fix(merge)
resolved merge conflicts
Showing
- cypress/e2e/register.cy.ts 2 additions, 2 deletionscypress/e2e/register.cy.ts
- src/App.vue 3 additions, 2 deletionssrc/App.vue
- src/assets/star.png 0 additions, 0 deletionssrc/assets/star.png
- src/components/CardChallengeSavingsPath.vue 98 additions, 82 deletionssrc/components/CardChallengeSavingsPath.vue
- src/components/FormLogin.vue 62 additions, 70 deletionssrc/components/FormLogin.vue
- src/components/FormRegister.vue 9 additions, 9 deletionssrc/components/FormRegister.vue
- src/components/HelpComponent.vue 6 additions, 8 deletionssrc/components/HelpComponent.vue
- src/components/ModalComponent.vue 9 additions, 1 deletionsrc/components/ModalComponent.vue
- src/components/SavingsPath.vue 25 additions, 10 deletionssrc/components/SavingsPath.vue
- src/components/__tests__/FormRegisterTest.spec.ts 6 additions, 6 deletionssrc/components/__tests__/FormRegisterTest.spec.ts
- src/router/index.ts 1 addition, 5 deletionssrc/router/index.ts
- src/services/authInterceptor.ts 2 additions, 1 deletionsrc/services/authInterceptor.ts
- src/stores/userConfigStore.ts 63 additions, 59 deletionssrc/stores/userConfigStore.ts
- src/stores/userStore.ts 21 additions, 23 deletionssrc/stores/userStore.ts
- src/types/profile.ts 1 addition, 0 deletionssrc/types/profile.ts
- src/types/user.ts 2 additions, 2 deletionssrc/types/user.ts
- src/views/BiometricLoginView.vue 5 additions, 3 deletionssrc/views/BiometricLoginView.vue
- src/views/ConfigAccountNumberView.vue 5 additions, 7 deletionssrc/views/ConfigAccountNumberView.vue
- src/views/ConfigBiometricView.vue 6 additions, 1 deletionsrc/views/ConfigBiometricView.vue
- src/views/ConfigSpendingItemsAmountView.vue 2 additions, 2 deletionssrc/views/ConfigSpendingItemsAmountView.vue
Loading
Please register or sign in to comment