aboutsummaryrefslogtreecommitdiff
path: root/modern/src
diff options
context:
space:
mode:
Diffstat (limited to 'modern/src')
-rw-r--r--modern/src/MainPage.js18
1 files changed, 8 insertions, 10 deletions
diff --git a/modern/src/MainPage.js b/modern/src/MainPage.js
index 43625691..c70e8169 100644
--- a/modern/src/MainPage.js
+++ b/modern/src/MainPage.js
@@ -1,13 +1,14 @@
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
import { useHistory } from 'react-router-dom';
-import { makeStyles } from '@material-ui/core';
+import { isWidthUp, makeStyles, withWidth } from '@material-ui/core';
import Drawer from '@material-ui/core/Drawer';
import ContainerDimensions from 'react-container-dimensions';
+import DeviceList from './DeviceList';
import MainMap from './MainMap';
-import SocketController from './SocketController';
import MainToobar from './MainToolbar';
-import DeviceList from './DeviceList';
+import SocketController from './SocketController';
+
const useStyles = makeStyles(theme => ({
root: {
@@ -38,7 +39,7 @@ const useStyles = makeStyles(theme => ({
}
}));
-const MainPage = () => {
+const MainPage = ({ width }) => {
const [loading, setLoading] = useState(true);
const classes = useStyles();
const history = useHistory();
@@ -58,11 +59,8 @@ const MainPage = () => {
<SocketController />
<MainToobar />
<div className={classes.content}>
- {/* <Drawer
- anchor={isWidthUp('sm', this.props.width) ? "left" : "bottom"} NOTE: What's this do?
- variant="permanent"
- classes={{ paper: classes.drawerPaper }}> */}
<Drawer
+ anchor={isWidthUp('sm', width) ? "left" : "bottom"}
variant="permanent"
classes={{ paper: classes.drawerPaper }}>
<DeviceList />
@@ -77,4 +75,4 @@ const MainPage = () => {
);
}
-export default MainPage;
+export default withWidth()(MainPage);