Worked on dashboard - made a blank page template - started credits page

app/classes/web/panel_handler.py

@@ -46,6 +46,9 @@ class PanelHandler(BaseHandler):
         if page == 'unauthorized':
             template = "panel/denied.html"
 
+        elif page == 'credits':
+            template = "panel/credits.html"
+
         elif page == 'dashboard':
             page_data['servers'] = db_helper.get_all_servers_stats()
 
@@ -55,6 +58,7 @@ class PanelHandler(BaseHandler):
                     s['int_ping_results'] = data
                 except:
                     pass
+
             template = "panel/dashboard.html"
 
         self.render(

app/config/version.json

@@ -1,5 +1,5 @@
 {
   "major": 4,
   "minor": 0,
-  "sub": "Alpha"
+  "sub": "Alpha 1"
 }

app/frontend/templates/blank_page_template.html

@@ -0,0 +1,56 @@
+{% extends ../base.html %}
+
+{% block meta %}
+<!--  <meta http-equiv="refresh" content="60">-->
+{% end %}
+
+{% block title %}Crafty Controller - Blank Page{% end %}
+
+{% block content %}
+
+<div class="content-wrapper">
+
+    <!-- Page Title Header Starts-->
+  <div class="row page-title-header">
+    <div class="col-12">
+      <div class="page-header">
+        <h4 class="page-title">Dashboard</h4>
+      </div>
+    </div>
+
+  </div>
+  <!-- Page Title Header Ends-->
+
+  <div class="row">
+    <div class="col-md-12 grid-margin">
+      <div class="card">
+        <div class="card-body">
+
+
+
+
+
+        </div>
+      </div>
+    </div>
+  </div>
+
+
+
+
+
+</div>
+<!-- content-wrapper ends -->
+
+{% end %}
+
+{% block js %}
+<script>
+
+$( document ).ready(function() {
+  console.log('ready for JS!')
+
+});
+</script>
+
+{% end %}

app/frontend/templates/main_menu.html

@@ -21,9 +21,12 @@
               </a>
               <div class="collapse" id="page-layouts">
                 <ul class="nav flex-column sub-menu">
+                  <li class="nav-item">
+                      <a class="nav-link" href="/server/step1"><i class="fas fa-plus-circle"></i> &nbsp; Add New Server</a>
+                    </li>
                   {% for s in data['menu_servers'] %}
                     <li class="nav-item">
-                      <a class="nav-link" href="/panel/server_detail?id={{s['server_id']}}">{{s['server_name']}}</a>
+                      <a class="nav-link" href="/panel/server_detail?id={{s['server_id']}}"><i class="fas fa-server"></i> &nbsp; {{s['server_name']}}</a>
                     </li>
                   {% end %}
 
@@ -73,7 +76,7 @@
             </li>
 
             <li class="nav-item">
-              <a class="nav-link" href="pages/samples/widgets.html">
+              <a class="nav-link" href="/panel/credits">
                 <i class="fas fa-heart"></i> &nbsp;
                 <span class="menu-title">Credits</span>
               </a>

app/frontend/templates/panel/credits.html

@@ -0,0 +1,224 @@
+{% extends ../base.html %}
+
+{% block meta %}
+<!--  <meta http-equiv="refresh" content="60">-->
+{% end %}
+
+{% block title %}Crafty Controller - Credits{% end %}
+
+{% block content %}
+
+<div class="content-wrapper">
+
+    <!-- Page Title Header Starts-->
+  <div class="row page-title-header">
+    <div class="col-12">
+      <div class="page-header">
+        <h4 class="page-title">Credits
+          <small>Without these people, you wouldn't have Crafty</small>
+        </h4>
+      </div>
+    </div>
+
+  </div>
+  <!-- Page Title Header Ends-->
+
+  <div class="row">
+    <div class="col-md-12 grid-margin">
+      <div class="card">
+        <div class="card-body">
+
+          <div class="row">
+
+            <div class="col-md-6 mb-5">
+              <div class="card rounded shadow-none">
+                <div class="card-body">
+
+                  <div class="row">
+                    <div class="col-md-4">
+
+                      <div class="user-avatar mb-auto">
+                        <img src="/static/assets/images/credits/ptarrant_cropped.png"
+                             alt="profile image" class="profile-img img-lg rounded-circle">
+                      </div>
+
+                      <div class="wrapper">
+                        <div class="wrapper d-flex align-items-center">
+                          <h4 class="mb-0 font-weight-medium">Phillip Tarrant</h4>
+                        </div>
+
+                        <div class="wrapper d-flex align-items-center font-weight-medium text-muted">
+                          <i class="mdi mdi-map-marker-outline mr-2"></i>
+                          <p class="mb-0 text-muted">Atlanta, GA</p>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="col-md-8">
+                      <div class="wrapper d-flex align-items-start">
+                        <span class="btn btn-sm btn-info mr-2">Staff</span>
+                        <span class="btn btn-sm btn-primary mr-2">Developer</span>
+                        <a href="https://en.wikipedia.org/wiki/Benevolent_dictator_for_life" class="btn btn-sm btn-inverse-success mr-2">BDFL</a>
+                      </div>
+
+                      <div class="wrapper d-flex align-items-start pt-3">
+                        Crafty's Benevolent Dictator for Life.<br /><br />
+                        His interests include Linux, Cybersecurity, hacking, gaming
+                        He enjoys downtime with the family, and playing with his chickens.
+                      </div>
+                    </div>
+                  </div>
+
+                </div>
+              </div>
+            </div>
+
+            <div class="col-md-6 mb-5">
+              <div class="card rounded shadow-none">
+                <div class="card-body">
+
+                  <div class="row">
+                    <div class="col-md-4">
+
+                      <div class="user-avatar mb-auto">
+                        <img src="/static/assets/images/credits/pita_cropped.png"
+                             alt="profile image" class="profile-img img-lg rounded-circle">
+                      </div>
+
+                      <div class="wrapper">
+                        <div class="wrapper d-flex align-items-center">
+                          <h4 class="mb-0 font-weight-medium">Pita Bread</h4>
+                        </div>
+
+                        <div class="wrapper d-flex align-items-center font-weight-medium text-muted">
+                          <i class="mdi mdi-map-marker-outline mr-2"></i>
+                          <p class="mb-0 text-muted">Central, OH</p>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="col-md-8">
+                      <div class="wrapper d-flex align-items-start">
+                        <span class="btn btn-sm btn-info mr-2">Staff</span>
+                        <span class="btn btn-sm btn-inverse-success mr-2">Community Leader</span>
+                      </div>
+
+                      <div class="wrapper d-flex align-items-start pt-3">
+                        His interests include bread, Linux, Networking.
+                        He enjoys Pumpkins, organizing, long-winded emails, but hates wifi
+                      </div>
+                    </div>
+                  </div>
+
+                </div>
+              </div>
+            </div>
+
+          </div> <!-- end user row-->
+
+          <div class="row">
+
+            <div class="col-md-6 mb-5">
+              <div class="card rounded shadow-none">
+                <div class="card-body">
+
+                  <div class="row">
+                    <div class="col-md-4">
+
+                      <div class="user-avatar mb-auto">
+                        <img src="/static/assets/images/credits/andrew_cropped.png"
+                             alt="profile image" class="profile-img img-lg rounded-circle">
+                      </div>
+
+                      <div class="wrapper">
+                        <div class="wrapper d-flex align-items-center">
+                          <h4 class="mb-0 font-weight-medium">Andrew Redacted</h4>
+                        </div>
+
+                        <div class="wrapper d-flex align-items-center font-weight-medium text-muted">
+                          <i class="mdi mdi-map-marker-outline mr-2"></i>
+                          <p class="mb-0 text-muted">East Coast, USA</p>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="col-md-8">
+                      <div class="wrapper d-flex align-items-start">
+                        <span class="btn btn-sm btn-info mr-2">Staff</span>
+                        <span class="btn btn-sm btn-inverse-success mr-2">Support Manager</span>
+                      </div>
+
+                      <div class="wrapper d-flex align-items-start pt-3">
+                        His interests include Linux, gaming, and helping others.
+                        He enjoys long walks on the beach, with his favorite hat, "Turtles"
+                      </div>
+                    </div>
+                  </div>
+
+                </div>
+              </div>
+            </div>
+
+            <div class="col-md-6 mb-5">
+              <div class="card rounded shadow-none">
+                <div class="card-body">
+
+                  <div class="row">
+                    <div class="col-md-4">
+
+                      <div class="user-avatar mb-auto">
+                        <img src="/static/assets/images/credits/manu_cropped.png"
+                             alt="profile image" class="profile-img img-lg rounded-circle">
+                      </div>
+
+                      <div class="wrapper">
+                        <div class="wrapper d-flex align-items-center">
+                          <h4 class="mb-0 font-weight-medium">Manu Redacted</h4>
+                        </div>
+
+                        <div class="wrapper d-flex align-items-center font-weight-medium text-muted">
+                          <i class="mdi mdi-map-marker-outline mr-2"></i>
+                          <p class="mb-0 text-muted">Eastern, CA</p>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="col-md-8">
+                      <div class="wrapper d-flex align-items-start">
+                        <span class="btn btn-sm btn-info mr-2">Staff</span>
+                        <span class="btn btn-sm btn-primary mr-2">Developer</span>
+                        <span class="btn btn-sm btn-inverse-success mr-2">Project Manager</span>
+                      </div>
+
+                      <div class="wrapper d-flex align-items-start pt-3">
+                        His interests include learning, Linux, Programming.
+                        He enjoys speaking French, doing 6 things at once, and testing software.
+                      </div>
+                    </div>
+                  </div>
+
+                </div>
+              </div>
+            </div>
+
+          </div> <!-- end user row-->
+
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- content-wrapper ends -->
+
+{% end %}
+
+{% block js %}
+<script>
+
+$( document ).ready(function() {
+  console.log('ready for JS!')
+
+});
+</script>
+
+{% end %}

app/frontend/templates/panel/dashboard.html

@@ -32,11 +32,15 @@
                   <h5 class="mb-1 font-weight-medium text-primary"> Host</h5>
                   <h3 class="mb-0 font-weight-semibold"> <i class="fas fa-chart-line"></i></h3>
 
-
                 </div>
                 <div class="wrapper my-auto ml-auto ml-lg-4">
-                  <p class="mb-0 text-success">{{ data.get('hosts_data').get('cpu_usage') }} {{ _('CPU Usage') }}</p>
-                  <p class="mb-0 text-danger">{{ data.get('hosts_data').get('mem_percent') }}% {{ _('Memory Usage') }}</p>
+                  <p class="mb-0 text-success" data-toggle="tooltip" data-placement="top" data-html="true" title="CPU Cores: {{ data.get('hosts_data').get('cpu_cores') }} <br /> CPU Cur Freq: {{ data.get('hosts_data').get('cpu_cur_freq') }} <br /> CPU Max Freq: {{ data.get('hosts_data').get('cpu_max_freq') }}" >
+                    {{ data.get('hosts_data').get('cpu_usage') }} {{ _('CPU Usage') }}
+
+                  </p>
+                  <p class="mb-0 text-danger" data-toggle="tooltip" data-placement="top" title="Memory Usage: {{ data.get('hosts_data').get('mem_usage') }}" >
+                    {{ data.get('hosts_data').get('mem_percent') }}% {{ _('Memory Usage') }}
+                  </p>
                 </div>
               </div>
             </div>
@@ -89,11 +93,11 @@
     <div class="col-md-12 col-lg-12 grid-margin stretch-card">
       <div class="card">
         <div class="card-header header-sm d-flex justify-content-between align-items-center">
-          <h4 class="card-title">All Servers</h4>
+          <h4 class="card-title"><i class="fas fa-server"></i> &nbsp;All Servers</h4>
           <div class="d-md-none">
             <small>Can't see everything on mobile?<br /> Try scrolling the table sideways.</small>
           </div>
-
+          <div><a class="nav-link" href="/server/step1"><i class="fas fa-plus-circle"></i> &nbsp; Add New Server</a></div>
         </div>
         <div class="card-body">