From 66faca83dac67d7a479a950f4db46cdcef925e2b Mon Sep 17 00:00:00 2001 From: knoxfighter Date: Mon, 29 Jul 2019 17:44:07 +0200 Subject: [PATCH 001/230] updated packages (broken admin-lte) --- package.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 85932f1..fa17c37 100644 --- a/package.json +++ b/package.json @@ -24,35 +24,35 @@ }, "homepage": "https://github.com/mroote/factorio-server-manager#readme", "devDependencies": { - "@babel/core": "^7.4.5", - "@babel/preset-env": "^7.4.5", + "@babel/core": "^7.5.5", + "@babel/preset-env": "^7.5.5", "@babel/preset-react": "^7.0.0", - "@fortawesome/fontawesome-free": "^5.8.2", - "admin-lte": "^3.0.0-alpha.2", + "@fortawesome/fontawesome-free": "^5.9.0", + "admin-lte": "^3.0.0-beta.1", "babel-loader": "^8.0.6", "bootstrap": "^4.3.1", - "bootstrap-fileinput": "^5.0.3", + "bootstrap-fileinput": "^5.0.4", "classnames": "^2.2.6", - "css-loader": "^2.1.0", - "file-loader": "^3.0.1", + "css-loader": "^3.1.0", + "file-loader": "^4.1.0", "jquery": "^3.4.1", "locks": "^0.2.2", - "mini-css-extract-plugin": "^0.7.0", + "mini-css-extract-plugin": "^0.8.0", "node-sass": "^4.12.0", - "optimize-css-assets-webpack-plugin": "^5.0.1", + "optimize-css-assets-webpack-plugin": "^5.0.3", "prop-types": "^15.7.2", "react": "^16.8.6", "react-dom": "^16.8.6", "react-native-listener": "^1.1.0", - "react-router": "^5.0.0", - "react-router-dom": "^5.0.0", + "react-router": "^5.0.1", + "react-router-dom": "^5.0.1", "resolve-url-loader": "^3.1.0", "sass-loader": "^7.1.0", - "semver": "^6.1.1", - "sweetalert2": "^8.11.6", + "semver": "^6.3.0", + "sweetalert2": "^8.14.0", "sweetalert2-react-content": "^1.1.0", - "webpack": "^4.32.2", - "webpack-cli": "^3.3.2", - "webpack-fix-style-only-entries": "^0.2.0" + "webpack": "^4.38.0", + "webpack-cli": "^3.3.6", + "webpack-fix-style-only-entries": "^0.3.0" } } From 81da54a1f778d02b430340ae530431dc31f83a22 Mon Sep 17 00:00:00 2001 From: knoxfighter Date: Wed, 31 Jul 2019 22:53:27 +0200 Subject: [PATCH 002/230] updated to admin-lte3.beta2 & test of card --- package.json | 4 +-- ui/App/components/Mods/ModOverview.jsx | 29 ++++++++++++--------- ui/App/components/Mods/search/ModSearch.jsx | 2 +- ui/index.js | 22 ++++++++-------- ui/index.scss | 1 + ui/scss/customizations/card.scss | 24 +++++++++++++++++ 6 files changed, 55 insertions(+), 27 deletions(-) create mode 100644 ui/scss/customizations/card.scss diff --git a/package.json b/package.json index fa17c37..0103721 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,8 @@ "@babel/core": "^7.5.5", "@babel/preset-env": "^7.5.5", "@babel/preset-react": "^7.0.0", - "@fortawesome/fontawesome-free": "^5.9.0", - "admin-lte": "^3.0.0-beta.1", + "@fortawesome/fontawesome-free": "^5.10.0", + "admin-lte": "^3.0.0-beta.2", "babel-loader": "^8.0.6", "bootstrap": "^4.3.1", "bootstrap-fileinput": "^5.0.4", diff --git a/ui/App/components/Mods/ModOverview.jsx b/ui/App/components/Mods/ModOverview.jsx index e4c5f2f..9df8e90 100644 --- a/ui/App/components/Mods/ModOverview.jsx +++ b/ui/App/components/Mods/ModOverview.jsx @@ -54,21 +54,24 @@ class ModOverview extends React.Component { render() { return(
-
-