lapikud
/
tipilan
mirror of https://github.com/Lapikud/tipilan
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52 from Lapikud/development

Browse Source 
Development
pull/56/head
Renkar 4 months ago committed by GitHub
parent b2d5e1d202 51c34d5339
commit 4f1456997e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 87 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  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

BIN
public/sponsors/tallinnaharidusamet.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

14
src/app/[locale]/ajakava/page.tsx
Unescape View File

@ -44,29 +44,25 @@ export default function Timetable() {
{schedule.map((item, idx) => (
<div
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
className={`${vipnagorgialla.className} text-[#00A3E0] text-4xl font-bold italic flex-shrink-0 flex items-center justify-center`}
style={{ width: "180px", minWidth: "180px" }}
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`}
>
{item.time}
</div>
<div
className="flex-1 flex flex-col justify-center min-h-[120px]"
style={{ minWidth: "0" }}
>
<div className="flex-1 flex flex-col justify-center min-w-0 min-h-[120px]">
<div
className={`${vipnagorgialla.className} text-3xl italic font-bold text-[#2A2C3F] dark:text-[#EEE5E5] text-balance`}
>
{t(item.titleKey)}
</div>
{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}
</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)}
</div>
</div>

11
src/app/[locale]/page.tsx
Unescape View File

@ -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">
{t("home.sections.poweredBy")}
</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">
<Image
src="/sponsors/taltech-color.png"
@ -212,6 +212,15 @@ export default async function Home({
className="object-contain"
/>
</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>

2
src/app/[locale]/piletid/page.tsx
Unescape View File

@ -15,7 +15,7 @@ export default async function Tickets({
<div>
<div className="flex flex-col min-h-[90vh] m-6 mt-16 md:m-16">
<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")}
</h1>

11
src/app/[locale]/striim/page.tsx
Unescape View File

@ -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">
{t("home.sections.poweredBy")}
</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">
<Image
src="/sponsors/taltech-color.png"
@ -207,6 +207,15 @@ export default async function Home({
className="object-contain"
/>
</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>

30
src/components/Footer.tsx
Unescape View File

@ -38,7 +38,7 @@ const Footer = () => {
<SiDiscord
title="Discord"
size={"2em"}
className="text-[#2A2C3F] dark:text-[#EEE5E5]"
className="text-[#2A2C3F] dark:text-[#EEE5E5] hover:text-[#007CAB] hover:dark:text-[#00A3E0] transition"
/>
</a>
<a
@ -50,7 +50,7 @@ const Footer = () => {
<SiInstagram
title="Instagram"
size={"2em"}
className="text-[#2A2C3F] dark:text-[#EEE5E5]"
className="text-[#2A2C3F] dark:text-[#EEE5E5] hover:text-[#007CAB] hover:dark:text-[#00A3E0] transition"
/>
</a>
<a
@ -62,7 +62,7 @@ const Footer = () => {
<SiFacebook
title="Facebook"
size={"2em"}
className="text-[#2A2C3F] dark:text-[#EEE5E5]"
className="text-[#2A2C3F] dark:text-[#EEE5E5] hover:text-[#007CAB] hover:dark:text-[#00A3E0] transition"
/>
</a>
</div>
@ -98,17 +98,33 @@ const Footer = () => {
{t("footer.organization")}
</h3>
<div>
<p className="text-[#aaa]">
<p>
{t("footer.registrationCode")}:{" "}
<span className="font-semibold text-[#007CAB] dark:text-[#00A3E0]">
80391807
</span>
</p>
<p className="text-[#aaa]">
ICO-210, Raja tn 4c, Tallinn, Harjumaa, 12616
</p>
<p className="">ICO-210, Raja tn 4c, Tallinn, Harjumaa, 12616</p>
</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>

2
src/components/SidebarLayoutClient.tsx
Unescape View File

@ -72,7 +72,7 @@ export default function SidebarLayoutClient({
<Link
key={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}
</Link>

2
src/data/rules/lol.md
Unescape View File

@ -30,7 +30,7 @@ Korraldajal on õigus eemaldada võistleja turniirilt nende reeglite rikkumise k
## 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
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**.

4
translations/en.json
Unescape View File

@ -163,7 +163,9 @@
"terms": "Terms",
"studentUnion": "IT Faculty Student Council",
"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": {
"title": "404",

4
translations/et.json
Unescape View File

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

Write Preview
Loading…
Cancel
Save