Fix: remove sidebar

uwblueprint · Jul 14, 2024 · 05b2ddc · 05b2ddc
1 parent c7ac7f9
commit 05b2ddc
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 100 deletions.
diff --git a/frontend/src/components/pages/residents/ResidentsPage.tsx b/frontend/src/components/pages/residents/ResidentsPage.tsx
@@ -49,8 +49,6 @@ const ResidentsPage = (): React.ReactElement => {
   }, []);
 
   return (
-    <Flex>
-      <SideBar />
     <Flex flexDir="column" flexGrow={1} p="20px">
       <Flex justifyContent="space-between" p="10px">
         <InputGroup w="30%">
@@ -75,7 +73,6 @@ const ResidentsPage = (): React.ReactElement => {
       />
       <ResidentModal isOpen={isModalOpen} setIsOpen={setIsModalOpen} />
     </Flex>
-    </Flex>
   );
 };
 

diff --git a/frontend/src/components/pages/schedule/SchedulePage.tsx b/frontend/src/components/pages/schedule/SchedulePage.tsx
@@ -61,120 +61,117 @@ const SchedulePage = (): React.ReactElement => {
   }
 
   return (
-    <Flex>
-      <SideBar />
-      <Flex flexDir="column" flexGrow={1}>
-
-        <Tabs variant="horizontal" h="30px" mb={6}>
-          {formatTabs(rooms)}
-        </Tabs>
-
-        <Flex justifyContent="space-between" mt={10} ml={8} mr={10}>
-          <Flex>
-            <Heading size="lg" fontSize="36px" w="14vw" color="purple.main">
-              January 2025 
-              {/* see announcements page for how to determine what text shows */}
-            </Heading>
-
-            <Flex w='200px' flexDir="row" height='100px' ml={5}>
-              <IconButton 
-                _hover={{
-                  cursor: "pointer",
-                }}
-                color="purple.main"
-                backgroundColor="grey.50"
-                borderRightRadius='0'
-                aria-label="Previous Week"
-                icon={<ArrowBackIosNew fontSize='small'/>}
-              />
-              <Button alignContent='center' borderRadius='0' color="purple.main" size="md" fontSize="lg">
-                Jan 1 - 7
-              </Button>
-              <IconButton 
-                _hover={{
-                  cursor: "pointer",
-                }}
-                color="purple.main"
-                backgroundColor="grey.50"
-                borderLeftRadius='0'
-                aria-label="Previous Week"
-                icon={<ArrowForwardIos fontSize='small'/>}
-              />
-            </Flex>
+    <Flex flexDir="column" flexGrow={1}>
 
-          </Flex>
+      <Tabs variant="horizontal" h="30px" mb={6}>
+        {formatTabs(rooms)}
+      </Tabs>
 
-          <Flex flexDir="row" height='100px' justifyContent="space-between">
-            <Button
-              variant="success"
-              rightIcon={<Icon as={Edit} color="green.main" />}
-              size="sm"
-              onClick={() => {}}
-              mr={5}
-            >
-              200 M-Bucks
-            </Button>
+      <Flex justifyContent="space-between" mt={10} ml={8} mr={10}>
+        <Flex>
+          <Heading size="lg" fontSize="36px" w="14vw" color="purple.main">
+            January 2025 
+            {/* see announcements page for how to determine what text shows */}
+          </Heading>
 
-            <Button
-              variant="error"
-              rightIcon={<Icon as={Edit} color="red.main" />}
-              size="sm"
-              onClick={() => {}}
-            >
-              0 Warnings
+          <Flex w='200px' flexDir="row" height='100px' ml={5}>
+            <IconButton 
+              _hover={{
+                cursor: "pointer",
+              }}
+              color="purple.main"
+              backgroundColor="grey.50"
+              borderRightRadius='0'
+              aria-label="Previous Week"
+              icon={<ArrowBackIosNew fontSize='small'/>}
+            />
+            <Button alignContent='center' borderRadius='0' color="purple.main" size="md" fontSize="lg">
+              Jan 1 - 7
             </Button>
+            <IconButton 
+              _hover={{
+                cursor: "pointer",
+              }}
+              color="purple.main"
+              backgroundColor="grey.50"
+              borderLeftRadius='0'
+              aria-label="Previous Week"
+              icon={<ArrowForwardIos fontSize='small'/>}
+            />
           </Flex>
 
         </Flex>
 
-        <Flex justifyContent="space-between" mt={-5} ml={8} mr={10}>
-          <Flex>
-            <Button
-              variant={ active === 'List' ? "primary" : "secondary" }
-              w="7vw"
-              borderRightRadius="0"
-              leftIcon={<Icon as={FormatListBulleted} color="white" />}
-              size="sm"
-              onClick={(event) => {
-                selectOption(event);
-                setScheduleType("LIST");
-              }}
-            >
-              List
-            </Button>
-
-            <Button
-              variant={ active === 'Calendar' ? "primary" : "secondary" }
-              w="7vw"
-              borderLeftRadius="0"
-              leftIcon={<Icon as={CalendarMonth} color="white" />}
-              size="sm"
-              onClick={(event) => {
-                selectOption(event);
-                setScheduleType("CALENDAR");
-              }}
-            >
-              Calendar
-            </Button>
-          </Flex>
+        <Flex flexDir="row" height='100px' justifyContent="space-between">
+          <Button
+            variant="success"
+            rightIcon={<Icon as={Edit} color="green.main" />}
+            size="sm"
+            onClick={() => {}}
+            mr={5}
+          >
+            200 M-Bucks
+          </Button>
 
           <Button
-            variant="primary"
+            variant="error"
+            rightIcon={<Icon as={Edit} color="red.main" />}
             size="sm"
             onClick={() => {}}
           >
-            Update Selected
+            0 Warnings
           </Button>
         </Flex>
 
-        <Flex justifyContent="space-between" mt={10} ml={8} mr={10}>
-          <Heading>
-            {scheduleData}
-          </Heading>
+      </Flex>
+
+      <Flex justifyContent="space-between" mt={-5} ml={8} mr={10}>
+        <Flex>
+          <Button
+            variant={ active === 'List' ? "primary" : "secondary" }
+            w="7vw"
+            borderRightRadius="0"
+            leftIcon={<Icon as={FormatListBulleted} color="white" />}
+            size="sm"
+            onClick={(event) => {
+              selectOption(event);
+              setScheduleType("LIST");
+            }}
+          >
+            List
+          </Button>
+
+          <Button
+            variant={ active === 'Calendar' ? "primary" : "secondary" }
+            w="7vw"
+            borderLeftRadius="0"
+            leftIcon={<Icon as={CalendarMonth} color="white" />}
+            size="sm"
+            onClick={(event) => {
+              selectOption(event);
+              setScheduleType("CALENDAR");
+            }}
+          >
+            Calendar
+          </Button>
         </Flex>
 
+        <Button
+          variant="primary"
+          size="sm"
+          onClick={() => {}}
+        >
+          Update Selected
+        </Button>
       </Flex>
-  </Flex>
+
+      <Flex justifyContent="space-between" mt={10} ml={8} mr={10}>
+        <Heading>
+          {scheduleData}
+        </Heading>
+      </Flex>
+
+    </Flex>
   );
 };
 

diff --git a/frontend/src/components/pages/tasks/TasksPage.tsx b/frontend/src/components/pages/tasks/TasksPage.tsx
@@ -89,8 +89,6 @@ const TasksPage = (): React.ReactElement => {
   }, [taskType]);
 
   return (
-    <Flex>
-      <SideBar />
       <Flex flexDir="column" flexGrow={1}>
         <Tabs variant="horizontal" h="30px" mb={6}>
           <TabList pl={6}>