From 86660a8d6409c0a299c26ea5291817a6b0c70e05 Mon Sep 17 00:00:00 2001 From: lukas-heiligenbrunner Date: Fri, 27 Mar 2020 19:55:42 +0100 Subject: [PATCH] removed sheduled taskpage for now removed settings index entry --- src/resources/wwwroot/ShedulePickUp.html | 467 --------------------- src/resources/wwwroot/adminpanel.html | 19 +- src/resources/wwwroot/dashboard.html | 19 - src/resources/wwwroot/device.html | 17 - src/resources/wwwroot/js/sheduledpickup.js | 3 - src/resources/wwwroot/user.html | 28 +- 6 files changed, 20 insertions(+), 533 deletions(-) delete mode 100644 src/resources/wwwroot/ShedulePickUp.html delete mode 100644 src/resources/wwwroot/js/sheduledpickup.js diff --git a/src/resources/wwwroot/ShedulePickUp.html b/src/resources/wwwroot/ShedulePickUp.html deleted file mode 100644 index 26aff71..0000000 --- a/src/resources/wwwroot/ShedulePickUp.html +++ /dev/null @@ -1,467 +0,0 @@ - - - - - - WasteInformation Server - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- -
-
-
-
-

Dashboard

-
-
-
    -
  1. Home
    2. -
  2. Shedule Pick-up
    3. -
-
-
-
-
- - - -
-
- -
-
- -
-
-

42

- -

Sheduled actions

-
-
- -
- More info -
-
- -
- -
-
-

42

- -

next Action

-
-
- -
- More info -
-
- -
- -
-
-

44

- -

last Added

-
-
- -
- More info -
-
- -
- -
-
-

65

- -

TODO

-
-
- -
- More info -
-
- -
- - -
- -
- -
-
-

- - All pickupdats -

-
-
- - - - - - - - - - - - - - - - - - - - - -
- - City - Zone - Waste Type - Date -
- - City - Zone - Waste Type - Date -
-
-
- - -
-
-

- - New City -

- -
-
-
- - - Please try to use no special - characters -
-
- - - Please try to use no special - characters -
- -
- -
- Plastic - Metal - Residual waste - Biowaste -
-
-
-
- - - -
-
-

- - New Pick up date -

-
-
-
- -

Add Data:

-
- -
- - -
- -
- - -
-
- - -
- - -
-
-
-
-
- - - - -
- -
-
-

- - Pick up locations -

-
- -
- - - - - - - - - - - - - - - - - - - - - -
- - City - Zone - Waste Type - Date -
- - City - Zone - Waste Type - Date -
-
- -
- - -
- -
- -
-
- -
- -
- By Gregor Dutzler & Lukas Heiligenbrunner & Emil Meindl - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/resources/wwwroot/adminpanel.html b/src/resources/wwwroot/adminpanel.html index 0ace60a..ffa13cf 100644 --- a/src/resources/wwwroot/adminpanel.html +++ b/src/resources/wwwroot/adminpanel.html @@ -68,14 +68,6 @@ -
  • - - -

    - Shedule Pick-up -

    -     -
    • -
  • - - -

    - Settings -

    -     -
    • -
  • @@ -259,7 +242,7 @@ - + diff --git a/src/resources/wwwroot/dashboard.html b/src/resources/wwwroot/dashboard.html index 5221f8f..4f9d7b3 100644 --- a/src/resources/wwwroot/dashboard.html +++ b/src/resources/wwwroot/dashboard.html @@ -71,16 +71,6 @@
    • -
  • - - -

    - Shedule Pick-up -

    -     -
    • - - -
  • - - -

    - Settings -

    -     -
    • -
  • diff --git a/src/resources/wwwroot/device.html b/src/resources/wwwroot/device.html index 3330a91..ed3a08d 100644 --- a/src/resources/wwwroot/device.html +++ b/src/resources/wwwroot/device.html @@ -69,14 +69,6 @@
    • -
  • - - -

    - Shedule Pick-up -

    -     -
    • -
  • - - -

    - Settings -

    -     -
    • -
  • diff --git a/src/resources/wwwroot/js/sheduledpickup.js b/src/resources/wwwroot/js/sheduledpickup.js deleted file mode 100644 index 43549a3..0000000 --- a/src/resources/wwwroot/js/sheduledpickup.js +++ /dev/null @@ -1,3 +0,0 @@ -$(function () { - console.log("bla"); -}) \ No newline at end of file diff --git a/src/resources/wwwroot/user.html b/src/resources/wwwroot/user.html index a0d5274..2f2c74f 100644 --- a/src/resources/wwwroot/user.html +++ b/src/resources/wwwroot/user.html @@ -62,23 +62,35 @@ data-accordion="false">
  • - - + +

    - Shedule Pick-up + Dashboard

    • -
  • - - + +
    • + + + +
  • @@ -87,8 +99,6 @@

    • - -