add multiple root layouts

CS3219-AY2425S1 · Oct 8, 2024 · f54bacf · f54bacf
1 parent 26afcb4
commit f54bacf
Show file tree

Hide file tree

Showing 21 changed files with 71 additions and 65 deletions.
diff --git a/frontend/peerprep/app/error.tsx → frontend/peerprep/app/(default)/error.tsx b/frontend/peerprep/app/error.tsx → frontend/peerprep/app/(default)/error.tsx
diff --git a/frontend/peerprep/app/home/layout.tsx → ...nd/peerprep/app/(default)/home/layout.tsx b/frontend/peerprep/app/home/layout.tsx → ...nd/peerprep/app/(default)/home/layout.tsx
diff --git a/frontend/peerprep/app/home/page.tsx → ...tend/peerprep/app/(default)/home/page.tsx b/frontend/peerprep/app/home/page.tsx → ...tend/peerprep/app/(default)/home/page.tsx
diff --git a/frontend/peerprep/app/(default)/layout.tsx b/frontend/peerprep/app/(default)/layout.tsx
@@ -0,0 +1,66 @@
+import "@/styles/globals.css";
+import { Metadata, Viewport } from "next";
+import clsx from "clsx";
+import { PublicEnvScript } from "next-runtime-env";
+
+import { Providers } from "./providers";
+
+import { siteConfig } from "@/config/site";
+import { fontSans } from "@/config/fonts";
+import { Navbar } from "@/components/navbar";
+import { Sidebar } from "@/components/sidebar";
+
+export const metadata: Metadata = {
+  title: {
+    default: siteConfig.name,
+    template: `%s - ${siteConfig.name}`,
+  },
+  description: siteConfig.description,
+  icons: {
+    icon: "/favicon.ico",
+  },
+};
+
+export const viewport: Viewport = {
+  themeColor: [
+    { media: "(prefers-color-scheme: light)", color: "white" },
+    { media: "(prefers-color-scheme: dark)", color: "black" },
+  ],
+};
+
+export default function RootLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <html suppressHydrationWarning lang="en">
+      <head>
+        <PublicEnvScript />
+        <link
+          href="https://unpkg.com/[email protected]/css/boxicons.min.css"
+          rel="stylesheet"
+        />
+      </head>
+      <body
+        className={clsx(
+          "min-h-screen bg-background font-sans antialiased",
+          fontSans.variable
+        )}
+      >
+        <Providers themeProps={{ attribute: "class", defaultTheme: "light" }}>
+          <div className="relative flex flex-col h-screen">
+            <Navbar />
+            <div className="flex flex-grow mx-6">
+              <Sidebar />
+              <main className="flex-grow container max-w-screen">
+                {children}
+              </main>
+            </div>
+            <footer className="w-full flex items-center justify-center py-3" />
+          </div>
+        </Providers>
+      </body>
+    </html>
+  );
+}
diff --git a/frontend/peerprep/app/providers.tsx → ...tend/peerprep/app/(default)/providers.tsx b/frontend/peerprep/app/providers.tsx → ...tend/peerprep/app/(default)/providers.tsx
diff --git a/...p/app/questions-management/add/layout.tsx → ...ault)/questions-management/add/layout.tsx b/...p/app/questions-management/add/layout.tsx → ...ault)/questions-management/add/layout.tsx
diff --git a/...rep/app/questions-management/add/page.tsx → ...efault)/questions-management/add/page.tsx b/...rep/app/questions-management/add/page.tsx → ...efault)/questions-management/add/page.tsx
diff --git a/...prep/app/questions-management/columns.tsx → ...default)/questions-management/columns.tsx b/...prep/app/questions-management/columns.tsx → ...default)/questions-management/columns.tsx
diff --git a/...questions-management/edit/[id]/layout.tsx → ...questions-management/edit/[id]/layout.tsx b/...questions-management/edit/[id]/layout.tsx → ...questions-management/edit/[id]/layout.tsx
diff --git a/...p/questions-management/edit/[id]/page.tsx → ...)/questions-management/edit/[id]/page.tsx b/...p/questions-management/edit/[id]/page.tsx → ...)/questions-management/edit/[id]/page.tsx
diff --git a/...rprep/app/questions-management/layout.tsx → ...(default)/questions-management/layout.tsx b/...rprep/app/questions-management/layout.tsx → ...(default)/questions-management/layout.tsx
diff --git a/...ment/mockdata/sample_getAllQuestions.json → ...ment/mockdata/sample_getAllQuestions.json b/...ment/mockdata/sample_getAllQuestions.json → ...ment/mockdata/sample_getAllQuestions.json
diff --git a/...nt/mockdata/sample_getSingleQuestion.json → ...nt/mockdata/sample_getSingleQuestion.json b/...nt/mockdata/sample_getSingleQuestion.json → ...nt/mockdata/sample_getSingleQuestion.json
diff --git a/...eerprep/app/questions-management/page.tsx → ...p/(default)/questions-management/page.tsx b/...eerprep/app/questions-management/page.tsx → ...p/(default)/questions-management/page.tsx
diff --git a/frontend/peerprep/app/settings/layout.tsx → ...eerprep/app/(default)/settings/layout.tsx b/frontend/peerprep/app/settings/layout.tsx → ...eerprep/app/(default)/settings/layout.tsx
diff --git a/frontend/peerprep/app/settings/page.tsx → .../peerprep/app/(default)/settings/page.tsx b/frontend/peerprep/app/settings/page.tsx → .../peerprep/app/(default)/settings/page.tsx
diff --git a/frontend/peerprep/app/layout.tsx b/frontend/peerprep/app/layout.tsx
@@ -1,65 +1,12 @@
-import "@/styles/globals.css";
-import { Metadata, Viewport } from "next";
-import clsx from "clsx";
-import { PublicEnvScript } from "next-runtime-env";
-
-import { Providers } from "./providers";
-
-import { siteConfig } from "@/config/site";
-import { fontSans } from "@/config/fonts";
-import { Navbar } from "@/components/navbar";
-import { Sidebar } from "@/components/sidebar";
-
-export const metadata: Metadata = {
-  title: {
-    default: siteConfig.name,
-    template: `%s - ${siteConfig.name}`,
-  },
-  description: siteConfig.description,
-  icons: {
-    icon: "/favicon.ico",
-  },
-};
-
-export const viewport: Viewport = {
-  themeColor: [
-    { media: "(prefers-color-scheme: light)", color: "white" },
-    { media: "(prefers-color-scheme: dark)", color: "black" },
-  ],
-};
-
 export default function RootLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
   return (
     <html suppressHydrationWarning lang="en">
-      <head>
-        <PublicEnvScript />
-        <link
-          href="https://unpkg.com/[email protected]/css/boxicons.min.css"
-          rel="stylesheet"
-        />
-      </head>
-      <body
-        className={clsx(
-          "min-h-screen bg-background font-sans antialiased",
-          fontSans.variable
-        )}
-      >
-        <Providers themeProps={{ attribute: "class", defaultTheme: "light" }}>
-          <div className="relative flex flex-col h-screen">
-            <Navbar />
-            <div className="flex flex-grow mx-6">
-              <Sidebar />
-              <main className="flex-grow container max-w-screen">
-                {children}
-              </main>
-            </div>
-            <footer className="w-full flex items-center justify-center py-3" />
-          </div>
-        </Providers>
+      <body>
+        <div>{children}</div>
       </body>
     </html>
   );

diff --git a/frontend/peerprep/app/page.tsx b/frontend/peerprep/app/page.tsx
@@ -1,13 +1,6 @@
 "use client";
 
 export default function Home() {
-  const friends = [
-    { name: "s_name", status: "online" },
-    { name: "thisisalongusername", status: "online" },
-    { name: "Friend3", status: "hidden" },
-    { name: "Friend4", status: "offline" },
-  ];
-
   return (
     <div className="flex flex-col items-center p-8">
       <h1 className="text-3xl font-bold text-center">

diff --git a/frontend/peerprep/components/addquestionform.tsx b/frontend/peerprep/components/addquestionform.tsx
@@ -21,7 +21,7 @@ import { WysiMarkEditor } from "./wysimarkeditor";
 import BoxIcon from "./boxicons";
 
 import { capitalize, languages } from "@/utils/utils";
-import { complexityColorMap } from "@/app/questions-management/columns";
+import { complexityColorMap } from "@/app/(default)/questions-management/columns";
 
 interface AddQuestionFormProps {
   initialTitle?: string;

diff --git a/frontend/peerprep/components/editquestionform.tsx b/frontend/peerprep/components/editquestionform.tsx
@@ -26,7 +26,7 @@ import { capitalize, languages } from "@/utils/utils";
 import {
   complexityColorMap,
   Question,
-} from "@/app/questions-management/columns";
+} from "@/app/(default)/questions-management/columns";
 
 interface EditQuestionFormProps {
   initialTitle?: string;

diff --git a/frontend/peerprep/components/questionstable.tsx b/frontend/peerprep/components/questionstable.tsx
@@ -32,7 +32,7 @@ import {
   Question,
   RenderCell,
   complexityOptions,
-} from "@/app/questions-management/columns";
+} from "@/app/(default)/questions-management/columns";
 
 const fetcher = (url: string) => fetch(url).then((res) => res.json());