Merge branch 'main' into Wishlist-Frontend
# Conflicts: # growbros-frontend/src/components/DropDownFilter.tsx # growbros-frontend/src/pages/Garten.tsx # growbros-frontend/src/pages/Wunschliste.tsx
No related branches found
No related tags found
Showing
- CHANGELOG.md 17 additions, 0 deletionsCHANGELOG.md
- growbros-frontend/.env 1 addition, 0 deletionsgrowbros-frontend/.env
- growbros-frontend/package-lock.json 146 additions, 1 deletiongrowbros-frontend/package-lock.json
- growbros-frontend/package.json 6 additions, 1 deletiongrowbros-frontend/package.json
- growbros-frontend/public/recources/images/Broccoli.webp 0 additions, 0 deletionsgrowbros-frontend/public/recources/images/Broccoli.webp
- growbros-frontend/public/recources/images/Cucumber.webp 0 additions, 0 deletionsgrowbros-frontend/public/recources/images/Cucumber.webp
- growbros-frontend/public/recources/images/Grandma.png 0 additions, 0 deletionsgrowbros-frontend/public/recources/images/Grandma.png
- growbros-frontend/public/recources/images/Red_Vegetable.webp 0 additions, 0 deletionsgrowbros-frontend/public/recources/images/Red_Vegetable.webp
- growbros-frontend/public/recources/images/Vegetables.jpeg 0 additions, 0 deletionsgrowbros-frontend/public/recources/images/Vegetables.jpeg
- growbros-frontend/public/vite.svg 0 additions, 18 deletionsgrowbros-frontend/public/vite.svg
- growbros-frontend/src/App.tsx 29 additions, 13 deletionsgrowbros-frontend/src/App.tsx
- growbros-frontend/src/components/DropDownFilter.tsx 38 additions, 0 deletionsgrowbros-frontend/src/components/DropDownFilter.tsx
- growbros-frontend/src/components/FilterPage.tsx 54 additions, 21 deletionsgrowbros-frontend/src/components/FilterPage.tsx
- growbros-frontend/src/components/Grandma.tsx 12 additions, 0 deletionsgrowbros-frontend/src/components/Grandma.tsx
- growbros-frontend/src/components/Navbar.tsx 13 additions, 2 deletionsgrowbros-frontend/src/components/Navbar.tsx
- growbros-frontend/src/components/NavbarRegistrationAndLogin.tsx 26 additions, 0 deletions...os-frontend/src/components/NavbarRegistrationAndLogin.tsx
- growbros-frontend/src/components/PlantCard.tsx 16 additions, 18 deletionsgrowbros-frontend/src/components/PlantCard.tsx
- growbros-frontend/src/components/PlantDetails.tsx 134 additions, 82 deletionsgrowbros-frontend/src/components/PlantDetails.tsx
- growbros-frontend/src/components/PlantsOverview.tsx 24 additions, 29 deletionsgrowbros-frontend/src/components/PlantsOverview.tsx
- growbros-frontend/src/env.d.ts 7 additions, 0 deletionsgrowbros-frontend/src/env.d.ts
Loading
Please register or sign in to comment