scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3536 from picklesrus/join-welcome-homepage

Browse source 
Take user to the homepage when finishing the join flow (unless they c…
This commit is contained in:
picklesrus 2019-11-15 13:17:19 -05:00 committed by GitHub
commit 6bf2f15ed7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/join-flow/welcome-step.jsx
View file

@ -50,7 +50,7 @@ class WelcomeStep extends React.Component {
innerClassName="join-flow-inner-welcome-step" innerClassName="join-flow-inner-welcome-step"
nextButton={this.props.createProjectOnComplete ? ( nextButton={this.props.createProjectOnComplete ? (
<React.Fragment> <React.Fragment>
<FormattedMessage id="registration.makeProject" /> <FormattedMessage id="general.getStarted" />
<img <img
className="join-flow-next-button-arrow" className="join-flow-next-button-arrow"
src="/svgs/project/r-arrow.svg" src="/svgs/project/r-arrow.svg"

5
src/redux/navigation.js
View file

@ -105,7 +105,10 @@ module.exports.handleRegistrationRequested = () => ({
module.exports.handleCompleteRegistration = createProject => (dispatch => { module.exports.handleCompleteRegistration = createProject => (dispatch => {
if (createProject) { if (createProject) {
window.location = '/projects/editor/?tutorial=getStarted'; // TODO: Ideally this would take you to the editor with the getting started
// tutorial open. We need to do some extra work to wait for the user
// to be logged in before we try creating a project due to replication lag.
window.location = '/';
} else { } else {
dispatch(sessionActions.refreshSession()); dispatch(sessionActions.refreshSession());
dispatch(module.exports.setRegistrationOpen(false)); dispatch(module.exports.setRegistrationOpen(false));