From 4c0783fdc7ecd64d78426b3cd06134f6e3375704 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu, 16 Jul 2015 19:53:24 +0100
Subject: [PATCH] Added search

---
 app/Http/Controllers/PageController.php       |  9 ++++++
 app/Http/routes.php                           |  1 +
 app/Repos/PageRepo.php                        | 10 +++++++
 resources/assets/sass/_forms.scss             |  5 ++--
 resources/assets/sass/_text.scss              |  8 +++++
 resources/assets/sass/styles.scss             |  3 +-
 resources/views/base.blade.php                | 25 ++++++++++++----
 .../views/pages/search-results.blade.php      | 30 +++++++++++++++++++
 8 files changed, 82 insertions(+), 9 deletions(-)
 create mode 100644 resources/views/pages/search-results.blade.php

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 0a9f11844..57901573b 100644
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -132,6 +132,15 @@ class PageController extends Controller
         return redirect($page->getUrl());
     }
 
+    public function searchAll(Request $request)
+    {
+        $searchTerm = $request->get('term');
+        if(empty($searchTerm)) return redirect()->back();
+
+        $pages = $this->pageRepo->getBySearch($searchTerm);
+        return view('pages/search-results', ['pages' => $pages, 'searchTerm' => $searchTerm]);
+    }
+
     /**
      * Remove the specified resource from storage.
      *
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 52394c564..c190da616 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -36,6 +36,7 @@ Route::get('/images/all/{page}', 'ImageController@getAll');
 Route::get('/images/{any}', 'ImageController@getImage')->where('any', '.*');
 
 Route::get('/link/{id}', 'PageController@redirectFromLink');
+Route::get('/pages/search/all', 'PageController@searchAll');
 
 Route::get('/', function () {
     return view('base');
diff --git a/app/Repos/PageRepo.php b/app/Repos/PageRepo.php
index 62fbe9d8f..a62907472 100644
--- a/app/Repos/PageRepo.php
+++ b/app/Repos/PageRepo.php
@@ -49,4 +49,14 @@ class PageRepo
         $page->delete();
     }
 
+    public function getBySearch($term)
+    {
+        $terms = explode(' ', trim($term));
+        $query = $this->page;
+        foreach($terms as $term) {
+            $query = $query->where('text', 'like', '%'.$term.'%');
+        }
+        return $query->get();
+    }
+
 }
\ No newline at end of file
diff --git a/resources/assets/sass/_forms.scss b/resources/assets/sass/_forms.scss
index 37e03c3cf..861cfbb9f 100644
--- a/resources/assets/sass/_forms.scss
+++ b/resources/assets/sass/_forms.scss
@@ -1,9 +1,8 @@
 
 .input-base {
   background-color: #FFF;
-  border-radius: 2px;
-  border: 1px solid #BBB;
-  border-top: 1px solid #AAA;
+  border-radius: 3px;
+  border: 1px solid #CCC;
   display: inline-block;
   font-size: $fs-s;
   font-family: $text;
diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss
index 584b12b5b..7c8e025dd 100644
--- a/resources/assets/sass/_text.scss
+++ b/resources/assets/sass/_text.scss
@@ -164,6 +164,14 @@ p.secondary, p .secondary, span.secondary, .text-secondary {
 	color: $secondary;
 }
 
+/*
+ * Lists
+ */
+ul {
+  list-style: disc;
+  margin-left: $-m;
+}
+
 /*
  * Generic text styling classes
  */
diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss
index 853e98454..9dc65cb8d 100644
--- a/resources/assets/sass/styles.scss
+++ b/resources/assets/sass/styles.scss
@@ -29,9 +29,10 @@ header hr {
 header .menu {
   margin-bottom: 0;
   list-style: none;
+  margin-left: 0;
   li {
     display: inline-block;
-    margin-left: $-m;
+    margin-right: $-m;
   }
 }
 
diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index e61944e37..6345de2b4 100644
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -16,6 +16,11 @@
             }, 800); // Adjust to change animations speed (ms)
             return this;
         };
+        $.expr[":"].contains = $.expr.createPseudo(function(arg) {
+            return function( elem ) {
+                return $(elem).text().toUpperCase().indexOf(arg.toUpperCase()) >= 0;
+            };
+        });
     </script>
     @yield('head')
 </head>
@@ -23,11 +28,21 @@
 
     <header>
         <div class="container">
-            <div class="padded-vertical clearfix">
-                <div class="logo float left">Oxbow</div>
-                <ul class="menu float right">
-                    <li><a href="/books"><i class="fa fa-book"></i>Books</a></li>
-                </ul>
+            <div class="padded-vertical row clearfix">
+                <div class="col-md-3">
+                    <div class="logo float left">Oxbow</div>
+                </div>
+                <div class="col-md-9">
+                    <ul class="menu float">
+                        <li><a href="/books"><i class="fa fa-book"></i>Books</a></li>
+                    </ul>
+                    <div class="search-box float right">
+                        <form action="/pages/search/all" id="search-form" method="GET">
+                            {!! csrf_field() !!}
+                            <input type="text" placeholder="Search all pages..." name="term" id="search-input">
+                        </form>
+                    </div>
+                </div>
             </div>
         </div>
     </header>
diff --git a/resources/views/pages/search-results.blade.php b/resources/views/pages/search-results.blade.php
new file mode 100644
index 000000000..cf3066d70
--- /dev/null
+++ b/resources/views/pages/search-results.blade.php
@@ -0,0 +1,30 @@
+@extends('base')
+
+@section('content')
+
+
+    <div class="row">
+
+        <div class="col-md-3 page-menu">
+
+        </div>
+
+        <div class="col-md-9 page-content">
+            <h1>Search Results <span class="subheader">For '{{$searchTerm}}'</span></h1>
+            <div class="page-list">
+                @if(count($pages) > 0)
+                    @foreach($pages as $page)
+                        <a href="{{$page->getUrl() . '#' . $searchTerm}}">{{$page->name}}</a>
+                    @endforeach
+                @else
+                    <p class="text-muted">No pages matched this search</p>
+                @endif
+            </div>
+        </div>
+
+    </div>
+
+
+
+
+@stop
\ No newline at end of file