#6 Fix requested changes

UniRegensburg · Aug 18, 2022 · 99afdd0 · 99afdd0
1 parent 2b91cc5
commit 99afdd0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx
@@ -27,14 +27,15 @@ export const Sidebar = () => {
       className={cx(
         "h-full overflow-y-clip shadow-lg divide-y-[1px] divide-lightGrey transition-width duration-300",
         {
-          "w-[40px] pt-4 px-1 overflow-hidden": !sidebarOpen,
-          "w-[400px] p-4": sidebarOpen,
+          "w-[65px] overflow-hidden": !sidebarOpen,
+          "w-[400px]": sidebarOpen,
         }
       )}
     >
       <SidebarHeader
         setActiveSidebar={setActiveSidebar}
-        setSidebarOpenForContent={setSidebarOpen}
+        sidebarOpen={sidebarOpen}
+        setSidebarOpen={setSidebarOpen}
       />
       {sidebars.map(
         (sidebar) =>

diff --git a/src/components/sidebar/SidebarHeader.tsx b/src/components/sidebar/SidebarHeader.tsx
@@ -5,7 +5,8 @@ import { Button } from "../Button";
 
 interface SidebarProps {
   setActiveSidebar: Dispatch<SetStateAction<string>>;
-  setSidebarOpenForContent: Dispatch<SetStateAction<boolean>>;
+  sidebarOpen: boolean;
+  setSidebarOpen: Dispatch<SetStateAction<boolean>>;
 }
 
 const buttons = [
@@ -25,14 +26,14 @@ const buttons = [
 
 export const SidebarHeader: React.FC<SidebarProps> = ({
   setActiveSidebar,
-  setSidebarOpenForContent,
+  sidebarOpen,
+  setSidebarOpen,
 }) => {
   const [activeButton, setActiveButton] = useState<string>(buttons[0].name);
-  const [sidebarOpen, setSidebarOpen] = useState<boolean>(true);
 
   return (
     <div
-      className={cx("flex flex-row mb-1", {
+      className={cx("flex flex-row mb-1 pt-4 pb-1 px-4", {
         "justify-between": sidebarOpen,
         "justify-end": !sidebarOpen,
       })}
@@ -53,7 +54,6 @@ export const SidebarHeader: React.FC<SidebarProps> = ({
           icon={<List size={18} />}
           onClick={() => {
             setSidebarOpen(!sidebarOpen);
-            setSidebarOpenForContent(!sidebarOpen);
           }}
         />
       </div>

diff --git a/src/components/sidebar/SidebarNotes.tsx b/src/components/sidebar/SidebarNotes.tsx
@@ -35,7 +35,7 @@ export const SidebarNotes = () => {
           textColor="text-white"
           hasText={false}
           alternativePadding="p-1"
-          icon={<Plus size={18} />}
+          icon={<Plus size={18} weight="bold" />}
         ></Button>
       </div>
       {notes.length <= 0 && (