Merge pull request #101 from Lapikud/development

Redirect to stream page, fix typos and other minor issues

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);

src/app/[locale]/messiala/page.tsx

@@ -583,16 +583,6 @@ export default function Expo() {
                   EVAL
                 </span>
               </div>
-              {/* Board Games */}
-              <div className="flex items-center gap-2">
-                <div
-                  className="w-4 h-4 border border-gray-300"
-                  style={{ backgroundColor: "#343434" }}
-                ></div>
-                <span className="text-sm text-[#2A2C3F] dark:text-[#EEE5E5]">
-                  {t("expo.areas.boardGames")}
-                </span>
-              </div>
               {/* LVLup */}
               <div className="flex items-center gap-2">
                 <div
@@ -868,7 +858,9 @@ export default function Expo() {
             MINITURNIIRID
           </h2>
           <p className="text-[#2A2C3F] dark:text-[#EEE5E5] text-lg mb-4">
-            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€.
           </p>
         </div>
         <div className="flex-shrink-0 relative overflow-hidden">
@@ -876,11 +868,11 @@ export default function Expo() {
             src="/images/minitournament_logo.png"
             alt="Miniturniirid logo"
             style={{
-              width: '649.7214965820312px',
+              width: "649.7214965820312px",
-              height: '400.99997840027544px',
+              height: "400.99997840027544px",
-              transform: 'rotate(0deg)',
+              transform: "rotate(0deg)",
               opacity: 1,
-              position: 'relative'
+              position: "relative",
             }}
           />
         </div>
@@ -911,12 +903,12 @@ export default function Expo() {
             <h3
               className="text-[#2A2C3F] dark:text-[#EEE5E5]"
               style={{
-                fontFamily: 'Work Sans',
+                fontFamily: "Work Sans",
                 fontWeight: 700,
-                fontSize: '36px',
+                fontSize: "36px",
-                lineHeight: '100%',
+                lineHeight: "100%",
-                letterSpacing: '-3%',
+                letterSpacing: "-3%",
-                verticalAlign: 'middle'
+                verticalAlign: "middle",
               }}
             >
               Chill-ala koos turniiride otseülekandega
@@ -937,12 +929,12 @@ export default function Expo() {
             <h3
               className="text-[#2A2C3F] dark:text-[#EEE5E5]"
               style={{
-                fontFamily: 'Work Sans',
+                fontFamily: "Work Sans",
                 fontWeight: 700,
-                fontSize: '36px',
+                fontSize: "36px",
-                lineHeight: '100%',
+                lineHeight: "100%",
-                letterSpacing: '-3%',
+                letterSpacing: "-3%",
-                verticalAlign: 'middle'
+                verticalAlign: "middle",
               }}
             >
               Mänguklubi lauamängud ja konsoolid
@@ -963,12 +955,12 @@ export default function Expo() {
             <h3
               className="text-[#2A2C3F] dark:text-[#EEE5E5]"
               style={{
-                fontFamily: 'Work Sans',
+                fontFamily: "Work Sans",
                 fontWeight: 700,
-                fontSize: '36px',
+                fontSize: "36px",
-                lineHeight: '100%',
+                lineHeight: "100%",
-                letterSpacing: '-3%',
+                letterSpacing: "-3%",
-                verticalAlign: 'middle'
+                verticalAlign: "middle",
               }}
             >
               Baariala jookide ja snäkkidega

src/app/[locale]/reeglid/page.tsx

@@ -49,11 +49,11 @@ export default async function RulesMenu({
           {/* Minitourn. link coming soon*/}
           {/*<Link href="">*/}
           {/* ajutine div. kui asendate lingiga, siis saab selle ära võtta */}
-          <div>
+          <div className="cursor-not-allowed">
-            <div className={`${boxStyle} bg-[#1F5673] py-16 px-8`}>
+            <div
-              <h2 className={`${boxTextStyle}`}>
+              className={`${boxStyle} bg-[#1F5673] py-16 px-8 opacity-50 pointer-events-none`}
-                {t("rules.miniRules")}
+            >
-              </h2>
+              <h2 className={`${boxTextStyle}`}>{t("rules.miniRules")}</h2>
             </div>
           </div>
           {/*</Link>*/}

src/app/[locale]/striim/page.tsx

@@ -1,7 +1,8 @@
 import { vipnagorgialla } from "@/components/Vipnagorgialla";
-import Link from "next/link";
+import Sponsors from "@/components/Sponsors";
-import Image from "next/image";
+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({
         >
           <div className="cursor-pointer flex flex-row justify-between gap-4 items-center">
             <h2
-              className={`text-[clamp(2rem,1.8rem+1vw,3rem)] ${vipnagorgialla.className} font-bold italic uppercase dark:text-[#EEE5E5] text-[#2A2C3F] dark:group-hover:text-[#2A2C3F] group-hover:text-black`}
+              className={`text-[clamp(2rem,1.8rem+1vw,3rem)] ${vipnagorgialla.className} font-bold italic break-normal uppercase dark:text-[#EEE5E5] text-[#2A2C3F] dark:group-hover:text-[#2A2C3F] group-hover:text-black`}
             >
               {t("navigation.tournaments")}
             </h2>
@@ -129,114 +130,11 @@ export default async function Home({
           </span>
         </div>
         <h2 className="text-[clamp(2.5rem,2.25rem+1.25vw,3.75rem)] text-[#007CAB] dark:text-[#00A3E0] dark:group-hover:text-[#EEE5E5] group-hover:text-[#EEE5E5]">
-          24.-26. okt.
+          {t("home.sections.dateAndLocation")}
         </h2>
       </Link>
       {/* Sponsors */}
-      <div
+      <Sponsors />
-        className={`p-12 flex flex-col ${vipnagorgialla.className} font-bold italic border-b-3 border-[#1F5673]`}
-      >
-        <div className="text-left flex flex-col justify-between xl:justify-start">
-          <h3 className="text-4xl md:text-5xl dark:text-[#EEE5E5] text-[#2A2C3F] group-hover:text-black pb-8">
-            {t("home.sections.poweredBy")}
-          </h3>
-          <div className="flex flex-row flex-wrap gap-8 md:gap-18 items-center">
-            <Link href="https://taltech.ee" target="_blank">
-              <Image
-                src="/sponsors/taltech-color.png"
-                alt="Taltech (Tallinna Tehnikaülikool)"
-                width={192}
-                height={192}
-                className="object-contain"
-              />
-            </Link>
-            <Link href="https://www.redbull.com/ee-et/" target="_blank">
-              <Image
-                src="/sponsors/redbull.png"
-                alt="Redbull"
-                width={80}
-                height={80}
-                className="object-contain"
-              />
-            </Link>
-            <Link href="https://www.alecoq.ee" target="_blank">
-              <Image
-                src="/sponsors/alecoq.svg"
-                alt="Alecoq"
-                width={200}
-                height={200}
-                className="object-contain"
-              />
-            </Link>
-            <Link href="https://www.simracing.ee/" target="_blank">
-              <Image
-                src="/sponsors/EVAL.png"
-                alt="EVAL"
-                width={200}
-                height={200}
-                className="object-contain"
-              />
-            </Link>
-            <Link href="https://balsnack.ee" target="_blank">
-              <Image
-                src="/sponsors/balsnack.svg"
-                alt="Balsnack"
-                width={200}
-                height={200}
-                className="object-contain"
-              />
-            </Link>
-            <Link
-              href="https://www.rara.ee/sundmused/interaktiivne-videomangude-muuseum-lvlup/"
-              target="_blank"
-            >
-              <Image
-                src="/sponsors/lvlup_logo_export.svg"
-                alt="LVLup!"
-                width={192}
-                height={192}
-                className="object-contain"
-              />
-            </Link>
-            <Link href="https://www.facebook.com/bfglOfficial" target="_blank">
-              <Image
-                src="/sponsors/BFGL.png"
-                alt="BFGL"
-                width={192}
-                height={192}
-                className="object-contain"
-              />
-            </Link>
-            <Link href="https://www.tallinn.ee/et/haridus" target="_blank">
-              <Image
-                src="/sponsors/Tallinna_Haridusamet_logo_RGB.svg"
-                alt="Tallinna Haridusamet"
-                width={192}
-                height={192}
-                className="object-contain"
-              />
-            </Link>
-            <Link href="https://www.militaarseiklus.ee/" target="_blank">
-              <Image
-                src="/sponsors/militaarseiklus.png"
-                alt="Militaarseiklus"
-                width={200}
-                height={200}
-                className="object-contain"
-              />
-            </Link>
-            <Link href="https://www.arvutimuuseum.ee" target="_blank">
-              <Image
-                src="/sponsors/arvutimuuseum.svg"
-                alt="Arvutimuuseum"
-                width={200}
-                height={200}
-                className="object-contain not-dark:invert"
-              />
-            </Link>
-          </div>
-        </div>
-      </div>
     </div>
   );
 }

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"
             />
           </NextLink>
-          <NextLink href="https://www.linkedin.com/company/gamedev-guild/" target="_blank">
+          <NextLink
+            href="https://www.linkedin.com/company/gamedev-guild/"
+            target="_blank"
+          >
             <Image
               src="/sponsors/estonian_gamedev_guild.png"
               alt="Estonian Gamedev Guild"
@@ -178,7 +184,7 @@ export default function Sponsors({ showTitle = true, className = "" }: SponsorsP
               alt="K-Space"
               width={200}
               height={200}
-              className="object-contain"
+              className="object-contain not-dark:invert"
             />
           </NextLink>
           <NextLink href="https://globalproductions.ee/" target="_blank">
@@ -190,7 +196,6 @@ export default function Sponsors({ showTitle = true, className = "" }: SponsorsP
               className="object-contain"
             />
           </NextLink>
-          
         </div>
       </div>
     </div>

src/data/gamedev.json

@@ -29,8 +29,8 @@
       "description": ""
     },
     {
-      "id": "cyber-dog-rogue",
+      "id": "cyber-doc-rogue",
-      "name": "Cyber Dog 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": ""
     }
   ]
 }