diff --git a/src/views/ViewChallengeView.vue b/src/views/ViewChallengeView.vue index fcdab7e74f067d141f509ad07dbaafb6b9631746..9bcd4baf83e6b36e888abad23bbaa72903748362 100644 --- a/src/views/ViewChallengeView.vue +++ b/src/views/ViewChallengeView.vue @@ -6,6 +6,7 @@ import authInterceptor from '@/services/authInterceptor' import type { Challenge } from '@/types/challenge' import InteractiveSpare from '@/components/InteractiveSpare.vue' import SpareComponent from '@/components/SpareComponent.vue' +import HelpComponent from "@/components/HelpComponent.vue"; const router = useRouter() @@ -29,6 +30,7 @@ const completion = computed( const isCompleted = computed(() => challengeInstance.value.completedOn != null) const motivation = ref<string[]>([]) +const helpSpeech = ref<string[]>([]) const calculateSpeech = () => { if (completion.value === 0) { @@ -80,6 +82,15 @@ const completeChallenge = () => { console.error(error) }) } + +const openHelp = () => { + helpSpeech.value = [ + `Her kan du se en oversikt over din spareutfordring: ${challengeInstance.value.title}`, + 'Du kan se hvor mye du har spart, hvor mye du har igjen til mÃ¥let, og hvor mange ganger du har spart.', + `Du kan ogsÃ¥ redigere utfordringen, slette den eller markere den som ferdig.`, + `Du har spart ${challengeInstance.value.saved}kr av ${challengeInstance.value.target}kr, som er ${timesSaved.value} ganger âš¡ï¸` + ] +} </script> <template> @@ -154,6 +165,7 @@ const completeChallenge = () => { class="mb-5" ></SpareComponent> </div> + <HelpComponent :speech="helpSpeech" @openHelp="openHelp"></HelpComponent> </template> <style scoped> diff --git a/src/views/ViewGoalView.vue b/src/views/ViewGoalView.vue index c6562932621f69a1da40f538ec090c783c57526e..c8ffbe738897fac90d2ae60a63df2b0e6f918e96 100644 --- a/src/views/ViewGoalView.vue +++ b/src/views/ViewGoalView.vue @@ -6,6 +6,7 @@ import authInterceptor from '@/services/authInterceptor' import type { Goal } from '@/types/goal' import InteractiveSpare from '@/components/InteractiveSpare.vue' import SpareComponent from '@/components/SpareComponent.vue' +import HelpComponent from "@/components/HelpComponent.vue"; const router = useRouter() @@ -23,8 +24,11 @@ const isCompleted = computed(() => goalInstance.value.completedOn != null) const motivation = ref<string[]>([]) const isModalOpen = ref(false) +const helpSpeech = ref<string[]>([]) + const openInteractiveSpare = () => { isModalOpen.value = true + calculateSpeech() } const calculateSpeech = () => { @@ -51,10 +55,6 @@ const calculateSpeech = () => { } } -const openSpare = () => { - calculateSpeech() -} - onMounted(() => { const goalId = router.currentRoute.value.params.id if (!goalId) return router.push({ name: 'goals' }) @@ -77,6 +77,15 @@ const completeGoal = () => { console.error(error) }) } + +const openHelp = () => { + helpSpeech.value = [ + `Her kan du se en oversikt over ditt sparemÃ¥l: ${goalInstance.value.title}`, + 'Du kan redigere mÃ¥let, markere det som ferdig eller slette det', + 'Du kan ogsÃ¥ se hvor mye du har spart av mÃ¥let ditt, og hvor mye du har igjen', + `Du har spart ${goalInstance.value.saved}kr av ${goalInstance.value.target}kr, bra jobbet 🥂` + ] +} </script> <template> @@ -136,24 +145,16 @@ const completeGoal = () => { </button> </div> </div> - <div class="flex items-center"> - <a @click="openInteractiveSpare" class="hover:bg-transparent z-20"> - <img - alt="Spare" - class="scale-x-[-1] md:h-5/6 md:w-5/6 w-2/3 h-2/3 cursor-pointer ml-14 md:ml-10" - src="@/assets/spare.png" - /> - </a> - </div> <SpareComponent :speech="motivation" :png-size="15" :imageDirection="'left'" :direction="'right'" - @openSpare="openSpare" + @openSpare="openInteractiveSpare" class="mb-5" ></SpareComponent> </div> + <HelpComponent :speech="helpSpeech" @openHelp="openHelp"></HelpComponent> </template> <style scoped>