Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Front end / favorite #94

Open
wants to merge 977 commits into
base: main
Choose a base branch
from
Open

Front end / favorite #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
977 commits
Select commit Hold shift + click to select a range
eb4c9c7
Merge pull request #285 from Kenneth-Ngcobo/Shopping-list-_Frontend
ThabangRammitlwa Nov 25, 2024
701697f
fixed vapid keys
TapiwaHerbetNosenga Nov 25, 2024
3974389
Merge branch 'PWA' of https://github.com/Kenneth-Ngcobo/ASE_2024_GROU…
TapiwaHerbetNosenga Nov 25, 2024
6a1ede0
Pwa website caching
K0BraKhan33 Nov 25, 2024
37a2b09
Commented out the ShoppingList component from the page.
Tumelo-Mogono-SE Nov 25, 2024
d063bf3
Merge branch 'VoiceAI' of https://github.com/Kenneth-Ngcobo/ASE_2024_…
Tumelo-Mogono-SE Nov 25, 2024
71265f1
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
Tumelo-Mogono-SE Nov 25, 2024
ab6ca4a
Merge branch 'PWA' of https://github.com/Kenneth-Ngcobo/ASE_2024_GROU…
K0BraKhan33 Nov 25, 2024
b486477
Removed the imported ShoppingList component.
Tumelo-Mogono-SE Nov 25, 2024
a511478
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
TshireletsoMogwere Nov 25, 2024
7e75a4c
Merge pull request #286 from Kenneth-Ngcobo/Vercel-error-fix
Tumelo-Mogono-SE Nov 25, 2024
bbdaaf1
fixed pushnotification
TapiwaHerbetNosenga Nov 25, 2024
98d4400
Merge branch 'main' into PWA
TapiwaHerbetNosenga Nov 25, 2024
f353f49
Merge branch 'PWA' of https://github.com/Kenneth-Ngcobo/ASE_2024_GROU…
TapiwaHerbetNosenga Nov 25, 2024
a438921
fixed some merge conflicts
TapiwaHerbetNosenga Nov 25, 2024
6eed444
Removed route endpoint that do not exist yet.
Tumelo-Mogono-SE Nov 25, 2024
7ab306d
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
Tumelo-Mogono-SE Nov 25, 2024
62d5619
Merge pull request #287 from Kenneth-Ngcobo/Vercel-error-fix
Tumelo-Mogono-SE Nov 25, 2024
4d58c30
Merge branch 'PWA' of https://github.com/Kenneth-Ngcobo/ASE_2024_GROU…
TapiwaHerbetNosenga Nov 25, 2024
2f9e9d2
Merge pull request #288 from Kenneth-Ngcobo/PWA
OtlotlengMajuja Nov 26, 2024
83edff7
Fixed casing and formatting issues in various components
OtlotlengMajuja Nov 26, 2024
8a9ae72
Update page.js
ThabangRammitlwa Nov 26, 2024
73518e0
Update recipes.js
ThabangRammitlwa Nov 26, 2024
1e9d349
Merge remote-tracking branch 'origin/allergens-backend' into Shopping…
ThabangRammitlwa Nov 26, 2024
5a7c3ea
Removed ShoppingList import from recipes.js and fixed capitalization …
ThabangRammitlwa Nov 26, 2024
238acfd
Updated route.js to use ObjectId, refactored Recipes component, and m…
OtlotlengMajuja Nov 26, 2024
1cab542
Merge branch 'main' into allergens-backend
OtlotlengMajuja Nov 26, 2024
2698bc7
Merge remote-tracking branch 'origin/Shopping-list-_Frontend' into al…
OtlotlengMajuja Nov 26, 2024
1506cd6
Refactored shopping list API routes to use NextResponse and separate …
Thapelo08 Nov 26, 2024
eacbf86
Moved various components and utility files, including `BackButton`, `…
OtlotlengMajuja Nov 26, 2024
f5f6364
Fixed the issue of it not playing each step without stopping.
Tumelo-Mogono-SE Nov 26, 2024
25cc699
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
Tumelo-Mogono-SE Nov 26, 2024
a08202a
adds API routes for documentation
TshireletsoMogwere Nov 26, 2024
6a90dd4
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
TshireletsoMogwere Nov 26, 2024
b9cf314
Removed duplicate imports
Tumelo-Mogono-SE Nov 26, 2024
2e98310
Updated Recipes and ShoppingList components, added useRouter and useE…
ThabangRammitlwa Nov 26, 2024
acec7c4
Added ShoppingListProvider to RecipePage and Header, replaced ingredi…
ThabangRammitlwa Nov 27, 2024
2c35a06
Merge remote-tracking branch 'origin/Shopping-list-_Frontend' into Ve…
Tumelo-Mogono-SE Nov 27, 2024
b3e91b4
Downgraded the nextjs version from 15 back to 14.2.15
Tumelo-Mogono-SE Nov 27, 2024
22c234a
Downgrade next from 15.0.3 to 14.2.15, update dependencies and packag…
ThabangRammitlwa Nov 27, 2024
9d3c5ff
Merge pull request #289 from Kenneth-Ngcobo/Vercel-error-fix
Tumelo-Mogono-SE Nov 27, 2024
af926be
Merge branch 'main' into Shopping-list-_Frontend
ThabangRammitlwa Nov 27, 2024
5dbfaf9
Merge pull request #290 from Kenneth-Ngcobo/Shopping-list-_Frontend
ThabangRammitlwa Nov 27, 2024
04467f0
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
TshireletsoMogwere Nov 27, 2024
7ce220f
updates read me
TshireletsoMogwere Nov 27, 2024
5d61758
Merge branch 'main' into allergens-backend
OtlotlengMajuja Nov 27, 2024
1a3a745
Moved ShoppingListProvider and ShoppingBagHeader components in Header…
ThabangRammitlwa Nov 27, 2024
42cc5a4
Merge branch 'Shopping-list-_Frontend' of https://github.com/Kenneth-…
ThabangRammitlwa Nov 27, 2024
f108bcc
fixed danamic link
TapiwaHerbetNosenga Nov 27, 2024
256861b
fixed db.js
TapiwaHerbetNosenga Nov 27, 2024
5c1cb78
Merge branch 'main' into PWA
TapiwaHerbetNosenga Nov 27, 2024
3252282
Merge branch 'main' into PWA
TapiwaHerbetNosenga Nov 27, 2024
3233373
Main Page.js redundancy fix and readding ShoppingListProvider
K0BraKhan33 Nov 27, 2024
aeeff05
remove save route
K0BraKhan33 Nov 27, 2024
7b79e78
removed download from page.js for detailed view. Readded <Shoppin…
K0BraKhan33 Nov 27, 2024
37df499
ServiceWorker naming fix
K0BraKhan33 Nov 27, 2024
8e4789d
Update package-lock.json
ThabangRammitlwa Nov 27, 2024
902887e
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
ThabangRammitlwa Nov 27, 2024
b838f57
Merge branch 'main' into Shopping-list-_Frontend
ThabangRammitlwa Nov 27, 2024
d01bae5
Merge pull request #291 from Kenneth-Ngcobo/PWA
ThabangRammitlwa Nov 27, 2024
4709903
Wrap child components with ShoppingListProvider and add error handlin…
ThabangRammitlwa Nov 27, 2024
db15d3a
Added error handling to useShoppingList hook and wrapped child compon…
ThabangRammitlwa Nov 27, 2024
b07b765
Merge branch 'main' into VoiceAI
Tumelo-Mogono-SE Nov 27, 2024
745058f
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
TshireletsoMogwere Nov 27, 2024
a80f192
Update layout.js
ThabangRammitlwa Nov 27, 2024
00fad93
Merge branch 'Shopping-list-_Frontend' into VoiceAI
Tumelo-Mogono-SE Nov 27, 2024
9bff0db
Merge pull request #292 from Kenneth-Ngcobo/VoiceAI
TshireletsoMogwere Nov 27, 2024
724d17e
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
TshireletsoMogwere Nov 27, 2024
51ba4b2
Merge branch 'main' into Shopping-list-_Frontend
ThabangRammitlwa Nov 27, 2024
8912790
Moved multiple components to their respective folders and updated the…
OtlotlengMajuja Nov 27, 2024
0ab580c
Moved files: AllergensSection.js, CollapsibleSection.js, EditableReci…
OtlotlengMajuja Nov 27, 2024
0eeb8d4
Merge branch 'main' into allergens-backend
OtlotlengMajuja Nov 27, 2024
5f4227c
Fixed the import to match the file name.
Tumelo-Mogono-SE Nov 27, 2024
e6ac3db
Merge pull request #293 from Kenneth-Ngcobo/VoiceAI
Tumelo-Mogono-SE Nov 27, 2024
b64194f
Fixed the naming of the imported files.
Tumelo-Mogono-SE Nov 27, 2024
c0caafa
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
Tumelo-Mogono-SE Nov 27, 2024
623ffcc
Merge pull request #294 from Kenneth-Ngcobo/VoiceAI
Tumelo-Mogono-SE Nov 27, 2024
52dc37a
Update layout.js
ThabangRammitlwa Nov 27, 2024
788f275
Update Header.js
ThabangRammitlwa Nov 27, 2024
7df930a
Update recipes.js
ThabangRammitlwa Nov 27, 2024
b0298a4
Fixed the shoppingListContext imported.
Tumelo-Mogono-SE Nov 27, 2024
cc03b13
Merge branch 'VoiceAI'
Tumelo-Mogono-SE Nov 27, 2024
16c7f83
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
Tumelo-Mogono-SE Nov 27, 2024
acee8d0
Merge pull request #295 from Kenneth-Ngcobo/VoiceAI
Tumelo-Mogono-SE Nov 27, 2024
2c92f3e
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
TshireletsoMogwere Nov 27, 2024
ed832b0
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
ThabangRammitlwa Nov 27, 2024
fba298a
Merge branch 'main' into Shopping-list-_Frontend
ThabangRammitlwa Nov 27, 2024
bf85f99
Merge branch 'Shopping-List-Backend' of https://github.com/Kenneth-Ng…
Thapelo08 Nov 27, 2024
da3d06a
Updated Header import path in layout.js
OtlotlengMajuja Nov 28, 2024
3de8e1e
Removed unnecessary imports, updated Recipes component, and modified …
ThabangRammitlwa Nov 28, 2024
95de27a
Updated Header component to add sticky and shadow styles, and refacto…
ThabangRammitlwa Nov 28, 2024
c4d8138
Moved several component files and updated import paths in page.js
OtlotlengMajuja Nov 28, 2024
21115b9
Moved `ImageGallery` to recipe-detail folder, and `SortControl` to re…
OtlotlengMajuja Nov 28, 2024
16679c1
updates dependency & read me
TshireletsoMogwere Nov 28, 2024
a018be0
Removed empty lines in Header.js and updated page.js to import and re…
ThabangRammitlwa Nov 28, 2024
a63105a
Added WebPush configuration and subscription management, updated Next…
OtlotlengMajuja Nov 28, 2024
a1afe83
"Added @fortawesome/fontawesome-svg-core and combined-stream dependen…
Thapelo08 Nov 28, 2024
f3742b0
Refactor shopping list component and context to add syncing functiona…
ThabangRammitlwa Nov 28, 2024
5075635
Added JSDoc comments to multiple API route files, including auth, fav…
OtlotlengMajuja Nov 28, 2024
ba0cc37
Update manifest icon and remove global.css file
ThabangRammitlwa Nov 28, 2024
d69b0f8
Merge pull request #296 from Kenneth-Ngcobo/Shopping-list-_Frontend
ThabangRammitlwa Nov 28, 2024
49316c2
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
TshireletsoMogwere Nov 28, 2024
c7c0e80
Merge branch 'main' into allergens-backend
OtlotlengMajuja Nov 28, 2024
0a88457
Updated import paths for components in Recipe/[id]/page.js and `Recip…
OtlotlengMajuja Nov 28, 2024
bb41edf
Merge branch 'Shopping-list-_Frontend' into allergens-backend
OtlotlengMajuja Nov 28, 2024
08239e4
Update page.js
ThabangRammitlwa Nov 28, 2024
c6e3995
Update Header.js
ThabangRammitlwa Nov 28, 2024
6583022
Updated import paths for Carousel and SortControl components
OtlotlengMajuja Nov 28, 2024
308890b
Trying to fix issues with the next step and previous step.
Tumelo-Mogono-SE Nov 28, 2024
803f5a2
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
Tumelo-Mogono-SE Nov 28, 2024
4901f71
updated Recipes component to check for existing items in shopping list
ThabangRammitlwa Nov 28, 2024
0315708
Merge branch 'main' into Shopping-list-_Frontend
ThabangRammitlwa Nov 28, 2024
1ce1764
Refactored RecipeCarousel component: removed useRouter, updated style…
Thapelo08 Nov 28, 2024
99362c1
Merge branch 'main' into Shopping-List-Backend
Thapelo08 Nov 28, 2024
85b0daf
Merge pull request #297 from Kenneth-Ngcobo/Shopping-List-Backend
Thapelo08 Nov 28, 2024
a765cc4
Merge branch 'main' into Shopping-list-_Frontend
ThabangRammitlwa Nov 28, 2024
839a9cc
Fixed previous and repeat commands.
Tumelo-Mogono-SE Nov 28, 2024
92c4f66
Updated package-lock.json: added @fortawesome/fontawesome-svg-core, c…
OtlotlengMajuja Nov 28, 2024
cb014f2
Fixed the issue of auto caching for static assets.
Tumelo-Mogono-SE Nov 28, 2024
cd4426b
Merge branch 'Shopping-list-_Frontend' of https://github.com/Kenneth-…
Tumelo-Mogono-SE Nov 28, 2024
8d060de
Fixed the issue of caching static assets
Tumelo-Mogono-SE Nov 28, 2024
2c45754
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
Tumelo-Mogono-SE Nov 29, 2024
81340a5
Merge branch 'main' into VoiceAI
Tumelo-Mogono-SE Nov 29, 2024
fff0d6f
Merge pull request #298 from Kenneth-Ngcobo/frontend-signup-login
TshireletsoMogwere Nov 29, 2024
c9a2caa
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
Tumelo-Mogono-SE Nov 29, 2024
0abfb8e
Merge pull request #299 from Kenneth-Ngcobo/VoiceAI
Tumelo-Mogono-SE Nov 29, 2024
c814e37
Update homepage.js
ThabangRammitlwa Nov 29, 2024
df054c4
Merge branch 'Shopping-list-_Frontend' of https://github.com/Kenneth-…
ThabangRammitlwa Nov 29, 2024
5a8d6cc
Merge branch 'main' into Shopping-list-_Frontend
ThabangRammitlwa Nov 29, 2024
f421a92
Removed HomePage component, inlined its content into page.js, and upd…
ThabangRammitlwa Nov 29, 2024
f8a85d6
Refactor Recipes component: simplify addIngredientsToShoppingList fun…
ThabangRammitlwa Nov 29, 2024
6c5df15
Merge branch 'main' into allergens-backend
OtlotlengMajuja Dec 1, 2024
881943e
Updated styles for dark mode, recipe cards, and interactive elements,…
ThabangRammitlwa Dec 2, 2024
7513f13
Update styles for ShoppingBagHeader and Recipes components
ThabangRammitlwa Dec 2, 2024
1f46804
Refactored RecipeCarousel component: simplify layout, remove star rat…
Thapelo08 Dec 2, 2024
e0ad6bc
Merge pull request #300 from Kenneth-Ngcobo/Shopping-list-_Frontend
ThabangRammitlwa Dec 2, 2024
d82c6b6
Commented out code in Recipes component
ThabangRammitlwa Dec 2, 2024
b8f8278
Remove addIngredientsToShoppingList function and related button compo…
ThabangRammitlwa Dec 2, 2024
704b2dc
Update recipes.js
ThabangRammitlwa Dec 2, 2024
6f34e32
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
Thapelo08 Dec 2, 2024
098eec1
Updated RecipeIngredientsSelector.js to handle errors and success mes…
ThabangRammitlwa Dec 2, 2024
5ea35b5
Remove hardcoded text color from h1 element in RecipePage component.
Thapeloletsapa Dec 3, 2024
cb846a8
Merge branch 'Shopping-list-_Frontend' into allergens-backend
OtlotlengMajuja Dec 3, 2024
4ef62e7
Merge branch 'main' into allergens-backend
OtlotlengMajuja Dec 3, 2024
27635b1
Refactored RecipeCarousel component: updated sorting, reformatted cod…
Thapelo08 Dec 3, 2024
497993d
modifies read me, user modal and comments out service worker
TshireletsoMogwere Dec 3, 2024
fe9e56f
Updated API routes and components with added JSDoc comments, removed …
OtlotlengMajuja Dec 3, 2024
d303ffc
updating styling
ThabangRammitlwa Dec 3, 2024
a33ed88
Refactored Header, SortControl, EditableRecipeDetails, ImageGallery; …
OtlotlengMajuja Dec 3, 2024
4084472
Added JSDoc comments to RecipeCarousel, RecipeIngredientsSelector, an…
OtlotlengMajuja Dec 3, 2024
c21a5c0
Added JSDoc comments to multiple components in the recipe-detail dire…
OtlotlengMajuja Dec 3, 2024
b820a9e
"Updated favorites route to store timestamp and added pagination, sor…
Thapeloletsapa Dec 3, 2024
fec8081
Refactored RecipePage.js, AllergensSection.js, CollapsibleSection.js,…
ThabangRammitlwa Dec 3, 2024
b024c64
added color to the arrows
Thapelo08 Dec 3, 2024
9772376
Added two new lines at the top of the file: a comment with the file p…
Thapeloletsapa Dec 3, 2024
e66e6a1
"Refactor FavoritesPage component: simplify layout, remove pagination…
Thapeloletsapa Dec 3, 2024
d042b4b
Remove hero section from Home page component
ThabangRammitlwa Dec 3, 2024
10e87d2
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
ThabangRammitlwa Dec 3, 2024
e3b138f
Added descriptive JSDoc comments to methods and components.
OtlotlengMajuja Dec 3, 2024
8f4f385
Merge branch 'main' into Shopping-list-_Frontend
ThabangRammitlwa Dec 3, 2024
34f050c
Merge pull request #306 from Kenneth-Ngcobo/allergens-backend
OtlotlengMajuja Dec 3, 2024
82b203d
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
ThabangRammitlwa Dec 3, 2024
0008b67
Merge branch 'main' into Shopping-list-_Frontend
ThabangRammitlwa Dec 3, 2024
4c647e4
Merge pull request #308 from Kenneth-Ngcobo/Shopping-list-_Frontend
ThabangRammitlwa Dec 3, 2024
41da93b
Updated import paths for VoiceAssistant and ShoppingBagHeader components
OtlotlengMajuja Dec 3, 2024
29f7f1e
Update layout.js
ThabangRammitlwa Dec 3, 2024
2e69c74
Update Header.js
ThabangRammitlwa Dec 3, 2024
64106dd
Updated import path for ShoppingBagHeader
OtlotlengMajuja Dec 3, 2024
b5c3a29
Fixed capitalization of ShoppingListContext import and indentation of…
OtlotlengMajuja Dec 3, 2024
3529045
Merge branch 'main' into allergens-backend
OtlotlengMajuja Dec 3, 2024
38b3b61
fixes authentication error and edit profile page
TshireletsoMogwere Dec 3, 2024
47a5686
Reverted the file structure
OtlotlengMajuja Dec 3, 2024
16f8813
merges main into frontend-signup-login
TshireletsoMogwere Dec 3, 2024
5c2f787
fixes errors found after running build for deployment
TshireletsoMogwere Dec 3, 2024
62dc17e
Merge branch 'allergens-backend' into Shopping-list-_Frontend
ThabangRammitlwa Dec 3, 2024
2880c71
Merge branch 'allergens-backend' into Shopping-list-_Frontend
ThabangRammitlwa Dec 3, 2024
57707b1
Update page.js
ThabangRammitlwa Dec 3, 2024
67de261
Revert "Shopping list frontend"
ThabangRammitlwa Dec 4, 2024
126806f
Merge pull request #310 from Kenneth-Ngcobo/revert-308-Shopping-list-…
ThabangRammitlwa Dec 4, 2024
28ea41a
Merge pull request #309 from Kenneth-Ngcobo/frontend-signup-login
TshireletsoMogwere Dec 4, 2024
d301cb2
improvements
ThabangRammitlwa Dec 4, 2024
15aee04
adds missing fields
TshireletsoMogwere Dec 4, 2024
e965182
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
TshireletsoMogwere Dec 4, 2024
9aa46d8
Revert "adds missing fields"
TshireletsoMogwere Dec 4, 2024
489aa2b
"Refactored FavoritesPage component: added comments, reformatted code…
Thapeloletsapa Dec 4, 2024
8342a72
fixes error of server rendering
TshireletsoMogwere Dec 4, 2024
d994b74
"Refactor favorites API route, simplify GET request and update user d…
Thapeloletsapa Dec 4, 2024
3b1915e
Refactored shopping list API route and update layout file
OtlotlengMajuja Dec 4, 2024
3d0b0a3
Removed ShoppingList feature, including components, context, and pages
ThabangRammitlwa Dec 4, 2024
178b35b
Removed commented code, addded map to pick up numbers and refactored …
Tumelo-Mogono-SE Dec 4, 2024
fb09fd7
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
Tumelo-Mogono-SE Dec 4, 2024
518c7b5
Refactored RecipePage component, removed ShoppingListProvider from la…
ThabangRammitlwa Dec 4, 2024
d462fa6
Merge remote-tracking branch 'origin/VoiceAI' into shopping-refactor
ThabangRammitlwa Dec 4, 2024
91ec893
Update RegisterServiceWorker.js
ThabangRammitlwa Dec 4, 2024
62ffd2b
Removed the await params
Tumelo-Mogono-SE Dec 4, 2024
5c6092a
Uncommented the file
Tumelo-Mogono-SE Dec 4, 2024
7343f5d
Fixed the imported file
Tumelo-Mogono-SE Dec 4, 2024
959542a
Merge pull request #312 from Kenneth-Ngcobo/Vercel-error-fix
ThabangRammitlwa Dec 4, 2024
87329f1
Merge branch 'main' into shopping-refactor
ThabangRammitlwa Dec 4, 2024
6313ee9
Update page.js
ThabangRammitlwa Dec 4, 2024
0c298e5
Merge remote-tracking branch 'origin/VoiceAI' into Shopping-list-_Fro…
ThabangRammitlwa Dec 4, 2024
5f9b8d7
Merge branch 'Shopping-list-_Frontend' into shopping-refactor
ThabangRammitlwa Dec 4, 2024
97238ca
modifies styling of header and search
TshireletsoMogwere Dec 5, 2024
792e3a4
"Updated Header component, RecipeIngredientsSelector, and Recipes com…
ThabangRammitlwa Dec 5, 2024
8650e7f
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
TshireletsoMogwere Dec 5, 2024
bd36a5c
Updated RecipePage component to handle empty ingredients array, refac…
ThabangRammitlwa Dec 5, 2024
8e4e6a7
"Refactor API route handlers to use NextResponse and remove res param…
ThabangRammitlwa Dec 5, 2024
8c907dc
Renamed API endpoint from '/api/shoppingList' to '/api/shopping_lists…
OtlotlengMajuja Dec 5, 2024
0c8cf29
Merge branch 'shopping-refactor' of https://github.com/Kenneth-Ngcobo…
OtlotlengMajuja Dec 5, 2024
45876e2
modifies styling and some of small screen
TshireletsoMogwere Dec 5, 2024
a2abeee
"Added a space at the end of the 'Favourite' text in the Header compo…
Thapeloletsapa Dec 5, 2024
a2edbbd
Refactored shopping list API route to add try-catch blocks and logging
OtlotlengMajuja Dec 5, 2024
620cb8a
Merge branch 'frontend-signup-login' into Shopping-list-_Frontend
ThabangRammitlwa Dec 5, 2024
9c6f559
modifies naming of components and edit description
TshireletsoMogwere Dec 5, 2024
688c390
Merge pull request #314 from Kenneth-Ngcobo/frontend-signup-login
TshireletsoMogwere Dec 5, 2024
063a97a
deletes shopping list context
TshireletsoMogwere Dec 5, 2024
b6bebd8
error fixing
ThabangRammitlwa Dec 5, 2024
0e70ae2
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
Thapeloletsapa Dec 5, 2024
e1257a6
fix vercel errors
TshireletsoMogwere Dec 5, 2024
0301c32
Merge pull request #315 from Kenneth-Ngcobo/frontend-signup-login
TshireletsoMogwere Dec 5, 2024
fe31ada
Delete tsconfig.json
ThabangRammitlwa Dec 5, 2024
e77141c
Update recipes.js
ThabangRammitlwa Dec 5, 2024
8ab8dd4
Merge branch 'main' into Shopping-list-_Frontend
ThabangRammitlwa Dec 5, 2024
add74bd
Refactor Recipe page and Header component: rename EditableRecipeDetai…
ThabangRammitlwa Dec 5, 2024
35a4f74
Refactor RecipePage and recipe API route: simplify EditableRecipeDeta…
ThabangRammitlwa Dec 5, 2024
c31d3ca
"Refactored shopping_lists API, Header, and ShoppingListPage compone…
ThabangRammitlwa Dec 5, 2024
0891955
Removed the objectId because it caused some recipes to not open.
Tumelo-Mogono-SE Dec 5, 2024
4271aeb
Changed the logic for searching for recipes that match the inputted t…
Tumelo-Mogono-SE Dec 5, 2024
ace40f8
Update RecipeIngredientsSelector.js
ThabangRammitlwa Dec 5, 2024
d3e2b21
Merge branch 'Shopping-list-_Frontend' of https://github.com/Kenneth-…
OtlotlengMajuja Dec 5, 2024
99b24da
Merge branch 'Shopping-list-_Frontend' of https://github.com/Kenneth-…
OtlotlengMajuja Dec 5, 2024
599101a
"Updated Header and Recipes components to display favorites count, ad…
Thapeloletsapa Dec 5, 2024
4fd50d6
Removed and commented out code in FilterButton, IngredientList, PushN…
Thapelo08 Dec 5, 2024
b66db95
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
Thapelo08 Dec 5, 2024
fd3ecc9
Commented out entire PushNotificationManager component, including imp…
Thapelo08 Dec 5, 2024
15d7296
Merge remote-tracking branch 'origin/main' into frontEnd-/-favorite
Thapeloletsapa Dec 5, 2024
7ca63cd
Revert "Merge remote-tracking branch 'origin/main' into frontEnd-/-fa…
Thapeloletsapa Dec 5, 2024
fc2921a
Merge branch 'main' into frontEnd-/-favorite
Thapeloletsapa Dec 5, 2024
2f842f7
Merge pull request #316 from Kenneth-Ngcobo/Shopping-list-_Frontend
ThabangRammitlwa Dec 6, 2024
d81450f
Merge branch 'main' of https://github.com/Kenneth-Ngcobo/ASE_2024_GRO…
Thapelo08 Dec 6, 2024
53b8e55
Added setTimeout to be used for fetching new recipes based on the sea…
Tumelo-Mogono-SE Dec 6, 2024
cdc1323
Refactor imports and components in various files
Thapelo08 Dec 6, 2024
f01556f
Merge pull request #318 from Kenneth-Ngcobo/Shopping-List-Backend
Thapelo08 Dec 6, 2024
1b40082
Merge branch 'main' into Vercel-error-fix
Tumelo-Mogono-SE Dec 6, 2024
aeaeb28
Merged the main and my branch and fixed wrong logic in the code.
Tumelo-Mogono-SE Dec 6, 2024
7a7b882
Merge branch 'main' into frontEnd-/-favorite
Tumelo-Mogono-SE Dec 6, 2024
667693b
Removed duplicates
Tumelo-Mogono-SE Dec 6, 2024
c7d06ee
Added the Link for favourite which wasnt there from main
Tumelo-Mogono-SE Dec 6, 2024
5d0c6d6
Merge branch 'Vercel-error-fix' into frontEnd-/-favorite
Tumelo-Mogono-SE Dec 6, 2024
6dbd50d
Merged main and this branch
Tumelo-Mogono-SE Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/.pnp
.pnp.js
.yarn/install-state.gz
.next

# testing
/coverage
Expand Down
Loading