Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

idatt2106_2024_02_frontend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7faa3c43

Commit 7faa3c43 authored 11 months ago by Trygve Jørgensen

Downloads
- Plain Diff

Merge branch 'refs/heads/dev' into enhancement/ui-cleanup

# Conflicts:
#	src/components/NavBarComponent.vue

parents 039d98f4 44373427

No related branches found

No related tags found

3 merge requests!66Final merge,!24UI cleanup,!4Pipeline fix

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/App.vue 17 additions, 0 deletions

src/App.vue
src/components/FormLogin.vue 7 additions, 4 deletions

src/components/FormLogin.vue
src/components/FormRegister.vue 4 additions, 1 deletion

src/components/FormRegister.vue
src/router/index.ts 5 additions, 0 deletions

src/router/index.ts
src/stores/userConfigStore.ts 45 additions, 0 deletions

src/stores/userConfigStore.ts
src/views/ConfigFamiliarWithSavingsView.vue 24 additions, 1 deletion

src/views/ConfigFamiliarWithSavingsView.vue
src/views/ConfigHabitChangeView.vue 24 additions, 1 deletion

src/views/ConfigHabitChangeView.vue
src/views/ConfigSpendingItemsAmountView.vue 32 additions, 42 deletions

src/views/ConfigSpendingItemsAmountView.vue
src/views/ConfigSpendingItemsTotalAmountView.vue 34 additions, 40 deletions

src/views/ConfigSpendingItemsTotalAmountView.vue
src/views/ConfigSpendingItemsView.vue 58 additions, 36 deletions

src/views/ConfigSpendingItemsView.vue
src/views/ResetPasswordView.vue 1 addition, 1 deletion

src/views/ResetPasswordView.vue

with 251 additions and 126 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment