diff --git a/frontend/src/components/App.tsx b/frontend/src/components/App.tsx index 296f404eccabc4b618126d5261065997c476d155..d0fe268ab923b359307541ecc8c1e70854b802bb 100644 --- a/frontend/src/components/App.tsx +++ b/frontend/src/components/App.tsx @@ -52,7 +52,7 @@ class App extends React.Component<{}, AppState> { render() { const horizontalBarPages = [ - { name: "Home", path: "/home", icon: faHome }, + { name: "Dashboard", path: "/dashboard", icon: faHome }, { name: "Modules", path: "/modules", icon: faChalkboardTeacher }, { name: "Timeline", path: "/timeline", icon: faCalendarWeek }, { name: "Exams", path: "/exams", icon: faBookOpen }, diff --git a/frontend/src/components/atoms/MyBreadcrumbs/index.tsx b/frontend/src/components/atoms/MyBreadcrumbs/index.tsx index a536406408f1e23d115c743b0fb14f88312b1b0c..ec4937fbdca6678c96e4ca476b9172db77f6ab09 100644 --- a/frontend/src/components/atoms/MyBreadcrumbs/index.tsx +++ b/frontend/src/components/atoms/MyBreadcrumbs/index.tsx @@ -5,8 +5,7 @@ import styles from "./style.module.scss"; import withBreadcrumbs from "react-router-breadcrumbs-hoc"; import { Link } from "react-router-dom"; -// delete [{ path: "/", breadcrumb: "" }] to enable Home in front of breadcrumbs -const MyBreadcrumbs = withBreadcrumbs([{ path: "/", breadcrumb: "" }])( +const MyBreadcrumbs = withBreadcrumbs()( ({ breadcrumbs }: { breadcrumbs: any }) => ( <Breadcrumb className={styles.breadcrumb}> {breadcrumbs.map( diff --git a/frontend/src/components/organisms/LeftBarHome/index.tsx b/frontend/src/components/organisms/LeftBarDashboard/index.tsx similarity index 92% rename from frontend/src/components/organisms/LeftBarHome/index.tsx rename to frontend/src/components/organisms/LeftBarDashboard/index.tsx index 39f09b37930ffa890e4df503714f65b874844e8e..75b213825a0a2126e9d51ccb1402c1d2d09efe48 100644 --- a/frontend/src/components/organisms/LeftBarHome/index.tsx +++ b/frontend/src/components/organisms/LeftBarDashboard/index.tsx @@ -4,7 +4,7 @@ import SideBarTabGroup from "components/molecules/SideBarTabGroup"; import { faGitlab } from "@fortawesome/free-brands-svg-icons"; import { faFlask, faAward, faDatabase, faEnvelopeOpen } from "@fortawesome/free-solid-svg-icons"; -const LeftBarHome: React.FC = () => { +const LeftBarDashboard: React.FC = () => { let linkButtons = [ { title: "GitLab", @@ -40,4 +40,4 @@ const LeftBarHome: React.FC = () => { ); }; -export default LeftBarHome; +export default LeftBarDashboard; diff --git a/frontend/src/components/pages/StandardView/index.tsx b/frontend/src/components/pages/StandardView/index.tsx index 28048df1ae5eed678df875d3e7ae4350feb60af0..eeceeacb56aceb3b07b51557089167262974addc 100644 --- a/frontend/src/components/pages/StandardView/index.tsx +++ b/frontend/src/components/pages/StandardView/index.tsx @@ -9,7 +9,7 @@ import classNames from "classnames"; import ModuleList from "../ModuleList"; import ModuleResources from "../ModuleResources"; import ModuleFeedback from "../ModuleFeedback"; -import LeftBarHome from "components/organisms/LeftBarHome"; +import LeftBarDashboard from "components/organisms/LeftBarDashboard"; import LeftBarModuleList from "components/organisms/LeftBarModuleList"; import LeftBarModule from "components/organisms/LeftBarModule"; import Container from "react-bootstrap/esm/Container"; @@ -48,15 +48,15 @@ const StandardView: React.FC<StandardViewProps> = ({ </Route> <Route path="/"> - <LeftBarHome /> + <LeftBarDashboard /> </Route> </Switch> <div id="sidenav-overlay" onClick={(e) => onOverlayClick(e)}></div> <Container className={classNames("py-4", "px-5", "pageContainer")}> <Switch> - <Route path="/home"> - <ExamplePage name="Home" /> + <Route path="/dashboard"> + <ExamplePage name="Dashboard" /> </Route> <Route exact path="/modules"> @@ -89,7 +89,7 @@ const StandardView: React.FC<StandardViewProps> = ({ <Redirect to={`/modules/${props.match.params.id}/overview`} /> )} /> - <Route path="/" render={() => <Redirect to="/home" />} /> + <Route path="/" render={() => <Redirect to="/dashboard" />} /> </Switch> </Container> </div>