diff --git a/app/log/goInventorize.log b/app/log/goInventorize.log index 400529f..6ca7269 100644 --- a/app/log/goInventorize.log +++ b/app/log/goInventorize.log @@ -70,3 +70,15 @@ {"level":"info","time":"2021-11-13T22:11:01-05:00","message":"Configuration loaded successfully..."} {"level":"debug","time":"2021-11-13T22:11:01-05:00","message":"{Timezone:America/New_York Server:{Port:3500 LocationPhotoDir:./app/photos/locations/} Logger:{Level:debug LoggingFile:./app/log/goInventorize.log} Authentication:{BasicAuth:true UserName:admin Password:password} Development:false}"} {"level":"info","time":"2021-11-13T22:11:01-05:00","message":"Database and Config loaded, starting webserver..."} +{"level":"info","time":"2021-11-14T14:26:43-05:00","message":"Configuration loaded successfully..."} +{"level":"debug","time":"2021-11-14T14:26:43-05:00","message":"{Timezone:America/New_York Server:{Port:3500 LocationPhotoDir:./app/photos/locations/} Logger:{Level:debug LoggingFile:./app/log/goInventorize.log} Authentication:{BasicAuth:true UserName:admin Password:password} Development:false}"} +{"level":"info","time":"2021-11-14T14:26:43-05:00","message":"Database and Config loaded, starting webserver..."} +{"level":"info","time":"2021-11-14T14:26:46-05:00","message":"Configuration loaded successfully..."} +{"level":"debug","time":"2021-11-14T14:26:46-05:00","message":"{Timezone:America/New_York Server:{Port:3500 LocationPhotoDir:./app/photos/locations/} Logger:{Level:debug LoggingFile:./app/log/goInventorize.log} Authentication:{BasicAuth:true UserName:admin Password:password} Development:false}"} +{"level":"info","time":"2021-11-14T14:26:46-05:00","message":"Database and Config loaded, starting webserver..."} +{"level":"info","time":"2021-11-14T18:43:36-05:00","message":"Configuration loaded successfully..."} +{"level":"debug","time":"2021-11-14T18:43:36-05:00","message":"{Timezone:America/New_York Server:{Port:3500 LocationPhotoDir:./app/photos/locations/} Logger:{Level:debug LoggingFile:./app/log/goInventorize.log} Authentication:{BasicAuth:true UserName:admin Password:password} Development:false}"} +{"level":"info","time":"2021-11-14T18:43:36-05:00","message":"Database and Config loaded, starting webserver..."} +{"level":"info","time":"2021-11-14T18:43:38-05:00","message":"Configuration loaded successfully..."} +{"level":"debug","time":"2021-11-14T18:43:38-05:00","message":"{Timezone:America/New_York Server:{Port:3500 LocationPhotoDir:./app/photos/locations/} Logger:{Level:debug LoggingFile:./app/log/goInventorize.log} Authentication:{BasicAuth:true UserName:admin Password:password} Development:false}"} +{"level":"info","time":"2021-11-14T18:43:38-05:00","message":"Database and Config loaded, starting webserver..."} diff --git a/frontend/src/App.js b/frontend/src/App.js index 9b1b392..cce81f6 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -1,7 +1,9 @@ import React, {useState, useEffect, useContext, createContext} from 'react'; import base64 from 'base-64'; -import Home from './components/pages/Home'; +import HomePage from './components/pages/HomePage'; +import Locations from './components/pages/Locations' import { Modal, Button, Text, Group, TextInput, Loader, AppShell } from '@mantine/core'; +import {BrowserRouter as Router, Routes, Route, Link} from 'react-router-dom' import { useDebouncedValue, useLocalStorageValue } from '@mantine/hooks'; @@ -83,14 +85,19 @@ function App() { return ( - } - header={} - > - Resize app to see responsive navbar in action - + + } + header={} + > + + } /> + } /> + + + setPortModalOpen(false)} diff --git a/frontend/src/components/SideBar.js b/frontend/src/components/SideBar.js index 06726c3..150e77a 100644 --- a/frontend/src/components/SideBar.js +++ b/frontend/src/components/SideBar.js @@ -1,12 +1,29 @@ import React, {useState } from 'react'; -import { Navbar, Text, Group, ThemeIcon, Button } from '@mantine/core'; +import { Navbar, Text, Group, ThemeIcon, Button, UnstyledButton } from '@mantine/core'; +import { createStyles } from '@mantine/styles'; import { BsMap } from 'react-icons/bs' -import {BrowserRouter as Router, Routes, Route, Link} from 'react-router-dom' +import { Link, useNavigate} from 'react-router-dom' +import { classNames } from '@plasmicapp/react-web'; +const useStyles = createStyles((theme) => ({ + button: { + display: 'block', + width: '100%', + padding: theme.spacing.xs, + borderRadius: theme.radius.sm, + color: theme.colorScheme === 'dark' ? theme.colors.dark[0] : theme.black, + backgroundColor: 'transparent', + + '&:hover': { + backgroundColor: theme.colorScheme === 'dark' ? theme.colors.dark[6] : theme.colors.gray[0], + }, + }, + })); function SideBar(props) { - + const { classes } = useStyles(); + const navigate = useNavigate(); return ( ) diff --git a/frontend/src/components/pages/Home.js b/frontend/src/components/pages/HomePage.js similarity index 57% rename from frontend/src/components/pages/Home.js rename to frontend/src/components/pages/HomePage.js index dda022d..4f63893 100644 --- a/frontend/src/components/pages/Home.js +++ b/frontend/src/components/pages/HomePage.js @@ -1,10 +1,11 @@ import React, {useState, useEffect, useContext, createContext} from 'react'; import APIContext from '../../App'; +import { Text } from '@mantine/core' +import { Home } from '@material-ui/icons'; - -function App() { +function HomePage() { const [opened, setOpened] = useState(false); const serverConfig = useContext(APIContext); @@ -12,9 +13,10 @@ function App() { return ( <> + This is the homepage! ); } -export default App; +export default HomePage;