diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index 8c0da99..963ec7d 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -1,4 +1,4 @@ -import { Box } from "@mui/material"; +import { AppBar, Box, CssBaseline } from "@mui/material"; import VIT_Logo from '../assets/logo.png'; /** @@ -6,21 +6,31 @@ import VIT_Logo from '../assets/logo.png'; * @returns JSX element representing the header with a logo. */ export default function Header() { - const headerStyle = { - backgroundColor: "#F5F5f5", - color: "white", - padding: "20px", - textAlign: "left", - height: "12vh" - }; return ( - - logo.exe + + + theme.zIndex.drawer + 1, + height: "130px", + padding: "20px", + backgroundColor: "#F5F5f5", + boxShadow: "none" + }} + > + logo.exe + ); } \ No newline at end of file diff --git a/frontend/src/components/ModSiderbar.tsx b/frontend/src/components/ModSiderbar.tsx index 3fdadc7..15579e7 100644 --- a/frontend/src/components/ModSiderbar.tsx +++ b/frontend/src/components/ModSiderbar.tsx @@ -9,7 +9,7 @@ import LocationCityIcon from "@mui/icons-material/LocationCity"; import GanttChart from "./GanttChart"; import { TimetableSolution } from "../scripts/api"; import { useState } from "react"; -import { ListItemIcon } from "@mui/material"; +import { Box, ListItemIcon } from "@mui/material"; interface SidebarProps { marginTop: number; @@ -40,12 +40,12 @@ export default function ModSidebar({ marginTop, width }: SidebarProps) { "& .MuiDrawer-paper": { width: drawerWidth, boxSizing: "border-box", - marginTop: marginTop, }, }} variant="permanent" anchor="left" > + {campusSolutions && campusSolutions.length > 0 ? ( campusSolutions.map((solution) => { @@ -64,11 +64,9 @@ export default function ModSidebar({ marginTop, width }: SidebarProps) { }} > - + - + ); @@ -89,7 +87,7 @@ export default function ModSidebar({ marginTop, width }: SidebarProps) { } + element={} /> ); })} diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx index c54ff5d..ce434a6 100644 --- a/frontend/src/components/Sidebar.tsx +++ b/frontend/src/components/Sidebar.tsx @@ -8,6 +8,7 @@ import SchoolIcon from "@mui/icons-material/School"; import MeetingRoomIcon from "@mui/icons-material/MeetingRoom"; import { Link } from "react-router-dom"; +import { Box } from "@mui/material"; interface SidebarProps { @@ -34,12 +35,12 @@ export default function Sidebar({ marginTop, width }: SidebarProps) { "& .MuiDrawer-paper": { width: drawerWidth, boxSizing: "border-box", - marginTop: marginTop, }, }} variant="permanent" anchor="left" > + diff --git a/frontend/src/components/UploadPopUp.tsx b/frontend/src/components/UploadPopUp.tsx index 0630b5f..07aebe4 100644 --- a/frontend/src/components/UploadPopUp.tsx +++ b/frontend/src/components/UploadPopUp.tsx @@ -49,7 +49,7 @@ export default function UploadPopUp() { onClose={handleClose} slots={{ backdrop: StyledBackdrop }} > - + diff --git a/frontend/src/pages/SemesterInfo.tsx b/frontend/src/pages/SemesterInfo.tsx index 4d69fa7..07fc8f3 100644 --- a/frontend/src/pages/SemesterInfo.tsx +++ b/frontend/src/pages/SemesterInfo.tsx @@ -15,8 +15,8 @@ import BackButton from "../components/BackButton.tsx"; export default function SemesterInfo() { return (
-
- +
+ {/* Spreadsheet */}
@@ -31,5 +31,5 @@ export default function SemesterInfo() {
- ) + ); } \ No newline at end of file diff --git a/frontend/src/pages/TimetableMod.tsx b/frontend/src/pages/TimetableMod.tsx index 831e78d..45d8544 100644 --- a/frontend/src/pages/TimetableMod.tsx +++ b/frontend/src/pages/TimetableMod.tsx @@ -41,7 +41,7 @@ export default function TimetableMod() { return (
- +