Merge branch '2.x' into bugfix/two_dots

Search from URL fixed #1369

app/Search.php

@@ -5,6 +5,7 @@ namespace App;
 use Cache;
 use Form;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Request as Input;
 use Yaml;
 
 abstract class Search
@@ -106,7 +107,7 @@ abstract class Search
         if ((bool) $homepage_search !== true) {
             return $output;
         }
-        $user_search_provider = $user_search_provider ?? 'none';
+        $user_search_provider = Input::get('p') ?? $user_search_provider ?? 'none';
 
         if ((bool) $search_provider) {
             if ((bool) $user_search_provider) {
@@ -124,7 +125,7 @@ abstract class Search
                 $output .= '</select>';
                 $output .= Form::text(
                     'q',
-                    null,
+                    Input::get('q') ?? null,
                     [
                         'class' => 'homesearch',
                         'autofocus' => 'autofocus',

config/app.php

@@ -17,7 +17,7 @@ return [
     */
 
     'name' => env('APP_NAME', 'Heimdall'),
-    'version' => '2.6.1',
+    'version' => '2.6.3',
 
     /*
     |--------------------------------------------------------------------------

public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/css/app.css": "/css/app.css?id=9ac09de3efefe57251cba47c5747c556",
-    "/js/app.js": "/js/app.js?id=a3df64b8054d7a3f742957b38d687835"
+    "/css/app.css": "/css/app.css?id=e8db4d3d99fdd3f0c747bb894c843e8e",
+    "/js/app.js": "/js/app.js?id=3b306fb20ef1a3c96c09963a4f6ff712"
 }

resources/assets/js/app.js

@@ -111,7 +111,7 @@ $.when($.ready).then(() => {
   $("#search-container")
     .on("input", "input[name=q]", function () {
       const search = this.value;
-      const items = $("#sortable").children(".item-container");
+      const items = $("#sortable").find(".item-container");
       if ($("#search-container select[name=provider]").val() === "tiles") {
         if (search.length > 0) {
           items.hide();
@@ -129,7 +129,7 @@ $.when($.ready).then(() => {
       }
     })
     .on("change", "select[name=provider]", function () {
-      const items = $("#sortable").children(".item-container");
+      const items = $("#sortable").find(".item-container");
       if ($(this).val() === "tiles") {
         $("#search-container button").hide();
         const search = $("#search-container input[name=q]").val();
@@ -150,6 +150,8 @@ $.when($.ready).then(() => {
       }
     });
 
+  $("#search-container select[name=provider]").trigger("change");
+
   $("#app")
     .on("click", "#config-button", (e) => {
       e.preventDefault();

resources/assets/sass/_app.scss

@@ -141,6 +141,7 @@ body {
 			top: -58px;
 			transition: all .35s ease-in-out;
 			z-index: 1;
+			overflow: hidden;
 			ul {
 				display: inline-block;
 				list-style: none;

resources/views/sortable.blade.php

@@ -3,7 +3,7 @@
 
             @foreach($categories as $category)
                 <?php $apps = $category->children; ?>
-                <div class="category item-container" data-name="{{ $category->title }}" data-id="{{ $category->id }}">
+                <div class="category item-containerz" data-name="{{ $category->title }}" data-id="{{ $category->id }}">
                 <div class="title"><a href="{{ $category->link }}" style="{{ $category->colour ? 'color: ' . $category->colour .';' : '' }}">{{ $category->title }}</a></div>
                 @foreach($apps as $app)
                     @include('item')