Skip to content

Fix login page #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 29, 2019
Merged

Fix login page #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9774e5f
Update readme
mroote Sep 23, 2018
9304c1f
Merge branch 'develop'
mroote Feb 27, 2019
57a5e4d
Merge branch 'fix-#123' into develop
knoxfighter Feb 28, 2019
9ed5146
Merge remote-tracking branch 'upstream/develop' into develop
knoxfighter Mar 2, 2019
98e7454
fixed login-page design
knoxfighter Mar 3, 2019
2b94eaf
missing login-designs
knoxfighter Mar 3, 2019
d82eb44
updated npm packages (w/o sweetalert2)
knoxfighter Mar 3, 2019
4b721bd
also updated sweetalert2
knoxfighter Mar 3, 2019
3b207fc
fixed sweetalert2 API changes
knoxfighter Mar 3, 2019
91bcf5c
updated npm dependencies
knoxfighter May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,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
Expand Down
44 changes: 22 additions & 22 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,35 @@
},
"homepage": "https://github.com/mroote/factorio-server-manager#readme",
"devDependencies": {
"@babel/core": "^7.2.2",
"@babel/preset-env": "^7.2.3",
"@babel/core": "^7.4.5",
"@babel/preset-env": "^7.4.5",
"@babel/preset-react": "^7.0.0",
"@fortawesome/fontawesome-free": "^5.6.3",
"@fortawesome/fontawesome-free": "^5.8.2",
"admin-lte": "^3.0.0-alpha.2",
"babel-loader": "^8.0.5",
"bootstrap": "^4.2.1",
"bootstrap-fileinput": "^4.5.2",
"babel-loader": "^8.0.6",
"bootstrap": "^4.3.1",
"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.6.2",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-native-listener": "^1.0.2",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1",
"resolve-url-loader": "^3.0.0",
"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",
"resolve-url-loader": "^3.1.0",
"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"
"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"
}
}
1 change: 0 additions & 1 deletion ui/App/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
});
Expand Down
80 changes: 35 additions & 45 deletions ui/App/components/LoginContent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down Expand Up @@ -30,54 +31,43 @@ class LoginContent extends React.Component {

render() {
return(
<div className="container ">
<div className="row">
<div className="absolute-center is-responsive">
<div className="col-centered col-md-4 col-mod-offset-2">
<div className="center-block">
<section className="content-header">
<h1>
Factorio Server Manager
<small>Login to manage Factorio</small>
</h1>
</section>

<section className="content">
<div className="row">
<div className="login-box-body">
<div className="container" id="login">
<div className="d-flex justify-content-center h-100">
<div className="card">
<div className="card-header">
<h1>
<img src="./images/factorio.jpg" className="img-circle" alt="User Image"/>
Factorio Server Manager
</h1>
</div>

<form onSubmit={this.loginUser}>
<div className="form-group has-feedback">
<input type="text" ref="username" className="form-control" placeholder="Username" />
<span className="fa fa-envelope form-control-feedback"></span>
</div>
<div className="form-group has-feedback">
<input type="password" ref="password" className="form-control" placeholder="Password" />
<span className="fa fa-lock form-control-feedback"></span>
</div>
<div className="row">
<div className="col-xs-8">
<div className="checkbox">
<label className="">
<div className="" aria-checked="false" aria-disabled="false" style={{position: "relative"}}>
<input type="checkbox"/>
</div> Remember Me
</label>
</div>
</div>
</div>
<div className="row">
<div className="col-xs-4">
<button type="submit" className="btn btn-primary btn-block btn-flat">Sign In</button>
</div>
</div>
</form>
<div className="car-body">
<form onSubmit={this.loginUser}>
<label className="input-group form-group">
<div className="input-group-prepend">
<span className="input-group-text">
<FontAwesomeIcon icon="user"/>
</span>
</div>
<input className="form-control" type="text" ref="username" placeholder="Username"/>
</label>

<a href="#">I forgot my password</a><br />
<label className="input-group form-group">
<div className="input-group-prepend">
<span className="input-group-text">
<FontAwesomeIcon icon="lock"/>
</span>
</div>
</div>
</section>
</div>
<input className="form-control" type="password" ref="password" placeholder="Password"/>
</label>

<label className="remember-me">
<input type="checkbox"/>&nbsp;
Remember me
</label>

<input type="submit" value="Sign In" className="btn btn-primary btn-block btn-flat"/>
</form>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/App/components/Mods/packs/ModPackOverview.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ui/App/components/ModsContent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion ui/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@
*/
@import "scss/pages/serverCtl";
@import "scss/pages/logs";
@import "scss/pages/saves";
@import "scss/pages/saves";
@import "scss/pages/login";
6 changes: 5 additions & 1 deletion ui/scss/customizations/form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
input.form-control {
border-radius: 0;
}
}

.input-group-text {
border-radius: 0;
}
22 changes: 22 additions & 0 deletions ui/scss/pages/login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
}
}