Codebase update and UI (v1.2.0)

README.md

@@ -1,44 +1,31 @@
-# [Jinja Template](https://github.com/app-generator/jinja-template) - [Argon Dashboard](https://appseed.us/argon-design)
+# [Jinja Template](https://appseed.us/jinja-template) Argon
 
-> Template Theme provided by [AppSeed](https://appseed.us) - Features:
+> Template [boilerplate code](https://appseed.us/boilerplate-code) used by [AppSeed](https://appseed.us) to generate simple starters coded in [Flask](https://palletsprojects.com/p/flask/) - Features:
 
 - UI Kit: **Argon Dashboard** (Free Version) by **Creative-Tim**
 - Render Engine: Flask / [Jinja2](https://jinja.palletsprojects.com/)
-- **[MIT License](https://github.com/app-generator/license-mit)**
-- Free support via **Github** issues tracker
-- Paid 24/7 Live Support via [Discord](https://discord.gg/fZC6hup).
-
-> Links
-
-- [Jinja Template - Argon Demo](https://jinja-template-argon-dashboard.appseed.us/) - LIVE Demo
-- [Jinja Template - Argon Docs](https://docs.appseed.us/jinja-template/jinja-template-argon-dashboard/)
-- [What is Jinja](https://docs.appseed.us/what-is/jinja/) - a short introduction to Jinja
-- [Jinja Template](https://github.com/app-generator/jinja-template) - A curated list with Jinja Templates (free & commercial) generated by AppSeed
-
-> Used by 
-
-- [Flask Dashboard - Argon Design](https://appseed.us/admin-dashboards/flask-boilerplate-dashboard-argon) - free admin dashboard coded in Flask
-- [Django Dashboard - Argon Design](https://appseed.us/admin-dashboards/django-dashboard-argon) - simple Django dashboard
+- Deployment scripts: Docker, Gunicorn/Nginx, HEROKU
+- Support via **Github** (issues tracker) and [Discord](https://discord.gg/fZC6hup).
 
 <br />
 
-## UI Kit - [Argon Dashboard](https://appseed.us/argon-design)
+> Links
 
-*Vendor Notes* - [Argon Dashboard](https://appseed.us/argon-design) is built with over 100 individual components, giving you the freedom of choosing and combining. All components can take variations in color, that you can easily modify using SASS files.
-You will save a lot of time going from prototyping to full-functional code, because all elements are implemented. This Dashboard is coming with pre-built examples, so the development process is seamless, switching from our pages to the real website is very easy to be done.
+- [Jinja Argon Dashboard](jinja-argon-dashboard.appseed-srv1.com) - starter in action
+- More [Jinja Templates](https://appseed.us/jinja-template) provided by AppSeed
 
 <br />
 
-![Jinja Template - Argon Dashboard, thumbnail image.](https://raw.githubusercontent.com/app-generator/jinja-template-argon-dashboard/master/media/jinja-template-argon-dashboard-screen.png)
+![Jinja Template - Argon Dashboard, thumbnail image.](https://raw.githubusercontent.com/app-generator/jinja-argon-dashboard/master/media/jinja-argon-dashboard-screen.png)
 
 <br />
 
 ## Build from sources
 
 ```bash
 $ # Clone the sources
-$ git clone https://github.com/app-generator/jinja-template-argon-dashboard.git
-$ cd jinja-template-argon-dashboard
+$ git clone https://github.com/app-generator/jinja-argon-dashboard.git
+$ cd jinja-argon-dashboard
 $
 $ # Virtualenv modules installation (Unix based systems)
 $ virtualenv env
@@ -127,8 +114,8 @@ The steps to start the template using Docker:
 > Get the code
 
 ```bash
-$ git clone https://github.com/app-generator/jinja-template-argon-dashboard.git
-$ cd jinja-template-argon-dashboard
+$ git clone https://github.com/app-generator/jinja-argon-dashboard.git
+$ cd jinja-argon-dashboard
 ```
 
 > Start the app in Docker
@@ -190,4 +177,4 @@ Visit `http://localhost:8001` in your browser. The app should be up & running.
 <br />
 
 ---
-[Jinja Template](https://github.com/app-generator/jinja-template) [Argon Dashboard](https://appseed.us/argon-design) - Provided by **AppSeed** [Web App Generator](https://appseed.us/app-generator).
+[Jinja Template](https://github.com/app-generator/jinja-template) Argon Dashboard - Provided by **AppSeed** [App Generator](https://appseed.us/app-generator).

app/templates/includes/footer-fullscreen.html

@@ -5,15 +5,15 @@
           <div class="col-xl-6">
             <div class="copyright text-center text-xl-left text-muted">
                 <a target="_blank" 
-                   href="https://github.com/app-generator/jinja-template-argon-dashboard" 
-                   class="font-weight-bold ml-1" target="_blank">Jinja Template Argon</a>
+                   href="https://appseed.us/jinja-template" 
+                   class="font-weight-bold ml-1" target="_blank">Jinja Templates</a>
             </div>
           </div>
           <div class="col-xl-6">
             <div class="text-center text-xl-right text-muted">
                &copy; <a target="_blank" 
-                         href="https://www.creative-tim.com/?AFFILIATE=128200">Creative-Tim</a> 
-               - coded by <a target="_blank" href="https://appseed.us?ref=j2-argon-demo">AppSeed</a>
+                         href="https://bit.ly/3fKQZaL">Creative-Tim</a> 
+               - coded by <a target="_blank" href="https://appseed.us">AppSeed</a>
             </div>
           </div>
         </div>

app/templates/includes/footer.html

@@ -4,15 +4,15 @@
         <div class="row align-items-center justify-content-xl-between">
           <div class="col-xl-6">
             <div class="text-center text-xl-left text-muted">
-              <a href="https://github.com/app-generator/jinja-template-argon-dashboard" 
-                 class="font-weight-bold ml-1" target="_blank">Jinja Template Argon</a>
+              <a href="https://appseed.us/jinja-template" 
+                 class="font-weight-bold ml-1" target="_blank">Jinja Templates</a>
             </div>
           </div>
           <div class="col-xl-6">
             <div class="text-center text-xl-right text-muted">
-              <a href="https://www.creative-tim.com?AFFILIATE=128200" 
+              <a href="https://bit.ly/3fKQZaL" 
                  class="font-weight-bold ml-1" target="_blank"> &copy; Creative-Tim</a> 
-                 - coded by <a target="_blank" href="https://appseed.us?ref=j2-argon-demo">AppSeed</a>
+                 - coded by <a target="_blank" href="https://appseed.us">AppSeed</a>
             </div>
           </div>
         </div>

app/templates/includes/navigation-fullscreen.html

@@ -57,14 +57,14 @@
         </li>
         <li class="nav-item">
           <a class="nav-link nav-link-icon" 
-             href="https://github.com/app-generator/jinja-template-argon-dashboard" 
+             href="https://github.com/app-generator/jinja-argon-dashboard" 
              target="_blank" data-toggle="tooltip" data-original-title="Star us on Github">
             <i class="fab fa-github"></i>
             <span class="nav-link-inner--text d-lg-none">Github</span>
           </a>
         </li>
         <li class="nav-item d-none d-lg-block ml-lg-4">
-          <a href="https://appseed.us?ref=j2-argon-demo" target="_blank" class="btn btn-neutral btn-icon">
+          <a href="https://appseed.us" target="_blank" class="btn btn-neutral btn-icon">
             <span class="btn-inner--icon">
               <i class="fas fa-shopping-cart mr-2"></i>
             </span>

app/templates/includes/sidenav.html

@@ -12,31 +12,31 @@
         <!-- Nav items -->
         <ul class="navbar-nav">
           <li class="nav-item">
-            <a class="nav-link active" href="/">
+            <a class="nav-link {% if 'index' in segment %} active {% endif %}" href="/">
               <i class="ni ni-tv-2 text-primary"></i>
               <span class="nav-link-text">Dashboard</span>
             </a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="/icons.html">
+            <a class="nav-link {% if 'icons' in segment %} active {% endif %}" href="/icons.html">
               <i class="ni ni-planet text-orange"></i>
               <span class="nav-link-text">Icons</span>
             </a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="/map.html">
+            <a class="nav-link {% if 'map' in segment %} active {% endif %}" href="/map.html">
               <i class="ni ni-pin-3 text-primary"></i>
               <span class="nav-link-text">Google</span>
             </a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="/profile.html">
+            <a class="nav-link {% if 'profile' in segment %} active {% endif %}" href="/profile.html">
               <i class="ni ni-single-02 text-yellow"></i>
               <span class="nav-link-text">Profile</span>
             </a>
           </li>
           <li class="nav-item">
-            <a class="nav-link" href="/tables.html">
+            <a class="nav-link {% if 'tables' in segment %} active {% endif %}" href="/tables.html">
               <i class="ni ni-bullet-list-67 text-default"></i>
               <span class="nav-link-text">Tables</span>
             </a>
@@ -63,9 +63,9 @@ <h6 class="navbar-heading p-0 text-muted">
         <!-- Navigation -->
         <ul class="navbar-nav mb-md-3">
           <li class="nav-item">
-            <a class="nav-link" href="https://github.com/app-generator/jinja-template-argon-dashboard" target="_blank">
+            <a class="nav-link" href="https://github.com/app-generator/jinja-argon-dashboard" target="_blank">
               <i class="ni ni-palette"></i>
-              <span class="nav-link-text">Source Code</span>
+              <span class="nav-link-text">Sources</span>
             </a>
           </li>
           <li class="nav-item">

app/templates/layouts/base-fullscreen.html

@@ -17,7 +17,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
   <title>
-    Jinja Template Argon - {% block title %} Open-Source Admin Panel {% endblock %} | AppSeed
+    Jinja Argon Dashboard - {% block title %} Open-Source Admin Panel {% endblock %} | AppSeed
   </title>
 
   <link rel="icon" href="/static/assets/img/brand/favicon.png" type="image/png">
@@ -48,11 +48,11 @@
             <div class="col-lg-5 col-md-6">
               <h1 class="text-white">
                 <a target="_blank" class="text-white"
-                   href="https://github.com/app-generator/jinja-template-argon-dashboard">Jinja Template Argon</a>
+                   href="https://github.com/app-generator/jinja-argon-dashboard">Jinja Argon</a>
               </h1>
               <p class="text-lead text-light">
                 Open-Source Jinja Template with Argon Design 
-                Coded by <a target="_blank" class="text-white" href="https://appseed.us?ref=j2-argon-demo">AppSeed</a>.  
+                Coded by <a target="_blank" class="text-white" href="https://appseed.us">AppSeed</a>.  
               </p>
             </div>
           </div>

app/templates/layouts/base.html

@@ -21,7 +21,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
   <title>
-    Jinja Template Argon - {% block title %} Open-Source Admin Panel {% endblock %} | AppSeed
+    Jinja Argon Dashboard - {% block title %} Open-Source Admin Panel {% endblock %} | AppSeed
   </title>
 
   <!-- Favicon - loaded as static -->

app/views.py

@@ -4,7 +4,7 @@
 """
 
 # Flask modules
-from flask   import render_template
+from flask   import render_template, request
 from jinja2  import TemplateNotFound
 
 # App modules
@@ -17,8 +17,26 @@ def index(path):
 
     try:
 
+        # Detect the current page
+        segment = get_segment( request )
+
         # Serve the file (if exists) from app/templates/FILE.html
-        return render_template( path )
+        return render_template( path, segment=segment )
 
     except TemplateNotFound:
         return render_template('page-404.html'), 404
+
+# Helper - Extract current page name from request 
+def get_segment( request ): 
+
+    try:
+
+        segment = request.path.split('/')[-1]
+
+        if segment == '':
+            segment = 'index'
+
+        return segment    
+
+    except:
+        return None