diff --git a/backend/package.json b/backend/package.json index 55df2d5..91ef49c 100644 --- a/backend/package.json +++ b/backend/package.json @@ -17,4 +17,4 @@ "node-fetch": "^2.6.0", "nodemon": "^2.0.2" } -} \ No newline at end of file +} diff --git a/frontend/src/App.js b/frontend/src/App.js index 4a814cb..4348a7e 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -3,6 +3,7 @@ import { BrowserRouter } from "react-router-dom"; import Navbar from "./components/navigation"; +import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles'; import "./App.css"; @@ -10,11 +11,27 @@ import "./App.css"; class App extends Component { render() { + const theme = createMuiTheme({ + palette: { + primary: { + main: "#0B1929", + light: "#9daac1" + }, + secondary: { + main: "#FFC800", + light: "#ffdf7b" + } + } + }) + //change basename in browserrouter if uri changes return ( - - - + + + + + + ); } } diff --git a/frontend/src/components/navigation.js b/frontend/src/components/navigation.js index c4967e9..eb7a6f0 100644 --- a/frontend/src/components/navigation.js +++ b/frontend/src/components/navigation.js @@ -6,7 +6,6 @@ import CssBaseline from '@material-ui/core/CssBaseline'; import AppBar from '@material-ui/core/AppBar'; import Toolbar from '@material-ui/core/Toolbar'; import List from '@material-ui/core/List'; -import Typography from '@material-ui/core/Typography'; import Divider from '@material-ui/core/Divider'; import IconButton from '@material-ui/core/IconButton'; import MenuIcon from '@material-ui/icons/Menu'; @@ -20,21 +19,26 @@ import Link1 from '@material-ui/core/Link'; import { Link } from "react-router-dom"; import SearchIcon from '@material-ui/icons/Search'; import InputBase from '@material-ui/core/InputBase'; +import EmojiObjectsIcon from '@material-ui/icons/EmojiObjects'; +import { ListItemIcon } from '@material-ui/core'; +import Tooltip from '@material-ui/core/Tooltip'; +import Zoom from '@material-ui/core/Zoom'; -const drawerWidth = 240; - +const drawerWidth = 64; +const drawerWidthOpen = 240; const useStyles = makeStyles((theme) => ({ root: { display: 'flex', }, appBar: { + zIndex: theme.zIndex.drawer + 1, transition: theme.transitions.create(['margin', 'width'], { easing: theme.transitions.easing.sharp, duration: theme.transitions.duration.leavingScreen, }), }, appBarShift: { - width: `calc(100% - ${drawerWidth}px)`, + width: `calc(100% - ${drawerWidthOpen}px)`, marginLeft: drawerWidth, transition: theme.transitions.create(['margin', 'width'], { easing: theme.transitions.easing.easeOut, @@ -50,8 +54,21 @@ const useStyles = makeStyles((theme) => ({ drawer: { width: drawerWidth, flexShrink: 0, + whiteSpace: 'nowrap' }, - drawerPaper: { + drawerOpen: { + width: drawerWidthOpen, + transition: theme.transitions.create('width', { + easing: theme.transitions.easing.sharp, + duration: theme.transitions.duration.enteringScreen, + }), + }, + drawerClose: { + transition: theme.transitions.create('width', { + easing: theme.transitions.easing.sharp, + duration: theme.transitions.duration.leavingScreen, + }), + overflowX: 'hidden', width: drawerWidth, }, drawerHeader: { @@ -69,7 +86,7 @@ const useStyles = makeStyles((theme) => ({ easing: theme.transitions.easing.sharp, duration: theme.transitions.duration.leavingScreen, }), - marginLeft: -drawerWidth, + marginLeft: 0, }, contentShift: { transition: theme.transitions.create('margin', { @@ -175,12 +192,16 @@ export default function Navigation() { @@ -191,9 +212,16 @@ export default function Navigation() { {['Resources'].map((text, index) => ( + + + + + + + ))}