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

Refactoring, smoothed out button visibility

Browse Source
This commit is contained in:
Kayne Ruse
2019-05-20 01:00:49 +10:00
parent 9bae98e055
commit fd0b60a589
1 changed files with 111 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/pages/profile.jsx
+111 -54
View File
@@ -48,63 +48,17 @@ class Profile extends React.Component {
//main panel //main panel
let MainPanel; let MainPanel;
if (this.state.username != '') { if (this.state.username === this.props.username && this.state.username !== '') {
MainPanel = () => { MainPanel = this.MyProfileMainPanel.bind(this);
return (
<div className='table'>
<div className='row'>
<p className='col'>Username:</p>
<p className='col'>{this.state.username}</p>
<div className='col'></div>
<div className='col'></div>
</div>
<div className='row'>
<p className='col'>Gold:</p>
<p className='col'>{this.state.gold}</p>
<div className='col'></div>
<div className='col'></div>
</div>
<div className='row'>
<p className='col'>Recruits:</p>
<p className='col'>{this.state.recruits}</p>
<button className='col' style={{flex: '2 1 1.5%'}}>Get More...</button>
</div>
<div className='row'>
<p className='col'>Soldiers:</p>
<p className='col'>{this.state.soldiers}</p>
<button className='col'>Train</button>
<button className='col'>Untrain</button>
</div>
<div className='row'>
<p className='col'>Spies:</p>
<p className='col'>{this.state.spies}</p>
<button className='col'>Train</button>
<button className='col'>Untrain</button>
</div>
<div className='row'>
<p className='col'>Scientists:</p>
<p className='col'>{this.state.scientists}</p>
<button className='col'>Train</button>
<button className='col'>Untrain</button>
</div>
</div>
);
}
} else { } else {
MainPanel = () => { if (this.state.username !== '') {
return ( MainPanel = this.NotMyProfileMainPanel.bind(this);
<div> } else {
<p>No profile found!</p> MainPanel = this.ProfileNotFoundMainPanel.bind(this);
</div>
);
} }
} }
//finally
return ( return (
<div className='page'> <div className='page'>
<h1 style={{textAlign: 'center', fontSize: '50px', margin: '30px'}}>KINGDOM BATTLES!</h1> <h1 style={{textAlign: 'center', fontSize: '50px', margin: '30px'}}>KINGDOM BATTLES!</h1>
@@ -199,17 +153,112 @@ class Profile extends React.Component {
); );
} }
MyProfileMainPanel() {
return (
<div className='table'>
<div className='row'>
<p className='col'>Username:</p>
<p className='col'>{this.state.username}</p>
<div className='col'></div>
<div className='col'></div>
</div>
<div className='row'>
<p className='col'>Gold:</p>
<p className='col'>{this.state.gold}</p>
<div className='col'></div>
<div className='col'></div>
</div>
<div className='row'>
<p className='col'>Recruits:</p>
<p className='col'>{this.state.recruits}</p>
<button className='col' style={{flex: '2 1 1.5%'}}>Get More...</button>
</div>
<div className='row'>
<p className='col'>Soldiers:</p>
<p className='col'>{this.state.soldiers}</p>
<button className='col'>Train</button>
<button className='col'>Untrain</button>
</div>
<div className='row'>
<p className='col'>Spies:</p>
<p className='col'>{this.state.spies}</p>
<button className='col'>Train</button>
<button className='col'>Untrain</button>
</div>
<div className='row'>
<p className='col'>Scientists:</p>
<p className='col'>{this.state.scientists}</p>
<button className='col'>Train</button>
<button className='col'>Untrain</button>
</div>
</div>
);
}
NotMyProfileSidePanel() { NotMyProfileSidePanel() {
//finally return the side panel //finally return the side panel
return ( return (
<div className='sidePanel'> <div className='sidePanel'>
<p>Return <Link to='/'>home</Link></p> <p>Return <Link to='/'>home</Link></p>
<p>Go to <Link to='/profile' onClick={(e) => { e.preventDefault(); this.requestProfileData(this.props.username); this.props.history.push('/profile'); }}>your profile</Link></p> <p>Go to <Link to='/profile' onClick={(e) => { e.preventDefault(); this.requestProfileData(this.props.username); this.setWarning(''); this.props.history.push('/profile'); }}>your profile</Link></p>
<Logout onClick={(e) => this.props.history.push('/')} /> <Logout onClick={(e) => this.props.history.push('/')} />
</div> </div>
); );
} }
NotMyProfileMainPanel() {
return (
<div className='table'>
<div className='row'>
<p className='col'>Username:</p>
<p className='col'>{this.state.username}</p>
<div className='col'></div>
<div className='col'></div>
</div>
<div className='row'>
<p className='col'>Gold:</p>
<p className='col'>{this.state.gold}</p>
<div className='col'></div>
<div className='col'></div>
</div>
<div className='row'>
<p className='col'>Recruits:</p>
<p className='col'>{this.state.recruits}</p>
<div className='col'></div>
<div className='col'></div>
</div>
<div className='row'>
<p className='col'>Soldiers:</p>
<p className='col'>{this.state.soldiers}</p>
<div className='col'></div>
<div className='col'></div>
</div>
<div className='row'>
<p className='col'>Spies:</p>
<p className='col'>{this.state.spies}</p>
<div className='col'></div>
<div className='col'></div>
</div>
<div className='row'>
<p className='col'>Scientists:</p>
<p className='col'>{this.state.scientists}</p>
<div className='col'></div>
<div className='col'></div>
</div>
</div>
);
}
LoggedOutSidePanel() { LoggedOutSidePanel() {
return ( return (
<div className='sidePanel'> <div className='sidePanel'>
@@ -218,6 +267,14 @@ class Profile extends React.Component {
); );
} }
ProfileNotFoundMainPanel() {
return (
<div>
<p>No profile found!</p>
</div>
);
}
setWarning(s) { setWarning(s) {
this.setState({ this.setState({
warning: s warning: s