diff --git a/frontend/src/components/App.scss b/frontend/src/components/App.scss index 7e64911499c3bf832426708a9c5350c938ac5c65..1b6f68e4b51bdb60dd3e30e830663a989f8a2345 100644 --- a/frontend/src/components/App.scss +++ b/frontend/src/components/App.scss @@ -13,4 +13,4 @@ body { code { font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace; -} +} \ No newline at end of file diff --git a/frontend/src/components/organisms/LeftBar/index.tsx b/frontend/src/components/organisms/LeftBar/index.tsx index 55a99befcb9bfdf588540262d15037dc0c5badd3..138001a55f3d1ffa0ae832193760e17b513e582b 100644 --- a/frontend/src/components/organisms/LeftBar/index.tsx +++ b/frontend/src/components/organisms/LeftBar/index.tsx @@ -1,5 +1,6 @@ import React from "react"; import styles from "./style.module.scss"; +import { Link } from "react-router-dom"; export interface LeftBarProps{ children: React.ReactNode; @@ -8,7 +9,7 @@ export interface LeftBarProps{ const LeftBar: React.FC<LeftBarProps> = ({children}: LeftBarProps) => { return ( <div id={styles.leftbarWrapper}> - <p className={styles.leftbarStatus}>1 DEADLINE</p> + <p className={styles.leftbarStatus}><Link to="/Dashboard">1 NOTICE</Link></p> {children} </div> ); diff --git a/frontend/src/components/organisms/LeftBar/style.module.scss b/frontend/src/components/organisms/LeftBar/style.module.scss index d61ca713955ec7b9d53adbd2808d2ee7daf128ca..a962e5ddd63f64ac5041ac8bb9d9676bfd1df48c 100644 --- a/frontend/src/components/organisms/LeftBar/style.module.scss +++ b/frontend/src/components/organisms/LeftBar/style.module.scss @@ -39,6 +39,11 @@ transform: translateX(0); } +.leftbarStatus a { + text-decoration: none !important; + color: #000 !important; +} + @media (max-width: 62rem) { .leftbarStatus { margin-top: 1.875rem; diff --git a/frontend/src/components/organisms/LeftBarModuleList/index.tsx b/frontend/src/components/organisms/LeftBarModuleList/index.tsx index 4c3d67e813031723dfcdde4002dfb1a82793baeb..2932b64e6d86753ac63b639f56e2b86196d774c1 100644 --- a/frontend/src/components/organisms/LeftBarModuleList/index.tsx +++ b/frontend/src/components/organisms/LeftBarModuleList/index.tsx @@ -6,23 +6,23 @@ import WorkDueGroup from "components/molecules/WorkDueGroup"; const LeftBarModuleList: React.FC = () => { let sortButtons = [ { - title: "Progress", + title: "All", + active: true, }, { - title: "Module Title", - active: true, + title: "In Progress", }, { - title: "Module Code", + title: "Not Started", }, { - title: "Term", + title: "Completed", }, ]; return ( <LeftBar> - <SideBarTabGroup title="Sort" buttons={sortButtons} /> + <SideBarTabGroup title="Filter" buttons={sortButtons} /> <WorkDueGroup/> </LeftBar> );