refactor: Refactor sidebar into a shared component

4 files changed, 63 insertions, 14 deletions

diff --git a/apps/web/components/admin/sidebar/MobileSidebar.tsx b/apps/web/components/shared/sidebar/MobileSidebar.tsx
index 416b944c..d3edc7df 100644
--- a/apps/web/components/admin/sidebar/MobileSidebar.tsx
+++ b/apps/web/components/shared/sidebar/MobileSidebar.tsx
@@ -1,14 +1,19 @@
-import MobileSidebarItem from "@/components/shared/sidebar/ModileSidebarItem";
 import { useTranslation } from "@/lib/i18n/server";
+import { TFunction } from "i18next";
 
-import { adminSidebarItems } from "./items";
+import MobileSidebarItem from "./ModileSidebarItem";
+import { TSidebarItem } from "./TSidebarItem";
 
-export default async function MobileSidebar() {
+export default async function MobileSidebar({
+  items,
+}: {
+  items: (t: TFunction) => TSidebarItem[];
+}) {
   const { t } = await useTranslation();
   return (
     <aside className="w-full">
       <ul className="flex justify-between space-x-2 border-b-black px-5 py-2 pt-5">
-        {adminSidebarItems(t).map((item) => (
+        {items(t).map((item) => (
           <MobileSidebarItem
             key={item.name}
             logo={item.icon}
diff --git a/apps/web/components/admin/sidebar/Sidebar.tsx b/apps/web/components/shared/sidebar/Sidebar.tsx
index 8a5d615a..bd5d23e6 100644
--- a/apps/web/components/admin/sidebar/Sidebar.tsx
+++ b/apps/web/components/shared/sidebar/Sidebar.tsx
@@ -1,24 +1,25 @@
-import { redirect } from "next/navigation";
-import SidebarItem from "@/components/shared/sidebar/SidebarItem";
 import { useTranslation } from "@/lib/i18n/server";
-import { getServerAuthSession } from "@/server/auth";
+import { TFunction } from "i18next";
 
 import serverConfig from "@hoarder/shared/config";
 
-import { adminSidebarItems } from "./items";
+import SidebarItem from "./SidebarItem";
+import { TSidebarItem } from "./TSidebarItem";
 
-export default async function Sidebar() {
+export default async function Sidebar({
+  items,
+  extraSections,
+}: {
+  items: (t: TFunction) => TSidebarItem[];
+  extraSections?: React.ReactNode;
+}) {
   const { t } = await useTranslation();
-  const session = await getServerAuthSession();
-  if (!session) {
-    redirect("/");
-  }
 
   return (
     <aside className="flex h-[calc(100vh-64px)] w-60 flex-col gap-5 border-r p-4 ">
       <div>
         <ul className="space-y-2 text-sm font-medium">
-          {adminSidebarItems(t).map((item) => (
+          {items(t).map((item) => (
             <SidebarItem
               key={item.name}
               logo={item.icon}
@@ -28,6 +29,7 @@ export default async function Sidebar() {
           ))}
         </ul>
       </div>
+      {extraSections}
       <div className="mt-auto flex items-center border-t pt-2 text-sm text-gray-400">
         Hoarder v{serverConfig.serverVersion}
       </div>
diff --git a/apps/web/components/shared/sidebar/SidebarLayout.tsx b/apps/web/components/shared/sidebar/SidebarLayout.tsx
new file mode 100644
index 00000000..2a2a872e
--- /dev/null
+++ b/apps/web/components/shared/sidebar/SidebarLayout.tsx
@@ -0,0 +1,37 @@
+import Header from "@/components/dashboard/header/Header";
+import DemoModeBanner from "@/components/DemoModeBanner";
+import { Separator } from "@/components/ui/separator";
+import ValidAccountCheck from "@/components/utils/ValidAccountCheck";
+
+import serverConfig from "@hoarder/shared/config";
+
+export default function SidebarLayout({
+  children,
+  mobileSidebar,
+  sidebar,
+  modal,
+}: {
+  children: React.ReactNode;
+  mobileSidebar: React.ReactNode;
+  sidebar: React.ReactNode;
+  modal?: React.ReactNode;
+}) {
+  return (
+    <div>
+      <Header />
+      <div className="flex min-h-[calc(100vh-64px)] w-screen flex-col sm:h-[calc(100vh-64px)] sm:flex-row">
+        <ValidAccountCheck />
+        <div className="hidden flex-none sm:flex">{sidebar}</div>
+        <main className="flex-1 bg-muted sm:overflow-y-auto">
+          {serverConfig.demoMode && <DemoModeBanner />}
+          <div className="block w-full sm:hidden">
+            {mobileSidebar}
+            <Separator />
+          </div>
+          {modal}
+          <div className="min-h-30 container p-4">{children}</div>
+        </main>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/components/shared/sidebar/TSidebarItem.ts b/apps/web/components/shared/sidebar/TSidebarItem.ts
new file mode 100644
index 00000000..84cd58f5
--- /dev/null
+++ b/apps/web/components/shared/sidebar/TSidebarItem.ts
@@ -0,0 +1,5 @@
+export interface TSidebarItem {
+  name: string;
+  icon: JSX.Element;
+  path: string;
+}