From e97fb4ce2ec560db2d00cbb1bf94cd15e7ba8fe3 Mon Sep 17 00:00:00 2001
From: LukasNowy <nowy492l@htl-ottakring.ac.at>
Date: Mon, 18 Feb 2019 09:26:12 +0100
Subject: [PATCH] ocr design fix

---
 express-server/public/ocrscan/ocrscan.js | 40 --------------------
 express-server/public/ocrscan/style.css  | 48 ++++++++++++++++++++++--
 express-server/views/ocrscan.ejs         |  2 +-
 3 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/express-server/public/ocrscan/ocrscan.js b/express-server/public/ocrscan/ocrscan.js
index 693ed28b..2d47ee85 100644
--- a/express-server/public/ocrscan/ocrscan.js
+++ b/express-server/public/ocrscan/ocrscan.js
@@ -44,8 +44,6 @@ var config = {
   firebase.initializeApp(config);
 
   getAllShoppinglists();
-  //updateUser();
-  displayShoppinglist();
 
 function movePurchases(text) {
     firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
@@ -189,41 +187,3 @@ var loading = false;
 }
 */
 
-
-
-function updateUser() {
-    firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
-        $.ajax({
-            type: "POST",
-            url: "/user",
-            data:{
-                idtoken: idtoken,
-                message_id: "msgtest"
-            },
-            success(){
-                console.log("USer updated");
-            },
-            error(err){
-                console.error("Error: " + err);
-            }
-        });
-    }).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
-}
-
-function displayShoppinglist() {
-    firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
-        $.ajax({
-            type: "GET",
-            url: "/shoppinglist_json/4tezJYMK",
-            data:{
-                idtoken: idtoken
-            },
-            success(data){
-                console.log("Result: ", data.sl_id);
-            },
-            error(err){
-                console.error("Error: " + err);
-            }
-        });
-    }).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
-}
\ No newline at end of file
diff --git a/express-server/public/ocrscan/style.css b/express-server/public/ocrscan/style.css
index bd7b7979..2c54c98f 100644
--- a/express-server/public/ocrscan/style.css
+++ b/express-server/public/ocrscan/style.css
@@ -10,29 +10,46 @@
 }
 
 .opt2 {
-    background-color: #039be5 ;
+    background-color: #039be5 !important;
     height: 100%;
     max-height: 100%;
     transition: 1s;
 }
 
 .opt2:hover {
-    background-color: #4fc3f7;
+    background-color: #4fc3f7 !important;
 }
 
 .r1 {
     height: 100%;
     max-height: 100%;
     margin-top: 100%;
+    transform: translateY(100%);
 }
 
+.r2 {
+    height: 100%;
+    max-height: 100%;
+    transform: translateY(100%);
+    background-color: #242424;
+}
+
+.row {
+    margin-bottom: 0px !important;
+    margin-top: 0px !important;
+}
+
+.container {
+    margin-bottom: 0px !important;
+    margin-top: 0px !important;
+}
 
 html, body {
     height: 100%;
     margin: 0;
     max-height: 100%;
     overflow: hidden;
-    background-color: #161616;
+    background-color: #242424;
   }
 
 .ico {
@@ -44,5 +61,30 @@ html, body {
 
 .collection .collection-item.active {
     /* background-color: #00c853; */
+    background-color: rgb(0, 195, 255);
+    color: rgb(24, 24, 24);
 
 }
+
+.collection .collection-item.active {
+    /* background-color: #00c853; */
+    background-color: rgb(0, 195, 255);
+    color: rgb(24, 24, 24);
+}
+
+.collection-item {
+    /* background-color: #00c853; */
+    color: rgb(24, 24, 24) !important;
+}
+
+.btn-choose {
+    width: 100%;
+}
+
+.progress .indeterminate {
+    background-color: #f4511e;
+}
+
+.progress {
+    background-color: #f8cfc3;
+} 
\ No newline at end of file
diff --git a/express-server/views/ocrscan.ejs b/express-server/views/ocrscan.ejs
index da936f68..3be46850 100644
--- a/express-server/views/ocrscan.ejs
+++ b/express-server/views/ocrscan.ejs
@@ -94,7 +94,7 @@
     </div>
     <div class="modal-footer">
             <a class="modal-close waves-effect waves-red btn-flat btndash">Return to Dashboard</a>
-      <a href="#!" class="modal-close waves-effect waves-green btn-flat btncont">Continue</a>
+      <a class="modal-close waves-effect waves-green btn-flat btncont">Continue</a>
     </div>
   </div>