codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-03-14 07:00:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Redirect students and teachers on sign in

Browse source 
Closes #3857
This commit is contained in:
Matt Lott 2016-08-17 09:38:43 -07:00
parent b647252956
commit 46e05e893b
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/views/core/AuthModal.coffee
View file

@ -51,7 +51,7 @@ module.exports = class AuthModal extends ModalView
return forms.applyErrorsToForm(@$el, res.errors) unless res.valid
new Promise(me.loginPasswordUser(userObject.emailOrUsername, userObject.password).then)
.then(->
if window.nextURL then window.location.href = window.nextURL else window.location.reload()
if window.nextURL then window.location.href = window.nextURL else loginNavigate()
)
.catch((jqxhr) =>
showingError = false
@ -85,7 +85,7 @@ module.exports = class AuthModal extends ModalView
existingUser.fetchGPlusUser(gplusAttrs.gplusID, {
success: =>
me.loginGPlusUser(gplusAttrs.gplusID, {
success: -> window.location.reload()
success: -> loginNavigate()
error: @onGPlusLoginError
})
error: @onGPlusLoginError
@ -116,7 +116,7 @@ module.exports = class AuthModal extends ModalView
existingUser.fetchFacebookUser(facebookAttrs.facebookID, {
success: =>
me.loginFacebookUser(facebookAttrs.facebookID, {
success: -> window.location.reload()
success: -> loginNavigate()
error: @onFacebookLoginError
})
error: @onFacebookLoginError
@ -148,3 +148,11 @@ formSchema = {
}
required: ['emailOrUsername', 'password']
}
loginNavigate = ->
if me.isStudent()
application.router.navigate('/courses', {trigger: true})
else if me.isTeacher()
application.router.navigate('/teachers/classes', {trigger: true})
window.location.reload()

6
app/views/core/CreateAccountModal/CreateAccountModal.coffee
View file

@ -123,7 +123,11 @@ module.exports = class CreateAccountModal extends ModalView
@once 'hidden', ->
if @signupState.get('accountCreated') and not application.testing
# ensure logged in state propagates through the entire app
document.location.reload()
if me.isStudent()
application.router.navigate('/courses', {trigger: true})
else if me.isTeacher()
application.router.navigate('/teachers/classes', {trigger: true})
window.location.reload()
onClickLoginLink: ->
@openModalView(new AuthModal({ initialValues: @signupState.get('authModalInitialValues') }))