From 5125ad3eba795cb7bcad74505793d963efa6a521 Mon Sep 17 00:00:00 2001
From: ditaajipratama <ditaajipratama@protonmail.com>
Date: Sat, 13 Jan 2024 12:01:14 +0700
Subject: [PATCH] Updating templating system

---
 config/directory.py                           | 17 +++----
 config/globalvar.py                           |  7 ++-
 core/templatestaticdir.py                     |  9 ++++
 handler.py                                    |  4 +-
 modules/public/home.py                        | 50 ++++++++-----------
 .../html/footer.html                          |  2 +-
 templates/bare/html/template.html             | 20 ++++++++
 .../html/topnav.html                          |  2 +-
 templates/{basic_bootstrap => bare}/main.py   | 11 ++--
 .../static/css/style.css                      |  0
 .../static/lib/bootstrap/LICENSE              |  0
 .../lib/bootstrap/css/bootstrap.min.css       |  0
 .../lib/bootstrap/css/bootstrap.min.css.map   |  0
 .../lib/bootstrap/js/bootstrap.bundle.min.js  |  0
 .../bootstrap/js/bootstrap.bundle.min.js.map  |  0
 .../static/lib/jquery/jquery-3.7.0.min.js     |  0
 templates/basic_bootstrap/html/template.html  | 20 --------
 17 files changed, 70 insertions(+), 72 deletions(-)
 create mode 100644 core/templatestaticdir.py
 rename templates/{basic_bootstrap => bare}/html/footer.html (68%)
 create mode 100644 templates/bare/html/template.html
 rename templates/{basic_bootstrap => bare}/html/topnav.html (92%)
 rename templates/{basic_bootstrap => bare}/main.py (62%)
 rename templates/{basic_bootstrap => bare}/static/css/style.css (100%)
 rename templates/{basic_bootstrap => bare}/static/lib/bootstrap/LICENSE (100%)
 rename templates/{basic_bootstrap => bare}/static/lib/bootstrap/css/bootstrap.min.css (100%)
 rename templates/{basic_bootstrap => bare}/static/lib/bootstrap/css/bootstrap.min.css.map (100%)
 rename templates/{basic_bootstrap => bare}/static/lib/bootstrap/js/bootstrap.bundle.min.js (100%)
 rename templates/{basic_bootstrap => bare}/static/lib/bootstrap/js/bootstrap.bundle.min.js.map (100%)
 rename templates/{basic_bootstrap => bare}/static/lib/jquery/jquery-3.7.0.min.js (100%)
 delete mode 100644 templates/basic_bootstrap/html/template.html

diff --git a/config/directory.py b/config/directory.py
index cf7e7c3..550c47a 100644
--- a/config/directory.py
+++ b/config/directory.py
@@ -1,7 +1,5 @@
 import os
-
-# template import
-import templates.basic_bootstrap.main   as basic_bootstrap
+from core import templatestaticdir
 
 # pages directory
 page = {
@@ -21,11 +19,12 @@ dirconfig = {
         'tools.staticdir.on'    : True ,
         'tools.staticdir.dir'   : './static/css' ,
     },
+    '/js' :
+    {
+        'tools.staticdir.on'    : True ,
+        'tools.staticdir.dir'   : './static/js' ,
+    },
 }
 
-def add(template):
-    for row in template:
-        dirconfig[ row['name'] ] = row['value']
-
-# template staticdir
-add(basic_bootstrap.static)
+# template staticdir: dirconfig  dirtemplate
+templatestaticdir.add(dirconfig, "templates")
diff --git a/config/globalvar.py b/config/globalvar.py
index fb6a5c0..c46ffbe 100755
--- a/config/globalvar.py
+++ b/config/globalvar.py
@@ -1,8 +1,7 @@
-GV_base_url = "http://localhost:81"
-GV_title    = "CostaPy"
-GV_copyright    = "Dita Aji Pratama"
+baseurl = "http://localhost:81"
+title    = "CostaPy"
 
-GV_menu = {
+menu = {
     "public": {
         "topnav": [
             {
diff --git a/core/templatestaticdir.py b/core/templatestaticdir.py
new file mode 100644
index 0000000..9327389
--- /dev/null
+++ b/core/templatestaticdir.py
@@ -0,0 +1,9 @@
+import os
+
+def add(dirconfig, template_directory):
+    template_directory  = "templates"
+    template_list       = [d for d in os.listdir(template_directory) if os.path.isdir(os.path.join(template_directory, d))]
+    for template_name in template_list:
+        template_module = __import__(f"{template_directory}.{template_name}.main", fromlist=["static"])
+        for static in getattr(template_module, "static", []):
+            dirconfig[ static['name'] ] = static['value']
diff --git a/handler.py b/handler.py
index 025f94c..a0cb5f5 100755
--- a/handler.py
+++ b/handler.py
@@ -10,6 +10,8 @@ import modules.public.home	as public_home
 class handler():
 
     def index(self, **kwargs):
-        kwargs["mako_website"] = basic_bootstrap.main(directory.page["public"], "home")
+        kwargs["mako"] = {
+            "website" : bare.main(directory.page["public"], "home")
+        }
         return public_home.main().html(kwargs)
     index.exposed = True
diff --git a/modules/public/home.py b/modules/public/home.py
index c4a7389..51a4639 100644
--- a/modules/public/home.py
+++ b/modules/public/home.py
@@ -3,35 +3,25 @@ import	config.globalvar	as globalvar
 
 class main:
 
-	def __init__(self):
- 		pass
+    def __init__(self):
+        pass
 
-	def html(self, params):
-
-		interface_template	= params["mako_website"]['template'		]
-		topnav				= params["mako_website"]['topnav'		]
-		footer				= params["mako_website"]['footer'		]
-		container			= params["mako_website"]['container'	]
-
-		name				= "World"
-
-		user_roles			= ["guest"]
-		active_page			= "Home"
-
-		return Template(interface_template).render(
-			GV_title	= globalvar.GV_title,
-			GV_base_url	= globalvar.GV_base_url,
-			topnav		= Template(topnav).render(
-				GV_title	= globalvar.GV_title,
-            	menu		= globalvar.GV_menu['public']['topnav'],
-                user_roles	= user_roles,
-                active_page	= active_page
-			),
-			footer		= Template(footer).render(
-				copyright_holder	= globalvar.GV_copyright,
-			),
-            container	= Template(container).render(
-				GV_base_url		= globalvar.GV_base_url,
-				greeting		= "Hello " + name + ", " + "Welcome to " + globalvar.GV_title
-			)
+    def html(self, params):
+        return Template(params["mako"]["website"]['template']).render(
+            title	= globalvar.title,
+            baseurl	= globalvar.baseurl,
+            topnav	= Template(params["mako"]["website"]['topnav']).render(
+                title		= globalvar.title,
+                baseurl		= globalvar.baseurl,
+                menu		= globalvar.menu['public']['topnav'],
+                user_roles	= ["guest"],
+                active_page	= "Home"
+            ),
+            footer	= Template(params["mako"]["website"]['footer']).render(
+                copyright	= "Dita Aji Pratama",
+            ),
+            container	= Template(params["mako"]["website"]['container']).render(
+                baseurl		= globalvar.baseurl,
+                greeting	= f"Hello world, welcome to {globalvar.title}"
+            )
         )
diff --git a/templates/basic_bootstrap/html/footer.html b/templates/bare/html/footer.html
similarity index 68%
rename from templates/basic_bootstrap/html/footer.html
rename to templates/bare/html/footer.html
index d26197a..0cc51ae 100644
--- a/templates/basic_bootstrap/html/footer.html
+++ b/templates/bare/html/footer.html
@@ -1,3 +1,3 @@
 <footer class="mt-auto bg-dark text-light p-3 text-center">
-    © 2022 ${copyright_holder}
+    © 2022 ${copyright}
 </footer>
diff --git a/templates/bare/html/template.html b/templates/bare/html/template.html
new file mode 100644
index 0000000..f433c3b
--- /dev/null
+++ b/templates/bare/html/template.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <title>${title}</title>
+    <script src="${baseurl}/bare/lib/jquery/jquery-3.7.0.min.js"></script>
+    <link href="${baseurl}/bare/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css">
+    <script src="${baseurl}/bare/lib/bootstrap/js/bootstrap.bundle.min.js"></script>
+    <link rel="stylesheet" href="${baseurl}/bare/css/style.css">
+  </head>
+  <body class="d-flex flex-column" style="min-height:100vh;">
+    ${topnav}
+    <div class="mb-5">
+      ${container}
+    </div>
+    ${footer}
+  </body>
+</html>
diff --git a/templates/basic_bootstrap/html/topnav.html b/templates/bare/html/topnav.html
similarity index 92%
rename from templates/basic_bootstrap/html/topnav.html
rename to templates/bare/html/topnav.html
index 5313350..b243085 100644
--- a/templates/basic_bootstrap/html/topnav.html
+++ b/templates/bare/html/topnav.html
@@ -1,5 +1,5 @@
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
-  <a class="navbar-brand" href="/">${GV_title}</a>
+  <a class="navbar-brand" href="${baseurl}">${title}</a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
diff --git a/templates/basic_bootstrap/main.py b/templates/bare/main.py
similarity index 62%
rename from templates/basic_bootstrap/main.py
rename to templates/bare/main.py
index a94784a..4da79af 100644
--- a/templates/basic_bootstrap/main.py
+++ b/templates/bare/main.py
@@ -1,26 +1,25 @@
 from core   import html
-from config import directory
 
 static = [
     {
-        'name':'/basic_bootstrap/lib',
+        'name':'/bare/lib',
         'value':{
             'tools.staticdir.on'    : True ,
-            'tools.staticdir.dir'   : './templates/basic_bootstrap/static/lib' ,
+            'tools.staticdir.dir'   : './templates/bare/static/lib' ,
         }
     },
     {
-        'name':'/basic_bootstrap/css',
+        'name':'/bare/css',
         'value':{
             'tools.staticdir.on'    : True ,
-            'tools.staticdir.dir'   : './templates/basic_bootstrap/static/css' ,
+            'tools.staticdir.dir'   : './templates/bare/static/css' ,
         }
     }
 ]
 
 def main(dir, page):
 
-    html_template   = html.main.get_html("templates/basic_bootstrap/html")
+    html_template   = html.main.get_html("templates/bare/html")
     html_page       = html.main.get_html(dir)
     params_list = {
         "template"  : html_template ["template.html"    ]   ,
diff --git a/templates/basic_bootstrap/static/css/style.css b/templates/bare/static/css/style.css
similarity index 100%
rename from templates/basic_bootstrap/static/css/style.css
rename to templates/bare/static/css/style.css
diff --git a/templates/basic_bootstrap/static/lib/bootstrap/LICENSE b/templates/bare/static/lib/bootstrap/LICENSE
similarity index 100%
rename from templates/basic_bootstrap/static/lib/bootstrap/LICENSE
rename to templates/bare/static/lib/bootstrap/LICENSE
diff --git a/templates/basic_bootstrap/static/lib/bootstrap/css/bootstrap.min.css b/templates/bare/static/lib/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from templates/basic_bootstrap/static/lib/bootstrap/css/bootstrap.min.css
rename to templates/bare/static/lib/bootstrap/css/bootstrap.min.css
diff --git a/templates/basic_bootstrap/static/lib/bootstrap/css/bootstrap.min.css.map b/templates/bare/static/lib/bootstrap/css/bootstrap.min.css.map
similarity index 100%
rename from templates/basic_bootstrap/static/lib/bootstrap/css/bootstrap.min.css.map
rename to templates/bare/static/lib/bootstrap/css/bootstrap.min.css.map
diff --git a/templates/basic_bootstrap/static/lib/bootstrap/js/bootstrap.bundle.min.js b/templates/bare/static/lib/bootstrap/js/bootstrap.bundle.min.js
similarity index 100%
rename from templates/basic_bootstrap/static/lib/bootstrap/js/bootstrap.bundle.min.js
rename to templates/bare/static/lib/bootstrap/js/bootstrap.bundle.min.js
diff --git a/templates/basic_bootstrap/static/lib/bootstrap/js/bootstrap.bundle.min.js.map b/templates/bare/static/lib/bootstrap/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from templates/basic_bootstrap/static/lib/bootstrap/js/bootstrap.bundle.min.js.map
rename to templates/bare/static/lib/bootstrap/js/bootstrap.bundle.min.js.map
diff --git a/templates/basic_bootstrap/static/lib/jquery/jquery-3.7.0.min.js b/templates/bare/static/lib/jquery/jquery-3.7.0.min.js
similarity index 100%
rename from templates/basic_bootstrap/static/lib/jquery/jquery-3.7.0.min.js
rename to templates/bare/static/lib/jquery/jquery-3.7.0.min.js
diff --git a/templates/basic_bootstrap/html/template.html b/templates/basic_bootstrap/html/template.html
deleted file mode 100644
index 33919e3..0000000
--- a/templates/basic_bootstrap/html/template.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>${GV_title}</title>
-    <script src="${GV_base_url}/basic_bootstrap/lib/jquery/jquery-3.7.0.min.js"></script>
-    <link href="${GV_base_url}/basic_bootstrap/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css">
-    <script src="${GV_base_url}/basic_bootstrap/lib/bootstrap/js/bootstrap.bundle.min.js"></script>
-    <link rel="stylesheet" href="${GV_base_url}/basic_bootstrap/css/style.css">
-  </head>
-  <body class="d-flex flex-column" style="min-height:100vh;">
-    ${topnav}
-    <div class="mb-5">
-      ${container}
-    </div>
-    ${footer}
-  </body>
-</html>