Move account-related APIs down one level into /api/account and the former /api/sign_u...

[ndcode_site.git] / my_account / sign_up / index.html.jst

diff --git a/my_account/sign_up/index.html.jst b/my_account/sign_up/index.html.jst
index 9f10481..228b5b0 100644 (file)
--- a/my_account/sign_up/index.html.jst
+++ b/my_account/sign_up/index.html.jst
@@ -78,7 +78,7 @@ return async env => {
                 div.col-md-6 {
                   div.form-group {
                     label.form-label(for="password") {'Password *'}
-                    input.form-control#password(type="password" value=details.password || '' placeholder="New password" required="required" minlength=8 maxlength=256) {}
+                    input.form-control#password(type="password" placeholder="New password" required="required" minlength=8 maxlength=256) {}
                   }
                 }
               }
@@ -182,36 +182,33 @@ return async env => {
 
       script {
         let sign_up_create_account = async (...arguments) => api_call(
-          '/api/sign_up/create_account.json',
+          '/api/account/sign_up/create_account.json',
           ...arguments
         )
         //let sign_up_get_draft = async (...arguments) => api_call(
-        //  '/api/sign_up/get_draft.json',
+        //  '/api/account/sign_up/get_draft.json',
         //  ...arguments
         //)
         let sign_up_set_draft = async (...arguments) => api_call(
-          '/api/sign_up/set_draft.json',
+          '/api/account/sign_up/set_draft.json',
           ...arguments
         )
         let sign_up_send_email_verification_link = async (...arguments) => api_call(
-          '/api/sign_up/send_email_verification_link.json',
+          '/api/account/sign_up/send_email_verification_link.json',
           ...arguments
         )
 
-        let coerce_details = () => {
-          return {
-            email: document.getElementById('email').value.slice(0, 256).toLowerCase(),
-            given_names: document.getElementById('given-names').value.slice(0, 256),
-            family_name: document.getElementById('family-name').value.slice(0, 256),
-            password: document.getElementById('password').value.slice(0, 256),
-            contact_me: document.getElementById('contact-me').checked ? true : false
-          }
-        }
-
         let draft_timeout_running = false
         let draft_timeout_handler = async () => {
           draft_timeout_running = false
-          await sign_up_set_draft(coerce_details())
+          await sign_up_set_draft(
+            {
+              email: document.getElementById('email').value.slice(0, 256).toLowerCase(),
+              given_names: document.getElementById('given-names').value.slice(0, 256),
+              family_name: document.getElementById('family-name').value.slice(0, 256),
+              contact_me: document.getElementById('contact-me').checked ? true : false
+            }
+          )
           //console.log('draft', await sign_up_get_draft())
         }
         let draft_change_handler = () => {
@@ -221,6 +218,7 @@ return async env => {
           }
         }
 
+        let details
         let step_1 = async () => {
           if (
             !document.getElementById('given-names').reportValidity() ||
@@ -237,10 +235,17 @@ return async env => {
           $('#step-1-tick').show()
           $('#step-1-cross').hide()
           //$('#step-1-spinner').hide()
+
+          details = {
+            email: document.getElementById('email').value.slice(0, 256).toLowerCase(),
+            given_names: document.getElementById('given-names').value.slice(0, 256),
+            family_name: document.getElementById('family-name').value.slice(0, 256),
+            password: document.getElementById('password').value.slice(0, 256),
+            contact_me: document.getElementById('contact-me').checked ? true : false
+          }
           return true
         }
 
-        let step_2_details = ''
         let step_2 = async () => {
           $('#step-2-tick').hide()
           $('#step-2-cross').hide()
@@ -248,12 +253,11 @@ return async env => {
           document.getElementById('step-2').scrollIntoView()
 
           try {
-            step_2_details = coerce_details()
             await sign_up_create_account(
               // verification_code
               document.getElementById('verification-code').value.slice(0, 6).toLowerCase(),
               // details
-              step_2_details
+              details
             )
           }
           catch (error) {
@@ -280,7 +284,7 @@ return async env => {
           $('#step-2-tick').show()
           $('#step-2-cross').hide()
           $('#step-2-spinner').hide()
-          document.getElementById('step-2-message').textContent = `Your account with email "${step_2_details.email}" has been created.`
+          document.getElementById('step-2-message').textContent = `Your account with email "${details.email}" has been created.`
           return true
         }
 
@@ -291,7 +295,7 @@ return async env => {
           document.getElementById('step-3').scrollIntoView()
 
           try {
-            await sign_up_send_email_verification_link(step_2_details.email)
+            await sign_up_send_email_verification_link(details.email)
           }
           catch (error) {
             let problem =
@@ -318,7 +322,7 @@ return async env => {
           $('#step-3-cross').hide()
           $('#step-3-spinner').hide()
 
-          document.getElementById('step-3-message').textContent = `Email verification link has been sent to "${step_2_details.email}". Please check your email for next steps.`
+          document.getElementById('step-3-message').textContent = `Email verification link has been sent to "${details.email}". Please check your email for next steps.`
           return true
         }