diff --git a/frontend/src/navbar/account/MeDropdown.module.css b/frontend/src/navbar/account/MeDropdown.module.css
index 1adc531..c05f09d 100644
--- a/frontend/src/navbar/account/MeDropdown.module.css
+++ b/frontend/src/navbar/account/MeDropdown.module.css
@@ -37,7 +37,6 @@
.navbarMe {
/* padding-left: 1rem; */
- height: 40px;
display: flex;
}
diff --git a/frontend/src/navbar/account/MeDropdown.tsx b/frontend/src/navbar/account/MeDropdown.tsx
index 30873dc..8a71c8c 100644
--- a/frontend/src/navbar/account/MeDropdown.tsx
+++ b/frontend/src/navbar/account/MeDropdown.tsx
@@ -8,7 +8,10 @@ import { FaSignOutAlt } from "react-icons/fa";
import clsx from "clsx";
import styles from "./MeDropdown.module.css";
-import { scrollToTop, useComponentVisible } from "../../commons/utilities/display";
+import {
+ scrollToTop,
+ useComponentVisible,
+} from "../../commons/utilities/display";
import { SurfaceComponent, TextComponent, HoverText } from "../Typography";
function DropdownItem({
@@ -102,6 +105,7 @@ function DropdownContent({
smooth */}
+ {/*
About
@@ -111,6 +115,7 @@ function DropdownContent({
Release Notes
+ */}
Sign Out
diff --git a/frontend/src/pages/Courses/Courses.tsx b/frontend/src/pages/Courses/Courses.tsx
index c874b57..94eac8d 100644
--- a/frontend/src/pages/Courses/Courses.tsx
+++ b/frontend/src/pages/Courses/Courses.tsx
@@ -1,4 +1,3 @@
-
import React, { useState, useEffect } from "react";
import styles from "./Courses.module.css";
@@ -6,7 +5,7 @@ import YearBox from "./components/YearBox";
import AddCourseMenu from "./components/add_course/AddCourse";
import { MockStudent } from "./../../commons/mock/MockStudent";
-
+import MeDropdown from "../../navbar/account/MeDropdown";
import nav_styles from "./../../commons/components/navbar/NavBar.module.css";
import img_logo from "./../../commons/images/ma_logo.png";
import { NavLink } from "react-router-dom";
@@ -15,59 +14,102 @@ function NavBar() {
return (
-
+
- isActive ? nav_styles.activeLink : nav_styles.dormantLink }>
+
+ isActive ? nav_styles.activeLink : nav_styles.dormantLink
+ }
+ >
Graduation
- isActive ? nav_styles.activeLink : nav_styles.dormantLink }>
+
+ isActive ? nav_styles.activeLink : nav_styles.dormantLink
+ }
+ >
Courses
- isActive ? nav_styles.activeLink : nav_styles.dormantLink }>
+
+ isActive ? nav_styles.activeLink : nav_styles.dormantLink
+ }
+ >
Majors
- {/* */}
+
);
}
export interface DisplaySetting {
- rating: boolean,
- workload: boolean,
+ rating: boolean;
+ workload: boolean;
}
const defaultDisplaySetting = { rating: true, workload: true };
-function Settings(props: { displaySetting: DisplaySetting, updateDisplaySetting: Function }) {
-
+function Settings(props: {
+ displaySetting: DisplaySetting;
+ updateDisplaySetting: Function;
+}) {
const [isOpen, setIsOpen] = useState(false);
- const toggleDropdown = () => { setIsOpen(!isOpen); };
+ const toggleDropdown = () => {
+ setIsOpen(!isOpen);
+ };
const throwBack = (key: string) => {
- if(key === "rating"){
- const newSetting = { ...props.displaySetting, rating: !props.displaySetting.rating };
+ if (key === "rating") {
+ const newSetting = {
+ ...props.displaySetting,
+ rating: !props.displaySetting.rating,
+ };
props.updateDisplaySetting(newSetting);
- } else
- if(key === "workload"){
- const newSetting = { ...props.displaySetting, workload: !props.displaySetting.workload };
+ } else if (key === "workload") {
+ const newSetting = {
+ ...props.displaySetting,
+ workload: !props.displaySetting.workload,
+ };
props.updateDisplaySetting(newSetting);
}
- }
+ };
return (
-