-
- Downloads
You need to sign in or sign up before continuing.
Merge branch 'main' into 'ukemeny'
# Conflicts: # src/router/index.js # src/style.scss
Showing
- cypress/e2e/navbar.cy.js 2 additions, 3 deletionscypress/e2e/navbar.cy.js
- package-lock.json 2 additions, 50 deletionspackage-lock.json
- package.json 1 addition, 0 deletionspackage.json
- src/App.vue 6 additions, 10 deletionssrc/App.vue
- src/assets/main.css 5 additions, 1 deletionsrc/assets/main.css
- src/components/EditAccount.vue 198 additions, 0 deletionssrc/components/EditAccount.vue
- src/components/EditProfile.vue 262 additions, 0 deletionssrc/components/EditProfile.vue
- src/components/FridgeItem.vue 13 additions, 12 deletionssrc/components/FridgeItem.vue
- src/components/GroceryOffers.vue 1 addition, 1 deletionsrc/components/GroceryOffers.vue
- src/components/ItemSearch.vue 44 additions, 7 deletionssrc/components/ItemSearch.vue
- src/components/Navbar.vue 6 additions, 4 deletionssrc/components/Navbar.vue
- src/components/ShoppingListItem.vue 166 additions, 0 deletionssrc/components/ShoppingListItem.vue
- src/components/__tests__/EditAccount.spec.js 47 additions, 0 deletionssrc/components/__tests__/EditAccount.spec.js
- src/components/__tests__/EditProfile.spec.js 64 additions, 0 deletionssrc/components/__tests__/EditProfile.spec.js
- src/components/__tests__/FridgeItem.spec.js 5 additions, 5 deletionssrc/components/__tests__/FridgeItem.spec.js
- src/components/__tests__/ShoppingListItem.spec.js 23 additions, 0 deletionssrc/components/__tests__/ShoppingListItem.spec.js
- src/components/icons/tips.png 0 additions, 0 deletionssrc/components/icons/tips.png
- src/components/icons/trash.svg 2 additions, 0 deletionssrc/components/icons/trash.svg
- src/components/images/w66XcIlw.jpeg 0 additions, 0 deletionssrc/components/images/w66XcIlw.jpeg
- src/router/index.js 30 additions, 1 deletionsrc/router/index.js
Loading
Please register or sign in to comment