From ac903b88baefb9e5a971ca5271ddf2c556afb739 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 2 Aug 2019 05:32:30 +0200
Subject: [PATCH] Fix search

---
 app/Http/Controllers/SearchController.php | 21 +++++++++++----------
 app/Support/Search/Search.php             |  3 +--
 resources/views/v1/layout/default.twig    |  4 ++--
 resources/views/v1/search/search.twig     |  3 +--
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index e8eb2aa296..62d917de03 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -22,11 +22,9 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
-use FireflyIII\Support\CacheProperties;
 use FireflyIII\Support\Search\SearchInterface;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
 use Log;
 use Throwable;
 
@@ -62,15 +60,18 @@ class SearchController extends Controller
      */
     public function index(Request $request, SearchInterface $searcher)
     {
-        $fullQuery = (string)$request->get('q');
+        $fullQuery = (string)$request->get('search');
 
         // parse search terms:
         $searcher->parseQuery($fullQuery);
-        $query    = $searcher->getWordsAsString();
+        $query     = $searcher->getWordsAsString();
         $modifiers = $searcher->getModifiers();
-        $subTitle = (string)trans('breadcrumbs.search_result', ['query' => $query]);
+        $subTitle  = (string)trans('breadcrumbs.search_result', ['query' => $query]);
 
-        return view('search.index', compact('query','modifiers', 'fullQuery', 'subTitle'));
+        return view(
+            'search.index',
+            compact('query', 'modifiers', 'fullQuery', 'subTitle')
+        );
     }
 
     /**
@@ -83,15 +84,15 @@ class SearchController extends Controller
      */
     public function search(Request $request, SearchInterface $searcher): JsonResponse
     {
-        $fullQuery    = (string)$request->get('search');
+        $fullQuery    = (string)$request->get('query');
 
         $searcher->parseQuery($fullQuery);
         $searcher->setLimit((int)config('firefly.search_result_limit'));
-        $transactions = $searcher->searchTransactions();
+        $groups = $searcher->searchTransactions();
         $searchTime = $searcher->searchTime(); // in seconds
 
         try {
-            $html = view('search.search', compact('transactions','searchTime'))->render();
+            $html = view('search.search', compact('groups','searchTime'))->render();
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             Log::error(sprintf('Cannot render search.search: %s', $e->getMessage()));
@@ -100,6 +101,6 @@ class SearchController extends Controller
 
         // @codeCoverageIgnoreEnd
 
-        return response()->json(['count' => $transactions->count(), 'html' => $html]);
+        return response()->json(['count' => $groups->count(), 'html' => $html]);
     }
 }
diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php
index 7eb878335d..3bd636d82d 100644
--- a/app/Support/Search/Search.php
+++ b/app/Support/Search/Search.php
@@ -168,13 +168,12 @@ class Search implements SearchInterface
 
         $collector->setLimit($pageSize)->setPage($page)->withAccountInformation();
         $collector->withCategoryInformation()->withBudgetInformation();
-
         $collector->setSearchWords($this->words);
 
         // Most modifiers can be applied to the collector directly.
         $collector = $this->applyModifiers($collector);
 
-        return $collector->getPaginatedTransactions();
+        return $collector->getPaginatedGroups();
 
     }
 
diff --git a/resources/views/v1/layout/default.twig b/resources/views/v1/layout/default.twig
index 9a31e56018..b12da4122a 100644
--- a/resources/views/v1/layout/default.twig
+++ b/resources/views/v1/layout/default.twig
@@ -104,9 +104,9 @@
         <section class="sidebar">
             <form action="{{ route('search.index') }}" method="get" class="sidebar-form">
                 <div class="input-group">
-                    <input autocomplete="off" type="text" name="q" class="form-control" placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}"/>
+                    <input autocomplete="off" type="text" name="search" class="form-control" placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}"/>
                     <span class="input-group-btn">
-                <button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button>
+                <button type='submit' name='go' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button>
               </span>
                 </div>
             </form>
diff --git a/resources/views/v1/search/search.twig b/resources/views/v1/search/search.twig
index 375f555137..5234c64dce 100644
--- a/resources/views/v1/search/search.twig
+++ b/resources/views/v1/search/search.twig
@@ -3,5 +3,4 @@
     {{ trans('firefly.search_found_transactions', {count: transactions.count, time: searchTime}) }}
 </p>
 
-{# TODO REPLACE ME#}
-<h1 style="color:red;">REPLACE ME</h1>
+{% include 'list.groups' %}