From 1408391125d8b9e84e43592bd78840cd1972ab16 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 21:32:03 +0000 Subject: [PATCH 1/5] Enter pre-release mode --- .changeset/pre.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .changeset/pre.json diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 000000000..5afe69743 --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,17 @@ +{ + "mode": "pre", + "tag": "beta", + "initialVersions": { + "admin-api": "1.3.1", + "admin-web": "1.3.0", + "api": "1.9.1", + "reg-scraper": "1.5.1", + "web": "1.12.0", + "web-e2e": "0.3.0", + "@cgr/codegen": "1.5.0", + "@cgr/course-utils": "1.3.0", + "@cgr/project-config": "1.3.0", + "@cgr/schema": "1.5.0" + }, + "changesets": [] +} From 5ae9440f0bb3a69e84151e6a67a1d1303cb46257 Mon Sep 17 00:00:00 2001 From: Nutthapat Pongtanyavichai Date: Wed, 15 Jan 2025 08:39:58 +0700 Subject: [PATCH 2/5] update default semester --- .changeset/silly-rivers-hear.md | 5 +++++ apps/web/src/common/constants/terms.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/silly-rivers-hear.md diff --git a/.changeset/silly-rivers-hear.md b/.changeset/silly-rivers-hear.md new file mode 100644 index 000000000..3624f454b --- /dev/null +++ b/.changeset/silly-rivers-hear.md @@ -0,0 +1,5 @@ +--- +"web": patch +--- + +feat: update default semester to 67/2 diff --git a/apps/web/src/common/constants/terms.ts b/apps/web/src/common/constants/terms.ts index 4a925f231..b9162320b 100644 --- a/apps/web/src/common/constants/terms.ts +++ b/apps/web/src/common/constants/terms.ts @@ -19,4 +19,4 @@ export const termOptions: TermOption[] = [ { academicYear: '2564', semester: '1', label: '2564/1' }, ] -export const tempHardCodedCurrentTerm = termOptions[2] +export const tempHardCodedCurrentTerm = termOptions[1] From 8a25424659c6ee3f1859d3bdd7dd09a02f1aae40 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 08:47:10 +0700 Subject: [PATCH 3/5] Version Packages (beta) (#730) Co-authored-by: github-actions[bot] --- .changeset/pre.json | 4 +++- apps/web/CHANGELOG.md | 6 ++++++ apps/web/package.json | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index 5afe69743..f8990e9b7 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -13,5 +13,7 @@ "@cgr/project-config": "1.3.0", "@cgr/schema": "1.5.0" }, - "changesets": [] + "changesets": [ + "silly-rivers-hear" + ] } diff --git a/apps/web/CHANGELOG.md b/apps/web/CHANGELOG.md index a23e1e31c..04ab55ff8 100644 --- a/apps/web/CHANGELOG.md +++ b/apps/web/CHANGELOG.md @@ -1,5 +1,11 @@ # web +## 1.12.1-beta.0 + +### Patch Changes + +- 5ae9440: feat: update default semester to 67/2 + ## 1.12.0 ### Minor Changes diff --git a/apps/web/package.json b/apps/web/package.json index 3a55949d0..d73dd1b69 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "web", - "version": "1.12.0", + "version": "1.12.1-beta.0", "private": true, "scripts": { "dev": "next dev -p 4200", From 6f3b048f58330c6694bc074e51487fd21b717a3c Mon Sep 17 00:00:00 2001 From: leomotors Date: Wed, 15 Jan 2025 01:48:43 +0000 Subject: [PATCH 4/5] Configure pre-release mode --- .changeset/pre.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index f8990e9b7..acb790d8b 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -1,5 +1,5 @@ { - "mode": "pre", + "mode": "exit", "tag": "beta", "initialVersions": { "admin-api": "1.3.1", From 08de7d9c1152ef051135a76ab66ffb3789e1c161 Mon Sep 17 00:00:00 2001 From: Nutthapat Pongtanyavichai Date: Wed, 15 Jan 2025 08:51:13 +0700 Subject: [PATCH 5/5] update announcement --- .../AnnouncementBar/announcements.ts | 19 +------------------ .../src/common/components/TopBar/index.tsx | 8 +------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/apps/web/src/common/components/TopBar/components/AnnouncementBar/announcements.ts b/apps/web/src/common/components/TopBar/components/AnnouncementBar/announcements.ts index 13d8b0c60..be56bdfda 100644 --- a/apps/web/src/common/components/TopBar/components/AnnouncementBar/announcements.ts +++ b/apps/web/src/common/components/TopBar/components/AnnouncementBar/announcements.ts @@ -2,28 +2,11 @@ import { AnnouncementItem } from '@web/common/components/TopBar/components/Annou // TODO Admin should be able to change the annoucement -export function getAnnouncement1(): AnnouncementItem { - return { - id: 'annoucement_1', - label: 'CU Get Reg เป็นเว็บไซต์ที่จัดทำโดยนิสิต ซึ่งได้รับการสนับสนุนเซิฟเวอร์จาก Reg Chula', - severity: 'info', - } -} - export function getNotRegChulaWarning(): AnnouncementItem { return { id: 'not_reg_chula', label: - 'CU Get Reg เป็นเพียงเครื่องมือที่ช่วยให้การวางแผนลงทะเบียนเรียนง่ายขึ้น แต่ไม่ใช่การลงทะเบียนเรียนจริง คุณสามารถลงทะเบียนเรียนได้ที่ https://www2.reg.chula.ac.th/ เพียงช่องทางเดียวเท่านั้น', + 'CU Get Reg เป็นเว็บไซต์ที่จัดทำโดยนิสิต ซึ่งได้รับการสนับสนุนเซิฟเวอร์จาก Reg Chula โดยเป็นเพียงเครื่องมือที่ช่วยให้การวางแผนลงทะเบียนเรียนง่ายขึ้น แต่ไม่ใช่การลงทะเบียนเรียนจริง คุณสามารถลงทะเบียนเรียนได้ที่ https://www2.reg.chula.ac.th/ เพียงช่องทางเดียวเท่านั้น', severity: 'warning', } } - -export function term67Issue(): AnnouncementItem { - return { - id: 'term_67_issue', - label: - 'ข้อมูลของปีการศึกษา 2567 จะยังมีไม่ครบ เนื่องจากปัญหาของการเชื่อมต่อระหว่าง CU Get Reg กับเว็บไซต์ของทะเบียนจุฬาฯ ขออภัยในความไม่สะดวก', - severity: 'error', - } -} diff --git a/apps/web/src/common/components/TopBar/index.tsx b/apps/web/src/common/components/TopBar/index.tsx index ab9d412d4..7e285136d 100644 --- a/apps/web/src/common/components/TopBar/index.tsx +++ b/apps/web/src/common/components/TopBar/index.tsx @@ -1,11 +1,7 @@ import { useRouter } from 'next/router' import { AnnouncementBar } from './components/AnnouncementBar' -import { - getAnnouncement1, - getNotRegChulaWarning, - term67Issue, -} from './components/AnnouncementBar/announcements' +import { getNotRegChulaWarning } from './components/AnnouncementBar/announcements' import { ConfigBar } from './components/ConfigBar' import { ConfigBarLayout } from './components/ConfigBar/styled' import { NavBar } from './components/NavBar' @@ -15,9 +11,7 @@ import { StickyContainer, StickySpace, TopBarLayout } from './styled' export function AnnouncementSection() { return ( <> - - ) }