fix(merge):
fixed merge conflict
No related branches found
No related tags found
Showing
- src/App.vue 1 addition, 1 deletionsrc/App.vue
- src/components/ButtonAddGoalOrChallenge.vue 11 additions, 6 deletionssrc/components/ButtonAddGoalOrChallenge.vue
- src/components/FormLogin.vue 0 additions, 5 deletionssrc/components/FormLogin.vue
- src/components/FormRegister.vue 1 addition, 1 deletionsrc/components/FormRegister.vue
- src/components/GeneratedChallengesModal.vue 104 additions, 86 deletionssrc/components/GeneratedChallengesModal.vue
- src/components/ModalComponent.vue 6 additions, 2 deletionssrc/components/ModalComponent.vue
- src/components/__tests__/InteractiveSpareTest.spec.ts 2 additions, 0 deletionssrc/components/__tests__/InteractiveSpareTest.spec.ts
- src/router/index.ts 42 additions, 30 deletionssrc/router/index.ts
- src/services/authInterceptor.ts 7 additions, 17 deletionssrc/services/authInterceptor.ts
- src/stores/userStore.ts 125 additions, 121 deletionssrc/stores/userStore.ts
- src/types/challengeConfig.ts 9 additions, 0 deletionssrc/types/challengeConfig.ts
- src/types/profile.ts 1 addition, 0 deletionssrc/types/profile.ts
- src/views/BiometricLoginView.vue 23 additions, 2 deletionssrc/views/BiometricLoginView.vue
- src/views/ConfigBiometricView.vue 9 additions, 35 deletionssrc/views/ConfigBiometricView.vue
- src/views/HomeView.vue 32 additions, 45 deletionssrc/views/HomeView.vue
- src/views/ManageConfigView.vue 183 additions, 0 deletionssrc/views/ManageConfigView.vue
- src/views/ManageProfileView.vue 18 additions, 19 deletionssrc/views/ManageProfileView.vue
- src/views/ViewProfileView.vue 19 additions, 2 deletionssrc/views/ViewProfileView.vue
Loading
Please register or sign in to comment