Commit Graph

68 Commits

Author SHA1 Message Date
276481bc00 Merge pull request 'fix: blog dynamic build' (#27) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#27
2026-02-06 05:10:28 +00:00
Wini_Fy
a9ff0e8947 fix: blog dynamic build 2026-02-06 12:09:33 +07:00
300928ecb1 Merge pull request 'fix visa build' (#26) from fea/hoang-05022026-Visa into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#26
2026-02-06 05:01:55 +00:00
r2xrzh9q2z-lab
f9da2970a4 fix visa build 2026-02-06 12:00:28 +07:00
f0f7c5228d Merge pull request 'chore: Add example environment configuration and update .gitignore to include .env' (#25) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#25
2026-02-06 04:44:20 +00:00
Wini_Fy
c39ea1fded chore: Add example environment configuration and update .gitignore to include .env 2026-02-06 11:43:07 +07:00
32b700e040 Merge pull request 'style(header): Implement responsive mobile menu and improve header layout' (#24) from style/huy-06022026-header-responsive-mobile-and-layout into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#24
2026-02-06 04:41:48 +00:00
26037e39b7 style(header): Implement responsive mobile menu and improve header layout 2026-02-06 11:35:24 +07:00
707728b839 Merge pull request 'feat(about): Implement about API integration and migrate from static JSON' (#23) from feat/huy-05022026-about-api-integration into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#23
2026-02-06 03:31:45 +00:00
dc68fe17ab feat(about): Implement about API integration and migrate from static JSON 2026-02-06 02:01:42 +07:00
38ce6ab775 Merge pull request 'fix: update blog post URL handling to use API base URL instead of site URL' (#22) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#22
2026-02-05 14:40:41 +00:00
Wini_Fy
0ae455f3d2 fix: update blog post URL handling to use API base URL instead of site URL 2026-02-05 21:38:48 +07:00
f3b9c83575 Merge pull request 'feat: Refactor home page components' (#21) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#21
2026-02-05 14:21:34 +00:00
Wini_Fy
03263d5fb1 feat: Refactor home page components 2026-02-05 21:20:12 +07:00
5471f559f7 Merge pull request 'feat: Udpate api/index.ts' (#20) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#20
2026-02-05 09:16:59 +00:00
Wini_Fy
2a475901cc feat: Udpate api/index.ts 2026-02-05 16:14:40 +07:00
deec288c54 Merge pull request 'fea/thanh-02022026-news' (#19) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#19
2026-02-05 09:02:06 +00:00
Wini_Fy
9e6fc061a4 Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/hailearning.edu.vn into fea/thanh-02022026-news 2026-02-05 16:01:26 +07:00
774d531aa1 Merge pull request 'Add footer API integration' (#18) from feat/huy-05022026-add-ui-footer into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#18
2026-02-05 08:58:45 +00:00
Wini_Fy
11f435378f feat: implement initial home page with dynamic content, API, and dedicated components. 2026-02-05 15:56:06 +07:00
a85182ff20 Add footer API integration 2026-02-05 15:19:08 +07:00
857d250435 Merge pull request 'fea/thanh-02022026-news' (#17) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#17
2026-02-05 04:01:48 +00:00
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
57d6d460bd Merge pull request 'fea/hoang-05022026-Visa' (#15) from fea/hoang-05022026-Visa into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#15
2026-02-05 02:40:26 +00:00
r2xrzh9q2z-lab
1daf698f4a fix conflig merge 2026-02-05 09:20:12 +07:00
05772e5dc4 Merge pull request 'styling ui header menu' (#13) from refactor/huy-03022026-ui-header into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#13
2026-02-05 02:15:40 +00: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
f0a8f0fbac Merge pull request 'feat: add country API integration and image fallback component' (#11) from fix/bao-04022026-1440-Image-Page_Service into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#11
2026-02-04 08:34:26 +00: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
d46c420aaf Merge pull request 'feat/huy-02022026-ui-header-footer-homepage-aboutpage' (#6) from feat/huy-02022026-ui-header-footer-homepage-aboutpage into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#6
2026-02-04 03:07:35 +00: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
ff8424078b Merge pull request 'feat: Refactor blog components and add pagination' (#9) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#9
2026-02-04 02:29:27 +00: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
9bdfdd66f7 Merge pull request 'feat: refactor service API schema and update layout structure' (#8) from fix/bao-03022026-Page-Service-Service-Detail into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#8
2026-02-04 02:23:52 +00: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
64845c60b3 Merge pull request 'feat: add pricing page with API integration and dynamic rendering' (#7) from hoanganh-03022026-appointment-contact-pricing into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#7
2026-02-03 15:36:18 +00: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