Skip to content

Commit c007533

Browse files
committed
chore(all): migrate to AY25/26
1 parent cb03f25 commit c007533

File tree

9 files changed

+61
-12
lines changed

9 files changed

+61
-12
lines changed

MAINTENANCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Create a new issue on GitHub with this checklist after the finals every semester
66

77
- [ ] Update academic year and semester in `website/src/config/app-config.json`, and add current academic year to archive years
88
- [ ] In `app-config.json`, update `examAvailability` to include only the semesters where exam information is available
9-
- [ ] Update with next year's holiday data from https://github.com/rjchow/singapore_public_holidays and delete old data, then run `scripts/holidays-csv-to-json.js`
9+
- [ ] Update `website/src/data/holidays.json` with latest holiday data from academic calendar
1010
- [ ] Update `website/src/data/academic-calendar.json` with data for the new academic year
1111
- [ ] Add announcement to website
1212
- [ ] Update academic year in `scrapers/nus-v2/src/config.ts`

scrapers/nus-v2/src/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const config: Config = {
4444
apiConcurrency: env.apiConcurrency || 5,
4545

4646
// Other config
47-
academicYear: '2024/2025',
47+
academicYear: '2025/2026',
4848
dataPath: path.resolve(__dirname, '../data'),
4949
};
5050

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Date,Name,Day,Observance,Observance Strategy
2+
2025-01-01,New Year's Day,Wednesday,2025-01-01,actual_day
3+
2025-01-29,Chinese New Year Day 1,Wednesday,2025-01-29,actual_day
4+
2025-01-30,Chinese New Year Day 2,Thursday,2025-01-30,actual_day
5+
2025-04-18,Good Friday,Friday,2025-04-18,actual_day
6+
2025-05-01,Labour Day,Thursday,2025-05-01,actual_day
7+
2025-05-12,Vesak Day,Monday,2025-05-12,actual_day
8+
2025-06-06,Hari Raya Haji,Friday,2025-06-06,actual_day
9+
2025-08-09,National Day,Saturday,2025-08-09,actual_day
10+
2025-10-20,Deepavali,Monday,2025-10-20,actual_day
11+
2025-12-25,Christmas Day,Thursday,2025-12-25,actual_day
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Date,Name,Day,Observance,Observance Strategy
2+
2026-01-01,New Year's Day,Thursday,2026-01-01,actual_day
3+
2026-02-17,Chinese New Year Day 1,Tuesday,2026-02-17,actual_day
4+
2026-02-18,Chinese New Year Day 2,Wednesday,2026-02-18,actual_day
5+
2026-03-21,Hari Raya Puasa,Saturday,2026-03-21,actual_day
6+
2026-04-03,Good Friday,Friday,2026-04-03,actual_day
7+
2026-05-01,Labour Day,Friday,2026-05-01,actual_day
8+
2026-05-01,Vesak Day,Friday,2026-05-01,actual_day
9+
2026-05-30,Hari Raya Haji,Saturday,2026-05-30,actual_day
10+
2026-08-09,National Day,Sunday,2026-08-10,next_monday
11+
2026-10-08,Deepavali,Thursday,2026-10-08,actual_day
12+
2026-12-25,Christmas Day,Friday,2026-12-25,actual_day

website/src/actions/__snapshots__/moduleBank.test.ts.snap

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,18 @@ exports[`fetchAllModuleArchive should return multiple request actions 1`] = `
9898
"type": "FETCH_ARCHIVE_MODULE",
9999
},
100100
],
101+
[
102+
{
103+
"meta": {
104+
"API_REQUEST": "FETCH_ARCHIVE_MODULE_CS1010S_2024/2025",
105+
"academicYear": "2024/2025",
106+
},
107+
"payload": {
108+
"url": "test://MOCK_MOD_DETAILS_URL/CS1010S/2024/2025",
109+
},
110+
"type": "FETCH_ARCHIVE_MODULE",
111+
},
112+
],
101113
]
102114
`;
103115

website/src/config/app-config.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"brandName": "NUSMods",
33
"defaultDescription": "NUSMods is a timetable builder and knowledge platform, providing students with a better way to plan their school timetable and useful module-related information that are community-driven.",
4-
"academicYear": "2024/2025",
4+
"academicYear": "2025/2026",
55
"apiBaseUrl": "https://api.nusmods.com",
66
"elasticsearchBaseUrl": "https://nusmods-search.es.ap-southeast-1.aws.found.io:9243",
7-
"semester": 2,
7+
"semester": 1,
88
"disqusShortname": "nusmods-prod",
99
"venueFeedbackApi": "https://nusmods-venue-github-hook.mods.workers.dev",
1010
"moduleErrorApi": "https://nusmods-module-error-reporting.mods.workers.dev",
@@ -16,7 +16,8 @@
1616
"2020/2021",
1717
"2021/2022",
1818
"2022/2023",
19-
"2023/2024"
19+
"2023/2024",
20+
"2024/2025"
2021
],
2122
"examAvailability": [
2223
1,
@@ -48,4 +49,4 @@
4849
"twitter": "https://twitter.com/nusmods",
4950
"telegram": "https://t.me/NUSMods"
5051
}
51-
}
52+
}

website/src/data/academic-calendar.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,11 @@
5454
"2": { "start": [2025, 1, 13] },
5555
"3": { "start": [2025, 5, 12] },
5656
"4": { "start": [2025, 6, 23] }
57+
},
58+
"2025/2026": {
59+
"1": { "start": [2025, 8, 11] },
60+
"2": { "start": [2026, 1, 12] },
61+
"3": { "start": [2026, 5, 11] },
62+
"4": { "start": [2026, 6, 22] }
5763
}
5864
}

website/src/data/holidays.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,13 @@
6969
"2025-06-07",
7070
"2025-08-09",
7171
"2025-10-20",
72-
"2025-10-21",
7372
"2025-12-25",
74-
"2026-01-01"
75-
]
73+
"2026-01-01",
74+
"2026-02-17",
75+
"2026-02-18",
76+
"2026-03-21",
77+
"2026-04-03",
78+
"2026-05-01",
79+
"2026-05-27",
80+
"2026-06-01"
81+
]

website/src/views/components/notfications/Announcements.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const enableAnnouncements = true;
1717
* dismissible, set the key to null. Otherwise, set it to a string.
1818
*
1919
* Previous keys:
20+
* - 'ay202526-new-data' - AY2025/26 data is available
2021
* - 'ay202425-new-data' - AY2024/25 data is available
2122
* - 'ay202324-new-data' - AY2023/24 data is available
2223
* - 'ay202223-new-data' - AY2022/23 data is available
@@ -31,7 +32,7 @@ const enableAnnouncements = true;
3132
* - 'ay201819-new-data' - AY2018/19 data is available
3233
* - 'ay201819-s2-new-data' - S2 data available
3334
*/
34-
const key = announcementKey('ay202425-new-data');
35+
const key = announcementKey('ay202526-new-data');
3536

3637
export const isNewCourseDataAnnoucement = () => {
3738
if (key) {
@@ -67,9 +68,9 @@ const Announcements = memo(() => {
6768
<Heart className={styles.backgroundIcon} />
6869

6970
<div className={styles.body}>
70-
<h3>AY2024/25 courses now available!</h3>
71+
<h3>AY2025/26 courses now available!</h3>
7172
<p className={styles.bodyElement}>
72-
NUSMods now has AY2024/25 course information available. The data is accurate but subject
73+
NUSMods now has AY2025/26 course information available. The data is accurate but subject
7374
to changes.
7475
</p>
7576
<p className={styles.bodyElement}>

0 commit comments

Comments
 (0)