Search controller.

app/Http/Controllers/BillController.php

@@ -70,7 +70,7 @@ class BillController extends Controller
     {
         $periods = \Config::get('firefly.periods_to_text');
 
-        return View::make('bills.edit')->with('periods', $periods)->with('bill', $bill)->with('subTitle', 'Edit "' . e($bill->name) . '"');
+        return view('bills.edit')->with('periods', $periods)->with('bill', $bill)->with('subTitle', 'Edit "' . e($bill->name) . '"');
     }
 
     /**
@@ -92,7 +92,7 @@ class BillController extends Controller
             }
         );
 
-        return View::make('bills.index', compact('bills'));
+        return view('bills.index', compact('bills'));
     }
 
     /**
@@ -140,7 +140,7 @@ class BillController extends Controller
         $hideBill                = true;
 
 
-        return View::make('bills.show', compact('journals', 'hideBill', 'bill'))->with('subTitle', e($bill->name));
+        return view('bills.show', compact('journals', 'hideBill', 'bill'))->with('subTitle', e($bill->name));
     }
 
     /**

app/Http/Controllers/CategoryController.php

@@ -73,7 +73,7 @@ class CategoryController extends Controller
                          ->get(['transaction_journals.*']);
         $subTitle = 'Transactions without a category in ' . $start->format('F Y');
 
-        return View::make('categories.noCategory', compact('list', 'subTitle'));
+        return view('categories.noCategory', compact('list', 'subTitle'));
     }
 
     /**

app/Http/Controllers/CurrencyController.php

@@ -74,7 +74,7 @@ class CurrencyController extends Controller
         }
 
 
-        return View::make('currency.delete', compact('currency'));
+        return view('currency.delete', compact('currency'));
     }
 
     /**

app/Http/Controllers/PiggyBankController.php

@@ -52,7 +52,7 @@ class PiggyBankController extends Controller
 
         \Log::debug('Now going to view for piggy bank #' . $piggyBank->id . ' (' . $piggyBank->name . ')');
 
-        return View::make('piggy-banks.add', compact('piggyBank', 'maxAmount'));
+        return view('piggy-banks.add', compact('piggyBank', 'maxAmount'));
     }
 
     /**
@@ -66,7 +66,7 @@ class PiggyBankController extends Controller
         $subTitle     = 'Create new piggy bank';
         $subTitleIcon = 'fa-plus';
 
-        return View::make('piggy-banks.create', compact('accounts', 'periods', 'subTitle', 'subTitleIcon'));
+        return view('piggy-banks.create', compact('accounts', 'periods', 'subTitle', 'subTitleIcon'));
     }
 
     /**
@@ -78,7 +78,7 @@ class PiggyBankController extends Controller
     {
         $subTitle = 'Delete "' . e($piggyBank->name) . '"';
 
-        return View::make('piggy_banks.delete', compact('piggyBank', 'subTitle'));
+        return view('piggy_banks.delete', compact('piggyBank', 'subTitle'));
     }
 
     /**
@@ -128,7 +128,7 @@ class PiggyBankController extends Controller
         ];
         Session::flash('preFilled', $preFilled);
 
-        return View::make('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'accounts', 'periods', 'preFilled'));
+        return view('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'accounts', 'periods', 'preFilled'));
     }
 
 
@@ -242,7 +242,7 @@ class PiggyBankController extends Controller
      */
     public function remove(PiggyBank $piggyBank)
     {
-        return View::make('piggy-banks.remove', compact('piggyBank'));
+        return view('piggy-banks.remove', compact('piggyBank'));
     }
 
     /**
@@ -261,7 +261,7 @@ class PiggyBankController extends Controller
 
         $subTitle = e($piggyBank->name);
 
-        return View::make('piggy-banks.show', compact('piggyBank', 'events', 'subTitle'));
+        return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle'));
 
     }
 

app/Http/Controllers/PreferencesController.php

@@ -39,7 +39,7 @@ class PreferencesController extends Controller {
         $budgetMax      = Preferences::get('budgetMaximum', 1000);
         $budgetMaximum  = $budgetMax->data;
 
-        return View::make('preferences.index', compact('budgetMaximum'))->with('accounts', $accounts)->with('frontPageAccounts', $frontPage)->with(
+        return view('preferences.index', compact('budgetMaximum'))->with('accounts', $accounts)->with('frontPageAccounts', $frontPage)->with(
             'viewRange', $viewRangeValue
         );
     }

app/Http/Controllers/RepeatedExpenseController.php

@@ -38,7 +38,7 @@ class RepeatedExpenseController extends Controller
         $periods  = Config::get('firefly.piggy_bank_periods');
         $accounts = ExpandedForm::makeSelectList(Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*']));
 
-        return View::make('repeatedExpense.create', compact('accounts', 'periods'))->with('subTitle', 'Create new repeated expense')->with(
+        return view('repeatedExpense.create', compact('accounts', 'periods'))->with('subTitle', 'Create new repeated expense')->with(
             'subTitleIcon', 'fa-plus'
         );
     }
@@ -52,7 +52,7 @@ class RepeatedExpenseController extends Controller
     {
         $subTitle = 'Delete "' . e($repeatedExpense->name) . '"';
 
-        return View::make('repeatedExpense.delete', compact('repeatedExpense', 'subTitle'));
+        return view('repeatedExpense.delete', compact('repeatedExpense', 'subTitle'));
     }
 
     /**
@@ -98,7 +98,7 @@ class RepeatedExpenseController extends Controller
         ];
         Session::flash('preFilled', $preFilled);
 
-        return View::make('repeatedExpense.edit', compact('subTitle', 'subTitleIcon', 'repeatedExpense', 'accounts', 'periods', 'preFilled'));
+        return view('repeatedExpense.edit', compact('subTitle', 'subTitleIcon', 'repeatedExpense', 'accounts', 'periods', 'preFilled'));
     }
 
     /**
@@ -116,7 +116,7 @@ class RepeatedExpenseController extends Controller
             }
         );
 
-        return View::make('repeatedExpense.index', compact('expenses', 'subTitle'));
+        return view('repeatedExpense.index', compact('expenses', 'subTitle'));
     }
 
     /**
@@ -136,7 +136,7 @@ class RepeatedExpenseController extends Controller
             }
         );
 
-        return View::make('repeatedExpense.show', compact('repetitions', 'repeatedExpense', 'today', 'subTitle'));
+        return view('repeatedExpense.show', compact('repetitions', 'repeatedExpense', 'today', 'subTitle'));
     }
 
     /**

app/Http/Controllers/SearchController.php

@@ -0,0 +1,44 @@
+<?php namespace FireflyIII\Http\Controllers;
+
+use FireflyIII\Http\Requests;
+use FireflyIII\Http\Controllers\Controller;
+
+use FireflyIII\Support\Search\SearchInterface;
+use Illuminate\Http\Request;
+use Input;
+
+/**
+ * Class SearchController
+ *
+ * @package FireflyIII\Http\Controllers
+ */
+class SearchController extends Controller {
+    /**
+     * Results always come in the form of an array [results, count, fullCount]
+     */
+    public function index(SearchInterface $searcher)
+    {
+
+        $subTitle = null;
+        $rawQuery = null;
+        $result   = [];
+        if (!is_null(Input::get('q')) && strlen(Input::get('q')) > 0) {
+            $rawQuery = trim(Input::get('q'));
+            $words    = explode(' ', $rawQuery);
+            $subTitle = 'Results for "' . e($rawQuery) . '"';
+
+            $transactions = $searcher->searchTransactions($words);
+            $accounts     = $searcher->searchAccounts($words);
+            $categories   = $searcher->searchCategories($words);
+            $budgets      = $searcher->searchBudgets($words);
+            $tags         = $searcher->searchTags($words);
+            $result       = ['transactions' => $transactions, 'accounts' => $accounts, 'categories' => $categories, 'budgets' => $budgets, 'tags' => $tags];
+
+        }
+
+        return view('search.index')->with('title', 'Search')->with('subTitle', $subTitle)->with(
+            'mainTitleIcon', 'fa-search'
+        )->with('query', $rawQuery)->with('result', $result);
+    }
+
+}