Add random order option

Kovah · Apr 3, 2023 · 48c84aa · 48c84aa
1 parent 5a62672
commit 48c84aa
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 4 deletions.
diff --git a/app/Http/Controllers/Models/LinkController.php b/app/Http/Controllers/Models/LinkController.php
@@ -31,11 +31,14 @@ public function index(Request $request): View
 
         $links = Link::byUser()
             ->with('tags')
-            ->orderBy($orderBy, $orderDir)
-            ->paginate(getPaginationLimit());
+            ->orderBy($orderBy, $orderDir);
+
+        if ($orderBy == 'random') {
+            $links->inRandomOrder();
+        }
 
         return view('models.links.index', [
-            'links' => $links,
+            'links' => $links->paginate(getPaginationLimit()),
             'route' => $request->getBaseUrl(),
             'orderBy' => $orderBy,
             'orderDir' => $orderDir,

diff --git a/app/Http/Controllers/Traits/SearchesLinks.php b/app/Http/Controllers/Traits/SearchesLinks.php
@@ -91,7 +91,11 @@ protected function buildDatabaseQuery(SearchRequest $request): Builder
 
         // Order the results if applicable
         if ($this->searchOrderBy = $request->input('order_by', $this->orderByOptions[0])) {
-            $search->orderBy(...explode(':', $this->searchOrderBy));
+            if ($this->searchOrderBy == 'random') {
+                $search->inRandomOrder();
+            } else {
+                $search->orderBy(...explode(':', $this->searchOrderBy));
+            }
         }
 
         // Return the query builder itself

diff --git a/lang/de_DE/search.php b/lang/de_DE/search.php
@@ -22,6 +22,7 @@
     'order_by.created_at:desc' => 'Erstellungsdatum absteigend',
     'order_by.number_links:asc' => 'Anzahl der Links aufsteigend',
     'order_by.number_links:desc' => 'Anzahl der Links absteigend',
+    'order_by.random' => 'Zufällig',
 
     'no_results' => 'Keine Ergebnisse gefunden.',
 

diff --git a/lang/en_US/search.php b/lang/en_US/search.php
@@ -22,6 +22,7 @@
     'order_by.created_at:desc' => 'Creation Date descending',
     'order_by.number_links:asc' => 'Number of Links ascending',
     'order_by.number_links:desc' => 'Number of Links descending',
+    'order_by.random' => 'Random',
 
     'no_results' => 'No results found.',
 

diff --git a/lang/fr_FR/search.php b/lang/fr_FR/search.php
@@ -22,6 +22,7 @@
     'order_by.created_at:desc' => 'Date de Création descendante',
     'order_by.number_links:asc' => 'Nombre de Liens ascendants',
     'order_by.number_links:desc' => 'Nombre de Liens descendants',
+    'order_by.random' => 'Aléatoire',
 
     'no_results' => 'Aucun résultat trouvé.',
 

diff --git a/resources/views/app/search/search.blade.php b/resources/views/app/search/search.blade.php
@@ -121,6 +121,10 @@ class="form-check-input"
                                     @lang('search.order_by.' . $order_by)
                                 </option>
                             @endforeach
+                            <option value="random"
+                                @if($query_settings['order_by'] == 'random') selected @endif>
+                                @lang('search.order_by.random')
+                            </option>
                         </select>
                     </div>
 

diff --git a/resources/views/models/links/partials/index-order-dropdown.blade.php b/resources/views/models/links/partials/index-order-dropdown.blade.php
@@ -28,4 +28,8 @@ class="btn btn-sm btn-outline-primary dropdown-toggle dropdown-toggle-split"
         href="{{ route($baseRoute, ['orderBy' => 'title', 'orderDir' => 'desc']) }}">
         @lang('search.order_by.title:desc')
     </a>
+    <a class="dropdown-item small"
+        href="{{ route($baseRoute, ['orderBy' => 'random']) }}">
+        @lang('search.order_by.random')
+    </a>
 </div>