Use (Transaction|LazyValue).get_json() instead of logjson.logjson_to_json() and ...

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

diff --git a/my_account/index.html.jst b/my_account/index.html.jst
index 841790f..30dc0dc 100644 (file)
--- a/my_account/index.html.jst
+++ b/my_account/index.html.jst
@@ -1,4 +1,3 @@
-let logjson = (await import('@ndcode/logjson')).default
 let XDate = require('xdate')
 
 return async env => {
@@ -24,33 +23,21 @@ return async env => {
         ).get('accounts')
       ).get(env.signed_in_as)
       details = {
-        given_names: await logjson.logjson_to_json(
-          await account.get('given_names')
-        ),
-        family_name: await logjson.logjson_to_json(
-          await account.get('family_name')
-        ),
-        contact_me: await logjson.logjson_to_json(
-          await account.get('contact_me')
-        )
+        given_names: await account.get_json('given_names'),
+        family_name: await account.get_json('family_name'),
+        contact_me: await account.get_json('contact_me')
       }
 
       let change_details_draft = await session.get('change_details_draft')
       draft_details =
         change_details_draft !== undefined &&
-          XDate.now() < await logjson.logjson_to_json(
-            await change_details_draft.get('expires')
-          ) ? {
-            given_names: await logjson.logjson_to_json(
-              await change_details_draft.get('given_names')
-            ),
-            family_name: await logjson.logjson_to_json(
-              await change_details_draft.get('family_name')
-            ),
-            contact_me: await logjson.logjson_to_json(
-              await change_details_draft.get('contact_me')
-            )
-          } : null
+          XDate.now() < await change_details_draft.get_json('expires') ?
+          {
+            given_names: await change_details_draft.get_json('given_names'),
+            family_name: await change_details_draft.get_json('family_name'),
+            contact_me: await change_details_draft.get_json('contact_me')
+          } :
+          null
     }
     await transaction.commit()
   }
@@ -252,11 +239,13 @@ return async env => {
           let draft_timeout_handler = async () => {
             draft_timeout_running = false
             await api_account_change_details_set_draft(
-              step_1_dirty ? {
-                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
-              } : null
+              step_1_dirty ?
+                {
+                  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
+                } :
+                null
             )
             //console.log('draft', await api_account_change_details_get_draft())
           }