Ratstail91/kingdombattles
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Got the BadgeText working

Browse Source
This commit is contained in:
Kayne Ruse
2019-06-08 13:33:09 +10:00
parent 2a27572562
commit 13ff97b1a2
9 changed files with 229 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/badges.js
+1 -24
View File
@@ -4,30 +4,7 @@ require('dotenv').config();
//utilities
let { log } = require('../common/utilities.js');
let { logActivity } = require('./utilities.js');
const getBadgesStatistics = (cb) => {
//TODO: apiVisible field
return cb(undefined, { 'statistics': require('./badge_statistics.json') });
};
const getBadgesOwned = (connection, id, cb) => {
let query = 'SELECT name, active FROM badges WHERE accountId = ?;';
connection.query(query, [id], (err, results) => {
if (err) throw err;
let ret = {}; //names, active
Object.keys(results).map((key) => {
if (ret[results[key].name] !== undefined) {
log('WARNING: Invalid database state, badges owned', id, JSON.stringify(results));
}
ret[results[key].name] = { active: results[key].active };
});
return cb(undefined, { 'owned': ret });
});
}
let { logActivity, getBadgesStatistics, getBadgesOwned } = require('./utilities.js');
const listRequest = (connection) => (req, res) => {
getBadgesStatistics((err, results) => {
server/profiles.js
+114 -49
View File
@@ -4,7 +4,7 @@ require('dotenv').config();
//libraries
let CronJob = require('cron').CronJob;
let { isAttacking, isSpying, logActivity } = require('./utilities.js');
let { getBadgesStatistics, getBadgesOwned, isAttacking, isSpying, logActivity } = require('./utilities.js');
//utilities
let { logDiagnostics } = require('./diagnostics.js');
@@ -77,17 +77,28 @@ function profileRequestInner(connection, req, res, body) {
}
});
} else {
//results.length === 1
res.status(200).json({
username: body.username,
gold: results[0].gold,
recruits: results[0].recruits,
soldiers: results[0].soldiers,
spies: results[0].spies,
scientists: results[0].scientists
getBadgesOwned(connection, results[0].accountId, (err, { owned }) => {
if (err) throw err;
getBadgesStatistics((err, { statistics }) => {
if (err) throw err;
let activeBadge = Object.keys(owned).find(name => owned[name].active) || null;
res.status(200).json({
username: body.username,
gold: results[0].gold,
recruits: results[0].recruits,
soldiers: results[0].soldiers,
spies: results[0].spies,
scientists: results[0].scientists,
activeBadge: activeBadge,
activeBadgeFilename: activeBadge ? statistics[activeBadge].filename : null
});
res.end();
log('Profile sent', body.username, body.id, body.token);
});
});
res.end();
log('Profile sent', body.username, body.id, body.token);
}
});
};
@@ -142,20 +153,31 @@ const recruitRequest = (connection) => (req, res) => {
return;
}
//results.length === 1
res.status(200).json({
username: results[0].username,
gold: results[0].gold,
recruits: results[0].recruits,
soldiers: results[0].soldiers,
spies: results[0].spies,
scientists: results[0].scientists
});
res.end();
getBadgesOwned(connection, results[0].accountId, (err, { owned }) => {
if (err) throw err;
log('Recruit successful', results[0].username, req.body.id, req.body.token);
logDiagnostics(connection, 'recruit', 1);
logActivity(connection, req.body.id);
getBadgesStatistics((err, { statistics }) => {
if (err) throw err;
let activeBadge = Object.keys(owned).find(name => owned[name].active) || null;
res.status(200).json({
username: results[0].username,
gold: results[0].gold,
recruits: results[0].recruits,
soldiers: results[0].soldiers,
spies: results[0].spies,
scientists: results[0].scientists,
activeBadge: activeBadge,
activeBadgeFilename: activeBadge ? statistics[activeBadge].filename : null
});
res.end();
log('Recruit successful', results[0].username, req.body.id, req.body.token);
logDiagnostics(connection, 'recruit', 1);
logActivity(connection, req.body.id);
});
});
});
});
});
@@ -250,18 +272,30 @@ const trainRequest = (connection) => (req, res) => {
return;
}
//results.length === 1
res.status(200).json({
username: results[0].username,
gold: results[0].gold,
recruits: results[0].recruits,
soldiers: results[0].soldiers,
spies: results[0].spies,
scientists: results[0].scientists
getBadgesOwned(connection, results[0].accountId, (err, { owned }) => {
if (err) throw err;
getBadgesStatistics((err, { statistics }) => {
if (err) throw err;
let activeBadge = Object.keys(owned).find(name => owned[name].active) || null;
res.status(200).json({
username: results[0].username,
gold: results[0].gold,
recruits: results[0].recruits,
soldiers: results[0].soldiers,
spies: results[0].spies,
scientists: results[0].scientists,
activeBadge: activeBadge,
activeBadgeFilename: activeBadge ? statistics[activeBadge].filename : null
});
res.end();
log('Train executed', results[0].username, req.body.role, req.body.id, req.body.token);
logActivity(connection, req.body.id);
});
});
res.end();
log('Train executed', results[0].username, req.body.role, req.body.id, req.body.token);
logActivity(connection, req.body.id);
});
});
});
@@ -363,18 +397,30 @@ const untrainRequest = (connection) => (req, res) => {
return;
}
//results.length === 1
res.status(200).json({
username: results[0].username,
gold: results[0].gold,
recruits: results[0].recruits,
soldiers: results[0].soldiers,
spies: results[0].spies,
scientists: results[0].scientists
getBadgesOwned(connection, results[0].accountId, (err, { owned }) => {
if (err) throw err;
getBadgesStatistics((err, { statistics }) => {
if (err) throw err;
let activeBadge = Object.keys(owned).find(name => owned[name].active) || null;
res.status(200).json({
username: results[0].username,
gold: results[0].gold,
recruits: results[0].recruits,
soldiers: results[0].soldiers,
spies: results[0].spies,
scientists: results[0].scientists,
activeBadge: activeBadge,
activeBadgeFilename: activeBadge ? statistics[activeBadge].filename : null
});
res.end();
log('Untrain executed', results[0].username, roleName, req.body.id, req.body.token);
logActivity(connection, req.body.id);
});
});
res.end();
log('Untrain executed', results[0].username, roleName, req.body.id, req.body.token);
logActivity(connection, req.body.id);
});
});
});
@@ -384,12 +430,31 @@ const untrainRequest = (connection) => (req, res) => {
};
const ladderRequest = (connection) => (req, res) => {
let query = 'SELECT username, soldiers, recruits, gold FROM accounts JOIN profiles ON accounts.id = profiles.accountId ORDER BY soldiers DESC, recruits DESC, gold DESC LIMIT ?, ?;';
let query = 'SELECT accounts.id AS id, username, soldiers, recruits, gold FROM accounts JOIN profiles ON accounts.id = profiles.accountId ORDER BY soldiers DESC, recruits DESC, gold DESC LIMIT ?, ?;';
connection.query(query, [req.body.start, req.body.length], (err, results) => {
if (err) throw err;
res.status(200).json(results);
log('Ladder sent', req.body.start, req.body.length, results);
getBadgesStatistics((err, { statistics }) => {
if (err) throw err;
for(let i = 0; i < results.length; i++) {
getBadgesOwned(connection, results[i].id, (err, { owned }) => {
if (err) throw err;
results[i].activeBadge = Object.keys(owned).find(name => owned[name].active) || null;
results[i].activeBadgeUrl = results[i].activeBadge ? statistics[results[i].activeBadge].filename : null;
//don't share IDs
delete results[i].id;
//weird, because of async
if (i + 1 === results.length) {
res.status(200).json(results);
log('Ladder sent', req.body.start, req.body.length, results);
}
});
}
});
});
};
server/utilities.js
+25
View File
@@ -27,6 +27,29 @@ const getEquipmentOwned = (connection, id, cb) => {
});
};
const getBadgesStatistics = (cb) => {
//TODO: apiVisible field
return cb(undefined, { 'statistics': require('./badge_statistics.json') });
};
const getBadgesOwned = (connection, id, cb) => {
let query = 'SELECT name, active FROM badges WHERE accountId = ?;';
connection.query(query, [id], (err, results) => {
if (err) throw err;
let ret = {}; //names, active
Object.keys(results).map((key) => {
if (ret[results[key].name] !== undefined) {
log('WARNING: Invalid database state, badges owned', id, JSON.stringify(results));
}
ret[results[key].name] = { active: results[key].active };
});
return cb(undefined, { 'owned': ret });
});
}
const isNormalInteger = (str) => {
let n = Math.floor(Number(str));
return n !== Infinity && String(n) == str && n >= 0;
@@ -96,6 +119,8 @@ const logActivity = (connection, id) => {
module.exports = {
getEquipmentStatistics: getEquipmentStatistics,
getEquipmentOwned: getEquipmentOwned,
getBadgesStatistics: getBadgesStatistics,
getBadgesOwned: getBadgesOwned,
isAttacking: isAttacking,
isSpying: isSpying,
logActivity: logActivity
src/actions/profile.js
+20 -2
View File
@@ -5,9 +5,11 @@ export const STORE_RECRUITS = 'STORE_RECRUITS';
export const STORE_SOLDIERS = 'STORE_SOLDIERS';
export const STORE_SPIES = 'STORE_SPIES';
export const STORE_SCIENTISTS = 'STORE_SCIENTISTS';
export const STORE_ACTIVE_BADGE = 'STORE_ACTIVE_BADGE';
export const STORE_ACTIVE_BADGE_FILENAME = 'STORE_ACTIVE_BADGE_FILENAME';
export const CLEAR_PROFILE = 'CLEAR_PROFILE';
export const storeProfile = (username, gold, recruits, soldiers, spies, scientists) => {
export const storeProfile = (username, gold, recruits, soldiers, spies, scientists, activeBadge, activeBadgeFilename) => {
return {
type: STORE_PROFILE,
username: username,
@@ -15,7 +17,9 @@ export const storeProfile = (username, gold, recruits, soldiers, spies, scientis
recruits: recruits,
soldiers: soldiers,
spies: spies,
scientists: scientists
scientists: scientists,
activeBadge: activeBadge,
activeBadgeFilename: activeBadgeFilename
};
}
@@ -61,6 +65,20 @@ export const storeScientists = (scientists) => {
};
}
export const storeActiveBadge = (activeBadge) => {
return {
tpye: STORE_ACTIVE_BADGE,
activeBadge: activeBadge
};
}
export const storeActiveBadgeFilename = (activeBadgeFilename) => {
return {
tpye: STORE_ACTIVE_BADGE,
activeBadgeFilename: activeBadgeFilename
};
}
export const clearProfile = () => {
return {
type: CLEAR_PROFILE
src/components/pages/profile.jsx
+8 -5
View File
@@ -10,6 +10,7 @@ import { storeProfile, clearProfile } from '../../actions/profile.js';
import CommonLinks from '../panels/common_links.jsx';
import AttackButton from '../panels/attack_button.jsx';
import Markdown from '../panels/markdown.jsx';
import BadgeText from '../panels/badge_text.jsx';
class Profile extends React.Component {
constructor(props) {
@@ -103,7 +104,9 @@ class Profile extends React.Component {
json.recruits,
json.soldiers,
json.spies,
json.scientists
json.scientists,
json.activeBadge,
json.activeBadgeFilename
);
}
else if (xhr.status === 400) {
@@ -136,7 +139,7 @@ class Profile extends React.Component {
<div className='table noCollapse'>
<div className='row'>
<p className='col'>Username:</p>
<p className='col'>{this.props.profile.username}</p>
<BadgeText name={this.props.profile.activeBadge} filename={this.props.profile.activeBadgeFilename} size={'small'} className='col'>{this.props.profile.username}</BadgeText>
<div className='col'></div>
<div className='col'></div>
@@ -209,7 +212,7 @@ class Profile extends React.Component {
<div className='table noCollapse'>
<div className='row'>
<p className='col'>Username:</p>
<p className='col'>{this.props.profile.username}</p>
<BadgeText name={this.props.profile.activeBadge} filename={this.props.profile.activeBadgeFilename} size={'small'} className='col'>{this.props.profile.username}</BadgeText>
<div className='col' />
<div className='col' />
@@ -294,7 +297,7 @@ class Profile extends React.Component {
<div className='table noCollapse'>
<div className='row'>
<p className='col'>Username:</p>
<p className='col'>{this.props.profile.username}</p>
<BadgeText name={this.props.profile.activeBadge} filename={this.props.profile.activeBadgeFilename} size={'small'} className='col'>{this.props.profile.username}</BadgeText>
<div className='col' />
<div className='col' />
@@ -366,7 +369,7 @@ const mapStoreToProps = (store) => {
const mapDispatchToProps = (dispatch) => {
return {
storeProfile: (username, gold, recruits, soldiers, spies, scientists) => dispatch(storeProfile(username, gold, recruits, soldiers, spies, scientists)),
storeProfile: (username, gold, recruits, soldiers, spies, scientists, activeBadge, activeBadgeFilename) => dispatch(storeProfile(username, gold, recruits, soldiers, spies, scientists, activeBadge, activeBadgeFilename)),
clearProfile: () => dispatch(clearProfile())
};
};
src/components/panels/badge.jsx
+6 -2
View File
@@ -10,6 +10,10 @@ class Badge extends React.Component {
}
render() {
if (!this.props.filename) {
return null;
}
let realSize = typeof(this.props.size) === 'number' ? this.props.number : this.parseSize(this.props.size);
return (
@@ -18,8 +22,8 @@ class Badge extends React.Component {
}
parseSize(sizeString) {
if (sizeString === 'small') return 12;
if (sizeString === 'medium') return 20;
if (sizeString === 'small') return 20;
if (sizeString === 'medium') return 50;
return 100;
}
};
src/components/panels/badge_text.jsx
+33
View File
@@ -0,0 +1,33 @@
import React from 'react';
import Badge from './badge.jsx';
class BadgeText extends React.Component {
render() {
if (!this.props.filename) {
return (
<p {...this.props}>{this.props.children}</p>
);
}
let centerStyle = {
display: 'flex',
justifyContent: 'center',
alignItems: 'center'
};
let leftStyle = {
display: 'flex'
};
let style = this.props.centered ? centerStyle : leftStyle;
return (
<div {...this.props} style={{...style, paddingBottom: '0.5em'}}>
<Badge name={this.props.name} filename={this.props.filename} size={this.props.size} />
<p style={{paddingBottom: 0}}>{this.props.children}</p>
</div>
);
}
};
export default BadgeText;
src/components/panels/paged_ladder.jsx
+7 -6
View File
@@ -2,6 +2,7 @@ import React from 'react';
import { withRouter, Link } from 'react-router-dom';
import PropTypes from 'prop-types';
import BadgeText from './badge_text.jsx';
import ProgressiveRainbowText from './progressive_rainbow_text.jsx';
class PagedLadder extends React.Component {
@@ -28,12 +29,12 @@ class PagedLadder extends React.Component {
{Object.keys(this.state).map((key) =><div key={key}>
<hr />
<div className='break' />
<div className={'row'}>
{
this.state[key].username === 'Ratstail91' ?
<Link to={`/profile?username=${this.state[key].username}`} className={'col centered truncate'}><ProgressiveRainbowText>{this.state[key].username}</ProgressiveRainbowText></Link> :
<Link to={`/profile?username=${this.state[key].username}`} className={'col centered truncate'}><p>{this.state[key].username}</p></Link>
}
<div className={'row'} style={{display: 'flex', justifyContent: 'center', alignItems: 'center'}}>
<Link className='col centered truncate' to={`/profile?username=${this.state[key].username}`}>
<BadgeText name={this.state[key].activeBadge} filename={this.state[key].activeBadgeUrl} size={'small'} centered={true}>{this.state[key].username}</BadgeText>
</Link>
<p className={'col centered truncate'}><span className='mobile show' style={{whiteSpace: 'pre'}}>Soldiers: </span>{this.state[key].soldiers}</p>
<p className={'col centered truncate'}><span className='mobile show' style={{whiteSpace: 'pre'}}>Recruits: </span>{this.state[key].recruits}</p>
<p className={'col centered truncate'}><span className='mobile show' style={{whiteSpace: 'pre'}}>Gold: </span>{this.state[key].gold}</p>
src/reducers/profile.js
+15 -1
View File
@@ -6,6 +6,8 @@ import {
STORE_SOLDIERS,
STORE_SPIES,
STORE_SCIENTISTS,
STORE_ACTIVE_BADGE,
STORE_ACTIVE_BADGE_FILENAME,
CLEAR_PROFILE
} from '../actions/profile.js';
@@ -15,7 +17,9 @@ const initialStore = {
recruits: 0,
soldiers: 0,
spies: 0,
scientists: 0
scientists: 0,
activeBadge: '',
activeBadgeFilename: ''
};
export const profileReducer = (store = initialStore, action) => {
@@ -29,6 +33,8 @@ export const profileReducer = (store = initialStore, action) => {
newStore.soldiers = action.soldiers;
newStore.spies = action.spies;
newStore.scientists = action.scientists;
newStore.activeBadge = action.activeBadge;
newStore.activeBadgeFilename = action.activeBadgeFilename;
break;
case STORE_USERNAME:
@@ -55,6 +61,14 @@ export const profileReducer = (store = initialStore, action) => {
newStore.scientists = action.scientists;
break;
case STORE_ACTIVE_BADGE:
newStore.activeBadge = action.activeBadge;
break;
case STORE_ACTIVE_BADGE_FILENAME:
newStore.activeBadgeFilename = action.activeBadgeFilename;
break;
case CLEAR_PROFILE:
newStore = JSON.parse(JSON.stringify(initialStore));
break;