From ecf9649df103cf59c7de0e69c7d3467aa891c1e3 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Wed, 7 Feb 2024 11:16:41 -0600
Subject: [PATCH] keep sidebar on mobile for now and add icons

---
 web/src/App.tsx                |  2 ++
 web/src/components/Header.tsx  | 49 +++++++++++++++++++---------------
 web/src/components/Sidebar.tsx |  2 +-
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/web/src/App.tsx b/web/src/App.tsx
index c39f0433e..15ad1e2be 100644
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -2,6 +2,7 @@ import Providers from "@/context/providers";
 import { BrowserRouter, Routes, Route } from "react-router-dom";
 import { useState } from "react";
 import Wrapper from "@/components/Wrapper";
+import Sidebar from "@/components/Sidebar";
 import Header from "@/components/Header";
 import Dashboard from "@/pages/Dashboard";
 import Live from "@/pages/Live";
@@ -28,6 +29,7 @@ function App() {
         <Wrapper>
           <Header onToggleNavbar={toggleNavbar} />
           <div className="grid grid-cols-[auto,1fr] flex-grow-1 overflow-auto">
+            <Sidebar sheetOpen={sheetOpen} setSheetOpen={setSheetOpen} />
             <div
               id="pageRoot"
               className="overflow-x-hidden px-4 py-2 w-screen md:w-full"
diff --git a/web/src/components/Header.tsx b/web/src/components/Header.tsx
index 9f98cb904..eb5df6f25 100644
--- a/web/src/components/Header.tsx
+++ b/web/src/components/Header.tsx
@@ -8,7 +8,6 @@ import {
   LuList,
   LuMenu,
   LuMoon,
-  LuMoreVertical,
   LuPenSquare,
   LuRotateCw,
   LuSettings,
@@ -18,7 +17,7 @@ import {
 import { IoColorPalette } from "react-icons/io5";
 import { CgDarkMode } from "react-icons/cg";
 import { Button } from "@/components/ui/button";
-import Heading from "./ui/heading";
+import { VscAccount } from "react-icons/vsc";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -93,24 +92,28 @@ function HeaderNavigation() {
     },
   ];
 
-  return navbarLinks.map((item) => {
-    let shouldRender = item.dev ? ENV !== "production" : true;
-    return (
-      shouldRender && (
-        <NavLink
-          key={item.id}
-          to={item.url}
-          className={({ isActive }) =>
-            `py-4 px-2 flex flex-row items-center text-center rounded-lg gap-2 hover:bg-border ${
-              isActive ? "font-bold bg-popover text-popover-foreground" : ""
-            }`
-          }
-        >
-          <div className="text-sm">{item.title}</div>
-        </NavLink>
-      )
-    );
-  });
+  return (
+    <div className="hidden md:flex">
+      {navbarLinks.map((item) => {
+        let shouldRender = item.dev ? ENV !== "production" : true;
+        return (
+          shouldRender && (
+            <NavLink
+              key={item.id}
+              to={item.url}
+              className={({ isActive }) =>
+                `py-4 px-2 flex flex-row items-center text-center rounded-lg gap-2 hover:bg-border ${
+                  isActive ? "font-bold bg-popover text-popover-foreground" : ""
+                }`
+              }
+            >
+              <div className="text-sm">{item.title}</div>
+            </NavLink>
+          )
+        );
+      })}
+    </div>
+  );
 }
 
 function Header({ onToggleNavbar }: HeaderProps) {
@@ -161,7 +164,6 @@ function Header({ onToggleNavbar }: HeaderProps) {
             <div className="w-10 mr-5">
               <Logo />
             </div>
-            <Heading as="h1">Frigate</Heading>
           </div>
           {ENV == "production" && (
             <div className="text-red-500 text-sm items-center text-right">
@@ -175,7 +177,7 @@ function Header({ onToggleNavbar }: HeaderProps) {
         <DropdownMenu>
           <DropdownMenuTrigger asChild>
             <Button size="icon" variant="ghost">
-              <LuMoreVertical />
+              <LuSettings />
             </Button>
           </DropdownMenuTrigger>
           <DropdownMenuContent className="md:w-72 mr-5">
@@ -309,6 +311,9 @@ function Header({ onToggleNavbar }: HeaderProps) {
             </DropdownMenuItem>
           </DropdownMenuContent>
         </DropdownMenu>
+        <Button size="icon" variant="ghost">
+          <VscAccount />
+        </Button>
       </div>
       {restartDialogOpen && (
         <AlertDialog
diff --git a/web/src/components/Sidebar.tsx b/web/src/components/Sidebar.tsx
index be9edb6c0..cbe78fa8e 100644
--- a/web/src/components/Sidebar.tsx
+++ b/web/src/components/Sidebar.tsx
@@ -69,7 +69,7 @@ function Sidebar({
 
   return (
     <>
-      <div className="hidden md:block">{sidebar}</div>
+      <div className="hidden">{sidebar}</div>
 
       <Sheet
         open={sheetOpen}