From 289e387f15aefc2f588f731ca1b2751314d9fdb5 Mon Sep 17 00:00:00 2001
From: Zeke Abshire <zekeabshire@gmail.com>
Date: Fri, 24 Mar 2023 01:29:43 -0500
Subject: [PATCH] Merged MainLayout and SidePanel

---
 src/components/SidePanel.tsx          | 103 -------------------------
 src/components/layouts/MainLayout.tsx | 106 +++++++++++++++++++++++++-
 2 files changed, 105 insertions(+), 104 deletions(-)
 delete mode 100644 src/components/SidePanel.tsx

diff --git a/src/components/SidePanel.tsx b/src/components/SidePanel.tsx
deleted file mode 100644
index c5e02af..0000000
--- a/src/components/SidePanel.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { typo } from "@styles/typography";
-import Link from "next/link";
-import {
-  FiMenu,
-  FiHome,
-  FiSearch,
-  FiClipboard,
-  FiEdit,
-  FiArchive,
-  FiUser,
-  FiSettings,
-} from "react-icons/fi";
-import type { IconType } from "react-icons/lib";
-import { Button } from "@components/Button";
-import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
-
-interface NavItem {
-  label: string;
-  route: string;
-  Icon: IconType;
-}
-
-const navItems: NavItem[] = [
-  { label: "Home", route: "/projects", Icon: FiHome },
-  { label: "Search", route: "/discover", Icon: FiSearch },
-  { label: "Proposals", route: "/discover/proposals", Icon: FiClipboard },
-  { label: "Revisions", route: "/discover/revisions", Icon: FiEdit },
-  { label: "Archive", route: "/discover/archive", Icon: FiArchive },
-  { label: "Profile", route: "/profile", Icon: FiUser },
-];
-
-export const SidePanel: React.FC = () => {
-  return (
-    <div
-      id="side-panel"
-      className="fixed top-0 left-0 bottom-0 hidden bg-bg-600 md:block"
-    >
-      <header className="flex h-screen flex-col justify-between gap-y-8 px-12 py-8">
-        <div>
-          <h1>
-            <Link
-              href="/"
-              className={typo({ tag: "h3", className: "text-primary" })}
-            >
-              <span className="text-fg">||</span> Parallel
-            </Link>
-          </h1>
-          <nav className="my-8 flex flex-col gap-y-5">
-            {navItems.map(({ label, route, Icon }) => (
-              <Link
-                key={label}
-                href={route}
-                className={typo({
-                  size: "2xl",
-                  className:
-                    "flex flex-row items-center gap-x-2 font-medium hover:font-bold hover:text-fg-400",
-                })}
-              >
-                <Icon size={28} /> {label}
-              </Link>
-            ))}
-          </nav>
-          <Button variant={{ size: "small" }}>New Proposal</Button>
-        </div>
-        <MoreMenu />
-      </header>
-    </div>
-  );
-};
-
-const MoreMenu: React.FC = () => {
-  const container =
-    typeof window !== "undefined" ? document.getElementById("root") : null;
-
-  return (
-    <DropdownMenu.Root>
-      <DropdownMenu.Trigger asChild>
-        <button
-          className={typo({
-            size: "2xl",
-            className:
-              "flex flex-row items-center gap-x-2 font-medium hover:font-bold hover:text-fg-400",
-          })}
-        >
-          <FiMenu size={28} /> More
-        </button>
-      </DropdownMenu.Trigger>
-
-      <DropdownMenu.Portal container={container}>
-        <DropdownMenu.Content
-          side="top"
-          className="min-w-[250px] rounded-md bg-bg-700 p-3 data-[side=top]:animate-slideUpAndFade"
-          sideOffset={10}
-        >
-          <DropdownMenu.Item className="flex select-none items-center justify-between px-[5px] pl-[25px] text-lg outline-none">
-            <p className={typo({ tag: "p" })}>Settings</p>
-            <FiSettings />
-          </DropdownMenu.Item>
-        </DropdownMenu.Content>
-      </DropdownMenu.Portal>
-    </DropdownMenu.Root>
-  );
-};
diff --git a/src/components/layouts/MainLayout.tsx b/src/components/layouts/MainLayout.tsx
index 5da585e..cd71476 100644
--- a/src/components/layouts/MainLayout.tsx
+++ b/src/components/layouts/MainLayout.tsx
@@ -1,5 +1,19 @@
-import { SidePanel } from "@components/SidePanel";
 import type { Children } from "@utils/types/props";
+import { typo } from "@styles/typography";
+import Link from "next/link";
+import {
+  FiMenu,
+  FiHome,
+  FiSearch,
+  FiClipboard,
+  FiEdit,
+  FiArchive,
+  FiUser,
+  FiSettings,
+} from "react-icons/fi";
+import type { IconType } from "react-icons/lib";
+import { Button } from "@components/Button";
+import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 
 export const MainLayout: React.FC<Children> = ({ children }) => {
   return (
@@ -9,3 +23,93 @@ export const MainLayout: React.FC<Children> = ({ children }) => {
     </>
   );
 };
+
+// === Side Panel =============================================================
+
+interface NavItem {
+  label: string;
+  route: string;
+  Icon: IconType;
+}
+
+const navItems: NavItem[] = [
+  { label: "Home", route: "/projects", Icon: FiHome },
+  { label: "Search", route: "/discover", Icon: FiSearch },
+  { label: "Proposals", route: "/discover/proposals", Icon: FiClipboard },
+  { label: "Revisions", route: "/discover/revisions", Icon: FiEdit },
+  { label: "Archive", route: "/discover/archive", Icon: FiArchive },
+  { label: "Profile", route: "/profile", Icon: FiUser },
+];
+
+export const SidePanel: React.FC = () => {
+  return (
+    <div
+      id="side-panel"
+      className="fixed top-0 left-0 bottom-0 hidden bg-bg-600 md:block"
+    >
+      <header className="flex h-screen flex-col justify-between gap-y-8 px-12 py-8">
+        <div>
+          <h1>
+            <Link
+              href="/"
+              className={typo({ tag: "h3", className: "text-primary" })}
+            >
+              <span className="text-fg">||</span> Parallel
+            </Link>
+          </h1>
+          <nav className="my-8 flex flex-col gap-y-5">
+            {navItems.map(({ label, route, Icon }) => (
+              <Link
+                key={label}
+                href={route}
+                className={typo({
+                  size: "2xl",
+                  className:
+                    "flex flex-row items-center gap-x-2 font-medium hover:font-bold hover:text-fg-400",
+                })}
+              >
+                <Icon size={28} /> {label}
+              </Link>
+            ))}
+          </nav>
+          <Button variant={{ size: "small" }}>New Proposal</Button>
+        </div>
+        <MoreMenu />
+      </header>
+    </div>
+  );
+};
+
+const MoreMenu: React.FC = () => {
+  const container =
+    typeof window !== "undefined" ? document.getElementById("root") : null;
+
+  return (
+    <DropdownMenu.Root>
+      <DropdownMenu.Trigger asChild>
+        <button
+          className={typo({
+            size: "2xl",
+            className:
+              "flex flex-row items-center gap-x-2 font-medium hover:font-bold hover:text-fg-400",
+          })}
+        >
+          <FiMenu size={28} /> More
+        </button>
+      </DropdownMenu.Trigger>
+
+      <DropdownMenu.Portal container={container}>
+        <DropdownMenu.Content
+          side="top"
+          className="min-w-[250px] rounded-md bg-bg-700 p-3 data-[side=top]:animate-slideUpAndFade"
+          sideOffset={10}
+        >
+          <DropdownMenu.Item className="flex select-none items-center justify-between px-[5px] pl-[25px] text-lg outline-none">
+            <p className={typo({ tag: "p" })}>Settings</p>
+            <FiSettings />
+          </DropdownMenu.Item>
+        </DropdownMenu.Content>
+      </DropdownMenu.Portal>
+    </DropdownMenu.Root>
+  );
+};