Compare commits

..

No commits in common. "127e6399dd33d846f35d453be2aca1d158736468" and "5a46f836f8044e4f00e65cb72d748a761c57794f" have entirely different histories.

8 changed files with 14 additions and 30 deletions

View file

@ -3,7 +3,7 @@ import { Provider } from "react-redux";
import store from "./src/store/store";
import "react-vis/dist/style.css";
import "prismjs/themes/prism-tomorrow.css";
import "typeface-inter";
import "typeface-roboto";
import { ThemeContextProvider } from "./src/context";
export const wrapRootElement = ({ element }) => (

7
package-lock.json generated
View file

@ -38,7 +38,6 @@
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
"reselect": "^4.0.0",
"typeface-inter": "^3.18.1",
"typeface-roboto": "0.0.75",
"worker-loader": "^2.0.0"
},
@ -24201,12 +24200,6 @@
"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": {
"version": "0.0.75",
"resolved": "https://registry.npmjs.org/typeface-roboto/-/typeface-roboto-0.0.75.tgz",

View file

@ -33,7 +33,6 @@
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
"reselect": "^4.0.0",
"typeface-inter": "^3.18.1",
"typeface-roboto": "0.0.75",
"worker-loader": "^2.0.0"
},
@ -41,8 +40,8 @@
"eslint": "^6.8.0",
"eslint-plugin-react": "^7.23.2",
"nodemon": "^3.1.9",
"prettier": "^1.19.1",
"serve": "^14.2.4"
"serve": "^14.2.4",
"prettier": "^1.19.1"
},
"keywords": [
"gatsby"

View file

@ -1,4 +1,4 @@
import React, { useMemo } from "react";
import React from "react";
import { makeStyles } from "@material-ui/styles";
import { Paper, Divider } from "@material-ui/core";
@ -6,7 +6,7 @@ import { MenuSolverControls } from "./MenuSolverControls";
import { MenuMetrics } from "./MenuMetrics";
import { OtherControls } from "./OtherControls";
import { MemoryUsage } from "./MemoryUsage";
import { useThemeContext } from "../context";
const useStyles = makeStyles(theme => ({
wrapper: {
overflowY: "auto",
@ -32,11 +32,6 @@ export const Menu = ({
}) => {
const classes = useStyles();
const { muiTheme, colorMode } = useThemeContext();
const backgroundStyle = useMemo(() =>
colorMode === "dark" ? "#101010" : "#ffffff",
[colorMode]
);
return (
<Paper classes={{ root: classes.wrapper }} style={{
@ -49,7 +44,6 @@ export const Menu = ({
padding: "15px",
borderRadius: "8px",
boxShadow: "2px 2px 10px rgba(0, 0, 0, 0.3)",
backgroundColor: backgroundStyle,
}}>
<MenuMetrics />
<Divider />

View file

@ -28,8 +28,8 @@ export const MenuMetrics = props => {
useEffect(() => {
if (startedRunningAt) {
const interval = setInterval(() => {
setRunningFor(Number(((Date.now() - startedRunningAt) / 1000).toFixed(3)));
}, 50);
setRunningFor(Math.floor((Date.now() - startedRunningAt) / 1000));
}, 1000);
return () => clearInterval(interval);
}
}, [startedRunningAt]);
@ -105,7 +105,7 @@ export const MenuMetrics = props => {
display="inline"
variant="button"
>
{runningFor.toFixed(3) || ""}
{runningFor || ""}
</Typography>
<Typography
classes={{ root: classes.unit }}

View file

@ -8,7 +8,7 @@ export const Navbar = () => {
justifyContent: 'space-between',
alignItems: 'center',
padding: '10px 20px',
backgroundColor: '#101010',
backgroundColor: '#333',
color: 'white',
position: 'fixed',
top: 0,

View file

@ -8,7 +8,7 @@ import orange from "@material-ui/core/colors/orange";
import { COLOR_MODE_KEY } from "../constants";
import { usePersistentState } from "../hooks";
export const ThemeContext = createContext();
export const ThemeContext = createContext();
export const ThemeContextProvider = props => {
const { children } = props;
@ -17,14 +17,12 @@ export const ThemeContextProvider = props => {
const muiTheme = useMemo(
() =>
createTheme({
createTheme({
palette: {
type: colorMode,
primary: blue,
secondary: orange,
// backgroundColor: colorMode === "dark" ? "#101010" : "#ffffff",
// background: colorMode === "dark" ? "#ffffff" : "#ffffff",
},
type: colorMode
}
}),
[colorMode]
);

View file

@ -9,7 +9,7 @@ const AboutPage = () => {
maxWidth: '900px',
margin: '80px auto 20px',
padding: '0 20px',
fontFamily: 'Inter, sans-serif',
fontFamily: 'Arial, sans-serif',
};
return (