router

fykosak · Jul 5, 2024 · 356a4d9 · 356a4d9
1 parent 1f10b74
commit 356a4d9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 34 deletions.
diff --git a/app/Modules/Fykos/DefaultModule/ResultsPresenter.php b/app/Modules/Fykos/DefaultModule/ResultsPresenter.php
@@ -7,10 +7,15 @@
 use App\Models\Downloader\FKSDBDownloader;
 use Fykosak\FKSDBDownloaderCore\Requests\SeriesResultsRequest;
 
+use Nette\Application\Attributes\Persistent;
+use Tracy\Debugger;
+
 class ResultsPresenter extends BasePresenter
 {
-    /** @persistent */
-    public ?int $year = self::CURRENT_YEAR;
+    #[Persistent]
+    public ?int $year;
+
+
     private readonly FKSDBDownloader $downloader;
 
     public function injectDownloader(FKSDBDownloader $downloader): void
@@ -23,6 +28,8 @@ public function injectDownloader(FKSDBDownloader $downloader): void
      */
     public function renderDefault(): void
     {
+        Debugger::barDump($this->year);
+
         $year = $this->year ?? self::CURRENT_YEAR;
         $this->template->year = $year;
         $this->template->results = $this->downloader->download(new SeriesResultsRequest(1, $year, 1));

diff --git a/app/RouterFactory.php b/app/RouterFactory.php
@@ -174,39 +174,27 @@ public static function createDsefRouter(?array $domainList, array $routerMapping
                 null => self::useTranslateFilter($domainList, $routerMapping['archive']),
             ]);
 
-        $router->withModule('Default')
-            ->addRoute('//<domain>/(international|erasmus)', [
-                'presenter' => 'Erasmus',
-                'lang' => 'cs',
-                null => self::havingDomainLanguage(['cs'], $domainList),
-            ], $router::ONE_WAY)
-            ->addRoute('//<domain>/<presenter>[/<action>]', [
-                'presenter' => 'Default',
-                'action' => 'default',
-                null => self::useTranslateFilter($domainList, $routerMapping['default']),
-            ]);
-
         return $router;
     }
 
     public static function createFykosRouter(?array $domainList, array $routerMapping): Router
     {
         $router = new RouteList();
 
-        $specialRouterMapping = [
-            'results' => [
-                'cs' => 'poradi',
-                'en' => 'results'
-            ]
-        ];
+
+
+        Debugger::barDump($domainList);
+
 
-        foreach ($specialRouterMapping['results'] as $lang => $translated) {
-            $router->withModule('Default')->addRoute("//<domain>/$translated/<year ([0-9]{2})(-.*)?>", [
-                'presenter' => 'Results',
-                'action' => 'default',
-                null => self::useTranslateFilter($domainList, $routerMapping['default']),
-            ]);
-        }
+        $router->withModule('Default')->addRoute("//<domain>/results[/<year [0-9]{2}>]", [
+            'presenter' => 'Results',
+            'action' => 'default',
+            'lang' => 'cs'
+            // 'lang' => ['filterTable' => [
+            //     'poradi' => "cs",
+            //     'results' => "en",
+            // ]]
+        ]);
 
         $router->withModule('Default')
         ->addRoute('//<domain>/problems/<year ([0-9]{2})(-.*)?>/<series ([0-9]{1})(-.*)?>', [
@@ -221,12 +209,13 @@ public static function createFykosRouter(?array $domainList, array $routerMappin
                 null => self::useTranslateFilter($domainList, $routerMapping['events']),
             ]);
 
-        $router->withModule('Default')
-            ->addRoute('//<domain>/<presenter>[/<action>]', [
-                'presenter' => 'Default',
-                'action' => 'default',
-                null => self::useTranslateFilter($domainList, $routerMapping['default']),
-            ]);
+        // $router->withModule('Default')
+        //     ->addRoute('//<domain>/<presenter>[/<action>]', [
+        //         'presenter' => 'Default',
+        //         'action' => 'default',
+        //         null => self::useTranslateFilter($domainList, $routerMapping['default']),
+        //     ]);
+
 
         return $router;
     }

diff --git a/app/config/fykos-router-mapping.neon b/app/config/fykos-router-mapping.neon
@@ -13,7 +13,6 @@ parameters:
                 Historie: History
                 Kontakt: Contact
                 Zadani: Problems
-                Poradi: Results
                 ArchivUloh: ProblemsArchive
         events:
             cs: