diff --git a/server/index.js b/server/index.js index 2e9f906..d8f1f24 100644 --- a/server/index.js +++ b/server/index.js @@ -38,6 +38,7 @@ app.post('/recruitrequest', profiles.recruitRequest(connection)); app.post('/trainrequest', profiles.trainRequest(connection)); app.post('/untrainrequest', profiles.untrainRequest(connection)); app.post('/ladderrequest', profiles.ladderRequest(connection)); +app.post('/attackrequest', profiles.attackRequest(connection)); profiles.runGoldTick(connection); //static directories diff --git a/server/profiles.js b/server/profiles.js index 8ba6dba..013078e 100644 --- a/server/profiles.js +++ b/server/profiles.js @@ -366,6 +366,11 @@ const ladderRequest = (connection) => (req, res) => { }); } +const attackRequest = (connection) => (req, res) => { + res.status(400).write(log('Not yet implemented')); + res.end(); +} + const runGoldTick = (connection) => { let goldTickJob = new CronJob('0 */30 * * * *', () => { let query = 'UPDATE profiles SET gold = gold + recruits;'; @@ -386,5 +391,6 @@ module.exports = { trainRequest: trainRequest, untrainRequest: untrainRequest, ladderRequest: ladderRequest, + attackRequest: attackRequest, runGoldTick: runGoldTick } \ No newline at end of file diff --git a/src/actions/combat.js b/src/actions/combat.js new file mode 100644 index 0000000..1906331 --- /dev/null +++ b/src/actions/combat.js @@ -0,0 +1,8 @@ +export const SET_ATTACK_DISABLED = 'SET_ATTACK_DISABLED'; + +export function setAttackDisabled(disabled) { + return { + type: SET_ATTACK_DISABLED, + disabled: disabled + } +} \ No newline at end of file diff --git a/src/components/app.jsx b/src/components/app.jsx index fe6781b..afcb050 100644 --- a/src/components/app.jsx +++ b/src/components/app.jsx @@ -5,11 +5,37 @@ import Loadable from 'react-loadable'; //other stuff import Footer from './panels/footer.jsx'; -//lazy route loading +//lazy route loading (with error handling) const LazyRoute = (props) => { const component = Loadable({ loader: props.component, - loading: () =>
Loading...
{props.error}
+Timed Out
+Loading...
+Recruits:
{this.state.recruits}
- - +