release version 1.0.1

removed sheduled taskpage for now
removed settings index entry
2020-03-27 19:56:09 +01:00 · 2020-03-27 19:55:42 +01:00 · 2020-03-27 19:29:56 +01:00 · 2020-03-27 19:27:07 +01:00 · 2020-03-27 17:56:23 +01:00 · 2020-03-27 17:53:33 +01:00
1738 changed files with 7198 additions and 439180 deletions
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@ -1,2 +0,0 @@
-# Default ignored files
-/workspace.xml
--- a/.idea/artifacts/WasteInformationServer_main_jar.xml
+++ b/.idea/artifacts/WasteInformationServer_main_jar.xml
@ -1,11 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="WasteInformationServer.main:jar">
-    <output-path>$PROJECT_DIR$/out/artifacts/WasteInformationServer_main_jar</output-path>
-    <root id="archive" name="WasteInformationServer.main.jar">
-      <element id="module-output" name="WasteInformationServer.main" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.paho/org.eclipse.paho.client.mqttv3/1.0.2/e1c9a81aadf25b884c779298a90750d0ab8013a5/org.eclipse.paho.client.mqttv3-1.0.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/mysql/mysql-connector-java/8.0.18/e088efaa4b568bc7d9f7274b9c5ea1a00da1a45c/mysql-connector-java-8.0.18.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.protobuf/protobuf-java/3.6.1/d06d46ecfd92ec6d0f3b423b4cd81cb38d8b924/protobuf-java-3.6.1.jar" path-in-jar="/" />
-    </root>
-  </artifact>
-</component>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="GRADLE" />
-        <option name="disableWrapperSourceDistributionNotification" value="true" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-        <option name="useAutoImport" value="true" />
-        <option name="useQualifiedModuleNames" value="true" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@ -1,10 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <Languages>
-        <language minSize="47" name="Java" />
-      </Languages>
-    </inspection_tool>
-  </profile>
-</component>
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-  </component>
-</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
--- a/.idea/uiDesigner.xml
+++ b/.idea/uiDesigner.xml
@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,28 @@
+language: java
+jdk: oraclejdk8
+dist: trusty
+
+# Make the gradle wrapper executable
+# before_install: chmod +x gradlew
+before_install:
+  - wget https://services.gradle.org/distributions/gradle-6.1.1-all.zip
+  - unzip -qq gradle-6.1.1-all.zip
+  - export GRADLE_HOME=$PWD/gradle-6.1.1
+  - export PATH=$GRADLE_HOME/bin:$PATH
+  - gradle -v
+
+script:
+  #- gradle check jacocoTestReport
+  # Also upload test coverage to codecov
+  #- bash <(curl -s https://codecov.io/bash)
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+  - rm -f  $HOME/.gradle/caches/*/fileHashes/fileHashes.bin
+  - rm -f  $HOME/.gradle/caches/*/fileHashes/fileHashes.lock
+
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
--- a/build.gradle
+++ b/build.gradle
@ -2,10 +2,11 @@ import java.text.SimpleDateFormat

 plugins {
    id 'java'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.70'
 }

 group 'com.wasteinformationserver'
-version '0.2.1-Beta'
+version '1.0.1'

 sourceCompatibility = 1.8

@ -15,7 +16,7 @@ repositories {

 jar {
    manifest {
-        attributes 'Main-Class': 'com.wasteinformationserver.main'
+        attributes 'Main-Class': 'com.wasteinformationserver.Main'
    }
    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
 }
@ -28,11 +29,12 @@ sourceSets {
 dependencies {
    compile group: 'org.eclipse.paho', name: 'org.eclipse.paho.client.mqttv3', version: '1.2.2'
    compile group: 'mysql',name:'mysql-connector-java',version: '8.0.18'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 }

 task run (type: JavaExec){
    description = "Secure algorythm testing"
-    main = 'com.wasteinformationserver.main'
+    main = 'com.wasteinformationserver.Main'
    classpath = sourceSets.main.runtimeClasspath
 }

@ -47,6 +49,19 @@ task createProperties(dependsOn: processResources) {
    }
 }

+task myJavadocs(type: Javadoc) {
+    title = "JAVADOC WasteInformationServer"
+    source = sourceSets.main.allJava
+    classpath = sourceSets.main.runtimeClasspath
+}
+
 classes {
    dependsOn createProperties
+}
+
+compileKotlin {
+    kotlinOptions.jvmTarget = "1.8"
+}
+compileTestKotlin {
+    kotlinOptions.jvmTarget = "1.8"
 }
--- a/src/java/com/wasteinformationserver/Dateget.java
+++ b/src/java/com/wasteinformationserver/Dateget.java
@ -1,3 +1,6 @@
+/**
+ * dead code...
+ */
 package com.wasteinformationserver;

 import com.wasteinformationserver.basicutils.Log;
@ -49,13 +52,13 @@ public class Dateget {

    public void printList() {
        for (int n = 0; n < list.size(); n++) {
-            Log.debug(list.get(n));
+            Log.Log.debug(list.get(n));
        }
    }

    public void printListnew() {
        for (int n = 0; n < listnew.size(); n++) {
-            Log.debug(listnew.get(n));
+            Log.Log.debug(listnew.get(n));
        }
    }

--- a/src/java/com/wasteinformationserver/Main.kt
+++ b/src/java/com/wasteinformationserver/Main.kt
@ -0,0 +1,55 @@
+@file:JvmName("Main")
+package com.wasteinformationserver
+
+import com.wasteinformationserver.basicutils.Info
+import com.wasteinformationserver.basicutils.Log
+import com.wasteinformationserver.db.JDBC
+import com.wasteinformationserver.mqtt.MqttService
+import com.wasteinformationserver.website.Webserver
+import java.io.IOException
+
+/**
+ * application entry point
+ *
+ * @author Lukas Heiligenbrunner
+ */
+fun main() {
+    Log.setLevel(Log.DEBUG)
+    Info.init()
+
+    Log.info("startup of WasteInformationServer")
+
+    Runtime.getRuntime().addShutdownHook(Thread(Runnable {
+        try {
+            Thread.sleep(200)
+            Log.warning("Shutting down ...")
+            //shutdown routine
+        } catch (e: InterruptedException) {
+            e.printStackTrace()
+        }
+    }))
+
+    Log.info("Server version: " + Info.getVersion())
+    Log.debug("Build date: " + Info.getBuilddate())
+
+    //initial connect to db
+    Log.message("initial login to db")
+    try {
+        JDBC.init("ingproject", "Kb9Dxklumt76ieq6", "ingproject", "db.power4future.at", 3306)
+        //JDBC.init("users", "kOpaIJUjkgb9ur6S", "wasteinformation", "192.168.65.15", 3306);
+    } catch (e: IOException) { //e.printStackTrace();
+        Log.error("no connection to db")
+    }
+
+
+    //startup web server
+    val mythread = Thread(Runnable { Webserver().startserver() })
+    mythread.start()
+
+
+    //startup mqtt service
+    Log.message("starting mqtt service")
+
+    val m = MqttService("mqtt.heili.eu", "1883")
+    m.startupService()
+}
--- a/src/java/com/wasteinformationserver/basicutils/Info.java
+++ b/src/java/com/wasteinformationserver/basicutils/Info.java
@ -7,38 +7,65 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Properties;

+/**
+ * get basic infos about Software
+ *
+ * @author Lukas Heiligenbrunner
+ */
 public class Info {
-    private static String version="not init";
-    private static String builddate="not init";
-    private static String starttime="not init";
+    private static String version = "not init";
+    private static String builddate = "not init";
+    private static String starttime = "not init";

+    /**
+     * get Software Version (defined in gradle build file)
+     *
+     * @return Version as string
+     */
    public static String getVersion() {
        return version;
    }

+    /**
+     * get Software build date
+     *
+     * @return Date as string
+     */
    public static String getBuilddate() {
        return builddate;
    }

+    /**
+     * get Server start time
+     *
+     * @return start time
+     */
    public static String getStarttime() {
        return starttime;
    }

-    public static void init(){
+    /**
+     * initialize the version and builddate variables
+     */
+    public static void init() {
        starttime = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss").format(new Date());
        Properties prop = new Properties();
        try {
            URL url = Info.class.getResource("/version.properties");

            prop.load(url.openStream());
-            version=(String)prop.get("version");
-            builddate=(String)prop.get("buildtime");
+            version = (String) prop.get("version");
+            builddate = (String) prop.get("buildtime");
        } catch (IOException e) {
            e.printStackTrace();
        }
    }

-    public static void getMemoryUsage(){
+    /**
+     * print memory utilization
+     * todo parse into website somehow
+     */
+    public static void getMemoryUsage() {
        Runtime runtime = Runtime.getRuntime();

        NumberFormat format = NumberFormat.getInstance();
--- a/src/java/com/wasteinformationserver/basicutils/Log.java
+++ b/src/java/com/wasteinformationserver/basicutils/Log.java
@ -1,123 +0,0 @@
-package com.wasteinformationserver.basicutils;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-
-public class Log {
-
-    private static final String ANSI_RESET = "\u001B[0m";
-    private static final String ANSI_BLACK = "\u001B[30m";
-    private static final String ANSI_RED = "\u001B[31m";
-    private static final String ANSI_GREEN = "\u001B[32m";
-    private static final String ANSI_YELLOW = "\u001B[33m";
-    private static final String ANSI_BLUE = "\u001B[34m";
-    private static final String ANSI_PURPLE = "\u001B[35m";
-    private static final String ANSI_CYAN = "\u001B[36m";
-    private static final String ANSI_WHITE = "\u001B[37m";
-
-    public static final int CRITICAL_ERROR = 6;
-    public static final int ERROR = 5;
-    public static final int WARNING = 4;
-    public static final int INFO = 3;
-    public static final int MESSAGE = 2;
-    public static final int DEBUG = 1;
-
-    private static int Loglevel = 0;
-
-    private static ArrayList<String> colors = new ArrayList<String>(Arrays.asList("", "DEBUG", "MESSAGE", "INFO", "WARNING", "ERROR", "CRITICAL_ERROR"));
-
-    public static void criticalerror(Object msg) {
-        if (Loglevel <= CRITICAL_ERROR)
-            log(msg, CRITICAL_ERROR);
-    }
-
-    public static void error(Object msg) {
-        if (Loglevel <= ERROR)
-            log(msg, ERROR);
-    }
-
-    public static void warning(Object msg) {
-        if (Loglevel <= WARNING)
-            log(msg, WARNING);
-    }
-
-    public static void info(Object msg) {
-        if (Loglevel <= INFO)
-            log(msg, INFO);
-    }
-
-    public static void message(Object msg) {
-        if (Loglevel <= MESSAGE)
-            log(msg, MESSAGE);
-    }
-
-    public static void debug(Object msg) {
-        if (Loglevel <= DEBUG)
-            log(msg, DEBUG);
-    }
-
-
-    public static void log(Object msg, int level) {
-        boolean iswindows = System.getProperty("os.name").contains("Windows");
-        StringBuilder builder = new StringBuilder();
-        if (!iswindows) {
-            switch (level) {
-                case INFO:
-                    builder.append(ANSI_CYAN);
-                    break;
-                case WARNING:
-                    builder.append(ANSI_YELLOW);
-                    break;
-                case ERROR:
-                    builder.append(ANSI_RED);
-                    break;
-                case CRITICAL_ERROR:
-                    builder.append(ANSI_RED);
-                    break;
-                case MESSAGE:
-                    builder.append(ANSI_WHITE);
-                    break;
-                case DEBUG:
-                    builder.append(ANSI_BLUE);
-                    break;
-            }
-
-        }
-        builder.append("[");
-        builder.append(calcDate(System.currentTimeMillis()));
-        builder.append("]");
-
-        builder.append(" [");
-        builder.append(new Exception().getStackTrace()[2].getClassName());
-        builder.append("]");
-
-        builder.append(" [");
-        builder.append(colors.get(level));
-        builder.append("]");
-
-        if (!iswindows) {
-            builder.append(ANSI_WHITE);
-        }
-
-        builder.append(" - ");
-        builder.append(msg.toString());
-
-        if (!iswindows) {
-            builder.append(ANSI_RESET);
-        }
-        System.out.println(builder.toString());
-    }
-
-    private static String calcDate(long millisecs) {
-        SimpleDateFormat date_format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date resultdate = new Date(millisecs);
-        return date_format.format(resultdate);
-    }
-
-    public static void setLevel(int level) {
-        Loglevel = level;
-    }
-
-}
--- a/src/java/com/wasteinformationserver/basicutils/Log.kt
+++ b/src/java/com/wasteinformationserver/basicutils/Log.kt
@ -0,0 +1,139 @@
+package com.wasteinformationserver.basicutils
+
+import java.text.SimpleDateFormat
+import java.util.*
+
+class Log {
+    companion object Log{
+        val CRITICAL_ERROR = 6
+        val ERROR = 5
+        val WARNING = 4
+        val INFO = 3
+        val MESSAGE = 2
+        val DEBUG = 1
+
+        private val ANSI_RESET = "\u001B[0m"
+        private val ANSI_BLACK = "\u001B[30m"
+        private val ANSI_RED = "\u001B[31m"
+        private val ANSI_GREEN = "\u001B[32m"
+        private val ANSI_YELLOW = "\u001B[33m"
+        private val ANSI_BLUE = "\u001B[34m"
+        private val ANSI_PURPLE = "\u001B[35m"
+        private val ANSI_CYAN = "\u001B[36m"
+        private val ANSI_WHITE = "\u001B[37m"
+
+        private var Loglevel = 0
+
+        /**
+         * Log critical Error
+         *
+         * @param msg message
+         */
+        fun criticalerror(msg: Any) {
+            if (Loglevel <= CRITICAL_ERROR) log(msg, CRITICAL_ERROR)
+        }
+
+        /**
+         * Log basic Error
+         *
+         * @param msg message
+         */
+        fun error(msg: Any) {
+            if (Loglevel <= ERROR) log(msg, ERROR)
+        }
+
+        /**
+         * Log warning
+         *
+         * @param msg message
+         */
+        fun warning(msg: Any) {
+            if (Loglevel <= WARNING) log(msg, WARNING)
+        }
+
+        /**
+         * Log info
+         *
+         * @param msg message
+         */
+        fun info(msg: Any) {
+            if (Loglevel <= INFO) log(msg, INFO)
+        }
+
+        /**
+         * Log basic message
+         *
+         * @param msg message
+         */
+        fun message(msg: Any) {
+            if (Loglevel <= MESSAGE) log(msg, MESSAGE)
+        }
+
+        /**
+         * Log debug Message
+         *
+         * @param msg message
+         */
+        fun debug(msg: Any) {
+            if (Loglevel <= DEBUG) log(msg, DEBUG)
+        }
+
+        /**
+         * Log as defined
+         *
+         * @param msg   message
+         * @param level Loglevel --> static vals defined
+         */
+        fun log(msg: Any, level: Int) {
+            val iswindows = System.getProperty("os.name").contains("Windows")
+            val builder = StringBuilder()
+            if (!iswindows) {
+                when (level) {
+                    INFO -> builder.append(ANSI_CYAN)
+                    WARNING -> builder.append(ANSI_YELLOW)
+                    ERROR -> builder.append(ANSI_RED)
+                    CRITICAL_ERROR -> builder.append(ANSI_RED)
+                    MESSAGE -> builder.append(ANSI_WHITE)
+                    DEBUG -> builder.append(ANSI_BLUE)
+                }
+            }
+            builder.append("[")
+            builder.append(calcDate(System.currentTimeMillis()))
+            builder.append("]")
+            builder.append(" [")
+            builder.append(Exception().stackTrace[2].className)
+            builder.append("]")
+            builder.append(" [")
+            builder.append(colors[level])
+            builder.append("]")
+            if (!iswindows) {
+                builder.append(ANSI_WHITE)
+            }
+            builder.append(" - ")
+            builder.append(msg.toString())
+            if (!iswindows) {
+                builder.append(ANSI_RESET)
+            }
+            println(builder.toString())
+        }
+
+        /**
+         * define Loglevel call on startup or at runtime
+         * default: 0[DEBUG] --> Max logging
+         *
+         * @param level Loglevel --> static vals defined
+         */
+        fun setLevel(level: Int) {
+            Loglevel = level
+        }
+        private val colors = ArrayList(Arrays.asList("", "DEBUG", "MESSAGE", "INFO", "WARNING", "ERROR", "CRITICAL_ERROR"))
+
+
+
+        private fun calcDate(millisecs: Long): String? {
+            val date_format = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+            val resultdate = Date(millisecs)
+            return date_format.format(resultdate)
+        }
+    }
+}
--- a/src/java/com/wasteinformationserver/db/Database.java
+++ b/src/java/com/wasteinformationserver/db/Database.java
@ -1,16 +1,9 @@
 package com.wasteinformationserver.db;

-import com.wasteinformationserver.basicutils.Log;
-
-import javax.swing.table.DefaultTableModel;
 import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
-import java.util.Vector;

-public abstract class
-Database {
+abstract class Database {

    protected String user;
    protected String password;
@ -29,62 +22,4 @@ Database {
    }

    public abstract Connection getConnection() throws SQLException;
-
-    public static void logToConsole(ResultSet res) {
-        try {
-
-            ResultSetMetaData rsmd = res.getMetaData();
-
-            while (res.next()) {
-                String row = "";
-
-                for (int i = 1; i <= rsmd.getColumnCount(); ++i) {
-                    if (row.length() > 0) {
-                        row += ", ";
-                    }
-
-                    if (res.getObject(i) != null) {
-                        row +=
-                                rsmd.getColumnName(i) +
-                                        ": " +
-                                        res.getObject(i).toString();
-                    }
-                }
-
-                Log.debug(row);
-            }
-
-        } catch (SQLException e) {
-        }
-    }
-
-    public static DefaultTableModel logToTable(ResultSet res) {
-        try {
-            ResultSetMetaData rsmd = res.getMetaData();
-            Vector<String> columnNames = new Vector<>();
-            int columnCount = rsmd.getColumnCount();
-
-            for (int i = 1; i <= columnCount; ++i) {
-                columnNames.add(rsmd.getColumnName(i));
-            }
-
-            Vector<Vector<Object>> data = new Vector<>();
-
-            while (res.next()) {
-                Vector<Object> row = new Vector();
-
-                for (int i = 1; i <= columnCount; ++i) {
-                    row.add(res.getObject(i));
-                }
-
-                data.add(row);
-            }
-
-            return new DefaultTableModel(data, columnNames);
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
 }
--- a/src/java/com/wasteinformationserver/db/JDBC.java
+++ b/src/java/com/wasteinformationserver/db/JDBC.java
@ -0,0 +1,120 @@
+package com.wasteinformationserver.db;
+
+import com.wasteinformationserver.basicutils.Log;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * basic connection class to a Database
+ *
+ * @author Lukas Heiligenbrunner
+ */
+public class JDBC {
+    private static Connection conn;
+
+    private static JDBC JDBC;
+    private static boolean loggedin = false;
+
+    private static String usernamec;
+    private static String passwordc;
+    private static String dbnamec;
+    private static String ipc;
+    private static int portc;
+
+    /**
+     * initialize database values
+     * suggested on startup
+     *
+     * @param username db username
+     * @param password db password
+     * @param dbname   Database name
+     * @param ip       Server ip or hostname
+     * @param port     Server port
+     * @throws IOException
+     */
+    public static void init(String username, String password, String dbname, String ip, int port) throws IOException {
+        usernamec = username;
+        passwordc = password;
+        dbnamec = dbname;
+        ipc = ip;
+        portc = port;
+        JDBC = new JDBC(username, password, dbname, ip, port);
+    }
+
+    private JDBC(String username, String password, String dbname, String ip, int port) throws IOException {
+        logintodb(username, password, dbname, ip, port);
+    }
+
+    /**
+     * get instance of db object
+     * logindata has to be set before!
+     *
+     * @return JDBC object of this
+     * @throws IOException
+     */
+    public static JDBC getInstance() {
+        if (!loggedin) {
+            try {
+                logintodb(usernamec, passwordc, dbnamec, ipc, portc);
+            } catch (IOException e) {
+                Log.Log.error("no connetion to db - retrying in 5min");
+            }
+        }
+        return JDBC;
+    }
+
+    private static void logintodb(String username, String password, String dbname, String ip, int port) throws IOException {
+        Database db = new MySQLConnector(
+                username,
+                password,
+                ip,
+                port,
+                dbname);
+
+        try {
+            conn = db.getConnection();
+            loggedin = true;
+        } catch (SQLException e) {
+            throw new IOException("No connection to database");
+            // todo reconnect every 5mins or something
+        }
+
+    }
+
+    /**
+     * execute basic query --> requests only
+     *
+     * @param sql query sql statement
+     * @return ResultSet representating the table
+     */
+    public ResultSet executeQuery(String sql) {
+        try {
+            PreparedStatement stmt = conn.prepareStatement(sql);
+            return stmt.executeQuery();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * update db in some way
+     *
+     * @param sql sql insert/update/delete statement
+     * @return status
+     * @throws SQLException
+     */
+    public int executeUpdate(String sql) throws SQLException {
+        PreparedStatement stmt = conn.prepareStatement(sql);
+
+        return stmt.executeUpdate();
+    }
+
+    public boolean isConnected() {
+        return loggedin;
+    }
+}
--- a/src/java/com/wasteinformationserver/db/JDCB.java
+++ b/src/java/com/wasteinformationserver/db/JDCB.java
@ -1,73 +0,0 @@
-package com.wasteinformationserver.db;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class JDCB {
-    static Connection conn;
-
-    static JDCB jdcb;
-    static boolean loggedin = false;
-
-    static String usernamec;
-    static String passwordc;
-    static String dbnamec;
-    static String ipc;
-    static int portc;
-
-    public static void init(String username, String password, String dbname, String ip, int port) throws IOException {
-        usernamec = username;
-        passwordc = password;
-        dbnamec = dbname;
-        jdcb = new JDCB(username, password, dbname, ip, port);
-    }
-
-    private JDCB(String username, String password, String dbname, String ip, int port) throws IOException {
-        logintodb(username, password, dbname, ip, port);
-    }
-
-    public static JDCB getInstance() throws IOException {
-        if (loggedin) {
-            return jdcb;
-        } else {
-            logintodb(usernamec, passwordc, dbnamec, ipc, portc);
-            return jdcb;
-        }
-
-    }
-
-    public static void logintodb(String username, String password, String dbname, String ip, int port) throws IOException {
-        Database db = new MySQLConnector(
-                username,
-                password,
-                ip,
-                port,
-                dbname);
-
-        try {
-            conn = db.getConnection();
-            loggedin = true;
-        } catch (SQLException e) {
-            throw new IOException("No connection to database");
-        }
-
-    }
-
-    public ResultSet executeQuery(String sql) {
-        try {
-            PreparedStatement stmt = conn.prepareStatement(sql);
-            return stmt.executeQuery();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public int executeUpdate(String sql) throws SQLException {
-        PreparedStatement stmt = conn.prepareStatement(sql);
-
-        return stmt.executeUpdate();
-    }
-}
--- a/src/java/com/wasteinformationserver/db/MySQLConnector.java
+++ b/src/java/com/wasteinformationserver/db/MySQLConnector.java
@ -4,7 +4,7 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;

-public class MySQLConnector extends Database {
+class MySQLConnector extends Database {

    static {
        try {
@ -19,9 +19,9 @@ public class MySQLConnector extends Database {
    }

    public Connection getConnection() throws SQLException {
-        DriverManager.setLoginTimeout(1); // TODO: 30.11.19 set higher maybe
+        DriverManager.setLoginTimeout(1);
        return DriverManager.getConnection(
-                "jdbc:mysql://" + host + ":" + port + "/" + dbName + "?useSSL=false",
+                "jdbc:mysql://" + host + ":" + port + "/" + dbName + "?useSSL=false&serverTimezone=CET",
                user,
                password);
    }
--- a/src/java/com/wasteinformationserver/db/PostgreSQLConnector.java
+++ b/src/java/com/wasteinformationserver/db/PostgreSQLConnector.java
@ -1,37 +0,0 @@
-package com.wasteinformationserver.db;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-public class PostgreSQLConnector extends Database {
-
-    static {
-        try {
-            Class.forName("org.postgresql.Driver").newInstance();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public PostgreSQLConnector(String user, String password, String host, int port, String dbName) {
-        super(user, password, host, port, dbName);
-    }
-
-    @Override
-    public Connection getConnection() {
-        Connection con = null;
-
-        try {
-            con = DriverManager.getConnection(
-                    "jdbc:postgresql://" + host + ":" + port + "/" + dbName,
-                    user,
-                    password);
-
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-
-        return con;
-    }
-}
--- a/src/java/com/wasteinformationserver/main.java
+++ b/src/java/com/wasteinformationserver/main.java
@ -1,63 +0,0 @@
-package com.wasteinformationserver;
-
-import com.wasteinformationserver.basicutils.Info;
-import com.wasteinformationserver.basicutils.Log;
-import com.wasteinformationserver.db.JDCB;
-import com.wasteinformationserver.mqtt.mqtt;
-import com.wasteinformationserver.website.Webserver;
-
-import java.io.IOException;
-
-public class main {
-    public static void main(String[] args) {
-
-        Log.setLevel(Log.INFO);
-        Log.info("startup of WasteInformationServer");
-
-        Log.info("mem: "+Runtime.getRuntime().totalMemory());
-
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-            try {
-                Thread.sleep(200);
-                Log.warning("Shutting down ...");
-
-                //shutdown routine
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }));
-
-        Info.init();
-        Log.info("Server version: " + Info.getVersion());
-        Log.debug("Build date: " + Info.getBuilddate());
-
-        //initial connect to db
-        Log.message("initial login to db");
-        new Thread(() -> {
-            try {
-                //JDCB.init("users", "admin0", "wasteinformation", "192.168.65.15", 1883);
-                JDCB.init("users", "kOpaIJUjkgb9ur6S", "wasteinformation", "192.168.65.15", 3306);
-            } catch (IOException e) {
-                //e.printStackTrace();
-                Log.error("no connection to db");
-            }
-        }).start();
-
-
-        //startup web server
-        Thread mythread = new Thread(() -> new Webserver().startserver());
-        mythread.start();
-
-
-        //startup mqtt service
-        Log.message("starting mqtt service");
-        try {
-            mqtt m = new mqtt();
-            m.notifymessage();
-        } catch (Exception e) {
-            Log.error("An error occured in the class mqtt");
-        }
-
-        Log.info("mem: "+Runtime.getRuntime().totalMemory());
-    }
-}
--- a/src/java/com/wasteinformationserver/mqtt/MqttService.kt
+++ b/src/java/com/wasteinformationserver/mqtt/MqttService.kt
@ -0,0 +1,173 @@
+package com.wasteinformationserver.mqtt
+
+import com.wasteinformationserver.basicutils.Log.Log.debug
+import com.wasteinformationserver.basicutils.Log.Log.error
+import com.wasteinformationserver.basicutils.Log.Log.info
+import com.wasteinformationserver.basicutils.Log.Log.message
+import com.wasteinformationserver.db.JDBC
+import org.eclipse.paho.client.mqttv3.*
+import java.io.IOException
+import java.sql.SQLException
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.*
+
+/**
+ * Mqtt Service to receive and send back messages to the Hardware
+ * check values from db send right feedback to hardware.
+ *
+ * @author Lukas Heiligenbrunner
+ * @author Gregor Dutzler
+ */
+class MqttService(serverurl: String, port: String) {
+    private val serveruri: String = "tcp://$serverurl:$port"
+    private var client: MqttClient = MqttClient(serveruri, "JavaSample42")
+    private var db: JDBC = JDBC.getInstance()
+
+    /**
+     * init mqtt service
+     * JDBC has to be inited before
+     *
+     * @param serverurl mqtt server ip or hostname
+     * @param port      mqtt server port
+     */
+    init {
+        connectToDb()
+    }
+
+    /**
+     * startup of the mqtt service
+     */
+    fun startupService() {
+        try {
+            client = MqttClient(serveruri, "JavaSample42")
+            val connOpts = MqttConnectOptions()
+            connOpts.isCleanSession = true
+            client.connect(connOpts)
+            client.setCallback(object : MqttCallback {
+                override fun connectionLost(throwable: Throwable) {
+                    error("connection lost")
+                    connectToDb()
+                }
+
+                override fun messageArrived(s: String, mqttMessage: MqttMessage) {
+                    val deviceid = String(mqttMessage.payload)
+                    message("received Request from PCB")
+                    val res = db.executeQuery("SELECT * from devices WHERE DeviceID=$deviceid")
+                    try {
+                        res.last()
+                        if (res.row != 0) { //existing device
+                            res.first()
+                            val devicecities = db.executeQuery("SELECT * from device_city WHERE DeviceID='$deviceid'")
+                            devicecities.last()
+                            if (devicecities.row == 0) { //not configured
+                                tramsmitMessage("$deviceid,-1")
+                            }
+                            else {
+                                devicecities.first()
+                                devicecities.previous()
+
+                                while (devicecities.next()) {
+                                    val cityid = devicecities.getInt("CityID")
+                                    checkDatabase(cityid, deviceid.toInt())
+                                }
+                            }
+                        }
+                        else { //new device
+                            db.executeUpdate("INSERT INTO devices (DeviceID) VALUES ($deviceid)")
+                            info("new device registered to server")
+                            tramsmitMessage("$deviceid,-1")
+                        }
+                    } catch (e: SQLException) {
+                        e.printStackTrace()
+                    }
+                }
+
+                override fun deliveryComplete(iMqttDeliveryToken: IMqttDeliveryToken) {}
+            })
+            client.subscribe("TopicIn")
+        } catch (e: MqttException) {
+            error("Connection to the Broker failed")
+        }
+    }
+
+    private fun checkDatabase(citywastezoneid: Int, deviceid: Int) {
+        var wastetype = -1
+        val set2 = db.executeQuery("SELECT * FROM cities WHERE `id`='$citywastezoneid'")
+        try {
+            set2.last()
+            if (set2.row != 1) { //error
+            }
+            else {
+                val typ = set2.getString("wastetype")
+                wastetype = getIntTyp(typ)
+            }
+        } catch (e: SQLException) {
+            e.printStackTrace()
+        }
+        val result = db.executeQuery("SELECT pickupdates.pickupdate FROM pickupdates WHERE pickupdates.citywastezoneid=$citywastezoneid")
+        try {
+            result.last()
+            if (result.row == 0) { //if not found in db --> send zero
+                debug("not found in db")
+                tramsmitMessage("$deviceid,$wastetype,0")
+            }
+            else {
+                debug(result.getString("pickupdate"))
+                result.first()
+                do {
+                    val formatter = SimpleDateFormat("yyyy-MM-dd")
+                    val timestamp = formatter.parse(result.getString("pickupdate")).time
+                    val timestampnow = formatter.parse(formatter.format(Date())).time
+                    debug("timestamp is :$timestamp")
+                    if (timestamp == timestampnow || timestamp == timestampnow + 86400000) { // 86400000 == one day
+                        // valid time
+                        tramsmitMessage("$deviceid,$wastetype,1")
+                        debug("valid time")
+                        return
+                    }
+                } while (result.next())
+                tramsmitMessage("$deviceid,$wastetype,0") //transmit zero if not returned before
+            }
+        } catch (e: SQLException) {
+            e.printStackTrace()
+        } catch (e: ParseException) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun tramsmitMessage(temp: String) {
+        debug("sending message >>>$temp")
+        val message = MqttMessage(temp.toByteArray())
+        message.qos = 2
+        try {
+            client.publish("TopicOut", message)
+        } catch (e: MqttException) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun getTyp(number: Int): String? {
+        return when (number) {
+            1 -> "Plastic"
+            2 -> "Metal"
+            3 -> "Residual waste"
+            4 -> "Biowaste"
+            else -> null
+        }
+    }
+
+    private fun getIntTyp(temp: String): Int {
+        return when (temp) {
+            "Plastic" -> 1
+            "Metal" -> 2
+            "Residual waste" -> 3
+            "Biowaste" -> 4
+            else -> 0
+        }
+    }
+
+    private fun connectToDb() {
+        db = JDBC.getInstance()
+    }
+}
--- a/src/java/com/wasteinformationserver/mqtt/mqtt.java
+++ b/src/java/com/wasteinformationserver/mqtt/mqtt.java
@ -1,154 +0,0 @@
-package com.wasteinformationserver.mqtt;
-
-import com.wasteinformationserver.basicutils.Log;
-import com.wasteinformationserver.db.JDCB;
-import org.eclipse.paho.client.mqttv3.MqttClient;
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-import org.eclipse.paho.client.mqttv3.MqttException;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-public class mqtt {
-    MqttClient client = null;
-
-    public mqtt() {
-
-    }
-
-    public void notifymessage() {
-
-        try {
-            client = new MqttClient("tcp://192.168.65.15:1883", "JavaSample42");
-            MqttConnectOptions connOpts = new MqttConnectOptions();
-            connOpts.setCleanSession(true);
-            client.connect(connOpts);
-        } catch (MqttException e) {
-            Log.error("Connection to the ESB was failed");
-        }
-
-        mqttreceiver mr = new mqttreceiver(client);
-        mr.addMessageReceivedListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                Log.debug("received message");
-                String[] split = e.getActionCommand().split(",");
-                String wastetyp = getTyp(Integer.parseInt(split[2]));
-                getDatabasedata("SELECT pickupdates.pickupdate FROM pickupdates WHERE pickupdates.citywastezoneid=(SELECT cities.zone FROM cities WHERE cities.name='" + split[1] + "' AND cities.wastetype='" + wastetyp + "' AND cities.zone=" + split[3] + ")", wastetyp, Integer.parseInt(split[0]));
-            }
-        });
-        mr.getmessage();
-    }
-
-    public void getDatabasedata(String message, String wastetyp, int clientidentify) {
-
-        Log.debug(message);
-        Log.debug(wastetyp);
-        Log.debug(clientidentify);
-
-        JDCB Database = null;
-        try {
-            Database = JDCB.getInstance();
-        } catch (IOException e) {
-            Log.error("No Connection to the databank");
-        }
-        int wastenumber = getIntTyp(wastetyp);
-
-        ResultSet result = Database.executeQuery(message);
-        try {
-            result.last();
-            if (result.getFetchSize() == 0){
-                //if not found in db --> send zero
-                transmitmessageAbfallart(clientidentify + "," + wastenumber + "," + 0);
-            }
-            result.first();
-            while (result.next()) {
-                String newDate = getDateDatabase(String.valueOf(result.getString("pickupdate")));
-                String currentDate = getcurrentDate();
-                String Datetomorrow = nexDayDate();
-
-                if (currentDate.equals(newDate) || currentDate.equals(Datetomorrow)) {
-                    transmitmessageAbfallart(clientidentify + "," + wastenumber + "," + 1);
-                } else {
-                    transmitmessageAbfallart(clientidentify + "," + wastenumber + "," + 0);
-                }
-            }
-        } catch (SQLException e) {
-            Log.error("No data from database");
-        }
-    }
-
-
-    private void transmitmessageAbfallart(String temp) {
-        Log.debug("sending message >>>"+temp);
-        mqtttransmitter mt = new mqtttransmitter(client);
-        Log.debug(temp);
-        mt.sendmessage(temp);
-    }
-
-    private String nexDayDate() {
-
-        final DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
-        Date currentDate = new Date();
-
-        Calendar c = Calendar.getInstance();
-        c.setTime(currentDate);
-        c.add(Calendar.DATE, 1);
-        Date currentDatePlusOne = c.getTime();
-
-        String temp = dateFormat.format(currentDatePlusOne);
-        String split[] = temp.split("/");
-        return split[2] + "." + split[1] + "." + split[0];
-    }
-
-    private String getTyp(int number) {
-        if (number == 1) {
-            return "Plastic";
-        } else if (number == 2) {
-            return "Metal";
-        } else if (number == 3) {
-            return "Residual waste";
-        } else if (number == 4) {
-            return "Biowaste";
-        }
-        return null;
-    }
-
-    private int getIntTyp(String temp) {
-        int number = 0;
-        if (temp.equals("Plastic")) {
-            number = 1;
-        } else if (temp.equals("Metal")) {
-            number = 2;
-        } else if (temp.equals("Residual waste")) {
-            number = 3;
-        } else if (temp.equals("Biowaste")) {
-            number = 4;
-        }
-        return number;
-    }
-
-    private String getDateDatabase(String temptime) {
-        String[] parts = temptime.split("-");
-        String tempyear = parts[0];
-        String[] yearsplit = tempyear.split("0");
-        String tempyearnew = yearsplit[1];
-        return parts[2] + "." + parts[1] + "." + tempyearnew;
-    }
-
-    private String getcurrentDate() {
-        GregorianCalendar now = new GregorianCalendar();
-        DateFormat df = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.LONG);
-        String date = df.format(now.getTime());
-        String[] partstwo = date.split(",");
-        return partstwo[0];
-    }
-}
--- a/src/java/com/wasteinformationserver/mqtt/mqttreceiver.java
+++ b/src/java/com/wasteinformationserver/mqtt/mqttreceiver.java
@ -1,62 +0,0 @@
-package com.wasteinformationserver.mqtt;
-
-import com.wasteinformationserver.basicutils.Log;
-import org.eclipse.paho.client.mqttv3.*;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-
-public class mqttreceiver {
-
-    private MqttClient client;
-    public ArrayList<ActionListener> mylisteners = new ArrayList<>();
-    public String message;
-
-    public mqttreceiver(MqttClient mqtt) {
-        this.client = mqtt;
-    }
-
-    public String getmessage() {
-
-        try {
-            client.setCallback(new MqttCallback() {
-                @Override
-                public void connectionLost(Throwable throwable) {
-                    Log.error("connection lost");
-                }
-
-                @Override
-                public void messageArrived(String s, MqttMessage mqttMessage) throws Exception {
-                    message = new String(mqttMessage.getPayload());
-                    Log.info("received Request from PCB");
-                    notifylisteners(message);
-
-                }
-
-                @Override
-                public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
-
-                }
-            });
-            client.subscribe("TopicIn");
-            Log.debug("subscribed topic");
-        } catch (MqttException e) {
-            Log.error("Connection to the ESB failed");
-        }
-        return message;
-    }
-
-
-    private void notifylisteners(String message) {
-        for (ActionListener ac : mylisteners) {
-            ac.actionPerformed(new ActionEvent(this, 0, message));
-        }
-    }
-
-    public void addMessageReceivedListener(ActionListener l) {
-        mylisteners.add(l);
-    }
-
-}
-
--- a/src/java/com/wasteinformationserver/mqtt/mqtttransmitter.java
+++ b/src/java/com/wasteinformationserver/mqtt/mqtttransmitter.java
@ -1,40 +0,0 @@
-package com.wasteinformationserver.mqtt;
-
-import com.wasteinformationserver.basicutils.Log;
-import org.eclipse.paho.client.mqttv3.MqttClient;
-import org.eclipse.paho.client.mqttv3.MqttException;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-
-
-public class mqtttransmitter {
-    MqttClient client;
-
-    public mqtttransmitter(MqttClient client) {
-        this.client = client;
-    }
-
-    public void sendmessage(String temp) {
-        String topic = "TopicOut";
-        String content = temp;
-        int qos = 2;
-        MemoryPersistence persistence = new MemoryPersistence();
-
-        try {
-            Log.debug("Connected");
-            Log.debug("Publishing message: " + content);
-            MqttMessage message = new MqttMessage(content.getBytes());
-            message.setQos(qos);
-            client.publish(topic, message);
-            Log.debug("Message published");
-
-
-        } catch (MqttException me) {
-            Log.debug("reason " + me.getReasonCode());
-            Log.debug("msg " + me.getMessage());
-            Log.debug("loc " + me.getLocalizedMessage());
-            Log.debug("cause " + me.getCause());
-            Log.debug("excep " + me);
-        }
-    }
-}
--- a/src/java/com/wasteinformationserver/website/HttpTools.java
+++ b/src/java/com/wasteinformationserver/website/HttpTools.java
@ -1,19 +0,0 @@
-package com.wasteinformationserver.website;
-
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-public class HttpTools {
-    public static String StringToMD5(String value) {
-        try {
-            MessageDigest md = MessageDigest.getInstance("MD5");
-            byte[] messageDigest = md.digest(value.getBytes());
-            BigInteger no = new BigInteger(1, messageDigest);
-            return no.toString(16);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-            return "";
-        }
-    }
-}
--- a/src/java/com/wasteinformationserver/website/HttpTools.kt
+++ b/src/java/com/wasteinformationserver/website/HttpTools.kt
@ -0,0 +1,32 @@
+package com.wasteinformationserver.website
+
+import java.math.BigInteger
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+
+/**
+ * basic http tools
+ *
+ * @author Lukas Heiligenbrunner
+ */
+class HttpTools {
+    companion object{
+        /**
+         * create md5 hash of string
+         *
+         * @param value input string
+         * @return md5 hash
+         */
+        fun StringToMD5(value: String): String {
+            return try {
+                val md = MessageDigest.getInstance("MD5")
+                val messageDigest = md.digest(value.toByteArray())
+                val no = BigInteger(1, messageDigest)
+                no.toString(16)
+            } catch (e: NoSuchAlgorithmException) {
+                e.printStackTrace()
+                ""
+            }
+        }
+    }
+}
--- a/src/java/com/wasteinformationserver/website/MainPage.java
+++ b/src/java/com/wasteinformationserver/website/MainPage.java
@ -1,78 +0,0 @@
-// Dear programmer:
-// When I wrote this code, only god and
-// I knew how it worked.
-// Now, only god knows it!
-//
-// Therefore, if you are trying to optimize
-// this routine and it fails (most surely),
-// please increase this counter as a
-// warning for the next person:
-//
-// total hours wasted here = 254
-//
-
-package com.wasteinformationserver.website;
-
-import com.sun.net.httpserver.Headers;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import com.wasteinformationserver.basicutils.Log;
-import com.wasteinformationserver.website.datarequests.login.LoginState;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class MainPage implements HttpHandler {
-    @Override
-    public void handle(HttpExchange t) throws IOException {
-        String path = t.getRequestURI().getPath();
-
-        if (path.equals("/")) {
-            path += "index.html";
-        }
-
-        Log.debug("looking for: " + path);
-
-        if (path.contains(".html")) {
-            if (LoginState.getObject().isLoggedIn() || path.equals("/register.html") || path.equals("/index.html")) { //pass only register page
-                sendPage(path, t);
-            } else {
-                Log.warning("user not logged in --> redirecting to login page");
-                sendPage("/index.html", t);
-            }
-        } else { //only detect login state on html pages
-            sendPage(path, t);
-        }
-    }
-
-    private void sendPage(String path, HttpExchange t) throws IOException {
-        InputStream fs = getClass().getResourceAsStream("/wwwroot" + path);
-
-        if (fs == null && path.contains(".html")) {
-            Log.warning("wrong page sending 404");
-            sendPage("/404Error.html", t);
-        } else if (fs == null) {
-            Log.warning("requested resource doesnt exist");
-        } else {
-            // Object exists and is a file: accept with response code 200.
-            String mime = "text/html";
-            if (path.substring(path.length() - 3).equals(".js")) mime = "application/javascript";
-            if (path.substring(path.length() - 3).equals("css")) mime = "text/css";
-
-            Headers h = t.getResponseHeaders();
-            h.set("Content-Type", mime);
-            t.sendResponseHeaders(200, 0);
-
-            OutputStream os = t.getResponseBody();
-
-            final byte[] buffer = new byte[0x10000];
-            int count;
-            while ((count = fs.read(buffer)) >= 0) {
-                os.write(buffer, 0, count);
-            }
-            fs.close();
-            os.close();
-        }
-    }
-}
--- a/src/java/com/wasteinformationserver/website/MainPage.kt
+++ b/src/java/com/wasteinformationserver/website/MainPage.kt
@ -0,0 +1,61 @@
+package com.wasteinformationserver.website
+
+import com.sun.net.httpserver.HttpExchange
+import com.sun.net.httpserver.HttpHandler
+import com.wasteinformationserver.basicutils.Log.Log.debug
+import com.wasteinformationserver.basicutils.Log.Log.warning
+import com.wasteinformationserver.website.datarequests.login.LoginState
+import java.io.IOException
+
+/**
+ * Http handler to deliver all the main pages (index.html ...)
+ *
+ * @author Lukas Heiligenbrunner
+ */
+class MainPage : HttpHandler {
+    @Throws(IOException::class)
+    override fun handle(t: HttpExchange) {
+        var path = t.requestURI.path
+        if (path == "/") {
+            path += "index.html"
+        }
+        debug("looking for: $path")
+        if (path.contains(".html")) {
+            if (LoginState.getObject().isLoggedIn || path == "/register.html" || path == "/index.html") { //pass only register page
+                sendPage(path, t)
+            } else {
+                warning("user not logged in --> redirecting to login page")
+                sendPage("/index.html", t)
+            }
+        } else { //only detect login state on html pages
+            sendPage(path, t)
+        }
+    }
+
+    @Throws(IOException::class)
+    private fun sendPage(path: String, t: HttpExchange) {
+        val fs = javaClass.getResourceAsStream("/wwwroot$path")
+        if (fs == null && path.contains(".html")) {
+            warning("wrong page sending 404")
+            sendPage("/404Error.html", t)
+        } else if (fs == null) {
+            warning("requested resource doesnt exist --> $path")
+        } else { // Object exists and is a file: accept with response code 200.
+            var mime = "text/html"
+            val s = path.substring(path.length - 3)
+            if (s == ".js") mime = "application/javascript"
+            if (s == "css") mime = "text/css"
+            val h = t.responseHeaders
+            h["Content-Type"] = mime
+            t.sendResponseHeaders(200, 0)
+            val os = t.responseBody
+            val buffer = ByteArray(0x10000)
+            var count: Int
+            while (fs.read(buffer).also { count = it } >= 0) {
+                os.write(buffer, 0, count)
+            }
+            fs.close()
+            os.close()
+        }
+    }
+}
--- a/src/java/com/wasteinformationserver/website/Webserver.java
+++ b/src/java/com/wasteinformationserver/website/Webserver.java
@ -1,42 +0,0 @@
-package com.wasteinformationserver.website;
-
-import com.sun.net.httpserver.HttpServer;
-import com.wasteinformationserver.basicutils.Log;
-import com.wasteinformationserver.website.datarequests.AdminRequests;
-import com.wasteinformationserver.website.datarequests.DataRequest;
-import com.wasteinformationserver.website.datarequests.NewDateRequest;
-import com.wasteinformationserver.website.datarequests.RegisterRequest;
-import com.wasteinformationserver.website.datarequests.login.CheckLoginState;
-import com.wasteinformationserver.website.datarequests.login.LoginRequest;
-
-import java.io.IOException;
-import java.net.BindException;
-import java.net.InetSocketAddress;
-
-
-public class Webserver {
-    public void startserver() {
-        Log.info("starting Webserver");
-
-        try {
-            HttpServer server = HttpServer.create(new InetSocketAddress(8000), 0);
-
-            server.createContext("/", new MainPage());
-
-            server.createContext("/senddata/loginget", new LoginRequest());
-            server.createContext("/senddata/registerpost", new RegisterRequest());
-            server.createContext("/senddata/checkloginstate", new CheckLoginState());
-            server.createContext("/senddata/wastedata", new DataRequest());
-            server.createContext("/senddata/admindata", new AdminRequests());
-            server.createContext("/senddata/newdate", new NewDateRequest());
-
-            server.setExecutor(null); // creates a default executor
-            server.start();
-            Log.info("Server available at http://127.0.0.1:8000 now");
-        } catch (BindException e) {
-            Log.criticalerror("The Port 8000 is already in use!");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}
--- a/src/java/com/wasteinformationserver/website/Webserver.kt
+++ b/src/java/com/wasteinformationserver/website/Webserver.kt
@ -0,0 +1,40 @@
+package com.wasteinformationserver.website
+
+import com.sun.net.httpserver.HttpServer
+import com.wasteinformationserver.basicutils.Log.Log.criticalerror
+import com.wasteinformationserver.basicutils.Log.Log.info
+import com.wasteinformationserver.website.datarequests.*
+import com.wasteinformationserver.website.datarequests.login.CheckLoginState
+import com.wasteinformationserver.website.datarequests.login.LoginRequest
+import java.io.IOException
+import java.net.BindException
+import java.net.InetSocketAddress
+
+/**
+ * class to create the website nodes at specific paths
+ *
+ * @author Lukas Heiligenbrunner
+ */
+class Webserver {
+    fun startserver() {
+        info("starting Webserver")
+        try {
+            val server = HttpServer.create(InetSocketAddress(8000), 0)
+            server.createContext("/", MainPage())
+            server.createContext("/senddata/loginget", LoginRequest())
+            server.createContext("/senddata/registerpost", RegisterRequest())
+            server.createContext("/senddata/checkloginstate", CheckLoginState())
+            server.createContext("/senddata/wastedata", DataRequest())
+            server.createContext("/senddata/admindata", AdminRequests())
+            server.createContext("/senddata/newdate", NewDateRequest())
+            server.createContext("/senddata/Devicedata", DeviceRequest())
+            server.executor = java.util.concurrent.Executors.newCachedThreadPool() // creates a default executor
+            server.start()
+            info("Server available at http://127.0.0.1:8000 now")
+        } catch (e: BindException) {
+            criticalerror("The Port 8000 is already in use!")
+        } catch (e: IOException) {
+            e.printStackTrace()
+        }
+    }
+}
--- a/src/java/com/wasteinformationserver/website/basicrequest/GetRequest.java
+++ b/src/java/com/wasteinformationserver/website/basicrequest/GetRequest.java
@ -1,45 +0,0 @@
-package com.wasteinformationserver.website.basicrequest;
-
-import com.sun.net.httpserver.Headers;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-
-public abstract class GetRequest implements HttpHandler {
-    @Override
-    public void handle(HttpExchange httpExchange) throws IOException {
-        if (httpExchange.getRequestMethod().equals("GET")) {
-            String query = httpExchange.getRequestURI().getQuery();
-
-            HashMap<String, String> params = new HashMap<>();
-
-            String[] res = query.split("&");
-            for (String str : res) {
-                String[] values = str.split("=");
-                params.put(values[0], values[1]);
-
-            }
-
-            String response = myrequest(params);
-
-
-            Headers h = httpExchange.getResponseHeaders();
-            h.set("Content-Type", "application/json");
-            httpExchange.sendResponseHeaders(200, 0);
-
-            OutputStream os = httpExchange.getResponseBody();
-            os.write(response.getBytes());
-            os.close();
-        }
-    }
-
-    /**
-     * @param params received get params from com.wasteinformationserver.website
-     * @return json reply to com.wasteinformationserver.website
-     */
-    public abstract String myrequest(HashMap<String, String> params);
-
-}
--- a/src/java/com/wasteinformationserver/website/basicrequest/GetRequest.kt
+++ b/src/java/com/wasteinformationserver/website/basicrequest/GetRequest.kt
@ -0,0 +1,38 @@
+package com.wasteinformationserver.website.basicrequest
+
+import com.sun.net.httpserver.HttpExchange
+import com.sun.net.httpserver.HttpHandler
+import java.io.IOException
+import java.util.*
+
+/**
+ * basic GET request handler
+ * reply function has to be implemented!
+ */
+abstract class GetRequest : HttpHandler {
+    @Throws(IOException::class)
+    override fun handle(httpExchange: HttpExchange) {
+        if (httpExchange.requestMethod == "GET") {
+            val query = httpExchange.requestURI.query
+            val params = HashMap<String, String>()
+            val res = query.split("&".toRegex()).toTypedArray()
+            for (str in res) {
+                val values = str.split("=".toRegex()).toTypedArray()
+                params[values[0]] = values[1]
+            }
+            val response = myrequest(params)
+            val h = httpExchange.responseHeaders
+            h["Content-Type"] = "application/json"
+            httpExchange.sendResponseHeaders(200, 0)
+            val os = httpExchange.responseBody
+            os.write(response.toByteArray())
+            os.close()
+        }
+    }
+
+    /**
+     * @param params received get params from com.wasteinformationserver.website
+     * @return json reply to com.wasteinformationserver.website
+     */
+    abstract fun myrequest(params: HashMap<String, String>): String
+}
--- a/src/java/com/wasteinformationserver/website/basicrequest/PostRequest.java
+++ b/src/java/com/wasteinformationserver/website/basicrequest/PostRequest.java
@ -1,52 +0,0 @@
-package com.wasteinformationserver.website.basicrequest;
-
-import com.sun.net.httpserver.Headers;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-
-public abstract class PostRequest implements HttpHandler {
-
-    @Override
-    public void handle(HttpExchange httpExchange) throws IOException {
-        if (httpExchange.getRequestMethod().equals("POST")) {
-            StringBuilder sb = new StringBuilder();
-            InputStream ios = httpExchange.getRequestBody();
-            int i;
-            while ((i = ios.read()) != -1) {
-                sb.append((char) i);
-            }
-            String query = sb.toString();
-
-            HashMap<String, String> params = new HashMap<>();
-
-            String[] res = query.split("&");
-            for (String str : res) {
-                String[] values = str.split("=");
-                params.put(values[0], values[1]);
-            }
-
-            String response = request(params);
-
-
-            Headers h = httpExchange.getResponseHeaders();
-            h.set("Content-Type", "application/json");
-            httpExchange.sendResponseHeaders(200, 0);
-
-            OutputStream os = httpExchange.getResponseBody();
-            os.write(response.getBytes());
-            os.close();
-        }
-    }
-
-    /**
-     * @param params received get params from com.wasteinformationserver.website
-     * @return json reply to com.wasteinformationserver.website
-     */
-    public abstract String request(HashMap<String, String> params);
-
-}
--- a/src/java/com/wasteinformationserver/website/basicrequest/PostRequest.kt
+++ b/src/java/com/wasteinformationserver/website/basicrequest/PostRequest.kt
@ -0,0 +1,44 @@
+package com.wasteinformationserver.website.basicrequest
+
+import com.sun.net.httpserver.HttpExchange
+import com.sun.net.httpserver.HttpHandler
+import java.io.IOException
+import java.util.*
+
+/**
+ * basic POST request handler
+ * reply function has to be implemented!
+ */
+abstract class PostRequest : HttpHandler {
+    @Throws(IOException::class)
+    override fun handle(httpExchange: HttpExchange) {
+        if (httpExchange.requestMethod == "POST") {
+            val sb = StringBuilder()
+            val ios = httpExchange.requestBody
+            var i: Int
+            while (ios.read().also { i = it } != -1) {
+                sb.append(i.toChar())
+            }
+            val query = sb.toString()
+            val params = HashMap<String, String>()
+            val res = query.split("&".toRegex()).toTypedArray()
+            for (str in res) {
+                val values = str.split("=".toRegex()).toTypedArray()
+                params[values[0]] = values[1]
+            }
+            val response = request(params)
+            val h = httpExchange.responseHeaders
+            h["Content-Type"] = "application/json"
+            httpExchange.sendResponseHeaders(200, 0)
+            val os = httpExchange.responseBody
+            os.write(response.toByteArray())
+            os.close()
+        }
+    }
+
+    /**
+     * @param params received get params from com.wasteinformationserver.website
+     * @return json reply to com.wasteinformationserver.website
+     */
+    abstract fun request(params: HashMap<String, String>): String
+}
--- a/src/java/com/wasteinformationserver/website/datarequests/AdminRequests.java
+++ b/src/java/com/wasteinformationserver/website/datarequests/AdminRequests.java
@ -9,14 +9,25 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.HashMap;

+/**
+ * all requests for Admin page
+ *
+ * @author Lukas Heiligenbrunner
+ */
 public class AdminRequests extends PostRequest {
    @Override
    public String request(HashMap<String, String> params) {
        String result = "";
        switch (params.get("action")) {
+            /**
+             * shut down the whole application
+             */
            case "shutdownserver":
                System.exit(0);
                break;
+            /**
+             * restart the server application
+             */
            case "restartserver":
                final String javaBin = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
                File currentJar = null;
@ -28,7 +39,7 @@ public class AdminRequests extends PostRequest {

                /* is it a jar file? */
                if (!currentJar.getName().endsWith(".jar"))
-                    Log.warning("not jar --> cant restart");
+                    Log.Log.warning("not jar --> cant restart");

                /* Build command: java -jar application.jar */
                final ArrayList<String> command = new ArrayList<String>();
--- a/src/java/com/wasteinformationserver/website/datarequests/DataRequest.java
+++ b/src/java/com/wasteinformationserver/website/datarequests/DataRequest.java
@ -1,210 +0,0 @@
-package com.wasteinformationserver.website.datarequests;
-
-import com.wasteinformationserver.basicutils.Info;
-import com.wasteinformationserver.basicutils.Log;
-import com.wasteinformationserver.db.JDCB;
-import com.wasteinformationserver.website.basicrequest.PostRequest;
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLIntegrityConstraintViolationException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-
-public class DataRequest extends PostRequest {
-    @Override
-    public String request(HashMap<String, String> params) {
-        StringBuilder sb = new StringBuilder();
-        ResultSet set = null;
-        int status = -1;
-
-        JDCB jdcb;
-        try {
-            jdcb = JDCB.getInstance();
-        } catch (IOException e) {
-            Log.error("no connection to db");
-            return "{\"query\" : \"nodbconn\"}";
-        }
-        switch (params.get("action")) {
-            case "newCity":
-                sb.append("{");
-                Log.debug(params.toString());
-
-//                check if wastezone and wasteregion already exists
-
-                Log.debug(params.get("cityname") + params.get("wastetype") + params.get("wastezone"));
-                set = jdcb.executeQuery("select * from `cities` where `name`='" + params.get("cityname") + "' AND `wastetype`='" + params.get("wastetype") + "' AND `zone`='" + params.get("wastezone") + "'");
-                int size = 0;
-                try {
-                    if (set != null) {
-                        set.last();    // moves cursor to the last row
-                        size = set.getRow(); // get row id
-                    }
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                if (size == 0) {
-                    //doesnt exist
-                    try {
-                        status = jdcb.executeUpdate("INSERT INTO `cities`(`userid`, `name`, `wastetype`, `zone`) VALUES ('0','" + params.get("cityname") + "','" + params.get("wastetype") + "','" + params.get("wastezone") + "');");
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                    }
-
-                    if (status == 1) {
-                        sb.append("\"status\" : \"inserted\"");
-                    } else {
-                        sb.append("\"status\" : \"inserterror\"");
-                    }
-
-                } else if (size > 1) {
-                    Log.warning("more than one entry in db!!!");
-                    sb.append("\"status\" : \"exists\"");
-                } else {
-                    //already exists
-                    sb.append("\"status\" : \"exists\"");
-                }
-
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-            case "getAllCities":
-                set = jdcb.executeQuery("select * from cities");
-                Log.debug(set.toString());
-                sb.append("{\"data\":[");
-                try {
-                    while (set.next()) {
-                        sb.append("{\"cityname\":\"" + set.getString("name") + "\"");
-                        sb.append(",\"wastetype\":\"" + set.getString("wastetype") + "\"");
-                        sb.append(",\"id\":\"" + set.getString("id") + "\"");
-                        sb.append(",\"zone\":\"" + set.getString("zone") + "\"}");
-                        if (!set.isLast()) {
-                            sb.append(",");
-                        }
-                    }
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                sb.append("]");
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-            case "deletecity":
-                //DELETE FROM `cities` WHERE `id`=0
-                sb.append("{");
-                try {
-                    status = jdcb.executeUpdate("DELETE FROM `cities` WHERE `id`='" + params.get("id") + "'");
-                    if (status == 1) {
-                        //success
-                        sb.append("\"status\" : \"success\"");
-                    } else {
-                        sb.append("\"status\" : \"error\"");
-                    }
-                } catch (SQLIntegrityConstraintViolationException e) {
-                    Log.warning("dependencies of deletion exist");
-                    sb.append("\"status\" : \"dependenciesnotdeleted\"");
-                } catch (SQLException e) {
-                    Log.error("sql exception: " + e.getMessage());
-                    sb.append("\"status\" : \"error\"");
-                }
-
-                Log.debug(status);
-
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-
-                break;
-            case "getAllDates":
-                set = jdcb.executeQuery("SELECT pickupdates.id,pickupdates.pickupdate,cities.userid,cities.name,cities.wastetype,cities.zone " +
-                        "FROM `pickupdates` INNER JOIN `cities` ON pickupdates.citywastezoneid = cities.id");
-                sb.append("{\"data\":[");
-                try {
-                    while (set.next()) {
-                        sb.append("{\"date\":\"" + set.getString("pickupdate") + "\"");
-                        sb.append(",\"cityname\":\"" + set.getString("name") + "\"");
-                        sb.append(",\"wastetype\":\"" + set.getString("wastetype") + "\"");
-                        sb.append(",\"id\":\"" + set.getString("id") + "\"");
-                        sb.append(",\"zone\":\"" + set.getString("zone") + "\"}");
-                        if (!set.isLast()) {
-                            sb.append(",");
-                        }
-                    }
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                sb.append("]");
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-            case "deletedate":
-                sb.append("{");
-                try {
-                    status = jdcb.executeUpdate("DELETE FROM `pickupdates` WHERE `id`='" + params.get("id") + "'");
-                    if (status == 1) {
-                        //success
-                        sb.append("\"status\" : \"success\"");
-                    } else {
-                        sb.append("\"status\" : \"error\"");
-                    }
-                } catch (SQLIntegrityConstraintViolationException e) {
-                    Log.warning("dependencies of deletion exist");
-                    sb.append("\"status\" : \"dependenciesnotdeleted\"");
-                } catch (SQLException e) {
-                    Log.error("sql exception: " + e.getMessage());
-                    sb.append("\"status\" : \"error\"");
-                }
-
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-            case "getversionandbuildtime":
-                sb.append("{");
-
-                sb.append("\"version\" : \""+ Info.getVersion()+"\"");
-                sb.append(",\"buildtime\" : \""+ Info.getBuilddate()+"\"");
-
-
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-            case "getStartHeaderData":
-                sb.append("{");
-
-                try {
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                    Date date = new Date();
-                    String time = sdf.format(date);
-                    set = jdcb.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN  '0000-12-27' AND '"+time+"'");
-                    set.last();
-                    sb.append("\"finshedcollections\":\"" + set.getRow() + "\"");
-
-                    sdf = new SimpleDateFormat("yyyy-MM-dd");
-                    date = new Date();
-                    date = new Date(date.getTime()+1 * 24 * 60 * 60 * 1000);
-
-                    time = sdf.format(date);
-                    set = jdcb.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN '"+time+"' AND '2222-12-27'");
-                    set.last();
-                    sb.append(",\"futurecollections\":\"" + set.getRow() + "\"");
-
-                    set = jdcb.executeQuery("select * from pickupdates");
-                    set.last();
-                    sb.append(",\"collectionnumber\":\"" + set.getRow() + "\"");
-
-                    set = jdcb.executeQuery("select * from `cities`");
-                    set.last();
-                    sb.append(",\"citynumber\":\"" + set.getRow() + "\"");
-                } catch (SQLException e) {
-                    Log.error("sql exception: " + e.getMessage());
-                    sb.append("\"status\" : \"error\"");
-                }
-
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-        }
-        return sb.toString();
-    }
-}
--- a/src/java/com/wasteinformationserver/website/datarequests/DataRequest.kt
+++ b/src/java/com/wasteinformationserver/website/datarequests/DataRequest.kt
@ -0,0 +1,215 @@
+package com.wasteinformationserver.website.datarequests
+
+import com.wasteinformationserver.basicutils.Info
+import com.wasteinformationserver.basicutils.Log.Log.debug
+import com.wasteinformationserver.basicutils.Log.Log.error
+import com.wasteinformationserver.basicutils.Log.Log.warning
+import com.wasteinformationserver.db.JDBC
+import com.wasteinformationserver.website.basicrequest.PostRequest
+import java.sql.ResultSet
+import java.sql.SQLException
+import java.sql.SQLIntegrityConstraintViolationException
+import java.text.SimpleDateFormat
+import java.util.*
+
+/**
+ * General Datarequests for Dashboard
+ *
+ * @author Lukas Heiligenbrunner
+ */
+class DataRequest : PostRequest() {
+    override fun request(params: HashMap<String, String>): String {
+        val sb = StringBuilder()
+        var set: ResultSet?
+        var status = -1
+        val jdbc: JDBC = JDBC.getInstance()
+        if (!jdbc.isConnected) {
+            error("no connection to db")
+            return "{\"query\" : \"nodbconn\"}"
+        }
+
+        when (params["action"]) {
+            /**
+             * create a new city entry in db
+             */
+            "newCity" -> {
+                sb.append("{")
+                debug(params.toString())
+                //                check if wastezone and wasteregion already exists
+                debug(params["cityname"] + params["wastetype"] + params["wastezone"])
+                set = jdbc.executeQuery("select * from `cities` where `name`='" + params["cityname"] + "' AND `wastetype`='" + params["wastetype"] + "' AND `zone`='" + params["wastezone"] + "'")
+                var size = 0
+                try {
+                    if (set != null) {
+                        set.last() // moves cursor to the last row
+                        size = set.row // get row id
+                    }
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                if (size == 0) { //doesnt exist
+                    try {
+                        status = jdbc.executeUpdate("INSERT INTO `cities`(`userid`, `name`, `wastetype`, `zone`) VALUES ('0','" + params["cityname"] + "','" + params["wastetype"] + "','" + params["wastezone"] + "');")
+                    } catch (e: SQLException) {
+                        e.printStackTrace()
+                    }
+                    if (status == 1) {
+                        sb.append("\"status\" : \"inserted\"")
+                    }
+                    else {
+                        sb.append("\"status\" : \"inserterror\"")
+                    }
+                }
+                else if (size > 1) {
+                    warning("more than one entry in db!!!")
+                    sb.append("\"status\" : \"exists\"")
+                }
+                else { //already exists
+                    sb.append("\"status\" : \"exists\"")
+                }
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            /**
+             * return all defined cities from db
+             */
+            "getAllCities" -> {
+                set = jdbc.executeQuery("select * from cities")
+                debug(set.toString())
+                sb.append("{\"data\":[")
+                try {
+                    while (set.next()) {
+                        sb.append("{\"cityname\":\"" + set.getString("name") + "\"")
+                        sb.append(",\"wastetype\":\"" + set.getString("wastetype") + "\"")
+                        sb.append(",\"id\":\"" + set.getString("id") + "\"")
+                        sb.append(",\"zone\":\"" + set.getString("zone") + "\"}")
+                        if (!set.isLast) {
+                            sb.append(",")
+                        }
+                    }
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                sb.append("]")
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            /**
+             * delete a specific city
+             */
+            "deletecity" -> {
+                //DELETE FROM `cities` WHERE `id`=0
+                sb.append("{")
+                try {
+                    status = jdbc.executeUpdate("DELETE FROM `cities` WHERE `id`='" + params["id"] + "'")
+                    if (status == 1) { //success
+                        sb.append("\"status\" : \"success\"")
+                    }
+                    else {
+                        sb.append("\"status\" : \"error\"")
+                    }
+                } catch (e: SQLIntegrityConstraintViolationException) {
+                    warning("dependencies of deletion exist")
+                    sb.append("\"status\" : \"dependenciesnotdeleted\"")
+                } catch (e: SQLException) {
+                    error("sql exception: " + e.message)
+                    sb.append("\"status\" : \"error\"")
+                }
+                debug(status)
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            /**
+             * returns all configured dates with its city and zone
+             */
+            "getAllDates" -> {
+                set = jdbc.executeQuery("SELECT pickupdates.id,pickupdates.pickupdate,cities.userid,cities.name,cities.wastetype,cities.zone " +
+                        "FROM `pickupdates` INNER JOIN `cities` ON pickupdates.citywastezoneid = cities.id")
+                sb.append("{\"data\":[")
+                try {
+                    while (set.next()) {
+                        sb.append("{\"date\":\"" + set.getString("pickupdate") + "\"")
+                        sb.append(",\"cityname\":\"" + set.getString("name") + "\"")
+                        sb.append(",\"wastetype\":\"" + set.getString("wastetype") + "\"")
+                        sb.append(",\"id\":\"" + set.getString("id") + "\"")
+                        sb.append(",\"zone\":\"" + set.getString("zone") + "\"}")
+                        if (!set.isLast) {
+                            sb.append(",")
+                        }
+                    }
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                sb.append("]")
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            /**
+             * delete a specific date
+             */
+            "deletedate" -> {
+                sb.append("{")
+                try {
+                    status = jdbc.executeUpdate("DELETE FROM `pickupdates` WHERE `id`='" + params["id"] + "'")
+                    if (status == 1) { //success
+                        sb.append("\"status\" : \"success\"")
+                    }
+                    else {
+                        sb.append("\"status\" : \"error\"")
+                    }
+                } catch (e: SQLIntegrityConstraintViolationException) {
+                    warning("dependencies of deletion exist")
+                    sb.append("\"status\" : \"dependenciesnotdeleted\"")
+                } catch (e: SQLException) {
+                    error("sql exception: " + e.message)
+                    sb.append("\"status\" : \"error\"")
+                }
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            /**
+             * return version foot data
+             */
+            "getversionandbuildtime" -> {
+                sb.append("{")
+                sb.append("\"version\" : \"" + Info.getVersion() + "\"")
+                sb.append(",\"buildtime\" : \"" + Info.getBuilddate() + "\"")
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            /**
+             * return head data with basic collection infos
+             */
+            "getStartHeaderData" -> {
+                sb.append("{")
+                try {
+                    var sdf = SimpleDateFormat("yyyy-MM-dd")
+                    var date = Date()
+                    var time = sdf.format(date)
+                    set = jdbc.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN  '0000-12-27' AND '$time'")
+                    set.last()
+                    sb.append("\"finshedcollections\":\"" + set.row + "\"")
+                    sdf = SimpleDateFormat("yyyy-MM-dd")
+                    date = Date()
+                    date = Date(date.time + 1 * 24 * 60 * 60 * 1000)
+                    time = sdf.format(date)
+                    set = jdbc.executeQuery("SELECT * FROM `pickupdates` WHERE `pickupdate` BETWEEN '$time' AND '2222-12-27'")
+                    set.last()
+                    sb.append(",\"futurecollections\":\"" + set.row + "\"")
+                    set = jdbc.executeQuery("select * from pickupdates")
+                    set.last()
+                    sb.append(",\"collectionnumber\":\"" + set.row + "\"")
+                    set = jdbc.executeQuery("select * from `cities`")
+                    set.last()
+                    sb.append(",\"citynumber\":\"" + set.row + "\"")
+                } catch (e: SQLException) {
+                    error("sql exception: " + e.message)
+                    sb.append("\"status\" : \"error\"")
+                }
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+        }
+        return sb.toString()
+    }
+}
--- a/src/java/com/wasteinformationserver/website/datarequests/DeviceRequest.kt
+++ b/src/java/com/wasteinformationserver/website/datarequests/DeviceRequest.kt
@ -0,0 +1,202 @@
+package com.wasteinformationserver.website.datarequests
+
+import com.wasteinformationserver.basicutils.Log.Log.debug
+import com.wasteinformationserver.basicutils.Log.Log.error
+import com.wasteinformationserver.db.JDBC
+import com.wasteinformationserver.website.basicrequest.PostRequest
+import java.sql.ResultSet
+import java.sql.SQLException
+import java.util.*
+
+/**
+ * Class for all requests on device Page
+ *
+ * @author Lukas Heiligenbrunner
+ */
+class DeviceRequest : PostRequest() {
+    override fun request(params: HashMap<String, String>): String {
+        val jdbc = JDBC.getInstance()
+        if (!jdbc.isConnected) {
+            error("no connection to db")
+            return "{\"query\" : \"nodbconn\"}"
+        }
+
+        val sb = StringBuilder()
+        val deviceset: ResultSet
+        when (params["action"]) {
+            /**
+             * return all available devices
+             */
+            "getdevices" -> {
+                deviceset = jdbc!!.executeQuery("SELECT * FROM `devices")
+                sb.append("{\"data\":[")
+                try {
+                    while (deviceset.next()) {
+                        val deviceid = deviceset.getInt("DeviceID")
+                        val cityid = deviceset.getInt("CityID")
+                        if (cityid == -1) {
+                            sb.append("{\"deviceid\":").append(deviceid).append(",\"cityid\":").append(cityid).append("}")
+                        }
+                        else {
+                            val devicename = deviceset.getString("DeviceName")
+                            val devicelocation = deviceset.getString("DeviceLocation")
+                            sb.append("{\"deviceid\":").append(deviceid).append(",\"devicename\":\"").append(devicename).append("\",\"devicelocation\":\"").append(devicelocation).append("\",\"devices\":[")
+                            val devicecities = jdbc.executeQuery("SELECT * FROM `device_city` INNER JOIN `cities` ON device_city.CityID=cities.id WHERE `DeviceID`='$deviceid'")
+                            while (devicecities.next()) {
+                                val cityidd = devicecities.getInt("id")
+                                val cityname = devicecities.getString("name")
+                                val wastetype = devicecities.getString("wastetype")
+                                val zone = devicecities.getString("zone")
+                                sb.append("{\"cityid\":").append(cityidd).append(",\"cityname\":\"").append(cityname).append("\",\"wastetype\":\"").append(wastetype).append("\",\"zone\":\"").append(zone).append("\"}")
+                                if (!devicecities.isLast) {
+                                    sb.append(",")
+                                }
+                            }
+                            sb.append("]}")
+                        }
+                        if (!deviceset.isLast) {
+                            sb.append(",")
+                        }
+                    }
+                    sb.append("]}")
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+            }
+            /**
+             * returns all available city names
+             */
+            "getCitynames" -> {
+                deviceset = jdbc!!.executeQuery("select * from cities")
+                debug(deviceset.toString())
+                sb.append("{")
+                try {
+                    var prev = ""
+                    while (deviceset.next()) {
+                        if (prev != deviceset.getString("name")) {
+                            if (!deviceset.isFirst()) {
+                                sb.append(",")
+                            }
+                            sb.append("\"").append(deviceset.getString("name")).append("\":\"").append(deviceset.getString("name")).append("\"")
+                        }
+                        prev = deviceset.getString("name")
+                    }
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                sb.append("}")
+                debug(sb.toString())
+            }
+            /**
+             * returns all available zones for specified city
+             */
+            "getzones" -> {
+                deviceset = jdbc!!.executeQuery("select * from cities WHERE `name`='" + params["cityname"] + "' ORDER BY zone ASC")
+                debug(deviceset.toString())
+                sb.append("{")
+                try {
+                    var prev = 42
+                    while (deviceset.next()) {
+                        if (prev != deviceset.getInt("zone")) {
+                            sb.append("\"").append(deviceset.getInt("zone")).append("\":\"").append(deviceset.getInt("zone")).append("\"")
+                            if (!deviceset.isLast()) {
+                                sb.append(",")
+                            }
+                        }
+                        prev = deviceset.getInt("zone")
+                    }
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                sb.append("}")
+            }
+            /**
+             * returns all available waste types for specified zone and city
+             */
+            "gettypes" -> {
+                deviceset = jdbc!!.executeQuery("select * from cities WHERE `name`='" + params["cityname"] + "' AND `zone`='" + params["zonename"] + "' ORDER BY zone ASC")
+                debug(deviceset.toString())
+                sb.append("{")
+                try {
+                    var prev = "42"
+                    while (deviceset.next()) {
+                        if (prev != deviceset.getString("wastetype")) {
+                            sb.append("\"" + deviceset.getString("wastetype") + "\":\"" + deviceset.getString("wastetype") + "\"")
+                            if (!deviceset.isLast()) {
+                                sb.append(",")
+                            }
+                        }
+                        prev = deviceset.getString("wastetype")
+                    }
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                sb.append("}")
+            }
+            /**
+             * configure device and save infos to db
+             */
+            "savetodb" -> try {
+                val cityset = jdbc!!.executeQuery("SELECT id from cities WHERE `name`='" + params["cityname"] + "' AND `zone`='" + params["zonename"] + "' AND `wastetype`='" + params["wastetype"] + "'")
+                cityset.last()
+                if (cityset.row != 1) {
+                    error("error saving device to db --> device multiply defined?")
+                    sb.append("{\"success\":\"false\"}")
+                }
+                else {
+                    val cityid = cityset.getInt("id")
+                    jdbc.executeUpdate("INSERT INTO `device_city` (`DeviceID`, `CityID`) VALUES ('" + params["deviceid"] + "', '" + cityid + "');")
+                    jdbc.executeUpdate("UPDATE devices SET `CityID`='0',`DeviceName`='" + params["devicename"] + "',`DeviceLocation`='" + params["devicelocation"] + "' WHERE `DeviceID`='" + params["deviceid"] + "'")
+                    sb.append("{\"success\":\"true\"}")
+                }
+            } catch (e: SQLException) {
+                e.printStackTrace()
+            }
+            /**
+             * delete a configured device from db
+             */
+            "deleteDevice" -> {
+                try {
+                    jdbc.executeUpdate("DELETE FROM devices WHERE `DeviceID`='" + params["id"] + "'")
+                    jdbc.executeUpdate("DELETE FROM device_city WHERE `DeviceID`='" + params["id"] + "'")
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                sb.append("{\"status\":\"success\"}")
+            }
+            /**
+             * add new city/zone/type to db to existing one
+             */
+            "addtodb" -> {
+                try {
+                    val device = jdbc.executeQuery("SELECT * FROM cities WHERE name='" + params["cityname"] + "' AND wastetype='" + params["wastetype"] + "' AND zone='" + params["zonename"] + "'")
+                    device.first()
+                    var cityid = device.getInt("id")
+                    jdbc.executeUpdate("INSERT INTO `device_city` (`DeviceID`, `CityID`) VALUES ('" + params["deviceid"] + "', '" + cityid + "');")
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                sb.append("{\"success\":true}")
+            }
+            /**
+             * return header information such as devicenumber and number of unconfigured devices
+             */
+            "getheader" -> {
+                try {
+                    var numberset = jdbc.executeQuery("SELECT * FROM devices")
+                    numberset.last()
+                    val devicenr = numberset.row
+
+                    numberset = jdbc.executeQuery("SELECT * FROM devices WHERE CityID=-1")
+                    numberset.last()
+                    val unconfigureddevices = numberset.row
+
+                    sb.append("{\"success\":true,\"devicenumber\":$devicenr, \"unconfigureddevices\":$unconfigureddevices}")
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+            }
+        }
+        return sb.toString()
+    }
+}
--- a/src/java/com/wasteinformationserver/website/datarequests/NewDateRequest.java
+++ b/src/java/com/wasteinformationserver/website/datarequests/NewDateRequest.java
@ -1,127 +0,0 @@
-package com.wasteinformationserver.website.datarequests;
-
-import com.wasteinformationserver.basicutils.Log;
-import com.wasteinformationserver.db.JDCB;
-import com.wasteinformationserver.website.basicrequest.PostRequest;
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-
-public class NewDateRequest extends PostRequest {
-    @Override
-    public String request(HashMap<String, String> params) {
-        StringBuilder sb = new StringBuilder();
-        JDCB jdcb;
-        ResultSet set;
-        try {
-            jdcb = JDCB.getInstance();
-        } catch (IOException e) {
-            Log.error("no connection to db");
-            return "{\"query\" : \"nodbconn\"}";
-        }
-        switch (params.get("action")) {
-            case "getCitynames":
-                set = jdcb.executeQuery("select * from cities");
-                Log.debug(set.toString());
-                sb.append("{\"data\":[");
-                try {
-                    String prev = "";
-                    while (set.next()) {
-                        if (prev.equals(set.getString("name"))) {
-
-                        } else {
-                            if (!set.isFirst()) {
-                                sb.append(",");
-                            }
-                            sb.append("{\"cityname\":\"" + set.getString("name") + "\"}");
-                        }
-                        prev = set.getString("name");
-                    }
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                sb.append("]");
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                Log.debug(sb.toString());
-                break;
-            case "getzones":
-                set = jdcb.executeQuery("select * from cities WHERE `name`='" + params.get("cityname") + "' ORDER BY zone ASC");
-                Log.debug(set.toString());
-                sb.append("{\"data\":[");
-                try {
-                    int prev = 42;
-                    while (set.next()) {
-                        if (prev == set.getInt("zone")) {
-
-                        } else {
-                            sb.append("{\"zone\":\"" + set.getInt("zone") + "\"}");
-                            if (!set.isLast()) {
-                                sb.append(",");
-                            }
-                        }
-                        prev = set.getInt("zone");
-                    }
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                sb.append("]");
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-            case "gettypes":
-                set = jdcb.executeQuery("select * from cities WHERE `name`='" + params.get("cityname") + "' AND `zone`='"+params.get("zonename")+"' ORDER BY zone ASC");
-                Log.debug(set.toString());
-                sb.append("{\"data\":[");
-                try {
-                    String prev = "42";
-                    while (set.next()) {
-                        if (prev == set.getString("wastetype")) {
-
-                        } else {
-                            sb.append("{\"wastetype\":\"" + set.getString("wastetype") + "\"}");
-                            if (!set.isLast()) {
-                                sb.append(",");
-                            }
-                        }
-                        prev = set.getString("wastetype");
-                    }
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                sb.append("]");
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-            case "newdate":
-                sb.append("{");
-                Log.debug(params);
-                set = jdcb.executeQuery("select * from cities WHERE `name`='" + params.get("cityname") + "' AND `zone`='" + params.get("zone") + "' AND `wastetype`='" + params.get("wastetype") + "'");
-                try {
-                    set.last();
-                    if (set.getRow() == 1) {
-                        Log.debug(set.getInt("id"));
-
-                        int status = jdcb.executeUpdate("INSERT INTO `pickupdates`(`citywastezoneid`, `pickupdate`) VALUES ('" + set.getInt("id") + "','" + params.get("date") + "')");
-                        if (status == 1) {
-                            sb.append("\"status\" : \"success\"");
-                        } else {
-                            sb.append("\"status\" : \"error\"");
-                        }
-                    } else {
-                        Log.warning("city doesnt exist!");
-                        sb.append("\"status\" : \"citydoesntexist\"");
-                    }
-
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                sb.append(",\"query\":\"ok\"");
-                sb.append("}");
-                break;
-        }
-        return sb.toString();
-    }
-}
--- a/src/java/com/wasteinformationserver/website/datarequests/NewDateRequest.kt
+++ b/src/java/com/wasteinformationserver/website/datarequests/NewDateRequest.kt
@ -0,0 +1,128 @@
+package com.wasteinformationserver.website.datarequests
+
+import com.wasteinformationserver.basicutils.Log.Log.debug
+import com.wasteinformationserver.basicutils.Log.Log.error
+import com.wasteinformationserver.basicutils.Log.Log.warning
+import com.wasteinformationserver.db.JDBC
+import com.wasteinformationserver.website.basicrequest.PostRequest
+import java.sql.ResultSet
+import java.sql.SQLException
+
+/**
+ * todo
+ *
+ * @author Lukas Heiligenbrunner
+ */
+class NewDateRequest : PostRequest() {
+    override fun request(params: HashMap<String, String>): String {
+        val sb = StringBuilder()
+        val set: ResultSet
+        val jdbc = JDBC.getInstance()
+        if (!jdbc.isConnected) {
+            error("no connection to db")
+            return "{\"query\" : \"nodbconn\"}"
+        }
+        when (params["action"]) {
+            "getCitynames" -> {
+                set = jdbc.executeQuery("select * from cities")
+                debug(set.toString())
+                sb.append("{\"data\":[")
+                try {
+                    var prev = ""
+                    while (set.next()) {
+                        if (prev == set.getString("name")) {
+                        }
+                        else {
+                            if (!set.isFirst) {
+                                sb.append(",")
+                            }
+                            sb.append("{\"cityname\":\"" + set.getString("name") + "\"}")
+                        }
+                        prev = set.getString("name")
+                    }
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                sb.append("]")
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+                debug(sb.toString())
+            }
+            "getzones" -> {
+                set = jdbc.executeQuery("select * from cities WHERE `name`='" + params["cityname"] + "' ORDER BY zone ASC")
+                debug(set.toString())
+                sb.append("{\"data\":[")
+                try {
+                    var prev = 42
+                    while (set.next()) {
+                        if (prev == set.getInt("zone")) {
+                        }
+                        else {
+                            sb.append("{\"zone\":\"" + set.getInt("zone") + "\"}")
+                            if (!set.isLast) {
+                                sb.append(",")
+                            }
+                        }
+                        prev = set.getInt("zone")
+                    }
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                sb.append("]")
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            "gettypes" -> {
+                set = jdbc.executeQuery("select * from cities WHERE `name`='" + params["cityname"] + "' AND `zone`='" + params["zonename"] + "' ORDER BY zone ASC")
+                debug(set.toString())
+                sb.append("{\"data\":[")
+                try {
+                    var prev = "42"
+                    while (set.next()) {
+                        if (prev === set.getString("wastetype")) {
+                        }
+                        else {
+                            sb.append("{\"wastetype\":\"" + set.getString("wastetype") + "\"}")
+                            if (!set.isLast) {
+                                sb.append(",")
+                            }
+                        }
+                        prev = set.getString("wastetype")
+                    }
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                sb.append("]")
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+            "newdate" -> {
+                sb.append("{")
+                debug(params)
+                set = jdbc.executeQuery("select * from cities WHERE `name`='" + params["cityname"] + "' AND `zone`='" + params["zone"] + "' AND `wastetype`='" + params["wastetype"] + "'")
+                try {
+                    set.last()
+                    if (set.row == 1) {
+                        debug(set.getInt("id"))
+                        val status = jdbc.executeUpdate("INSERT INTO `pickupdates`(`citywastezoneid`, `pickupdate`) VALUES ('" + set.getInt("id") + "','" + params["date"] + "')")
+                        if (status == 1) {
+                            sb.append("\"status\" : \"success\"")
+                        }
+                        else {
+                            sb.append("\"status\" : \"error\"")
+                        }
+                    }
+                    else {
+                        warning("city doesnt exist!")
+                        sb.append("\"status\" : \"citydoesntexist\"")
+                    }
+                } catch (e: SQLException) {
+                    e.printStackTrace()
+                }
+                sb.append(",\"query\":\"ok\"")
+                sb.append("}")
+            }
+        }
+        return sb.toString()
+    }
+}
--- a/src/java/com/wasteinformationserver/website/datarequests/RegisterRequest.java
+++ b/src/java/com/wasteinformationserver/website/datarequests/RegisterRequest.java
@ -1,35 +0,0 @@
-package com.wasteinformationserver.website.datarequests;
-
-import com.wasteinformationserver.basicutils.Log;
-import com.wasteinformationserver.db.JDCB;
-import com.wasteinformationserver.website.HttpTools;
-import com.wasteinformationserver.website.basicrequest.PostRequest;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.HashMap;
-
-public class RegisterRequest extends PostRequest {
-    @Override
-    public String request(HashMap<String, String> params) {
-        Log.debug(params.toString());
-
-        String passhash = HttpTools.StringToMD5(params.get("password"));
-
-        JDCB myjd = null;
-        try {
-            myjd = JDCB.getInstance();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        //new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation");
-        try {
-            int s = myjd.executeUpdate("INSERT INTO `user` (`username`, `firstName`, `secondName`, `password`, `email`, `logindate`) VALUES ('" + params.get("username") + "', '" + params.get("firstname") + "', '" + params.get("lastname") + "', '" + passhash + "', '" + params.get("email") + "', current_timestamp());");
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-
-        // TODO: 27.09.19 detect if register process was successful and reply right json
-        return "{\"accept\": true}";
-    }
-}
--- a/src/java/com/wasteinformationserver/website/datarequests/RegisterRequest.kt
+++ b/src/java/com/wasteinformationserver/website/datarequests/RegisterRequest.kt
@ -0,0 +1,38 @@
+package com.wasteinformationserver.website.datarequests
+
+import com.wasteinformationserver.basicutils.Log
+import com.wasteinformationserver.basicutils.Log.Log.debug
+import com.wasteinformationserver.db.JDBC
+import com.wasteinformationserver.website.HttpTools.Companion.StringToMD5
+import com.wasteinformationserver.website.basicrequest.PostRequest
+import java.io.IOException
+import java.sql.SQLException
+import java.util.*
+
+class RegisterRequest : PostRequest() {
+    override fun request(params: HashMap<String, String>): String {
+        debug(params.toString())
+        val passhash = StringToMD5(params["password"]!!)
+        var reply: StringBuilder = StringBuilder("{")
+        try {
+            var myjd: JDBC = JDBC.getInstance()
+
+            val status = myjd.executeUpdate("INSERT INTO `user` (`username`, `firstName`, `secondName`, `password`, `email`, `logindate`) VALUES ('" + params["username"] + "', '" + params["firstname"] + "', '" + params["lastname"] + "', '" + passhash + "', '" + params["email"] + "', current_timestamp());")
+            if (status == 1) {
+                reply.append("\"accept\": true")
+            } else {
+                reply.append("\"accept\": false")
+            }
+
+        } catch (e: IOException) {
+            Log.error("no connection to db")
+            reply.append("\"accept\": false")
+        } catch (e: SQLException) {
+            e.printStackTrace()
+            reply.append("\"accept\": false")
+        }
+        reply.append("}")
+
+        return reply.toString()
+    }
+}
--- a/src/java/com/wasteinformationserver/website/datarequests/UserInfoRequest.kt
+++ b/src/java/com/wasteinformationserver/website/datarequests/UserInfoRequest.kt
@ -0,0 +1,19 @@
+package com.wasteinformationserver.website.datarequests
+
+import com.wasteinformationserver.website.basicrequest.PostRequest
+import java.util.*
+
+class UserInfoRequest : PostRequest() {
+    override fun request(params: HashMap<String, String>): String {
+        //TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        when (params.get("action")) {
+            "getlogins" -> {
+                println("heyho")
+            }
+            ""->{
+                //todo o
+            }
+        }
+        return "{}";
+    }
+}
--- a/src/java/com/wasteinformationserver/website/datarequests/login/CheckLoginState.java
+++ b/src/java/com/wasteinformationserver/website/datarequests/login/CheckLoginState.java
@ -5,10 +5,13 @@ import com.wasteinformationserver.website.basicrequest.PostRequest;

 import java.util.HashMap;

+/**
+ * request handler for checking the login state of a user
+ */
 public class CheckLoginState extends PostRequest {
    @Override
    public String request(HashMap<String, String> params) {
-        Log.message("checking login state");
+        Log.Log.message("checking login state");
        if ((params.get("action")).equals("getloginstate")) {
            if (LoginState.getObject().isLoggedIn()) {
                return "{\"loggedin\":true, \"username\":\"" + LoginState.getObject().getUsername() + "\", \"permission\":\"" + LoginState.getObject().getPermission() + "\"}";
@ -16,7 +19,7 @@ public class CheckLoginState extends PostRequest {
                return "{\"loggedin\":false}";
            }
        } else if ((params.get("action")).equals("logout")) {
-            Log.debug("logging out");
+            Log.Log.debug("logging out");
            LoginState.getObject().logOut();
            return "{\"loggedin\":false}";
        }
--- a/src/java/com/wasteinformationserver/website/datarequests/login/LoginRequest.java
+++ b/src/java/com/wasteinformationserver/website/datarequests/login/LoginRequest.java
@ -1,59 +0,0 @@
-package com.wasteinformationserver.website.datarequests.login;
-
-import com.wasteinformationserver.basicutils.Log;
-import com.wasteinformationserver.db.JDCB;
-import com.wasteinformationserver.website.HttpTools;
-import com.wasteinformationserver.website.basicrequest.PostRequest;
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-
-public class LoginRequest extends PostRequest {
-    @Override
-    public String request(HashMap<String, String> params) {
-
-        Log.message("new login request");
-
-        String password = params.get("password");
-        String username = params.get("username");
-
-        JDCB jdcb;
-        try {
-            jdcb = JDCB.getInstance();
-        } catch (IOException e) {
-            Log.error("no connection to db");
-            return "{\"status\" : \"nodbconn\"}";
-        }
-
-        ResultSet s = jdcb.executeQuery("select * from user where username ='" + username + "'");
-        ;
-        //new JDCB("users", "kOpaIJUjkgb9ur6S", "wasteinformation").executeQuery("select * from user where username ='" + username + "'");
-        Log.debug("successfully logged in to db");
-        String response = "{\"accept\": false}";
-        try {
-            s.last();
-            if (s.getRow() == 1) {
-                //success
-                if (HttpTools.StringToMD5(password).equals(s.getString("password"))) {
-                    Log.debug("login success");
-                    LoginState.getObject().logIn();
-                    LoginState.getObject().setAccountData(username, "", "", "", s.getInt("permission")); // TODO: 06.12.19
-                    response = "{\"accept\": true}";
-                } else {
-                    Log.debug("wrong password");
-                }
-            } else if (s.getRow() == 0) {
-                //user not found
-                Log.debug("user not found");
-            } else {
-                //internal error two users with same name...?
-            }
-            Log.debug("rowcount: " + s.getRow());
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return response;
-    }
-}
--- a/src/java/com/wasteinformationserver/website/datarequests/login/LoginRequest.kt
+++ b/src/java/com/wasteinformationserver/website/datarequests/login/LoginRequest.kt
@ -0,0 +1,55 @@
+package com.wasteinformationserver.website.datarequests.login
+
+import com.wasteinformationserver.basicutils.Log.Log.debug
+import com.wasteinformationserver.basicutils.Log.Log.error
+import com.wasteinformationserver.basicutils.Log.Log.message
+import com.wasteinformationserver.db.JDBC
+import com.wasteinformationserver.website.HttpTools.Companion.StringToMD5
+import com.wasteinformationserver.website.basicrequest.PostRequest
+import java.io.IOException
+import java.sql.SQLException
+import java.util.*
+
+/**
+ * request handler of new login request of user
+ * - checks the truth of username and password
+ * - replies right error messages or the success login
+ */
+class LoginRequest : PostRequest() {
+    override fun request(params: HashMap<String, String>): String {
+        message("new login request")
+        val password = params["password"]
+        val username = params["username"]
+        val jdbc: JDBC = try {
+            JDBC.getInstance()
+        } catch (e: IOException) {
+            error("no connection to db")
+            return "{\"status\" : \"nodbconn\"}"
+        }
+        val s = jdbc.executeQuery("select * from user where username ='$username'")
+
+        debug("successfully logged in to db")
+        var response = "{\"accept\": false}"
+        try {
+            s.last()
+            if (s.row == 1) { //success
+                if (StringToMD5(password!!) == s.getString("password")) {
+                    debug("login success")
+                    LoginState.getObject().logIn()
+                    LoginState.getObject().setAccountData(username, s.getString("firstName"), s.getString("secondName"), s.getString("email"), s.getInt("permission"))
+                    response = "{\"accept\": true}"
+                } else {
+                    debug("wrong password")
+                }
+            } else if (s.row == 0) { //user not found
+                debug("user not found")
+            } else { //internal error two users with same name...?
+                error("there seem to be two users with same name")
+            }
+            debug("rowcount: " + s.row)
+        } catch (e: SQLException) {
+            e.printStackTrace()
+        }
+        return response
+    }
+}
--- a/src/java/com/wasteinformationserver/website/datarequests/login/LoginState.java
+++ b/src/java/com/wasteinformationserver/website/datarequests/login/LoginState.java
@ -1,11 +1,16 @@
 package com.wasteinformationserver.website.datarequests.login;

+/**
+ * singleton representing the login state of the user
+ */
 public class LoginState {
-    private LoginState() {
-    }

    private static LoginState mythis = new LoginState();

+    /**
+     * get object
+     * @return LoginState instance
+     */
    public static LoginState getObject() {
        return mythis;
    }
@ -16,16 +21,26 @@ public class LoginState {
    private String email;
    private int permission;

-    boolean loggedin = false;
+    private boolean loggedin = false;

+    /**
+     * login the user
+     */
    public void logIn() {
        loggedin = true;
    }

+    /**
+     * logout the user
+     */
    public void logOut() {
        loggedin = false;
    }

+    /**
+     * set the account infos
+     * username, firstname, lastname, email and permission level
+     */
    public void setAccountData(String username, String firstname, String lastname, String email, int permission) {
        this.username = username;
        this.firstname = firstname;
@ -34,26 +49,50 @@ public class LoginState {
        this.permission = permission;
    }

+    /**
+     * check if user is logged in
+     * @return loginstate
+     */
    public boolean isLoggedIn() {
        return loggedin;
    }

+    /**
+     * get username
+     * @return username
+     */
    public String getUsername() {
        return username;
    }

+    /**
+     * get firstname
+     * @return firstname
+     */
    public String getFirstname() {
        return firstname;
    }

+    /**
+     * get lastname
+     * @return lastname
+     */
    public String getLastname() {
        return lastname;
    }

+    /**
+     * get email address
+     * @return mail address
+     */
    public String getEmail() {
        return email;
    }

+    /**
+     * get permission level
+     * @return level as int
+     */
    public int getPermission() {
        return permission;
    }
--- 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">
@ -118,7 +118,5 @@
 <script src="lib/AdminLTE/plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
 <!-- AdminLTE App -->
 <script src="lib/AdminLTE/dist/js/adminlte.min.js"></script>
-<!-- AdminLTE for demo purposes -->
-<script src="lib/AdminLTE/dist/js/demo.js"></script>
 </body>
 </html>
--- a/src/resources/wwwroot/adminpanel.html
+++ b/src/resources/wwwroot/adminpanel.html
@ -6,38 +6,27 @@
    <title>WasteInformation Server</title>
    <!-- Tell the browser to be responsive to screen width -->
    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+
+    <!-- AdminLTE Libs -->
    <!-- Font Awesome -->
    <link rel="stylesheet" href="lib/AdminLTE/plugins/fontawesome-free/css/all.min.css">
    <!-- Ionicons -->
    <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
    <!-- DataTables -->
    <link rel="stylesheet" href="lib/AdminLTE/plugins/datatables-bs4/css/dataTables.bootstrap4.css">
-    <!-- Tempusdominus Bbootstrap 4 -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css">
-    <!-- iCheck -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/icheck-bootstrap/icheck-bootstrap.min.css">
-    <!-- JQVMap -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/jqvmap/jqvmap.min.css">
-    <!-- Theme style -->
+
+    <!-- !Theme style -->
    <link rel="stylesheet" href="lib/AdminLTE/dist/css/adminlte.min.css">
-    <!-- overlayScrollbars -->
+    <!-- !overlayScrollbars -->
    <link rel="stylesheet" href="lib/AdminLTE/plugins/overlayScrollbars/css/OverlayScrollbars.min.css">
-    <!-- Daterange picker -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/daterangepicker/daterangepicker.css">
-    <!-- summernote -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/summernote/summernote-bs4.css">
    <!-- Google Font: Source Sans Pro -->
    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">

-    <!-- Bootstrap Date-Picker Plugin -->
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/css/bootstrap-datepicker3.css"/>

-    <link rel="stylesheet"
-          href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/css/bootstrap-datepicker3.css"/>
-
-    <!--    <link rel="stylesheet" type="text/css" href="css/user.css">-->
+    <!-- custom stylesheets -->
    <link rel="stylesheet" type="text/css" href="css/general.css">
-
-
 </head>
 <body class="hold-transition sidebar-mini layout-fixed">
 <div class="wrapper">
@ -45,7 +34,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>
@ -71,14 +60,36 @@
                    data-accordion="false">

                    <li class="nav-item">
-                        <a href="#todo" class="nav-link">
-                            <i class="nav-icon fas fa-cog"></i>
+                        <a href="dashboard.html" class="nav-link">
+                            <i class="nav-icon fas fa-columns"></i>
                            <p>
-                                Settings
+                                Dashboard
                            </p>
                        </a>
                    </li>

+
+                    <li id="devicepanel" class="nav-item">
+                        <a href="device.html" class="nav-link">
+                            <i class="nav-icon fas fa-desktop"></i>
+                            <p>
+                                Devices
+                            </p>
+                        </a>
+                    </li>
+
+
+
+                    <li id="adminpanel" class="nav-item hideit">
+                        <a href="adminpanel.html" class="nav-link">
+                            <i class="nav-icon fas fa-plus-circle"></i>
+                            <p>
+                                Admin panel
+                            </p>
+                        </a>
+                    </li>
+
+
                    <li class="nav-item">
                        <a href="index.html" class="nav-link" id="logoutbtn">
                            <i class="nav-icon fas fa-sign-out-alt"></i>
@ -88,23 +99,7 @@
                        </a>
                    </li>

-                    <li class="nav-item">
-                        <a href="#todo" class="nav-link">
-                            <i class="nav-icon fas fa-plus-circle"></i>
-                            <p>
-                                New Entry
-                            </p>
-                        </a>
-                    </li>

-                    <li id="adminpanel" class="nav-item hideit">
-                        <a href="adminpanel.html" class="nav-link">
-                            <i class="nav-icon fas fa-plus-circle"></i>
-                            <p>
-                                Admin panel
-                            </p>
-                        </a>
-                    </li>
                </ul>
            </nav>
            <!-- /.sidebar-menu -->
@ -226,6 +221,7 @@
 </div>
 <!-- ./wrapper -->

+<!-- AdminLTE Libs -->
 <!-- jQuery -->
 <script src="lib/AdminLTE/plugins/jquery/jquery.min.js"></script>
 <!-- jQuery UI 1.11.4 -->
@ -236,40 +232,18 @@
 </script>
 <!-- Bootstrap 4 -->
 <script src="lib/AdminLTE/plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
-<!-- ChartJS -->
-<script src="lib/AdminLTE/plugins/chart.js/Chart.min.js"></script>
-<!-- Sparkline -->
-<script src="lib/AdminLTE/plugins/sparklines/sparkline.js"></script>
-<!-- JQVMap -->
-<script src="lib/AdminLTE/plugins/jqvmap/jquery.vmap.min.js"></script>
-<script src="lib/AdminLTE/plugins/jqvmap/maps/jquery.vmap.usa.js"></script>
-<!-- jQuery Knob Chart -->
-<script src="lib/AdminLTE/plugins/jquery-knob/jquery.knob.min.js"></script>
-<!-- daterangepicker -->
-<script src="lib/AdminLTE/plugins/moment/moment.min.js"></script>
-<script src="lib/AdminLTE/plugins/daterangepicker/daterangepicker.js"></script>
-<!-- Tempusdominus Bootstrap 4 -->
-<script src="lib/AdminLTE/plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
-<!-- Summernote -->
-<script src="lib/AdminLTE/plugins/summernote/summernote-bs4.min.js"></script>
-<!-- overlayScrollbars -->
-<script src="lib/AdminLTE/plugins/overlayScrollbars/js/jquery.overlayScrollbars.min.js"></script>
 <!-- AdminLTE App -->
 <script src="lib/AdminLTE/dist/js/adminlte.js"></script>
-<!-- AdminLTE dashboard demo (This is only for demo purposes) -->
-<script src="lib/AdminLTE/dist/js/pages/dashboard.js"></script>
-<!-- AdminLTE for demo purposes -->
-<script src="lib/AdminLTE/dist/js/demo.js"></script>
+<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="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/js/bootstrap-datepicker.min.js"></script>
-
-<script type="text/javascript" src="js/adminpanel.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>

+<!-- custom js -->
+<script src="js/adminpanel.js"></script>
+<script src="js/userManager.js"></script>
+
 </body>
 </html>
--- a/src/resources/wwwroot/css/profile.css
+++ b/src/resources/wwwroot/css/profile.css
@ -1,7 +0,0 @@
-html,body{
-  background-image: url('../rsc/login2.jpg');
-  background-size: cover;
-  background-repeat: no-repeat;
-  height: 100%;
-  font-family: 'Numans', sans-serif;
-}
--- a/src/resources/wwwroot/dashboard.html
+++ b/src/resources/wwwroot/dashboard.html
@ -6,40 +6,29 @@
    <title>WasteInformation Server</title>
    <!-- Tell the browser to be responsive to screen width -->
    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <!-- AdminLTE Libs -->
    <!-- Font Awesome -->
    <link rel="stylesheet" href="lib/AdminLTE/plugins/fontawesome-free/css/all.min.css">
    <!-- Ionicons -->
    <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
    <!-- DataTables -->
    <link rel="stylesheet" href="lib/AdminLTE/plugins/datatables-bs4/css/dataTables.bootstrap4.css">
-    <!-- Tempusdominus Bbootstrap 4 -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css">
-    <!-- iCheck -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/icheck-bootstrap/icheck-bootstrap.min.css">
-    <!-- JQVMap -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/jqvmap/jqvmap.min.css">
-    <!-- Theme style -->
+
+    <!-- !Theme style -->
    <link rel="stylesheet" href="lib/AdminLTE/dist/css/adminlte.min.css">
-    <!-- overlayScrollbars -->
+    <!-- !overlayScrollbars -->
    <link rel="stylesheet" href="lib/AdminLTE/plugins/overlayScrollbars/css/OverlayScrollbars.min.css">
-    <!-- Daterange picker -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/daterangepicker/daterangepicker.css">
-    <!-- summernote -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/summernote/summernote-bs4.css">
    <!-- Google Font: Source Sans Pro -->
    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">

-    <!-- Bootstrap Date-Picker Plugin -->
-
-    <link rel="stylesheet"
-          href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/css/bootstrap-datepicker3.css"/>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/css/bootstrap-datepicker3.css"/>

+    <!-- custom stylesheets -->
    <link rel="stylesheet" type="text/css" href="css/dashboard.css">
    <link rel="stylesheet" type="text/css" href="css/general.css">

    <link rel="icon" type="image/png" href="/favicon.png">
-
-
 </head>
 <body class="hold-transition sidebar-mini layout-fixed">
 <div class="wrapper">
@ -47,7 +36,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>
@ -73,23 +62,25 @@
                    data-accordion="false">

                    <li class="nav-item">
-                        <a href="#todo" class="nav-link">
-                            <i class="nav-icon fas fa-cog"></i>
+                        <a href="dashboard.html" class="nav-link">
+                            <i class="nav-icon fas fa-columns"></i>
                            <p>
-                                Settings
+                                Dashboard
                            </p>
                        </a>
                    </li>

-                    <li class="nav-item">
-                        <a href="index.html" class="nav-link" id="logoutbtn">
-                            <i class="nav-icon fas fa-sign-out-alt"></i>
+
+                    <li id="devicepanel" class="nav-item">
+                        <a href="device.html" class="nav-link">
+                            <i class="nav-icon fas fa-desktop"></i>
                            <p>
-                                Logout
+                                Devices
                            </p>
                        </a>
                    </li>

+
                    <li id="adminpanel" class="nav-item hideit">
                        <a href="adminpanel.html" class="nav-link">
                            <i class="nav-icon fas fa-plus-circle"></i>
@ -99,11 +90,12 @@
                        </a>
                    </li>

-                    <li id="devicepanel" class="nav-item">
-                        <a href="device.html" class="nav-link">
-                            <i class="nav-icon fas fa-plus-circle"></i>
+
+                    <li class="nav-item">
+                        <a href="index.html" class="nav-link" id="logoutbtn">
+                            <i class="nav-icon fas fa-sign-out-alt"></i>
                            <p>
-                                Devices
+                                Logout
                            </p>
                        </a>
                    </li>
@ -210,29 +202,30 @@
                            <div class="card-header">
                                <h3 class="card-title">
                                    <i class="fas fa-chart-pie mr-1"></i>
-                                    Alle abholdaten
+                                    All pickupdats
                                </h3>
                            </div><!-- /.card-header -->
                            <div class="card-body">
                                <table id="table-pickupdates" class="table table-bordered table-hover">
                                    <thead>
                                    <tr>
-                                        <th>City</th>
-                                        <th>Zone</th>
-                                        <th>Waste Type</th>
-                                        <th>Date</th>
-                                        <th>X</th>
+                                        <th><i class="fas fa-city"></i>City</th>
+                                        <th><i class="fas fa-search-location"></i>Zone</th>
+                                        <th><i class="fas fa-recycle"></i>Waste Type</th>
+                                        <th><i class="fas fa-calendar-alt"></i>Date</th>
+                                        <th><i class="fas fa-trash-alt"></i></th>
                                    </tr>
                                    </thead>
                                    <tbody id="picupdates-tablebody">
                                    </tbody>
                                    <tfoot>
                                    <tr>
-                                        <th>City</th>
-                                        <th>Zone</th>
-                                        <th>Waste Type</th>
-                                        <th>Date</th>
-                                        <th>X</th>
+                                        <th><i class="fas fa-city"></i>City</th>
+                                        <th><i class="fas fa-search-location"></i>Zone</th>
+                                        <th><i class="fas fa-recycle"></i>Waste Type</th>
+                                        <th><i class="fas fa-calendar-alt"></i>Date</th>
+                                        <th><i class="fas fa-trash-alt"></i>
+                                        </th>
                                    </tr>
                                    </tfoot>
                                </table>
@ -322,6 +315,7 @@
                                                    data-toggle="dropdown">
                                                Select waste type
                                            </button>
+
                                            <div id="dropdown-type-drops" class="dropdown-menu">
                                            </div>
                                        </div>
@ -353,20 +347,28 @@
                                <table id="example2" class="table table-bordered table-hover">
                                    <thead>
                                    <tr>
-                                        <th>City</th>
-                                        <th>Zone</th>
-                                        <th>Waste Type</th>
-                                        <th>X</th>
+                                        <th>
+                                            <i class="fas fa-city"></i>
+                                            City
+                                        </th>
+                                        <th><i class="fas fa-search-location"></i>
+                                            Zone
+                                        </th>
+                                        <th><i class="fas fa-recycle"></i>
+                                            Waste Type
+                                        </th>
+                                        <th><i class="fas fa-trash-alt"></i>
+                                        </th>
                                    </tr>
                                    </thead>
                                    <tbody id="location-table-data">
                                    </tbody>
                                    <tfoot>
                                    <tr>
-                                        <th>City</th>
-                                        <th>Zone</th>
-                                        <th>Waste Type</th>
-                                        <th>X</th>
+                                        <th><i class="fas fa-city"></i>City</th>
+                                        <th><i class="fas fa-search-location"></i>Zone</th>
+                                        <th><i class="fas fa-recycle"></i>Waste Type</th>
+                                        <th><i class="fas fa-trash-alt"></i></th>
                                    </tr>
                                    </tfoot>
                                </table>
@ -402,6 +404,7 @@
 </div>
 <!-- ./wrapper -->

+<!-- AdminLTE Libs -->
 <!-- jQuery -->
 <script src="lib/AdminLTE/plugins/jquery/jquery.min.js"></script>
 <!-- jQuery UI 1.11.4 -->
@ -412,40 +415,18 @@
 </script>
 <!-- Bootstrap 4 -->
 <script src="lib/AdminLTE/plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
-<!-- ChartJS -->
-<script src="lib/AdminLTE/plugins/chart.js/Chart.min.js"></script>
-<!-- Sparkline -->
-<script src="lib/AdminLTE/plugins/sparklines/sparkline.js"></script>
-<!-- JQVMap -->
-<script src="lib/AdminLTE/plugins/jqvmap/jquery.vmap.min.js"></script>
-<script src="lib/AdminLTE/plugins/jqvmap/maps/jquery.vmap.usa.js"></script>
-<!-- jQuery Knob Chart -->
-<script src="lib/AdminLTE/plugins/jquery-knob/jquery.knob.min.js"></script>
-<!-- daterangepicker -->
-<script src="lib/AdminLTE/plugins/moment/moment.min.js"></script>
-<script src="lib/AdminLTE/plugins/daterangepicker/daterangepicker.js"></script>
-<!-- Tempusdominus Bootstrap 4 -->
-<script src="lib/AdminLTE/plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
-<!-- Summernote -->
-<script src="lib/AdminLTE/plugins/summernote/summernote-bs4.min.js"></script>
-<!-- overlayScrollbars -->
-<script src="lib/AdminLTE/plugins/overlayScrollbars/js/jquery.overlayScrollbars.min.js"></script>
 <!-- AdminLTE App -->
 <script src="lib/AdminLTE/dist/js/adminlte.js"></script>
-<!-- AdminLTE dashboard demo (This is only for demo purposes) -->
-<script src="lib/AdminLTE/dist/js/pages/dashboard.js"></script>
-<!-- AdminLTE for demo purposes -->
-<script src="lib/AdminLTE/dist/js/demo.js"></script>
+<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="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>

+<!-- custom js -->
+<script type="text/javascript" src="js/dashboard.js"></script>
+<script src="js/userManager.js"></script>
+
 </body>
 </html>
--- a/src/resources/wwwroot/device.html
+++ b/src/resources/wwwroot/device.html
@ -6,38 +6,27 @@
    <title>WasteInformation Server</title>
    <!-- Tell the browser to be responsive to screen width -->
    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+
+    <!-- AdminLTE Libs -->
    <!-- Font Awesome -->
    <link rel="stylesheet" href="lib/AdminLTE/plugins/fontawesome-free/css/all.min.css">
    <!-- Ionicons -->
    <link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
    <!-- DataTables -->
    <link rel="stylesheet" href="lib/AdminLTE/plugins/datatables-bs4/css/dataTables.bootstrap4.css">
-    <!-- Tempusdominus Bbootstrap 4 -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css">
-    <!-- iCheck -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/icheck-bootstrap/icheck-bootstrap.min.css">
-    <!-- JQVMap -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/jqvmap/jqvmap.min.css">
-    <!-- Theme style -->
+
+    <!-- !Theme style -->
    <link rel="stylesheet" href="lib/AdminLTE/dist/css/adminlte.min.css">
-    <!-- overlayScrollbars -->
+    <!-- !overlayScrollbars -->
    <link rel="stylesheet" href="lib/AdminLTE/plugins/overlayScrollbars/css/OverlayScrollbars.min.css">
-    <!-- Daterange picker -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/daterangepicker/daterangepicker.css">
-    <!-- summernote -->
-    <link rel="stylesheet" href="lib/AdminLTE/plugins/summernote/summernote-bs4.css">
    <!-- Google Font: Source Sans Pro -->
    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">

-    <!-- Bootstrap Date-Picker Plugin -->
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/css/bootstrap-datepicker3.css"/>

-    <link rel="stylesheet"
-          href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/css/bootstrap-datepicker3.css"/>
-
-    <!--    <link rel="stylesheet" type="text/css" href="css/user.css">-->
+    <!-- custom stylesheets -->
    <link rel="stylesheet" type="text/css" href="css/general.css">
-
-
 </head>
 <body class="hold-transition sidebar-mini layout-fixed">
 <div class="wrapper">
@ -45,12 +34,13 @@
    <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>
        </a>

+
        <!-- Sidebar -->
        <div class="sidebar">
            <!-- Sidebar user panel (optional) -->
@ -65,64 +55,53 @@
                </div>
            </div>

-            <!-- Sidebar -->
-            <div class="sidebar">
-                <!-- Sidebar user panel (optional) -->
-                <div class="user-panel mt-3 pb-3 mb-3 d-flex">
-                    <div class="image">
-                        <!-- <img src="lib/AdminLTE/dist/img/user2-160x160.jpg" class="img-circle elevation-2" alt="User Image"> -->
-                        <i class="nav-icon fas fa-user img-circle elevation-2" style="color:white"></i>
-                    </div>
-                    <!-- <i class="nav-icon fas fa-tachometer-alt"></i> -->
-                    <div class="info">
-                        <a href="user.html" class="d-block" id="userlabel">Username to set!</a>
-                    </div>
-                </div>
+            <!-- Sidebar Menu -->
+            <nav class="mt-2">
+                <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu"
+                    data-accordion="false">

-                <!-- Sidebar Menu -->
-                <nav class="mt-2">
-                    <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu"
-                        data-accordion="false">
+                    <li class="nav-item">
+                        <a href="dashboard.html" class="nav-link">
+                            <i class="nav-icon fas fa-columns"></i>
+                            <p>
+                                Dashboard
+                            </p>
+                        </a>
+                    </li>

-                        <li class="nav-item">
-                            <a href="#todo" class="nav-link">
-                                <i class="nav-icon fas fa-cog"></i>
-                                <p>
-                                    Settings
-                                </p>
-                            </a>
-                        </li>

-                        <li class="nav-item">
-                            <a href="index.html" class="nav-link" id="logoutbtn">
-                                <i class="nav-icon fas fa-sign-out-alt"></i>
-                                <p>
-                                    Logout
-                                </p>
-                            </a>
-                        </li>
+                    <li id="devicepanel" class="nav-item">
+                        <a href="device.html" class="nav-link">
+                            <i class="nav-icon fas fa-desktop"></i>
+                            <p>
+                                Devices
+                            </p>
+                        </a>
+                    </li>

-                        <li id="adminpanel" class="nav-item hideit">
-                            <a href="adminpanel.html" class="nav-link">
-                                <i class="nav-icon fas fa-plus-circle"></i>
-                                <p>
-                                    Admin panel
-                                </p>
-                            </a>
-                        </li>
+                    <li id="adminpanel" class="nav-item hideit">
+                        <a href="adminpanel.html" class="nav-link">
+                            <i class="nav-icon fas fa-plus-circle"></i>
+                            <p>
+                                Admin panel
+                            </p>
+                        </a>
+                    </li>

-                        <li id="devicepanel" class="nav-item">
-                            <a href="device.html" class="nav-link">
-                                <i class="nav-icon fas fa-plus-circle"></i>
-                                <p>
-                                    Devices
-                                </p>
-                            </a>
-                        </li>
-                    </ul>
-                </nav>
-                <!-- /.sidebar-menu -->
-            </div>
+
+                    <li class="nav-item">
+                        <a href="index.html" class="nav-link" id="logoutbtn">
+                            <i class="nav-icon fas fa-sign-out-alt"></i>
+                            <p>
+                                Logout
+                            </p>
+                        </a>
+                    </li>
+
+                </ul>
+            </nav>
+            <!-- /.sidebar-menu -->
+        </div>
        <!-- /.sidebar -->
    </aside>

@ -155,9 +134,9 @@
                        <!-- small box -->
                        <div class="small-box bg-info">
                            <div class="inner">
-                                <h3>150</h3>
+                                <h3 id="devicenr-label">-1</h3>

-                                <p>Todo</p>
+                                <p>Devices</p>
                            </div>
                            <div class="icon">
                                <i class="ion ion-bag"></i>
@ -170,9 +149,9 @@
                        <!-- small box -->
                        <div class="small-box bg-success">
                            <div class="inner">
-                                <h3>42</h3>
+                                <h3 id="unconfigured-devices-label">-1</h3>

-                                <p>Devices</p>
+                                <p>Not Configured Devices</p>
                            </div>
                            <div class="icon">
                                <i class="ion ion-stats-bars"></i>
@ -193,42 +172,32 @@
                            <div class="card-header">
                                <h3 class="card-title">
                                    <i class="fas fa-chart-pie mr-1"></i>
-                                    User Data
+                                    All Devices
                                </h3>
-                                <button id="btn-newdevice" type="button" class="btn btn-success"
-                                        style="float:right;">Save
-                                </button>
                            </div><!-- /.card-header -->
                            <div class="card-body">
-                                <div class="form-group" style="margin-top: 15px; width: 10cm;">
-                                    <!-- todo todo -->
-                                    <label for="new_city_cityname">City/Village name</label>
-                                    <input type="email" class="form-control" id="new_city_cityname"
-                                           aria-describedby="emailHelp" placeholder="Enter city name here">
-                                    <small class="form-text text-muted">Please try to use no special
-                                        characters</small>
-                                </div>
-                                <div class="form-group" style="width: 10cm;">
-                                    <label for="new_city_zonename">Zone Name</label>
-                                    <input type="email" class="form-control" id="new_city_zonename"
-                                           aria-describedby="emailHelp" placeholder="Enter Zone name here">
-                                    <small class="form-text text-muted">Please try to use no special
-                                        characters</small>
-                                </div>
-
-                                <div class="input-group-prepend">
-                                    <button id="dropdown-wastetype" type="button"
-                                            class="btn btn-outline-dark dropdown-toggle"
-                                            data-toggle="dropdown">
-                                        Select waste type
-                                    </button>
-                                    <div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#">Plastic</a>
-                                        <a class="dropdown-item" href="#">Metal</a>
-                                        <a class="dropdown-item" href="#">Residual waste</a>
-                                        <a class="dropdown-item" href="#">Biowaste</a>
-                                    </div>
-                                </div>
+                                <table id="table-devices" class="table table-bordered table-hover">
+                                    <thead>
+                                    <tr>
+                                        <th><i class="fas fa-id-card"></i> Device ID</th>
+                                        <th><i class="fas fa-signature"></i> Devicename</th>
+                                        <th><i class="fas fa-search-location"></i> Devicelocation</th>
+                                        <th><i class="fas fa-recycle"></i> WasteType</th>
+                                        <th><i class="fas fa-edit"></i> Action</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody id="devices-tablebody">
+                                    </tbody>
+                                    <tfoot>
+                                    <tr>
+                                        <th><i class="fas fa-id-card"></i> Device ID</th>
+                                        <th><i class="fas fa-signature"></i> Devicename</th>
+                                        <th><i class="fas fa-search-location"></i> Devicelocation</th>
+                                        <th><i class="fas fa-recycle"></i> WasteType</th>
+                                        <th><i class="fas fa-edit"></i> Action</th>
+                                    </tr>
+                                    </tfoot>
+                                </table>
                            </div><!-- /.card-body -->
                        </div>

@ -267,6 +236,7 @@
 </div>
 <!-- ./wrapper -->

+<!-- AdminLTE Libs -->
 <!-- jQuery -->
 <script src="lib/AdminLTE/plugins/jquery/jquery.min.js"></script>
 <!-- jQuery UI 1.11.4 -->
@ -277,41 +247,17 @@
 </script>
 <!-- Bootstrap 4 -->
 <script src="lib/AdminLTE/plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
-<!-- ChartJS -->
-<script src="lib/AdminLTE/plugins/chart.js/Chart.min.js"></script>
-<!-- Sparkline -->
-<script src="lib/AdminLTE/plugins/sparklines/sparkline.js"></script>
-<!-- JQVMap -->
-<script src="lib/AdminLTE/plugins/jqvmap/jquery.vmap.min.js"></script>
-<script src="lib/AdminLTE/plugins/jqvmap/maps/jquery.vmap.usa.js"></script>
-<!-- jQuery Knob Chart -->
-<script src="lib/AdminLTE/plugins/jquery-knob/jquery.knob.min.js"></script>
-<!-- daterangepicker -->
-<script src="lib/AdminLTE/plugins/moment/moment.min.js"></script>
-<script src="lib/AdminLTE/plugins/daterangepicker/daterangepicker.js"></script>
-<!-- Tempusdominus Bootstrap 4 -->
-<script src="lib/AdminLTE/plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
-<!-- Summernote -->
-<script src="lib/AdminLTE/plugins/summernote/summernote-bs4.min.js"></script>
-<!-- overlayScrollbars -->
-<script src="lib/AdminLTE/plugins/overlayScrollbars/js/jquery.overlayScrollbars.min.js"></script>
 <!-- AdminLTE App -->
 <script src="lib/AdminLTE/dist/js/adminlte.js"></script>
-<!-- AdminLTE dashboard demo (This is only for demo purposes) -->
-<script src="lib/AdminLTE/dist/js/pages/dashboard.js"></script>
-<!-- AdminLTE for demo purposes -->
-<script src="lib/AdminLTE/dist/js/demo.js"></script>
+<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="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/js/bootstrap-datepicker.min.js"></script>
-
-<!--<script type="text/javascript" src="js/user.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>

+<!-- custom js -->
+<script src="js/userManager.js"></script>
 <script src="js/device.js"></script>
 </body>
 </html>
--- 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>
--- a/src/resources/wwwroot/js/adminpanel.js
+++ b/src/resources/wwwroot/js/adminpanel.js
@ -1,34 +1,45 @@
 $(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();
+    new AdminPanel();
+});
+
+class AdminPanel {
+    constructor() {
+        this.checkLoginState();
+        this.addClickListeners();
+    }
+
+    checkLoginState(){
+        $.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!!");
            }
-        } else {
-            $("#userlabel").html(" not logged in!!");
-        }
-    }, 'json');
-
-
-    $("#btn-shutdown").click(function (event) {
-        console.log("shutting down server");
-
-        $.post('/senddata/admindata', 'action=shutdownserver', function (data) {
-            console.log(data);
-
        }, 'json');
+    }

-    });
+    addClickListeners(){
+        $("#btn-shutdown").click(function (event) {
+            console.log("shutting down server");

-    $("#btn-restart").click(function (event) {
-        console.log("restarting server");
+            $.post('/senddata/admindata', 'action=shutdownserver', function (data) {
+                console.log(data);

-        $.post('/senddata/admindata', 'action=restartserver', function (data) {
-            console.log(data);
+            }, 'json');

-        }, 'json');
-    });
-});
+        });
+
+        $("#btn-restart").click(function (event) {
+            console.log("restarting server");
+
+            $.post('/senddata/admindata', 'action=restartserver', function (data) {
+                console.log(data);
+
+            }, 'json');
+        });
+    }
+}
--- a/src/resources/wwwroot/js/dashboard.js
+++ b/src/resources/wwwroot/js/dashboard.js
@ -1,52 +1,256 @@
 $(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');
+    new Dashboard();
+});

-    //load total collections
-    $.post('/senddata/wastedata', 'action=getStartHeaderData', function (data) {
-        console.log(data);
-        $("#total-connection-labels").html(data.collectionnumber);
+class Dashboard {
+    constructor() {
+        //load header data
+        this.loadHeaderData();

-        $("#planed-collection-label").html(data.futurecollections);
+        //load footer
+        this.loadVersionFooter();

-        $("#finished-collection-label").html(data.finshedcollections);
+        //reload city table
+        this.reloadtable();

-        $("#total-city-number-label").html(data.citynumber);
-    }, 'json');
+        //reload Date table
+        this.reloadDateTable();

-    //load version footer
-    //
-    $.post('/senddata/wastedata', 'action=getversionandbuildtime', function (data) {
-        $("#version-footer-label").html("<b>Version</b> "+data.version+" <b>Build</b> "+data.buildtime);
-    }, 'json');
+        //init time picker
+        this.initDatePicker();
+
+        //add click listeners to all buttons
+        this.addClickListeners();
+    }
+
+    /* Constants */
+    citytable;
+    datetable;
+
+    /* Btn Action Listeners */
+
+    addClickListeners() {
+        const _this = this;
+        //btn listeners
+        $('#logoutbtn').click(function () {
+            $.post('/senddata/checkloginstate', 'action=logout', function (data) {
+                console.log(data);
+            }, 'json');
+        });
+
+        $('.wastetype-citynew-item').click(function (event) {
+            event.preventDefault();
+            $('#dropdown-wastetype').html($(this).html());
+        });
+
+        $('#btn-savecity').click(function () {
+            var cityname = $("#new_city_cityname").val();
+            var zonename = $("#new_city_zonename").val();
+            var wastetype = $("#dropdown-wastetype").html();
+            console.log("storing: " + cityname + "--" + wastetype + "in db");
+
+            $.post('/senddata/wastedata', 'action=newCity&wastetype=' + wastetype + "&cityname=" + cityname + "&wastezone=" + zonename, function (data) {
+                console.log(data);
+                if (data.status == "inserted") {
+                    Swal.fire({
+                        type: "success",
+                        title: 'Successfully created city!',
+                        html: 'This alert closes automatically.',
+                        timer: 1000,
+                    }).then((result) => {
+                        console.log('Popup closed. ')
+
+                    });
+                    _this.reloadtable();
+                } else if (data.status == "exists") {
+                    Swal.fire({
+                        type: "warning",
+                        title: 'Name already exists in db',
+                        html: 'Close popup.',
+                    }).then((result) => {
+                        console.log('Popup closed. ')
+
+                    });
+                }
+            }, 'json');
+
+            //clear form data
+            $("#new_city_cityname").val("");
+            $("#new_city_zonename").val("");
+            $("#dropdown-wastetype").html("select waste type");
+        });


-    var citytable;
-    var datetable;
+        /* new Date create:  */
+        $("#dropdown-city").click(function (event) {
+            event.preventDefault();
+            var dropdata = $("#dropdown-city-data");
+            dropdata.html("");
+            console.log("loading city names")

-    function reloadtable() {
+            $.post('/senddata/newdate', 'action=getCitynames', function (data) {
+                console.log(data);
+                if (data.query == "ok") {
+                    var prev = "";
+                    for (var i = 0; i < data.data.length; i++) {
+                        var name = data.data[i].cityname;
+                        dropdata.append("<a class=\"dropdown-data-cityname dropdown-item\" href=\"#\">" + name + "</a>");
+                    }
+
+                    $(".dropdown-data-cityname").off();
+                    $(".dropdown-data-cityname").click(function (evnt) {
+                        evnt.preventDefault();
+                        console.log($(this).html());
+                        $("#dropdown-city").html($(this).html());
+                    });
+                }
+            }, "json");
+        });
+
+        $("#dropdown-zone").click(function (event) {
+            event.preventDefault();
+            var dropdata = $("#dropdown-zone-data");
+            dropdata.html("");
+
+            $.post('/senddata/newdate', 'action=getzones&cityname=' + $("#dropdown-city").html(), function (data) {
+                console.log(data);
+                if (data.query == "ok") {
+                    var prev = "";
+                    for (var i = 0; i < data.data.length; i++) {
+                        var zone = data.data[i].zone;
+                        dropdata.append("<a class=\"dropdown-data-zonename dropdown-item\" href=\"#\">" + zone + "</a>");
+                    }
+
+                    $(".dropdown-data-zonename").off();
+                    $(".dropdown-data-zonename").click(function (evnt) {
+                        evnt.preventDefault();
+                        console.log($(this).html());
+                        $("#dropdown-zone").html($(this).html());
+                    });
+                }
+            });
+        });
+
+        $("#dropdown-type-data").click(function (event) {
+            event.preventDefault();
+
+            var dropdata = $("#dropdown-type-drops");
+            dropdata.html("");
+            console.log("clickeeeed");
+
+            $.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++) {
+                        var type = data.data[i].wastetype;
+                        dropdata.append("<a class=\"dropdown-data-typename dropdown-item\" href=\"#\">" + type + "</a>");
+                    }
+
+                    $(".dropdown-data-typename").off();
+                    $(".dropdown-data-typename").click(function (evnt) {
+                        evnt.preventDefault();
+                        $("#dropdown-type-data").html($(this).html());
+                    });
+                }
+            });
+
+
+        });
+
+
+        $('.btn-savelist').click(function () {
+            console.log("saving date");
+
+            var cityname = $("#dropdown-city");
+            var zone = $("#dropdown-zone");
+            var wastetype = $("#dropdown-type-data");
+            var date = $("#input-wastetime");
+
+            $.post('/senddata/newdate', 'action=newdate&cityname=' + cityname.html() + "&zone=" + zone.html() + "&wastetype=" + wastetype.html() + "&date=" + date.val(), function (data) {
+                if (data.status == "success") {
+                    Swal.fire({
+                        type: "success",
+                        title: 'Successfully created Date!',
+                        html: 'This alert closes automatically.',
+                        timer: 1000,
+                    }).then((result) => {
+                        console.log('Popup closed. ')
+
+                    });
+
+                    cityname.html("Select City");
+                    zone.html("Select Zone");
+                    wastetype.html("Select waste type");
+                    date.val("");
+                    _this.reloadDateTable();
+                } else if (data.status == "citydoesntexist") {
+                    Swal.fire({
+                        type: "warning",
+                        title: 'city name doesnt exist',
+                        html: 'Close popup.',
+                    }).then((result) => {
+                        console.log('Popup closed. ')
+
+                    });
+                }
+
+                console.log(data)
+            }, "json");
+        });
+    }
+
+
+    /* Functions */
+    initDatePicker() {
+        //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 = {
+            format: 'yyyy-mm-dd',
+            container: container,
+            todayHighlight: true,
+            autoclose: true,
+        };
+        date_input.datepicker(options);
+    }
+
+    loadHeaderData() {
+        $.post('/senddata/wastedata', 'action=getStartHeaderData', function (data) {
+            console.log(data);
+            $("#total-connection-labels").html(data.collectionnumber);
+
+            $("#planed-collection-label").html(data.futurecollections);
+
+            $("#finished-collection-label").html(data.finshedcollections);
+
+            $("#total-city-number-label").html(data.citynumber);
+        }, 'json');
+    }
+
+    loadVersionFooter() {
+        $.post('/senddata/wastedata', 'action=getversionandbuildtime', function (data) {
+            $("#version-footer-label").html("<b>Version</b> " + data.version + " <b>Build</b> " + data.buildtime);
+        }, 'json');
+    }
+
+    reloadtable() {
+        const _this = this;
        $.post('/senddata/wastedata', 'action=getAllCities', function (data) {
-            if (citytable != null) {
-                citytable.destroy(); //delete table if already created
+            if (_this.citytable != null) {
+                _this.citytable.destroy(); //delete table if already created
            }

            console.log(data);
            if (data.query == "ok") {
-                $('#location-table-data').html("");
+                var tabledata = $('#location-table-data');
+
+
+                tabledata.html("");
+                //todo in variable
                $(".delbtn").off();

                for (var i = 0; i < data.data.length; i++) {
-                    $('#location-table-data').append("<tr>" +
+                    tabledata.append("<tr>" +
                        "<td>" + data.data[i].cityname + "</td>" +
                        "<td>" + data.data[i].zone + "</td>" +
                        "<td>" + data.data[i].wastetype + "</td>" +
@ -59,7 +263,7 @@ $(document).ready(function () {
                    console.log("clicked btn data " + id);
                    $.post('/senddata/wastedata', 'action=deletecity&id=' + id, function (data) {
                        console.log(data);
-                        if (data.status == "success") {
+                        if (data.status === "success") {
                            Swal.fire({
                                type: "success",
                                title: 'Successfully deleted city!',
@ -70,7 +274,7 @@ $(document).ready(function () {

                            });
                            reloadtable();
-                        } else if (data.status == "dependenciesnotdeleted") {
+                        } else if (data.status === "dependenciesnotdeleted") {
                            Swal.fire({
                                type: "warning",
                                title: 'This city is a dependency of a date',
@ -85,7 +289,7 @@ $(document).ready(function () {
                    }, "json");
                });

-                citytable = $("#example2").DataTable();
+                _this.citytable = $("#example2").DataTable();
            } else if (data.query == "nodbconn") {
                Swal.fire({
                    type: "error",
@ -102,17 +306,17 @@ $(document).ready(function () {
        }, 'json');
    }

-
-    function reloadDateTable() {
+    reloadDateTable() {
+        const _this = this;
        $.post('/senddata/wastedata', 'action=getAllDates', function (data) {
-            if (datetable != null) {
-                datetable.destroy(); //delete table if already created
+            if (_this.datetable != null) {
+                _this.datetable.destroy(); //delete table if already created
            }
            console.log(data);

            if (data.query == "ok") {
                $('#picupdates-tablebody').html("");
-                 $(".delbtndate").off();
+                $(".delbtndate").off();

                for (var i = 0; i < data.data.length; i++) {
                    $('#picupdates-tablebody').append("<tr>" +
@ -155,195 +359,11 @@ $(document).ready(function () {
                    }, "json");
                });
            }
-            datetable = $("#table-pickupdates").DataTable({
-                "order": [[ 3, "asc" ]]
-            } );
-
-            //todo picupdates-tablebody
-        },"json");
+            _this.datetable = $("#table-pickupdates").DataTable({
+                "order": [[3, "asc"]]
+            });
+        }, "json");
    }
-
-    reloadtable();
-    reloadDateTable();
+}


-    //btn listeners
-    $('#logoutbtn').click(function () {
-        $.post('/senddata/checkloginstate', 'action=logout', function (data) {
-            console.log(data);
-        }, 'json');
-    });
-
-    $('.wastetype-citynew-item').click(function (event) {
-        event.preventDefault();
-        $('#dropdown-wastetype').html($(this).html());
-    });
-
-    $('#btn-savecity').click(function () {
-        var cityname = $("#new_city_cityname").val();
-        var zonename = $("#new_city_zonename").val();
-        var wastetype = $("#dropdown-wastetype").html();
-        console.log("storing: " + cityname + "--" + wastetype + "in db");
-
-        $.post('/senddata/wastedata', 'action=newCity&wastetype=' + wastetype + "&cityname=" + cityname + "&wastezone=" + zonename, function (data) {
-            console.log(data);
-            if (data.status == "inserted") {
-                Swal.fire({
-                    type: "success",
-                    title: 'Successfully created city!',
-                    html: 'This alert closes automatically.',
-                    timer: 1000,
-                }).then((result) => {
-                    console.log('Popup closed. ')
-
-                });
-                reloadtable();
-            } else if (data.status == "exists") {
-                Swal.fire({
-                    type: "warning",
-                    title: 'Name already exists in db',
-                    html: 'Close popup.',
-                }).then((result) => {
-                    console.log('Popup closed. ')
-
-                });
-            }
-        }, 'json');
-
-        //clear form data
-        $("#new_city_cityname").val("");
-        $("#new_city_zonename").val("");
-        $("#dropdown-wastetype").html("select waste type");
-    });
-
-
-    /* new Date create:  */
-    $("#dropdown-city").click(function (event) {
-        event.preventDefault();
-        var dropdata = $("#dropdown-city-data");
-        dropdata.html("");
-        console.log("loading city names")
-
-        $.post('/senddata/newdate', 'action=getCitynames', function (data) {
-            console.log(data);
-            if (data.query == "ok") {
-                var prev = "";
-                for (var i = 0; i < data.data.length; i++) {
-                    var name = data.data[i].cityname;
-                    dropdata.append("<a class=\"dropdown-data-cityname dropdown-item\" href=\"#\">" + name + "</a>");
-                }
-
-                $(".dropdown-data-cityname").off();
-                $(".dropdown-data-cityname").click(function (evnt) {
-                    evnt.preventDefault();
-                    console.log($(this).html());
-                    $("#dropdown-city").html($(this).html());
-                });
-            }
-        }, "json");
-    });
-
-    $("#dropdown-zone").click(function (event) {
-        event.preventDefault();
-        var dropdata = $("#dropdown-zone-data");
-        dropdata.html("");
-
-        $.post('/senddata/newdate', 'action=getzones&cityname=' + $("#dropdown-city").html(), function (data) {
-            console.log(data);
-            if (data.query == "ok") {
-                var prev = "";
-                for (var i = 0; i < data.data.length; i++) {
-                    var zone = data.data[i].zone;
-                    dropdata.append("<a class=\"dropdown-data-zonename dropdown-item\" href=\"#\">" + zone + "</a>");
-                }
-
-                $(".dropdown-data-zonename").off();
-                $(".dropdown-data-zonename").click(function (evnt) {
-                    evnt.preventDefault();
-                    console.log($(this).html());
-                    $("#dropdown-zone").html($(this).html());
-                });
-            }
-        });
-    });
-
-    $("#dropdown-type-data").click(function (event) {
-        event.preventDefault();
-
-        var dropdata = $("#dropdown-type-drops");
-        dropdata.html("");
-        console.log("clickeeeed");
-
-        $.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++) {
-                    var type = data.data[i].wastetype;
-                    dropdata.append("<a class=\"dropdown-data-typename dropdown-item\" href=\"#\">" + type + "</a>");
-                }
-
-                $(".dropdown-data-typename").off();
-                $(".dropdown-data-typename").click(function (evnt) {
-                    evnt.preventDefault();
-                    $("#dropdown-type-data").html($(this).html());
-                });
-            }
-        });
-
-
-
-    });
-
-
-    $('.btn-savelist').click(function () {
-        console.log("saving date");
-
-        var cityname = $("#dropdown-city");
-        var zone = $("#dropdown-zone");
-        var wastetype = $("#dropdown-type-data");
-        var date = $("#input-wastetime");
-
-        $.post('/senddata/newdate', 'action=newdate&cityname=' + cityname.html() + "&zone=" + zone.html() + "&wastetype=" + wastetype.html() + "&date=" + date.val(), function (data) {
-            if (data.status == "success") {
-                Swal.fire({
-                    type: "success",
-                    title: 'Successfully created Date!',
-                    html: 'This alert closes automatically.',
-                    timer: 1000,
-                }).then((result) => {
-                    console.log('Popup closed. ')
-
-                });
-
-                cityname.html("Select City");
-                zone.html("Select Zone");
-                wastetype.html("Select waste type");
-                date.val("");
-                reloadDateTable();
-            } else if (data.status == "citydoesntexist") {
-                Swal.fire({
-                    type: "warning",
-                    title: 'city name doesnt exist',
-                    html: 'Close popup.',
-                }).then((result) => {
-                    console.log('Popup closed. ')
-
-                });
-            }
-
-            console.log(data)
-        }, "json");
-    });
-
-
-    //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 = {
-        format: 'yyyy-mm-dd',
-        container: container,
-        todayHighlight: true,
-        autoclose: true,
-    };
-    date_input.datepicker(options);
-});
--- a/src/resources/wwwroot/js/device.js
+++ b/src/resources/wwwroot/js/device.js
@ -1,37 +1,297 @@
-$(document).ready(function () {
-    $('#btn-newdevice').click(function (e) {
-        e.preventDefault();
-
-        Swal.showLoading({
-                title: 'No connection to Database',
-                html: 'Setup DB here --> <a href="index.html">click<a/>.',
-            });
-
-        // Swal.fire({
-        //     type: "error",
-        //     title: 'No connection to Database',
-        //     html: 'Setup DB here --> <a href="index.html">click<a/>.',
-        //     onBeforeOpen: () => {
-        //         Swal.showLoading()
-        //     },
-        // }).then((result) => {
-        //     console.log('Popup closed. ')
-        //
-        // });
-
-
-        // $.post('/senddata/loginget', 'username=' + username + '&password=' + password, function (data) {
-        //
-        //     console.log(data);
-        //     if (data.status == "nodbconn"){
-        //
-        //     }
-        //     if (data.accept == true) {
-        //         console.log("successfully logged in!");
-        //         document.cookie = "username=" + username;
-        //         window.location = 'dashboard.html';
-        //     }
-        // }, 'json');
-    });
+$(function () {
+    new Device();
 });

+
+class Device {
+    constructor() {
+        this.reloadDevices();
+        this.loadHeader();
+    }
+
+    devicetable = null;
+
+    /**
+     * reload devices list on page
+     */
+    reloadDevices() {
+        var _this = this;
+        $.post('/senddata/Devicedata', 'action=getdevices', function (data) {
+            if (_this.devicetable != null) {
+                _this.devicetable.destroy();
+            }
+            console.log(data);
+
+            $('#devices-tablebody').html("");
+            $(".delbtn").off();
+
+            for (var i = 0; i < data.data.length; i++) {
+                var id = data.data[i].deviceid;
+                var cityid = data.data[i].cityid;
+
+
+                if (cityid === -1) {
+                    $("#devices-tablebody").append("<tr><td>" + id + "</td><td>new Device</td><td><button deviceid=\"" + id + "\"type=\"button\" class=\"btn btn-primary configuredevicebutton\">Configure</button></td><td></td><td><button dataid='" + id + "' type='button' class='delbtn btn btn-danger'>X</button></td></tr>");
+                } else {
+                    var devicename = data.data[i].devicename;
+                    var devicelocation = data.data[i].devicelocation;
+
+                    var row = "<tr><td>" + id + "</td><td>" + devicename + "</td><td>" + devicelocation + "</td><td>";
+                    for (var n = 0; n < data.data[i].devices.length; n++) {
+                        var cityname = data.data[i].devices[n].cityname;
+                        var cityzone = data.data[i].devices[n].zone;
+                        var wastetype = data.data[i].devices[n].wastetype;
+                        row += cityname + "/" + wastetype + "/" + cityzone + " </br>";
+                    }
+
+                    row += "</td><td><button dataid='" + id + "' type='button' class='delbtn btn btn-danger'>X</button><button dataid='" + id + "' type='button' class='addbtn btn btn-success'>ADD</button></td></tr>";
+
+                    $("#devices-tablebody").append(row);
+
+                }
+            }
+
+            _this._addDeleteButton();
+            _this._addAddButton();
+            _this._addConfigDialog();
+            _this.devicetable = $('#table-devices').DataTable();
+        }, 'json');
+    }
+
+    /**
+     * add click listener to add button to add new city entries to current device
+     */
+    _addAddButton() {
+        var _this = this;
+        $('.addbtn').click(function (event) {
+            var id = event.target.getAttribute("dataid");
+            var cityname;
+            var zone;
+            var wastetype;
+            var devicename;
+            var devicelocation;
+
+            $.post('/senddata/Devicedata', 'action=getCitynames', function (data) {
+                Swal.mixin({
+                    input: 'text',
+                    confirmButtonText: 'Next &rarr;',
+                    showCancelButton: true,
+                    progressSteps: ['1']
+                }).queue([{
+                    title: 'City',
+                    text: 'Select your City',
+                    input: 'select',
+                    inputOptions: data
+                }
+                ]).then((result) => {
+                    if (result.value) {
+                        cityname = result.value[0];
+
+                        console.log("cityname=" + cityname);
+                        $.post('/senddata/Devicedata', 'action=getzones&cityname=' + cityname, function (data) {
+                            Swal.mixin({
+                                input: 'text',
+                                confirmButtonText: 'Next &rarr;',
+                                showCancelButton: true,
+                                progressSteps: ['1']
+                            }).queue([
+                                {
+                                    title: 'City',
+                                    text: 'Select your City',
+                                    input: 'select',
+                                    inputOptions: data
+                                }
+                            ]).then((result) => {
+                                if (result.value) {
+                                    zone = result.value[0];
+                                    $.post('/senddata/Devicedata', 'action=gettypes&cityname=' + cityname + '&zonename=' + zone, function (data) {
+                                        Swal.mixin({
+                                            input: 'text',
+                                            confirmButtonText: 'Next &rarr;',
+                                            showCancelButton: true,
+                                            progressSteps: ['1']
+                                        }).queue([
+                                            {
+                                                title: 'City',
+                                                text: 'Select your City',
+                                                input: 'select',
+                                                inputOptions: data
+                                            }
+                                        ]).then((result) => {
+                                            if (result.value) {
+                                                wastetype = result.value[0];
+
+                                                $.post('/senddata/Devicedata', 'action=addtodb&deviceid=' + id + '&cityname=' + cityname + '&zonename=' + zone + '&wastetype=' + wastetype, function (data) {
+                                                    if (data.success) {
+                                                        Swal.fire({
+                                                            type: "success",
+                                                            title: 'Successfully configured!',
+                                                            html: 'This alert closes added.',
+                                                            timer: 1000,
+                                                        }).then((result) => {
+                                                            _this.reloadDevices();
+                                                        });
+                                                    }
+                                                });
+                                            }
+                                        });
+                                    });
+                                }
+                            });
+                        });
+                    }
+                });
+            });
+        });
+    }
+
+    /**
+     * add click listener to delete button to delete this device entry
+     */
+    _addDeleteButton() {
+        var _this = this;
+        $(".delbtn").click(function (event) {
+            var id = event.target.getAttribute("dataid");
+            console.log("clicked btn data " + id);
+            $.post('/senddata/Devicedata', 'action=deleteDevice&id=' + id, function (data) {
+                console.log(data);
+                if (data.status === "success") {
+                    Swal.fire({
+                        type: "success",
+                        title: 'Successfully deleted city!',
+                        html: 'This alert closes automatically.',
+                        timer: 1000,
+                    }).then((result) => {
+                        console.log('Popup closed. ')
+
+                    });
+                    _this.reloadDevices();
+                } else if (data.status === "dependenciesnotdeleted") {
+                    Swal.fire({
+                        type: "warning",
+                        title: 'This city is a dependency of a date',
+                        html: 'Do you want do delete it anyway with all dependencies?',
+                    }).then((result) => {
+                        console.log('Popup closed. ')
+
+                    });
+                    //todo set yes no button here
+                }
+
+            }, "json");
+        });
+    }
+
+    /**
+     * add click listener to unconfigured device to show configure dialog
+     */
+    _addConfigDialog() {
+        var _this = this;
+        $(".configuredevicebutton").click(function (event) {
+            var id = event.target.getAttribute("deviceid");
+            var cityname;
+            var zone;
+            var wastetype;
+            var devicename;
+            var devicelocation;
+
+            $.post('/senddata/Devicedata', 'action=getCitynames', function (data) {
+                Swal.mixin({
+                    input: 'text',
+                    confirmButtonText: 'Next &rarr;',
+                    showCancelButton: true,
+                    progressSteps: ['1', '2', '3']
+                }).queue([
+                    {
+                        title: 'Name of device',
+                        text: 'Please define a device name'
+                    }, {
+                        title: 'Location of device',
+                        text: 'Please define a device location'
+                    }, {
+                        title: 'City',
+                        text: 'Select your City',
+                        input: 'select',
+                        inputOptions: data
+                    }
+                ]).then((result) => {
+                    if (result.value) {
+                        console.log(result.value);
+                        const answers = JSON.stringify(result.value);
+                        cityname = result.value[2];
+                        devicename = result.value[0];
+                        devicelocation = result.value[1];
+
+                        console.log("cityname=" + cityname);
+                        $.post('/senddata/Devicedata', 'action=getzones&cityname=' + cityname, function (data) {
+                            Swal.mixin({
+                                input: 'text',
+                                confirmButtonText: 'Next &rarr;',
+                                showCancelButton: true,
+                                progressSteps: ['1']
+                            }).queue([
+                                {
+                                    title: 'City',
+                                    text: 'Select your City',
+                                    input: 'select',
+                                    inputOptions: data
+                                }
+                            ]).then((result) => {
+                                if (result.value) {
+                                    console.log(result.value);
+                                    zone = result.value[0];
+                                    $.post('/senddata/Devicedata', 'action=gettypes&cityname=' + cityname + '&zonename=' + zone, function (data) {
+                                        Swal.mixin({
+                                            input: 'text',
+                                            confirmButtonText: 'Next &rarr;',
+                                            showCancelButton: true,
+                                            progressSteps: ['1']
+                                        }).queue([
+                                            {
+                                                title: 'City',
+                                                text: 'Select your City',
+                                                input: 'select',
+                                                inputOptions: data
+                                            }
+                                        ]).then((result) => {
+                                            if (result.value) {
+                                                console.log(result.value);
+                                                wastetype = result.value[0];
+
+                                                $.post('/senddata/Devicedata', 'action=savetodb&deviceid=' + id + '&cityname=' + cityname + '&zonename=' + zone + '&wastetype=' + wastetype + '&devicename=' + devicename + '&devicelocation=' + devicelocation, function (data) {
+                                                    if (data.success) {
+                                                        Swal.fire({
+                                                            type: "success",
+                                                            title: 'Successfully configured!',
+                                                            html: 'This alert closes automatically.',
+                                                            timer: 1000,
+                                                        }).then((result) => {
+                                                            console.log('Popup closed. ');
+                                                            _this.reloadDevices();
+                                                        });
+                                                    }
+                                                });
+                                            }
+                                        });
+                                    });
+                                }
+                            });
+                        });
+                    }
+                });
+            });
+        });
+    }
+
+    /**
+     * Load header tiles
+     */
+    loadHeader(){
+        $.post('/senddata/Devicedata', 'action=getheader', function (data) {
+            if (data.success) {
+                $("#devicenr-label").html(data.devicenumber);
+                $("#unconfigured-devices-label").html(data.unconfigureddevices);
+            }
+        });
+    }
+}
--- a/src/resources/wwwroot/js/profile.js
+++ b/src/resources/wwwroot/js/profile.js
@ -1,7 +0,0 @@
-$(document).ready(function() {
-    $("#firstname").value("hhh");
-
-    $.post('/senddata/checkloginstate', 'action=getfirstname', function (data) {
-        console.log(data);
-    }, 'json');
-});
--- a/src/resources/wwwroot/js/userManager.js
+++ 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');
+});
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.components.css
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.components.css
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.components.css.map
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.components.css.map
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.components.min.css
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.components.min.css
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.components.min.css.map
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.components.min.css.map
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.core.css
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.core.css
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.core.css.map
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.core.css.map
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.core.min.css
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.core.min.css
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.core.min.css.map
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.core.min.css.map
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.extra-components.css
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.extra-components.css
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.extra-components.css.map
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.extra-components.css.map
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.extra-components.min.css
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.extra-components.min.css
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.extra-components.min.css.map
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.extra-components.min.css.map
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.pages.css
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.pages.css
@ -1,444 +0,0 @@
-/*!
- *   AdminLTE v3.0.0
- *     Only Pages
- *   Author: Colorlib
- *	 Website: AdminLTE.io <http://adminlte.io>
- *   License: Open source - MIT <http://opensource.org/licenses/MIT>
- */
-.close, .mailbox-attachment-close {
-  float: right;
-  font-size: 1.5rem;
-  font-weight: 700;
-  line-height: 1;
-  color: #000;
-  text-shadow: 0 1px 0 #ffffff;
-  opacity: .5;
-}
-
-.close:hover, .mailbox-attachment-close:hover {
-  color: #000;
-  text-decoration: none;
-}
-
-.close:not(:disabled):not(.disabled):hover, .mailbox-attachment-close:not(:disabled):not(.disabled):hover, .close:not(:disabled):not(.disabled):focus, .mailbox-attachment-close:not(:disabled):not(.disabled):focus {
-  opacity: .75;
-}
-
-button.close, button.mailbox-attachment-close {
-  padding: 0;
-  background-color: transparent;
-  border: 0;
-  appearance: none;
-}
-
-a.close.disabled, a.disabled.mailbox-attachment-close {
-  pointer-events: none;
-}
-
-.mailbox-messages > .table {
-  margin: 0;
-}
-
-.mailbox-controls {
-  padding: 5px;
-}
-
-.mailbox-controls.with-border {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
-}
-
-.mailbox-read-info {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
-  padding: 10px;
-}
-
-.mailbox-read-info h3 {
-  font-size: 20px;
-  margin: 0;
-}
-
-.mailbox-read-info h5 {
-  margin: 0;
-  padding: 5px 0 0;
-}
-
-.mailbox-read-time {
-  color: #999;
-  font-size: 13px;
-}
-
-.mailbox-read-message {
-  padding: 10px;
-}
-
-.mailbox-attachments {
-  padding-left: 0;
-  list-style: none;
-}
-
-.mailbox-attachments li {
-  border: 1px solid #eee;
-  float: left;
-  margin-bottom: 10px;
-  margin-right: 10px;
-  width: 200px;
-}
-
-.mailbox-attachment-name {
-  color: #666;
-  font-weight: bold;
-}
-
-.mailbox-attachment-icon,
-.mailbox-attachment-info,
-.mailbox-attachment-size {
-  display: block;
-}
-
-.mailbox-attachment-info {
-  background: #f8f9fa;
-  padding: 10px;
-}
-
-.mailbox-attachment-size {
-  color: #999;
-  font-size: 12px;
-}
-
-.mailbox-attachment-size > span {
-  display: inline-block;
-  padding-top: 0.75rem;
-}
-
-.mailbox-attachment-icon {
-  color: #666;
-  font-size: 65px;
-  max-height: 132.5px;
-  padding: 20px 10px;
-  text-align: center;
-}
-
-.mailbox-attachment-icon.has-img {
-  padding: 0;
-}
-
-.mailbox-attachment-icon.has-img > img {
-  height: auto;
-  max-width: 100%;
-}
-
-.lockscreen {
-  background: #e9ecef;
-}
-
-.lockscreen .lockscreen-name {
-  font-weight: 600;
-  text-align: center;
-}
-
-.lockscreen-logo {
-  font-size: 35px;
-  font-weight: 300;
-  margin-bottom: 25px;
-  text-align: center;
-}
-
-.lockscreen-logo a {
-  color: #495057;
-}
-
-.lockscreen-wrapper {
-  margin: 0 auto;
-  margin-top: 10%;
-  max-width: 400px;
-}
-
-.lockscreen-item {
-  border-radius: 4px;
-  background: #ffffff;
-  margin: 10px auto 30px;
-  padding: 0;
-  position: relative;
-  width: 290px;
-}
-
-.lockscreen-image {
-  border-radius: 50%;
-  background: #ffffff;
-  left: -10px;
-  padding: 5px;
-  position: absolute;
-  top: -25px;
-  z-index: 10;
-}
-
-.lockscreen-image > img {
-  border-radius: 50%;
-  height: 70px;
-  width: 70px;
-}
-
-.lockscreen-credentials {
-  margin-left: 70px;
-}
-
-.lockscreen-credentials .form-control {
-  border: 0;
-}
-
-.lockscreen-credentials .btn {
-  background-color: #ffffff;
-  border: 0;
-  padding: 0 10px;
-}
-
-.lockscreen-footer {
-  margin-top: 10px;
-}
-
-.login-logo,
-.register-logo {
-  font-size: 2.1rem;
-  font-weight: 300;
-  margin-bottom: .9rem;
-  text-align: center;
-}
-
-.login-logo a,
-.register-logo a {
-  color: #495057;
-}
-
-.login-page,
-.register-page {
-  align-items: center;
-  background: #e9ecef;
-  display: flex;
-  height: 100vh;
-  justify-content: center;
-}
-
-.login-box,
-.register-box {
-  width: 360px;
-}
-
-@media (max-width: 576px) {
-  .login-box,
-  .register-box {
-    margin-top: 20px;
-    width: 90%;
-  }
-}
-
-.login-card-body,
-.register-card-body {
-  background: #ffffff;
-  border-top: 0;
-  color: #666;
-  padding: 20px;
-}
-
-.login-card-body .input-group .form-control,
-.register-card-body .input-group .form-control {
-  border-right: 0;
-}
-
-.login-card-body .input-group .form-control:focus,
-.register-card-body .input-group .form-control:focus {
-  box-shadow: none;
-}
-
-.login-card-body .input-group .form-control:focus ~ .input-group-append .input-group-text,
-.register-card-body .input-group .form-control:focus ~ .input-group-append .input-group-text {
-  border-color: #80bdff;
-}
-
-.login-card-body .input-group .form-control.is-valid:focus,
-.register-card-body .input-group .form-control.is-valid:focus {
-  box-shadow: none;
-}
-
-.login-card-body .input-group .form-control.is-valid ~ .input-group-append .input-group-text,
-.register-card-body .input-group .form-control.is-valid ~ .input-group-append .input-group-text {
-  border-color: #28a745;
-}
-
-.login-card-body .input-group .form-control.is-invalid:focus,
-.register-card-body .input-group .form-control.is-invalid:focus {
-  box-shadow: none;
-}
-
-.login-card-body .input-group .form-control.is-invalid ~ .input-group-append .input-group-text,
-.register-card-body .input-group .form-control.is-invalid ~ .input-group-append .input-group-text {
-  border-color: #dc3545;
-}
-
-.login-card-body .input-group .input-group-text,
-.register-card-body .input-group .input-group-text {
-  background-color: transparent;
-  border-bottom-right-radius: 0.25rem;
-  border-left: 0;
-  border-top-right-radius: 0.25rem;
-  color: #777;
-  transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-}
-
-.login-box-msg,
-.register-box-msg {
-  margin: 0;
-  padding: 0 20px 20px;
-  text-align: center;
-}
-
-.social-auth-links {
-  margin: 10px 0;
-}
-
-.error-page {
-  margin: 20px auto 0;
-  width: 600px;
-}
-
-@media (max-width: 767.98px) {
-  .error-page {
-    width: 100%;
-  }
-}
-
-.error-page > .headline {
-  float: left;
-  font-size: 100px;
-  font-weight: 300;
-}
-
-@media (max-width: 767.98px) {
-  .error-page > .headline {
-    float: none;
-    text-align: center;
-  }
-}
-
-.error-page > .error-content {
-  display: block;
-  margin-left: 190px;
-}
-
-@media (max-width: 767.98px) {
-  .error-page > .error-content {
-    margin-left: 0;
-  }
-}
-
-.error-page > .error-content > h3 {
-  font-size: 25px;
-  font-weight: 300;
-}
-
-@media (max-width: 767.98px) {
-  .error-page > .error-content > h3 {
-    text-align: center;
-  }
-}
-
-.invoice {
-  background: #ffffff;
-  border: 1px solid rgba(0, 0, 0, 0.125);
-  position: relative;
-}
-
-.invoice-title {
-  margin-top: 0;
-}
-
-.profile-user-img {
-  border: 3px solid #adb5bd;
-  margin: 0 auto;
-  padding: 3px;
-  width: 100px;
-}
-
-.profile-username {
-  font-size: 21px;
-  margin-top: 5px;
-}
-
-.post {
-  border-bottom: 1px solid #adb5bd;
-  color: #666;
-  margin-bottom: 15px;
-  padding-bottom: 15px;
-}
-
-.post:last-of-type {
-  border-bottom: 0;
-  margin-bottom: 0;
-  padding-bottom: 0;
-}
-
-.post .user-block {
-  margin-bottom: 15px;
-  width: 100%;
-}
-
-.post .row {
-  width: 100%;
-}
-
-.product-image {
-  max-width: 100%;
-  height: auto;
-  width: 100%;
-}
-
-.product-image-thumbs {
-  align-items: stretch;
-  display: flex;
-  margin-top: 2rem;
-}
-
-.product-image-thumb {
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
-  border-radius: 0.25rem;
-  background-color: #ffffff;
-  border: 1px solid #dee2e6;
-  display: flex;
-  margin-right: 1rem;
-  max-width: 7rem;
-  padding: 0.5rem;
-}
-
-.product-image-thumb img {
-  max-width: 100%;
-  height: auto;
-  align-self: center;
-}
-
-.product-image-thumb:hover {
-  opacity: 0.5;
-}
-
-.product-share a {
-  margin-right: .5rem;
-}
-
-.projects td {
-  vertical-align: middle;
-}
-
-.projects .list-inline {
-  margin-bottom: 0;
-}
-
-.projects img.table-avatar,
-.projects .table-avatar img {
-  border-radius: 50%;
-  display: inline;
-  width: 2.5rem;
-}
-
-.projects .project-state {
-  text-align: center;
-}
-
-/*# sourceMappingURL=adminlte.pages.css.map */
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.pages.css.map
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.pages.css.map
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.pages.min.css
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.pages.min.css
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.pages.min.css.map
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.pages.min.css.map
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.plugins.css
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.plugins.css
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.plugins.css.map
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.plugins.css.map
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.plugins.min.css
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.plugins.min.css
--- a/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.plugins.min.css.map
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/css/alt/adminlte.plugins.min.css.map
--- a/src/resources/wwwroot/lib/AdminLTE/dist/img/AdminLTELogo.png
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/img/AdminLTELogo.png
--- a/src/resources/wwwroot/lib/AdminLTE/dist/js/demo.js
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/js/demo.js
@ -1,413 +0,0 @@
-/**
- * AdminLTE Demo Menu
- * ------------------
- * You should not use this file in production.
- * This file is for demo purposes only.
- */
-(function ($) {
-  'use strict'
-
-  var $sidebar   = $('.control-sidebar')
-  var $container = $('<div />', {
-    class: 'p-3 control-sidebar-content'
-  })
-
-  $sidebar.append($container)
-
-  var navbar_dark_skins = [
-    'navbar-primary',
-    'navbar-secondary',
-    'navbar-info',
-    'navbar-success',
-    'navbar-danger',
-    'navbar-indigo',
-    'navbar-purple',
-    'navbar-pink',
-    'navbar-teal',
-    'navbar-cyan',
-    'navbar-dark',
-    'navbar-gray-dark',
-    'navbar-gray',
-  ]
-
-  var navbar_light_skins = [
-    'navbar-light',
-    'navbar-warning',
-    'navbar-white',
-    'navbar-orange',
-  ]
-
-  $container.append(
-    '<h5>Customize AdminLTE</h5><hr class="mb-2"/>'
-  )
-
-  var $no_border_checkbox = $('<input />', {
-    type   : 'checkbox',
-    value  : 1,
-    checked: $('.main-header').hasClass('border-bottom-0'),
-    'class': 'mr-1'
-  }).on('click', function () {
-    if ($(this).is(':checked')) {
-      $('.main-header').addClass('border-bottom-0')
-    } else {
-      $('.main-header').removeClass('border-bottom-0')
-    }
-  })
-  var $no_border_container = $('<div />', {'class': 'mb-1'}).append($no_border_checkbox).append('<span>No Navbar border</span>')
-  $container.append($no_border_container)
-
-  var $text_sm_body_checkbox = $('<input />', {
-    type   : 'checkbox',
-    value  : 1,
-    checked: $('body').hasClass('text-sm'),
-    'class': 'mr-1'
-  }).on('click', function () {
-    if ($(this).is(':checked')) {
-      $('body').addClass('text-sm')
-    } else {
-      $('body').removeClass('text-sm')
-    }
-  })
-  var $text_sm_body_container = $('<div />', {'class': 'mb-1'}).append($text_sm_body_checkbox).append('<span>Body small text</span>')
-  $container.append($text_sm_body_container)
-
-  var $text_sm_header_checkbox = $('<input />', {
-    type   : 'checkbox',
-    value  : 1,
-    checked: $('.main-header').hasClass('text-sm'),
-    'class': 'mr-1'
-  }).on('click', function () {
-    if ($(this).is(':checked')) {
-      $('.main-header').addClass('text-sm')
-    } else {
-      $('.main-header').removeClass('text-sm')
-    }
-  })
-  var $text_sm_header_container = $('<div />', {'class': 'mb-1'}).append($text_sm_header_checkbox).append('<span>Navbar small text</span>')
-  $container.append($text_sm_header_container)
-
-  var $text_sm_sidebar_checkbox = $('<input />', {
-    type   : 'checkbox',
-    value  : 1,
-    checked: $('.nav-sidebar').hasClass('text-sm'),
-    'class': 'mr-1'
-  }).on('click', function () {
-    if ($(this).is(':checked')) {
-      $('.nav-sidebar').addClass('text-sm')
-    } else {
-      $('.nav-sidebar').removeClass('text-sm')
-    }
-  })
-  var $text_sm_sidebar_container = $('<div />', {'class': 'mb-1'}).append($text_sm_sidebar_checkbox).append('<span>Sidebar nav small text</span>')
-  $container.append($text_sm_sidebar_container)
-
-  var $text_sm_footer_checkbox = $('<input />', {
-    type   : 'checkbox',
-    value  : 1,
-    checked: $('.main-footer').hasClass('text-sm'),
-    'class': 'mr-1'
-  }).on('click', function () {
-    if ($(this).is(':checked')) {
-      $('.main-footer').addClass('text-sm')
-    } else {
-      $('.main-footer').removeClass('text-sm')
-    }
-  })
-  var $text_sm_footer_container = $('<div />', {'class': 'mb-1'}).append($text_sm_footer_checkbox).append('<span>Footer small text</span>')
-  $container.append($text_sm_footer_container)
-
-  var $flat_sidebar_checkbox = $('<input />', {
-    type   : 'checkbox',
-    value  : 1,
-    checked: $('.nav-sidebar').hasClass('nav-flat'),
-    'class': 'mr-1'
-  }).on('click', function () {
-    if ($(this).is(':checked')) {
-      $('.nav-sidebar').addClass('nav-flat')
-    } else {
-      $('.nav-sidebar').removeClass('nav-flat')
-    }
-  })
-  var $flat_sidebar_container = $('<div />', {'class': 'mb-1'}).append($flat_sidebar_checkbox).append('<span>Sidebar nav flat style</span>')
-  $container.append($flat_sidebar_container)
-
-  var $legacy_sidebar_checkbox = $('<input />', {
-    type   : 'checkbox',
-    value  : 1,
-    checked: $('.nav-sidebar').hasClass('nav-legacy'),
-    'class': 'mr-1'
-  }).on('click', function () {
-    if ($(this).is(':checked')) {
-      $('.nav-sidebar').addClass('nav-legacy')
-    } else {
-      $('.nav-sidebar').removeClass('nav-legacy')
-    }
-  })
-  var $legacy_sidebar_container = $('<div />', {'class': 'mb-1'}).append($legacy_sidebar_checkbox).append('<span>Sidebar nav legacy style</span>')
-  $container.append($legacy_sidebar_container)
-
-  var $compact_sidebar_checkbox = $('<input />', {
-    type   : 'checkbox',
-    value  : 1,
-    checked: $('.nav-sidebar').hasClass('nav-compact'),
-    'class': 'mr-1'
-  }).on('click', function () {
-    if ($(this).is(':checked')) {
-      $('.nav-sidebar').addClass('nav-compact')
-    } else {
-      $('.nav-sidebar').removeClass('nav-compact')
-    }
-  })
-  var $compact_sidebar_container = $('<div />', {'class': 'mb-1'}).append($compact_sidebar_checkbox).append('<span>Sidebar nav compact</span>')
-  $container.append($compact_sidebar_container)
-
-  var $child_indent_sidebar_checkbox = $('<input />', {
-    type   : 'checkbox',
-    value  : 1,
-    checked: $('.nav-sidebar').hasClass('nav-child-indent'),
-    'class': 'mr-1'
-  }).on('click', function () {
-    if ($(this).is(':checked')) {
-      $('.nav-sidebar').addClass('nav-child-indent')
-    } else {
-      $('.nav-sidebar').removeClass('nav-child-indent')
-    }
-  })
-  var $child_indent_sidebar_container = $('<div />', {'class': 'mb-1'}).append($child_indent_sidebar_checkbox).append('<span>Sidebar nav child indent</span>')
-  $container.append($child_indent_sidebar_container)
-
-  var $no_expand_sidebar_checkbox = $('<input />', {
-    type   : 'checkbox',
-    value  : 1,
-    checked: $('.main-sidebar').hasClass('sidebar-no-expand'),
-    'class': 'mr-1'
-  }).on('click', function () {
-    if ($(this).is(':checked')) {
-      $('.main-sidebar').addClass('sidebar-no-expand')
-    } else {
-      $('.main-sidebar').removeClass('sidebar-no-expand')
-    }
-  })
-  var $no_expand_sidebar_container = $('<div />', {'class': 'mb-1'}).append($no_expand_sidebar_checkbox).append('<span>Main Sidebar disable hover/focus auto expand</span>')
-  $container.append($no_expand_sidebar_container)
-
-  var $text_sm_brand_checkbox = $('<input />', {
-    type   : 'checkbox',
-    value  : 1,
-    checked: $('.brand-link').hasClass('text-sm'),
-    'class': 'mr-1'
-  }).on('click', function () {
-    if ($(this).is(':checked')) {
-      $('.brand-link').addClass('text-sm')
-    } else {
-      $('.brand-link').removeClass('text-sm')
-    }
-  })
-  var $text_sm_brand_container = $('<div />', {'class': 'mb-4'}).append($text_sm_brand_checkbox).append('<span>Brand small text</span>')
-  $container.append($text_sm_brand_container)
-
-  $container.append('<h6>Navbar Variants</h6>')
-
-  var $navbar_variants        = $('<div />', {
-    'class': 'd-flex'
-  })
-  var navbar_all_colors       = navbar_dark_skins.concat(navbar_light_skins)
-  var $navbar_variants_colors = createSkinBlock(navbar_all_colors, function (e) {
-    var color = $(this).data('color')
-    var $main_header = $('.main-header')
-    $main_header.removeClass('navbar-dark').removeClass('navbar-light')
-    navbar_all_colors.map(function (color) {
-      $main_header.removeClass(color)
-    })
-
-    if (navbar_dark_skins.indexOf(color) > -1) {
-      $main_header.addClass('navbar-dark')
-    } else {
-      $main_header.addClass('navbar-light')
-    }
-
-    $main_header.addClass(color)
-  })
-
-  $navbar_variants.append($navbar_variants_colors)
-
-  $container.append($navbar_variants)
-
-  var sidebar_colors = [
-    'bg-primary',
-    'bg-warning',
-    'bg-info',
-    'bg-danger',
-    'bg-success',
-    'bg-indigo',
-    'bg-navy',
-    'bg-purple',
-    'bg-fuchsia',
-    'bg-pink',
-    'bg-maroon',
-    'bg-orange',
-    'bg-lime',
-    'bg-teal',
-    'bg-olive'
-  ]
-
-  var accent_colors = [
-    'accent-primary',
-    'accent-warning',
-    'accent-info',
-    'accent-danger',
-    'accent-success',
-    'accent-indigo',
-    'accent-navy',
-    'accent-purple',
-    'accent-fuchsia',
-    'accent-pink',
-    'accent-maroon',
-    'accent-orange',
-    'accent-lime',
-    'accent-teal',
-    'accent-olive'
-  ]
-
-  var sidebar_skins = [
-    'sidebar-dark-primary',
-    'sidebar-dark-warning',
-    'sidebar-dark-info',
-    'sidebar-dark-danger',
-    'sidebar-dark-success',
-    'sidebar-dark-indigo',
-    'sidebar-dark-navy',
-    'sidebar-dark-purple',
-    'sidebar-dark-fuchsia',
-    'sidebar-dark-pink',
-    'sidebar-dark-maroon',
-    'sidebar-dark-orange',
-    'sidebar-dark-lime',
-    'sidebar-dark-teal',
-    'sidebar-dark-olive',
-    'sidebar-light-primary',
-    'sidebar-light-warning',
-    'sidebar-light-info',
-    'sidebar-light-danger',
-    'sidebar-light-success',
-    'sidebar-light-indigo',
-    'sidebar-light-navy',
-    'sidebar-light-purple',
-    'sidebar-light-fuchsia',
-    'sidebar-light-pink',
-    'sidebar-light-maroon',
-    'sidebar-light-orange',
-    'sidebar-light-lime',
-    'sidebar-light-teal',
-    'sidebar-light-olive'
-  ]
-
-  $container.append('<h6>Accent Color Variants</h6>')
-  var $accent_variants = $('<div />', {
-    'class': 'd-flex'
-  })
-  $container.append($accent_variants)
-  $container.append(createSkinBlock(accent_colors, function () {
-    var color         = $(this).data('color')
-    var accent_class = color
-    var $body      = $('body')
-    accent_colors.map(function (skin) {
-      $body.removeClass(skin)
-    })
-
-    $body.addClass(accent_class)
-  }))
-
-  $container.append('<h6>Dark Sidebar Variants</h6>')
-  var $sidebar_variants = $('<div />', {
-    'class': 'd-flex'
-  })
-  $container.append($sidebar_variants)
-  $container.append(createSkinBlock(sidebar_colors, function () {
-    var color         = $(this).data('color')
-    var sidebar_class = 'sidebar-dark-' + color.replace('bg-', '')
-    var $sidebar      = $('.main-sidebar')
-    sidebar_skins.map(function (skin) {
-      $sidebar.removeClass(skin)
-    })
-
-    $sidebar.addClass(sidebar_class)
-  }))
-
-  $container.append('<h6>Light Sidebar Variants</h6>')
-  var $sidebar_variants = $('<div />', {
-    'class': 'd-flex'
-  })
-  $container.append($sidebar_variants)
-  $container.append(createSkinBlock(sidebar_colors, function () {
-    var color         = $(this).data('color')
-    var sidebar_class = 'sidebar-light-' + color.replace('bg-', '')
-    var $sidebar      = $('.main-sidebar')
-    sidebar_skins.map(function (skin) {
-      $sidebar.removeClass(skin)
-    })
-
-    $sidebar.addClass(sidebar_class)
-  }))
-
-  var logo_skins = navbar_all_colors
-  $container.append('<h6>Brand Logo Variants</h6>')
-  var $logo_variants = $('<div />', {
-    'class': 'd-flex'
-  })
-  $container.append($logo_variants)
-  var $clear_btn = $('<a />', {
-    href: 'javascript:void(0)'
-  }).text('clear').on('click', function () {
-    var $logo = $('.brand-link')
-    logo_skins.map(function (skin) {
-      $logo.removeClass(skin)
-    })
-  })
-  $container.append(createSkinBlock(logo_skins, function () {
-    var color = $(this).data('color')
-    var $logo = $('.brand-link')
-    logo_skins.map(function (skin) {
-      $logo.removeClass(skin)
-    })
-    $logo.addClass(color)
-  }).append($clear_btn))
-
-  function createSkinBlock(colors, callback) {
-    var $block = $('<div />', {
-      'class': 'd-flex flex-wrap mb-3'
-    })
-
-    colors.map(function (color) {
-      var $color = $('<div />', {
-        'class': (typeof color === 'object' ? color.join(' ') : color).replace('navbar-', 'bg-').replace('accent-', 'bg-') + ' elevation-2'
-      })
-
-      $block.append($color)
-
-      $color.data('color', color)
-
-      $color.css({
-        width       : '40px',
-        height      : '20px',
-        borderRadius: '25px',
-        marginRight : 10,
-        marginBottom: 10,
-        opacity     : 0.8,
-        cursor      : 'pointer'
-      })
-
-      $color.hover(function () {
-        $(this).css({ opacity: 1 }).removeClass('elevation-2').addClass('elevation-4')
-      }, function () {
-        $(this).css({ opacity: 0.8 }).removeClass('elevation-4').addClass('elevation-2')
-      })
-
-      if (callback) {
-        $color.on('click', callback)
-      }
-    })
-
-    return $block
-  }
-})(jQuery)
--- a/src/resources/wwwroot/lib/AdminLTE/dist/js/pages/dashboard.js
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/js/pages/dashboard.js
@ -1,264 +0,0 @@
-/*
- * Author: Abdullah A Almsaeed
- * Date: 4 Jan 2014
- * Description:
- *      This is a demo file used only for the main dashboard (index.html)
- **/
-
-$(function () {
-
-  'use strict'
-
-  // Make the dashboard widgets sortable Using jquery UI
-  $('.connectedSortable').sortable({
-    placeholder         : 'sort-highlight',
-    connectWith         : '.connectedSortable',
-    handle              : '.card-header, .nav-tabs',
-    forcePlaceholderSize: true,
-    zIndex              : 999999
-  })
-  $('.connectedSortable .card-header, .connectedSortable .nav-tabs-custom').css('cursor', 'move')
-
-  // jQuery UI sortable for the todo list
-  $('.todo-list').sortable({
-    placeholder         : 'sort-highlight',
-    handle              : '.handle',
-    forcePlaceholderSize: true,
-    zIndex              : 999999
-  })
-
-  // bootstrap WYSIHTML5 - text editor
-  $('.textarea').summernote()
-
-  $('.daterange').daterangepicker({
-    ranges   : {
-      'Today'       : [moment(), moment()],
-      'Yesterday'   : [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
-      'Last 7 Days' : [moment().subtract(6, 'days'), moment()],
-      'Last 30 Days': [moment().subtract(29, 'days'), moment()],
-      'This Month'  : [moment().startOf('month'), moment().endOf('month')],
-      'Last Month'  : [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
-    },
-    startDate: moment().subtract(29, 'days'),
-    endDate  : moment()
-  }, function (start, end) {
-    window.alert('You chose: ' + start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'))
-  })
-
-  /* jQueryKnob */
-  $('.knob').knob()
-
-  // jvectormap data
-  var visitorsData = {
-    'US': 398, //USA
-    'SA': 400, //Saudi Arabia
-    'CA': 1000, //Canada
-    'DE': 500, //Germany
-    'FR': 760, //France
-    'CN': 300, //China
-    'AU': 700, //Australia
-    'BR': 600, //Brazil
-    'IN': 800, //India
-    'GB': 320, //Great Britain
-    'RU': 3000 //Russia
-  }
-  // World map by jvectormap
-  $('#world-map').vectorMap({
-    map              : 'usa_en',
-    backgroundColor  : 'transparent',
-    regionStyle      : {
-      initial: {
-        fill            : 'rgba(255, 255, 255, 0.7)',
-        'fill-opacity'  : 1,
-        stroke          : 'rgba(0,0,0,.2)',
-        'stroke-width'  : 1,
-        'stroke-opacity': 1
-      }
-    },
-    series           : {
-      regions: [{
-        values           : visitorsData,
-        scale            : ['#ffffff', '#0154ad'],
-        normalizeFunction: 'polynomial'
-      }]
-    },
-    onRegionLabelShow: function (e, el, code) {
-      if (typeof visitorsData[code] != 'undefined')
-        el.html(el.html() + ': ' + visitorsData[code] + ' new visitors')
-    }
-  })
-
-  // Sparkline charts
-  var sparkline1 = new Sparkline($("#sparkline-1")[0], {width: 80, height: 50, lineColor: '#92c1dc', endColor: '#ebf4f9'});
-  var sparkline2 = new Sparkline($("#sparkline-2")[0], {width: 80, height: 50, lineColor: '#92c1dc', endColor: '#ebf4f9'});
-  var sparkline3 = new Sparkline($("#sparkline-3")[0], {width: 80, height: 50, lineColor: '#92c1dc', endColor: '#ebf4f9'});
-
-  sparkline1.draw([1000, 1200, 920, 927, 931, 1027, 819, 930, 1021]);
-  sparkline2.draw([515, 519, 520, 522, 652, 810, 370, 627, 319, 630, 921]);
-  sparkline3.draw([15, 19, 20, 22, 33, 27, 31, 27, 19, 30, 21]);
-
-  // The Calender
-  $('#calendar').datetimepicker({
-    format: 'L',
-    inline: true
-  })
-
-  // SLIMSCROLL FOR CHAT WIDGET
-  $('#chat-box').overlayScrollbars({
-    height: '250px'
-  })
-
-  /* Chart.js Charts */
-  // Sales chart
-  var salesChartCanvas = document.getElementById('revenue-chart-canvas').getContext('2d');
-  //$('#revenue-chart').get(0).getContext('2d');
-
-  var salesChartData = {
-    labels  : ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
-    datasets: [
-      {
-        label               : 'Digital Goods',
-        backgroundColor     : 'rgba(60,141,188,0.9)',
-        borderColor         : 'rgba(60,141,188,0.8)',
-        pointRadius          : false,
-        pointColor          : '#3b8bba',
-        pointStrokeColor    : 'rgba(60,141,188,1)',
-        pointHighlightFill  : '#fff',
-        pointHighlightStroke: 'rgba(60,141,188,1)',
-        data                : [28, 48, 40, 19, 86, 27, 90]
-      },
-      {
-        label               : 'Electronics',
-        backgroundColor     : 'rgba(210, 214, 222, 1)',
-        borderColor         : 'rgba(210, 214, 222, 1)',
-        pointRadius         : false,
-        pointColor          : 'rgba(210, 214, 222, 1)',
-        pointStrokeColor    : '#c1c7d1',
-        pointHighlightFill  : '#fff',
-        pointHighlightStroke: 'rgba(220,220,220,1)',
-        data                : [65, 59, 80, 81, 56, 55, 40]
-      },
-    ]
-  }
-
-  var salesChartOptions = {
-    maintainAspectRatio : false,
-    responsive : true,
-    legend: {
-      display: false
-    },
-    scales: {
-      xAxes: [{
-        gridLines : {
-          display : false,
-        }
-      }],
-      yAxes: [{
-        gridLines : {
-          display : false,
-        }
-      }]
-    }
-  }
-
-  // This will get the first returned node in the jQuery collection.
-  var salesChart = new Chart(salesChartCanvas, { 
-      type: 'line', 
-      data: salesChartData, 
-      options: salesChartOptions
-    }
-  )
-
-  // Donut Chart
-  var pieChartCanvas = $('#sales-chart-canvas').get(0).getContext('2d')
-  var pieData        = {
-    labels: [
-        'Instore Sales', 
-        'Download Sales',
-        'Mail-Order Sales', 
-    ],
-    datasets: [
-      {
-        data: [30,12,20],
-        backgroundColor : ['#f56954', '#00a65a', '#f39c12'],
-      }
-    ]
-  }
-  var pieOptions = {
-    legend: {
-      display: false
-    },
-    maintainAspectRatio : false,
-    responsive : true,
-  }
-  //Create pie or douhnut chart
-  // You can switch between pie and douhnut using the method below.
-  var pieChart = new Chart(pieChartCanvas, {
-    type: 'doughnut',
-    data: pieData,
-    options: pieOptions      
-  });
-
-  // Sales graph chart
-  var salesGraphChartCanvas = $('#line-chart').get(0).getContext('2d');
-  //$('#revenue-chart').get(0).getContext('2d');
-
-  var salesGraphChartData = {
-    labels  : ['2011 Q1', '2011 Q2', '2011 Q3', '2011 Q4', '2012 Q1', '2012 Q2', '2012 Q3', '2012 Q4', '2013 Q1', '2013 Q2'],
-    datasets: [
-      {
-        label               : 'Digital Goods',
-        fill                : false,
-        borderWidth         : 2,
-        lineTension         : 0,
-        spanGaps : true,
-        borderColor         : '#efefef',
-        pointRadius         : 3,
-        pointHoverRadius    : 7,
-        pointColor          : '#efefef',
-        pointBackgroundColor: '#efefef',
-        data                : [2666, 2778, 4912, 3767, 6810, 5670, 4820, 15073, 10687, 8432]
-      }
-    ]
-  }
-
-  var salesGraphChartOptions = {
-    maintainAspectRatio : false,
-    responsive : true,
-    legend: {
-      display: false,
-    },
-    scales: {
-      xAxes: [{
-        ticks : {
-          fontColor: '#efefef',
-        },
-        gridLines : {
-          display : false,
-          color: '#efefef',
-          drawBorder: false,
-        }
-      }],
-      yAxes: [{
-        ticks : {
-          stepSize: 5000,
-          fontColor: '#efefef',
-        },
-        gridLines : {
-          display : true,
-          color: '#efefef',
-          drawBorder: false,
-        }
-      }]
-    }
-  }
-
-  // This will get the first returned node in the jQuery collection.
-  var salesGraphChart = new Chart(salesGraphChartCanvas, { 
-      type: 'line', 
-      data: salesGraphChartData, 
-      options: salesGraphChartOptions
-    }
-  )
-
-})
--- a/src/resources/wwwroot/lib/AdminLTE/dist/js/pages/dashboard2.js
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/js/pages/dashboard2.js
@ -1,267 +0,0 @@
-$(function () {
-
-  'use strict'
-
-  /* ChartJS
-   * -------
-   * Here we will create a few charts using ChartJS
-   */
-
-  //-----------------------
-  //- MONTHLY SALES CHART -
-  //-----------------------
-
-  // Get context with jQuery - using jQuery's .get() method.
-  var salesChartCanvas = $('#salesChart').get(0).getContext('2d')
-
-  var salesChartData = {
-    labels  : ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
-    datasets: [
-      {
-        label               : 'Digital Goods',
-        backgroundColor     : 'rgba(60,141,188,0.9)',
-        borderColor         : 'rgba(60,141,188,0.8)',
-        pointRadius          : false,
-        pointColor          : '#3b8bba',
-        pointStrokeColor    : 'rgba(60,141,188,1)',
-        pointHighlightFill  : '#fff',
-        pointHighlightStroke: 'rgba(60,141,188,1)',
-        data                : [28, 48, 40, 19, 86, 27, 90]
-      },
-      {
-        label               : 'Electronics',
-        backgroundColor     : 'rgba(210, 214, 222, 1)',
-        borderColor         : 'rgba(210, 214, 222, 1)',
-        pointRadius         : false,
-        pointColor          : 'rgba(210, 214, 222, 1)',
-        pointStrokeColor    : '#c1c7d1',
-        pointHighlightFill  : '#fff',
-        pointHighlightStroke: 'rgba(220,220,220,1)',
-        data                : [65, 59, 80, 81, 56, 55, 40]
-      },
-    ]
-  }
-
-  var salesChartOptions = {
-    maintainAspectRatio : false,
-    responsive : true,
-    legend: {
-      display: false
-    },
-    scales: {
-      xAxes: [{
-        gridLines : {
-          display : false,
-        }
-      }],
-      yAxes: [{
-        gridLines : {
-          display : false,
-        }
-      }]
-    }
-  }
-
-  // This will get the first returned node in the jQuery collection.
-  var salesChart = new Chart(salesChartCanvas, { 
-      type: 'line', 
-      data: salesChartData, 
-      options: salesChartOptions
-    }
-  )
-
-  //---------------------------
-  //- END MONTHLY SALES CHART -
-  //---------------------------
-
-  //-------------
-  //- PIE CHART -
-  //-------------
-  // Get context with jQuery - using jQuery's .get() method.
-    var pieChartCanvas = $('#pieChart').get(0).getContext('2d')
-    var pieData        = {
-      labels: [
-          'Chrome', 
-          'IE',
-          'FireFox', 
-          'Safari', 
-          'Opera', 
-          'Navigator', 
-      ],
-      datasets: [
-        {
-          data: [700,500,400,600,300,100],
-          backgroundColor : ['#f56954', '#00a65a', '#f39c12', '#00c0ef', '#3c8dbc', '#d2d6de'],
-        }
-      ]
-    }
-    var pieOptions     = {
-      legend: {
-        display: false
-      }
-    }
-    //Create pie or douhnut chart
-    // You can switch between pie and douhnut using the method below.
-    var pieChart = new Chart(pieChartCanvas, {
-      type: 'doughnut',
-      data: pieData,
-      options: pieOptions      
-    })
-
-  //-----------------
-  //- END PIE CHART -
-  //-----------------
-
-  /* jVector Maps
-   * ------------
-   * Create a world map with markers
-   */
-  $('#world-map-markers').mapael({
-      map: {
-        name : "usa_states",
-        zoom: {
-          enabled: true,
-          maxLevel: 10
-        },
-      },
-    }
-  );
-
-  // $('#world-map-markers').vectorMap({
-  //   map              : 'world_en',
-  //   normalizeFunction: 'polynomial',
-  //   hoverOpacity     : 0.7,
-  //   hoverColor       : false,
-  //   backgroundColor  : 'transparent',
-  //   regionStyle      : {
-  //     initial      : {
-  //       fill            : 'rgba(210, 214, 222, 1)',
-  //       'fill-opacity'  : 1,
-  //       stroke          : 'none',
-  //       'stroke-width'  : 0,
-  //       'stroke-opacity': 1
-  //     },
-  //     hover        : {
-  //       'fill-opacity': 0.7,
-  //       cursor        : 'pointer'
-  //     },
-  //     selected     : {
-  //       fill: 'yellow'
-  //     },
-  //     selectedHover: {}
-  //   },
-  //   markerStyle      : {
-  //     initial: {
-  //       fill  : '#00a65a',
-  //       stroke: '#111'
-  //     }
-  //   },
-  //   markers          : [
-  //     {
-  //       latLng: [41.90, 12.45],
-  //       name  : 'Vatican City'
-  //     },
-  //     {
-  //       latLng: [43.73, 7.41],
-  //       name  : 'Monaco'
-  //     },
-  //     {
-  //       latLng: [-0.52, 166.93],
-  //       name  : 'Nauru'
-  //     },
-  //     {
-  //       latLng: [-8.51, 179.21],
-  //       name  : 'Tuvalu'
-  //     },
-  //     {
-  //       latLng: [43.93, 12.46],
-  //       name  : 'San Marino'
-  //     },
-  //     {
-  //       latLng: [47.14, 9.52],
-  //       name  : 'Liechtenstein'
-  //     },
-  //     {
-  //       latLng: [7.11, 171.06],
-  //       name  : 'Marshall Islands'
-  //     },
-  //     {
-  //       latLng: [17.3, -62.73],
-  //       name  : 'Saint Kitts and Nevis'
-  //     },
-  //     {
-  //       latLng: [3.2, 73.22],
-  //       name  : 'Maldives'
-  //     },
-  //     {
-  //       latLng: [35.88, 14.5],
-  //       name  : 'Malta'
-  //     },
-  //     {
-  //       latLng: [12.05, -61.75],
-  //       name  : 'Grenada'
-  //     },
-  //     {
-  //       latLng: [13.16, -61.23],
-  //       name  : 'Saint Vincent and the Grenadines'
-  //     },
-  //     {
-  //       latLng: [13.16, -59.55],
-  //       name  : 'Barbados'
-  //     },
-  //     {
-  //       latLng: [17.11, -61.85],
-  //       name  : 'Antigua and Barbuda'
-  //     },
-  //     {
-  //       latLng: [-4.61, 55.45],
-  //       name  : 'Seychelles'
-  //     },
-  //     {
-  //       latLng: [7.35, 134.46],
-  //       name  : 'Palau'
-  //     },
-  //     {
-  //       latLng: [42.5, 1.51],
-  //       name  : 'Andorra'
-  //     },
-  //     {
-  //       latLng: [14.01, -60.98],
-  //       name  : 'Saint Lucia'
-  //     },
-  //     {
-  //       latLng: [6.91, 158.18],
-  //       name  : 'Federated States of Micronesia'
-  //     },
-  //     {
-  //       latLng: [1.3, 103.8],
-  //       name  : 'Singapore'
-  //     },
-  //     {
-  //       latLng: [1.46, 173.03],
-  //       name  : 'Kiribati'
-  //     },
-  //     {
-  //       latLng: [-21.13, -175.2],
-  //       name  : 'Tonga'
-  //     },
-  //     {
-  //       latLng: [15.3, -61.38],
-  //       name  : 'Dominica'
-  //     },
-  //     {
-  //       latLng: [-20.2, 57.5],
-  //       name  : 'Mauritius'
-  //     },
-  //     {
-  //       latLng: [26.02, 50.55],
-  //       name  : 'Bahrain'
-  //     },
-  //     {
-  //       latLng: [0.33, 6.73],
-  //       name  : 'São Tomé and Príncipe'
-  //     }
-  //   ]
-  // })
-
-})
--- a/src/resources/wwwroot/lib/AdminLTE/dist/js/pages/dashboard3.js
+++ b/src/resources/wwwroot/lib/AdminLTE/dist/js/pages/dashboard3.js
@ -1,140 +0,0 @@
-$(function () {
-  'use strict'
-
-  var ticksStyle = {
-    fontColor: '#495057',
-    fontStyle: 'bold'
-  }
-
-  var mode      = 'index'
-  var intersect = true
-
-  var $salesChart = $('#sales-chart')
-  var salesChart  = new Chart($salesChart, {
-    type   : 'bar',
-    data   : {
-      labels  : ['JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC'],
-      datasets: [
-        {
-          backgroundColor: '#007bff',
-          borderColor    : '#007bff',
-          data           : [1000, 2000, 3000, 2500, 2700, 2500, 3000]
-        },
-        {
-          backgroundColor: '#ced4da',
-          borderColor    : '#ced4da',
-          data           : [700, 1700, 2700, 2000, 1800, 1500, 2000]
-        }
-      ]
-    },
-    options: {
-      maintainAspectRatio: false,
-      tooltips           : {
-        mode     : mode,
-        intersect: intersect
-      },
-      hover              : {
-        mode     : mode,
-        intersect: intersect
-      },
-      legend             : {
-        display: false
-      },
-      scales             : {
-        yAxes: [{
-          // display: false,
-          gridLines: {
-            display      : true,
-            lineWidth    : '4px',
-            color        : 'rgba(0, 0, 0, .2)',
-            zeroLineColor: 'transparent'
-          },
-          ticks    : $.extend({
-            beginAtZero: true,
-
-            // Include a dollar sign in the ticks
-            callback: function (value, index, values) {
-              if (value >= 1000) {
-                value /= 1000
-                value += 'k'
-              }
-              return '$' + value
-            }
-          }, ticksStyle)
-        }],
-        xAxes: [{
-          display  : true,
-          gridLines: {
-            display: false
-          },
-          ticks    : ticksStyle
-        }]
-      }
-    }
-  })
-
-  var $visitorsChart = $('#visitors-chart')
-  var visitorsChart  = new Chart($visitorsChart, {
-    data   : {
-      labels  : ['18th', '20th', '22nd', '24th', '26th', '28th', '30th'],
-      datasets: [{
-        type                : 'line',
-        data                : [100, 120, 170, 167, 180, 177, 160],
-        backgroundColor     : 'transparent',
-        borderColor         : '#007bff',
-        pointBorderColor    : '#007bff',
-        pointBackgroundColor: '#007bff',
-        fill                : false
-        // pointHoverBackgroundColor: '#007bff',
-        // pointHoverBorderColor    : '#007bff'
-      },
-        {
-          type                : 'line',
-          data                : [60, 80, 70, 67, 80, 77, 100],
-          backgroundColor     : 'tansparent',
-          borderColor         : '#ced4da',
-          pointBorderColor    : '#ced4da',
-          pointBackgroundColor: '#ced4da',
-          fill                : false
-          // pointHoverBackgroundColor: '#ced4da',
-          // pointHoverBorderColor    : '#ced4da'
-        }]
-    },
-    options: {
-      maintainAspectRatio: false,
-      tooltips           : {
-        mode     : mode,
-        intersect: intersect
-      },
-      hover              : {
-        mode     : mode,
-        intersect: intersect
-      },
-      legend             : {
-        display: false
-      },
-      scales             : {
-        yAxes: [{
-          // display: false,
-          gridLines: {
-            display      : true,
-            lineWidth    : '4px',
-            color        : 'rgba(0, 0, 0, .2)',
-            zeroLineColor: 'transparent'
-          },
-          ticks    : $.extend({
-            beginAtZero : true,
-            suggestedMax: 200
-          }, ticksStyle)
-        }],
-        xAxes: [{
-          display  : true,
-          gridLines: {
-            display: false
-          },
-          ticks    : ticksStyle
-        }]
-      }
-    }
-  })
-})
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/.npmignore
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/.npmignore
@ -1,2 +0,0 @@
-*
-!/plugins/flot-old/
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css
@ -1,399 +0,0 @@
-/*!
- * Bootstrap Colorpicker - Bootstrap Colorpicker is a modular color picker plugin for Bootstrap 4.
- * @package bootstrap-colorpicker
- * @version v3.1.2
- * @license MIT
- * @link https://farbelous.github.io/bootstrap-colorpicker/
- * @link https://github.com/farbelous/bootstrap-colorpicker.git
- */
-.colorpicker {
-  position: relative;
-  display: none;
-  font-size: inherit;
-  color: inherit;
-  text-align: left;
-  list-style: none;
-  background-color: #ffffff;
-  background-clip: padding-box;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  padding: .75rem .75rem;
-  width: 148px;
-  border-radius: 4px;
-  -webkit-box-sizing: content-box;
-          box-sizing: content-box; }
-
-.colorpicker.colorpicker-disabled,
-.colorpicker.colorpicker-disabled * {
-  cursor: default !important; }
-
-.colorpicker div {
-  position: relative; }
-
-.colorpicker-popup {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  float: left;
-  margin-top: 1px;
-  z-index: 1060; }
-
-.colorpicker-popup.colorpicker-bs-popover-content {
-  position: relative;
-  top: auto;
-  left: auto;
-  float: none;
-  margin: 0;
-  z-index: initial;
-  border: none;
-  padding: 0.25rem 0;
-  border-radius: 0;
-  background: none;
-  -webkit-box-shadow: none;
-          box-shadow: none; }
-
-.colorpicker:before,
-.colorpicker:after {
-  content: "";
-  display: table;
-  clear: both;
-  line-height: 0; }
-
-.colorpicker-clear {
-  clear: both;
-  display: block; }
-
-.colorpicker:before {
-  content: '';
-  display: inline-block;
-  border-left: 7px solid transparent;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  position: absolute;
-  top: -7px;
-  left: auto;
-  right: 6px; }
-
-.colorpicker:after {
-  content: '';
-  display: inline-block;
-  border-left: 6px solid transparent;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #ffffff;
-  position: absolute;
-  top: -6px;
-  left: auto;
-  right: 7px; }
-
-.colorpicker.colorpicker-with-alpha {
-  width: 170px; }
-
-.colorpicker.colorpicker-with-alpha .colorpicker-alpha {
-  display: block; }
-
-.colorpicker-saturation {
-  position: relative;
-  width: 126px;
-  height: 126px;
-  /* FF3.6+ */
-  /* Chrome,Safari4+ */
-  /* Chrome10+,Safari5.1+ */
-  /* Opera 11.10+ */
-  /* IE10+ */
-  background: -webkit-gradient(linear, left top, left bottom, from(transparent), to(black)), -webkit-gradient(linear, left top, right top, from(white), to(rgba(255, 255, 255, 0)));
-  background: linear-gradient(to bottom, transparent 0%, black 100%), linear-gradient(to right, white 0%, rgba(255, 255, 255, 0) 100%);
-  /* W3C */
-  cursor: crosshair;
-  float: left;
-  -webkit-box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2);
-  margin-bottom: 6px; }
-  .colorpicker-saturation .colorpicker-guide {
-    display: block;
-    height: 6px;
-    width: 6px;
-    border-radius: 6px;
-    border: 1px solid #000;
-    -webkit-box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.8);
-            box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.8);
-    position: absolute;
-    top: 0;
-    left: 0;
-    margin: -3px 0 0 -3px; }
-
-.colorpicker-hue,
-.colorpicker-alpha {
-  position: relative;
-  width: 16px;
-  height: 126px;
-  float: left;
-  cursor: row-resize;
-  margin-left: 6px;
-  margin-bottom: 6px; }
-
-.colorpicker-alpha-color {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%; }
-
-.colorpicker-hue,
-.colorpicker-alpha-color {
-  -webkit-box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2); }
-
-.colorpicker-hue .colorpicker-guide,
-.colorpicker-alpha .colorpicker-guide {
-  display: block;
-  height: 4px;
-  background: rgba(255, 255, 255, 0.8);
-  border: 1px solid rgba(0, 0, 0, 0.4);
-  position: absolute;
-  top: 0;
-  left: 0;
-  margin-left: -2px;
-  margin-top: -2px;
-  right: -2px;
-  z-index: 1; }
-
-.colorpicker-hue {
-  /* FF3.6+ */
-  /* Chrome,Safari4+ */
-  /* Chrome10+,Safari5.1+ */
-  /* Opera 11.10+ */
-  /* IE10+ */
-  background: -webkit-gradient(linear, left bottom, left top, from(red), color-stop(8%, #ff8000), color-stop(17%, yellow), color-stop(25%, #80ff00), color-stop(33%, lime), color-stop(42%, #00ff80), color-stop(50%, cyan), color-stop(58%, #0080ff), color-stop(67%, blue), color-stop(75%, #8000ff), color-stop(83%, magenta), color-stop(92%, #ff0080), to(red));
-  background: linear-gradient(to top, red 0%, #ff8000 8%, yellow 17%, #80ff00 25%, lime 33%, #00ff80 42%, cyan 50%, #0080ff 58%, blue 67%, #8000ff 75%, magenta 83%, #ff0080 92%, red 100%);
-  /* W3C */ }
-
-.colorpicker-alpha {
-  background: linear-gradient(45deg, rgba(0, 0, 0, 0.1) 25%, transparent 25%, transparent 75%, rgba(0, 0, 0, 0.1) 75%, rgba(0, 0, 0, 0.1) 0), linear-gradient(45deg, rgba(0, 0, 0, 0.1) 25%, transparent 25%, transparent 75%, rgba(0, 0, 0, 0.1) 75%, rgba(0, 0, 0, 0.1) 0), white;
-  background-size: 10px 10px;
-  background-position: 0 0, 5px 5px;
-  display: none; }
-
-.colorpicker-bar {
-  min-height: 16px;
-  margin: 6px 0 0 0;
-  clear: both;
-  text-align: center;
-  font-size: 10px;
-  line-height: normal;
-  max-width: 100%;
-  -webkit-box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2); }
-  .colorpicker-bar:before {
-    content: "";
-    display: table;
-    clear: both; }
-
-.colorpicker-bar.colorpicker-bar-horizontal {
-  height: 126px;
-  width: 16px;
-  margin: 0 0 6px 0;
-  float: left; }
-
-.colorpicker-input-addon {
-  position: relative; }
-
-.colorpicker-input-addon i {
-  display: inline-block;
-  cursor: pointer;
-  vertical-align: text-top;
-  height: 16px;
-  width: 16px;
-  position: relative; }
-
-.colorpicker-input-addon:before {
-  content: "";
-  position: absolute;
-  width: 16px;
-  height: 16px;
-  display: inline-block;
-  vertical-align: text-top;
-  background: linear-gradient(45deg, rgba(0, 0, 0, 0.1) 25%, transparent 25%, transparent 75%, rgba(0, 0, 0, 0.1) 75%, rgba(0, 0, 0, 0.1) 0), linear-gradient(45deg, rgba(0, 0, 0, 0.1) 25%, transparent 25%, transparent 75%, rgba(0, 0, 0, 0.1) 75%, rgba(0, 0, 0, 0.1) 0), white;
-  background-size: 10px 10px;
-  background-position: 0 0, 5px 5px; }
-
-.colorpicker.colorpicker-inline {
-  position: relative;
-  display: inline-block;
-  float: none;
-  z-index: auto;
-  vertical-align: text-bottom; }
-
-.colorpicker.colorpicker-horizontal {
-  width: 126px;
-  height: auto; }
-
-.colorpicker.colorpicker-horizontal .colorpicker-bar {
-  width: 126px; }
-
-.colorpicker.colorpicker-horizontal .colorpicker-saturation {
-  float: none;
-  margin-bottom: 0; }
-
-.colorpicker.colorpicker-horizontal .colorpicker-hue,
-.colorpicker.colorpicker-horizontal .colorpicker-alpha {
-  float: none;
-  width: 126px;
-  height: 16px;
-  cursor: col-resize;
-  margin-left: 0;
-  margin-top: 6px;
-  margin-bottom: 0; }
-
-.colorpicker.colorpicker-horizontal .colorpicker-hue .colorpicker-guide,
-.colorpicker.colorpicker-horizontal .colorpicker-alpha .colorpicker-guide {
-  position: absolute;
-  display: block;
-  bottom: -2px;
-  left: 0;
-  right: auto;
-  height: auto;
-  width: 4px; }
-
-.colorpicker.colorpicker-horizontal .colorpicker-hue {
-  /* FF3.6+ */
-  /* Chrome,Safari4+ */
-  /* Chrome10+,Safari5.1+ */
-  /* Opera 11.10+ */
-  /* IE10+ */
-  background: -webkit-gradient(linear, right top, left top, from(red), color-stop(8%, #ff8000), color-stop(17%, yellow), color-stop(25%, #80ff00), color-stop(33%, lime), color-stop(42%, #00ff80), color-stop(50%, cyan), color-stop(58%, #0080ff), color-stop(67%, blue), color-stop(75%, #8000ff), color-stop(83%, magenta), color-stop(92%, #ff0080), to(red));
-  background: linear-gradient(to left, red 0%, #ff8000 8%, yellow 17%, #80ff00 25%, lime 33%, #00ff80 42%, cyan 50%, #0080ff 58%, blue 67%, #8000ff 75%, magenta 83%, #ff0080 92%, red 100%);
-  /* W3C */ }
-
-.colorpicker.colorpicker-horizontal .colorpicker-alpha {
-  background: linear-gradient(45deg, rgba(0, 0, 0, 0.1) 25%, transparent 25%, transparent 75%, rgba(0, 0, 0, 0.1) 75%, rgba(0, 0, 0, 0.1) 0), linear-gradient(45deg, rgba(0, 0, 0, 0.1) 25%, transparent 25%, transparent 75%, rgba(0, 0, 0, 0.1) 75%, rgba(0, 0, 0, 0.1) 0), white;
-  background-size: 10px 10px;
-  background-position: 0 0, 5px 5px; }
-
-.colorpicker-inline:before,
-.colorpicker-no-arrow:before,
-.colorpicker-popup.colorpicker-bs-popover-content:before {
-  content: none;
-  display: none; }
-
-.colorpicker-inline:after,
-.colorpicker-no-arrow:after,
-.colorpicker-popup.colorpicker-bs-popover-content:after {
-  content: none;
-  display: none; }
-
-.colorpicker-alpha,
-.colorpicker-saturation,
-.colorpicker-hue {
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none; }
-
-.colorpicker.colorpicker-visible,
-.colorpicker-alpha.colorpicker-visible,
-.colorpicker-saturation.colorpicker-visible,
-.colorpicker-hue.colorpicker-visible,
-.colorpicker-bar.colorpicker-visible {
-  display: block; }
-
-.colorpicker.colorpicker-hidden,
-.colorpicker-alpha.colorpicker-hidden,
-.colorpicker-saturation.colorpicker-hidden,
-.colorpicker-hue.colorpicker-hidden,
-.colorpicker-bar.colorpicker-hidden {
-  display: none; }
-
-.colorpicker-inline.colorpicker-visible {
-  display: inline-block; }
-
-.colorpicker.colorpicker-disabled:after {
-  border: none;
-  content: '';
-  display: block;
-  width: 100%;
-  height: 100%;
-  background: rgba(233, 236, 239, 0.33);
-  top: 0;
-  left: 0;
-  right: auto;
-  z-index: 2;
-  position: absolute; }
-
-.colorpicker.colorpicker-disabled .colorpicker-guide {
-  display: none; }
-
-/** EXTENSIONS **/
-.colorpicker-preview {
-  background: linear-gradient(45deg, rgba(0, 0, 0, 0.1) 25%, transparent 25%, transparent 75%, rgba(0, 0, 0, 0.1) 75%, rgba(0, 0, 0, 0.1) 0), linear-gradient(45deg, rgba(0, 0, 0, 0.1) 25%, transparent 25%, transparent 75%, rgba(0, 0, 0, 0.1) 75%, rgba(0, 0, 0, 0.1) 0), white;
-  background-size: 10px 10px;
-  background-position: 0 0, 5px 5px; }
-
-.colorpicker-preview > div {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%; }
-
-.colorpicker-bar.colorpicker-swatches {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  height: auto; }
-
-.colorpicker-swatches--inner {
-  clear: both;
-  margin-top: -6px; }
-
-.colorpicker-swatch {
-  position: relative;
-  cursor: pointer;
-  float: left;
-  height: 16px;
-  width: 16px;
-  margin-right: 6px;
-  margin-top: 6px;
-  margin-left: 0;
-  display: block;
-  -webkit-box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2);
-  background: linear-gradient(45deg, rgba(0, 0, 0, 0.1) 25%, transparent 25%, transparent 75%, rgba(0, 0, 0, 0.1) 75%, rgba(0, 0, 0, 0.1) 0), linear-gradient(45deg, rgba(0, 0, 0, 0.1) 25%, transparent 25%, transparent 75%, rgba(0, 0, 0, 0.1) 75%, rgba(0, 0, 0, 0.1) 0), white;
-  background-size: 10px 10px;
-  background-position: 0 0, 5px 5px; }
-
-.colorpicker-swatch--inner {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%; }
-
-.colorpicker-swatch:nth-of-type(7n+0) {
-  margin-right: 0; }
-
-.colorpicker-with-alpha .colorpicker-swatch:nth-of-type(7n+0) {
-  margin-right: 6px; }
-
-.colorpicker-with-alpha .colorpicker-swatch:nth-of-type(8n+0) {
-  margin-right: 0; }
-
-.colorpicker-horizontal .colorpicker-swatch:nth-of-type(6n+0) {
-  margin-right: 0; }
-
-.colorpicker-horizontal .colorpicker-swatch:nth-of-type(7n+0) {
-  margin-right: 6px; }
-
-.colorpicker-horizontal .colorpicker-swatch:nth-of-type(8n+0) {
-  margin-right: 6px; }
-
-.colorpicker-swatch:last-of-type:after {
-  content: "";
-  display: table;
-  clear: both; }
-
-*[dir='rtl'] .colorpicker-element input,
-.colorpicker-element[dir='rtl'] input,
-.colorpicker-element input[dir='rtl'] {
-  direction: ltr;
-  text-align: right; }
-
-/*# sourceMappingURL=bootstrap-colorpicker.css.map */
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.css.map
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css.map
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js.map
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.js.map
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js.map
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js.map
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-slider/bootstrap-slider.js
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-slider/bootstrap-slider.js
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-slider/bootstrap-slider.min.js
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-slider/bootstrap-slider.min.js
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-slider/css/bootstrap-slider.css
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-slider/css/bootstrap-slider.css
@ -1,328 +0,0 @@
-/*! =======================================================
-                      VERSION  10.6.2              
-========================================================= */
-/*! =========================================================
- * bootstrap-slider.js
- *
- * Maintainers:
- *		Kyle Kemp
- *			- Twitter: @seiyria
- *			- Github:  seiyria
- *		Rohit Kalkur
- *			- Twitter: @Rovolutionary
- *			- Github:  rovolution
- *
- * =========================================================
-  *
- * bootstrap-slider is released under the MIT License
- * Copyright (c) 2019 Kyle Kemp, Rohit Kalkur, and contributors
- * 
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- * 
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * ========================================================= */
-.slider {
-  display: inline-block;
-  vertical-align: middle;
-  position: relative;
-}
-.slider.slider-horizontal {
-  width: 210px;
-  height: 20px;
-}
-.slider.slider-horizontal .slider-track {
-  height: 10px;
-  width: 100%;
-  margin-top: -5px;
-  top: 50%;
-  left: 0;
-}
-.slider.slider-horizontal .slider-selection,
-.slider.slider-horizontal .slider-track-low,
-.slider.slider-horizontal .slider-track-high {
-  height: 100%;
-  top: 0;
-  bottom: 0;
-}
-.slider.slider-horizontal .slider-tick,
-.slider.slider-horizontal .slider-handle {
-  margin-left: -10px;
-}
-.slider.slider-horizontal .slider-tick.triangle,
-.slider.slider-horizontal .slider-handle.triangle {
-  position: relative;
-  top: 50%;
-  -ms-transform: translateY(-50%);
-  transform: translateY(-50%);
-  border-width: 0 10px 10px 10px;
-  width: 0;
-  height: 0;
-  border-bottom-color: #2e6da4;
-  margin-top: 0;
-}
-.slider.slider-horizontal .slider-tick-container {
-  white-space: nowrap;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-}
-.slider.slider-horizontal .slider-tick-label-container {
-  white-space: nowrap;
-  margin-top: 20px;
-}
-.slider.slider-horizontal .slider-tick-label-container .slider-tick-label {
-  padding-top: 4px;
-  display: inline-block;
-  text-align: center;
-}
-.slider.slider-horizontal .tooltip {
-  -ms-transform: translateX(-50%);
-  transform: translateX(-50%);
-}
-.slider.slider-horizontal.slider-rtl .slider-track {
-  left: initial;
-  right: 0;
-}
-.slider.slider-horizontal.slider-rtl .slider-tick,
-.slider.slider-horizontal.slider-rtl .slider-handle {
-  margin-left: initial;
-  margin-right: -10px;
-}
-.slider.slider-horizontal.slider-rtl .slider-tick-container {
-  left: initial;
-  right: 0;
-}
-.slider.slider-horizontal.slider-rtl .tooltip {
-  -ms-transform: translateX(50%);
-  transform: translateX(50%);
-}
-.slider.slider-vertical {
-  height: 210px;
-  width: 20px;
-}
-.slider.slider-vertical .slider-track {
-  width: 10px;
-  height: 100%;
-  left: 25%;
-  top: 0;
-}
-.slider.slider-vertical .slider-selection {
-  width: 100%;
-  left: 0;
-  top: 0;
-  bottom: 0;
-}
-.slider.slider-vertical .slider-track-low,
-.slider.slider-vertical .slider-track-high {
-  width: 100%;
-  left: 0;
-  right: 0;
-}
-.slider.slider-vertical .slider-tick,
-.slider.slider-vertical .slider-handle {
-  margin-top: -10px;
-}
-.slider.slider-vertical .slider-tick.triangle,
-.slider.slider-vertical .slider-handle.triangle {
-  border-width: 10px 0 10px 10px;
-  width: 1px;
-  height: 1px;
-  border-left-color: #2e6da4;
-  border-right-color: #2e6da4;
-  margin-left: 0;
-  margin-right: 0;
-}
-.slider.slider-vertical .slider-tick-label-container {
-  white-space: nowrap;
-}
-.slider.slider-vertical .slider-tick-label-container .slider-tick-label {
-  padding-left: 4px;
-}
-.slider.slider-vertical .tooltip {
-  -ms-transform: translateY(-50%);
-  transform: translateY(-50%);
-}
-.slider.slider-vertical.slider-rtl .slider-track {
-  left: initial;
-  right: 25%;
-}
-.slider.slider-vertical.slider-rtl .slider-selection {
-  left: initial;
-  right: 0;
-}
-.slider.slider-vertical.slider-rtl .slider-tick.triangle,
-.slider.slider-vertical.slider-rtl .slider-handle.triangle {
-  border-width: 10px 10px 10px 0;
-}
-.slider.slider-vertical.slider-rtl .slider-tick-label-container .slider-tick-label {
-  padding-left: initial;
-  padding-right: 4px;
-}
-.slider.slider-disabled .slider-handle {
-  background-image: -webkit-linear-gradient(top, #dfdfdf 0%, #bebebe 100%);
-  background-image: -o-linear-gradient(top, #dfdfdf 0%, #bebebe 100%);
-  background-image: linear-gradient(to bottom, #dfdfdf 0%, #bebebe 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdfdfdf', endColorstr='#ffbebebe', GradientType=0);
-  background-repeat: repeat-x;
-}
-.slider.slider-disabled .slider-track {
-  background-image: -webkit-linear-gradient(top, #e5e5e5 0%, #e9e9e9 100%);
-  background-image: -o-linear-gradient(top, #e5e5e5 0%, #e9e9e9 100%);
-  background-image: linear-gradient(to bottom, #e5e5e5 0%, #e9e9e9 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe5e5e5', endColorstr='#ffe9e9e9', GradientType=0);
-  background-repeat: repeat-x;
-  cursor: not-allowed;
-}
-.slider input {
-  display: none;
-}
-.slider .tooltip {
-  pointer-events: none;
-}
-.slider .tooltip.top {
-  margin-top: -36px;
-}
-.slider .tooltip-inner {
-  white-space: nowrap;
-  max-width: none;
-}
-.slider .hide {
-  display: none;
-}
-.slider-track {
-  position: absolute;
-  cursor: pointer;
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #f9f9f9 100%);
-  background-image: -o-linear-gradient(top, #f5f5f5 0%, #f9f9f9 100%);
-  background-image: linear-gradient(to bottom, #f5f5f5 0%, #f9f9f9 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  border-radius: 4px;
-}
-.slider-selection {
-  position: absolute;
-  background-image: -webkit-linear-gradient(top, #f9f9f9 0%, #f5f5f5 100%);
-  background-image: -o-linear-gradient(top, #f9f9f9 0%, #f5f5f5 100%);
-  background-image: linear-gradient(to bottom, #f9f9f9 0%, #f5f5f5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#fff5f5f5', GradientType=0);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  border-radius: 4px;
-}
-.slider-selection.tick-slider-selection {
-  background-image: -webkit-linear-gradient(top, #8ac1ef 0%, #82b3de 100%);
-  background-image: -o-linear-gradient(top, #8ac1ef 0%, #82b3de 100%);
-  background-image: linear-gradient(to bottom, #8ac1ef 0%, #82b3de 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8ac1ef', endColorstr='#ff82b3de', GradientType=0);
-  background-repeat: repeat-x;
-}
-.slider-track-low,
-.slider-track-high {
-  position: absolute;
-  background: transparent;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  border-radius: 4px;
-}
-.slider-handle {
-  position: absolute;
-  top: 0;
-  width: 20px;
-  height: 20px;
-  background-color: #337ab7;
-  background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
-  background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
-  background-repeat: repeat-x;
-  filter: none;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-  box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-  border: 0px solid transparent;
-}
-.slider-handle:hover {
-  cursor: pointer;
-}
-.slider-handle.round {
-  border-radius: 50%;
-}
-.slider-handle.triangle {
-  background: transparent none;
-}
-.slider-handle.custom {
-  background: transparent none;
-}
-.slider-handle.custom::before {
-  line-height: 20px;
-  font-size: 20px;
-  content: '\2605';
-  color: #726204;
-}
-.slider-tick {
-  position: absolute;
-  cursor: pointer;
-  width: 20px;
-  height: 20px;
-  background-image: -webkit-linear-gradient(top, #f9f9f9 0%, #f5f5f5 100%);
-  background-image: -o-linear-gradient(top, #f9f9f9 0%, #f5f5f5 100%);
-  background-image: linear-gradient(to bottom, #f9f9f9 0%, #f5f5f5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#fff5f5f5', GradientType=0);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  filter: none;
-  opacity: 0.8;
-  border: 0px solid transparent;
-}
-.slider-tick.round {
-  border-radius: 50%;
-}
-.slider-tick.triangle {
-  background: transparent none;
-}
-.slider-tick.custom {
-  background: transparent none;
-}
-.slider-tick.custom::before {
-  line-height: 20px;
-  font-size: 20px;
-  content: '\2605';
-  color: #726204;
-}
-.slider-tick.in-selection {
-  background-image: -webkit-linear-gradient(top, #8ac1ef 0%, #82b3de 100%);
-  background-image: -o-linear-gradient(top, #8ac1ef 0%, #82b3de 100%);
-  background-image: linear-gradient(to bottom, #8ac1ef 0%, #82b3de 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8ac1ef', endColorstr='#ff82b3de', GradientType=0);
-  background-repeat: repeat-x;
-  opacity: 1;
-}
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-slider/css/bootstrap-slider.min.css
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-slider/css/bootstrap-slider.min.css
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-switch/css/bootstrap2/bootstrap-switch.css
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-switch/css/bootstrap2/bootstrap-switch.css
@ -1,510 +0,0 @@
-/**
-  * bootstrap-switch - Turn checkboxes and radio buttons into toggle switches.
-  *
-  * @version v3.4.0
-  * @homepage https://bttstrp.github.io/bootstrap-switch
-  * @author Mattia Larentis <mattia@larentis.eu> (http://larentis.eu)
-  * @license MIT
-  */
-
-.clearfix {
-  *zoom: 1;
-}
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  content: "";
-  line-height: 0;
-}
-.clearfix:after {
-  clear: both;
-}
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.bootstrap-switch {
-  display: inline-block;
-  direction: ltr;
-  cursor: pointer;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  border: 1px solid;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  position: relative;
-  text-align: left;
-  overflow: hidden;
-  line-height: 8px;
-  z-index: 0;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  -o-user-select: none;
-  user-select: none;
-  vertical-align: middle;
-  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-  -moz-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-  -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-}
-.bootstrap-switch .bootstrap-switch-container {
-  display: inline-block;
-  top: 0;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -webkit-transform: translate3d(0, 0, 0);
-  -moz-transform: translate3d(0, 0, 0);
-  -o-transform: translate3d(0, 0, 0);
-  transform: translate3d(0, 0, 0);
-}
-.bootstrap-switch .bootstrap-switch-handle-on,
-.bootstrap-switch .bootstrap-switch-handle-off,
-.bootstrap-switch .bootstrap-switch-label {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  cursor: pointer;
-  display: inline-block !important;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  padding-left: 8px;
-  padding-right: 8px;
-  font-size: 14px;
-  line-height: 20px;
-}
-.bootstrap-switch .bootstrap-switch-handle-on,
-.bootstrap-switch .bootstrap-switch-handle-off {
-  text-align: center;
-  z-index: 1;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary {
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #005fcc;
-  background-image: -moz-linear-gradient(top, #0044cc, #08c);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0044cc), to(#08c));
-  background-image: -webkit-linear-gradient(top, #0044cc, #08c);
-  background-image: -o-linear-gradient(top, #0044cc, #08c);
-  background-image: linear-gradient(to bottom, #0044cc, #08c);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0044cc', endColorstr='#ff0088cc', GradientType=0);
-  border-color: #08c #08c #005580;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  *background-color: #08c;
-  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary:hover,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary:hover,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary:focus,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary:focus,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary:active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary:active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary.active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary.active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary.disabled,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary.disabled,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary[disabled],
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary[disabled] {
-  color: #fff;
-  background-color: #08c;
-  *background-color: #0077b3;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary:active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary:active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary.active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary.active {
-  background-color: #006699 \9;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info {
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #41a7c5;
-  background-image: -moz-linear-gradient(top, #2f96b4, #5bc0de);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#2f96b4), to(#5bc0de));
-  background-image: -webkit-linear-gradient(top, #2f96b4, #5bc0de);
-  background-image: -o-linear-gradient(top, #2f96b4, #5bc0de);
-  background-image: linear-gradient(to bottom, #2f96b4, #5bc0de);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2f96b4', endColorstr='#ff5bc0de', GradientType=0);
-  border-color: #5bc0de #5bc0de #28a1c5;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  *background-color: #5bc0de;
-  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info:hover,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info:hover,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info:focus,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info:focus,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info:active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info:active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info.active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info.active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info.disabled,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info.disabled,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info[disabled],
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info[disabled] {
-  color: #fff;
-  background-color: #5bc0de;
-  *background-color: #46b8da;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info:active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info:active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info.active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info.active {
-  background-color: #31b0d5 \9;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success {
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #58b058;
-  background-image: -moz-linear-gradient(top, #51a351, #62c462);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#51a351), to(#62c462));
-  background-image: -webkit-linear-gradient(top, #51a351, #62c462);
-  background-image: -o-linear-gradient(top, #51a351, #62c462);
-  background-image: linear-gradient(to bottom, #51a351, #62c462);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff51a351', endColorstr='#ff62c462', GradientType=0);
-  border-color: #62c462 #62c462 #3b9e3b;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  *background-color: #62c462;
-  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success:hover,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success:hover,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success:focus,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success:focus,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success:active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success:active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success.active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success.active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success.disabled,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success.disabled,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success[disabled],
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success[disabled] {
-  color: #fff;
-  background-color: #62c462;
-  *background-color: #4fbd4f;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success:active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success:active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success.active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success.active {
-  background-color: #42b142 \9;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning {
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #f9a123;
-  background-image: -moz-linear-gradient(top, #f89406, #fbb450);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f89406), to(#fbb450));
-  background-image: -webkit-linear-gradient(top, #f89406, #fbb450);
-  background-image: -o-linear-gradient(top, #f89406, #fbb450);
-  background-image: linear-gradient(to bottom, #f89406, #fbb450);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff89406', endColorstr='#fffbb450', GradientType=0);
-  border-color: #fbb450 #fbb450 #f89406;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  *background-color: #fbb450;
-  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning:hover,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning:hover,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning:focus,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning:focus,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning:active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning:active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning.active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning.active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning.disabled,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning.disabled,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning[disabled],
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning[disabled] {
-  color: #fff;
-  background-color: #fbb450;
-  *background-color: #faa937;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning:active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning:active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning.active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning.active {
-  background-color: #fa9f1e \9;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger {
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #d14641;
-  background-image: -moz-linear-gradient(top, #bd362f, #ee5f5b);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#bd362f), to(#ee5f5b));
-  background-image: -webkit-linear-gradient(top, #bd362f, #ee5f5b);
-  background-image: -o-linear-gradient(top, #bd362f, #ee5f5b);
-  background-image: linear-gradient(to bottom, #bd362f, #ee5f5b);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffbd362f', endColorstr='#ffee5f5b', GradientType=0);
-  border-color: #ee5f5b #ee5f5b #e51d18;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  *background-color: #ee5f5b;
-  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger:hover,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger:hover,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger:focus,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger:focus,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger:active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger:active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger.active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger.active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger.disabled,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger.disabled,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger[disabled],
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger[disabled] {
-  color: #fff;
-  background-color: #ee5f5b;
-  *background-color: #ec4844;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger:active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger:active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger.active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger.active {
-  background-color: #e9322d \9;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default {
-  color: #333;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  background-color: #f0f0f0;
-  background-image: -moz-linear-gradient(top, #e6e6e6, #fff);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e6e6e6), to(#fff));
-  background-image: -webkit-linear-gradient(top, #e6e6e6, #fff);
-  background-image: -o-linear-gradient(top, #e6e6e6, #fff);
-  background-image: linear-gradient(to bottom, #e6e6e6, #fff);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6', endColorstr='#ffffffff', GradientType=0);
-  border-color: #fff #fff #d9d9d9;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  *background-color: #fff;
-  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default:hover,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default:hover,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default:focus,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default:focus,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default:active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default:active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default.active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default.active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default.disabled,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default.disabled,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default[disabled],
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default[disabled] {
-  color: #333;
-  background-color: #fff;
-  *background-color: #f2f2f2;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default:active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default:active,
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default.active,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default.active {
-  background-color: #e6e6e6 \9;
-}
-.bootstrap-switch .bootstrap-switch-label {
-  text-align: center;
-  margin-top: -1px;
-  margin-bottom: -1px;
-  z-index: 100;
-  border-left: 1px solid #ccc;
-  border-right: 1px solid #ccc;
-  color: #333;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #f5f5f5;
-  background-image: -moz-linear-gradient(top, #fff, #e6e6e6);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(top, #fff, #e6e6e6);
-  background-image: -o-linear-gradient(top, #fff, #e6e6e6);
-  background-image: linear-gradient(to bottom, #fff, #e6e6e6);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
-  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  *background-color: #e6e6e6;
-  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.bootstrap-switch .bootstrap-switch-label:hover,
-.bootstrap-switch .bootstrap-switch-label:focus,
-.bootstrap-switch .bootstrap-switch-label:active,
-.bootstrap-switch .bootstrap-switch-label.active,
-.bootstrap-switch .bootstrap-switch-label.disabled,
-.bootstrap-switch .bootstrap-switch-label[disabled] {
-  color: #333;
-  background-color: #e6e6e6;
-  *background-color: #d9d9d9;
-}
-.bootstrap-switch .bootstrap-switch-label:active,
-.bootstrap-switch .bootstrap-switch-label.active {
-  background-color: #cccccc \9;
-}
-.bootstrap-switch span::before {
-  content: "\200b";
-}
-.bootstrap-switch .bootstrap-switch-handle-on {
-  -webkit-border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-  border-top-left-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  border-bottom-left-radius: 4px;
-}
-.bootstrap-switch .bootstrap-switch-handle-off {
-  -webkit-border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  border-bottom-right-radius: 4px;
-}
-.bootstrap-switch input[type='radio'],
-.bootstrap-switch input[type='checkbox'] {
-  position: absolute !important;
-  top: 0;
-  left: 0;
-  opacity: 0;
-  filter: alpha(opacity=0);
-  z-index: -1;
-  visibility: hidden;
-}
-.bootstrap-switch input[type='radio'].form-control,
-.bootstrap-switch input[type='checkbox'].form-control {
-  height: auto;
-}
-.bootstrap-switch.bootstrap-switch-mini {
-  min-width: 71px;
-}
-.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-on,
-.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-off,
-.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-label {
-  padding: 3px 6px;
-  font-size: 10px;
-  line-height: 9px;
-}
-.bootstrap-switch.bootstrap-switch-small {
-  min-width: 79px;
-}
-.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-on,
-.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-off,
-.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-label {
-  padding: 3px 6px;
-  font-size: 12px;
-  line-height: 18px;
-}
-.bootstrap-switch.bootstrap-switch-large {
-  min-width: 120px;
-}
-.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-handle-on,
-.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-handle-off,
-.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-label {
-  padding: 9px 12px;
-  font-size: 16px;
-  line-height: normal;
-}
-.bootstrap-switch.bootstrap-switch-disabled,
-.bootstrap-switch.bootstrap-switch-readonly,
-.bootstrap-switch.bootstrap-switch-indeterminate {
-  cursor: default !important;
-}
-.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-on,
-.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-on,
-.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-on,
-.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-off,
-.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-off,
-.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-off,
-.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-label,
-.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-label,
-.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-label {
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-  cursor: default !important;
-}
-.bootstrap-switch.bootstrap-switch-animate .bootstrap-switch-container {
-  -webkit-transition: margin-left 0.5s;
-  -moz-transition: margin-left 0.5s;
-  -o-transition: margin-left 0.5s;
-  transition: margin-left 0.5s;
-}
-.bootstrap-switch.bootstrap-switch-inverse .bootstrap-switch-handle-on {
-  -webkit-border-top-left-radius: 0;
-  -moz-border-radius-topleft: 0;
-  border-top-left-radius: 0;
-  -webkit-border-bottom-left-radius: 0;
-  -moz-border-radius-bottomleft: 0;
-  border-bottom-left-radius: 0;
-  -webkit-border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  border-bottom-right-radius: 4px;
-}
-.bootstrap-switch.bootstrap-switch-inverse .bootstrap-switch-handle-off {
-  -webkit-border-top-right-radius: 0;
-  -moz-border-radius-topright: 0;
-  border-top-right-radius: 0;
-  -webkit-border-bottom-right-radius: 0;
-  -moz-border-radius-bottomright: 0;
-  border-bottom-right-radius: 0;
-  -webkit-border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-  border-top-left-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  border-bottom-left-radius: 4px;
-}
-.bootstrap-switch.bootstrap-switch-focused {
-  border-color: rgba(82, 168, 236, 0.8);
-  outline: 0;
-  outline: thin dotted \9;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82, 168, 236, .6);
-  -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82, 168, 236, .6);
-  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82, 168, 236, .6);
-}
-.bootstrap-switch.bootstrap-switch-on .bootstrap-switch-label,
-.bootstrap-switch.bootstrap-switch-inverse.bootstrap-switch-off .bootstrap-switch-label {
-  -webkit-border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  border-bottom-right-radius: 4px;
-}
-.bootstrap-switch.bootstrap-switch-off .bootstrap-switch-label,
-.bootstrap-switch.bootstrap-switch-inverse.bootstrap-switch-on .bootstrap-switch-label {
-  -webkit-border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-  border-top-left-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  border-bottom-left-radius: 4px;
-}
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-switch/css/bootstrap2/bootstrap-switch.min.css
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-switch/css/bootstrap2/bootstrap-switch.min.css
--- a/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-switch/css/bootstrap3/bootstrap-switch.css
+++ b/src/resources/wwwroot/lib/AdminLTE/plugins/bootstrap-switch/css/bootstrap3/bootstrap-switch.css
@ -1,187 +0,0 @@
-/**
-  * bootstrap-switch - Turn checkboxes and radio buttons into toggle switches.
-  *
-  * @version v3.4.0
-  * @homepage https://bttstrp.github.io/bootstrap-switch
-  * @author Mattia Larentis <mattia@larentis.eu> (http://larentis.eu)
-  * @license MIT
-  */
-
-.bootstrap-switch {
-  display: inline-block;
-  direction: ltr;
-  cursor: pointer;
-  border-radius: 4px;
-  border: 1px solid;
-  border-color: #ccc;
-  position: relative;
-  text-align: left;
-  overflow: hidden;
-  line-height: 8px;
-  z-index: 0;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  vertical-align: middle;
-  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-  -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-}
-.bootstrap-switch .bootstrap-switch-container {
-  display: inline-block;
-  top: 0;
-  border-radius: 4px;
-  -webkit-transform: translate3d(0, 0, 0);
-  transform: translate3d(0, 0, 0);
-}
-.bootstrap-switch .bootstrap-switch-handle-on,
-.bootstrap-switch .bootstrap-switch-handle-off,
-.bootstrap-switch .bootstrap-switch-label {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  cursor: pointer;
-  display: table-cell;
-  vertical-align: middle;
-  padding: 6px 12px;
-  font-size: 14px;
-  line-height: 20px;
-}
-.bootstrap-switch .bootstrap-switch-handle-on,
-.bootstrap-switch .bootstrap-switch-handle-off {
-  text-align: center;
-  z-index: 1;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary {
-  color: #fff;
-  background: #337ab7;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-info,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-info {
-  color: #fff;
-  background: #5bc0de;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-success,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-success {
-  color: #fff;
-  background: #5cb85c;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-warning,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-warning {
-  background: #f0ad4e;
-  color: #fff;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-danger,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-danger {
-  color: #fff;
-  background: #d9534f;
-}
-.bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-default,
-.bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-default {
-  color: #000;
-  background: #eeeeee;
-}
-.bootstrap-switch .bootstrap-switch-label {
-  text-align: center;
-  margin-top: -1px;
-  margin-bottom: -1px;
-  z-index: 100;
-  color: #333;
-  background: #fff;
-}
-.bootstrap-switch span::before {
-  content: "\200b";
-}
-.bootstrap-switch .bootstrap-switch-handle-on {
-  border-bottom-left-radius: 3px;
-  border-top-left-radius: 3px;
-}
-.bootstrap-switch .bootstrap-switch-handle-off {
-  border-bottom-right-radius: 3px;
-  border-top-right-radius: 3px;
-}
-.bootstrap-switch input[type='radio'],
-.bootstrap-switch input[type='checkbox'] {
-  position: absolute !important;
-  top: 0;
-  left: 0;
-  margin: 0;
-  z-index: -1;
-  opacity: 0;
-  filter: alpha(opacity=0);
-  visibility: hidden;
-}
-.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-on,
-.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-off,
-.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-label {
-  padding: 1px 5px;
-  font-size: 12px;
-  line-height: 1.5;
-}
-.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-on,
-.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-off,
-.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-label {
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-}
-.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-handle-on,
-.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-handle-off,
-.bootstrap-switch.bootstrap-switch-large .bootstrap-switch-label {
-  padding: 6px 16px;
-  font-size: 18px;
-  line-height: 1.3333333;
-}
-.bootstrap-switch.bootstrap-switch-disabled,
-.bootstrap-switch.bootstrap-switch-readonly,
-.bootstrap-switch.bootstrap-switch-indeterminate {
-  cursor: default !important;
-}
-.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-on,
-.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-on,
-.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-on,
-.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-handle-off,
-.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-handle-off,
-.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-handle-off,
-.bootstrap-switch.bootstrap-switch-disabled .bootstrap-switch-label,
-.bootstrap-switch.bootstrap-switch-readonly .bootstrap-switch-label,
-.bootstrap-switch.bootstrap-switch-indeterminate .bootstrap-switch-label {
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-  cursor: default !important;
-}
-.bootstrap-switch.bootstrap-switch-animate .bootstrap-switch-container {
-  -webkit-transition: margin-left 0.5s;
-  -o-transition: margin-left 0.5s;
-  transition: margin-left 0.5s;
-}
-.bootstrap-switch.bootstrap-switch-inverse .bootstrap-switch-handle-on {
-  border-bottom-left-radius: 0;
-  border-top-left-radius: 0;
-  border-bottom-right-radius: 3px;
-  border-top-right-radius: 3px;
-}
-.bootstrap-switch.bootstrap-switch-inverse .bootstrap-switch-handle-off {
-  border-bottom-right-radius: 0;
-  border-top-right-radius: 0;
-  border-bottom-left-radius: 3px;
-  border-top-left-radius: 3px;
-}
-.bootstrap-switch.bootstrap-switch-focused {
-  border-color: #66afe9;
-  outline: 0;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
-  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
-}
-.bootstrap-switch.bootstrap-switch-on .bootstrap-switch-label,
-.bootstrap-switch.bootstrap-switch-inverse.bootstrap-switch-off .bootstrap-switch-label {
-  border-bottom-right-radius: 3px;
-  border-top-right-radius: 3px;
-}
-.bootstrap-switch.bootstrap-switch-off .bootstrap-switch-label,
-.bootstrap-switch.bootstrap-switch-inverse.bootstrap-switch-on .bootstrap-switch-label {
-  border-bottom-left-radius: 3px;
-  border-top-left-radius: 3px;
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lukas-heiligenbrunner	b3fcd26964	release version 1.0.1	2020-03-27 19:56:09 +01:00
lukas-heiligenbrunner	86660a8d64	removed sheduled taskpage for now removed settings index entry	2020-03-27 19:55:42 +01:00
Lukas-Heiligenbrunner	dbc7505cc4	Merge pull request #5 from IngProjDutzlerHeiligenbrunnerMeindl/cleanup Cleanup	2020-03-27 19:29:56 +01:00
lukas-heiligenbrunner	72b13cb335	readded main datatables lib	2020-03-27 19:27:07 +01:00
lukas-heiligenbrunner	c78e5614d7	removed demo dependencies in pages	2020-03-27 17:56:23 +01:00
lukas-heiligenbrunner	0498e61616	delete unused profile and demo files	2020-03-27 17:53:33 +01:00
lukas-heiligenbrunner	8b43afb2c9	deleted unused profile page cleanup shedulepickup devices page and user page	2020-03-27 17:49:49 +01:00
lukas-heiligenbrunner	ab348417b4	removed libs at Admin page	2020-03-27 17:41:12 +01:00
lukas-heiligenbrunner	62a43cf695	delete unused libs	2020-03-27 17:36:32 +01:00
lukas-heiligenbrunner	ac3fce2913	new webserver executor to allow multiple instances	2020-03-20 13:36:43 +01:00
Lukas Heiligenbrunner	05b338ec85	add timezone to mysql init	2020-03-13 15:41:55 +01:00
Lukas Heiligenbrunner	5605a813d9	Merge branch 'javadoc' # Conflicts: # src/java/com/wasteinformationserver/website/datarequests/NewDateRequest.java	2020-03-13 14:50:47 +01:00
Lukas-Heiligenbrunner	b4d7e2e691	Merge pull request #4 from IngProjDutzlerHeiligenbrunnerMeindl/sheduledtaskpage added new page to shedule tasks	2020-03-13 13:38:17 +01:00
Lukas Heiligenbrunner	9f39b4f9c8	added javadoc	2020-03-13 11:04:09 +01:00
Lukas-Heiligenbrunner	5fde74eb15	update gradle version to 1.3.70	2020-03-06 08:39:33 +01:00
Lukas-Heiligenbrunner	4c018d567a	fix this calls of dashboard.js class and autoreload of tables	2020-02-28 16:53:43 +01:00
Lukas-Heiligenbrunner	76f5c36ba1	removed unused initializer converted Daterequest to kotlin	2020-02-28 16:35:55 +01:00
Lukas-Heiligenbrunner	022ae044ab	removed checked calls for JDBC and added connection check in JDBC class itself	2020-02-28 16:06:04 +01:00
Lukas-Heiligenbrunner	aa023aeb95	compile also kotlin plugin into jar	2020-02-28 12:16:29 +01:00
Lukas-Heiligenbrunner	8b1d2bd583	release version 1.0.0	2020-02-28 11:59:16 +01:00
Lukas-Heiligenbrunner	e28cfd4a20	added new page to shedule tasks	2020-02-28 11:55:30 +01:00
Lukas-Heiligenbrunner	c839c8506c	sidebar values improvement load header data on devicepage	2020-02-28 11:48:41 +01:00
root	8e4aad4691	removed useless gradle instance	2020-02-28 09:33:03 +01:00
Lukas-Heiligenbrunner	3a1cff0895	Merge pull request #2 from IngProjDutzlerHeiligenbrunnerMeindl/DutziTest new Text icons	2020-02-28 09:27:39 +01:00
Lukas-Heiligenbrunner	32633221f1	removed useless idea files	2020-02-28 09:24:33 +01:00
Lukas-Heiligenbrunner	cb5db3dddd	ids as Value and not String	2020-02-28 09:13:42 +01:00
gdutzler	2c82d5fb43	deleted useless files reformatting	2020-02-28 08:53:57 +01:00
gdutzler	c5ff6cd2aa	eine Zeile	2020-02-28 08:43:17 +01:00
Lukas-Heiligenbrunner	fbc53b97f5	added travis to build	2020-02-14 16:52:24 +01:00
Lukas Heiligenbrunner	99961e18c5	delete idea files	2020-02-14 08:38:11 +01:00
Lukas-Heiligenbrunner	26d4284169	removed dead code	2020-02-11 08:31:25 +01:00
Lukas-Heiligenbrunner	026cf1a51a	added this to reload table	2020-02-10 11:32:09 +01:00
Lukas-Heiligenbrunner	7e8a857caf	define class for AdminPanel	2020-02-10 11:16:44 +01:00
Lukas-Heiligenbrunner	1238a121f4	define class for device	2020-02-10 11:10:37 +01:00
Lukas-Heiligenbrunner	98b3c69c15	define class for dashboard	2020-02-10 10:52:49 +01:00
Lukas-Heiligenbrunner	9cf713ab4a	Merge pull request #1 from IngProjDutzlerHeiligenbrunnerMeindl/kotlin Kotlin	2020-02-10 10:18:04 +01:00
Lukas-Heiligenbrunner	04ecbd1375	updated Datarequest to kotlin	2020-02-10 10:17:01 +01:00
gdutzler	aaa0600af4	Stand 7.2.2020 ICON	2020-02-07 16:48:05 +01:00
Lukas-Heiligenbrunner	0bf021ab5a	userinforeqest	2020-01-31 16:37:52 +01:00
Lukas-Heiligenbrunner	4fe1b0c6ae	userinforeqest	2020-01-31 16:34:24 +01:00
lukas-heiligenbrunner	1dc2aa1022	userinforeqest	2020-01-31 11:32:25 +01:00
lukas-heiligenbrunner	daf440e36b	login request setup all fields provided by db updated loginrequest to kotlin	2020-01-31 10:28:39 +01:00
lukas-heiligenbrunner	22a9a5b612	alter parts to kotlin better error handling on register request	2020-01-31 10:01:09 +01:00
lukas-heiligenbrunner	02dff914ca	alter mqttservice to gradle	2020-01-31 09:37:06 +01:00
lukas-heiligenbrunner	5e42eeb2ae	alter language to kotlin	2020-01-31 09:17:12 +01:00
lukas-heiligenbrunner	02e6f96a3a	reformat dashboard js code to subfunctions	2020-01-31 08:31:04 +01:00
lukas-heiligenbrunner	e5d579e9d0	javadoc	2020-01-30 15:04:42 +01:00
lukas-heiligenbrunner	339ba9861b	class javadoc	2020-01-23 19:03:47 +01:00
lukas-heiligenbrunner	10058b24a7	javadoc improved data encapsulation	2020-01-23 18:32:29 +01:00
lukas-heiligenbrunner	cdb03ada81	jar generation filename fix	2020-01-23 18:15:41 +01:00
lukas-heiligenbrunner	7207f39892	Version 0.3.1-Beta	2020-01-23 18:06:03 +01:00
lukas-heiligenbrunner	a9cf947670	log improvements	2020-01-23 17:33:40 +01:00
lukas-heiligenbrunner	664ba5e28b	multiple replies on device request with more than one city provided	2020-01-23 17:33:00 +01:00
lukas-heiligenbrunner	d34b43f61a	enable multiple cities per device applied db entries on add btn click	2020-01-23 17:10:22 +01:00
lukas-heiligenbrunner	c590b612b5	some name and warning fixings	2020-01-20 18:20:37 +01:00
lukas-heiligenbrunner	81e79c1e67	adding info to db	2020-01-18 11:02:00 +01:00
lukas-heiligenbrunner	7f62fc9bec	add button for adding new zone infos to device	2020-01-18 10:17:33 +01:00
lukas-heiligenbrunner	fa16d1206b	waste zone/type/city info on device page	2020-01-18 08:42:08 +01:00
lukas-heiligenbrunner	ce44ee5d17	version 0.3.0-Beta	2020-01-16 21:24:21 +01:00
lukas-heiligenbrunner	23f75cae4f	correctly configure new devices edit data in db correctly response correctly to requests	2020-01-16 21:12:05 +01:00
lukas-heiligenbrunner	b9ba0dbcef	load devices in table configure popup for devices	2020-01-16 17:27:16 +01:00
lukas-heiligenbrunner	92ef4cc0c6	* added table to device page * request devices from js from db	2020-01-13 21:00:33 +01:00
lukas-heiligenbrunner	ac02e4bd62	* added some todos	2020-01-12 14:05:28 +01:00
lukas-heiligenbrunner	c3fb92d6eb	* changed city zone handling to server instead of pcb	2020-01-12 13:22:31 +01:00
lukas-heiligenbrunner	05b15a1ea2	* style improvements in mqtt	2020-01-12 11:32:33 +01:00
lukas-heiligenbrunner	86dc38a8da	* Waste logo on every page * username displayed right on every page	2020-01-12 11:23:47 +01:00
lukas-heiligenbrunner	7c8a0d3018	* mqtt service cleanup * removed unused methods	2020-01-12 11:23:05 +01:00
lukas-heiligenbrunner	4b96ad576d	cleanup in mqtt methods deleted unneccessary classes	2020-01-10 18:45:32 +01:00
lukas-heiligenbrunner	f7383474ac	* fixed multiple username bug * added table to devices page	2020-01-10 18:18:06 +01:00