Skip to content

Implement switch soldier #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implement switch soldier #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bf0de0
Implement switch soldier
FlashHit Sep 28, 2022
6bb7649
Merge branch 'master' into feature/switch-soldier
FlashHit Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/popups/LogoutQuitConfirmationPopup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class LogoutQuitConfirmationPopup extends Component
<h1>Logout & Quit</h1>
<p>Are you sure you want to log out and quit?</p>
<a href="#" className="btn border-btn" onClick={this.onClosePopup.bind(this)}>Cancel</a>
<a href="#" className="btn border-btn primary" onClick={this.onSwitchSoldier.bind(this)}>Switch Soldier</a>
<a href="#" className="btn border-btn primary" onClick={this.onConfirmQuit.bind(this)}>Logout & Quit</a>
</div>
</div>
Expand All @@ -27,6 +28,15 @@ class LogoutQuitConfirmationPopup extends Component
WebUI.Call('LogoutQuit');
}

onSwitchSoldier(e)
{
if (e)
e.preventDefault();

this.props.closePopup();
WebUI.Call('LogoutPlayer');
}

onClosePopup(e)
{
if (e)
Expand Down
9 changes: 9 additions & 0 deletions app/reducers/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,15 @@ export default function user(state = initialState, action)
hashHistory.push('/main-menu');
}, 50);
}
else if(finalState.loginStatus === LoginStatus.LOGGED_IN &&
finalState.playerLoginStatus === PlayerLoginStatus.LOGGED_OUT &&
finalState.user !== null &&
finalState.players !== null)
{
setTimeout(function() {
hashHistory.push('/players');
}, 50);
}

return finalState;
}
Expand Down