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

Failed to commit these

Browse Source
This commit is contained in:
Kayne Ruse
2019-06-01 16:48:08 +10:00
parent f7698887b7
commit bdba64aed3
7 changed files with 65 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/pages/profile.jsx
+3 -3
View File
@@ -145,14 +145,14 @@ class Profile extends React.Component {
<p className='col'>Gold:</p>
<p className='col'>{this.props.profile.gold}</p>
<p className='col' style={{flex: '2 1 1%'}}>(+1 gold for each recruit every half hour)</p>
<p className='col truncate' style={{flex: '2 1 2%'}}>(+1 gold for each recruit every half hour)</p>
</div>
<div className='row'>
<p className='col'>Recruits:</p>
<p className='col'>{this.props.profile.recruits}</p>
<button className='col' style={{flex: '2 1 1%'}} onClick={ () => this.sendRequest('/recruitrequest') }>Recruit More Units</button>
<button className='col' style={{flex: '2 1 2%'}} onClick={ () => this.sendRequest('/recruitrequest') }>Recruit More Units</button>
</div>
<div className='row'>
@@ -224,7 +224,7 @@ class Profile extends React.Component {
<AttackButton
className='col'
style={{flex: '2 1 1%'}}
style={{flex: '2 1 2%'}}
setWarning={this.setWarning.bind(this)}
attacker={this.props.account.username}
defender={this.props.profile.username}
src/components/panels/equipment.jsx
+13 -13
View File
@@ -33,21 +33,21 @@ class Equipment extends React.Component {
<div className='panel'>
<div className='table'>
<div className='row'>
<p className='col centered'>Name</p>
<p className='col centered'>Type</p>
<p className='col centered'>Owned</p>
<p className='col centered'>Cost</p>
<p className='col centered'>Buy</p>
<p className='col centered'>Sell</p>
<p className='col centered truncate'>Name</p>
<p className='col centered truncate'>Type</p>
<p className='col centered truncate'>Owned</p>
<p className='col centered truncate'>Cost</p>
<p className='col centered truncate'>Buy</p>
<p className='col centered truncate'>Sell</p>
</div>
{Object.keys(display).map((key) => <div className='row' key={key}>
<p className='col centered'>{display[key].name}</p>
<p className='col centered'>{display[key].type}</p>
<p className='col centered'>{display[key].owned}</p>
<p className='col centered'>{display[key].cost}</p>
<button className='col centered' disabled={true || display[key].cost > this.props.gold}>+ Buy +</button>
<button className='col centered' disabled={true || display[key].owned === 0}>- Sell -</button>
<p className='col centered truncate'>{display[key].name}</p>
<p className='col centered truncate'>{display[key].type}</p>
<p className='col centered truncate'>{display[key].owned}</p>
<p className='col centered truncate'>{display[key].cost}</p>
{display[key].purchasable ? <button className='col centered truncate' disabled={true || display[key].cost > this.props.gold}>+ Buy +</button> : <div className='col centered truncate' />}
{display[key].saleable ? <button className='col centered truncate' disabled={true || display[key].owned === 0}>- Sell -</button> : <div className='col centered truncate' />}
</div>)}
</div>
</div>
@@ -106,7 +106,7 @@ class Equipment extends React.Component {
name: name,
type: type,
owned: (structure.owned && structure.owned[name]) || 0,
cost: structure.statistics[type][name].cost
...structure.statistics[type][name]
});
});
});
src/components/panels/paged_combat_log.jsx
+18 -18
View File
@@ -29,27 +29,27 @@ class PagedCombatLog extends React.Component {
return (
<div className='table'>
<div className='row'>
<p className='col centered'>When</p>
<p className='col centered'>Attacker</p>
<p className='col centered'>Defender</p>
<p className='col centered'>Attacking Force</p>
<p className='col centered'>Defending Force</p>
<p className='col centered'>Undefended?</p>
<p className='col centered'>Victor</p>
<p className='col centered'>Gold Transferred</p>
<p className='col centered'>Victor Casualties</p>
<p className='col centered badwrap'>When</p>
<p className='col centered badwrap'>Attacker</p>
<p className='col centered badwrap'>Defender</p>
<p className='col centered badwrap'>Attacking Force</p>
<p className='col centered badwrap'>Defending Force</p>
<p className='col centered badwrap'>Undefended?</p>
<p className='col centered badwrap'>Victor</p>
<p className='col centered badwrap'>Gold Stolen</p>
<p className='col centered badwrap'>Attacker Deaths</p>
</div>
{Object.keys(this.state).map((key) => <div key={key} className={'row'}>
<p className='col centered'>{ this.parseDate(this.state[key].eventTime) }</p>
<PrettyName className='col centered' name={this.state[key].attacker} />
<PrettyName className='col centered' name={this.state[key].defender} />
<p className='col centered'>{this.state[key].attackingUnits}</p>
<p className='col centered'>{this.state[key].defendingUnits}</p>
<p className='col centered'>{this.state[key].undefended ? 'yes' : 'no'}</p>
<p className='col centered'>{this.state[key].victor}</p>
<p className='col centered'>{this.state[key].spoilsGold}</p>
<p className='col centered'>{this.state[key].casualtiesVictor}</p>
<p className='col centered truncate'>{ this.parseDate(this.state[key].eventTime) }</p>
<PrettyName className='col centered truncate' name={this.state[key].attacker} />
<PrettyName className='col centered truncate' name={this.state[key].defender} />
<p className='col centered truncate'>{this.state[key].attackingUnits}</p>
<p className='col centered truncate'>{this.state[key].defendingUnits}</p>
<p className='col centered truncate'>{this.state[key].undefended ? 'yes' : 'no'}</p>
<p className='col centered truncate'>{this.state[key].victor}</p>
<p className='col centered truncate'>{this.state[key].spoilsGold}</p>
<p className='col centered truncate'>{this.state[key].attackerCasualties}</p>
</div>)}
</div>
);
src/components/panels/paged_ladder.jsx
+4 -4
View File
@@ -24,10 +24,10 @@ class PagedLadder extends React.Component {
<p className='col centered'>Gold</p>
</div>
{Object.keys(this.state).map((key) => <div key={key} className={'row'}>
<p className={'col centered'}><Link to={`/profile?username=${this.state[key].username}`}>{this.state[key].username}</Link></p>
<p className={'col centered'}>{this.state[key].soldiers}</p>
<p className={'col centered'}>{this.state[key].recruits}</p>
<p className={'col centered'}>{this.state[key].gold}</p>
<p className={'col centered truncate'}><Link to={`/profile?username=${this.state[key].username}`}>{this.state[key].username}</Link></p>
<p className={'col centered truncate'}>{this.state[key].soldiers}</p>
<p className={'col centered truncate'}>{this.state[key].recruits}</p>
<p className={'col centered truncate'}>{this.state[key].gold}</p>
</div> )}
</div>
);