From 80208ffc457e4459fbe0ac7f84ee853ee4ee166e Mon Sep 17 00:00:00 2001 From: danieldeng2 <danieldeng223@gmail.com> Date: Mon, 24 Aug 2020 14:16:29 +0100 Subject: [PATCH] Add empty signin screen --- src/components/App.tsx | 52 ++++++++++++++++----------- src/components/pages/SignIn/index.tsx | 11 ++++++ 2 files changed, 42 insertions(+), 21 deletions(-) create mode 100644 src/components/pages/SignIn/index.tsx diff --git a/src/components/App.tsx b/src/components/App.tsx index eab3b939d..bc5789894 100644 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -9,6 +9,8 @@ import { faChalkboardTeacher, } from "@fortawesome/free-solid-svg-icons"; import StandardView from "./pages/StandardView"; +import { Switch, Route } from "react-router-dom"; +import SignIn from "./pages/SignIn"; type AppState = { toggledLeft: boolean; @@ -83,29 +85,37 @@ class App extends React.Component<{}, AppState> { return ( <> - <TopBar - pages={horizontalBarPages} - onFavIconClick={(e) => { - e.preventDefault(); - this.toggleLeftBar(); - }} - onUserIconClick={(e) => { - e.preventDefault(); - this.toggleRightBar(); - }} - /> + <Switch> + <Route path="/signin"> + <SignIn /> + </Route> - <StandardView - pages={horizontalBarPages} - toggledLeft={this.state.toggledLeft} - toggledRight={this.state.toggledRight} - onOverlayClick={(e) => { - e.preventDefault(); - this.setState({ toggledLeft: false, toggledRight: false }); - }} - /> + <Route path="/"> + <TopBar + pages={horizontalBarPages} + onFavIconClick={(e) => { + e.preventDefault(); + this.toggleLeftBar(); + }} + onUserIconClick={(e) => { + e.preventDefault(); + this.toggleRightBar(); + }} + /> - <BottomBar pages={horizontalBarPages} /> + <StandardView + pages={horizontalBarPages} + toggledLeft={this.state.toggledLeft} + toggledRight={this.state.toggledRight} + onOverlayClick={(e) => { + e.preventDefault(); + this.setState({ toggledLeft: false, toggledRight: false }); + }} + /> + + <BottomBar pages={horizontalBarPages} /> + </Route> + </Switch> </> ); } diff --git a/src/components/pages/SignIn/index.tsx b/src/components/pages/SignIn/index.tsx new file mode 100644 index 000000000..904eefd99 --- /dev/null +++ b/src/components/pages/SignIn/index.tsx @@ -0,0 +1,11 @@ +import React from "react"; + +const SignIn: React.FC = () => { + return ( + <> + Sign In + </> + ); +}; + +export default SignIn; -- GitLab