Commit graph

96 commits

Author SHA1 Message Date
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
100e1ac4d2
Merge pull request #1 from Ansel-Hong/dev
Dev
2022-10-15 04:39:12 -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
Aarya Prakash
f664390059 Receipe List 2022-10-15 01:07:44 -04:00
Ansel-Hong
a9b6a3e9d5 db connected 2022-10-15 00:55:54 -04:00
Ansel-Hong
3e7951b2bc working fetch form firebase 2022-10-15 00:53:22 -04:00
array-in-a-matrix
f60d609c05 updated dependencies 2022-10-15 00:34:11 -04:00
CodeEpoch
eb021f79c5 setup skeleton 2022-10-15 00:22:14 -04:00
CodeEpoch
463cc24ea5 Merge remote-tracking branch 'origin/dev' into dev 2022-10-14 23:47:59 -04:00
Ansel-Hong
4eacef68ba Routing works 2022-10-14 23:47:09 -04:00
CodeEpoch
8c108ad145 add boostrap 2022-10-14 23:34:20 -04:00
CodeEpoch
8eb1204639 clean up 2022-10-14 22:50:28 -04:00
array-in-a-matrix
339b2b4955 created vite/react project 2022-10-14 22:27:23 -04:00
array-in-a-matrix
7216a61929 removed duped gitignore 2022-10-14 22:20:46 -04:00
array-in-a-matrix
8ca4cfb597 created vue project 2022-10-14 22:11:50 -04:00
Ansel-Hong
fa5a3056ed
Initial commit 2022-10-14 22:00:58 -04:00