From bf20164d5e9972c4c1f51397f1b48b9fb116c895 Mon Sep 17 00:00:00 2001
From: jk <jk@nipponalba.scot>
Date: Thu, 24 Jun 2021 13:11:32 +0100
Subject: [PATCH] first iteration of search functionality - likely to fail hard

---
 resources/views/beers/index.blade.php    | 1 -
 resources/views/inc/navbar.blade.php     | 2 ++
 resources/views/search/index.blade.php   | 2 +-
 resources/views/search/results.blade.php | 3 +--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/beers/index.blade.php b/resources/views/beers/index.blade.php
index 98c0617..69a2262 100644
--- a/resources/views/beers/index.blade.php
+++ b/resources/views/beers/index.blade.php
@@ -6,7 +6,6 @@
         <div class="col-md-12">
             <div class="card">
 @include('inc.navbar')
-@include('search.index')
                 <div class="card-header"><a href="/home">Home</a> -> {{ __('Beer List') }}<span class="backlink"><a href="{{url()->previous()}}">Go Back</a></span></div>
 
                 <div class="card-body">
diff --git a/resources/views/inc/navbar.blade.php b/resources/views/inc/navbar.blade.php
index 167ed1d..aa94f0e 100644
--- a/resources/views/inc/navbar.blade.php
+++ b/resources/views/inc/navbar.blade.php
@@ -1,3 +1,5 @@
 <div id="navline1"><a href="/beers">Beers</a> | <a href="/breweries">Breweries</a> | <a href="/grains">Grains</a> | <a href="/hops">Hops</a> | <a href="/yeasts">Yeasts</a> | <a href="/adjuncts">Adjuncts</a></div>
 
 @if (Auth::user()->isAdmin())<div id="navline2"><a href="/grainbills">Grain Bills</a> | <a href="/mashes">Mash Steps</a> | <a href="/hopadditions">Hop Additions</a> | <a href="/fermentations">Fermentation Steps</a> | <a href="/adjunctadditions">Adjunct Additions</a></div>@endif
+
+@include('search.index')
diff --git a/resources/views/search/index.blade.php b/resources/views/search/index.blade.php
index 349a635..af784b3 100644
--- a/resources/views/search/index.blade.php
+++ b/resources/views/search/index.blade.php
@@ -10,7 +10,7 @@
       <label for="">Hops</label>
       <input type="radio" id="yeasts" value="yeast" name="table" >
       <label for="">Yeasts</label></span>
-      <input type="text" class="form-control" name="search" />  <button type="submit" class="btn btn-primary"><i class="fa fa-search fa-2x" aria-hidden="true"></i></button>
+      <input type="text" class="form-control" name="search" />  <button type="submit" class="btn btn-primary"><i class="fa fa-search" aria-hidden="true"></i></button>
     </div>
 
 </form>
diff --git a/resources/views/search/results.blade.php b/resources/views/search/results.blade.php
index 8b51c73..6936a12 100644
--- a/resources/views/search/results.blade.php
+++ b/resources/views/search/results.blade.php
@@ -6,7 +6,6 @@
         <div class="col-md-12">
             <div class="card">
 @include('inc.navbar')
-@include('search.index')
                 <div class="card-header"><a href="/home">Home</a> -> {{ __('Search Results') }}<span class="backlink"><a href="{{url()->previous()}}">Go Back</a></span></div>
 
                 <div class="card-body">
@@ -16,7 +15,7 @@
             <thead>
               <tr>
                 <th scope="col">@sortablelink('name')</th>
-		            <th scope="col">@sortablelink('brewery')</th>
+		            <th scope="col">@sortablelink('brewery'</th>
 		            <th scope="col" class="hideable">@sortablelink('type', 'Style')</th>
               </tr>
             </thead>