Merge branch 'main' into 'item-card'
# Conflicts: # src/router/index.js
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- .gitlab-ci.yml 28 additions, 17 deletions.gitlab-ci.yml
- package-lock.json 13 additions, 1 deletionpackage-lock.json
- package.json 3 additions, 1 deletionpackage.json
- src/App.vue 1 addition, 15 deletionssrc/App.vue
- src/assets/defaultUserProfileImage.jpg 0 additions, 0 deletionssrc/assets/defaultUserProfileImage.jpg
- src/assets/removeIcon.png 0 additions, 0 deletionssrc/assets/removeIcon.png
- src/components/CreateNewGroup.vue 306 additions, 0 deletionssrc/components/CreateNewGroup.vue
- src/components/HelloWorld.vue 8 additions, 120 deletionssrc/components/HelloWorld.vue
- src/components/ItemCard.vue 31 additions, 0 deletionssrc/components/ItemCard.vue
- src/components/NewPasswordForm.vue 74 additions, 0 deletionssrc/components/NewPasswordForm.vue
- src/components/RegisterFormComponent.vue 239 additions, 144 deletionssrc/components/RegisterFormComponent.vue
- src/components/SearchItemListComponent.vue 82 additions, 0 deletionssrc/components/SearchItemListComponent.vue
- src/components/UserProfileComponents/LargeProfileCard.vue 141 additions, 0 deletionssrc/components/UserProfileComponents/LargeProfileCard.vue
- src/components/UserProfileComponents/RatingComponent.vue 61 additions, 0 deletionssrc/components/UserProfileComponents/RatingComponent.vue
- src/components/UserProfileComponents/UserListItemCard.vue 40 additions, 0 deletionssrc/components/UserProfileComponents/UserListItemCard.vue
- src/main.js 0 additions, 3 deletionssrc/main.js
- src/plugins/vuetify.js 0 additions, 9 deletionssrc/plugins/vuetify.js
- src/plugins/webfontloader.js 0 additions, 17 deletionssrc/plugins/webfontloader.js
- src/utils/token-utils.js 16 additions, 0 deletionssrc/utils/token-utils.js
Loading
Please register or sign in to comment