From 0a0730479e92eafa08ce58964a8f1db8f46abf83 Mon Sep 17 00:00:00 2001
From: horus
Date: Tue, 13 Feb 2018 20:19:46 +0100
Subject: Implements basic search with LIKE query. (website)

---
 site/resources/views/snippets/navbar.blade.php      | 17 +++++++++++++----
 site/resources/views/snippets/sortbuttons.blade.php | 20 ++++++++++----------
 2 files changed, 23 insertions(+), 14 deletions(-)

(limited to 'site/resources/views/snippets')

diff --git a/site/resources/views/snippets/navbar.blade.php b/site/resources/views/snippets/navbar.blade.php
index 0bb2a9b..722836e 100644
--- a/site/resources/views/snippets/navbar.blade.php
+++ b/site/resources/views/snippets/navbar.blade.php
@@ -1,7 +1,7 @@
     <header>                                                                                                                                                                                                         
       <!-- Fixed navbar -->
       <nav class="navbar navbar-expand-md navbar-dark ffixed-top bg-primary nnavbar-light">
-        <a class="navbar-brand" href="/">Alkobote.de</a>
+        <a class="navbar-brand" href="/">Angebote &nbsp;&nbsp;&nbsp;&nbsp;<br><small class="float-right font-italic navbar-small">auf Fuselkönig.de</small></a>
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
@@ -35,10 +35,19 @@
             </li>
           </ul>
 -->
-          <form class="form-inline mt-2 mt-md-0">
-            <input class="form-control mr-sm-2" type="text" placeholder="Suchen… zB Glenfiddich" aria-label="Search">
-            <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Suchen</button>
+          <form class="form-inline mt-2 mt-md-0" action="/search">
+            <input class="form-control mr-sm-2" name="q" type="text" placeholder="Suchen… zB Glenfiddich" aria-label="Search">
+            <button class="btn btn-outline-success my-2 my-sm-0 search-btn-bg-white" type="submit">Suchen</button>
           </form>
+<!--
+          <ul class="navbar-nav ml-2">
+            <li class="nav-item {{ Request::is('misc') ? 'active' : '' }}">   
+              <a class="nav-link active" href="/feeds">Feeds</a>
+            </li>
+            <li class="nav-item divider">   
+            </li>
+          </ul>
+-->
         </div>
       </nav>
     </header>
diff --git a/site/resources/views/snippets/sortbuttons.blade.php b/site/resources/views/snippets/sortbuttons.blade.php
index bf99649..22f7f02 100644
--- a/site/resources/views/snippets/sortbuttons.blade.php
+++ b/site/resources/views/snippets/sortbuttons.blade.php
@@ -8,8 +8,8 @@
 		   Preis 
 		  </button>
 		  <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-		    <a class="dropdown-item" href="?sort=price&order=asc">Niedrigster Preis</a>
-		    <a class="dropdown-item" href="?sort=price&order=desc">Höchster Preis</a>
+		    <a class="dropdown-item" href="?sort=price&order=asc{!! Request::is('search') ? '&q=' : '' !!}{{ Request::is('search') ? $search_phrase : '' }}">Niedrigster Preis</a>
+		    <a class="dropdown-item" href="?sort=price&order=desc{!! Request::is('search') ? '&q=' : '' !!}{{ Request::is('search') ? $search_phrase : '' }}">Höchster Preis</a>
 		  </div>
 		</div>
 		<div class="dropdown mr-2">
@@ -17,8 +17,8 @@
 		  Name  
 		  </button>
 		  <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-		    <a class="dropdown-item" href="?sort=name&order=asc">Alphabetisch</a>
-		    <a class="dropdown-item" href="?sort=name&order=desc">Umgekehrt</a>
+		    <a class="dropdown-item" href="?sort=name&order=asc{!! Request::is('search') ? '&q=' : '' !!}{{ Request::is('search') ? $search_phrase : '' }}">Alphabetisch</a>
+		    <a class="dropdown-item" href="?sort=name&order=desc{!! Request::is('search') ? '&q=' : '' !!}{{ Request::is('search') ? $search_phrase : '' }}">Umgekehrt</a>
 		  </div>
 		</div>
 		<div class="dropdown mr-2">
@@ -26,8 +26,8 @@
 		 Shop 
 		  </button>
 		  <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-		    <a class="dropdown-item" href="?sort=shop&order=asc">Alphabetisch</a>
-		    <a class="dropdown-item" href="?sort=shop&order=desc">Umgekehrt</a>
+		    <a class="dropdown-item" href="?sort=shop&order=asc{!! Request::is('search') ? '&q=' : '' !!}{{ Request::is('search') ? $search_phrase : '' }}">Alphabetisch</a>
+		    <a class="dropdown-item" href="?sort=shop&order=desc{!! Request::is('search') ? '&q=' : '' !!}{{ Request::is('search') ? $search_phrase : '' }}">Umgekehrt</a>
 		  </div>
 		</div>
 	</div>
@@ -37,8 +37,8 @@
 		Preisnachlass
 		  </button>
 		  <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-		    <a class="dropdown-item" href="?sort=procent&order=asc">Niedrigster Preisnachlass</a>
-		    <a class="dropdown-item" href="?sort=procent&order=desc">Höchster Preisnachlass</a>
+		    <a class="dropdown-item" href="?sort=procent&order=asc{!! Request::is('search') ? '&q=' : '' !!}{{ Request::is('search') ? $search_phrase : '' }}">Niedrigster Preisnachlass</a>
+		    <a class="dropdown-item" href="?sort=procent&order=desc{!! Request::is('search') ? '&q=' : '' !!}{{ Request::is('search') ? $search_phrase : '' }}">Höchster Preisnachlass</a>
 		  </div>
 		</div>
 		<div class="dropdown">
@@ -46,8 +46,8 @@
 		Aktualität
 		  </button>
 		  <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-		    <a class="dropdown-item" href="?sort=time&order=desc">Neueste zuerst</a>
-		    <a class="dropdown-item" href="?sort=time&order=asc">Älteste zuerst</a>
+		    <a class="dropdown-item" href="?sort=time&order=desc{!! Request::is('search') ? '&q=' : '' !!}{{ Request::is('search') ? $search_phrase : '' }}">Neueste zuerst</a>
+		    <a class="dropdown-item" href="?sort=time&order=asc{!! Request::is('search') ? '&q=' : '' !!}{{ Request::is('search') ? $search_phrase : '' }}">Älteste zuerst</a>
 		  </div>
 		</div>
 	</div>
-- 
cgit v1.2.3