array-in-a-matrix/foodie
1
0
Fork 0
mirror of https://github.com/array-in-a-matrix/foodie.git synced 2025-04-02 10:32:08 -04:00
Code Issues Projects Releases Packages Wiki Activity
97 commits 6 branches 0 tags 438 KiB
Commit graph

97 commits

This branch
This branch
All branches
Author SHA1 Message Date
array-in-a-matrix
a29eff2f01 Invalid DOM property . Did you mean ? 2022-10-16 00:28:37 -04:00
Array in a Matrix
4ec640edae
Merge pull request #5 from Ansel-Hong/dev 
Merging to upload zip of project to devpost.
 2022-10-16 00:26:25 -04:00
CodeEpoch
c54c9a60f8 Merge branch 'la' into dev 2022-10-16 00:09:03 -04:00
CodeEpoch
73b41c7c8d last ui update 2022-10-16 00:07:41 -04:00
Ansel-Hong
f1484dc01f foxed 2022-10-15 23:39:58 -04:00
Ansel-Hong
82c84e97b5 working bubble 2022-10-15 23:37:10 -04:00
Ansel-Hong
9bb544ad0a a 2022-10-15 23:12:12 -04:00
Ansel-Hong
61d1bde3bb consolelog 2022-10-15 23:11:07 -04:00
Ansel-Hong
a46453ed65 hi 2022-10-15 23:10:10 -04:00
Ansel-Hong
f4602c143d working cart 2022-10-15 22:49:33 -04:00
CodeEpoch
d82b0c977f Merge branch 'main' into dev 2022-10-15 21:07:41 -04:00
CodeEpoch
500b055b42 BBOOKMARK WOKRIN 2022-10-15 21:07:18 -04:00
array-in-a-matrix
a96de11824 favicon 2022-10-15 20:24:42 -04:00
Array in a Matrix
d6e386bba3
Merge pull request #4 from Ansel-Hong/dev 
updated
 2022-10-15 18:34:34 -04:00
array-in-a-matrix
36deac1935 added button 2022-10-15 18:33:18 -04:00
Ansel-Hong
177f1d1d08 unbookmark 2022-10-15 18:21:55 -04:00
Ansel-Hong
452bd2a703 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 
asd the commit.
 2022-10-15 18:17:24 -04:00
Ansel-Hong
0f401a8fe2 unbookmark written 2022-10-15 18:17:17 -04:00
CodeEpoch
00ee9dc089 Merge branch 'dev' of https://github.com/Ansel-Hong/foodie into dev 2022-10-15 18:17:06 -04:00
CodeEpoch
fed091eafb fridge style update 2022-10-15 18:16:56 -04:00
Ansel-Hong
a2029c85d4 changes 2022-10-15 18:11:36 -04:00
Ansel-Hong
e4278e99da working 2022-10-15 18:09:53 -04:00
CodeEpoch
b5d8b437b5 MORE CSS UPDATE 2022-10-15 18:07:54 -04:00
CodeEpoch
3c91fa3723 merge conflic thing 2022-10-15 17:50:11 -04:00
CodeEpoch
3b974c6f1b Merge remote-tracking branch 'origin/colors' into dev 
# Conflicts:
#	src/components/pages/VideoPlayer.jsx
 2022-10-15 17:49:08 -04:00
CodeEpoch
d7c5449a7e dynamic % 2022-10-15 17:47:08 -04:00
array-in-a-matrix
edb1aab03f added color palette 2022-10-15 17:19:12 -04:00
array-in-a-matrix
a2a0c735fd added color & font 2022-10-15 17:18:50 -04:00
array-in-a-matrix
e4eade1207 added font 2022-10-15 17:18:29 -04:00
array-in-a-matrix
dee4ecda47 themed next button 2022-10-15 17:14:54 -04:00
array-in-a-matrix
07afc1e447 added google fonts 2022-10-15 17:14:12 -04:00
array-in-a-matrix
a6170cadb2 added color palette 2022-10-15 17:13:53 -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
efc69c0f0e removed unused variable 2022-10-15 16:41:08 -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
Array in a Matrix
ba4ababb29
Merge pull request #3 from Ansel-Hong/dev 
Dev
 2022-10-15 16:04:07 -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