Merge branch 'master' of github.com:fykosak/webs

fykosak · Jul 8, 2024 · 8a6ee0a · 8a6ee0a
2 parents 9504f35 + ecf1875
commit 8a6ee0a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/app/Modules/Dsef/DefaultModule/templates/Archive/default.latte b/app/Modules/Dsef/DefaultModule/templates/Archive/default.latte
@@ -39,9 +39,9 @@
                     </div>
                 {/if}
                 {* Hack for missing photos *}
-                {if $eventKey['fykos-year'] == 34}
+                {if $eventKey['year'] == 34}
                     <div class="mt-5">
-                        Tento ročník proběhl kvůli pandemii COVID-19 online. 
+                        Tento ročník proběhl kvůli pandemii COVID-19 online.
                     </div>
                 {/if}
             </section>

diff --git a/app/Modules/Dsef/DefaultModule/templates/Default/default.latte b/app/Modules/Dsef/DefaultModule/templates/Default/default.latte
@@ -60,7 +60,7 @@
     <div class="panel color-auto">
         <section class="inner-container">
             <div class="subheader">Z minulých let</div>
-            <h1>Nepřesvědčili jsme vás?</h1>
+            <h1>Stále váháte?</h1>
             <div class="row strips">
                 {control gallery:randomLine "/photos/front-page/"}
             </div>

diff --git a/app/RouterFactory.php b/app/RouterFactory.php
@@ -166,6 +166,13 @@ public static function createDsefRouter(?array $domainList, array $routerMapping
     {
         $router = new RouteList();
 
+        $router->withModule('Default')
+            ->addRoute('//<domain>/<presenter>[/<action>]', [
+                'presenter' => 'Default',
+                'action' => 'default',
+                null => self::useTranslateFilter($domainList, $routerMapping['default']),
+            ]);
+
         $router->withModule('Archive')
             ->addRoute('//<domain>/<eventYear ([0-9]{4})(-.*)?>/<eventMonth>/[<presenter>/[<action>]]', [
                 'presenter' => 'Default',
@@ -194,18 +201,18 @@ public static function createFykosRouter(?array $domainList, array $routerMappin
         ]);
 
         $router->withModule('Default')
-        ->addRoute('//<domain>/problems/<year ([0-9]{2})(-.*)?>/<series ([0-9]{1})(-.*)?>', [
-            'presenter' => 'Problems',
-            'action' => 'default',
-            null => self::useTranslateFilter($domainList, $routerMapping['default']),
-        ]);
-
-        $router->addRoute('//<domain>/<module events>/[<presenter>[/<action>]]', [
-                'presenter' => 'Default',
+            ->addRoute('//<domain>/problems/<year ([0-9]{2})(-.*)?>/<series ([0-9]{1})(-.*)?>', [
+                'presenter' => 'Problems',
                 'action' => 'default',
-                null => self::useTranslateFilter($domainList, $routerMapping['events']),
+                null => self::useTranslateFilter($domainList, $routerMapping['default']),
             ]);
 
+        $router->addRoute('//<domain>/<module events>/[<presenter>[/<action>]]', [
+            'presenter' => 'Default',
+            'action' => 'default',
+            null => self::useTranslateFilter($domainList, $routerMapping['events']),
+        ]);
+
         $router->withModule('Default')
             ->addRoute('//<domain>/<presenter>[/<action>]', [
                 'presenter' => 'Default',