diff --git a/public/styles/shared.css b/public/styles/shared.css index a659315..dd768bf 100644 --- a/public/styles/shared.css +++ b/public/styles/shared.css @@ -161,15 +161,15 @@ footer { } } -.panel.left, .panel.center { +.panel.right, .panel.center { align-items: center; } -.panel.left .warning, .panel.center .warning { +.panel.right .warning, .panel.center .warning { align-self: stretch; } -.panel.left form, .panel.center form { +.panel.right form, .panel.center form { flex: 1; display: flex; flex-direction: column; @@ -177,14 +177,14 @@ footer { align-self: stretch; } -.panel.left form button, .panel.center form button { +.panel.right form button, .panel.center form button { align-self: stretch; margin-top: .2em; margin-bottom: .2em; } @media screen and (max-width: 480px) { - .panel.left h1, .panel.center h1 { + .panel.right h1, .panel.center h1 { font-size: 16px; } } diff --git a/server/accounts.js b/server/accounts.js index d59b1f3..719164f 100644 --- a/server/accounts.js +++ b/server/accounts.js @@ -10,7 +10,7 @@ let sendmail = require('sendmail')(); let { log, validateEmail } = require('../common/utilities.js'); let { throttle, isThrottled } = require('../common/throttle.js'); -const signup = (connection) => (req, res) => { +const signupRequest = (connection) => (req, res) => { //formidable handles forms let form = formidable.IncomingForm(); @@ -66,7 +66,7 @@ const signup = (connection) => (req, res) => { if (err) throw err; //build the verification email - let addr = `http://${process.env.WEB_ADDRESS}/verify?email=${fields.email}&verify=${rand}`; + let addr = `http://${process.env.WEB_ADDRESS}/verifyrequest?email=${fields.email}&verify=${rand}`; let msg = 'Hello! Please visit the following address to verify your account: '; let msgHtml = `

${msg}${addr}

`; @@ -95,7 +95,7 @@ const signup = (connection) => (req, res) => { }); } -const verify = (connection) => (req, res) => { +const verifyRequest = (connection) => (req, res) => { //get the saved data let query = 'SELECT email, username, salt, hash, verify FROM signups WHERE email = ?;'; @@ -133,7 +133,7 @@ const verify = (connection) => (req, res) => { }); } -const login = (connection) => (req, res) => { +const loginRequest = (connection) => (req, res) => { //formidable handles forms let form = formidable.IncomingForm(); @@ -193,7 +193,7 @@ const login = (connection) => (req, res) => { }); } -const logout = (connection) => (req, res) => { +const logoutRequest = (connection) => (req, res) => { let query = 'DELETE FROM sessions WHERE sessions.accountId IN (SELECT accounts.id FROM accounts WHERE email = ?) AND token = ?;'; connection.query(query, [req.body.email, req.body.token], (err) => { if (err) throw err; @@ -203,7 +203,7 @@ const logout = (connection) => (req, res) => { res.end(); } -const passwordChange = (connection) => (req, res) => { +const passwordChangeRequest = (connection) => (req, res) => { //formidable handles forms let form = formidable.IncomingForm(); @@ -269,7 +269,7 @@ const passwordChange = (connection) => (req, res) => { }); } -const passwordRecover = (connection) => (req, res) => { +const passwordRecoverRequest = (connection) => (req, res) => { //formidable handles forms let form = formidable.IncomingForm(); @@ -339,7 +339,7 @@ const passwordRecover = (connection) => (req, res) => { }); } -const passwordReset = (connection) => (req, res) => { +const passwordResetRequest = (connection) => (req, res) => { //formidable handles forms let form = formidable.IncomingForm(); @@ -394,11 +394,11 @@ const passwordReset = (connection) => (req, res) => { } module.exports = { - signup: signup, - verify: verify, - login: login, - logout: logout, - passwordChange: passwordChange, - passwordRecover: passwordRecover, - passwordReset: passwordReset + signupRequest: signupRequest, + verifyRequest: verifyRequest, + loginRequest: loginRequest, + logoutRequest: logoutRequest, + passwordChangeRequest: passwordChangeRequest, + passwordRecoverRequest: passwordRecoverRequest, + passwordResetRequest: passwordResetRequest }; \ No newline at end of file diff --git a/server/index.js b/server/index.js index 1866ee8..2a5e1ef 100644 --- a/server/index.js +++ b/server/index.js @@ -23,20 +23,20 @@ let connection = connectToDatabase(); //uses .env //handle accounts let accounts = require('./accounts.js'); -app.post('/signup', accounts.signup(connection)); -app.get('/verify', accounts.verify(connection)); -app.post('/login', accounts.login(connection)); -app.post('/logout', accounts.logout(connection)); -app.post('/passwordchange', accounts.passwordChange(connection)); -app.post('/passwordrecover', accounts.passwordRecover(connection)); -app.post('/passwordreset', accounts.passwordReset(connection)); +app.post('/signuprequest', accounts.signupRequest(connection)); +app.get('/verifyrequest', accounts.verifyRequest(connection)); +app.post('/loginrequest', accounts.loginRequest(connection)); +app.post('/logoutrequest', accounts.logoutRequest(connection)); +app.post('/passwordchangerequest', accounts.passwordChangeRequest(connection)); +app.post('/passwordrecoverrequest', accounts.passwordRecoverRequest(connection)); +app.post('/passwordresetrequest', accounts.passwordResetRequest(connection)); //handle profiles let profiles = require('./profiles.js'); app.post('/profilerequest', profiles.profileRequest(connection)); -app.post('/recruit', profiles.recruit(connection)); -app.post('/train', profiles.train(connection)); -app.post('/untrain', profiles.untrain(connection)); +app.post('/recruitrequest', profiles.recruitRequest(connection)); +app.post('/trainrequest', profiles.trainRequest(connection)); +app.post('/untrainrequest', profiles.untrainRequest(connection)); app.post('/ladderrequest', profiles.ladderRequest(connection)); profiles.runGoldTick(connection); diff --git a/server/profiles.js b/server/profiles.js index ff483e4..8ba6dba 100644 --- a/server/profiles.js +++ b/server/profiles.js @@ -9,7 +9,7 @@ let CronJob = require('cron').CronJob; let { log } = require('../common/utilities.js'); //profile creation & requesting -const profileCreate = (connection) => (req, res) => { +const profileCreateRequest = (connection) => (req, res) => { //formidable handles forms let form = formidable.IncomingForm(); @@ -18,11 +18,11 @@ const profileCreate = (connection) => (req, res) => { if (err) throw err; //separate this section so it can be used elsewhere too - return profileCreateInner(connection, req, res, fields); + return profileCreateRequestInner(connection, req, res, fields); }); } -function profileCreateInner(connection, req, res, fields) { +function profileCreateRequestInner(connection, req, res, fields) { let query = 'SELECT accountId FROM profiles WHERE accountId IN (SELECT accounts.id FROM accounts WHERE username = ?);'; connection.query(query, [fields.username], (err, results) => { if (err) throw err; @@ -81,7 +81,7 @@ function profileRequestInner(connection, req, res, fields) { if (err) throw err; if (results.length === 1) { - return profileCreateInner(connection, req, res, fields); + return profileCreateRequestInner(connection, req, res, fields); } else { res.status(400).write(log('Profile not found', fields.username, fields.id, fields.token)); res.end(); @@ -104,7 +104,7 @@ function profileRequestInner(connection, req, res, fields) { } //actual actions to be taken -const recruit = (connection) => (req, res) => { +const recruitRequest = (connection) => (req, res) => { //formidable handles forms let form = formidable.IncomingForm(); @@ -178,7 +178,7 @@ const recruit = (connection) => (req, res) => { }); } -const train = (connection) => (req, res) => { +const trainRequest = (connection) => (req, res) => { //formidable handles forms let form = formidable.IncomingForm(); @@ -272,7 +272,7 @@ const train = (connection) => (req, res) => { }); } -const untrain = (connection) => (req, res) => { +const untrainRequest = (connection) => (req, res) => { //formidable handles forms let form = formidable.IncomingForm(); @@ -382,9 +382,9 @@ const runGoldTick = (connection) => { module.exports = { // profileCreate: profileCreate, //NOTE: Not actually used profileRequest: profileRequest, - recruit: recruit, - train: train, - untrain: untrain, - runGoldTick: runGoldTick, - ladderRequest: ladderRequest + recruitRequest: recruitRequest, + trainRequest: trainRequest, + untrainRequest: untrainRequest, + ladderRequest: ladderRequest, + runGoldTick: runGoldTick } \ No newline at end of file diff --git a/src/components/pages/password_reset.jsx b/src/components/pages/password_reset.jsx index 07893c5..6785d21 100644 --- a/src/components/pages/password_reset.jsx +++ b/src/components/pages/password_reset.jsx @@ -30,9 +30,9 @@ class PasswordReset extends React.Component { } return ( -
+
- Return Home + Return Home
); } diff --git a/src/components/pages/profile.jsx b/src/components/pages/profile.jsx index 94ba855..8b3d9eb 100644 --- a/src/components/pages/profile.jsx +++ b/src/components/pages/profile.jsx @@ -164,28 +164,28 @@ class Profile extends React.Component {

Recruits:

{this.state.recruits}

- +

Soldiers:

{this.state.soldiers}

- - + +

Spies:

{this.state.spies}

- - + +

Scientists:

{this.state.scientists}

- - + +
); diff --git a/src/components/panels/login.jsx b/src/components/panels/login.jsx index 6f80ccf..733e7dc 100644 --- a/src/components/panels/login.jsx +++ b/src/components/panels/login.jsx @@ -19,14 +19,14 @@ class Login extends React.Component { }; return ( -
+

Login

{this.state.warning}

-
this.submit(e)}> + this.submit(e)}>
diff --git a/src/components/panels/logout.jsx b/src/components/panels/logout.jsx index a848bc4..136dd6a 100644 --- a/src/components/panels/logout.jsx +++ b/src/components/panels/logout.jsx @@ -19,7 +19,7 @@ class Logout extends React.Component { //build the XHR let xhr = new XMLHttpRequest(); - xhr.open('POST', '/logout', true); + xhr.open('POST', '/logoutrequest', true); xhr.setRequestHeader('Content-Type', 'application/json; charset=UTF-8'); xhr.send(JSON.stringify({ email: this.props.email, diff --git a/src/components/panels/password_change.jsx b/src/components/panels/password_change.jsx index 3b4a3f5..c7d8d22 100644 --- a/src/components/panels/password_change.jsx +++ b/src/components/panels/password_change.jsx @@ -18,14 +18,14 @@ class PasswordChange extends React.Component { }; return ( -
+

Change Password

{this.state.warning}

- this.submit(e)}> + this.submit(e)}>
diff --git a/src/components/panels/password_recover.jsx b/src/components/panels/password_recover.jsx index af8cdab..2e72ccb 100644 --- a/src/components/panels/password_recover.jsx +++ b/src/components/panels/password_recover.jsx @@ -16,14 +16,14 @@ class PasswordRecover extends React.Component { }; return ( -
+

Recover Password

{this.state.warning}

- this.submit(e)}> + this.submit(e)}>
diff --git a/src/components/panels/password_reset.jsx b/src/components/panels/password_reset.jsx index acee2c8..46b012e 100644 --- a/src/components/panels/password_reset.jsx +++ b/src/components/panels/password_reset.jsx @@ -19,14 +19,14 @@ class PasswordReset extends React.Component { }; return ( -
+

Change Password

{this.state.warning}

- this.submit(e)}> + this.submit(e)}>
diff --git a/src/components/panels/signup.jsx b/src/components/panels/signup.jsx index d271f79..ccdd59d 100644 --- a/src/components/panels/signup.jsx +++ b/src/components/panels/signup.jsx @@ -19,14 +19,14 @@ export default class Signup extends React.Component { }; return ( -
+

Sign Up

{this.state.warning}

- this.submit(e)}> + this.submit(e)}>