From 3a6a815ac05f63626b651d3831b76e0c30cd45a1 Mon Sep 17 00:00:00 2001
From: Thiemann96 <e_thie10@uni-muenster.de>
Date: Wed, 11 Mar 2020 01:14:10 +0100
Subject: [PATCH] added translations for login and reordered menu components

---
 src/app/app.component.ts             | 10 +++++-----
 src/assets/i18n/de.json              | 19 ++++++++++++++++++-
 src/assets/i18n/en.json              | 18 ++++++++++++++++--
 src/pages/ota-wizard/ota-wizard.scss |  3 +--
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 8b42a75..51a70b3 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -23,6 +23,11 @@ export class openSenseApp {
       icon: 'code',
       component: 'BlocklyPage'
     },
+    {
+      title: 'MENU.MYSENSEBOX',
+      icon: "person",
+      component : 'LoginPage'
+    },
     {
       title: 'MENU.DOCS',
       icon: 'book',
@@ -39,11 +44,6 @@ export class openSenseApp {
       title: 'MENU.SETTINGS',
       icon: 'settings',
       component: 'SettingsPage'
-    },
-    {
-      title: 'MENU.MYSENSEBOX',
-      icon: "person",
-      component : 'LoginPage'
     }
   ];
 
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index ffb96ad..d9f5655 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -5,7 +5,8 @@
     "ABOUT": "Über",
     "BLOCKLY": "Blockly",
     "DOCS": "Dokumentation",
-    "SETTINGS": "Einstellungen"
+    "SETTINGS": "Einstellungen",
+    "MYSENSEBOX":"Meine senseBox"
   },
   "ABOUT": {
     "TITLE": "Über",
@@ -25,6 +26,22 @@
     "BTN_CODE": "Quellcode Ansicht",
     "BTN_OTA": "OTA Upload"
   },
+  "CONFIG":{
+    "WIFI":"WiFi Einstellungen",
+    "IDS":"senseBox und Sensor ID's",
+    "DEBUG":"Debugging einschalten",
+    "BTN_UPLOAD":"Sketch hochladen!"
+  },
+  "MYSENSEBOX":{
+    "TITLE":"Meine senseBox",
+    "SHOW":"Zeige Sensoren",
+    "SKETCH":"Sketch hochladen",
+    "EXPOSURE":"Position"
+  },
+  "SENSORS":{
+    "TYP":"Typ",
+    "MEASUREMENT":"Letzte Messung"
+  },
   "SETTINGS": {
     "TITLE": "Einstellungen",
     "LANGUAGE": {
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index b0b7363..da0b5e8 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -5,7 +5,8 @@
     "ABOUT": "About",
     "BLOCKLY": "Blockly",
     "DOCS": "Documentation",
-    "SETTINGS": "Settings"
+    "SETTINGS": "Settings",
+    "MYSENSEBOX": "My senseBox"
   },
   "ABOUT": {
     "TITLE": "About",
@@ -25,6 +26,16 @@
     "BTN_CODE": "Code View",
     "BTN_OTA": "OTA Programmer"
   },
+  "MYSENSEBOX":{
+    "TITLE":"My senseBox",
+    "SHOW":"Show sensors",
+    "SKETCH":"Upload Sketch",
+    "EXPOSURE":"Exposure"
+  },
+  "SENSORS":{
+    "TYP":"Type",
+    "MEASUREMENT":"Last measurement"
+  },
   "SETTINGS": {
     "TITLE": "Settings",
     "LANGUAGE": {
@@ -100,6 +111,9 @@
   },
   "CONFIG":{
     "TITLE":"Initial configuration",
-    "BUTTON":"Upload!"
+    "BUTTON":"Upload Sketch!",
+    "WIFI":"Configure WiFi Settings",
+    "IDS":"senseBox and sensor ID's",
+    "DEBUG":"Enable debugging"
   }
 }
diff --git a/src/pages/ota-wizard/ota-wizard.scss b/src/pages/ota-wizard/ota-wizard.scss
index 2670d4c..b4c3d9c 100644
--- a/src/pages/ota-wizard/ota-wizard.scss
+++ b/src/pages/ota-wizard/ota-wizard.scss
@@ -7,8 +7,7 @@ page-ota-wizard {
 
   .tutorial_gif {
     border-radius: 25px;
-    box-shadow: 10px 10px 8px #888888;
-    }
+   }
 
   ion-slide {
     h4 {