diff --git a/src/views/ManageConfigView.vue b/src/views/ManageConfigView.vue index c928a18f66b8211acc57ffaef2d6011c8f4e85c0..508c96af766ff32f88271afd59d372f423b502d2 100644 --- a/src/views/ManageConfigView.vue +++ b/src/views/ManageConfigView.vue @@ -159,7 +159,11 @@ onMounted(() => { class="flex flex-row flex-wrap justify-center gap-5 border-2 p-4" > <input v-model="item.type" placeholder="Type" type="text" /> - <input v-model="item.specificAmount" placeholder="Generell pris" type="number" /> + <input + v-model="item.specificAmount" + placeholder="Generell pris" + type="number" + /> <input v-model="item.generalAmount" placeholder="Pris per uke" type="number" /> <button class="primary danger w-min items-center" diff --git a/src/views/ManageGoalView.vue b/src/views/ManageGoalView.vue index 88ee78fcfd99e9074ca82b43698d2090467d9171..c9e0d688752695d63e3338237215dd5329e311a8 100644 --- a/src/views/ManageGoalView.vue +++ b/src/views/ManageGoalView.vue @@ -255,95 +255,97 @@ onMounted(async () => { </div> <ProgressBar :completion="completion" /> - <div class="flex flex-row gap-4"> - <div class="flex flex-col"> - <p class="mx-4">Forfallsdato*</p> - <input - :min="minDate" - v-model="selectedDate" - placeholder="Forfallsdato" - type="date" - /> - </div> - <div class="flex flex-col items-center"> - <p>Last opp ikon for utfordringen📸</p> - <label - for="fileUpload" - class="bg-white text-black text-lg p-1 mt-2 rounded cursor-pointer leading-none" - > - 💾 - </label> - <input - id="fileUpload" - type="file" - accept=".jpg, .png" - hidden - @change="handleFileChange" - /> - <div v-if="uploadedFile" class="flex justify-center items-center mt-2"> - <p class="text-sm">{{ uploadedFile.name }}</p> - <button - @click="removeUploadedFile" - class="ml-2 text-xs font-bold border-2 p-1 rounded text-red-500" + <div class="flex flex-row gap-4"> + <div class="flex flex-col"> + <p class="mx-4">Forfallsdato*</p> + <input + :min="minDate" + v-model="selectedDate" + placeholder="Forfallsdato" + type="date" + /> + </div> + <div class="flex flex-col items-center"> + <p>Last opp ikon for utfordringen📸</p> + <label + for="fileUpload" + class="bg-white text-black text-lg p-1 mt-2 rounded cursor-pointer leading-none" > - Fjern fil - </button> + 💾 + </label> + <input + id="fileUpload" + type="file" + accept=".jpg, .png" + hidden + @change="handleFileChange" + /> + <div v-if="uploadedFile" class="flex justify-center items-center mt-2"> + <p class="text-sm">{{ uploadedFile.name }}</p> + <button + @click="removeUploadedFile" + class="ml-2 text-xs font-bold border-2 p-1 rounded text-red-500" + > + Fjern fil + </button> + </div> </div> </div> - </div> - <div class="flex flex-row justify-between w-full"> - <button - v-if="isEdit" - class="ml-2 primary danger" - @click="deleteGoal" - v-text="'Slett'" - /> - <button - v-else - class="ml-2 primary danger" - @click="cancelCreation" - v-text="'Avbryt'" - /> - <button class="primary" @click="submitAction" v-text="submitButton" /> + <div class="flex flex-row justify-between w-full"> + <button + v-if="isEdit" + class="ml-2 primary danger" + @click="deleteGoal" + v-text="'Slett'" + /> + <button + v-else + class="ml-2 primary danger" + @click="cancelCreation" + v-text="'Avbryt'" + /> + <button class="primary" @click="submitAction" v-text="submitButton" /> + </div> + <ModalComponent + :title="modalTitle" + :message="modalMessage" + :isModalOpen="errorModalOpen" + @close="errorModalOpen = false" + > + <template v-slot:buttons> + <button class="primary" @click="errorModalOpen = false">Lukk</button> + </template> + </ModalComponent> + + <ModalComponent + :title="modalTitle" + :message="modalMessage" + :isModalOpen="confirmModalOpen" + @close="confirmModalOpen = false" + > + <template v-slot:buttons> + <button class="primary" @click="confirmCancel">Bekreft</button> + <button class="primary danger" @click="confirmModalOpen = false"> + Avbryt + </button> + </template> + </ModalComponent> </div> - <ModalComponent - :title="modalTitle" - :message="modalMessage" - :isModalOpen="errorModalOpen" - @close="errorModalOpen = false" + <div + class="lg:absolute right-5 lg:top-1/4 max-lg:bottom-0 max-lg:mt-44 transform -translate-y-1/2 lg:w-1/4 lg:max-w-xs" > - <template v-slot:buttons> - <button class="primary" @click="errorModalOpen = false">Lukk</button> - </template> - </ModalComponent> - - <ModalComponent - :title="modalTitle" - :message="modalMessage" - :isModalOpen="confirmModalOpen" - @close="confirmModalOpen = false" - > - <template v-slot:buttons> - <button class="primary" @click="confirmCancel">Bekreft</button> - <button class="primary danger" @click="confirmModalOpen = false">Avbryt</button> - </template> - </ModalComponent> - </div> - <div - class="lg:absolute right-5 lg:top-1/4 max-lg:bottom-0 max-lg:mt-44 transform -translate-y-1/2 lg:w-1/4 lg:max-w-xs" - > - <InteractiveSpare - :png-size="10" - :speech="[ - 'Her kan du lage et sparemål! 💎', - `Trenger du hjelp? Trykk på ⓠnede i høyre hjørne!` - ]" - direction="left" - /> + <InteractiveSpare + :png-size="10" + :speech="[ + 'Her kan du lage et sparemål! 💎', + `Trenger du hjelp? Trykk på ⓠnede i høyre hjørne!` + ]" + direction="left" + /> + </div> </div> </div> - </div> </template> <style scoped>