Merge branch 'main' into 'test/e2e'
# Conflicts: # src/components/UserProfile/UserProfileLayout.vue
Showing
- README.md 18 additions, 3 deletionsREADME.md
- package-lock.json 3334 additions, 99 deletionspackage-lock.json
- package.json 3 additions, 0 deletionspackage.json
- spec.json 355 additions, 146 deletionsspec.json
- src/api/index.ts 9 additions, 3 deletionssrc/api/index.ts
- src/api/models/BadgeDTO.ts 11 additions, 0 deletionssrc/api/models/BadgeDTO.ts
- src/api/models/ChallengeDTO.ts 9 additions, 5 deletionssrc/api/models/ChallengeDTO.ts
- src/api/models/ChallengeTemplateDTO.ts 31 additions, 0 deletionssrc/api/models/ChallengeTemplateDTO.ts
- src/api/models/CreateGoalDTO.ts 1 addition, 1 deletionsrc/api/models/CreateGoalDTO.ts
- src/api/models/GoalDTO.ts 3 additions, 4 deletionssrc/api/models/GoalDTO.ts
- src/api/models/InventoryDTO.ts 11 additions, 0 deletionssrc/api/models/InventoryDTO.ts
- src/api/models/ItemDTO.ts 12 additions, 0 deletionssrc/api/models/ItemDTO.ts
- src/api/models/MarkChallengeDTO.ts 4 additions, 3 deletionssrc/api/models/MarkChallengeDTO.ts
- src/api/models/ProgressDTO.ts 3 additions, 2 deletionssrc/api/models/ProgressDTO.ts
- src/api/services/BadgeService.ts 80 additions, 0 deletionssrc/api/services/BadgeService.ts
- src/api/services/BudgetService.ts 202 additions, 0 deletionssrc/api/services/BudgetService.ts
- src/api/services/GoalService.ts 44 additions, 10 deletionssrc/api/services/GoalService.ts
- src/api/services/ItemService.ts 57 additions, 0 deletionssrc/api/services/ItemService.ts
- src/api/services/LeaderboardService.ts 12 additions, 0 deletionssrc/api/services/LeaderboardService.ts
- src/api/services/UserService.ts 0 additions, 193 deletionssrc/api/services/UserService.ts
Loading
Please register or sign in to comment