From 0cd51eafad7caca323b0a65ed9d5de0fbc167252 Mon Sep 17 00:00:00 2001
From: = <ditaajipratama@protonmail.com>
Date: Thu, 8 Aug 2024 13:25:40 +0700
Subject: [PATCH] Pattern update

---
 .../html/{template.html => index.html}        | 26 +++++-----
 blackdashboard/main.py                        | 49 ++++++-------------
 2 files changed, 28 insertions(+), 47 deletions(-)
 rename blackdashboard/html/{template.html => index.html} (81%)
diff --git a/blackdashboard/html/template.html b/blackdashboard/html/index.html
similarity index 81%
rename from blackdashboard/html/template.html
rename to blackdashboard/html/index.html
index 2734fab..89efdf9 100644
--- a/blackdashboard/html/template.html
+++ b/blackdashboard/html/index.html
@@ -19,8 +19,8 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="apple-touch-icon" sizes="76x76" href="${baseurl}/blackdashboard/img/apple-icon.png">
-  <link rel="icon" type="image/png" href="${baseurl}/blackdashboard/img/favicon.png">
+  <link rel="apple-touch-icon" sizes="76x76" href="${baseurl}/templates/blackdashboard/img/apple-icon.png">
+  <link rel="icon" type="image/png" href="${baseurl}/templates/blackdashboard/img/favicon.png">
   <title>
     ${title}
   </title>
@@ -28,11 +28,11 @@
   <link href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,600,700,800" rel="stylesheet" />
   <link href="https://use.fontawesome.com/releases/v5.0.6/css/all.css" rel="stylesheet">
   <!-- Nucleo Icons -->
-  <link href="${baseurl}/blackdashboard/css/nucleo-icons.css" rel="stylesheet" />
+  <link href="${baseurl}/templates/blackdashboard/css/nucleo-icons.css" rel="stylesheet" />
   <!-- CSS Files -->
-  <link href="${baseurl}/blackdashboard/css/black-dashboard.css?v=1.0.0" rel="stylesheet" />
+  <link href="${baseurl}/templates/blackdashboard/css/black-dashboard.css?v=1.0.0" rel="stylesheet" />
   <!-- CSS Just for demo purpose, don't include it in your project -->
-  <link href="${baseurl}/blackdashboard/demo/demo.css" rel="stylesheet" />
+  <link href="${baseurl}/templates/blackdashboard/demo/demo.css" rel="stylesheet" />
 </head>
 
 <body class="">
@@ -47,20 +47,20 @@
     </div>
   </div>
   <!--   Core JS Files   -->
-  <script src="${baseurl}/blackdashboard/js/core/jquery.min.js"></script>
-  <script src="${baseurl}/blackdashboard/js/core/popper.min.js"></script>
-  <script src="${baseurl}/blackdashboard/js/core/bootstrap.min.js"></script>
-  <script src="${baseurl}/blackdashboard/js/plugins/perfect-scrollbar.jquery.min.js"></script>
+  <script src="${baseurl}/templates/blackdashboard/js/core/jquery.min.js"></script>
+  <script src="${baseurl}/templates/blackdashboard/js/core/popper.min.js"></script>
+  <script src="${baseurl}/templates/blackdashboard/js/core/bootstrap.min.js"></script>
+  <script src="${baseurl}/templates/blackdashboard/js/plugins/perfect-scrollbar.jquery.min.js"></script>
   <!--  Google Maps Plugin    -->
   <!-- Place this tag in your head or just before your close body tag. -->
   <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_KEY_HERE"></script>
   <!-- Chart JS -->
-  <script src="${baseurl}/blackdashboard/js/plugins/chartjs.min.js"></script>
+  <script src="${baseurl}/templates/blackdashboard/js/plugins/chartjs.min.js"></script>
   <!--  Notifications Plugin    -->
-  <script src="${baseurl}/blackdashboard/js/plugins/bootstrap-notify.js"></script>
+  <script src="${baseurl}/templates/blackdashboard/js/plugins/bootstrap-notify.js"></script>
   <!-- Control Center for Black Dashboard: parallax effects, scripts for the example pages etc -->
-  <script src="${baseurl}/blackdashboard/js/black-dashboard.min.js?v=1.0.0"></script><!-- Black Dashboard DEMO methods, don't include it in your project! -->
-  <script src="${baseurl}/blackdashboard/demo/demo.js"></script>
+  <script src="${baseurl}/templates/blackdashboard/js/black-dashboard.min.js?v=1.0.0"></script><!-- Black Dashboard DEMO methods, don't include it in your project! -->
+  <script src="${baseurl}/templates/blackdashboard/demo/demo.js"></script>
   <script>
     $(document).ready(function() {
       $().ready(function() {
diff --git a/blackdashboard/main.py b/blackdashboard/main.py
index e12de7c..5018d9e 100644
--- a/blackdashboard/main.py
+++ b/blackdashboard/main.py
@@ -2,58 +2,39 @@ from core   import html
 
 static = [
     {
-        'name':'/blackdashboard/css',
-        'value':{
-            'tools.staticdir.on'    : True ,
-            'tools.staticdir.dir'   : './templates/blackdashboard/static/css' ,
-        }
+        "route":"/templates/blackdashboard/css/<filepath>",
+        "root":"./templates/blackdashboard/static/css"
     },
     {
-        'name':'/blackdashboard/demo',
-        'value':{
-            'tools.staticdir.on'    : True ,
-            'tools.staticdir.dir'   : './templates/blackdashboard/static/demo' ,
-        }
+        "route":"/templates/blackdashboard/demo/<filepath>",
+        "root":"./templates/blackdashboard/static/demo"
     },
     {
-        'name':'/blackdashboard/fonts',
-        'value':{
-            'tools.staticdir.on'    : True ,
-            'tools.staticdir.dir'   : './templates/blackdashboard/static/fonts' ,
-        }
+        "route":"/templates/blackdashboard/fonts/<filepath>",
+        "root":"./templates/blackdashboard/static/fonts"
     },
     {
-        'name':'/blackdashboard/img',
-        'value':{
-            'tools.staticdir.on'    : True ,
-            'tools.staticdir.dir'   : './templates/blackdashboard/static/img' ,
-        }
+        "route":"/templates/blackdashboard/img/<filepath>",
+        "root":"./templates/blackdashboard/static/img"
     },
     {
-        'name':'/blackdashboard/js',
-        'value':{
-            'tools.staticdir.on'    : True ,
-            'tools.staticdir.dir'   : './templates/blackdashboard/static/js' ,
-        }
+        "route":"/templates/blackdashboard/js/<filepath>",
+        "root":"./templates/blackdashboard/static/js"
     },
     {
-        'name':'/blackdashboard/scss',
-        'value':{
-            'tools.staticdir.on'    : True ,
-            'tools.staticdir.dir'   : './templates/blackdashboard/static/scss' ,
-        }
-    },
+        "route":"/templates/blackdashboard/scss/<filepath>",
+        "root":"./templates/blackdashboard/static/scss"
+    }
 ]
 
 def main(dir, page):
-
     html_template   = html.main.get_html("templates/blackdashboard/html")
     html_page       = html.main.get_html(dir)
     params_list = {
-        "template"  : html_template ["template.html"    ]   ,
+        "index"     : html_template ["index.html"       ]   ,
         "navbar"    : html_template ["navbar.html"      ]   ,
         "sidebar"   : html_template ["sidebar.html"     ]   ,
         "footer"    : html_template ["footer.html"      ]   ,
-        "container" : html_page     [ page+".html"      ]
+        "container" : html_page     [f"{page}.html"     ]
     }
     return params_list
