From 86dc38a8da464593ce1d9a3fda6de5439ec5d847 Mon Sep 17 00:00:00 2001
From: lukas-heiligenbrunner <lheilige@htl-steyr.ac.at>
Date: Sun, 12 Jan 2020 11:23:47 +0100
Subject: [PATCH] * Waste logo on every page * username displayed right on
 every page

---
 src/resources/wwwroot/404Error.html     |   2 +-
 src/resources/wwwroot/adminpanel.html   |   4 +-
 src/resources/wwwroot/dashboard.html    |   8 +-
 src/resources/wwwroot/device.html       |   3 +-
 src/resources/wwwroot/index.html        | 113 ++++++++++++------------
 src/resources/wwwroot/js/dashboard.js   |  26 ++----
 src/resources/wwwroot/js/userManager.js |  14 +++
 src/resources/wwwroot/user.html         |   4 +-
 8 files changed, 93 insertions(+), 81 deletions(-)
 create mode 100644 src/resources/wwwroot/js/userManager.js

diff --git a/src/resources/wwwroot/404Error.html b/src/resources/wwwroot/404Error.html
index 542149d..2f1b83d 100644
--- a/src/resources/wwwroot/404Error.html
+++ b/src/resources/wwwroot/404Error.html
@@ -23,7 +23,7 @@
     <aside class="main-sidebar sidebar-dark-primary elevation-4">
         <!-- Brand Logo -->
         <a href="dashboard.html" class="brand-link">
-            <img src="lib/AdminLTE/dist/img/AdminLTELogo.png"
+            <img src="/favicon.png"
                  alt="AdminLTE Logo"
                  class="brand-image img-circle elevation-3"
                  style="opacity: .8">
diff --git a/src/resources/wwwroot/adminpanel.html b/src/resources/wwwroot/adminpanel.html
index 18579f8..c7e84a6 100644
--- a/src/resources/wwwroot/adminpanel.html
+++ b/src/resources/wwwroot/adminpanel.html
@@ -45,7 +45,7 @@
     <aside class="main-sidebar sidebar-dark-primary elevation-4">
         <!-- Brand Logo -->
         <a href="dashboard.html" class="brand-link">
-            <img src="lib/AdminLTE/dist/img/AdminLTELogo.png" alt="AdminLTE Logo"
+            <img src="/favicon.png" alt="AdminLTE Logo"
                  class="brand-image img-circle elevation-3"
                  style="opacity: .8">
             <span class="brand-text font-weight-light">Waste Control</span>
@@ -271,5 +271,7 @@
 
 <script src="lib/AdminLTE/plugins/sweetalert2/sweetalert2.all.js"></script>
 
+<script src="js/userManager.js"></script>
+
 </body>
 </html>
diff --git a/src/resources/wwwroot/dashboard.html b/src/resources/wwwroot/dashboard.html
index 7c0a082..54d50ef 100644
--- a/src/resources/wwwroot/dashboard.html
+++ b/src/resources/wwwroot/dashboard.html
@@ -47,7 +47,7 @@
     <aside class="main-sidebar sidebar-dark-primary elevation-4">
         <!-- Brand Logo -->
         <a href="dashboard.html" class="brand-link">
-            <img src="lib/AdminLTE/dist/img/AdminLTELogo.png" alt="AdminLTE Logo"
+            <img src="/favicon.png" alt="AdminLTE Logo"
                  class="brand-image img-circle elevation-3"
                  style="opacity: .8">
             <span class="brand-text font-weight-light">Waste Control</span>
@@ -440,12 +440,16 @@
 <script type="text/javascript"
         src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/js/bootstrap-datepicker.min.js"></script>
 
-<script type="text/javascript" src="js/dashboard.js"></script>
 <!-- DataTables -->
 <script src="lib/AdminLTE/plugins/datatables/jquery.dataTables.js"></script>
 <script src="lib/AdminLTE/plugins/datatables-bs4/js/dataTables.bootstrap4.js"></script>
 
 <script src="lib/AdminLTE/plugins/sweetalert2/sweetalert2.all.js"></script>
 
+<!-- OWN -->
+
+<script type="text/javascript" src="js/dashboard.js"></script>
+<script src="js/userManager.js"></script>
+
 </body>
 </html>
diff --git a/src/resources/wwwroot/device.html b/src/resources/wwwroot/device.html
index 2c42a37..835dd47 100644
--- a/src/resources/wwwroot/device.html
+++ b/src/resources/wwwroot/device.html
@@ -45,7 +45,7 @@
     <aside class="main-sidebar sidebar-dark-primary elevation-4">
         <!-- Brand Logo -->
         <a href="dashboard.html" class="brand-link">
-            <img src="lib/AdminLTE/dist/img/AdminLTELogo.png" alt="AdminLTE Logo"
+            <img src="/favicon.png" alt="AdminLTE Logo"
                  class="brand-image img-circle elevation-3"
                  style="opacity: .8">
             <span class="brand-text font-weight-light">Waste Control</span>
@@ -288,6 +288,7 @@
 
 <script src="lib/AdminLTE/plugins/sweetalert2/sweetalert2.all.js"></script>
 
+<script src="js/userManager.js"></script>
 <script src="js/device.js"></script>
 </body>
 </html>
diff --git a/src/resources/wwwroot/index.html b/src/resources/wwwroot/index.html
index 9d58a73..22914a9 100644
--- a/src/resources/wwwroot/index.html
+++ b/src/resources/wwwroot/index.html
@@ -1,74 +1,77 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
-  <head>
+<head>
     <meta charset="utf-8">
-	<title>Login Page</title>
-   <!--Made with love by Mutiullah Samim -->
+    <title>Login Page</title>
+    <!--Made with love by Mutiullah Samim -->
 
-   <!-- Latest compiled and minified CSS -->
-   <link rel="stylesheet" href="lib/bootstrap.min.css">
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="lib/bootstrap.min.css">
 
-   <!-- jQuery library -->
-   <script src="lib/jquery.min.js"></script>
+    <!-- jQuery library -->
+    <script src="lib/jquery.min.js"></script>
 
-   <!-- Popper JS -->
-   <script src="lib/popper.min.js"></script>
+    <!-- Popper JS -->
+    <script src="lib/popper.min.js"></script>
 
-   <!-- Latest compiled JavaScript -->
-   <script src="lib/bootstrap.min.js"></script>
+    <!-- Latest compiled JavaScript -->
+    <script src="lib/bootstrap.min.js"></script>
 
-  <!--Fontawesome CDN-->
-	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
+    <!--Fontawesome CDN-->
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css"
+          integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
 
-	<!--Custom styles-->
-	<link rel="stylesheet" type="text/css" href="css/index.css">
+    <!--Custom styles-->
+    <link rel="stylesheet" type="text/css" href="css/index.css">
 
-  <script type="text/javascript" src="js/index.js"></script>
+    <script type="text/javascript" src="js/index.js"></script>
 
-	  <script src="lib/AdminLTE/plugins/sweetalert2/sweetalert2.all.js"></script>
+    <script src="lib/AdminLTE/plugins/sweetalert2/sweetalert2.all.js"></script>
 
-	  <link rel="manifest" href="/manifest.json">
+    <link rel="manifest" href="/manifest.json">
+
+    <link rel="icon" type="image/png" href="/favicon.png">
 </head>
 <body>
 <div class="container">
-	<div class="d-flex justify-content-center h-100">
-		<div class="card">
-			<div class="card-header">
-				<h3>Sign In</h3>
-			</div>
-			<div class="card-body">
-				<form>
-					<div class="input-group form-group">
-						<div class="input-group-prepend">
-							<span class="input-group-text"><i class="fas fa-user"></i></span>
-						</div>
-						<input type="text" class="form-control" placeholder="username" id="userfield">
+    <div class="d-flex justify-content-center h-100">
+        <div class="card">
+            <div class="card-header">
+                <h3>Sign In</h3>
+            </div>
+            <div class="card-body">
+                <form>
+                    <div class="input-group form-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fas fa-user"></i></span>
+                        </div>
+                        <input type="text" class="form-control" placeholder="username" id="userfield">
 
-					</div>
-					<div class="input-group form-group">
-						<div class="input-group-prepend">
-							<span class="input-group-text"><i class="fas fa-key"></i></span>
-						</div>
-						<input type="password" class="form-control" placeholder="password" id="passfield">
-					</div>
-					<div class="row align-items-center remember">
-						<input type="checkbox">Remember Me
-					</div>
-					<div class="form-group">
-						<input type="submit" value="Login" class="btn float-right login_btn" id="loginbtn">
-					</div>
-				</form>
-			</div>
-			<div class="card-footer">
-				<div class="d-flex justify-content-center links">
-					Don't have an account?<a href="register.html">Sign Up</a>
-				</div>
-				<div class="d-flex justify-content-center">
-					<a href="#">Forgot your password?</a>
-				</div>
-			</div>
-		</div>
-	</div>
+                    </div>
+                    <div class="input-group form-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fas fa-key"></i></span>
+                        </div>
+                        <input type="password" class="form-control" placeholder="password" id="passfield">
+                    </div>
+                    <div class="row align-items-center remember">
+                        <input type="checkbox">Remember Me
+                    </div>
+                    <div class="form-group">
+                        <input type="submit" value="Login" class="btn float-right login_btn" id="loginbtn">
+                    </div>
+                </form>
+            </div>
+            <div class="card-footer">
+                <div class="d-flex justify-content-center links">
+                    Don't have an account?<a href="register.html">Sign Up</a>
+                </div>
+                <div class="d-flex justify-content-center">
+                    <a href="#">Forgot your password?</a>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 </body>
 </html>
diff --git a/src/resources/wwwroot/js/dashboard.js b/src/resources/wwwroot/js/dashboard.js
index adad1d1..b0c262a 100644
--- a/src/resources/wwwroot/js/dashboard.js
+++ b/src/resources/wwwroot/js/dashboard.js
@@ -1,17 +1,4 @@
 $(document).ready(function () {
-    console.log("page loaded");
-    $.post('/senddata/checkloginstate', 'action=getloginstate', function (data) {
-        console.log(data);
-        if (data.loggedin == true) {
-            $("#userlabel").html(" " + data.username);
-            if (data.permission > 0) {
-                $("#adminpanel").show();
-            }
-        } else {
-            $("#userlabel").html(" not logged in!!");
-        }
-    }, 'json');
-
     //load total collections
     $.post('/senddata/wastedata', 'action=getStartHeaderData', function (data) {
         console.log(data);
@@ -27,7 +14,7 @@ $(document).ready(function () {
     //load version footer
     //
     $.post('/senddata/wastedata', 'action=getversionandbuildtime', function (data) {
-        $("#version-footer-label").html("<b>Version</b> "+data.version+" <b>Build</b> "+data.buildtime);
+        $("#version-footer-label").html("<b>Version</b> " + data.version + " <b>Build</b> " + data.buildtime);
     }, 'json');
 
 
@@ -112,7 +99,7 @@ $(document).ready(function () {
 
             if (data.query == "ok") {
                 $('#picupdates-tablebody').html("");
-                 $(".delbtndate").off();
+                $(".delbtndate").off();
 
                 for (var i = 0; i < data.data.length; i++) {
                     $('#picupdates-tablebody').append("<tr>" +
@@ -156,11 +143,11 @@ $(document).ready(function () {
                 });
             }
             datetable = $("#table-pickupdates").DataTable({
-                "order": [[ 3, "asc" ]]
-            } );
+                "order": [[3, "asc"]]
+            });
 
             //todo picupdates-tablebody
-        },"json");
+        }, "json");
     }
 
     reloadtable();
@@ -274,7 +261,7 @@ $(document).ready(function () {
         dropdata.html("");
         console.log("clickeeeed");
 
-        $.post('/senddata/newdate', 'action=gettypes&cityname=' + $("#dropdown-city").html()+'&zonename='+$("#dropdown-zone").html(), function (data) {
+        $.post('/senddata/newdate', 'action=gettypes&cityname=' + $("#dropdown-city").html() + '&zonename=' + $("#dropdown-zone").html(), function (data) {
             console.log(data);
             if (data.query == "ok") {
                 for (var i = 0; i < data.data.length; i++) {
@@ -291,7 +278,6 @@ $(document).ready(function () {
         });
 
 
-
     });
 
 
diff --git a/src/resources/wwwroot/js/userManager.js b/src/resources/wwwroot/js/userManager.js
new file mode 100644
index 0000000..f8f517b
--- /dev/null
+++ b/src/resources/wwwroot/js/userManager.js
@@ -0,0 +1,14 @@
+$(document).ready(function () {
+    console.log("page loaded");
+    $.post('/senddata/checkloginstate', 'action=getloginstate', function (data) {
+        console.log(data);
+        if (data.loggedin == true) {
+            $("#userlabel").html(" " + data.username);
+            if (data.permission > 0) {
+                $("#adminpanel").show();
+            }
+        } else {
+            $("#userlabel").html(" not logged in!!");
+        }
+    }, 'json');
+});
\ No newline at end of file
diff --git a/src/resources/wwwroot/user.html b/src/resources/wwwroot/user.html
index 8b0c7ac..829e415 100644
--- a/src/resources/wwwroot/user.html
+++ b/src/resources/wwwroot/user.html
@@ -45,7 +45,7 @@
     <aside class="main-sidebar sidebar-dark-primary elevation-4">
         <!-- Brand Logo -->
         <a href="dashboard.html" class="brand-link">
-            <img src="lib/AdminLTE/dist/img/AdminLTELogo.png" alt="AdminLTE Logo"
+            <img src="/favicon.png" alt="AdminLTE Logo"
                  class="brand-image img-circle elevation-3"
                  style="opacity: .8">
             <span class="brand-text font-weight-light">Waste Control</span>
@@ -289,5 +289,7 @@
 
 <script src="lib/AdminLTE/plugins/sweetalert2/sweetalert2.all.js"></script>
 
+<script src="js/userManager.js"></script>
+
 </body>
 </html>