Skip to content
Snippets Groups Projects
Commit ddf7cbf8 authored by Ina Martini's avatar Ina Martini
Browse files

chore: ran format

parent a58aec0a
No related branches found
No related tags found
3 merge requests!66Final merge,!57General cleanup of application,!4Pipeline fix
Pipeline #284024 failed
Stage: install
Stage: lint_and_format
Stage: build
Stage: test
Stage: security_scan
Hide whitespace changes
Inline Side-by-side
src/views/ManageConfigView.vue
+ 5
− 1
View file @ ddf7cbf8
...@@ -159,7 +159,11 @@ onMounted(() => { ...@@ -159,7 +159,11 @@ onMounted(() => {
class="flex flex-row flex-wrap justify-center gap-5 border-2 p-4" 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.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" /> <input v-model="item.generalAmount" placeholder="Pris per uke" type="number" />
<button <button
class="primary danger w-min items-center" class="primary danger w-min items-center"
......
src/views/ManageGoalView.vue
+ 83
− 81
View file @ ddf7cbf8
...@@ -255,95 +255,97 @@ onMounted(async () => { ...@@ -255,95 +255,97 @@ onMounted(async () => {
</div> </div>
<ProgressBar :completion="completion" /> <ProgressBar :completion="completion" />
<div class="flex flex-row gap-4"> <div class="flex flex-row gap-4">
<div class="flex flex-col"> <div class="flex flex-col">
<p class="mx-4">Forfallsdato*</p> <p class="mx-4">Forfallsdato*</p>
<input <input
:min="minDate" :min="minDate"
v-model="selectedDate" v-model="selectedDate"
placeholder="Forfallsdato" placeholder="Forfallsdato"
type="date" type="date"
/> />
</div> </div>
<div class="flex flex-col items-center"> <div class="flex flex-col items-center">
<p>Last opp ikon for utfordringen📸</p> <p>Last opp ikon for utfordringen📸</p>
<label <label
for="fileUpload" for="fileUpload"
class="bg-white text-black text-lg p-1 mt-2 rounded cursor-pointer leading-none" 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"
> >
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>
</div>
<div class="flex flex-row justify-between w-full"> <div class="flex flex-row justify-between w-full">
<button <button
v-if="isEdit" v-if="isEdit"
class="ml-2 primary danger" class="ml-2 primary danger"
@click="deleteGoal" @click="deleteGoal"
v-text="'Slett'" v-text="'Slett'"
/> />
<button <button
v-else v-else
class="ml-2 primary danger" class="ml-2 primary danger"
@click="cancelCreation" @click="cancelCreation"
v-text="'Avbryt'" v-text="'Avbryt'"
/> />
<button class="primary" @click="submitAction" v-text="submitButton" /> <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> </div>
<ModalComponent <div
:title="modalTitle" 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"
:message="modalMessage"
:isModalOpen="errorModalOpen"
@close="errorModalOpen = false"
> >
<template v-slot:buttons> <InteractiveSpare
<button class="primary" @click="errorModalOpen = false">Lukk</button> :png-size="10"
</template> :speech="[
</ModalComponent> 'Her kan du lage et sparemål! 💎',
`Trenger du hjelp? Trykk på ❓ nede i høyre hjørne!`
<ModalComponent ]"
:title="modalTitle" direction="left"
:message="modalMessage" />
:isModalOpen="confirmModalOpen" </div>
@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"
/>
</div> </div>
</div> </div>
</div>
</template> </template>
<style scoped> <style scoped>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment