From 954eb8d61ce8cbe96cfa4a30d2567735a315a599 Mon Sep 17 00:00:00 2001 From: lukas-heiligenbrunner Date: Mon, 11 Nov 2019 18:51:16 +0100 Subject: [PATCH] added 404 page and redirect if logged out --- resources/wwwroot/404Error.html | 124 ++++++++++++++++++ .../css/{settings.css => dashboard.css} | 0 resources/wwwroot/dashboard.html | 8 +- .../wwwroot/js/{settings.js => dashboard.js} | 10 +- resources/wwwroot/settings.html | 4 +- .../basicutils/Log.java | 16 +-- .../website/MainPage.java | 43 +++--- 7 files changed, 163 insertions(+), 42 deletions(-) create mode 100644 resources/wwwroot/404Error.html rename resources/wwwroot/css/{settings.css => dashboard.css} (100%) rename resources/wwwroot/js/{settings.js => dashboard.js} (91%) diff --git a/resources/wwwroot/404Error.html b/resources/wwwroot/404Error.html new file mode 100644 index 0000000..542149d --- /dev/null +++ b/resources/wwwroot/404Error.html @@ -0,0 +1,124 @@ + + + + + + AdminLTE 3 | 404 Page not found + + + + + + + + + + + + + +
+ + + + + +
+ +
+
+
+
+

404 Error Page

+
+
+
    +
  1. Home
    2. +
  2. 404 Error Page
    3. +
+
+
+
+
+ + +
+
+

404

+ +
+

Oops! Page not found.

+ +

+ We could not find the page you were looking for. + Meanwhile, you may return to dashboard or try using the search form. +

+ +
+
+ + +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+
+ Version 3.0.0 +
+ Copyright © 2014-2019 AdminLTE.io. All rights + reserved. +
+ + + + +
+ + + + + + + + + + + + diff --git a/resources/wwwroot/css/settings.css b/resources/wwwroot/css/dashboard.css similarity index 100% rename from resources/wwwroot/css/settings.css rename to resources/wwwroot/css/dashboard.css diff --git a/resources/wwwroot/dashboard.html b/resources/wwwroot/dashboard.html index 3cd6ee3..1a80b02 100644 --- a/resources/wwwroot/dashboard.html +++ b/resources/wwwroot/dashboard.html @@ -32,7 +32,7 @@ - + @@ -59,7 +59,7 @@
- Username to set! + Username to set!
@@ -78,7 +78,7 @@
  • - +

    Logout @@ -357,6 +357,6 @@ - + diff --git a/resources/wwwroot/js/settings.js b/resources/wwwroot/js/dashboard.js similarity index 91% rename from resources/wwwroot/js/settings.js rename to resources/wwwroot/js/dashboard.js index 684b2a9..c26fe80 100644 --- a/resources/wwwroot/js/settings.js +++ b/resources/wwwroot/js/dashboard.js @@ -17,15 +17,6 @@ $(document).ready(function () { }, 'json'); }); - $('#addnewtable-btn').click(function () { - console.log("clicked"); - $('.create-table').show(); - }); - - $('.exit-icon').click(function () { - $('.create-table').hide(); - }); - $('.dropdown-item').click(function () { $('#dropdown-wastetype').html($(this).html()); }); @@ -57,6 +48,7 @@ $(document).ready(function () { }); + //Date picker pop up actions... var date_input = $('input[name="date"]'); //our date input has the name "date" var container = $('.bootstrap-iso form').length > 0 ? $('.bootstrap-iso form').parent() : "body"; var options = { diff --git a/resources/wwwroot/settings.html b/resources/wwwroot/settings.html index 0172e6b..5d95b1e 100644 --- a/resources/wwwroot/settings.html +++ b/resources/wwwroot/settings.html @@ -26,10 +26,10 @@ - + - +