Merge pull request #75 from fykosak/dev-martin-routing

Dev martin routing
fykosak · Aug 23, 2024 · 39b948d · 39b948d
2 parents b3de086 + 760bcb0
commit 39b948d
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 92 deletions.
diff --git a/app/Modules/Fol/DefaultModule/templates/Default/otherEvents.cs.latte b/app/Modules/Fol/DefaultModule/templates/Default/otherEvents.cs.latte
diff --git a/app/Modules/Fol/DefaultModule/templates/Default/otherEvents.en.latte b/app/Modules/Fol/DefaultModule/templates/Default/otherEvents.en.latte
diff --git a/.../Rules/organisationalRegulations.cs.latte → .../Rules/organizationalRegulations.cs.latte b/.../Rules/organisationalRegulations.cs.latte → .../Rules/organizationalRegulations.cs.latte
diff --git a/.../Rules/organisationalRegulations.en.latte → .../Rules/organizationalRegulations.en.latte b/.../Rules/organisationalRegulations.en.latte → .../Rules/organizationalRegulations.en.latte
diff --git a/app/Modules/Fykos/Core/BasePresenter.php b/app/Modules/Fykos/Core/BasePresenter.php
@@ -24,9 +24,9 @@ protected function getNavItems(): array
             [],
             [
                 new NavItem(new PageTitle($this->csen('Co je FYKOS?', 'What Is FYKOS?')), ':Default:About:default'),
-                new NavItem(new PageTitle($this->csen('Organizátoři', 'Organizers')), ':Default:About:Organizers'),
-                new NavItem(new PageTitle($this->csen('Historie', 'History')), ':Default:About:History'),
-                new NavItem(new PageTitle($this->csen('Kontakt', 'Contact')), ':Default:About:Contact'),
+                new NavItem(new PageTitle($this->csen('Organizátoři', 'Organizers')), ':Default:About:organizers'),
+                new NavItem(new PageTitle($this->csen('Historie', 'History')), ':Default:About:history'),
+                new NavItem(new PageTitle($this->csen('Kontakt', 'Contact')), ':Default:About:contact'),
             ],
         );
 
@@ -44,7 +44,7 @@ protected function getNavItems(): array
             [],
             [
                 new NavItem(new PageTitle($this->csen('Základní informace', 'Basic Information')), ':Events:Fykos:'),
-                new NavItem(new PageTitle($this->csen('Pravidla', 'Rules')), ':Events:Fykos:Rules'),
+                new NavItem(new PageTitle($this->csen('Pravidla', 'Rules')), ':Events:Fykos:rules'),
                 new NavItem(
                     new PageTitle($this->csen('Jak psát řešení', 'How to Write Solutions')),
                     ':Events:Fykos:TexTutorial'

diff --git a/app/RouterFactory.php b/app/RouterFactory.php
@@ -82,6 +82,14 @@ private static function useTranslateFilter(?array $domainList, array $routerMapp
                     $params['presenter'] = $routerMapping[$params['lang']][$params['presenter']];
                 }
 
+                // Translate action
+                if (
+                    isset($routerMapping['actions'][$params['lang']]) &&
+                    isset($routerMapping['actions'][$params['lang']][$params['action']])
+                ) {
+                    $params['action'] = $routerMapping['actions'][$params['lang']][$params['action']];
+                }
+
                 return $params;
             },
 
@@ -97,6 +105,14 @@ private static function useTranslateFilter(?array $domainList, array $routerMapp
                     }
                 }
 
+                // Translate action
+                if (isset($routerMapping['actions'][$params['lang']])) {
+                    $key = array_search($params['action'], $routerMapping['actions'][$params['lang']]);
+                    if ($key !== false) {
+                        $params['action'] = $key;
+                    }
+                }
+
                 // Either set the language in the domain, or in lang parameter
                 if (isset($domainList) && count($domainList)) {
                     $params['domain'] = array_search($params['lang'], $domainList);
@@ -187,6 +203,16 @@ public static function createFykosRouter(?array $domainList, array $routerMappin
     {
         $router = new RouteList();
 
+        $router->addRoute('//<domain>/<lang events|akce>/[<presenter>[/<action>]]', [
+            'module' => 'Events',
+            'presenter' => 'Default',
+            'action' => 'default',
+            'lang' => ['filterTable' => [
+                'akce' => "cs",
+                'events' => "en",
+            ]],
+            null => self::useTranslateFilter($domainList, $routerMapping['events']),
+        ]);
 
         $router->addRoute('//<domain>/<lang results|poradi>[/<year ([0-9]{1,2})>]', [
             'module' => 'Default',
@@ -207,11 +233,12 @@ public static function createFykosRouter(?array $domainList, array $routerMappin
                 null => self::useTranslateFilter($domainList, $routerMapping['default']),
             ]);
 
-        $router->addRoute('//<domain>/<module events>/[<presenter>[/<action>]]', [
-            'presenter' => 'Default',
-            'action' => 'default',
-            null => self::useTranslateFilter($domainList, $routerMapping['events']),
-        ]);
+
+        // $router->addRoute('//<domain>/<module events>/[<presenter>[/<action>]]', [
+        //     'presenter' => 'Default',
+        //     'action' => 'default',
+        //     null => self::useTranslateFilter($domainList, $routerMapping['events']),
+        // ]);
 
         $router->withModule('Default')
             ->addRoute('//<domain>/<presenter>[/<action>]', [

diff --git a/app/config/fof-router-mapping.neon b/app/config/fof-router-mapping.neon
@@ -21,6 +21,13 @@ parameters:
                 Spoluprace: Cooperation
             en:
                 About: AboutTheCompetition
+            actions:
+                cs:
+                    organizatori: organizers
+                    uplna: complete
+                    organizacniRad: organizationalRegulations
+                    rozhodnutiKomise: resolutions
+
         archive:
             cs:
                 Default: Default

diff --git a/app/config/fol-router-mapping.neon b/app/config/fol-router-mapping.neon
@@ -21,6 +21,15 @@ parameters:
                 Spoluprace: Cooperation
             en:
                 About: AboutTheCompetition
+            actions:
+                cs:
+                    uplna: complete
+                    organizacniRad: organizationalRegulations
+                    organisationalRegulations: organizationalRegulations # historical
+                    rozhodnutiKomise: resolutions
+                en:
+                    organisationalRegulations: organizationalRegulations # historical
+
         archive:
             cs:
                 Default: Default

diff --git a/app/config/fykos-router-mapping.neon b/app/config/fykos-router-mapping.neon
@@ -9,16 +9,19 @@ parameters:
                 Default: Default
                 ONas: About
                 Pravidla: Rules
-                Organizatori: Organizers
-                Historie: History
-                Kontakt: Contact
                 Zadani: Problems
                 ArchivUloh: ProblemsArchive
+            actions:
+                cs:
+                    historie: history
+                    organizatori: organizers
+                    kontakt: contact
         events:
             cs:
-                Default: Default
-                Akce: Events
-                Experimenty: Experiments
-                Pravidla: Rules
-                jakPsat: TexTutorial
-
+                Soustredeni: Camps
+            actions:
+                cs:
+                    pravidla: rules
+                    jakPsat: texTutorial
+                    experimenty: experiments
+                    cena: price