diff --git a/src/components/CommunityComponents/CommunityHome.vue b/src/components/CommunityComponents/CommunityHome.vue index 6b6e61e3f617d627a1d924d8e0b0023163f55a29..4d38f647038c77ac982bcb1bbc12499b62ee4f9f 100644 --- a/src/components/CommunityComponents/CommunityHome.vue +++ b/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, diff --git a/src/components/FormComponents/NewPasswordForm.vue b/src/components/FormComponents/NewPasswordForm.vue index 08af584a9ba70659b568db1557a0e545681e938f..d13c08349360250ff4f0cf96b5f3faab00d7a841 100644 --- a/src/components/FormComponents/NewPasswordForm.vue +++ b/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" diff --git a/src/components/FormComponents/ResetPasswordForm.vue b/src/components/FormComponents/ResetPasswordForm.vue index b027fc071d3ec453b9c833b5e048e9c7bb90088b..a4c2d80e1533e2c7be82804041bd49208b4ab6be 100644 --- a/src/components/FormComponents/ResetPasswordForm.vue +++ b/src/components/FormComponents/ResetPasswordForm.vue @@ -1,9 +1,4 @@ <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" diff --git a/src/components/ItemComponents/NewItemForm.vue b/src/components/ItemComponents/NewItemForm.vue index 9eed3e86773e3ffe7e82ef642e4591fff3cc9a8a..40ed211d5bb5144aadc6da56d84c325f6d723e6d 100644 --- a/src/components/ItemComponents/NewItemForm.vue +++ b/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 }"> diff --git a/src/components/RentingComponents/ItemInfo.vue b/src/components/RentingComponents/ItemInfo.vue index a9d515cd6212c7e65c133132142bf027d25a72c6..b50cc23dd3d97c6c7b1325943bf2ce22cb56bafc 100644 --- a/src/components/RentingComponents/ItemInfo.vue +++ b/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();