Revert "chore(all): migrate to AY25/26"

This reverts commit c007533.

Author: ravern

MAINTENANCE.md

@@ -6,7 +6,7 @@ Create a new issue on GitHub with this checklist after the finals every semester
 
 - [ ] Update academic year and semester in `website/src/config/app-config.json`, and add current academic year to archive years
 - [ ] In `app-config.json`, update `examAvailability` to include only the semesters where exam information is available
-- [ ] Update `website/src/data/holidays.json` with latest holiday data from academic calendar
+- [ ] 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`
 - [ ] Update `website/src/data/academic-calendar.json` with data for the new academic year
 - [ ] Add announcement to website
 - [ ] Update academic year in `scrapers/nus-v2/src/config.ts`

scrapers/nus-v2/src/config.ts

@@ -44,7 +44,7 @@ const config: Config = {
   apiConcurrency: env.apiConcurrency || 5,
 
   // Other config
-  academicYear: '2025/2026',
+  academicYear: '2024/2025',
   dataPath: path.resolve(__dirname, '../data'),
 };
 

website/scripts/holidays/2025_singapore_holidays.csv

@@ -98,18 +98,6 @@ exports[`fetchAllModuleArchive should return multiple request actions 1`] = `
       "type": "FETCH_ARCHIVE_MODULE",
     },
   ],
-  [
-    {
-      "meta": {
-        "API_REQUEST": "FETCH_ARCHIVE_MODULE_CS1010S_2024/2025",
-        "academicYear": "2024/2025",
-      },
-      "payload": {
-        "url": "test://MOCK_MOD_DETAILS_URL/CS1010S/2024/2025",
-      },
-      "type": "FETCH_ARCHIVE_MODULE",
-    },
-  ],
 ]
 `;
 

website/scripts/holidays/2026_singapore_holidays.csv

@@ -1,10 +1,10 @@
 {
   "brandName": "NUSMods",
   "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.",
-  "academicYear": "2025/2026",
+  "academicYear": "2024/2025",
   "apiBaseUrl": "https://api.nusmods.com",
   "elasticsearchBaseUrl": "https://nusmods-search.es.ap-southeast-1.aws.found.io:9243",
-  "semester": 1,
+  "semester": 2,
   "disqusShortname": "nusmods-prod",
   "venueFeedbackApi": "https://nusmods-venue-github-hook.mods.workers.dev",
   "moduleErrorApi": "https://nusmods-module-error-reporting.mods.workers.dev",
@@ -16,8 +16,7 @@
     "2020/2021",
     "2021/2022",
     "2022/2023",
-    "2023/2024",
-    "2024/2025"
+    "2023/2024"
   ],
   "examAvailability": [
     1,
@@ -49,4 +48,4 @@
     "twitter": "https://twitter.com/nusmods",
     "telegram": "https://t.me/NUSMods"
   }
-}
+}

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

@@ -54,11 +54,5 @@
     "2": { "start": [2025, 1, 13] },
     "3": { "start": [2025, 5, 12] },
     "4": { "start": [2025, 6, 23] }
-  },
-  "2025/2026": {
-    "1": { "start": [2025, 8, 11] },
-    "2": { "start": [2026, 1, 12] },
-    "3": { "start": [2026, 5, 11] },
-    "4": { "start": [2026, 6, 22] }
   }
 }

website/src/config/app-config.json

@@ -69,13 +69,7 @@
   "2025-06-07",
   "2025-08-09",
   "2025-10-20",
+  "2025-10-21",
   "2025-12-25",
-  "2026-01-01",
-  "2026-02-17",
-  "2026-02-18",
-  "2026-03-21",
-  "2026-04-03",
-  "2026-05-01",
-  "2026-05-27",
-  "2026-06-01"
-]
+  "2026-01-01"
+]

website/src/data/academic-calendar.json

@@ -17,7 +17,6 @@ const enableAnnouncements = true;
  * dismissible, set the key to null. Otherwise, set it to a string.
  *
  * Previous keys:
- * - 'ay202526-new-data' - AY2025/26 data is available
  * - 'ay202425-new-data' - AY2024/25 data is available
  * - 'ay202324-new-data' - AY2023/24 data is available
  * - 'ay202223-new-data' - AY2022/23 data is available
@@ -32,7 +31,7 @@ const enableAnnouncements = true;
  * - 'ay201819-new-data' - AY2018/19 data is available
  * - 'ay201819-s2-new-data' - S2 data available
  */
-const key = announcementKey('ay202526-new-data');
+const key = announcementKey('ay202425-new-data');
 
 export const isNewCourseDataAnnoucement = () => {
   if (key) {
@@ -68,9 +67,9 @@ const Announcements = memo(() => {
       <Heart className={styles.backgroundIcon} />
 
       <div className={styles.body}>
-        <h3>AY2025/26 courses now available!</h3>
+        <h3>AY2024/25 courses now available!</h3>
         <p className={styles.bodyElement}>
-          NUSMods now has AY2025/26 course information available. The data is accurate but subject
+          NUSMods now has AY2024/25 course information available. The data is accurate but subject
           to changes.
         </p>
         <p className={styles.bodyElement}>