From 9774e5f85921d88d7b98851d9daec5c036243dc5 Mon Sep 17 00:00:00 2001 From: Mitch Roote Date: Sat, 22 Sep 2018 22:38:26 -0400 Subject: [PATCH 1/7] Update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 02a77127..b212574a 100644 --- a/README.md +++ b/README.md @@ -178,6 +178,7 @@ go build * **Mitch Roote** - [roote.ca](https://roote.ca) ## Special Thanks +- **[All Contributions]**(https://github.com/mroote/factorio-server-manager/graphs/contributors) - **mickael9** for reverseengineering the factorio-save-file: https://forums.factorio.com/viewtopic.php?f=5&t=8568# ## License From 98e7454745ddf1bd4365383712f12eae1439238d Mon Sep 17 00:00:00 2001 From: knoxfighter Date: Sun, 3 Mar 2019 01:25:00 +0100 Subject: [PATCH 2/7] fixed login-page design --- ui/App/components/LoginContent.jsx | 80 +++++++++++++----------------- ui/index.scss | 3 +- ui/scss/customizations/form.scss | 6 ++- 3 files changed, 42 insertions(+), 47 deletions(-) diff --git a/ui/App/components/LoginContent.jsx b/ui/App/components/LoginContent.jsx index 946dd370..947da44f 100644 --- a/ui/App/components/LoginContent.jsx +++ b/ui/App/components/LoginContent.jsx @@ -1,5 +1,6 @@ import React from 'react'; import {withRouter} from 'react-router-dom'; +import FontAwesomeIcon from "./FontAwesomeIcon"; class LoginContent extends React.Component { constructor(props) { @@ -30,54 +31,43 @@ class LoginContent extends React.Component { render() { return( -
-
-
-
-
-
-

- Factorio Server Manager - Login to manage Factorio -

-
- -
-
-
+
+
+
+
+

+ User Image + Factorio Server Manager +

+
-
-
- - -
-
- - -
-
-
-
- -
-
-
-
-
- -
-
-
+
+
+ - I forgot my password
+
-
-
+ + + + + + +
diff --git a/ui/index.scss b/ui/index.scss index 167b6761..4817d240 100644 --- a/ui/index.scss +++ b/ui/index.scss @@ -32,4 +32,5 @@ */ @import "scss/pages/serverCtl"; @import "scss/pages/logs"; -@import "scss/pages/saves"; \ No newline at end of file +@import "scss/pages/saves"; +@import "scss/pages/login"; diff --git a/ui/scss/customizations/form.scss b/ui/scss/customizations/form.scss index 3f48d4f6..e4cae73f 100644 --- a/ui/scss/customizations/form.scss +++ b/ui/scss/customizations/form.scss @@ -1,3 +1,7 @@ input.form-control { border-radius: 0; -} \ No newline at end of file +} + +.input-group-text { + border-radius: 0; +} From 2b94eaf8263e9979dfd81c3329ea55fbaa6525e4 Mon Sep 17 00:00:00 2001 From: knoxfighter Date: Sun, 3 Mar 2019 01:25:59 +0100 Subject: [PATCH 3/7] missing login-designs --- ui/scss/pages/login.scss | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 ui/scss/pages/login.scss diff --git a/ui/scss/pages/login.scss b/ui/scss/pages/login.scss new file mode 100644 index 00000000..d430ded1 --- /dev/null +++ b/ui/scss/pages/login.scss @@ -0,0 +1,22 @@ +#login { + .card { + border: none; + + .card-header h1 { + display: flex; + align-items: center; + + img { + width: 4rem; + } + } + + .remember-me { + @extend .row; + @extend .align-items-center; + + margin-left: 0; + margin-right: 0; + } + } +} From d82eb447d6cfbb67e8621331c7441dc035a7c6a1 Mon Sep 17 00:00:00 2001 From: knoxfighter Date: Sun, 3 Mar 2019 01:57:43 +0100 Subject: [PATCH 4/7] updated npm packages (w/o sweetalert2) --- package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 282cb2df..9a7a3bdc 100644 --- a/package.json +++ b/package.json @@ -24,13 +24,13 @@ }, "homepage": "https://github.com/mroote/factorio-server-manager#readme", "devDependencies": { - "@babel/core": "^7.2.2", - "@babel/preset-env": "^7.2.3", + "@babel/core": "^7.3.4", + "@babel/preset-env": "^7.3.4", "@babel/preset-react": "^7.0.0", - "@fortawesome/fontawesome-free": "^5.6.3", + "@fortawesome/fontawesome-free": "^5.7.2", "admin-lte": "^3.0.0-alpha.2", "babel-loader": "^8.0.5", - "bootstrap": "^4.2.1", + "bootstrap": "^4.3.1", "bootstrap-fileinput": "^4.5.2", "classnames": "^2.2.6", "css-loader": "^2.1.0", @@ -40,19 +40,19 @@ "mini-css-extract-plugin": "^0.5.0", "node-sass": "^4.11.0", "optimize-css-assets-webpack-plugin": "^5.0.1", - "prop-types": "^15.6.2", - "react": "^16.7.0", - "react-dom": "^16.7.0", + "prop-types": "^15.7.2", + "react": "^16.8.3", + "react-dom": "^16.8.3", "react-native-listener": "^1.0.2", "react-router": "^4.3.1", "react-router-dom": "^4.3.1", - "resolve-url-loader": "^3.0.0", + "resolve-url-loader": "^3.0.1", "sass-loader": "^7.1.0", "semver": "^5.6.0", "sweetalert2": "^7.33.1", "sweetalert2-react-content": "^1.0.1", - "webpack": "^4.28.4", - "webpack-cli": "^3.2.1", - "webpack-fix-style-only-entries": "0.1.0" + "webpack": "^4.29.6", + "webpack-cli": "^3.2.3", + "webpack-fix-style-only-entries": "^0.2.0" } } From 4b721bd8650286709a04570d2bbb2ea3149bea16 Mon Sep 17 00:00:00 2001 From: knoxfighter Date: Sun, 3 Mar 2019 02:10:58 +0100 Subject: [PATCH 5/7] also updated sweetalert2 --- package.json | 4 ++-- ui/App/App.jsx | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 9a7a3bdc..a86f1d05 100644 --- a/package.json +++ b/package.json @@ -49,8 +49,8 @@ "resolve-url-loader": "^3.0.1", "sass-loader": "^7.1.0", "semver": "^5.6.0", - "sweetalert2": "^7.33.1", - "sweetalert2-react-content": "^1.0.1", + "sweetalert2": "^8.2.6", + "sweetalert2-react-content": "^1.0.3", "webpack": "^4.29.6", "webpack-cli": "^3.2.3", "webpack-fix-style-only-entries": "^0.2.0" diff --git a/ui/App/App.jsx b/ui/App/App.jsx index d4c135bc..b27d923c 100644 --- a/ui/App/App.jsx +++ b/ui/App/App.jsx @@ -128,7 +128,6 @@ class App extends React.Component { url: "/api/server/facVersion", // dataType: "json", success: (data) => { - console.log(data); this.setState({ factorioVersion: data.data.base_mod_version }); From 3b207fc750180a4ee3da6ba15fc8474d9b47f2be Mon Sep 17 00:00:00 2001 From: knoxfighter Date: Sun, 3 Mar 2019 02:16:36 +0100 Subject: [PATCH 6/7] fixed sweetalert2 API changes --- ui/App/components/Mods/packs/ModPackOverview.jsx | 2 +- ui/App/components/ModsContent.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/App/components/Mods/packs/ModPackOverview.jsx b/ui/App/components/Mods/packs/ModPackOverview.jsx index e0be241a..9e16d98b 100644 --- a/ui/App/components/Mods/packs/ModPackOverview.jsx +++ b/ui/App/components/Mods/packs/ModPackOverview.jsx @@ -224,7 +224,7 @@ class ModPackOverview extends React.Component { if(updatesInProgress) { - ReactSwalNormal.fir({ + ReactSwalNormal.fire({ title: "Toggle mod failed", text: "Can't toggle the mod, when an update is still in progress", type: "error" diff --git a/ui/App/components/ModsContent.jsx b/ui/App/components/ModsContent.jsx index 83ea348e..c50318e9 100644 --- a/ui/App/components/ModsContent.jsx +++ b/ui/App/components/ModsContent.jsx @@ -336,7 +336,7 @@ class ModsContent extends React.Component { let $row = $button.parents("tr"); let modName = $row.data("mod-name"); - ReactSwalDanger({ + ReactSwalDanger.fire({ title: "Delete Mod?", text: "This will delete the mod and can break the save file", type: "question", From 91bcf5cf95e24e2e804c0a65d00325b22870daa4 Mon Sep 17 00:00:00 2001 From: knoxfighter Date: Wed, 29 May 2019 21:52:10 +0200 Subject: [PATCH 7/7] updated npm dependencies --- package.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index a86f1d05..85932f1e 100644 --- a/package.json +++ b/package.json @@ -24,35 +24,35 @@ }, "homepage": "https://github.com/mroote/factorio-server-manager#readme", "devDependencies": { - "@babel/core": "^7.3.4", - "@babel/preset-env": "^7.3.4", + "@babel/core": "^7.4.5", + "@babel/preset-env": "^7.4.5", "@babel/preset-react": "^7.0.0", - "@fortawesome/fontawesome-free": "^5.7.2", + "@fortawesome/fontawesome-free": "^5.8.2", "admin-lte": "^3.0.0-alpha.2", - "babel-loader": "^8.0.5", + "babel-loader": "^8.0.6", "bootstrap": "^4.3.1", - "bootstrap-fileinput": "^4.5.2", + "bootstrap-fileinput": "^5.0.3", "classnames": "^2.2.6", "css-loader": "^2.1.0", "file-loader": "^3.0.1", - "jquery": "^3.3.1", + "jquery": "^3.4.1", "locks": "^0.2.2", - "mini-css-extract-plugin": "^0.5.0", - "node-sass": "^4.11.0", + "mini-css-extract-plugin": "^0.7.0", + "node-sass": "^4.12.0", "optimize-css-assets-webpack-plugin": "^5.0.1", "prop-types": "^15.7.2", - "react": "^16.8.3", - "react-dom": "^16.8.3", - "react-native-listener": "^1.0.2", - "react-router": "^4.3.1", - "react-router-dom": "^4.3.1", - "resolve-url-loader": "^3.0.1", + "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", + "resolve-url-loader": "^3.1.0", "sass-loader": "^7.1.0", - "semver": "^5.6.0", - "sweetalert2": "^8.2.6", - "sweetalert2-react-content": "^1.0.3", - "webpack": "^4.29.6", - "webpack-cli": "^3.2.3", + "semver": "^6.1.1", + "sweetalert2": "^8.11.6", + "sweetalert2-react-content": "^1.1.0", + "webpack": "^4.32.2", + "webpack-cli": "^3.3.2", "webpack-fix-style-only-entries": "^0.2.0" } }