Renting is now good

src/components/CommunityComponents/CommunityHome.vue

@@ -48,7 +48,6 @@
 <script>
 import CommunityHeader from "@/components/CommunityComponents/CommunityHeader.vue";
 import ItemCard from "@/components/ItemComponents/ItemCard";
-import CommunityHeader from "@/components/BaseComponents/CommunityHeader";
 import {
   GetCommunity,
   GetListingsInCommunity,

src/components/FormComponents/NewPasswordForm.vue

@@ -2,16 +2,11 @@
   <div
     class="md:ring-1 ring-gray-300 rounded-xl overflow-hidden mx-auto mb-auto max-w-md w-full p-4"
   >
-<<<<<<< HEAD
-
-    <div class="text-2xl font-medium text-center text-gray-600 dark:text-gray-200 mt-4 mb-8">Endre passord</div>
-=======
     <h3
       class="text-xl font-medium text-center text-gray-600 dark:text-gray-200 mt-4 mb-8"
     >
       Endre passord
     </h3>
->>>>>>> b2d672f737c091606c38e81d3ba3e42b5de37d00
 
     <div
       id="firstPasswordField"

src/components/FormComponents/ResetPasswordForm.vue

 <template>
-<<<<<<< HEAD
-  <div class="md:ring-1 ring-gray-300 rounded-xl overflow-hidden mx-auto mb-auto max-w-md w-full p-4">
-
-    <div class="text-2xl font-medium text-center text-gray-600 dark:text-gray-200 mt-4 mb-8">Glemt passordet ditt?</div>
-=======
   <div
     class="md:ring-1 ring-gray-300 rounded-xl overflow-hidden mx-auto mb-auto max-w-md w-full p-4"
   >
@@ -12,7 +7,6 @@
     >
       Glemt passordet ditt?
     </h3>
->>>>>>> b2d672f737c091606c38e81d3ba3e42b5de37d00
 
     <div
       id="emailField"

src/components/ItemComponents/NewItemForm.vue

@@ -3,15 +3,11 @@
     class="md:ring-1 ring-gray-300 rounded-xl overflow-hidden mx-auto mb-auto max-w-md w-full p-4"
   >
     <!-- Component heading -->
-<<<<<<< HEAD
-    <div class="text-xl md:text-2xl font-medium text-center text-gray-600 dark:text-gray-200 mt-4 mb-10">Opprett ny utleie</div>
-=======
     <h3
       class="text-xl font-medium text-center text-gray-600 dark:text-gray-200 mt-4 mb-8"
     >
       Opprett ny utleie
     </h3>
->>>>>>> b2d672f737c091606c38e81d3ba3e42b5de37d00
 
     <!-- Title -->
     <div class="mb-6" :class="{ error: v$.item.title.$errors.length }">

src/components/RentingComponents/ItemInfo.vue

@@ -141,8 +141,10 @@ export default {
   },
   methods: {
     sendToConfirm(){
+      if (this.allowForRent) {
       this.confirm = true;
       this.createPushItem();
+      }
     },
     createPushItem(){
       this.pushItem.listingID = this.item.listingID;
@@ -199,12 +201,6 @@ export default {
       amountOfDays = amountOfDays / 86400000;
       this.totPrice = this.item.pricePerDay * amountOfDays;
     },
-    sendToConfirm() {
-      if (this.allowForRent) {
-        //TODO change this to a componet change
-        alert("Hei");
-      }
-    },
   },
   async beforeMount() {
     await this.getItemPictures();