URL

fykosak · Jul 5, 2024 · f8fd533 · f8fd533
1 parent c6dc987
commit f8fd533
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 26 deletions.
diff --git a/app/Modules/Fykos/DefaultModule/ResultsPresenter.php b/app/Modules/Fykos/DefaultModule/ResultsPresenter.php
@@ -7,14 +7,10 @@
 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;
-
+    /** @persistent */
+    public ?int $year = null;
 
     private readonly FKSDBDownloader $downloader;
 
@@ -28,10 +24,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));
+        $this->template->results = $this->downloader->download(new SeriesResultsRequest(1, $year));
     }
 }
diff --git a/app/RouterFactory.php b/app/RouterFactory.php
@@ -7,7 +7,6 @@
 use Nette\Application\Routers\RouteList;
 use Nette\Routing\Route;
 use Nette\Routing\Router;
-use Tracy\Debugger;
 
 class RouterFactory
 {
@@ -182,18 +181,16 @@ public static function createFykosRouter(?array $domainList, array $routerMappin
         $router = new RouteList();
 
 
-
-        Debugger::barDump($domainList);
-
-
-        $router->withModule('Default')->addRoute("//<domain>/results[/<year [0-9]{2}>]", [
+        $router->addRoute('//<domain>/<lang results|poradi>[/<year [0-9]{2}>]', [
+            'module' => 'Default',
             'presenter' => 'Results',
             'action' => 'default',
-            'lang' => 'cs'
-            // 'lang' => ['filterTable' => [
-            //     'poradi' => "cs",
-            //     'results' => "en",
-            // ]]
+            'year' => null,
+            'lang' => ['filterTable' => [
+                'poradi' => "cs",
+                'results' => "en",
+            ]],
+            null => self::useTranslateFilter($domainList, [])
         ]);
 
         $router->withModule('Default')
@@ -209,12 +206,12 @@ 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;