Login bug fix for OOP and module bundling architecture complete.

datastores/datastore_user.py

@@ -27,7 +27,7 @@ from business_objects.store.stock_item import Stock_Item, Stock_Item_Filters
 from business_objects.user import User, User_Filters, User_Permission_Evaluation
 from business_objects.store.product_variation import Product_Variation, Product_Variation_Filters, Product_Variation_List
 from datastores.datastore_base import DataStore_Base
-# from helpers.helper_db_mysql import Helper_DB_MySQL
+from helpers.helper_db_mysql import Helper_DB_MySQL
 # from models.model_view_store_checkout import Model_View_Store_Checkout # circular!
 from extensions import db
 # external

static/js/api.js

@@ -40,18 +40,19 @@ export default class API {
         if (hash == null) hash = hashPageHome;
         console.log("getUrlFromHash:");
         console.log("base url: " + _pathHost + "\nhash: " + hash + '\nparams: ' + params);
-        let url = _pathHost + hash;
+        let url = API.parameteriseUrl(_pathHost + hash, params);
-        if (params) {
-            url += '?' + new URLSearchParams(params).toString();
-        }
         console.log("url: " + url);
         return url;
     }
-
+    static parameteriseUrl(url, params) {
+        if (params) {
+            url += '?' + new URLSearchParams(params).toString();
+        }
+        return url;
+    }
     static goToUrl(url) {
         window.location.href = url;
     }
-
     static goToHash(hash, params = null) {
         const url = API.getUrlFromHash(hash, params);
         API.goToUrl(url);

static/js/pages/base.js

@@ -131,6 +131,7 @@ export default class BasePage {
                 console.log('sending data to user login controller: '); 
                 console.log(dataRequest);
                 */
+                // let page = this;
                 API.loginUser()
                     .then((response) => {
                     if (response.Success) {

static/js/router.js

@@ -179,6 +179,12 @@ export default class Router {
         const pageCurrent = new ClassPageCurrent(this);
         pageCurrent.leave();
     }
+    navigateToUrl(url, data = null, appendHistory = true) {
+        this.beforeLeave();
+        if (appendHistory) history.pushState(data, '', url);
+        url = API.parameteriseUrl(url, data);
+        API.goToUrl(url);
+    }
 
     /*
     static getPages() {
@@ -222,12 +228,6 @@ export default class Router {
         this.navigateToUrl(url, data);
     }
 
-    navigateToUrl(url, data = null, appendHistory = true) {
-        this.leavePageCurrent();
-        if (appendHistory) history.pushState(data, '', url);
-        url = Router.parameteriseUrl(url, data);
-        Router.#goToUrl(url);
-    }
 
     leavePageCurrent() {
         const pageCurrent = Router.getPageCurrent();