regardscitoyens · alexfauquette · Dec 1, 2023 · Nov 30, 2023 · Nov 30, 2023 · Nov 30, 2023
diff --git a/app/about/page.tsx b/app/about/page.tsx
@@ -1,11 +1,10 @@
 import Button from "@mui/material/Button";
-import { Layout } from "../components/Layout";
 
 export default function About() {
   return (
-    <Layout>
+    <div>
       Hello About
       <Button>Test</Button>
-    </Layout>
+    </div>
   );
 }
diff --git a/app/components/Layout.tsx b/app/components/Layout.tsx
diff --git a/app/dossiers/dossier/page.tsx b/app/dossiers/dossier/page.tsx
@@ -2,7 +2,6 @@
 
 import React from "react";
 
-import { Layout } from "@/app/components/Layout";
 import AdditionalInfoCard from "@/components/folders/AdditionalInfoCard";
 import CommiteeCard from "@/components/folders/CommiteeCard";
 import Hero from "@/components/folders/HeroSection";
@@ -17,14 +16,11 @@ import Stack from "@mui/material/Stack";
 import Tabs from "@mui/material/Tabs";
 import Tab from "@mui/material/Tab";
 
-import { useTheme } from "@mui/material";
-
 export default function Dossier() {
-  const theme = useTheme();
   const tabNumber = 0;
 
   return (
-    <Layout>
+    <React.Fragment>
       <Hero />
       <Box
         mb={2}
@@ -107,6 +103,6 @@ export default function Dossier() {
           </Container>
         )}
       </div>
-    </Layout>
+    </React.Fragment>
   );
 }
diff --git a/app/dossiers/page.tsx b/app/dossiers/page.tsx
@@ -1,12 +1,6 @@
-import { Layout } from "../components/Layout";
-
 import Link from "next/link";
 
 export default function Dossiers() {
-  return (
-    <Layout>
-      {/* TODO: match old website url ":id/dossiers/:id" */}
-      <Link href="dossiers/dossier">Lien vers un dossier</Link>
-    </Layout>
-  );
+  // TODO: match old website url ":id/dossiers/:id"
+  return <Link href="dossiers/dossier">Lien vers un dossier</Link>;
 }
diff --git a/app/favicon.ico b/app/favicon.ico
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -2,23 +2,60 @@ import type { Metadata } from "next";
 import { Raleway } from "next/font/google";
 import "./globals.css";
 import ThemeRegistry from "@/components/ThemeRegistry/ThemeRegistry";
+import { NavBar, NavigationItem } from "@/components/NavBar";
 
 const inter = Raleway({ subsets: ["latin"] });
 
 export const metadata: Metadata = {
-  title: "Create Next App",
-  description: "Generated by create next app",
+  metadataBase: new URL("https://www.nosdeputes.fr"),
+  robots: "index, follow",
+  title: "NosDéputés.fr : Observatoire citoyen de l'activité parlementaire",
+  description: "Observatoire citoyen de l'activité parlementaire",
+
+  twitter: {
+    card: "summary",
+    site: "@RegardsCitoyens",
+    title: "NosDéputés.fr par @RegardsCitoyens",
+    description:
+      "Observatoire citoyen de l'activité parlementaire à l'Assemblée nationale",
+    images: {
+      url: "https://www.nosdeputes.fr/images/xneth/bouton_logo.png",
+      type: "image/png",
+    },
+  },
+  openGraph: {
+    type: "website",
+    title: "NosDéputés.fr par Regards Citoyens",
+    siteName: "NosDéputés.fr",
+    description:
+      "Observatoire citoyen de l'activité parlementaire à l'Assemblée nationale",
+    url: "https://www.NosDéputés.fr",
+    locale: "fr_FR",
+    images: "https://www.nosdeputes.fr/images/xneth/bouton_logo.png",
+  },
 };
 
+const navigation: NavigationItem[] = [
+  { name: "Home", href: "/" },
+  { name: "About", href: "/about" },
+  { name: "Dossiers", href: "/dossiers" }, // old url is "/dossiers/date"
+  // ... more items
+];
+
 export default function RootLayout({
   children,
 }: {
   children?: React.ReactNode;
 }) {
   return (
-    <html lang="en">
+    <html lang="fr">
       <body className={inter.className}>
-        <ThemeRegistry>{children}</ThemeRegistry>
+        <ThemeRegistry>
+          <main className="flex min-h-screen flex-col">
+            <NavBar navigation={navigation} />
+            {children}
+          </main>
+        </ThemeRegistry>
       </body>
     </html>
   );

diff --git a/app/page.tsx b/app/page.tsx
@@ -1,5 +1,3 @@
-import { Layout } from "./components/Layout";
-
 export default function Home() {
-  return <Layout>Hello Home!</Layout>;
+  return <p>Hello Home!</p>;
 }
diff --git a/app/components/NavBar.tsx → components/NavBar.tsx b/app/components/NavBar.tsx → components/NavBar.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-// app/components/NavBar.client.tsx
 import { usePathname } from "next/navigation"; // This is hypothetical, replace with the appropriate import
 import Link from "next/link";
 

diff --git a/components/folders/HeroSection/index.tsx b/components/folders/HeroSection/index.tsx
@@ -147,10 +147,10 @@ const HeroSection = () => {
               <StatusChip size="small" status="dropped" label="Non-soutenu" />
               <StatusChip size="small" status="review" label="1e lecture AN" />
               <StatusChip size="small" status="validated" label="Promulgué" />
-              <LabelChip label="Label" icon={<EnergyIcon />} />
+              <LabelChip size="small" label="Label" icon={<EnergyIcon />} />
               <LabelChip size="small" label="Label" />
               <LabelChip size="small" label="Label" onDelete={() => {}} />
-              <LabelChip label="Label" onDelete={() => {}} />
+              <LabelChip size="small" label="Label" onDelete={() => {}} />
             </Stack>
           </Stack>
         </Paper>