Skip to content

fix: hydration issue #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Theodore-Kelechukwu-Onyejiaku wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: hydration issue #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .yarn/install-state.gz
View file
Open in desktop
Binary file not shown.
105 changes: 54 additions & 51 deletions next/app/[locale]/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,70 @@
import React from 'react'
import React from "react";

import { Metadata } from 'next';
import { Inter } from 'next/font/google';
import { generateMetadataObject } from '@/lib/shared/metadata';
import { Metadata } from "next";
import { Inter } from "next/font/google";
import { generateMetadataObject } from "@/lib/shared/metadata";

import { Footer } from '@/components/footer';
import { Navbar } from '@/components/navbar';
import { CartProvider } from '@/context/cart-context';
import { cn } from '@/lib/utils';
import { ViewTransitions } from 'next-view-transitions';
import fetchContentType from '@/lib/strapi/fetchContentType';
import { Footer } from "@/components/footer";
import { Navbar } from "@/components/navbar";
import { CartProvider } from "@/context/cart-context";
import { cn } from "@/lib/utils";
import { ViewTransitions } from "next-view-transitions";
import fetchContentType from "@/lib/strapi/fetchContentType";

const inter = Inter({
subsets: ["latin"],
display: "swap",
weight: ["400", "500", "600", "700", "800", "900"],
subsets: ["latin"],
display: "swap",
weight: ["400", "500", "600", "700", "800", "900"],
});

// Default Global SEO for pages without them
export async function generateMetadata({
params,
params,
}: {
params: { locale: string; slug: string };
params: { locale: string; slug: string };
}): Promise<Metadata> {
const pageData = await fetchContentType(
'global',
{
filters: { locale: params.locale },
populate: "seo.metaImage",
},
true
);
const pageData = await fetchContentType(
"global",
{
filters: { locale: params.locale },
populate: "seo.metaImage",
},
true
);

const seo = pageData?.seo;
const metadata = generateMetadataObject(seo);
return metadata;
const seo = pageData?.seo;
const metadata = generateMetadataObject(seo);
return metadata;
}

export default async function LocaleLayout({
children,
params: { locale }
children,
params: { locale },
}: {
children: React.ReactNode;
params: { locale: string };
children: React.ReactNode;
params: { locale: string };
}) {

const pageData = await fetchContentType('global', { filters: { locale } }, true);
return (
<html lang={locale}>
<ViewTransitions>
<CartProvider>
<body
className={cn(
inter.className,
"bg-charcoal antialiased h-full w-full"
)}
>
<Navbar data={pageData.navbar} locale={locale} />
{children}
<Footer data={pageData.footer} locale={locale} />
</body>
</CartProvider>
</ViewTransitions>
</html>
);
}
const pageData = await fetchContentType(
"global",
{ filters: { locale } },
true
);
return (
<div lang={locale}>
<ViewTransitions>
<CartProvider>
<div
className={cn(
inter.className,
"bg-charcoal antialiased h-full w-full"
)}
>
<Navbar data={pageData.navbar} locale={locale} />
{children}
<Footer data={pageData.footer} locale={locale} />
</div>
</CartProvider>
</ViewTransitions>
</div>
);
}
Loading