Skip to content

Commit

Permalink
Version upgrades (#7)
Browse files Browse the repository at this point in the history 
* Update dependencies

* null check on devices

* update dependencies
  • Loading branch information
@mstelz
mstelz authored Sep 18, 2019
1 parent 94ba519 commit 08d8880
Show file tree
Hide file tree
Showing 6 changed files with 3,878 additions and 13,181 deletions.
6,877 changes: 3,801 additions & 3,076 deletions controller/server/package-lock.json
View file

Large diffs are not rendered by default.

143 changes: 72 additions & 71 deletions controller/server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,112 +20,113 @@
"dependencies": {
"@coreui/coreui": "2.1.6",
"@coreui/icons": "0.3.0",
"@svgr/webpack": "4.1.0",
"@svgr/webpack": "4.3.2",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "10.0.1",
"babel-jest": "24.5.0",
"babel-plugin-named-asset-import": "0.3.1",
"babel-preset-react-app": "7.0.2",
"bfj": "6.1.1",
"babel-eslint": "10.0.3",
"babel-jest": "24.9.0",
"babel-plugin-named-asset-import": "0.3.3",
"babel-preset-react-app": "9.0.1",
"bfj": "7.0.1",
"bootstrap": "4.3.1",
"case-sensitive-paths-webpack-plugin": "2.2.0",
"chalk": "2.4.2",
"chart.js": "2.8.0",
"classnames": "2.2.6",
"core-js": "2.6.5",
"dotenv": "7.0.0",
"core-js": "^2.5.7",
"dotenv": "8.1.0",
"dotenv-expand": "5.1.0",
"element-closest": "3.0.1",
"enzyme": "3.9.0",
"enzyme-adapter-react-16": "1.11.2",
"eslint": "5.15.3",
"eslint-config-react-app": "3.0.8",
"eslint-loader": "2.1.2",
"eslint-plugin-flowtype": "3.4.2",
"eslint-plugin-import": "2.16.0",
"eslint-plugin-jsx-a11y": "6.2.1",
"eslint-plugin-react": "7.12.4",
"express": "4.16.4",
"enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.14.0",
"eslint": "6.4.0",
"eslint-config-react-app": "5.0.1",
"eslint-loader": "3.0.0",
"eslint-plugin-flowtype": "4.3.0",
"eslint-plugin-import": "2.18.2",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-react": "7.14.3",
"express": "4.17.1",
"flag-icon-css": "3.3.0",
"font-awesome": "4.7.0",
"fs-extra": "7.0.1",
"fs-extra": "8.1.0",
"html-webpack-plugin": "3.2.0",
"identity-obj-proxy": "3.0.0",
"imgur": "^0.3.1",
"jest": "24.5.0",
"jest": "24.9.0",
"jest-pnp-resolver": "1.2.1",
"jest-resolve": "24.5.0",
"mime": "2.4.0",
"mini-css-extract-plugin": "0.5.0",
"jest-resolve": "24.9.0",
"mime": "2.4.4",
"mini-css-extract-plugin": "0.8.0",
"moment": "2.24.0",
"moment-timezone": "0.5.23",
"moment-timezone": "0.5.26",
"noble": "1.9.1",
"node-cron": "^2.0.3",
"node-sass": "4.11.0",
"optimize-css-assets-webpack-plugin": "5.0.1",
"pi-camera": "^1.2.1",
"pnp-webpack-plugin": "1.4.1",
"node-sass": "4.12.0",
"optimize-css-assets-webpack-plugin": "5.0.3",
"pi-camera": "^1.3.0",
"pnp-webpack-plugin": "1.5.0",
"postcss-flexbugs-fixes": "4.1.0",
"postcss-loader": "3.0.0",
"postcss-preset-env": "6.6.0",
"postcss-preset-env": "6.7.0",
"postcss-safe-parser": "4.0.1",
"prop-types": "15.7.2",
"react": "16.8.4",
"react-app-polyfill": "0.2.2",
"react-chartjs-2": "2.7.4",
"react-dev-utils": "8.0.0",
"react-dom": "16.8.4",
"react": "16.9.0",
"react-app-polyfill": "1.0.2",
"react-chartjs-2": "2.7.6",
"react-dev-utils": "9.0.3",
"react-dom": "16.9.0",
"react-loadable": "5.5.0",
"react-moment": "0.8.4",
"react-moment": "0.9.2",
"react-onclickout": "2.0.8",
"react-perfect-scrollbar": "1.4.4",
"react-router-config": "5.0.0",
"react-router-dom": "5.0.0",
"react-test-renderer": "16.8.4",
"reactstrap": "7.1.0",
"resolve": "1.10.0",
"sass-loader": "7.1.0",
"react-perfect-scrollbar": "1.5.3",
"react-router-config": "5.0.1",
"react-router-dom": "5.0.1",
"react-test-renderer": "16.9.0",
"reactstrap": "8.0.1",
"resolve": "1.12.0",
"sass-loader": "8.0.0",
"simple-line-icons": "2.4.1",
"sqlite3": "4.0.6",
"terser-webpack-plugin": "1.2.3",
"url-loader": "1.1.2",
"sqlite3": "4.1.0",
"terser-webpack-plugin": "2.1.0",
"url-loader": "2.1.0",
"usb": "^1.6.0",
"webpack-manifest-plugin": "2.0.4",
"workbox-webpack-plugin": "4.1.1"
"workbox-webpack-plugin": "4.3.1"
},
"devDependencies": {
"@babel/core": "7.4.0",
"@babel/plugin-proposal-class-properties": "7.4.0",
"@babel/plugin-proposal-decorators": "7.4.0",
"@babel/plugin-proposal-do-expressions": "7.2.0",
"@babel/plugin-proposal-export-default-from": "7.2.0",
"@babel/plugin-proposal-export-namespace-from": "7.2.0",
"@babel/core": "7.6.0",
"@babel/plugin-proposal-class-properties": "7.5.5",
"@babel/plugin-proposal-decorators": "7.6.0",
"@babel/plugin-proposal-do-expressions": "7.6.0",
"@babel/plugin-proposal-export-default-from": "7.5.2",
"@babel/plugin-proposal-export-namespace-from": "7.5.2",
"@babel/plugin-proposal-function-bind": "7.2.0",
"@babel/plugin-proposal-function-sent": "7.2.0",
"@babel/plugin-proposal-function-sent": "7.5.0",
"@babel/plugin-proposal-json-strings": "7.2.0",
"@babel/plugin-proposal-logical-assignment-operators": "7.2.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.2.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.4.4",
"@babel/plugin-proposal-numeric-separator": "7.2.0",
"@babel/plugin-proposal-optional-chaining": "7.2.0",
"@babel/plugin-proposal-pipeline-operator": "7.3.2",
"@babel/plugin-proposal-optional-chaining": "7.6.0",
"@babel/plugin-proposal-pipeline-operator": "7.5.0",
"@babel/plugin-proposal-throw-expressions": "7.2.0",
"@babel/plugin-syntax-dynamic-import": "7.2.0",
"@babel/plugin-syntax-import-meta": "7.2.0",
"@babel/polyfill": "7.4.0",
"@babel/preset-env": "7.4.2",
"@babel/polyfill": "7.6.0",
"@babel/preset-env": "7.6.0",
"@babel/preset-react": "7.0.0",
"babel-loader": "8.0.5",
"babel-plugin-react-svg": "2.1.0",
"concurrently": "4.1.0",
"css-loader": "2.1.1",
"eslint-config-airbnb": "17.1.0",
"eslint-config-prettier": "4.1.0",
"eslint-plugin-prettier": "3.0.1",
"file-loader": "3.0.1",
"prettier": "1.16.4",
"style-loader": "0.23.1",
"webpack": "4.29.6",
"webpack-cli": "3.3.0",
"webpack-dev-server": "3.3.1"
"babel-loader": "8.0.6",
"babel-plugin-react-svg": "3.0.3",
"concurrently": "4.1.2",
"css-loader": "3.2.0",
"eslint-config-airbnb": "18.0.1",
"eslint-config-prettier": "6.3.0",
"eslint-plugin-prettier": "3.1.0",
"file-loader": "4.2.0",
"prettier": "1.18.2",
"style-loader": "1.0.0",
"webpack": "4.40.2",
"webpack-cli": "3.3.8",
"webpack-dev-server": "^3.8.1"
},
"proxy": "http://localhost:3000/",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion controller/server/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="manifest" href="public/manifest.json">
<link rel="shortcut icon" href="/favicon.ico">
<!--
Notice the use of %PUBLIC_URL% in the tags above.
Expand Down
2 changes: 1 addition & 1 deletion controller/server/src/client/src/views/Outlets/Outlets.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ class Outlets extends Component {
<option value="" disabled>
Please Select
</option>
{this.state.devices.map((val, i) => (
{this.state.devices && this.state.devices.map((val, i) => (
<option key={val.device_uuid} value={i}>
{val.name}
{i}
Expand Down
4 changes: 3 additions & 1 deletion controller/server/webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@ module.exports = {
{
loader: 'sass-loader',
options: {
includePaths: ['absolute/path/a', 'absolute/path/b'],
sassOptions: {
includePaths: ['absolute/path/a', 'absolute/path/b'],
}
},
},
],
Expand Down
Loading

0 comments on commit 08d8880

Please sign in to comment.