From dcf49e98649978ca084daeedbbe549cd9bfe84a0 Mon Sep 17 00:00:00 2001
From: Ingrid Martinsheimen Egge <ingrimeg@stud.ntnu.no>
Date: Sat, 29 Apr 2023 10:10:27 +0200
Subject: [PATCH] =?UTF-8?q?Justerte=20plassering=20av=20knapper=20for=20?=
 =?UTF-8?q?=C3=A5=20unng=C3=A5=20overlapp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EatFridgeItemModal.vue | 10 ++++----
 src/components/FridgeItem.vue         |  2 +-
 src/components/ItemSearch.vue         |  5 ++--
 src/views/FridgeView.vue              | 37 +++++++++++++++++++++------
 4 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/src/components/EatFridgeItemModal.vue b/src/components/EatFridgeItemModal.vue
index 5bc0347..f3e6150 100644
--- a/src/components/EatFridgeItemModal.vue
+++ b/src/components/EatFridgeItemModal.vue
@@ -9,8 +9,8 @@
       <input type = "range" id = "slider" name = "slider" min="0" :max = "this.maxValue" v-model="sliderValue">
 
       <div id="buttons">
-          <button @click="logFoodAsDiscarded">Ble kastet 🗑️ </button>
-          <button id="eatenBtn" @click="logFoodAsEaten" >Ble spist 😋</button>
+          <button @click="logFoodAsDiscarded">Ble kastet</button>
+          <button id="eatenBtn" @click="logFoodAsEaten" >Ble spist</button>
       </div>
       <div v-if="isExpired" id = "itemHasExpiredMessage">
           <h2>Varen har gått ut på dato</h2>
@@ -105,7 +105,7 @@ export default {
 #popup {
   background-color: base.$white;
   color: black;
-  width: 70%;
+  width: 90%;
   padding:2em;
   display:flex;
   flex-direction: column;
@@ -126,7 +126,7 @@ export default {
 }
 
 #buttons {
-  justify-content: center;
+  justify-content: space-between;
   display: flex;
     width: 100%;
   margin: 1em;
@@ -143,7 +143,7 @@ export default {
 button {
   margin:.1em;
   font-weight: bolder;
-    width: 40%;
+    width: 50%;
     padding:1em;
   background-color: base.$red;
   color:white;
diff --git a/src/components/FridgeItem.vue b/src/components/FridgeItem.vue
index 824d58d..f755967 100644
--- a/src/components/FridgeItem.vue
+++ b/src/components/FridgeItem.vue
@@ -44,7 +44,7 @@ export default {
             const dateString = this.formatDate();
 
             if(expirationDays<0) {
-                return "Utgikk " + this.item.expiration
+                return "Utgikk " + dateString
             }
 
             switch (expirationDays){
diff --git a/src/components/ItemSearch.vue b/src/components/ItemSearch.vue
index c08c478..8a61e32 100644
--- a/src/components/ItemSearch.vue
+++ b/src/components/ItemSearch.vue
@@ -67,9 +67,10 @@ select {
 }
 
 #wrapper{
-    background-color: base.$grey;
+    background-color: base.$white;
     padding: 2em;
-    border-radius: 9%;
+   border: 3px dashed base.$light-green;
+
 
 }
 
diff --git a/src/views/FridgeView.vue b/src/views/FridgeView.vue
index f57303c..eb6c950 100644
--- a/src/views/FridgeView.vue
+++ b/src/views/FridgeView.vue
@@ -1,8 +1,10 @@
-<template>
+<template><h1>Kjøleskap</h1><br><br>
     <main>
-        <h1>Kjøleskap</h1><br><br>
+
         <ItemSearch v-if="searchVisible" @itemsAdded="updateFridge"></ItemSearch>
-        <div><p>{{this.fridgeMsg}}</p></div>
+
+
+        <div id = "fridgeMsg"><p>Melding fra kjøleskapet:</p><span>{{this.fridgeMsg}}</span></div>
         <eat-fridge-item-modal @closeModal="hideModal" v-if="visible" :fridge-item="selectedItem"></eat-fridge-item-modal>
 
         <div id = "itemContainer" >
@@ -40,7 +42,7 @@ export default {
           selectedItem: null,
           fridgeItems: [],
           searchVisible: false,
-          fridgeMsg: "fridge message:"
+          fridgeMsg: ""
       }
   },
   methods: {
@@ -53,6 +55,7 @@ export default {
         },
       showItemSearch() {
         this.searchVisible=!this.searchVisible;
+        window.scrollTo({ top: 0, behavior: 'smooth' });
       },
       hideItemSearch() {
           this.searchVisible=false;
@@ -64,7 +67,8 @@ export default {
           this.fridgeItems = await API.getFridgeItems();
           this.hideItemSearch();
           this.updateFridgeMessage("Varen ble lagt i kjøleskapet.")
-      }
+      },
+
   },
   async mounted() {
       this.fridgeItems = await API.getFridgeItems();
@@ -74,14 +78,17 @@ export default {
 
 <style scoped lang="scss">
 main {
-    padding-top: 4em;
+
     color:black;
-    background-color: base.$white;
+    background-color: base.$grey;
+    padding: 2em;
+    min-height: 600px;
 }
 
 h1 {
   width:100%;
   padding-left: 1em;
+  padding-top: 2em;
   font-weight: bold;
 }
 
@@ -109,10 +116,24 @@ h1 {
 }
 
 #addItemBtn-container {
-  padding-bottom: 9em;
+  padding-bottom: 3em;
   z-index: 9999;
   position: fixed;
   bottom: 15px;
   right: 1em;
 }
+
+#fridgeMsg {
+  background-color: base.$light-green;
+  padding: 1em;
+}
+
+#fridgeMsg span, #fridgeMsg p{
+
+  font-weight: bolder;
+  font-size: 1.2em;
+}
+
+
+
 </style>
\ No newline at end of file
-- 
GitLab