Commit Graph

1531 Commits

Author SHA1 Message Date
unknown
2b7e4fe6cb merge: fix conflict 2021-09-09 20:47:24 +07:00
lytrankieio123
59cf321ac4 Merge pull request #32 from KieIO/m6-quangnhan
M6 quangnhan BlogDetailPage,BlogContent,BlogDetailImg,RecipesList,RecipeListPage
2021-09-09 17:43:01 +07:00
quangnhankie
606f3e5e81 refactor: BlogDetailpage 2021-09-09 14:15:21 +07:00
quangnhankie
ee82d5b578 Merge branch 'common' of https://github.com/KieIO/grocery-vercel-commerce into m6-quangnhan 2021-09-09 12:01:20 +07:00
quangnhankie
6757d3298f style: add label for selectCommon at RecipesList and style it 2021-09-09 10:50:58 +07:00
lytrankieio123
dd4fff8478 Merge pull request #35 from KieIO/m5-lytran
🎨 styles: descrease cart drawer width
2021-09-09 10:30:44 +07:00
lytrankieio123
017aba6274 🎨 styles: descrease cart drawer width
:%s
2021-09-09 10:08:37 +07:00
quangnhankie
d6a0c41e99 refactor: Refactor RecipeListPage 2021-09-08 23:50:47 +07:00
unknown
98c08910ad styles: add white-spaces 2021-09-08 21:58:35 +07:00
unknown
69d5e64dea remove: remove link CollapseCommon 2021-09-08 21:34:36 +07:00
unknown
d79e971bed refactor: update link 2021-09-08 21:32:26 +07:00
unknown
0699b0dfd7 merge: fix conflict 2021-09-08 21:24:48 +07:00
unknown
7a01eb1ef5 merge: pull and fix conflict common 2021-09-08 20:48:27 +07:00
unknown
1d833a3a7b remove: remove CollapseContent 2021-09-08 20:43:49 +07:00
unknown
51c8642d24 styles: add padding DeliveryAndPolicyContent 2021-09-08 20:08:26 +07:00
unknown
023087048e remove: DeliveryAndPolicyPage 2021-09-08 20:00:35 +07:00
datnguyenkieio
04a7de82e9 Merge pull request #23 from KieIO/m4-datnguyen
M4 datnguyen
2021-09-08 17:05:55 +07:00
unknown
5c7a382b62 Merge branch 'm4-datnguyen' of github.com:KieIO/grocery-vercel-commerce into m4-datnguyen 2021-09-08 17:04:15 +07:00
unknown
0d0bbba004 Merge branch 'common' of github.com:KieIO/grocery-vercel-commerce into m4-datnguyen 2021-09-08 17:02:05 +07:00
datnguyenkieio
0e1ed45e46 Update src/components/common/PaginationCommon/PaginationCommon.tsx
Co-authored-by: lytrankieio123 <76729908+lytrankieio123@users.noreply.github.com>
2021-09-08 16:49:17 +07:00
lytrankieio123
2ac6cec8d5 Merge pull request #20 from KieIO/m4-quangnhan
create components MenuFilter and MenuNavigation
2021-09-08 16:46:01 +07:00
lytrankieio123
f8d1910a04 🔀 merge: branch 'common' of https://github.com/KieIO/grocery-vercel-commerce into m4-quangnhan
:%s
2021-09-08 16:45:47 +07:00
lytrankieio123
a3a185cc19 🐛 bug: not show menu filter product list in tablet-and-up screen
:%s
2021-09-08 16:43:39 +07:00
lytrankieio123
9db2a1b5a3 🔥 remove: fix warning
:%s
2021-09-08 16:41:58 +07:00
quangnhankie
58664e7523 bug: fix bug conflic 2021-09-08 16:30:18 +07:00
lytrankieio123
eba1ef10f8 Merge pull request #21 from KieIO/m4-tan
m4-tan CollapseCommon, CardBlog, RelevantBlogPosts
2021-09-08 16:21:52 +07:00
lytrankieio123
24e0173619 enhance: link card blog 2021-09-08 16:16:53 +07:00
lytrankieio123
ac5de0d4b5 enhance: link to all blogs 2021-09-08 16:09:05 +07:00
lytrankieio123
1740c529ac 🔀 merge: branch 'common' of https://github.com/KieIO/grocery-vercel-commerce into m4-tan
:%s
2021-09-08 16:07:31 +07:00
quangnhankie
b517ae69d6 Merge branch 'common' of https://github.com/KieIO/grocery-vercel-commerce into m6-quangnhan 2021-09-08 16:07:09 +07:00
quangnhankie
1b4a882d64 bug: fixbug images link for RecipesListPage 2021-09-08 16:05:19 +07:00
lytrankieio123
65a74b3608 🔥 remove: link in collapse title
:%s
2021-09-08 16:04:28 +07:00
quangnhankie
035c362f48 fix: Fix link data demo recipesListPage 2021-09-08 15:45:31 +07:00
lytrankieio123
03a3e8c24f Merge pull request #25 from KieIO/tanle
Tanle SelectCommon
2021-09-08 15:33:31 +07:00
lytrankieio123
b3fdb10c79 🔀 merge: branch 'common' of https://github.com/KieIO/grocery-vercel-commerce into tanle
:%s
2021-09-08 15:33:15 +07:00
lytrankieio123
b4edbf8c8a 🎨 styles: animation icon select common
:%s
2021-09-08 15:32:07 +07:00
quangnhankie
92b37ae10a fix: fix link import 2021-09-08 15:28:53 +07:00
lytrankieio123
c812aadca7 Merge pull request #31 from KieIO/m5-lytran
M5: styles header, home page
2021-09-08 15:11:40 +07:00
lytrankieio123
d39fa20340 🎨 styles: img banner home
:%s
2021-09-08 15:09:25 +07:00
quangnhankie
2660e23116 fix: fix bug blogs/index.ts 2021-09-08 15:04:03 +07:00
lytrankieio123
0913caa0a9 change banner home 2021-09-08 14:57:06 +07:00
lytrankieio123
700fe602be 🎨 styles: hover effect in header
:%s
2021-09-08 14:56:11 +07:00
quangnhankie
07844e4503 fix:RecipesList 2021-09-08 14:50:09 +07:00
quangnhankie
d642460c65 fix: fix type Image 2021-09-08 11:43:04 +07:00
quangnhankie
ae5e7e8d43 feat: create components BlogDetalImg BlogContent BlogDetailPage 2021-09-08 11:38:36 +07:00
quangnhankie
b44ca8cb50 Merge branch 'm4-tan' of https://github.com/KieIO/grocery-vercel-commerce into m6-quangnhan 2021-09-08 10:41:11 +07:00
quangnhankie
4b0e46523c fix: fix RelevantBlogPosts 2021-09-08 10:41:02 +07:00
unknown
c1f7d9d7ab refactor: RelevantBlogPosts bgcolor -> option props 2021-09-08 10:37:04 +07:00
unknown
83fcfc3d65 styles: add bg color option RelevantBlogPosts 2021-09-08 10:35:33 +07:00
quangnhankie
3b37061fb2 feat: BlogDetailPage 2021-09-08 10:27:09 +07:00