Merge branch 'master' into system/authsquare

config/globalvar.py

@@ -46,93 +46,3 @@ def change_forgot_url(token):
     url = f"{baseurl}/reset?token={token}"
     return url
 
-menu        = {
-    "public": {
-        "navbar": [
-            {
-                "name":"Home",
-                "target":"_self",
-                "href":"/",
-                "roles":[0,1,2,3]
-            },
-            {
-                "name":"Dashboard",
-                "target":"_self",
-                "href":"/dashboard",
-                "roles":[1,2]
-            },
-            {
-                "name":"Register",
-                "target":"_self",
-                "href":"/register/member",
-                "roles":[0]
-            },
-            {
-                "name":"Login",
-                "target":"_self",
-                "href":"/login",
-                "roles":[0]
-            },
-            {
-                "name":"Logout",
-                "target":"_self",
-                "href":"/logout",
-                "roles":[1,2,3]
-            }
-        ]
-    },
-    "dashboard": {
-        "navbar": [
-            {
-                "name":"Home",
-                "target":"_self",
-                "href":"/",
-                "notification":0,
-                "roles":[0,1,2,3]
-            }
-        ],
-        "profile": [
-            {
-                "name"  :"Profile",
-                "href"  :"/dashboard/profile",
-                "target":"_self",
-                "roles":[1,2]
-            },
-            {
-                "name"  :"Settings",
-                "href"  :"/dashboard/settings",
-                "target":"_self",
-                "roles":[1,2]
-            },
-            {
-                "name"  :"Logout",
-                "href"  :"/logout",
-                "target":"_self",
-                "roles":[1,2,3]
-            }
-        ],
-        "sidebar": [
-            {
-                "icon":"fa-solid fa-gauge",
-                "name":"Dashboard",
-                "target":"_self",
-                "href":"/dashboard",
-                "roles":[1,2]
-            },
-            {
-                "icon":"fa-solid fa-user-tag",
-                "name":"Roles",
-                "target":"_self",
-                "href":"/dashboard/roles",
-                "roles":[1]
-            },
-            {
-                "icon":"fa-solid fa-address-card",
-                "name":"Users",
-                "target":"_self",
-                "href":"/dashboard/users",
-                "roles":[1,2]
-            }
-        ]
-    }
-}

config/navigation.py

@@ -0,0 +1,90 @@
+menu        = {
+    "public": {
+        "navbar": [
+            {
+                "name":"Home",
+                "target":"_self",
+                "href":"/",
+                "roles":[0,1,2,3]
+            },
+            {
+                "name":"Dashboard",
+                "target":"_self",
+                "href":"/dashboard",
+                "roles":[1,2]
+            },
+            {
+                "name":"Register",
+                "target":"_self",
+                "href":"/register/member",
+                "roles":[0]
+            },
+            {
+                "name":"Login",
+                "target":"_self",
+                "href":"/login",
+                "roles":[0]
+            },
+            {
+                "name":"Logout",
+                "target":"_self",
+                "href":"/logout",
+                "roles":[1,2,3]
+            }
+        ]
+    },
+    "dashboard": {
+        "navbar": [
+            {
+                "name":"Home",
+                "target":"_self",
+                "href":"/",
+                "notification":0,
+                "roles":[0,1,2,3]
+            }
+        ],
+        "profile": [
+            {
+                "name"  :"Profile",
+                "href"  :"/dashboard/profile",
+                "target":"_self",
+                "roles":[1,2]
+            },
+            {
+                "name"  :"Settings",
+                "href"  :"/dashboard/settings",
+                "target":"_self",
+                "roles":[1,2]
+            },
+            {
+                "name"  :"Logout",
+                "href"  :"/logout",
+                "target":"_self",
+                "roles":[1,2,3]
+            }
+        ],
+        "sidebar": [
+            {
+                "icon":"fa-solid fa-gauge",
+                "name":"Dashboard",
+                "target":"_self",
+                "href":"/dashboard",
+                "roles":[1,2]
+            },
+            {
+                "icon":"fa-solid fa-user-tag",
+                "name":"Roles",
+                "target":"_self",
+                "href":"/dashboard/roles",
+                "roles":[1]
+            },
+            {
+                "icon":"fa-solid fa-address-card",
+                "name":"Users",
+                "target":"_self",
+                "href":"/dashboard/users",
+                "roles":[1,2]
+            }
+        ]
+    }
+}

config/server.py

@@ -2,16 +2,16 @@ from bottle import response
 
 host        = "localhost"
 port        = 11000
-reloader    = False
+reloader    = True
 debug       = False
-server      = 'gunicorn' # default = 'wsgiref'
+server      = 'wsgiref' # try 'gunicorn'
 
 session_opts = {
     'session.type': 'file',
     'session.cookie_expires': 5*60, # Session expiration in seconds: minutes*seconds
     'session.data_dir': './.beaker/data',
     'session.auto': True
-}
+} # beaker's session options
 
 def enable_cors():
     response.headers['Access-Control-Allow-Origin' ] = '*'

modules/public/forgot.py

@@ -1,5 +1,5 @@
 from    mako.template           import  Template
-from    config                  import  globalvar
+from    config                  import  globalvar, navigation
 from    scripts                 import  loggorilla
 
 import  procedure.validation    as 		procedure_validation
@@ -24,7 +24,7 @@ class forgot:
             title	= globalvar.title,
             header	= globalvar.header,
             navbar	= Template(params["mako"]["website"]['navbar']).render(
-                menu		= globalvar.menu['public']['navbar'],
+                menu		= navigation.menu['public']['navbar'],
                 user_roles	= user['profile']['roles'],
                 active_page	= active_page
             ),

modules/public/home.py

@@ -1,5 +1,5 @@
 from    mako.template		import Template
-from    config			import globalvar
+from    config			import globalvar, navigation
 from    scripts                 import  loggorilla
 
 import  procedure.validation    as 		procedure_validation
@@ -24,7 +24,7 @@ class main:
             title	= globalvar.title,
             header	= globalvar.header,
             navbar	= Template(params["mako"]["website"]['navbar']).render(
-                menu		= globalvar.menu['public']['navbar'],
+                menu		= navigation.menu['public']['navbar'],
                 user_roles	= user['profile']['roles'],
                 active_page	= active_page
             ),

modules/public/login.py

@@ -1,5 +1,5 @@
 from    mako.template           import  Template
-from    config                  import  globalvar
+from    config                  import  globalvar, navigation
 from    scripts                 import  loggorilla
 
 import  procedure.validation    as 		procedure_validation
@@ -24,7 +24,7 @@ class login:
             title	= globalvar.title,
             header	= globalvar.header,
             navbar	= Template(params["mako"]["website"]['navbar']).render(
-                menu		= globalvar.menu['public']['navbar'],
+                menu		= navigation.menu['public']['navbar'],
                 user_roles	= user['profile']['roles'],
                 active_page	= active_page
             ),

modules/public/notme.py

@@ -1,5 +1,5 @@
 from    mako.template           import  Template
-from    config                  import  globalvar
+from    config                  import  globalvar, navigation
 from    scripts                 import  loggorilla
 
 import  procedure.validation    as 		procedure_validation
@@ -24,7 +24,7 @@ class notme:
             title	= globalvar.title,
             header	= globalvar.header,
             navbar	= Template(params["mako"]["website"]['navbar']).render(
-                menu		= globalvar.menu['public']['navbar'],
+                menu		= navigation.menu['public']['navbar'],
                 user_roles	= user['profile']['roles'],
                 active_page	= active_page
             ),

modules/public/register.py

@@ -1,5 +1,5 @@
 from    mako.template           import  Template
-from    config                  import  globalvar
+from    config                  import  globalvar, navigation
 from    scripts                 import  loggorilla
 
 import  procedure.validation    as	procedure_validation
@@ -25,7 +25,7 @@ class register:
             title	= globalvar.title,
             header	= globalvar.header,
             navbar	= Template(params["mako"]["website"]['navbar']).render(
-                menu		= globalvar.menu['public']['navbar'],
+                menu		= navigation.menu['public']['navbar'],
                 user_roles	= user['profile']['roles'],
                 active_page	= active_page
             ),

modules/public/reset.py

@@ -1,5 +1,5 @@
 from    mako.template           import  Template
-from    config                  import  globalvar
+from    config                  import  globalvar, navigation
 from    scripts                 import  loggorilla
 
 import  procedure.validation    as 		procedure_validation
@@ -24,7 +24,7 @@ class reset:
             title	= globalvar.title,
             header	= globalvar.header,
             navbar	= Template(params["mako"]["website"]['navbar']).render(
-                menu		= globalvar.menu['public']['navbar'],
+                menu		= navigation.menu['public']['navbar'],
                 user_roles	= user['profile']['roles'],
                 active_page	= active_page
             ),

modules/public/verify.py

@@ -1,5 +1,5 @@
 from    mako.template           import  Template
-from    config                  import  globalvar
+from    config                  import  globalvar, navigation
 from    scripts                 import  loggorilla
 
 import  procedure.validation    as 		procedure_validation
@@ -24,7 +24,7 @@ class verify:
             title	= globalvar.title,
             header	= globalvar.header,
             navbar	= Template(params["mako"]["website"]['navbar']).render(
-                menu		= globalvar.menu['public']['navbar'],
+                menu		= navigation.menu['public']['navbar'],
                 user_roles	= user['profile']['roles'],
                 active_page	= active_page
             ),