Merge pull request #52 from Lapikud/development

Development
pull/56/head
Renkar 4 months ago committed by GitHub
commit 4f1456997e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. BIN
      public/sponsors/tallinnaharidusamet.jpg
  2. 14
      src/app/[locale]/ajakava/page.tsx
  3. 11
      src/app/[locale]/page.tsx
  4. 2
      src/app/[locale]/piletid/page.tsx
  5. 11
      src/app/[locale]/striim/page.tsx
  6. 30
      src/components/Footer.tsx
  7. 2
      src/components/SidebarLayoutClient.tsx
  8. 2
      src/data/rules/lol.md
  9. 4
      translations/en.json
  10. 4
      translations/et.json

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

@ -44,29 +44,25 @@ export default function Timetable() {
{schedule.map((item, idx) => ( {schedule.map((item, idx) => (
<div <div
key={idx} key={idx}
className="border-l-3 border-[#007CAB] pl-4 flex flex-row flex-wrap gap-5 items-stretch" className="border-l-3 border-[#007CAB] pl-4 flex flex-col sm:flex-row flex-wrap gap-5 items-stretch"
> >
<div <div
className={`${vipnagorgialla.className} text-[#00A3E0] text-4xl font-bold italic flex-shrink-0 flex items-center justify-center`} className={`${vipnagorgialla.className} md:w-[180px] w-30 text-[#00A3E0] text-3xl md:text-4xl font-bold italic flex-shrink-0 flex items-center justify-center`}
style={{ width: "180px", minWidth: "180px" }}
> >
{item.time} {item.time}
</div> </div>
<div <div className="flex-1 flex flex-col justify-center min-w-0 min-h-[120px]">
className="flex-1 flex flex-col justify-center min-h-[120px]"
style={{ minWidth: "0" }}
>
<div <div
className={`${vipnagorgialla.className} text-3xl italic font-bold text-[#2A2C3F] dark:text-[#EEE5E5] text-balance`} className={`${vipnagorgialla.className} text-3xl italic font-bold text-[#2A2C3F] dark:text-[#EEE5E5] text-balance`}
> >
{t(item.titleKey)} {t(item.titleKey)}
</div> </div>
{item.description && ( {item.description && (
<div className="text-2xl text-[#938BA1] dark:text-[#938BA1] text-balance"> <div className="text-xl md:text-2xl text-[#938BA1] dark:text-[#938BA1] text-balance">
{item.description} {item.description}
</div> </div>
)} )}
<div className="text-2xl text-[#938BA1] dark:text-[#938BA1] text-balance"> <div className="text-xl md:text-2xl text-[#938BA1] dark:text-[#938BA1] text-balance">
{t(item.locationKey)} {t(item.locationKey)}
</div> </div>
</div> </div>

@ -142,7 +142,7 @@ export default async function Home({
<h3 className="text-4xl md:text-5xl dark:text-[#EEE5E5] text-[#2A2C3F] group-hover:text-black pb-8"> <h3 className="text-4xl md:text-5xl dark:text-[#EEE5E5] text-[#2A2C3F] group-hover:text-black pb-8">
{t("home.sections.poweredBy")} {t("home.sections.poweredBy")}
</h3> </h3>
<div className="flex flex-row flex-wrap gap-8 md:gap-18 items-center"> <div className="flex flex-row flex-wrap gap-8 md:gap-18 items-center justify-center">
<NextLink href="https://taltech.ee" target="_blank"> <NextLink href="https://taltech.ee" target="_blank">
<Image <Image
src="/sponsors/taltech-color.png" src="/sponsors/taltech-color.png"
@ -212,6 +212,15 @@ export default async function Home({
className="object-contain" className="object-contain"
/> />
</NextLink> </NextLink>
<NextLink href="https://www.tallinn.ee/et/haridus" target="_blank">
<Image
src="/sponsors/tallinnaharidusamet.jpg"
alt="Tallinna Haridusamet"
width={192}
height={192}
className="object-contain"
/>
</NextLink>
</div> </div>
</div> </div>
</div> </div>

@ -15,7 +15,7 @@ export default async function Tickets({
<div> <div>
<div className="flex flex-col min-h-[90vh] m-6 mt-16 md:m-16"> <div className="flex flex-col min-h-[90vh] m-6 mt-16 md:m-16">
<h1 <h1
className={`text-4xl md:text-5xl lg:text-6xl ${vipnagorgialla.className} font-bold italic text-[#2A2C3F] dark:text-[#EEE5E5] mt-8 md:mt-16 mb-4`} className={`text-4xl wrap-break-word md:text-5xl lg:text-6xl ${vipnagorgialla.className} font-bold italic text-[#2A2C3F] dark:text-[#EEE5E5] mt-8 md:mt-16 mb-4`}
> >
{t("tickets.title")} {t("tickets.title")}
</h1> </h1>

@ -140,7 +140,7 @@ export default async function Home({
<h3 className="text-4xl md:text-5xl dark:text-[#EEE5E5] text-[#2A2C3F] group-hover:text-black pb-8"> <h3 className="text-4xl md:text-5xl dark:text-[#EEE5E5] text-[#2A2C3F] group-hover:text-black pb-8">
{t("home.sections.poweredBy")} {t("home.sections.poweredBy")}
</h3> </h3>
<div className="flex flex-row flex-wrap gap-8 md:gap-18 items-center"> <div className="flex flex-row flex-wrap gap-8 md:gap-18 items-center justify-center">
<Link href="https://taltech.ee" target="_blank"> <Link href="https://taltech.ee" target="_blank">
<Image <Image
src="/sponsors/taltech-color.png" src="/sponsors/taltech-color.png"
@ -207,6 +207,15 @@ export default async function Home({
className="object-contain" className="object-contain"
/> />
</Link> </Link>
<Link href="https://www.tallinn.ee/et/haridus" target="_blank">
<Image
src="/sponsors/tallinnaharidusamet.jpg"
alt="Tallinna Haridusamet"
width={192}
height={192}
className="object-contain"
/>
</Link>
</div> </div>
</div> </div>
</div> </div>

@ -38,7 +38,7 @@ const Footer = () => {
<SiDiscord <SiDiscord
title="Discord" title="Discord"
size={"2em"} size={"2em"}
className="text-[#2A2C3F] dark:text-[#EEE5E5]" className="text-[#2A2C3F] dark:text-[#EEE5E5] hover:text-[#007CAB] hover:dark:text-[#00A3E0] transition"
/> />
</a> </a>
<a <a
@ -50,7 +50,7 @@ const Footer = () => {
<SiInstagram <SiInstagram
title="Instagram" title="Instagram"
size={"2em"} size={"2em"}
className="text-[#2A2C3F] dark:text-[#EEE5E5]" className="text-[#2A2C3F] dark:text-[#EEE5E5] hover:text-[#007CAB] hover:dark:text-[#00A3E0] transition"
/> />
</a> </a>
<a <a
@ -62,7 +62,7 @@ const Footer = () => {
<SiFacebook <SiFacebook
title="Facebook" title="Facebook"
size={"2em"} size={"2em"}
className="text-[#2A2C3F] dark:text-[#EEE5E5]" className="text-[#2A2C3F] dark:text-[#EEE5E5] hover:text-[#007CAB] hover:dark:text-[#00A3E0] transition"
/> />
</a> </a>
</div> </div>
@ -98,18 +98,34 @@ const Footer = () => {
{t("footer.organization")} {t("footer.organization")}
</h3> </h3>
<div> <div>
<p className="text-[#aaa]"> <p>
{t("footer.registrationCode")}:{" "} {t("footer.registrationCode")}:{" "}
<span className="font-semibold text-[#007CAB] dark:text-[#00A3E0]"> <span className="font-semibold text-[#007CAB] dark:text-[#00A3E0]">
80391807 80391807
</span> </span>
</p> </p>
<p className="text-[#aaa]"> <p className="">ICO-210, Raja tn 4c, Tallinn, Harjumaa, 12616</p>
ICO-210, Raja tn 4c, Tallinn, Harjumaa, 12616
</p>
</div> </div>
</div> </div>
</div> </div>
<div className="block align-middle text-center pt-16">
{t("footer.madeBy")}{" "}
<a
target="_blank"
href="https://lapikud.ee/"
className="text-[#E3983E] font-bold"
>
MTÜ Lapikud
</a>{" "}
{t("footer.withHelpFrom")}{" "}
<a
target="_blank"
href="https://ituk.ee/"
className="bg-[#7B1642] font-bold not-dark:text-white"
>
MTÜ For Tsükkel/ITÜK
</a>
</div>
</div> </div>
</div> </div>
); );

@ -72,7 +72,7 @@ export default function SidebarLayoutClient({
<Link <Link
key={item.href} key={item.href}
href={item.href} href={item.href}
className="hover:text-[#00A3E0] transition duration-150" className="hover:text-[#00A3E0] md:hover:translate-x-2 transition duration-150"
> >
{item.label} {item.label}
</Link> </Link>

@ -30,7 +30,7 @@ Korraldajal on õigus eemaldada võistleja turniirilt nende reeglite rikkumise k
## 3. Mängule eelnev ## 3. Mängule eelnev
1. **3.1** Turniiril osalemine, matchid ja turniiripuu toimib **challengermode.com** keskkonna kaudu: 1. **3.1** Turniiril osalemine, matchid ja turniiripuu toimib **[challengermode.com](https://www.challengermode.com/s/TipiLAN/tournaments/4b7d832b-7cf3-406a-8425-08ddd311ac8a)** keskkonna kaudu:
1. **3.1.1** Turniirile peab olema registreeritud kogu meeskond, sh varumängija 1. **3.1.1** Turniirile peab olema registreeritud kogu meeskond, sh varumängija
2. **3.1.2** Turniir toimub **EU West** serveris 2. **3.1.2** Turniir toimub **EU West** serveris
2. **3.2** Challengermode keskkonnas on match’id automaatsed. Uue match’i puhul on valmisolekuks aega **10 minutit**, seejärel lobby’sse jõudmiseks veel **10 minutit**. 2. **3.2** Challengermode keskkonnas on match’id automaatsed. Uue match’i puhul on valmisolekuks aega **10 minutit**, seejärel lobby’sse jõudmiseks veel **10 minutit**.

@ -163,7 +163,9 @@
"terms": "Terms", "terms": "Terms",
"studentUnion": "IT Faculty Student Council", "studentUnion": "IT Faculty Student Council",
"organization": "MTÜ For Tsükkel", "organization": "MTÜ For Tsükkel",
"registrationCode": "Registration code" "registrationCode": "Registration code",
"madeBy": "The TipiLAN website is made with love by",
"withHelpFrom": "with the help of"
}, },
"notFound": { "notFound": {
"title": "404", "title": "404",

@ -164,7 +164,9 @@
"terms": "Tingimused", "terms": "Tingimused",
"studentUnion": "IT-teaduskonna üliõpilaskogu", "studentUnion": "IT-teaduskonna üliõpilaskogu",
"organization": "MTÜ For Tsükkel", "organization": "MTÜ For Tsükkel",
"registrationCode": "Registrikood" "registrationCode": "Registrikood",
"madeBy": "TipiLANi veebileht on tehtud armastusega",
"withHelpFrom": "poolt, kellele oli abiks"
}, },
"notFound": { "notFound": {
"title": "404", "title": "404",

Loading…
Cancel
Save