Compare commits
2 commits
5a46f836f8
...
127e6399dd
Author | SHA1 | Date | |
---|---|---|---|
127e6399dd | |||
0fad731db9 |
8 changed files with 30 additions and 14 deletions
|
@ -3,7 +3,7 @@ import { Provider } from "react-redux";
|
||||||
import store from "./src/store/store";
|
import store from "./src/store/store";
|
||||||
import "react-vis/dist/style.css";
|
import "react-vis/dist/style.css";
|
||||||
import "prismjs/themes/prism-tomorrow.css";
|
import "prismjs/themes/prism-tomorrow.css";
|
||||||
import "typeface-roboto";
|
import "typeface-inter";
|
||||||
import { ThemeContextProvider } from "./src/context";
|
import { ThemeContextProvider } from "./src/context";
|
||||||
|
|
||||||
export const wrapRootElement = ({ element }) => (
|
export const wrapRootElement = ({ element }) => (
|
||||||
|
|
7
package-lock.json
generated
7
package-lock.json
generated
|
@ -38,6 +38,7 @@
|
||||||
"redux": "^4.0.5",
|
"redux": "^4.0.5",
|
||||||
"redux-thunk": "^2.3.0",
|
"redux-thunk": "^2.3.0",
|
||||||
"reselect": "^4.0.0",
|
"reselect": "^4.0.0",
|
||||||
|
"typeface-inter": "^3.18.1",
|
||||||
"typeface-roboto": "0.0.75",
|
"typeface-roboto": "0.0.75",
|
||||||
"worker-loader": "^2.0.0"
|
"worker-loader": "^2.0.0"
|
||||||
},
|
},
|
||||||
|
@ -24200,6 +24201,12 @@
|
||||||
"is-typedarray": "^1.0.0"
|
"is-typedarray": "^1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/typeface-inter": {
|
||||||
|
"version": "3.18.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/typeface-inter/-/typeface-inter-3.18.1.tgz",
|
||||||
|
"integrity": "sha512-c+TBanYFCvmg3j5vPk+zxK4ocMZbPxMEmjnwG7rPQoV87xvQ6b07VbAOC0Va0XBbbZCGw6cWNeFuLeg1YQru3Q==",
|
||||||
|
"license": "OFL-1.1"
|
||||||
|
},
|
||||||
"node_modules/typeface-roboto": {
|
"node_modules/typeface-roboto": {
|
||||||
"version": "0.0.75",
|
"version": "0.0.75",
|
||||||
"resolved": "https://registry.npmjs.org/typeface-roboto/-/typeface-roboto-0.0.75.tgz",
|
"resolved": "https://registry.npmjs.org/typeface-roboto/-/typeface-roboto-0.0.75.tgz",
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
"redux": "^4.0.5",
|
"redux": "^4.0.5",
|
||||||
"redux-thunk": "^2.3.0",
|
"redux-thunk": "^2.3.0",
|
||||||
"reselect": "^4.0.0",
|
"reselect": "^4.0.0",
|
||||||
|
"typeface-inter": "^3.18.1",
|
||||||
"typeface-roboto": "0.0.75",
|
"typeface-roboto": "0.0.75",
|
||||||
"worker-loader": "^2.0.0"
|
"worker-loader": "^2.0.0"
|
||||||
},
|
},
|
||||||
|
@ -40,8 +41,8 @@
|
||||||
"eslint": "^6.8.0",
|
"eslint": "^6.8.0",
|
||||||
"eslint-plugin-react": "^7.23.2",
|
"eslint-plugin-react": "^7.23.2",
|
||||||
"nodemon": "^3.1.9",
|
"nodemon": "^3.1.9",
|
||||||
"serve": "^14.2.4",
|
"prettier": "^1.19.1",
|
||||||
"prettier": "^1.19.1"
|
"serve": "^14.2.4"
|
||||||
},
|
},
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"gatsby"
|
"gatsby"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import React from "react";
|
import React, { useMemo } from "react";
|
||||||
import { makeStyles } from "@material-ui/styles";
|
import { makeStyles } from "@material-ui/styles";
|
||||||
import { Paper, Divider } from "@material-ui/core";
|
import { Paper, Divider } from "@material-ui/core";
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ import { MenuSolverControls } from "./MenuSolverControls";
|
||||||
import { MenuMetrics } from "./MenuMetrics";
|
import { MenuMetrics } from "./MenuMetrics";
|
||||||
import { OtherControls } from "./OtherControls";
|
import { OtherControls } from "./OtherControls";
|
||||||
import { MemoryUsage } from "./MemoryUsage";
|
import { MemoryUsage } from "./MemoryUsage";
|
||||||
|
import { useThemeContext } from "../context";
|
||||||
const useStyles = makeStyles(theme => ({
|
const useStyles = makeStyles(theme => ({
|
||||||
wrapper: {
|
wrapper: {
|
||||||
overflowY: "auto",
|
overflowY: "auto",
|
||||||
|
@ -32,6 +32,11 @@ export const Menu = ({
|
||||||
|
|
||||||
}) => {
|
}) => {
|
||||||
const classes = useStyles();
|
const classes = useStyles();
|
||||||
|
const { muiTheme, colorMode } = useThemeContext();
|
||||||
|
const backgroundStyle = useMemo(() =>
|
||||||
|
colorMode === "dark" ? "#101010" : "#ffffff",
|
||||||
|
[colorMode]
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Paper classes={{ root: classes.wrapper }} style={{
|
<Paper classes={{ root: classes.wrapper }} style={{
|
||||||
|
@ -44,6 +49,7 @@ export const Menu = ({
|
||||||
padding: "15px",
|
padding: "15px",
|
||||||
borderRadius: "8px",
|
borderRadius: "8px",
|
||||||
boxShadow: "2px 2px 10px rgba(0, 0, 0, 0.3)",
|
boxShadow: "2px 2px 10px rgba(0, 0, 0, 0.3)",
|
||||||
|
backgroundColor: backgroundStyle,
|
||||||
}}>
|
}}>
|
||||||
<MenuMetrics />
|
<MenuMetrics />
|
||||||
<Divider />
|
<Divider />
|
||||||
|
|
|
@ -28,8 +28,8 @@ export const MenuMetrics = props => {
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (startedRunningAt) {
|
if (startedRunningAt) {
|
||||||
const interval = setInterval(() => {
|
const interval = setInterval(() => {
|
||||||
setRunningFor(Math.floor((Date.now() - startedRunningAt) / 1000));
|
setRunningFor(Number(((Date.now() - startedRunningAt) / 1000).toFixed(3)));
|
||||||
}, 1000);
|
}, 50);
|
||||||
return () => clearInterval(interval);
|
return () => clearInterval(interval);
|
||||||
}
|
}
|
||||||
}, [startedRunningAt]);
|
}, [startedRunningAt]);
|
||||||
|
@ -105,7 +105,7 @@ export const MenuMetrics = props => {
|
||||||
display="inline"
|
display="inline"
|
||||||
variant="button"
|
variant="button"
|
||||||
>
|
>
|
||||||
{runningFor || ""}
|
{runningFor.toFixed(3) || ""}
|
||||||
</Typography>
|
</Typography>
|
||||||
<Typography
|
<Typography
|
||||||
classes={{ root: classes.unit }}
|
classes={{ root: classes.unit }}
|
||||||
|
|
|
@ -8,7 +8,7 @@ export const Navbar = () => {
|
||||||
justifyContent: 'space-between',
|
justifyContent: 'space-between',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
padding: '10px 20px',
|
padding: '10px 20px',
|
||||||
backgroundColor: '#333',
|
backgroundColor: '#101010',
|
||||||
color: 'white',
|
color: 'white',
|
||||||
position: 'fixed',
|
position: 'fixed',
|
||||||
top: 0,
|
top: 0,
|
||||||
|
|
|
@ -8,7 +8,7 @@ import orange from "@material-ui/core/colors/orange";
|
||||||
import { COLOR_MODE_KEY } from "../constants";
|
import { COLOR_MODE_KEY } from "../constants";
|
||||||
import { usePersistentState } from "../hooks";
|
import { usePersistentState } from "../hooks";
|
||||||
|
|
||||||
export const ThemeContext = createContext();
|
export const ThemeContext = createContext();
|
||||||
|
|
||||||
export const ThemeContextProvider = props => {
|
export const ThemeContextProvider = props => {
|
||||||
const { children } = props;
|
const { children } = props;
|
||||||
|
@ -17,12 +17,14 @@ export const ThemeContextProvider = props => {
|
||||||
|
|
||||||
const muiTheme = useMemo(
|
const muiTheme = useMemo(
|
||||||
() =>
|
() =>
|
||||||
createTheme({
|
createTheme({
|
||||||
palette: {
|
palette: {
|
||||||
|
type: colorMode,
|
||||||
primary: blue,
|
primary: blue,
|
||||||
secondary: orange,
|
secondary: orange,
|
||||||
type: colorMode
|
// backgroundColor: colorMode === "dark" ? "#101010" : "#ffffff",
|
||||||
}
|
// background: colorMode === "dark" ? "#ffffff" : "#ffffff",
|
||||||
|
},
|
||||||
}),
|
}),
|
||||||
[colorMode]
|
[colorMode]
|
||||||
);
|
);
|
||||||
|
|
|
@ -9,7 +9,7 @@ const AboutPage = () => {
|
||||||
maxWidth: '900px',
|
maxWidth: '900px',
|
||||||
margin: '80px auto 20px',
|
margin: '80px auto 20px',
|
||||||
padding: '0 20px',
|
padding: '0 20px',
|
||||||
fontFamily: 'Arial, sans-serif',
|
fontFamily: 'Inter, sans-serif',
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|
Loading…
Add table
Reference in a new issue