Skip to content

Commit

Permalink
#68 Fixed some warning in console.
Browse files Browse the repository at this point in the history
  • Loading branch information
artzub committed Dec 29, 2020
1 parent 250ee55 commit 43120c2
Show file tree
Hide file tree
Showing 5 changed files with 130 additions and 75 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
"order": "asc",
"caseInsensitive": true
}
}]
}],
"react/forbid-component-props": [0]
}
}
1 change: 1 addition & 0 deletions config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ module.exports = function(webpackEnv) {
// Support React Native Web
// https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
'react-native': 'react-native-web',
'react-dom': '@hot-loader/react-dom',
// Allows for better profiling with ReactDevTools
...(isEnvProductionProfile && {
'react-dom$': 'react-dom/profiling',
Expand Down
53 changes: 28 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,18 @@
},
"devDependencies": {
"@babel/core": "7.8.4",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
"@babel/plugin-proposal-object-rest-spread": "^7.12.1",
"@babel/plugin-proposal-optional-chaining": "^7.12.7",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.12.1",
"@babel/plugin-proposal-object-rest-spread": "7.12.1",
"@babel/plugin-proposal-optional-chaining": "7.12.7",
"@hot-loader/react-dom": "16.12.0",
"@material-ui/core": "4.9.4",
"@material-ui/icons": "4.9.1",
"@material-ui/lab": "4.0.0-alpha.44",
"@octokit/auth-oauth-app": "^3.0.7",
"@octokit/auth-token": "^2.4.4",
"@octokit/graphql": "^4.5.8",
"@octokit/rest": "^18.0.12",
"@reduxjs/toolkit": "^1.5.0",
"@octokit/auth-oauth-app": "3.0.7",
"@octokit/auth-token": "2.4.4",
"@octokit/graphql": "4.5.8",
"@octokit/rest": "18.0.12",
"@reduxjs/toolkit": "1.5.0",
"@svgr/webpack": "4.3.3",
"@testing-library/jest-dom": "4.2.4",
"@testing-library/react": "9.3.2",
Expand All @@ -62,7 +63,7 @@
"babel-jest": "24.9.0",
"babel-loader": "8.0.6",
"babel-plugin-named-asset-import": "0.3.6",
"babel-plugin-styled-components": "^1.12.0",
"babel-plugin-styled-components": "1.12.0",
"babel-preset-react-app": "9.1.1",
"camelcase": "5.3.1",
"case-sensitive-paths-webpack-plugin": "2.3.0",
Expand Down Expand Up @@ -91,14 +92,15 @@
"identity-obj-proxy": "3.0.0",
"jest": "24.9.0",
"jest-environment-jsdom-fourteen": "1.0.1",
"jest-raw-loader": "^1.0.1",
"jest-raw-loader": "1.0.1",
"jest-resolve": "24.9.0",
"jest-watch-typeahead": "0.4.2",
"lint-staged": "^10.5.3",
"lodash.capitalize": "^4.2.1",
"lodash.map": "^4.6.0",
"lodash.throttle": "^4.1.1",
"mdi-react": "^7.4.0",
"lint-staged": "10.5.3",
"lodash.capitalize": "4.2.1",
"lodash.debounce": "^4.0.8",
"lodash.map": "4.6.0",
"lodash.throttle": "4.1.1",
"mdi-react": "7.4.0",
"mini-css-extract-plugin": "0.9.0",
"optimize-css-assets-webpack-plugin": "5.0.3",
"pnp-webpack-plugin": "1.6.0",
Expand All @@ -107,25 +109,26 @@
"postcss-normalize": "8.0.1",
"postcss-preset-env": "6.7.0",
"postcss-safe-parser": "4.0.1",
"pre-commit": "^1.2.2",
"prop-types": "^15.7.2",
"raw-loader": "^4.0.2",
"pre-commit": "1.2.2",
"prop-types": "15.7.2",
"raw-loader": "4.0.2",
"react": "16.12.0",
"react-app-polyfill": "1.0.6",
"react-dev-utils": "10.2.0",
"react-dom": "16.12.0",
"react-hot-loader": "^4.13.0",
"react-redux": "^7.2.2",
"react-hot-loader": "4.13.0",
"react-redux": "7.2.2",
"react-router-dom": "5.1.2",
"react-smooth-scrollbar": "^8.0.6",
"react-use": "^15.3.4",
"redux-devtools-extension": "^2.13.8",
"redux-saga": "^1.1.3",
"react-smooth-scrollbar": "8.0.6",
"react-use": "15.3.4",
"react-window": "^1.8.6",
"redux-devtools-extension": "2.13.8",
"redux-saga": "1.1.3",
"resolve": "1.15.0",
"resolve-url-loader": "3.1.1",
"sass-loader": "8.0.2",
"semver": "6.3.0",
"smooth-scrollbar": "^8.5.3",
"smooth-scrollbar": "8.5.3",
"style-loader": "0.23.1",
"styled-components": "5.0.1",
"terser-webpack-plugin": "2.3.4",
Expand Down
46 changes: 23 additions & 23 deletions src/themes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,31 @@ export const addTheme = (name, theme) => {
addTheme(light.name, light);
addTheme(dark.name, dark);

export const getTheme = (name) => {
const theme = createMuiTheme(themes[name] || themes.dark);
const GlobalStyle = createGlobalStyle`
html,
body {
margin: 0;
padding: 0;
width: 100vw;
height: 100vh;
overflow: hidden;
}
const GlobalStyle = createGlobalStyle`
html,
body {
margin: 0;
padding: 0;
width: 100vw;
height: 100vh;
overflow: hidden;
}
//body {
// font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
// 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
// sans-serif;
// -webkit-font-smoothing: antialiased;
// -moz-osx-font-smoothing: grayscale;
//}
//
//code {
// font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
//}
`;

//body {
// font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
// 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
// sans-serif;
// -webkit-font-smoothing: antialiased;
// -moz-osx-font-smoothing: grayscale;
//}
//
//code {
// font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
//}
`;
export const getTheme = (name) => {
const theme = createMuiTheme(themes[name] || themes.dark);

return {
theme,
Expand Down
Loading

0 comments on commit 43120c2

Please sign in to comment.