Major refactoring of get_session(), get_account(), get_nodemailer(), introduces ...

[ndcode_site.git] / _lib / navbar.jst

diff --git a/_lib/navbar.jst b/_lib/navbar.jst
index b7c32d0..4636c52 100644 (file)
--- a/_lib/navbar.jst
+++ b/_lib/navbar.jst
@@ -3,7 +3,6 @@ let XDate = require('xdate')
 
 return async (env, head, body, scripts) => {
   //let cart = await _require('/online_store/cart.jst')
-  let get_globals = await _require('/_lib/get_globals.jst')
   let get_session = await _require('/_lib/get_session.jst')
   //let icon_cart_small = await env.site.get_min_svg('/_svg/icon_cart_small.svg')
   let icon_search_mono = await env.site.get_min_svg('/_svg/icon_search_mono.svg')
@@ -14,15 +13,18 @@ return async (env, head, body, scripts) => {
   // initialize env.cart
   //await cart(env)
 
-  let transaction = await env.site.Transaction()
-  let signed_in_as, site_title, copyright
+  let transaction = await env.site.database.Transaction()
+  let signed_in_as
+  let site_title, copyright
   try {
-    let session = await get_session(env, transaction)
-    signed_in_as = session.get_json('signed_in_as', null)
+    let root = await transaction.get({})
 
-    let globals = await get_globals(env, transaction)
-    site_title = globals.get_json('site_title')
-    copyright = globals.get_json('copyright')
+    let session = await get_session(env, root)
+    signed_in_as = await session.get_json('signed_in_as', null)
+
+    let globals = await root.get('globals', {})
+    site_title = await globals.get_json('site_title')
+    copyright = await globals.get_json('copyright')
   }
   finally {
     transaction.rollback()
@@ -84,7 +86,7 @@ return async (env, head, body, scripts) => {
                 else
                   a#sign-out(href="#" style="display: none;") {'Sign out'}
               }
-  
+
               form(action="/search/index.html") {
                 div.input-group {
                   input.form-control(name="query" type="text" placeholder="Search" aria-describedby="search-button") {}
@@ -96,7 +98,7 @@ return async (env, head, body, scripts) => {
                 }
               }
             }
-  
+
             //div.'col-sm-1'.vbottom {
             //  // a nested div is used to avoid hover colour on the padding
             //  div.nav-li-a(style="text-align: center;") {