Commit Graph

1557 Commits

Author SHA1 Message Date
unknown
3e4b056ee8 refactor: change link 2021-09-10 15:21:34 +07:00
unknown
91d9303536 merge: fix conflict 2021-09-10 14:30:06 +07:00
lytrankieio123
065836792d Merge pull request #39 from KieIO/m6-lytran
M6 Ly: Fix header, style shape common, optimize images
2021-09-10 14:21:17 +07:00
lytrankieio123
db9c2df3e7 🔀 merge: branch 'common' of https://github.com/KieIO/grocery-vercel-commerce into m6-lytran
:%s
2021-09-10 14:20:53 +07:00
lytrankieio123
b52a839805 Merge pull request #38 from KieIO/m4-fixbugMenu
M4 fixbug menu and fix animation MenuNavigationProductList
2021-09-10 14:18:11 +07:00
lytrankieio123
b1d60a45cc test: shape common 2021-09-10 13:50:02 +07:00
lytrankieio123
5d98948de4 🎨 styles: shape common
:%s
2021-09-10 13:42:49 +07:00
unknown
2f4f19414e refactor: change data test 2021-09-10 12:00:43 +07:00
unknown
8848065674 merge: override BreadCrumb Common 2021-09-10 11:48:42 +07:00
lytrankieio123
a5c9e73a39 🎨 styles: cursor pointer btn cart in header
:%s
2021-09-10 11:42:50 +07:00
lytrankieio123
e6d8d42ede 🐛 bug: fix header animation
:%s
2021-09-10 11:37:17 +07:00
quangnhankie
7997dbc8c5 fix: fix animation MenuNavigationProductList 2021-09-10 11:36:32 +07:00
quangnhankie
14dd99c051 test 2021-09-10 10:08:57 +07:00
quangnhankie
a44a29fcfa Merge branch 'm6-lytran' of https://github.com/KieIO/grocery-vercel-commerce into m6-lytran 2021-09-10 10:05:12 +07:00
quangnhankie
660a27e1f8 merge: Merge branch 'common' of https://github.com/KieIO/grocery-vercel-commerce into m6-lytran 2021-09-10 10:05:06 +07:00
unknown
0299c30829 styles: change padding 2021-09-10 10:00:03 +07:00
lytrankieio123
6e44c53e93 🐛 bug: empty img
:%s
2021-09-10 09:56:42 +07:00
lytrankieio123
c508ad0931 test: components in test.tsx 2021-09-10 09:52:02 +07:00
quangnhankie
0b0f0c631e bug: fix bug animation for menuFilte 2021-09-10 09:49:00 +07:00
lytrankieio123
bd7cf33a51 🎨 styles: custom shape
:%s
2021-09-10 09:28:38 +07:00
unknown
2b7e4fe6cb merge: fix conflict 2021-09-09 20:47:24 +07:00
quangnhankie
1c9e1a1191 bug: fix bug pagination 2021-09-09 17:49:32 +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
lytrankieio123
d27f20e9f8 🎨 styles: empty common
:%s
2021-09-09 17:13:27 +07:00
lytrankieio123
2e3947a1ba style: blur bg img 2021-09-09 16:49:27 +07:00
lytrankieio123
1a4392eacc feat: add blur img
:%s
2021-09-09 16:48:54 +07:00
lytrankieio123
985f8861c8 🐛 bug: fix header animation
:%s
2021-09-09 14:33:52 +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
lytrankieio123
4f905b1558 🎨 styles: tab common
:%s
2021-09-09 11:03:14 +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