fix(merge):
Fixed merge
No related branches found
No related tags found
Showing
- cypress/e2e/homeView.cy.ts 20 additions, 1 deletioncypress/e2e/homeView.cy.ts
- src/assets/base.css 0 additions, 6 deletionssrc/assets/base.css
- src/assets/hjelp.png 0 additions, 0 deletionssrc/assets/hjelp.png
- src/assets/sti.png 0 additions, 0 deletionssrc/assets/sti.png
- src/assets/varsel.png 0 additions, 0 deletionssrc/assets/varsel.png
- src/components/CardChallengeSavingsPath.vue 1 addition, 3 deletionssrc/components/CardChallengeSavingsPath.vue
- src/components/CardTemplate.vue 0 additions, 0 deletionssrc/components/CardTemplate.vue
- src/components/ContinueButtonComponent.vue 8 additions, 1 deletionsrc/components/ContinueButtonComponent.vue
- src/components/GeneratedChallengesModal.vue 134 additions, 0 deletionssrc/components/GeneratedChallengesModal.vue
- src/components/InteractiveSpare.vue 75 additions, 28 deletionssrc/components/InteractiveSpare.vue
- src/components/ModalComponent.vue 2 additions, 2 deletionssrc/components/ModalComponent.vue
- src/components/NavBarComponent.vue 1 addition, 1 deletionsrc/components/NavBarComponent.vue
- src/components/SavingsPath.vue 307 additions, 182 deletionssrc/components/SavingsPath.vue
- src/components/__tests__/InteractiveSpareTest.spec.ts 16 additions, 11 deletionssrc/components/__tests__/InteractiveSpareTest.spec.ts
- src/components/__tests__/NavBarTest.spec.ts 0 additions, 123 deletionssrc/components/__tests__/NavBarTest.spec.ts
- src/router/index.ts 67 additions, 15 deletionssrc/router/index.ts
- src/services/authInterceptor.ts 8 additions, 11 deletionssrc/services/authInterceptor.ts
- src/stores/accountStore.ts 0 additions, 35 deletionssrc/stores/accountStore.ts
- src/stores/goalStore.ts 10 additions, 2 deletionssrc/stores/goalStore.ts
- src/stores/userConfigStore.ts 85 additions, 41 deletionssrc/stores/userConfigStore.ts
Loading
Please register or sign in to comment