Fix timetable logic and data

2026-09-22 15:22:59 +00:00 · 2026-09-12 10:40:04 +03:00
parent e636ebd0b3
commit 3bd9400489
4 changed files with 179 additions and 92 deletions
--- a/src/app/[locale]/ajakava/page.tsx
+++ b/src/app/[locale]/ajakava/page.tsx
@@ -14,11 +14,11 @@ const FILTER_MAP: Record<string, string[]> = {
  auditorium: ['auditorium'],
  tudengimaja: ['studentHouse'],
  studenthouse: ['studentHouse'],
-  fuajee: ['lobbyAndLanArea'],
-  foyer: ['lobbyAndLanArea'],
-  lan: ['lobbyAndLanArea'],
-  lanarea: ['lobbyAndLanArea'],
-  lobby: ['lobbyAndLanArea'],
+  fuajee: ['lobby'],
+  foyer: ['lobby'],
+  lan: ['lanArea'],
+  lanarea: ['lanArea'],
+  lobby: ['lobby'],
 };

 function matchesFilter(item: ScheduleItem, filter: string): boolean {
@@ -154,7 +154,21 @@ export default function Timetable() {
                : "bg-[#1F5673] text-[#EEE5E5] hover:bg-[#00A3E0] hover:text-black"
            }`}
          >
-            {t("schedule.locations.lobbyAndLanArea")}
+            {t("schedule.locations.lobby")}
+          </button>
+          <button
+            onClick={() => {
+              const url = new URL(window.location.href);
+              url.searchParams.set('filter', 'lan');
+              window.history.pushState({}, '', url.toString());
+            }}
+            className={`${vipnagorgialla.className} font-bold italic leading-none text-lg uppercase px-4 py-2 border-4 border-[#00A3E0] transition cursor-pointer ${
+              filter === 'lan'
+                ? "bg-[#00A3E0] text-black cursor-default pointer-events-none"
+                : "bg-[#1F5673] text-[#EEE5E5] hover:bg-[#00A3E0] hover:text-black"
+            }`}
+          >
+            {t("schedule.locations.lanArea")}
          </button>
        </div>

--- a/src/data/timetable.ts
+++ b/src/data/timetable.ts
@@ -12,60 +12,47 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
      locationKey: [
        "schedule.locations.auditorium",
        "schedule.locations.studentHouse",
-        "schedule.locations.lobbyAndLanArea"
+        "schedule.locations.lobby",
+        "schedule.locations.lanArea"
      ],
      time: "17:00",
    },
-    {
-      titleKey: "schedule.events.gamersSetup",
-      locationKey: [
-        "schedule.locations.auditorium",
-        "schedule.locations.studentHouse"
-      ],
-      time: "17:00-19:00",
-    },
    {
      titleKey: "schedule.events.exploring",
      locationKey: [
-        "schedule.locations.auditorium",
-        "schedule.locations.studentHouse"
+        "schedule.locations.studentHouse",
+        "schedule.locations.lanArea"
      ],
      time: "17:00-18:00",
    },
    {
      titleKey: "schedule.events.gameDevShowcasing",
-      locationKey: "schedule.locations.lobbyAndLanArea",
+      locationKey: "schedule.locations.lobby",
      time: "17:00-00:00",
    },
    {
      titleKey: "schedule.events.miniTournaments",
      locationKey: "schedule.locations.studentHouse",
-      time: "18:00",
+      time: "18:00-20:30",
    },
    {
      titleKey: "schedule.events.lanAreaTournaments",
-      locationKey: "schedule.locations.lobbyAndLanArea",
+      locationKey: "schedule.locations.lanArea",
      time: "18:00-00:00",
    },
    {
-      titleKey: "schedule.events.minigamesAndTournaments",
-      locationKey: "schedule.locations.lobbyAndLanArea",
-      time: "18:00-00:00",
+      titleKey: "schedule.events.miniTournaments",
+      locationKey: "schedule.locations.studentHouse",
+      time: "22:30-00:00",
    },
    {
      titleKey: "schedule.events.blueCarpet",
-      locationKey: [
-        "schedule.locations.auditorium",
-        "schedule.locations.studentHouse"
-      ],
+      locationKey: "schedule.locations.auditorium",
      time: "19:00",
    },
    {
      titleKey: "schedule.events.day1Begins",
-      locationKey: [
-        "schedule.locations.auditorium",
-        "schedule.locations.studentHouse"
-      ],
+      locationKey: "schedule.locations.auditorium",
      time: "19:30",
    },
    {
@@ -88,6 +75,16 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
      locationKey: "schedule.locations.auditorium",
      time: "21:00-22:00",
    },
+    {
+      titleKey: "schedule.events.ssbuFinal",
+      locationKey: "schedule.locations.studentHouse",
+      time: "21:00-21:30",
+    },
+    {
+      titleKey: "schedule.events.streetFighter6Final",
+      locationKey: "schedule.locations.studentHouse",
+      time: "21:30-22:00",
+    },
    {
      titleKey: "schedule.events.cs2SwissR3",
      locationKey: "schedule.locations.auditorium",
@@ -98,6 +95,16 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
      locationKey: "schedule.locations.auditorium",
      time: "22:00-23:00",
    },
+    {
+      titleKey: "schedule.events.invincibleVsFinal",
+      locationKey: "schedule.locations.studentHouse",
+      time: "22:00-22:30",
+    },
+    {
+      titleKey: "schedule.events.quakeDeathmatch",
+      locationKey: "schedule.locations.studentHouse",
+      time: "20:30-21:00",
+    },
    {
      titleKey: "schedule.events.cs2SwissR4",
      locationKey: "schedule.locations.auditorium",
@@ -118,9 +125,10 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
      locationKey: [
        "schedule.locations.auditorium",
        "schedule.locations.studentHouse",
-        "schedule.locations.lobbyAndLanArea"
+        "schedule.locations.lobby",
+        "schedule.locations.lanArea"
      ],
-      time: "~01:00",
+      time: "~02:00",
    },
  ],
  sep12: [
@@ -129,20 +137,11 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
      locationKey: [
        "schedule.locations.auditorium",
        "schedule.locations.studentHouse",
-        "schedule.locations.lobbyAndLanArea"
+        "schedule.locations.lobby",
+        "schedule.locations.lanArea"
      ],
      time: "09:00",
    },
-    {
-      titleKey: "schedule.events.gamersSetup",
-      locationKey: "schedule.locations.auditorium",
-      time: "09:00-10:30",
-    },
-    {
-      titleKey: "schedule.events.gamersSetup",
-      locationKey: "schedule.locations.studentHouse",
-      time: "09:00-11:30",
-    },
    {
      titleKey: "schedule.events.cs2WbR1",
      locationKey: "schedule.locations.auditorium",
@@ -165,18 +164,33 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
    },
    {
      titleKey: "schedule.events.expoOpens",
-      locationKey: "schedule.locations.lobbyAndLanArea",
-      time: "12:00",
+      locationKey: "schedule.locations.lobby",
+      time: "09:00",
+    },
+    {
+      titleKey: "schedule.events.lanAreaOpens",
+      locationKey: "schedule.locations.lanArea",
+      time: "10:00",
+    },
+    {
+      titleKey: "schedule.events.studentHouseOpens",
+      locationKey: "schedule.locations.studentHouse",
+      time: "10:00",
    },
    {
      titleKey: "schedule.events.gamedevExpo",
-      locationKey: "schedule.locations.lobbyAndLanArea",
-      time: "12:00-19:00",
+      locationKey: "schedule.locations.lobby",
+      time: "09:00-19:00",
    },
    {
      titleKey: "schedule.events.miniTournaments",
-      locationKey: "schedule.locations.lobbyAndLanArea",
-      time: "13:00-19:00",
+      locationKey: "schedule.locations.studentHouse",
+      time: "10:00-17:00",
+    },
+    {
+      titleKey: "schedule.events.lanAreaTournaments",
+      locationKey: "schedule.locations.lanArea",
+      time: "10:00-22:00",
    },
    {
      titleKey: "schedule.events.cs2LbR1",
@@ -225,17 +239,42 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
    },
    {
      titleKey: "schedule.events.break",
+      locationKey: "schedule.locations.auditorium",
+      time: "17:30-19:00",
+    },
+    {
+      titleKey: "schedule.events.avatarLegendsFinal",
+      locationKey: "schedule.locations.studentHouse",
+      time: "19:00-19:30",
+    },
+    {
+      titleKey: "schedule.events.rlFinal",
+      locationKey: "schedule.locations.studentHouse",
+      time: "17:00-18:00",
+    },
+    {
+      titleKey: "schedule.events.cs16Final",
+      locationKey: "schedule.locations.studentHouse",
+      time: "17:00-18:00",
+    },
+    {
+      titleKey: "schedule.events.osuFinal",
+      locationKey: "schedule.locations.studentHouse",
+      time: "17:00-18:00",
+    },
+    {
+      titleKey: "schedule.events.eaFc26Final",
+      locationKey: "schedule.locations.studentHouse",
+      time: "17:00-18:00",
+    },
+    {
+      titleKey: "schedule.events.evalHfdAndFinal",
      locationKey: "schedule.locations.studentHouse",
      time: "18:00-19:00",
    },
-    {
-      titleKey: "schedule.events.avatarLegendsFinal",
-      locationKey: "schedule.locations.lobbyAndLanArea",
-      time: "19:00-19:30",
-    },
    {
      titleKey: "schedule.events.gamedevAwardCeremony",
-      locationKey: "schedule.locations.lobbyAndLanArea",
+      locationKey: "schedule.locations.lobby",
      time: "19:00-20:00",
    },
    {
@@ -255,43 +294,43 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
    },
    {
      titleKey: "schedule.events.tekken8Final",
-      locationKey: "schedule.locations.lobbyAndLanArea",
-      time: "19:30-20:00",
+      locationKey: "schedule.locations.studentHouse",
+      time: "18:00-18:30",
    },
    {
-      titleKey: "schedule.events.streetFighter6Final",
-      locationKey: "schedule.locations.lobbyAndLanArea",
-      time: "20:00-20:30",
+      titleKey: "schedule.events.tokonFinal",
+      locationKey: "schedule.locations.studentHouse",
+      time: "18:30-19:00",
    },
    {
      titleKey: "schedule.events.gamedevExpo",
-      locationKey: "schedule.locations.lobbyAndLanArea",
+      locationKey: "schedule.locations.lobby",
      time: "20:00-00:00",
    },
    {
      titleKey: "schedule.events.twoXkoFinal",
-      locationKey: "schedule.locations.lobbyAndLanArea",
-      time: "20:30-21:00",
+      locationKey: "schedule.locations.studentHouse",
+      time: "19:30-20:00",
+    },
+    {
+      titleKey: "schedule.events.gt7HfdAndFinal",
+      locationKey: "schedule.locations.studentHouse",
+      time: "19:00-20:00",
    },
    {
      titleKey: "schedule.events.cs2ScLbR5",
      locationKey: "schedule.locations.auditorium",
      time: "20:30-21:30",
    },
-    {
-      titleKey: "schedule.events.ssbuFinal",
-      locationKey: "schedule.locations.lobbyAndLanArea",
-      time: "21:00-21:30",
-    },
    {
      titleKey: "schedule.events.cs2ScTournamentFinal",
      locationKey: "schedule.locations.auditorium",
-      time: "21:30-23:30",
+      time: "22:30-00:30",
    },
    {
-      titleKey: "schedule.events.invincibleVsFinal",
-      locationKey: "schedule.locations.lobbyAndLanArea",
-      time: "21:30-22:00",
+      titleKey: "schedule.events.cs2ScLbR6",
+      locationKey: "schedule.locations.auditorium",
+      time: "21:30-22:30",
    },
    {
      titleKey: "schedule.events.cs2LbR3",
@@ -300,9 +339,27 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
    },
    {
      titleKey: "schedule.events.miniTournamentsAwardCeremony",
-      locationKey: "schedule.locations.lobbyAndLanArea",
+      locationKey: "schedule.locations.studentHouse",
      time: "22:00-22:30",
    },
+    {
+      titleKey: "schedule.events.lanAreaAwardCeremony",
+      locationKey: [
+        "schedule.locations.studentHouse",
+        "schedule.locations.lanArea"
+      ],
+      time: "22:00-22:30",
+    },
+    {
+      titleKey: "schedule.events.lanAreaFunTime",
+      locationKey: "schedule.locations.lanArea",
+      time: "22:30-00:00",
+    },
+    {
+      titleKey: "schedule.events.exploring",
+      locationKey: "schedule.locations.studentHouse",
+      time: "22:30-00:00",
+    },
    {
      titleKey: "schedule.events.cs2LbR4",
      locationKey: "schedule.locations.auditorium",
@@ -310,13 +367,13 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
    },
    {
      titleKey: "schedule.events.awardCeremony",
-      locationKey: "schedule.locations.lobbyAndLanArea",
+      locationKey: "schedule.locations.auditorium",
      time: "00:00-00:30",
    },
    {
      titleKey: "schedule.events.doorsClose",
      locationKey: "schedule.locations.auditorium",
-      time: "~01:30",
+      time: "~02:00",
    },
  ],
  sep13: [
@@ -324,7 +381,8 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
      titleKey: "schedule.events.noEventsScheduled",
      locationKey: [
        "schedule.locations.studentHouse",
-        "schedule.locations.lobbyAndLanArea"
+        "schedule.locations.lobby",
+        "schedule.locations.lanArea"
      ],
      time: "-",
    },
@@ -333,11 +391,6 @@ export const scheduleData: Record<string, ScheduleItem[]> = {
      locationKey: "schedule.locations.auditorium",
      time: "09:00",
    },
-    {
-      titleKey: "schedule.events.gamersSetup",
-      locationKey: "schedule.locations.auditorium",
-      time: "09:30-10:30",
-    },
    {
      titleKey: "schedule.events.cs2WbR4",
      locationKey: "schedule.locations.auditorium",