Commit Graph

35 Commits

Author SHA1 Message Date
Wini_Fy
40307d1224 Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/hailearning.edu.vn into fea/thanh-02022026-news 2026-02-05 11:00:10 +07:00
Wini_Fy
879d71f7ab fix: update image URL handling to support paths without leading slashes and clean up layout file 2026-02-05 10:52:30 +07:00
r2xrzh9q2z-lab
1daf698f4a fix conflig merge 2026-02-05 09:20:12 +07:00
r2xrzh9q2z-lab
0b2e3d2123 Update UI, Call API 2026-02-05 05:55:00 +07:00
eab2c5e132 fix: resolve header.json conflict 2026-02-05 00:14:42 +07:00
c98ccd1fa1 styling ui header menu 2026-02-05 00:04:28 +07:00
0bad73da4c Merge pull request 'fea/thanh-02022026-news' (#12) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#12
2026-02-04 09:23:02 +00:00
Wini_Fy
01f3293195 refactor: Simplify blog navigation in header by removing nested links and updating href 2026-02-04 16:19:58 +07:00
Wini_Fy
9a71d39ebf feat: Implement blog API service and refactor components for improved data fetching 2026-02-04 15:33:02 +07:00
nguyenvanbao
f4529d1e90 feat: add country API integration and image fallback component 2026-02-04 14:42:54 +07:00
ec9883c65a Merge pull request 'fix: refactor services page styling and improve component logic' (#10) from fix/bao-04022026-Page-Service-ServiceDetail into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#10
2026-02-04 04:54:59 +00:00
nguyenvanbao
693821a9aa fix: refactor services page styling and improve component logic 2026-02-04 11:52:19 +07:00
00ba842b80 Merge branch 'main' into feat/huy-02022026-ui-header-footer-homepage-aboutpage 2026-02-04 09:56:52 +07:00
82fb663414 fix: resolve conflict in HeaderTop component 2026-02-04 09:43:22 +07:00
49ed4acd49 fix: resolve merge conflict in app layout 2026-02-04 09:34:13 +07:00
Wini_Fy
4d93f3c07a Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/hailearning.edu.vn into fea/thanh-02022026-news 2026-02-04 09:27:38 +07:00
nguyenvanbao
261a35f188 Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/hailearning.edu.vn into fix/bao-03022026-Page-Service-Service-Detail 2026-02-04 09:20:47 +07:00
Wini_Fy
29cc0bf2cd feat: Refactor blog components and add pagination 2026-02-03 17:05:09 +07:00
nguyenvanbao
adef27b214 feat: refactor service API schema and update layout structure 2026-02-03 16:24:55 +07:00
LNHA
6c5c92c9d9 feat: add pricing page with API integration and dynamic rendering 2026-02-03 14:53:10 +07:00
5b29928f16 refactor json header, footer, home and styling ui 2026-02-03 12:09:24 +07:00
0398135018 Merge pull request 'feat: UI appointment contact pricing page' (#5) from hoanganh-03022026-appointment-contact-pricing into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#5
2026-02-03 03:30:55 +00:00
LNHA
55c9a4c6b8 feat: UI appointment contact pricing page 2026-02-03 10:28:15 +07:00
nguyenvanbao
a2a215dfd7 Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/hailearning.edu.vn into fea/bao-03022026-Service-Service_Details 2026-02-03 10:21:54 +07:00
nguyenvanbao
9f67fd44ef feat: Add service details page with API integration 2026-02-03 10:18:53 +07:00
1add9d4d9d refactor ui and json data about 2026-02-02 22:29:31 +07:00
Wini_Fy
82a049a780 Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/hailearning.edu.vn into feat/huy-02022026-ui-header-footer-homepage-aboutpage 2026-02-02 17:10:05 +07:00
Wini_Fy
0de69cb4d0 feat: implement news details page with content and sidebar 2026-02-02 17:02:22 +07:00
d24b9ed33e build ui header, footer, home page, about page 2026-02-02 16:16:11 +07:00
Wini_Fy
52c7395353 featL Add news page 2026-02-02 13:41:45 +07:00
r2xrzh9q2z-lab
426749c480 fix data 2026-02-02 11:41:42 +07:00
r2xrzh9q2z-lab
b9e222b8dc Resolve merge conflicts 2026-02-02 11:03:31 +07:00
r2xrzh9q2z-lab
d53d4417b2 Initial commit 2026-02-02 11:00:08 +07:00
nguyenvanbao
5b62149051 feat: setup frontend Next.js project structure 2026-01-31 12:35:43 +07:00
nguyenvanbao
3c9a113721 Initial commit from Create Next App 2026-01-31 10:30:29 +07:00