Skip to content

Commit

Permalink
Update theme and ItemTable references
Browse files Browse the repository at this point in the history
  • Loading branch information
Justin Campbell committed Aug 19, 2020
1 parent f78669f commit 5281d1a
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React, { useState } from "react";
import { ThemeProvider, createMuiTheme } from "@material-ui/core/styles";
import { ThemeProvider } from "@material-ui/core/styles";
import webqueueTheme from "./theme";
import { Box, makeStyles } from "@material-ui/core";
import CustomAppBar from "./CustomAppBar";
import ItemTable from "./ItemTable";
import ItemTable from "./components/ItemTable/";
import ItemViewAppBar from "./ItemViewAppBar";
import ItemView from "./ItemView";
import clsx from "clsx";
Expand All @@ -14,11 +15,7 @@ function App(){
const [activeItem, setActiveItem] = useState(testItem);
const [sidebarOpen, setSidebarOpen] = useState(true);

const theme = createMuiTheme({
"palette": {
"type": darkMode ? "dark" : "light",
}
});
const theme = webqueueTheme(darkMode);

const transitionWidth = theme.transitions.create(["width"], {
duration: theme.transitions.duration.enteringScreen,
Expand Down Expand Up @@ -59,7 +56,7 @@ function App(){
<Box display="flex">
<Box className={classes.leftCol}>
<CustomAppBar title="webqueue2" darkMode={darkMode} setDarkMode={setDarkMode} theme={theme}/>
<ItemTable activeItem={activeItem} setActiveItem={setActiveItem} setSidebarOpen={setSidebarOpen}/>
<ItemTable setActiveItem={setActiveItem} setSidebarOpen={setSidebarOpen}/>
</Box>
<Box className={clsx(classes.rightCol, sidebarOpen && classes.rightColShift)}>
<ItemViewAppBar title={activeItem["queue"] + " " + activeItem["number"]} setSidebarOpen={setSidebarOpen} />
Expand Down

0 comments on commit 5281d1a

Please sign in to comment.