Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
idatt2106_2024_02_frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IDATT2106 - Gruppe 2
idatt2106_2024_02_frontend
Commits
ecb80f6a
Commit
ecb80f6a
authored
10 months ago
by
Ina Martini
Browse files
Options
Downloads
Patches
Plain Diff
chore: run format checks
parent
8d5c15d3
No related branches found
No related tags found
3 merge requests
!66
Final merge
,
!42
Refactor interactiveSpare to modal
,
!4
Pipeline fix
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/views/EditProfileView.vue
+1
-5
1 addition, 5 deletions
src/views/EditProfileView.vue
src/views/ProfileView.vue
+7
-8
7 additions, 8 deletions
src/views/ProfileView.vue
src/views/ViewGoalView.vue
+7
-7
7 additions, 7 deletions
src/views/ViewGoalView.vue
with
15 additions
and
20 deletions
src/views/EditProfileView.vue
+
1
−
5
View file @
ecb80f6a
...
...
@@ -52,10 +52,6 @@ const isSavingAccountValid = computed(() =>
accountNumberRegex
.
test
(
profile
.
value
.
savingAccount
.
accNumber
?.
toString
()
||
''
)
)
const
openInteractiveSpare
=
()
=>
{
isModalOpen
.
value
=
true
// Open the modalReset the flag since the speech will now be displayed
}
const
isFormInvalid
=
computed
(
()
=>
[
...
...
@@ -215,7 +211,7 @@ const saveChanges = async () => {
:png-size=
"10"
:speech=
"['Her kan du endre på profilen din!']"
direction=
"left"
:isModalOpen=
"
openInteractiveSpare
"
:isModalOpen=
"
isModalOpen
"
/>
<CardTemplate>
...
...
This diff is collapsed.
Click to expand it.
src/views/ProfileView.vue
+
7
−
8
View file @
ecb80f6a
...
...
@@ -48,7 +48,6 @@ const welcome = computed(() => {
const
openInteractiveSpare
=
()
=>
{
isModalOpen
.
value
=
true
}
</
script
>
<
template
>
...
...
@@ -100,13 +99,13 @@ const openInteractiveSpare = () => {
:isModalOpen=
"isModalOpen"
/>
<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>
<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>
<div
class=
"flex flex-row justify-between mx-4"
>
<p
class=
"font-bold"
>
Fullførte sparemål
</p>
...
...
This diff is collapsed.
Click to expand it.
src/views/ViewGoalView.vue
+
7
−
7
View file @
ecb80f6a
...
...
@@ -132,13 +132,13 @@ const completeGoal = () => {
</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>
<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>
<InteractiveSpare
:png-size=
"10"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment