From 38217a7101b50e7aa0a0d543cad737a011d5fac0 Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 28 Aug 2023 11:40:36 -0400 Subject: refactor: setup and run eslint+prettier --- src/App.js | 79 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 39 deletions(-) (limited to 'src/App.js') diff --git a/src/App.js b/src/App.js index 9d9ee58..21ebbf3 100644 --- a/src/App.js +++ b/src/App.js @@ -1,80 +1,81 @@ -import './App.css'; -import { RouterProvider, createBrowserRouter, Navigate } from 'react-router-dom'; -import Login from './pages/Login'; -import Surveys from './pages/Surveys'; -import NewSurvey from './pages/NewSurvey'; -import SurveyResults from './pages/SurveyResults'; -import SurveyAssignees from './pages/SurveyAssignees'; -import Users from './pages/Users'; -import NavBar from './components/NavBar'; -import useLoginState from './hooks/useLoginState'; -import CssBaseline from '@mui/material/CssBaseline'; -import CustomThemeProvider from './CustomThemeProvider'; +import "./App.css"; +import { + RouterProvider, + createBrowserRouter, + Navigate, +} from "react-router-dom"; +import Login from "./pages/Login"; +import Surveys from "./pages/Surveys"; +import NewSurvey from "./pages/NewSurvey"; +import SurveyResults from "./pages/SurveyResults"; +import SurveyAssignees from "./pages/SurveyAssignees"; +import Users from "./pages/Users"; +import NavBar from "./components/NavBar"; +import useLoginState from "./hooks/useLoginState"; +import CssBaseline from "@mui/material/CssBaseline"; +import CustomThemeProvider from "./CustomThemeProvider"; function routes({ login, logout, isLoggedIn }) { - function withNavBar(component) { const navbarLinks = [ - { label: 'Surveys', link: '/surveys' }, - { label: 'New Survey', link: '/surveys/new' }, - { label: 'Users', link: '/users' }, + { label: "Surveys", link: "/surveys" }, + { label: "New Survey", link: "/surveys/new" }, + { label: "Users", link: "/users" }, ]; - return (<> - - {component} - ); + return ( + <> + + {component} + + ); } if (!isLoggedIn) { - return ([ + return [ { - path: '*', - element: , + path: "*", + element: , }, - ]); + ]; } else { - return ([ + return [ { - path: '/', - element: , + path: "/", + element: , }, { - path: '/surveys', + path: "/surveys", element: withNavBar(), }, { - path: '/surveys/new', + path: "/surveys/new", element: withNavBar(), }, { - path: '/surveys/:surveyId/results', + path: "/surveys/:surveyId/results", element: withNavBar(), }, { - path: '/surveys/:surveyId/assignees', + path: "/surveys/:surveyId/assignees", element: withNavBar(), }, { - path: '/users', + path: "/users", element: withNavBar(), }, - ]); + ]; } - } export default function App() { const { login, logout, isLoggedIn } = useLoginState(); - const currentRoutes = routes({isLoggedIn, logout, login}); + const currentRoutes = routes({ isLoggedIn, logout, login }); return ( <> - + ); } - -- cgit v1.2.3