Merge branch 'main' into 'image-community'
# Conflicts: # src/components/CommunityComponents/NewCommunityForm.vue # tests/unit/component-tests/community-component-tests/__snapshots__/create-new-group.spec.js.snap
Showing
- src/components/BaseComponents/NavBar.vue 3 additions, 3 deletionssrc/components/BaseComponents/NavBar.vue
- src/components/BaseComponents/PaginationTemplate.vue 2 additions, 2 deletionssrc/components/BaseComponents/PaginationTemplate.vue
- src/components/CommunityComponents/CommunityList.vue 5 additions, 1 deletionsrc/components/CommunityComponents/CommunityList.vue
- src/components/CommunityComponents/CommunityListItem.vue 12 additions, 4 deletionssrc/components/CommunityComponents/CommunityListItem.vue
- src/components/FormComponents/LoginForm.vue 1 addition, 1 deletionsrc/components/FormComponents/LoginForm.vue
- src/components/FormComponents/NewPasswordForm.vue 52 additions, 3 deletionssrc/components/FormComponents/NewPasswordForm.vue
- src/components/FormComponents/RegisterForm.vue 1 addition, 1 deletionsrc/components/FormComponents/RegisterForm.vue
- src/components/FormComponents/ResetPasswordForm.vue 1 addition, 3 deletionssrc/components/FormComponents/ResetPasswordForm.vue
- src/components/ItemComponents/NewItemForm.vue 1 addition, 3 deletionssrc/components/ItemComponents/NewItemForm.vue
- src/components/TimepickerComponents/DatepickerRange/DatepickerRange.vue 0 additions, 16 deletions.../TimepickerComponents/DatepickerRange/DatepickerRange.vue
- src/components/UserProfileComponents/RatingComponents/Rating.vue 2 additions, 2 deletions...ponents/UserProfileComponents/RatingComponents/Rating.vue
- src/components/UserProfileComponents/RatingComponents/RatingModal.vue 2 additions, 4 deletions...ts/UserProfileComponents/RatingComponents/RatingModal.vue
- src/components/UserProfileComponents/RentHistoryComponents/RentHistoryItem.vue 122 additions, 0 deletions...ofileComponents/RentHistoryComponents/RentHistoryItem.vue
- src/components/UserProfileComponents/UserItems.vue 1 addition, 4 deletionssrc/components/UserProfileComponents/UserItems.vue
- src/components/UserProfileComponents/UserListItemCard.vue 10 additions, 5 deletionssrc/components/UserProfileComponents/UserListItemCard.vue
- src/components/UserProfileComponents/UserProfile.vue 26 additions, 15 deletionssrc/components/UserProfileComponents/UserProfile.vue
- src/router/index.js 17 additions, 6 deletionssrc/router/index.js
- src/services/community-admin.service.js 4 additions, 4 deletionssrc/services/community-admin.service.js
- src/services/community.service.js 17 additions, 2 deletionssrc/services/community.service.js
- src/services/user.service.js 61 additions, 6 deletionssrc/services/user.service.js
Loading
Please register or sign in to comment