Merge pull request #3899 from Roardom/modularize-torrent-layout

(Refactor) Move user torrent layout query into torrent search component
HDInnovations · Jun 4, 2024 · 87ef0e7 · 87ef0e7
2 parents ce46fc9 + 391e1f1
commit 87ef0e7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 65 deletions.
diff --git a/app/Http/Livewire/TorrentSearch.php b/app/Http/Livewire/TorrentSearch.php
@@ -214,14 +214,23 @@ class TorrentSearch extends Component
     #[Url(history: true)]
     public string $sortDirection = 'desc';
 
-    #[Url(history: true)]
+    #[Url(except: 'list')]
     public string $view = 'list';
 
     final public function mount(Request $request): void
     {
         if ($request->missing('sortField')) {
             $this->sortField = auth()->user()->settings?->torrent_sort_field ?? 'bumped_at';
         }
+
+        if ($request->missing('view')) {
+            $this->view = match (auth()->user()->settings?->torrent_layout) {
+                1       => 'card',
+                2       => 'group',
+                3       => 'poster',
+                default => 'list',
+            };
+        }
     }
 
     final public function updating(string $field, mixed &$value): void

diff --git a/resources/views/partials/top_nav.blade.php b/resources/views/partials/top_nav.blade.php
@@ -8,19 +8,7 @@
     </div>
     <ul class="top-nav__main-menus" x-bind:class="expanded && 'mobile'">
         <li class="top-nav--left__list-item top-nav__dropdown">
-            <a
-                class="top-nav__dropdown--nontouch"
-                href="{{
-                    route('torrents.index', [
-                        'view' => match (auth()->user()->settings?->torrent_layout) {
-                            1 => 'card',
-                            2 => 'group',
-                            3 => 'poster',
-                            default => 'list',
-                        },
-                    ])
-                }}"
-            >
+            <a class="top-nav__dropdown--nontouch" href="{{ route('torrents.index') }}">
                 <div class="top-nav--left__container">
                     {{ __('torrent.torrents') }}
                 </div>
@@ -32,18 +20,7 @@ class="top-nav__dropdown--nontouch"
             </a>
             <ul>
                 <li>
-                    <a
-                        href="{{
-                            route('torrents.index', [
-                                'view' => match (auth()->user()->settings?->torrent_layout) {
-                                    1 => 'card',
-                                    2 => 'group',
-                                    3 => 'poster',
-                                    default => 'list',
-                                },
-                            ])
-                        }}"
-                    >
+                    <a href="{{ route('torrents.index') }}">
                         <i class="{{ config('other.font-awesome') }} fa-download"></i>
                         {{ __('torrent.torrents') }}
                     </a>

diff --git a/resources/views/rss/index.blade.php b/resources/views/rss/index.blade.php
@@ -13,19 +13,7 @@
 
 @section('nav-tabs')
     <li class="nav-tabV2">
-        <a
-            class="nav-tab__link"
-            href="{{
-                route('torrents.index', [
-                    'view' => match (auth()->user()->settings?->torrent_layout) {
-                        1 => 'card',
-                        2 => 'group',
-                        3 => 'poster',
-                        default => 'list',
-                    },
-                ])
-            }}"
-        >
+        <a class="nav-tab__link" href="{{ route('torrents.index') }}">
             {{ __('torrent.search') }}
         </a>
     </li>

diff --git a/resources/views/top10/index.blade.php b/resources/views/top10/index.blade.php
@@ -12,19 +12,7 @@
 
 @section('nav-tabs')
     <li class="nav-tabV2">
-        <a
-            class="nav-tab__link"
-            href="{{
-                route('torrents.index', [
-                    'view' => match (auth()->user()->settings?->torrent_layout) {
-                        1 => 'card',
-                        2 => 'group',
-                        3 => 'poster',
-                        default => 'list',
-                    },
-                ])
-            }}"
-        >
+        <a class="nav-tab__link" href="{{ route('torrents.index') }}">
             {{ __('common.search') }}
         </a>
     </li>

diff --git a/resources/views/torrent/create.blade.php b/resources/views/torrent/create.blade.php
@@ -17,19 +17,7 @@
 
 @section('nav-tabs')
     <li class="nav-tabV2">
-        <a
-            class="nav-tab__link"
-            href="{{
-                route('torrents.index', [
-                    'view' => match (auth()->user()->settings?->torrent_layout) {
-                        1 => 'card',
-                        2 => 'group',
-                        3 => 'poster',
-                        default => 'list',
-                    },
-                ])
-            }}"
-        >
+        <a class="nav-tab__link" href="{{ route('torrents.index') }}">
             {{ __('torrent.search') }}
         </a>
     </li>