array-in-a-matrix/foodie
1
0
Fork 0
mirror of https://github.com/array-in-a-matrix/foodie.git synced 2024-06-16 03:17:02 -04:00
Code Issues Packages Projects Releases Wiki Activity
63 commits 6 branches 0 tags 438 KiB
Commit graph

63 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CodeEpoch d7c5449a7e dynamic % 2022-10-15 17:47:08 -04:00
Ansel-Hong cd5b966091 fixed scroll 2022-10-15 16:49:19 -04:00
CodeEpoch 74254a3275 Merge branch 'dev' of https://github.com/Ansel-Hong/foodie into dev 
# Conflicts:
#	src/components/pages/VideoPlayer.jsx
#	src/components/recipe_vid/RecipeVid.css
 2022-10-15 16:45:26 -04:00
CodeEpoch 8c34e157ae ui update 2022-10-15 16:44:04 -04:00
array-in-a-matrix 099f92f101 fixed width misalignment 2022-10-15 16:25:47 -04:00
Ansel-Hong 2860a9abe3 fix 2022-10-15 16:18:20 -04:00
CodeEpoch 232ec6b1c1 Merge branch 'dev' of https://github.com/Ansel-Hong/foodie into dev 2022-10-15 13:11:04 -04:00
CodeEpoch 9cccca2cbe css update 2022-10-15 13:10:55 -04:00
Aarya2004 21c9d62d0f Fixed list repeating items bug 2022-10-15 12:58:36 -04:00
CodeEpoch 34a9f0d487 Merge branch 'dev' of https://github.com/Ansel-Hong/foodie into dev 2022-10-15 12:25:02 -04:00
CodeEpoch 48a1f7b301 aadd cart 2022-10-15 12:24:49 -04:00
Ansel-Hong 84d8e629ca format video player size 2022-10-15 11:49:02 -04:00
Ansel-Hong 4c2d80c97a merged 2022-10-15 11:24:49 -04:00
Ansel-Hong 427fd7cc2f Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 2022-10-15 11:21:06 -04:00
Ansel-Hong 9ad32a1313 added nextvid button 2022-10-15 11:15:29 -04:00
Aarya2004 b6e7585c62 Merge branch 'dev' of https://github.com/Ansel-Hong/foodie into dev 2022-10-15 11:13:58 -04:00
array-in-a-matrix 9136d33e94 added margin to title 2022-10-15 11:12:39 -04:00
Aarya2004 788cba37d8 FridgeList linked to App 2022-10-15 11:10:43 -04:00
Ansel-Hong c639b1d532 Added videonext button 2022-10-15 11:05:38 -04:00
array-in-a-matrix a62109b3ee Merge branch 'dev' of https://github.com/Ansel-Hong/foodie into dev 2022-10-15 11:04:04 -04:00
array-in-a-matrix 307ad81a2c fixed typo 2022-10-15 11:03:48 -04:00
Aarya2004 4e8a91c0cf FridgeList updated view 2022-10-15 10:43:31 -04:00
Aarya2004 cfe0f5c194 Merge remote-tracking branch 'origin/dev' into AaryaTest 2022-10-15 10:42:41 -04:00
Aarya2004 418f7be62f pnpm changes 2022-10-15 10:41:43 -04:00
CodeEpoch 46caefe107 Merge remote-tracking branch 'origin/dev' into dev 2022-10-15 10:41:04 -04:00
CodeEpoch e77823fe96 link fridge to perc 2022-10-15 10:40:41 -04:00
array-in-a-matrix f47735a833 added padding between image and text 2022-10-15 10:25:19 -04:00
array-in-a-matrix 57f023bc29 added margin to title 2022-10-15 10:22:26 -04:00
array-in-a-matrix bc502d5637 added wrapper 2022-10-15 10:15:07 -04:00
array-in-a-matrix aa4358d77f remove comments and stuff 2022-10-15 10:14:43 -04:00
array-in-a-matrix 126ea5586d merge stuff 2022-10-15 10:12:27 -04:00
Array in a Matrix ff15ba613e
Merge pull request #2 from Ansel-Hong/anselContext 
Ansel context
 2022-10-15 10:07:10 -04:00
Array in a Matrix d3ac6b71a5
Merge branch 'dev' into anselContext 2022-10-15 10:06:59 -04:00
array-in-a-matrix 60015d3932 removed unused lines 2022-10-15 09:58:28 -04:00
array-in-a-matrix 8d27a7336b created logo 2022-10-15 09:52:24 -04:00
array-in-a-matrix 923d4221a7 using loaded recipes for card list 2022-10-15 09:52:12 -04:00
Ansel-Hong ceef8855c6 added 2022-10-15 09:47:27 -04:00
array-in-a-matrix e173777b45 created cards 2022-10-15 09:45:25 -04:00
array-in-a-matrix d60ae44a31 get recipes from db then display them in cards 2022-10-15 04:37:29 -04:00
array-in-a-matrix d63f17f57a added description element & comments 2022-10-15 02:53:21 -04:00
array-in-a-matrix 5778d43a0c readme 2022-10-15 02:50:49 -04:00
Ansel-Hong f69616530f ac 2022-10-15 02:44:01 -04:00
array-in-a-matrix 5ec8e2262c added dependency: bootstrap-icon 2022-10-15 02:34:27 -04:00
Aarya2004 b3886536da Merge remote-tracking branch 'origin/dev' into AaryaTest 2022-10-15 02:14:18 -04:00
CodeEpoch 5555ed508a Merge remote-tracking branch 'origin/dev' into dev 2022-10-15 02:08:52 -04:00
CodeEpoch 8e7fe0f8e7 route to firdge 2022-10-15 02:08:01 -04:00
CodeEpoch 33db3835d6 ui update 1 2022-10-15 02:06:33 -04:00
Ansel-Hong d777d5070c recipesVid object generalised 2022-10-15 01:52:48 -04:00
Aarya2004 b63e8b814e Merge remote-tracking branch 'origin/dev' into AaryaTest 
# Conflicts:
#	src/App.css
#	src/App.jsx
#	src/index.css
 2022-10-15 01:19:38 -04:00
Ansel-Hong 2046f0c96f fixed merge conflict 2022-10-15 01:10:47 -04:00