Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

fix layout

Bill Yang317c578c854c
diff --git a/client/src/app/[site]/layout.tsx b/client/src/app/[site]/layout.tsx
index b678e8565..e7f11911e 100644
--- a/client/src/app/[site]/layout.tsx
+++ b/client/src/app/[site]/layout.tsx
@@ -4,6 +4,9 @@ import { useEffect } from "react";
import { useStore } from "../../lib/store";
import { useSyncStateWithUrl } from "../../lib/urlParams";
import { Header } from "./Header/Header";
+import { useSiteHasData } from "../../hooks/api";
+import { useGetSiteMetadata } from "../../hooks/hooks";
+import { NoData } from "./components/NoData";
export default function SiteLayout({
children,
@@ -12,6 +15,9 @@ export default function SiteLayout({
}) {
const pathname = usePathname();
const { setSite, site } = useStore();
+ const { data: siteHasData, isLoading } = useSiteHasData(site);
+ const { siteMetadata, isLoading: isLoadingSiteMetadata } =
+ useGetSiteMetadata(site);
// Sync store state with URL parameters
useSyncStateWithUrl();
@@ -26,6 +32,14 @@ export default function SiteLayout({
return null;
}
+ if (isLoadingSiteMetadata || isLoading || !siteMetadata) {
+ return null;
+ }
+
+ if (!siteHasData?.data && !isLoading && !isLoadingSiteMetadata) {
+ return <NoData siteMetadata={siteMetadata} />;
+ }
+
return (
<>
<Header />
diff --git a/client/src/app/[site]/main/page.tsx b/client/src/app/[site]/main/page.tsx
index 5ed035a86..493687c07 100644
--- a/client/src/app/[site]/main/page.tsx
+++ b/client/src/app/[site]/main/page.tsx
@@ -24,19 +24,13 @@ export default function MainPage() {
}
function MainPageContent({ site }: { site: string }) {
- const { data: siteHasData, isLoading } = useSiteHasData(site);
-
const { siteMetadata, isLoading: isLoadingSiteMetadata } =
useGetSiteMetadata(site);
- if (isLoadingSiteMetadata || isLoading || !siteMetadata) {
+ if (isLoadingSiteMetadata || !siteMetadata) {
return null;
}
- if (!siteHasData?.data && !isLoading && !isLoadingSiteMetadata) {
- return <NoData siteMetadata={siteMetadata} />;
- }
-
return (
<>
<SubHeader />