Merge remote-tracking branch 'origin' into navbar
This commit is contained in:
@@ -10,7 +10,7 @@ export default async function Home() {
|
||||
const data = await getData();
|
||||
|
||||
return (
|
||||
<main className="flex min-h-screen flex-col items-center justify-between p-24 text-gray-300">
|
||||
<main className="flex min-h-screen flex-col items-center justify-between p-24 text-bg-primary">
|
||||
ssss
|
||||
</main>
|
||||
);
|
||||
|
||||
+9
-9
@@ -1,24 +1,24 @@
|
||||
'use client'
|
||||
import type { Metadata } from 'next';
|
||||
import './globals.css';
|
||||
import { I18nextProvider } from 'react-i18next';
|
||||
import i18n from '../config/i18n';
|
||||
import { cookies } from 'next/headers';
|
||||
|
||||
// export const metadata: Metadata = {
|
||||
// title: 'Create Next App',
|
||||
// description: 'Generated by create next app',
|
||||
// };
|
||||
|
||||
export default function RootLayout({
|
||||
export default async function RootLayout({
|
||||
children,
|
||||
}: {
|
||||
}: Readonly<{
|
||||
children: React.ReactNode;
|
||||
}) {
|
||||
}>) {
|
||||
const cookieStore = await cookies();
|
||||
const locale = cookieStore.get('lang')?.value || 'en';
|
||||
|
||||
return (
|
||||
<html lang="en">
|
||||
<I18nextProvider i18n={i18n}>
|
||||
<body>{children}</body>
|
||||
</I18nextProvider>
|
||||
<html lang={locale} dir={locale === 'fa' ? 'rtl' : 'ltr'}>
|
||||
<body>{children}</body>
|
||||
</html>
|
||||
);
|
||||
}
|
||||
|
||||
+10
-3
@@ -1,6 +1,8 @@
|
||||
// ... existing imports ...
|
||||
import Header from '@/components/layout/header';
|
||||
import Navbar from '@/components/layout/navbar';
|
||||
import ChangeLangButton from '@/components/layout/languageSwitcher';
|
||||
import { changeLanguage, t } from '@/locales/translates';
|
||||
|
||||
async function getData() {
|
||||
// Simulate a delay to show server-side data fetching
|
||||
@@ -8,13 +10,18 @@ async function getData() {
|
||||
return { message: 'This data was fetched on the server!' };
|
||||
}
|
||||
|
||||
const change = () => {
|
||||
changeLanguage('fa');
|
||||
};
|
||||
|
||||
export default async function Home() {
|
||||
const data = await getData();
|
||||
|
||||
return (
|
||||
<main className="">
|
||||
<main className="flex min-h-screen flex-col items-center justify-between p-24 text-gray-300">
|
||||
<Header/>
|
||||
{/* <Navbar/> */}
|
||||
<span>{t('pages_home_title') as string}</span>
|
||||
|
||||
</main>
|
||||
);
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user