Moved to param

Author: spitfire305

app/Http/Middleware/LoginRedirect.php

@@ -10,12 +10,15 @@ class LoginRedirect
 {
     public function handle(Request $request, Closure $next): Response
     {
+        $whitelist = ['roadmap'];
+
         // Store the previous URL in session only if it's not the login route itself and is a valid redirect url
         if ($request->is('login') || $request->is('register')) {
             // If to check where the request is coming from and set the variable if its a valid route.
-            if (url()->previous() === route('roadmap')) {
-                session(['login_redirect' => url()->previous()]);
-            } elseif (! (url()->previous() === route('login')) && ! (url()->previous() === route('register'))) {
+            if ($request->has('next') && in_array($request->get('next'), $whitelist)) {
+                session(['login_redirect' => route($request->get('next'))]);
+
+            } elseif (! (strtok(url()->previous(), '?') === route('login')) && ! (strtok(url()->previous(), '?') === route('register'))) {
                 // If the user moves outside the login page, reset the redirect variable.
                 session(['login_redirect' => null]);
             }

resources/views/layouts/front/nav.blade.php

@@ -13,15 +13,14 @@
             {{ __('footer.public-campaigns') }}
         </a>
     </div>
-
     @if (!isset($minimal) || !$minimal)
     <div class="gap-2.5 items-center hidden lg:flex">
         @guest()
-            <a href="{{ route('login') }}" class="btn-login transition-all duration-200">
+            <a href="{{ route('login', request()->is('roadmap') ? ['next' => 'roadmap'] : []) }}" class="btn-login transition-all duration-200">
                 {{ __('front.menu.login') }}
             </a>
             @if (config('auth.register_enabled'))
-            <a href="{{ route('register') }}" class="btn-register transition-all duration-200">
+            <a href="{{ route('register', request()->is('roadmap') ? ['next' => 'roadmap'] : []) }}" class="btn-register transition-all duration-200">
                 {{ __('front.menu.register') }}
             </a>
             @endif