password reset email; also sends email

6 files changed, 38 insertions, 3 deletions

diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index 3662d7b..b1d3dfb 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -120,5 +120,5 @@ MX.Youtube = MX.Object3D.extend({
 })
 
 window.onYouTubePlayerAPIReady = function(){
-	console.log("youtube ready")
+	// console.log("youtube ready")
 }
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index 6d41d5b..fdeafd5 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -5,6 +5,7 @@ var SiteRouter = Router.extend({
 	events: {
 		"click [data-role='show-signup-modal']": 'signup',
 		"click [data-role='show-signin-modal']": 'signin',
+		"click [data-role='forgot-password']": 'passwordForgot',
 		"click [data-role='new-project-modal']": 'newProject',
 		"click [data-role='edit-project-modal']": 'editProject',
 		"click [data-role='edit-profile-modal']": 'editProfile',
@@ -18,6 +19,11 @@ var SiteRouter = Router.extend({
 	routes: {
 		"/login":               'signin',
 		"/signup":              'signup',
+
+		"/auth/usernameTaken":  'usernameTaken',
+		"/auth/password":       'passwordReset',
+		"/auth/forgotPassword": 'passwordForgot',
+
 		"/profile":             'profile',
 		"/profile/edit":        'editProfile',
 		"/about/:name/edit":    'editDocument',
@@ -40,6 +46,7 @@ var SiteRouter = Router.extend({
 		this.newProjectModal = new NewProjectModal()
 		this.editProjectModal = new EditProjectModal()
 		this.editProfileModal = new EditProfileModal()
+		this.passwordForgotModal = new PasswordForgot()
 		this.documentModal = new DocumentModal()
 		
 		this.route()
@@ -122,6 +129,20 @@ var SiteRouter = Router.extend({
 		this.signInModal.load()
 	},
 	
+	usernameTaken: function(e){
+		this.usernameTakenModal = new UsernameTaken ()
+		this.usernameTakenModal.load()
+	},
+	passwordForgot: function(e){
+		e && e.preventDefault()
+		window.history.pushState(null, document.title, "/auth/forgotPassword")
+		this.passwordForgotModal.load()
+	},
+	passwordReset: function(e){
+		this.passwordResetModal = new PasswordReset ()
+		this.passwordResetModal.load()
+	},
+	
 	profile: function(e){
 		var classes = ['one', 'two', 'three', 'four',
 		               'five', 'six', 'seven', 'eight',
diff --git a/public/assets/javascripts/ui/site/PasswordForgot.js b/public/assets/javascripts/ui/site/PasswordForgot.js
index 6ac23c0..ecbfc07 100644
--- a/public/assets/javascripts/ui/site/PasswordForgot.js
+++ b/public/assets/javascripts/ui/site/PasswordForgot.js
@@ -1,6 +1,6 @@
 var PasswordForgot = ModalFormView.extend({
 	el: ".mediaDrawer.passwordForgot",
-	action: "/auth/passwordForgot",
+	action: "/auth/forgotPassword",
 
 	validate: function(){
 		var errors = []
diff --git a/public/assets/javascripts/ui/site/PasswordReset.js b/public/assets/javascripts/ui/site/PasswordReset.js
index 77e8684..9b87d37 100644
--- a/public/assets/javascripts/ui/site/PasswordReset.js
+++ b/public/assets/javascripts/ui/site/PasswordReset.js
@@ -2,6 +2,12 @@ var PasswordReset = ModalFormView.extend({
 	el: ".mediaDrawer.passwordReset",
 	action: "/auth/password",
 
+	load: function(){
+		var opt = JSON.parse( $("#opt").html() )
+		this.$("[name=nonce]").val( opt.nonce )
+		this.__super__.load.call(this)
+	},
+	
 	validate: function(){
 		var errors = []
 		
diff --git a/public/assets/javascripts/ui/site/UsernameTaken.js b/public/assets/javascripts/ui/site/UsernameTaken.js
index fc651e3..fc9f50a 100644
--- a/public/assets/javascripts/ui/site/UsernameTaken.js
+++ b/public/assets/javascripts/ui/site/UsernameTaken.js
@@ -2,6 +2,12 @@ var UsernameTaken = ModalFormView.extend({
 	el: ".mediaDrawer.usernameTaken",
 	action: "/auth/usernameTaken",
 
+	load: function(){
+		var opt = JSON.parse( $("#opt").html() )
+		this.$("#usernameThatIsTaken").html( opt.username )
+		this.__super__.load.call(this)
+	},
+
 	validate: function(){
 		var errors = []
 
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 9c80987..937e5c4 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -729,8 +729,10 @@ h5 {
   -webkit-transform:translateY(0%);
   transform:translateY(0%);
 }
+.mediaDrawer.table, .mediaDrawer.error,
 .mediaDrawer.signin, .mediaDrawer.signup,
-.mediaDrawer.alert, .mediaDrawer.confirm, .mediaDrawer.error,
+.mediaDrawer.alert, .mediaDrawer.confirm,
+.mediaDrawer.passwordForgot, .mediaDrawer.passwordReset, .mediaDrawer.usernameTaken,
 .mediaDrawer.layouts, .mediaDrawer.projects, .mediaDrawer.newProject {
     display:table;
 }