Add api_ or api_account_ prefix on all API calls in client side javascript

diff --git a/_lib/navbar.jst b/_lib/navbar.jst
index db455b4..7a96065 100644 (file)
--- a/_lib/navbar.jst
+++ b/_lib/navbar.jst
@@ -293,16 +293,16 @@ return async (env, head, body, scripts) => {
       script(src="/js/api_call.js") {}
 
       script {
-        let sign_in = async (...arguments) => api_call(
+        let api_account_sign_in = async (...arguments) => api_call(
           '/api/account/sign_in.json',
           ...arguments
         )
-        let sign_out = async (...arguments) => api_call(
+        let api_account_sign_out = async (...arguments) => api_call(
           '/api/account/sign_out.json',
           ...arguments
         )
-        let feedback = async (...arguments) => api_call(
-          '/api/account/feedback.json',
+        let api_feedback = async (...arguments) => api_call(
+          '/api/feedback.json',
           ...arguments
         )
 
@@ -337,7 +337,7 @@ return async (env, head, body, scripts) => {
                 let email
                 try {
                   email = document.getElementById('sign-in-email').value.slice(0, 256).toLowerCase()
-                  await sign_in(
+                  await api_account_sign_in(
                     email,
                     document.getElementById('sign-in-password').value.slice(0, 256)
                   )
@@ -382,7 +382,7 @@ return async (env, head, body, scripts) => {
               'click',
               async () => {
                 try {
-                  await sign_out()
+                  await api_account_sign_out()
                 }
                 catch (error) {
                   let problem =
@@ -435,7 +435,7 @@ return async (env, head, body, scripts) => {
               'click',
               async () => {
                 try {
-                  await feedback(
+                  await api_feedback(
                     location.href,
                     document.getElementById('feedback-message').value.slice(0, 65536)
                   )

diff --git a/my_account/password_reset/index.html.jst b/my_account/password_reset/index.html.jst
index ffae545..cc9113d 100644 (file)
--- a/my_account/password_reset/index.html.jst
+++ b/my_account/password_reset/index.html.jst
@@ -97,10 +97,10 @@ return async env => {
     },
     // scripts
     async _out => {
-      script(src="/js/api_call.js") {}
+      //script(src="/js/api_call.js") {}
 
       script {
-        let password_reset = async (...arguments) => api_call(
+        let api_account_password_reset = async (...arguments) => api_call(
           '/api/account/password_reset.json',
           ...arguments
         )
@@ -130,7 +130,7 @@ return async env => {
           let email
           try {
             email = document.getElementById('email').value.slice(0, 256).toLowerCase()
-            await password_reset(
+            await api_account_password_reset(
               email,
               document.getElementById('password').value.slice(0, 256)
             )

diff --git a/my_account/send_verification_email/index.html.jst b/my_account/send_verification_email/index.html.jst
index 32f6c75..b1a9595 100644 (file)
--- a/my_account/send_verification_email/index.html.jst
+++ b/my_account/send_verification_email/index.html.jst
@@ -91,10 +91,10 @@ return async env => {
     },
     // scripts
     async _out => {
-      script(src="/js/api_call.js") {}
+      //script(src="/js/api_call.js") {}
 
       script {
-        let sign_up_send_email_verification_link = async (...arguments) => api_call(
+        let api_account_sign_up_send_email_verification_link = async (...arguments) => api_call(
           '/api/account/sign_up/send_email_verification_link.json',
           ...arguments
         )
@@ -121,7 +121,7 @@ return async env => {
           let email
           try {
             email = document.getElementById('email').value.slice(0, 256).toLowerCase()
-            await sign_up_send_email_verification_link(email)
+            await api_account_sign_up_send_email_verification_link(email)
           }
           catch (error) {
             let problem =

diff --git a/my_account/sign_up/index.html.jst b/my_account/sign_up/index.html.jst
index 295b238..d2fe5ac 100644 (file)
--- a/my_account/sign_up/index.html.jst
+++ b/my_account/sign_up/index.html.jst
@@ -199,22 +199,22 @@ return async env => {
     },
     // scripts
     async _out => {
-      script(src="/js/api_call.js") {}
+      //script(src="/js/api_call.js") {}
 
       script {
-        let sign_up_create_account = async (...arguments) => api_call(
+        let api_account_sign_up_create_account = async (...arguments) => api_call(
           '/api/account/sign_up/create_account.json',
           ...arguments
         )
-        //let sign_up_get_draft = async (...arguments) => api_call(
+        //let api_account_sign_up_get_draft = async (...arguments) => api_call(
         //  '/api/account/sign_up/get_draft.json',
         //  ...arguments
         //)
-        let sign_up_set_draft = async (...arguments) => api_call(
+        let api_account_sign_up_set_draft = async (...arguments) => api_call(
           '/api/account/sign_up/set_draft.json',
           ...arguments
         )
-        let sign_up_send_email_verification_link = async (...arguments) => api_call(
+        let api_account_sign_up_send_email_verification_link = async (...arguments) => api_call(
           '/api/account/sign_up/send_email_verification_link.json',
           ...arguments
         )
@@ -222,7 +222,7 @@ return async env => {
         let draft_timeout_running = false
         let draft_timeout_handler = async () => {
           draft_timeout_running = false
-          await sign_up_set_draft(
+          await api_account_sign_up_set_draft(
             {
               email: document.getElementById('email').value.slice(0, 256).toLowerCase(),
               given_names: document.getElementById('given-names').value.slice(0, 256),
@@ -230,7 +230,7 @@ return async env => {
               contact_me: document.getElementById('contact-me').checked ? true : false
             }
           )
-          //console.log('draft', await sign_up_get_draft())
+          //console.log('draft', await api_account_sign_up_get_draft())
         }
         let draft_change_handler = () => {
           if (!draft_timeout_running) {
@@ -274,7 +274,7 @@ return async env => {
           document.getElementById('step-2').scrollIntoView()
 
           try {
-            await sign_up_create_account(
+            await api_account_sign_up_create_account(
               // verification_code
               document.getElementById('verification-code').value.slice(0, 6).toLowerCase(),
               // details
@@ -316,7 +316,7 @@ return async env => {
           document.getElementById('step-3').scrollIntoView()
 
           try {
-            await sign_up_send_email_verification_link(details.email)
+            await api_account_sign_up_send_email_verification_link(details.email)
           }
           catch (error) {
             let problem =

diff --git a/my_account/verify_email/index.html.jst b/my_account/verify_email/index.html.jst
index 142e10e..7f33b44 100644 (file)
--- a/my_account/verify_email/index.html.jst
+++ b/my_account/verify_email/index.html.jst
@@ -105,10 +105,10 @@ return async env => {
     },
     // scripts
     async _out => {
-      script(src="/js/api_call.js") {}
+      //script(src="/js/api_call.js") {}
 
       script {
-        let sign_up_verify_email = async (...arguments) => api_call(
+        let api_account_sign_up_verify_email = async (...arguments) => api_call(
           '/api/account/sign_up/verify_email.json',
           ...arguments
         )
@@ -138,7 +138,7 @@ return async env => {
           let email
           try {
             email = document.getElementById('email').value.slice(0, 256).toLowerCase()
-            await sign_up_verify_email(
+            await api_account_sign_up_verify_email(
               // email
               email,
               // link_code

diff --git a/my_account/verify_password/index.html.jst b/my_account/verify_password/index.html.jst
index 7fecc81..e20fa28 100644 (file)
--- a/my_account/verify_password/index.html.jst
+++ b/my_account/verify_password/index.html.jst
@@ -105,10 +105,10 @@ return async env => {
     },
     // scripts
     async _out => {
-      script(src="/js/api_call.js") {}
+      //script(src="/js/api_call.js") {}
 
       script {
-        let verify_password = async (...arguments) => api_call(
+        let api_account_verify_password = async (...arguments) => api_call(
           '/api/account/verify_password.json',
           ...arguments
         )
@@ -138,7 +138,7 @@ return async env => {
           let email
           try {
             email = document.getElementById('email').value.slice(0, 256).toLowerCase()
-            await verify_password(
+            await api_account_verify_password(
               // email
               email,
               // link_code