Commit Graph

105 Commits

Author SHA1 Message Date
691d655b69 Merge pull request 'refactor: merge code and update main.css, delete file css in component' (#5) from fea/nhat-13042026-fe-home-about into fea/nhat-13042026-merge-kiet-thien
Reviewed-on: #5
2026-04-14 19:34:05 +00:00
Đỗ Minh Nhật
f00283dfe1 refactor: merge code and update main.css, delete file css in component 2026-04-15 02:32:40 +07:00
8af38b8ae2 Merge pull request 'fea/thien-14042026-fe-publications-research' (#4) from fea/thien-14042026-fe-publications-research into fea/nhat-13042026-merge-kiet-thien
Reviewed-on: #4
2026-04-14 17:39:54 +00:00
VuHoangThien
45ba12e41e feat: complete publications and research sections and resolve conflicts 2026-04-14 23:51:53 +07:00
VuHoangThien
a7356cdb7a fix: resolve merge conflict in globals.css 2026-04-14 23:43:14 +07:00
f82c4626c1 Merge pull request 'feat: Create FE home page and about page' (#3) from fea/nhat-13042026-fe-home-about into fea/nhat-13042026-merge-kiet-thien
Reviewed-on: #3
2026-04-14 12:28:26 +00:00
Đỗ Minh Nhật
637846a80c feat: Create FE home page and about page 2026-04-14 19:28:35 +07:00
13a281b8c8 Merge pull request 'feat: add Contact and Accreditation pages' (#2) from fea/kiet-13042026-fe-contactus-accreditaton into fea/nhat-13042026-merge-kiet-thien
Reviewed-on: #2
2026-04-14 09:05:29 +00:00
hkiett265
10103806bb feat: add Contact and Accreditation pages 2026-04-14 16:00:11 +07:00
15a0b8824a Merge pull request 'fea/kiet-13042026-fe-partnerships-blog' (#1) from fea/kiet-13042026-fe-partnerships-blog into fea/nhat-13042028-merge-kiet-thien
Reviewed-on: #1
2026-04-14 08:51:10 +00:00
hkiett265
4bfad8481b feat: create Partnership and Blog functional components 2026-04-14 11:40:55 +07:00
hkiett265
ad68b7d8c4 feat: create Partnership component and styles 2026-04-13 22:15:20 +07:00
8592f68918 chore 2026-04-06 15:26:52 +00:00
966c3c3d76 Merge pull request 'chore: add SCSS build and watch scripts, update theme colors, and comment out text-transform properties in various styles' (#36) from fix/thanh-23032026-style-scss into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#36
2026-03-23 13:24:50 +00:00
Wini_Fy
96a97500c8 Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/hailearning.edu.vn into fix/thanh-23032026-style-scss 2026-03-23 13:24:52 +07:00
Wini_Fy
f1f49759ad chore: add SCSS build and watch scripts, update theme colors, and comment out text-transform properties in various styles 2026-03-23 13:17:55 +07:00
53cbb252dc update theme color 2026-03-11 09:19:59 +07:00
5e48207198 add standalone code 2026-03-07 17:47:50 +07:00
3d95348b92 merge code 2026-03-07 16:56:49 +07:00
e00d6bf4fb del package-lock json to git ignore 2026-03-07 16:55:53 +07:00
b3b5ff01c9 Merge pull request 'chore: update dependencies including axios and babel packages' (#35) from fix/bao-06032026-update-json into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#35
2026-03-07 09:33:51 +00:00
nguyenvanbao
3245827317 chore: update dependencies including axios and babel packages
- Add axios ^1.13.4 as a new dependency
- Update @babel/code-frame from 7.28.6 to 7.29.0
- Update @babel/compat-data from 7.28.6 to 7.29.0
- Update @babel/core from 7.28.6 to 7.29.0
- Update @babel/generator from 7.28.6 to 7.29.1
- Update @babel/parser from 7.28.6 to 7.29.0
- Update @babel/traverse from 7.28.6 to 7.29.0
- Update @babel/types from 7.28.6 to 7.29.0
- Update @eslint/eslintrc from 3.3.3 to 3.3.4
- Update @eslint/js from 9.39.2 to 9.39.3
- Update ajv dependency constraint in @eslint/eslintrc
- Update minimatch dependency constraint in @eslint/eslintrc
2026-03-06 10:00:04 +07:00
cffb4a22e7 Merge pull request 'feat: rebrand to H.A.I Learning with updated loader and assets' (#34) from fea/bao-05032026-hailearning into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#34
2026-03-05 10:08:34 +00:00
nguyenvanbao
6d9fd6beec feat: rebrand to H.A.I Learning with updated loader and assets 2026-03-05 17:07:38 +07:00
fa943bb311 Merge pull request 'refactor: centralize data fetching in layout components' (#33) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#33
2026-02-10 03:36:29 +00:00
Wini_Fy
1d901dec07 refactor: centralize data fetching in layout components 2026-02-10 10:24:48 +07:00
eecd48913a Merge pull request 'feat: implement a new responsive mobile header and slide-out menu system with multi-level submenus.' (#32) from hoanganh-03022026-appointment-contact-pricing into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#32
2026-02-09 06:24:05 +00:00
LNHA
40840ed324 feat: implement a new responsive mobile header and slide-out menu system with multi-level submenus. 2026-02-09 13:21:13 +07:00
976221c826 Merge pull request 'add favicon' (#31) from chore/huy-07022026-add-favicon into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#31
2026-02-08 05:11:57 +00:00
f776512469 add favicon 2026-02-07 22:14:00 +07:00
9cc620dade Merge pull request 'fix: comment out desktop button visibility in header responsive CSS' (#30) from hoanganh-03022026-appointment-contact-pricing into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#30
2026-02-07 03:38:41 +00:00
LNHA
38b5054b34 fix: comment out desktop button visibility in header responsive CSS 2026-02-07 10:31:22 +07:00
11a52d932b Merge pull request 'style(home): Improve image alignment in Partners component' (#29) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#29
2026-02-06 07:14:47 +00:00
Wini_Fy
1303883217 style(home): Improve image alignment in Partners component 2026-02-06 13:55:35 +07:00
f8189185cc Merge pull request 'fea/thanh-02022026-news' (#28) from fea/thanh-02022026-news into main
Reviewed-on: UKSOURCE/hailearning.edu.vn#28
2026-02-06 05:42:57 +00:00
Wini_Fy
5fac4b1459 feat(app): migrate from pages router to app router 2026-02-06 12:41:52 +07:00
Wini_Fy
7daddb2e8c feat: update .env.example 2026-02-06 12:26:06 +07:00
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