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 #3295 from benjiwheeler/join-flow-create-project

Browse source 
on complete join flow, take user to new project
This commit is contained in:
Benjamin Wheeler 2019-08-26 15:40:29 -04:00 committed by GitHub
commit 008f600d99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/navigation/www/navigation.jsx
View file

@ -217,6 +217,7 @@ class Navigation extends React.Component {
{this.props.registrationOpen && ( {this.props.registrationOpen && (
this.props.useScratch3Registration ? ( this.props.useScratch3Registration ? (
<Scratch3Registration <Scratch3Registration
createProjectOnComplete
isOpen isOpen
key="scratch3registration" key="scratch3registration"
/> />

9
src/components/registration/scratch3-registration.jsx
View file

@ -23,17 +23,22 @@ const Registration = ({
); );
Registration.propTypes = { Registration.propTypes = {
createProjectOnComplete: PropTypes.bool,
handleCloseRegistration: PropTypes.func, handleCloseRegistration: PropTypes.func,
handleCompleteRegistration: PropTypes.func, handleCompleteRegistration: PropTypes.func,
isOpen: PropTypes.bool isOpen: PropTypes.bool
}; };
const mapDispatchToProps = dispatch => ({ Registration.defaultProps = {
createProjectOnComplete: false
};
const mapDispatchToProps = (dispatch, ownProps) => ({
handleCloseRegistration: () => { handleCloseRegistration: () => {
dispatch(navigationActions.setRegistrationOpen(false)); dispatch(navigationActions.setRegistrationOpen(false));
}, },
handleCompleteRegistration: () => { handleCompleteRegistration: () => {
dispatch(navigationActions.handleCompleteRegistration()); dispatch(navigationActions.handleCompleteRegistration(ownProps.createProjectOnComplete));
} }
}); });

3
src/redux/navigation.js
View file

@ -92,9 +92,10 @@ module.exports.setSearchTerm = searchTerm => ({
searchTerm: searchTerm searchTerm: searchTerm
}); });
module.exports.handleCompleteRegistration = () => (dispatch => { module.exports.handleCompleteRegistration = createProject => (dispatch => {
dispatch(sessionActions.refreshSession()); dispatch(sessionActions.refreshSession());
dispatch(module.exports.setRegistrationOpen(false)); dispatch(module.exports.setRegistrationOpen(false));
if (createProject) window.location = '/projects/editor/?tutorial=getStarted';
}); });
module.exports.handleLogIn = (formData, callback) => (dispatch => { module.exports.handleLogIn = (formData, callback) => (dispatch => {