From cd89cf04ffa5056d9d4f41532aecf59cece01bb5 Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@fc.up.pt>
Date: Sun, 9 Aug 2020 13:25:48 +0000
Subject: [PATCH] [ROUTES] Add redirect from root to main/all, link from header
 to root, and change parameter order on RouteLoader::connect

---
 src/Core/Router/RouteLoader.php | 5 +++--
 src/Routes/Main.php             | 7 ++++---
 templates/base.html.twig        | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Core/Router/RouteLoader.php b/src/Core/Router/RouteLoader.php
index 6bfb7e8906..a636037bd2 100644
--- a/src/Core/Router/RouteLoader.php
+++ b/src/Core/Router/RouteLoader.php
@@ -78,7 +78,7 @@ class RouteLoader extends Loader
      *                               'fragment', 'http-methods', 'locale', 'methods', 'schemes']
      *                               'http-methods' and 'methods' are aliases
      */
-    public function connect(string $id, string $uri_path, $target, ?array $param_reqs = [], ?array $options = [])
+    public function connect(string $id, string $uri_path, $target, ?array $options = [], ?array $param_reqs = [])
     {
         $this->rc->add($id,
             new Route(
@@ -94,7 +94,8 @@ class RouteLoader extends Loader
                         '_locale'     => $options['locale'] ?? 'en',
                         'template'    => $options['template'] ?? '',
                     ],
-                    $options['defaults'] ?? []),
+                    $options['defaults'] ?? []
+                ),
                 // requirements = [] -- param => regex
                 $param_reqs,
                 // options = []      -- possible keys: compiler_class:, utf8
diff --git a/src/Routes/Main.php b/src/Routes/Main.php
index edbe3edc20..c29994f5bf 100644
--- a/src/Routes/Main.php
+++ b/src/Routes/Main.php
@@ -46,6 +46,7 @@ abstract class Main
         $r->connect('logout', '/logout', [C\Security::class, 'logout']);
         $r->connect('register', '/register', [C\Security::class, 'register']);
 
+        $r->connect('root', '/', RedirectController::class, ['defaults' => ['route' => 'main_all']]);
         $r->connect('main_all', '/main/all', C\NetworkPublic::class);
 
         $r->connect('panel', '/panel', [C\AdminPanel::class, 'site']);
@@ -53,15 +54,15 @@ abstract class Main
 
         // FAQ static pages
         foreach (['faq', 'contact', 'tags', 'groups', 'openid'] as $s) {
-            $r->connect('doc_' . $s, '/doc/' . $s, TemplateController::class, [], ['defaults' => ['template' => 'doc/faq/' . $s . '.html.twig']]);
+            $r->connect('doc_' . $s, '/doc/' . $s, TemplateController::class, ['defaults' => ['template' => 'doc/faq/' . $s . '.html.twig']]);
         }
 
         foreach (['privacy', 'tos', 'version', 'source'] as $s) {
-            $r->connect('doc_' . $s, '/doc/' . $s, TemplateController::class, [], ['defaults' => ['template' => 'doc/' . $s . '.html.twig']]);
+            $r->connect('doc_' . $s, '/doc/' . $s, TemplateController::class, ['defaults' => ['template' => 'doc/' . $s . '.html.twig']]);
         }
 
         // Settings pages
-        $r->connect('settings', '/settings', RedirectController::class, [], ['defaults' => ['route' => 'settings_personal_info']]);
+        $r->connect('settings', '/settings', RedirectController::class, ['defaults' => ['route' => 'settings_personal_info']]);
         foreach (['personal_info', 'avatar', 'notifications', 'account'] as $s) {
             $r->connect('settings_' . $s, '/settings/' . $s, [C\UserPanel::class, $s]);
         }
diff --git a/templates/base.html.twig b/templates/base.html.twig
index ab695abf52..60625d8457 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -57,7 +57,7 @@
                               {% block left %}
                               {% endblock left %}
                               <nav id='instance'>
-                                    <a href="#">
+                                    <a href="/">
                                           <svg class="icon icon-logo">
                                                 <use xlink:href="#icon-logo"></use>
                                           </svg><b>GNU social</b>