Merge branch 'master' of https://github.com/LukasNowy/SmartShopper

express-server/public/javascripts/ajax.js

@@ -346,7 +346,12 @@ function Detail() {
                                         `);
                                                 for (let x = 0; x < el.content.length; x++) {
                                                     const el2 = el.content[x]
-                                                    $(`.${el.name}`).append(`<div class="collapse" id="${el.name}"><ul><li>${el2.count}x ${el2.name}</li></ul></div>`);
+                                                    $(`.${el.name}`).append(`<div class="collapse" id="${el.name}">
+                                                    <div class="card itemcard" style="background-color: transparent; ">
+                                                    <div class="card-body">
+                                                    ${el2.name}${el2.count}
+                                                  </div>
+                                                    </div>`);
                                                 }
                                             }
                                             lala();

express-server/public/javascripts/login.js

@@ -22,7 +22,7 @@ function checkAuth() {
           console.error("Get id token client error: ", error)
         });
       } catch {
-        console.error("checkAuth error: ")
+        console.error("checkAuth error: ");
       }
 
       // document.getElementById("loginbutton").style.display = "none";
@@ -31,8 +31,7 @@ function checkAuth() {
       // document.getElementById("loginbutton").style.display = "block";
       console.log("Check Auth error", user)
     }
-  })
-  var user = firebase.auth().currentUser;
+  });
 }
 window.onload = function () {
   checkAuth();

express-server/public/stylesheets/style.css

@@ -94,4 +94,8 @@ button:focus{
 .btn:focus, .btn:active {
     outline: none !important;
     box-shadow: none !important;
+}
+
+.itemcard{
+    height: 2%;
 }