From 220c9b917e14b7901c250e341834f31e1f87cfa3 Mon Sep 17 00:00:00 2001 From: Kai Vogelgesang Date: Tue, 11 Jan 2022 21:59:53 +0100 Subject: [PATCH] Style frontend --- frontend/src/App.tsx | 32 ++++++++++--- frontend/src/Layout.tsx | 90 ++++++++++++++++++++++++++++++----- frontend/src/MainView.tsx | 14 ------ frontend/src/pages/Index.tsx | 47 ++++++++++++++---- frontend/src/tokenStorage.tsx | 7 +-- 5 files changed, 140 insertions(+), 50 deletions(-) delete mode 100644 frontend/src/MainView.tsx diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index fd4732b..867494c 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,14 +1,32 @@ import React from 'react'; import Layout from './Layout'; -import MainView from './MainView'; -import { TokenProvider } from './tokenStorage'; +import { TokenProvider, TokenContext } from './tokenStorage'; +import { BrowserRouter as Router, Routes, Route } from 'react-router-dom'; +import Login from './Login'; +import Index from './pages/Index'; +import Page404 from './pages/Page404'; const App: React.FC = () => { - return - - - - + return + + + + + + +} + +const Content: React.FC = () => { + const tokenStorage = React.useContext(TokenContext); + + if (!tokenStorage.token) { + return + } + + return + } /> + } /> + } export default App; diff --git a/frontend/src/Layout.tsx b/frontend/src/Layout.tsx index 728812f..5d469dd 100644 --- a/frontend/src/Layout.tsx +++ b/frontend/src/Layout.tsx @@ -1,21 +1,85 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { fab } from "fontawesome.macro"; +import { fas, fab } from "fontawesome.macro"; +import React from "react"; +import { Link } from "react-router-dom"; +import { TokenContext } from "./tokenStorage"; export const Layout: React.FC = (props) => { - return
-
{props.children}
- +
+