From bbb443ade04c9242d74049827d141e58d9f46e1d Mon Sep 17 00:00:00 2001
From: danieldeng2 <danieldeng223@gmail.com>
Date: Sun, 9 Aug 2020 00:46:08 +0100
Subject: [PATCH] Change default route to dashboard to resolve breadcrumb
confusion
---
frontend/src/components/App.tsx | 2 +-
frontend/src/components/atoms/MyBreadcrumbs/index.tsx | 3 +--
.../{LeftBarHome => LeftBarDashboard}/index.tsx | 4 ++--
frontend/src/components/pages/StandardView/index.tsx | 10 +++++-----
4 files changed, 9 insertions(+), 10 deletions(-)
rename frontend/src/components/organisms/{LeftBarHome => LeftBarDashboard}/index.tsx (92%)
diff --git a/frontend/src/components/App.tsx b/frontend/src/components/App.tsx
index 296f404ec..d0fe268ab 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 a53640640..ec4937fbd 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 39f09b379..75b213825 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 28048df1a..eeceeacb5 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>
--
GitLab