From c79f035a0fc666699c58eb6877956e16ad445e44 Mon Sep 17 00:00:00 2001 From: vercah Date: Sun, 1 Dec 2024 20:53:47 +0100 Subject: [PATCH 01/11] update merch page --- app/Modules/Fykos/Core/styles/main.scss | 4 +++ .../templates/Merch/default.latte | 28 +++++++++---------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/Modules/Fykos/Core/styles/main.scss b/app/Modules/Fykos/Core/styles/main.scss index 91763568..33f84a62 100644 --- a/app/Modules/Fykos/Core/styles/main.scss +++ b/app/Modules/Fykos/Core/styles/main.scss @@ -24,6 +24,10 @@ $naboj-color: #C22D86; --panel-color-light: white; } +.right-bar { + border-right: 5px solid #1175da; +} + $page-width: 77rem; // $base-font-size: 18px; diff --git a/app/Modules/Fykos/DefaultModule/templates/Merch/default.latte b/app/Modules/Fykos/DefaultModule/templates/Merch/default.latte index f9c943e0..fbae54da 100644 --- a/app/Modules/Fykos/DefaultModule/templates/Merch/default.latte +++ b/app/Modules/Fykos/DefaultModule/templates/Merch/default.latte @@ -60,14 +60,14 @@
-
+
-
- Mugs -
-
+
Mugs
+
+ Mugs +
@@ -106,12 +106,12 @@
-
+
-
+
Beanie
-
+
Beanie
@@ -151,12 +151,12 @@
-
+
-
+
Tshirt
-
+
Tshirt
@@ -216,12 +216,12 @@
-
+
-
+
Hoodie
-
+
Hoodie
From c0b1aa35db2d10dcc785c07cdb990049ad3f8e9f Mon Sep 17 00:00:00 2001 From: rkuklik Date: Mon, 2 Dec 2024 10:50:46 +0100 Subject: [PATCH 02/11] fix(style): black magic imports do not work --- app/Modules/Fol/Core/styles/main.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Modules/Fol/Core/styles/main.scss b/app/Modules/Fol/Core/styles/main.scss index 7284bb96..136bacf9 100644 --- a/app/Modules/Fol/Core/styles/main.scss +++ b/app/Modules/Fol/Core/styles/main.scss @@ -29,8 +29,7 @@ $navbar-dark-hover-color: $text-on-primary; @import "node_modules/bootstrap/scss/bootstrap"; $flag-icon-css-path: '/node_modules/flag-icon-css/flags'; -@import '../../../../../node_modules/flag-icon-css/sass/flag-icon'; -@import '../node_modules/lightbox2/dist/css/lightbox.min.css'; +@import 'node_modules/flag-icon-css/sass/flag-icon'; @import "./layout"; From 7e0e19d082c03d6cbb1f56ab2ecfae92a296b697 Mon Sep 17 00:00:00 2001 From: vercah Date: Mon, 2 Dec 2024 11:54:00 +0100 Subject: [PATCH 03/11] body-not-ready hack --- .../Fykos/DefaultModule/ResultsPresenter.php | 15 ++++++++++++--- .../DefaultModule/templates/Results/default.latte | 3 ++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/Modules/Fykos/DefaultModule/ResultsPresenter.php b/app/Modules/Fykos/DefaultModule/ResultsPresenter.php index 0e11c058..6fbe1cd4 100644 --- a/app/Modules/Fykos/DefaultModule/ResultsPresenter.php +++ b/app/Modules/Fykos/DefaultModule/ResultsPresenter.php @@ -18,12 +18,21 @@ class ResultsPresenter extends BasePresenter */ public function renderDefault(): void { - // $year = $this->year ?? $this->getCurrentYear()->year; - // hack before body-ready is implemented $year = $this->year ?? 38; - $this->template->year = $year; $this->template->contest = $this->getContest(); $this->template->results = $this->downloader->download(new SeriesResultsRequest(1, $year)); + // HACK BEFORE BODY-READY IS IMPLEMENTED + $this->template->results = $this->removeSeriesFromResults(2, $this->template->results); + } + + public function removeSeriesFromResults(int $seriesId, array $results): array + { + foreach (['FYKOS_1', 'FYKOS_2', 'FYKOS_3', 'FYKOS_4'] as $key) { + if (isset($results['tasks'][$key][$seriesId])) { + unset($results['tasks'][$key][$seriesId]); + } + } + return $results; } } diff --git a/app/Modules/Fykos/DefaultModule/templates/Results/default.latte b/app/Modules/Fykos/DefaultModule/templates/Results/default.latte index d819e178..d3a8ce5b 100644 --- a/app/Modules/Fykos/DefaultModule/templates/Results/default.latte +++ b/app/Modules/Fykos/DefaultModule/templates/Results/default.latte @@ -14,6 +14,7 @@
{dump $results} +

{switch $language->value} {case 'cs'}Výsledky {$year}. ročníku FYKOSu @@ -70,7 +71,7 @@ {default}By default, the sum of points for each series is displayed. By clicking on the title of the series, you can see the specific number of points for each task of the given series. {/switch}

- +

From b0984b885c0a23da623c049b9ac62e9fa097953b Mon Sep 17 00:00:00 2001 From: vercah Date: Wed, 4 Dec 2024 21:45:30 +0100 Subject: [PATCH 04/11] update prices --- app/Modules/Fykos/Core/styles/main.scss | 4 +++ .../templates/Merch/default.latte | 30 +++++++++---------- .../templates/SupportUs/default.cs.latte | 2 -- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/app/Modules/Fykos/Core/styles/main.scss b/app/Modules/Fykos/Core/styles/main.scss index 33f84a62..cc704548 100644 --- a/app/Modules/Fykos/Core/styles/main.scss +++ b/app/Modules/Fykos/Core/styles/main.scss @@ -28,6 +28,10 @@ $naboj-color: #C22D86; border-right: 5px solid #1175da; } +.left-bar { + border-left: 5px solid #1175da; +} + $page-width: 77rem; // $base-font-size: 18px; diff --git a/app/Modules/Fykos/DefaultModule/templates/Merch/default.latte b/app/Modules/Fykos/DefaultModule/templates/Merch/default.latte index fbae54da..b5f98dd3 100644 --- a/app/Modules/Fykos/DefaultModule/templates/Merch/default.latte +++ b/app/Modules/Fykos/DefaultModule/templates/Merch/default.latte @@ -20,9 +20,9 @@

{switch $language->value} {case 'cs'} - Chcete podpořit FYKOS? Pořiďte si náš merch! Nabízíme hrnky, čepice, mikiny a trička. Brzy otevřeme formulář na objednávky. + Chcete podpořit FYKOS? Pořiďte si náš merch! Nabízíme hrnky, čepice, mikiny a trička. Brzy otevřeme formulář na objednávky. Až do Vánoc máme navíc slevu na trička a mikiny! {default} - Want to support FYKOS? Get your favorite merch! Check out our mugs, beanies, sweatshirts, and t-shirts. We will soon publish the form to order them. + Want to support FYKOS? Get your favorite merch! Check out our mugs, beanies, sweatshirts, and t-shirts. We will soon publish the form to order them. Until Christmas, we have a discount on t-shirts and sweatshirts! {/switch}

@@ -60,7 +60,7 @@

-
+
Mugs @@ -70,7 +70,7 @@
-
+

{switch $language->value} {case 'cs'} Hrnky @@ -106,7 +106,7 @@
-
+
Beanie @@ -116,7 +116,7 @@
-
+

{switch $language->value} {case 'cs'}Čepice @@ -140,7 +140,7 @@

{switch $language->value} {case 'cs'}Cena: 199 Kč nebo 9 € - {default}Price: 9 € + {default}Price: 9 € {/switch}

@@ -151,7 +151,7 @@
-
+
Tshirt @@ -161,7 +161,7 @@
-
+

{switch $language->value} {case 'cs'}Tričko @@ -204,8 +204,8 @@

{switch $language->value} - {case 'cs'}Cena: 299 Kč nebo 13 € - {default}Price: 13 € + {case 'cs'}Cena: 299 Kč 249 Kč nebo 13 € 11 € + {default}Price: 13 € 11 € {/switch}

@@ -216,7 +216,7 @@
-
+
Hoodie @@ -226,7 +226,7 @@
-
+

{switch $language->value} {case 'cs'}Mikiny @@ -261,8 +261,8 @@

{switch $language->value} - {case 'cs'}Cena: 799 Kč nebo 34 € - {default}Price: 34 € + {case 'cs'}Cena: 799 Kč 749 Kč nebo 34 € 32 € + {default}Price: 34 € 32 € {/switch}

diff --git a/app/Modules/Fykos/DefaultModule/templates/SupportUs/default.cs.latte b/app/Modules/Fykos/DefaultModule/templates/SupportUs/default.cs.latte index 2b23a828..d5ad0900 100644 --- a/app/Modules/Fykos/DefaultModule/templates/SupportUs/default.cs.latte +++ b/app/Modules/Fykos/DefaultModule/templates/SupportUs/default.cs.latte @@ -2,8 +2,6 @@ {block main} {varType App\Models\Downloader\ContestYearModel $currentYear} - -