Add fallback routes when 'index' is not defined

Fix userfrosting/UserFrosting#1244
userfrosting · Feb 17, 2024 · 393f34f · 393f34f
1 parent c62b58f
commit 393f34f
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 219 deletions.
diff --git a/app/src/Controller/Group/GroupPageAction.php b/app/src/Controller/Group/GroupPageAction.php
@@ -14,12 +14,12 @@
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
-use Slim\Interfaces\RouteParserInterface;
 use Slim\Views\Twig;
 use UserFrosting\Sprinkle\Account\Authenticate\Authenticator;
 use UserFrosting\Sprinkle\Account\Database\Models\Interfaces\GroupInterface;
 use UserFrosting\Sprinkle\Account\Exceptions\ForbiddenException;
 use UserFrosting\Sprinkle\Core\I18n\SiteLocaleInterface;
+use UserFrosting\Sprinkle\Core\Util\RouteParserInterface;
 
 /**
  * Renders a page displaying a group's information, in read-only mode.

diff --git a/app/src/Controller/Permission/PermissionPageAction.php b/app/src/Controller/Permission/PermissionPageAction.php
@@ -14,11 +14,11 @@
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
-use Slim\Interfaces\RouteParserInterface;
 use Slim\Views\Twig;
 use UserFrosting\Sprinkle\Account\Authenticate\Authenticator;
 use UserFrosting\Sprinkle\Account\Database\Models\Interfaces\PermissionInterface;
 use UserFrosting\Sprinkle\Account\Exceptions\ForbiddenException;
+use UserFrosting\Sprinkle\Core\Util\RouteParserInterface;
 
 /**
  * Renders a page displaying a permission's information, in read-only mode.

diff --git a/app/src/Controller/Role/RolePageAction.php b/app/src/Controller/Role/RolePageAction.php
@@ -14,11 +14,11 @@
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
-use Slim\Interfaces\RouteParserInterface;
 use Slim\Views\Twig;
 use UserFrosting\Sprinkle\Account\Authenticate\Authenticator;
 use UserFrosting\Sprinkle\Account\Database\Models\Interfaces\RoleInterface;
 use UserFrosting\Sprinkle\Account\Exceptions\ForbiddenException;
+use UserFrosting\Sprinkle\Core\Util\RouteParserInterface;
 
 /**
  * Renders a page displaying a role's information, in read-only mode.

diff --git a/app/src/Controller/User/UserPageAction.php b/app/src/Controller/User/UserPageAction.php
@@ -14,12 +14,12 @@
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
-use Slim\Interfaces\RouteParserInterface;
 use Slim\Views\Twig;
 use UserFrosting\Sprinkle\Account\Authenticate\Authenticator;
 use UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface;
 use UserFrosting\Sprinkle\Account\Exceptions\ForbiddenException;
 use UserFrosting\Sprinkle\Core\I18n\SiteLocaleInterface;
+use UserFrosting\Sprinkle\Core\Util\RouteParserInterface;
 
 /**
  * Renders a page displaying a user's information, in read-only mode.

diff --git a/app/src/Listener/UserRedirectedToDashboard.php b/app/src/Listener/UserRedirectedToDashboard.php
@@ -13,9 +13,9 @@
 namespace UserFrosting\Sprinkle\Admin\Listener;
 
 use Psr\EventDispatcher\StoppableEventInterface;
-use Slim\Interfaces\RouteParserInterface;
 use UserFrosting\Sprinkle\Account\Authenticate\Authenticator;
 use UserFrosting\Sprinkle\Core\Event\Contract\RedirectingEventInterface;
+use UserFrosting\Sprinkle\Core\Util\RouteParserInterface;
 
 /**
  * Set redirect to dashboard.

diff --git a/app/src/Listener/UserRedirectedToSettings.php b/app/src/Listener/UserRedirectedToSettings.php
@@ -13,9 +13,9 @@
 namespace UserFrosting\Sprinkle\Admin\Listener;
 
 use Psr\EventDispatcher\StoppableEventInterface;
-use Slim\Interfaces\RouteParserInterface;
 use UserFrosting\Sprinkle\Account\Authenticate\Authenticator;
 use UserFrosting\Sprinkle\Core\Event\Contract\RedirectingEventInterface;
+use UserFrosting\Sprinkle\Core\Util\RouteParserInterface;
 
 /**
  * Set redirect to dashboard.

diff --git a/app/templates/pages/abstract/dashboard.html.twig b/app/templates/pages/abstract/dashboard.html.twig
@@ -28,7 +28,7 @@
       <header class="main-header">
         <!-- Logo -->
         {% block navbar_logo %}
-        <a href="{{ urlFor('index') }}" class="logo">
+        <a href="{{ urlFor('index', [], [], '/') }}" class="logo">
             <i class="fas fa-home"></i>
             {{site.title}}
         </a>

diff --git a/develop/App.php b/develop/App.php
@@ -54,9 +54,7 @@ public function getSprinkles(): array
      */
     public function getRoutes(): array
     {
-        return [
-            Routes::class,
-        ];
+        return [];
     }
 
     /**

diff --git a/develop/Routes.php b/develop/Routes.php
diff --git a/develop/templates/pages/index.html.twig b/develop/templates/pages/index.html.twig