From a9b4ef8e24f5d35f5ea8c496f063dc6208c0db86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katri=20Lotam=C3=B5is?= Date: Thu, 23 Oct 2025 12:03:31 +0300 Subject: [PATCH 1/4] Fix game name typo, add uni game under solo projects --- src/data/gamedev.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/data/gamedev.json b/src/data/gamedev.json index 0f7e36d..783204d 100644 --- a/src/data/gamedev.json +++ b/src/data/gamedev.json @@ -29,8 +29,8 @@ "description": "" }, { - "id": "cyber-dog-rogue", - "name": "Cyber Dog Rogue", + "id": "cyber-doc-rogue", + "name": "CYBER DOC ROGUE", "logo": "/images/EXPO/GameDev logos/Cyber_Doc_Rogue.png", "developer": "HRA Interactive", "description": "" @@ -126,6 +126,13 @@ "logo": "/images/EXPO/GameDev logos/War_torn.png", "developer": "KingOfTheEnd, ForgottenCup", "description": "" + }, + { + "id": "type-n-magic", + "name": "Type 'n Magic", + "logo": "/images/EXPO/ylikoolid/type_n_magic.png", + "developer": "Mikhail Fiadotau", + "description": "" } ], "universities": [ @@ -219,13 +226,6 @@ "logo": "/images/EXPO/ylikoolid/magic_mineral.png", "university": "Tallinna Ülikool", "description": "" - }, - { - "id": "type-n-magic", - "name": "Type 'n Magic", - "logo": "/images/EXPO/ylikoolid/type_n_magic.png", - "university": "Tallinna Ülikool", - "description": "" } ] } From a0b530379f22e21a421acbe9c57813d2db0aac3f Mon Sep 17 00:00:00 2001 From: v4ltages Date: Fri, 24 Oct 2025 17:13:47 +0300 Subject: [PATCH 2/4] Redirect to stream page for todays live feed --- next.config.ts | 14 ++++ src/app/[locale]/striim/page.tsx | 114 ++----------------------------- src/components/Sponsors.tsx | 13 ++-- 3 files changed, 29 insertions(+), 112 deletions(-) diff --git a/next.config.ts b/next.config.ts index d71ac07..069e25a 100644 --- a/next.config.ts +++ b/next.config.ts @@ -22,6 +22,20 @@ const nextConfig: NextConfig = { }, ]; }, + async redirects() { + return [ + { + source: "/et", + destination: "/striim", + permanent: false, + }, + { + source: "/en", + destination: "/stream", + permanent: false, + }, + ]; + }, }; export default withNextIntl(nextConfig); diff --git a/src/app/[locale]/striim/page.tsx b/src/app/[locale]/striim/page.tsx index f9a49b4..f6fd6a6 100644 --- a/src/app/[locale]/striim/page.tsx +++ b/src/app/[locale]/striim/page.tsx @@ -1,7 +1,8 @@ import { vipnagorgialla } from "@/components/Vipnagorgialla"; -import Link from "next/link"; -import Image from "next/image"; +import Sponsors from "@/components/Sponsors"; +import { Link } from "@/i18n/routing"; import { getTranslations, setRequestLocale } from "next-intl/server"; +import Image from "next/image"; export default async function Home({ params, @@ -73,7 +74,7 @@ export default async function Home({ >

{t("navigation.tournaments")}

@@ -129,114 +130,11 @@ export default async function Home({

- 24.-26. okt. + {t("home.sections.dateAndLocation")}

{/* Sponsors */} -
-
-

- {t("home.sections.poweredBy")} -

-
- - Taltech (Tallinna Tehnikaülikool) - - - Redbull - - - Alecoq - - - EVAL - - - Balsnack - - - LVLup! - - - BFGL - - - Tallinna Haridusamet - - - Militaarseiklus - - - Arvutimuuseum - -
-
-
+ ); } diff --git a/src/components/Sponsors.tsx b/src/components/Sponsors.tsx index a3d025c..d778ff0 100644 --- a/src/components/Sponsors.tsx +++ b/src/components/Sponsors.tsx @@ -8,7 +8,10 @@ interface SponsorsProps { className?: string; } -export default function Sponsors({ showTitle = true, className = "" }: SponsorsProps) { +export default function Sponsors({ + showTitle = true, + className = "", +}: SponsorsProps) { const t = useTranslations(); return ( @@ -109,7 +112,10 @@ export default function Sponsors({ showTitle = true, className = "" }: SponsorsP className="object-contain" /> - + Estonian Gamedev Guild @@ -190,7 +196,6 @@ export default function Sponsors({ showTitle = true, className = "" }: SponsorsP className="object-contain" /> - From a645d18b1fd56e9a1a346d419e3581cdcbbdbadc Mon Sep 17 00:00:00 2001 From: v4ltages Date: Fri, 24 Oct 2025 17:21:00 +0300 Subject: [PATCH 3/4] Gray out mini-tournament rules div --- src/app/[locale]/reeglid/page.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/[locale]/reeglid/page.tsx b/src/app/[locale]/reeglid/page.tsx index a84b859..48dbcc8 100644 --- a/src/app/[locale]/reeglid/page.tsx +++ b/src/app/[locale]/reeglid/page.tsx @@ -9,17 +9,17 @@ export default async function RulesMenu({ params: Promise<{ locale: string }>; }) { const { locale } = await params; - + setRequestLocale(locale); - + const t = await getTranslations({ locale }); - + const headingStyle = `text-4xl md:text-5xl lg:text-6xl ${vipnagorgialla.className} font-bold italic text-[#2A2C3F] dark:text-[#EEE5E5] uppercase`; const boxStyle = `-skew-x-2 md:-skew-x-5 text-white md:px-12 hover:scale-103 transition-all duration-150 w-full md:w-xl lg:w-[400px]`; const boxTextStyle = `text-2xl md:text-3xl ${vipnagorgialla.className} font-bold uppercase text-[#EEE5E5] pb-2 break-normal whitespace-pre-line`; - + return (
@@ -49,11 +49,11 @@ export default async function RulesMenu({ {/* Minitourn. link coming soon*/} {/**/} {/* ajutine div. kui asendate lingiga, siis saab selle ära võtta */} -
-
-

- {t("rules.miniRules")} -

+
+
+

{t("rules.miniRules")}

{/**/} From e8c7da793f266dd1ac8236a312f5a2af0b8837fd Mon Sep 17 00:00:00 2001 From: v4ltages Date: Fri, 24 Oct 2025 17:29:45 +0300 Subject: [PATCH 4/4] Remove left over boardgames area in student house --- src/app/[locale]/messiala/page.tsx | 64 +++++++++++++----------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/src/app/[locale]/messiala/page.tsx b/src/app/[locale]/messiala/page.tsx index a3e6ec3..8cc4424 100644 --- a/src/app/[locale]/messiala/page.tsx +++ b/src/app/[locale]/messiala/page.tsx @@ -583,16 +583,6 @@ export default function Expo() { EVAL
- {/* Board Games */} -
-
- - {t("expo.areas.boardGames")} - -
{/* LVLup */}

- TipiLANil toimub mitmeid erinevaid lõbusaid ja võistlushimu tekitavaid miniturniire. Osaleda saavad ka niisama külastajad! Auhinnafond on kõigi turniiride peale 1250€. + TipiLANil toimub mitmeid erinevaid lõbusaid ja võistlushimu + tekitavaid miniturniire. Osaleda saavad ka niisama külastajad! + Auhinnafond on kõigi turniiride peale 1250€.

@@ -876,11 +868,11 @@ export default function Expo() { src="/images/minitournament_logo.png" alt="Miniturniirid logo" style={{ - width: '649.7214965820312px', - height: '400.99997840027544px', - transform: 'rotate(0deg)', + width: "649.7214965820312px", + height: "400.99997840027544px", + transform: "rotate(0deg)", opacity: 1, - position: 'relative' + position: "relative", }} />
@@ -895,7 +887,7 @@ export default function Expo() { > PUHKA JA MÄNGI - +
{/* Card 1 - Chill-ala */}
@@ -908,15 +900,15 @@ export default function Expo() { />
-

Chill-ala koos turniiride otseülekandega @@ -934,15 +926,15 @@ export default function Expo() { />

-

Mänguklubi lauamängud ja konsoolid @@ -960,15 +952,15 @@ export default function Expo() { />

-

Baariala jookide ja snäkkidega @@ -986,7 +978,7 @@ export default function Expo() { > Eesti mänguarendajad

- +
{gamedevData.games.map((game) => (
@@ -1017,7 +1009,7 @@ export default function Expo() { > Ülikoolid - + {/* First 12 games in 3x4 grid */}
{gamedevData.universities?.slice(0, 12).map((university) => (