From 7b6509538877f9118f3593617eb0f1f39d19a174 Mon Sep 17 00:00:00 2001 From: Vesna Tan Date: Thu, 10 Dec 2020 19:51:41 -0500 Subject: [PATCH 01/10] WIP left drawer --- client/App.jsx | 22 ++- client/components/GearButton/index.jsx | 1 + client/components/LeftDrawer/index.jsx | 200 +++++++++++++++++++++++++ 3 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 client/components/LeftDrawer/index.jsx diff --git a/client/App.jsx b/client/App.jsx index 909bb18f4..634c120c7 100644 --- a/client/App.jsx +++ b/client/App.jsx @@ -1,25 +1,44 @@ import React, { useEffect } from 'react'; import PropTypes from 'proptypes'; import { connect } from 'react-redux'; -import { ThemeProvider } from '@material-ui/core/styles'; +import { ThemeProvider, makeStyles, useTheme } from '@material-ui/core/styles'; import { CssBaseline } from '@material-ui/core'; import { getMetadataRequest } from '@reducers/metadata'; import Header from '@components/Header'; import Footer from '@components/Footer'; import Map from '@components/Map'; import theme from './theme/theme'; +import PersistentDrawerLeft from '@components/LeftDrawer'; +import GearButton from '@components/GearButton'; +import { toggleMenu as reduxToggleMenu } from '@reducers/ui'; + +// const useStyles = makeStyles((theme) => ({ +// contentShift: { +// transition: theme.transitions.create('margin', { +// easing: theme.transitions.easing.easeOut, +// duration: theme.transitions.duration.enteringScreen, +// }), +// marginLeft: 0, +// }, +// }) const App = ({ getMetadata, + toggleMenu }) => { useEffect(() => { getMetadata(); }); + // const classes = useStyles(); + // const mapTheme = useTheme(); + return (
+ +