From 744864395808811d033878402c3773946331470a Mon Sep 17 00:00:00 2001
From: Stephen Cameron <stephen@cubedesigners.com>
Date: Wed, 4 Sep 2019 18:34:53 +0200
Subject: [PATCH] Done #2956 @3

---
 app/Templates/Documentation.php               | 14 +++++
 app/Templates/Search.php                      | 15 +++--
 app/Templates/Support.php                     | 13 ----
 resources/js/components/SearchField.vue       | 44 +++++++------
 resources/views/pages/documentation.blade.php | 15 +++++
 resources/views/pages/search.blade.php        | 61 +------------------
 resources/views/pages/services.blade.php      |  4 +-
 resources/views/pages/support.blade.php       |  7 ---
 resources/views/partials/form.blade.php       |  2 +-
 .../views/partials/search-results.blade.php   | 60 ++++++++++++++++++
 10 files changed, 130 insertions(+), 105 deletions(-)
 create mode 100644 app/Templates/Documentation.php
 delete mode 100644 app/Templates/Support.php
 create mode 100644 resources/views/pages/documentation.blade.php
 delete mode 100644 resources/views/pages/support.blade.php
 create mode 100644 resources/views/partials/search-results.blade.php

diff --git a/app/Templates/Documentation.php b/app/Templates/Documentation.php
new file mode 100644
index 0000000..f84de8e
--- /dev/null
+++ b/app/Templates/Documentation.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Templates;
+
+class Documentation extends Search
+{
+    protected $_hasIntro = true;
+
+    public function getName()
+    {
+        return 'Documentation';
+    }
+
+}
diff --git a/app/Templates/Search.php b/app/Templates/Search.php
index 28b12e3..38db221 100644
--- a/app/Templates/Search.php
+++ b/app/Templates/Search.php
@@ -7,6 +7,8 @@ use Cubist\Backpack\app\Magic\Search as SearchEngine;
 
 class Search extends Base
 {
+    protected $_hasIntro = false;
+
     public function getName()
     {
         return 'Moteur de recherche';
@@ -16,12 +18,15 @@ class Search extends Base
     {
         parent::init();
 
-        $this->removeField('intro');
+        if (!$this->_hasIntro) {
+
+            $this->removeField('intro');
 
-        $this->addField(['name'  => 'page_heading',
-                         'type'  => 'Text',
-                         'label' => 'Titre de la page',
-                         'tab'   => 'Contenus']);
+            $this->addField(['name'  => 'page_heading',
+                             'type'  => 'Text',
+                             'label' => 'Titre de la page',
+                             'tab'   => 'Contenus']);
+        }
 
         // Enable form
         $this->addForm();
diff --git a/app/Templates/Support.php b/app/Templates/Support.php
deleted file mode 100644
index 1191a99..0000000
--- a/app/Templates/Support.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-
-namespace App\Templates;
-
-
-class Support extends Base
-{
-    public function getName()
-    {
-        return 'Support';
-    }
-}
diff --git a/resources/js/components/SearchField.vue b/resources/js/components/SearchField.vue
index 0820879..80fa6e3 100644
--- a/resources/js/components/SearchField.vue
+++ b/resources/js/components/SearchField.vue
@@ -1,17 +1,19 @@
 <template>
-    <autocomplete
-        class="flex-grow"
-        name="q"
-        :default-value="value"
-        ref="autocomplete"
-        :search="getSuggestions"
-        :get-result-value="getResultValue"
-        :placeholder="placeholder"
-        :aria-placeholder="placeholder"
-        @submit="handleSubmit"
-        :autofocus="autofocus"
-    >
-    </autocomplete>
+    <div class="flex-grow">
+        <autocomplete
+            name="q"
+            :default-value="value"
+            ref="autocomplete"
+            :search="getSuggestions"
+            :get-result-value="getResultValue"
+            :placeholder="placeholder"
+            :aria-placeholder="placeholder"
+            @submit="handleSubmit"
+            :autofocus="autofocus"
+        >
+        </autocomplete>
+        <input type="hidden" name="type" :value="searchType" v-if="searchType !== ''">
+    </div>
 </template>
 
 <script>
@@ -36,6 +38,10 @@
             placeholder: {
                 type: String,
             },
+            searchType: {
+                type: String,
+                default: ''
+            },
             value: {
                 type: String,
             },
@@ -66,11 +72,15 @@
                         return resolve([])
                     }
 
-                    axios.post(this.ajaxURL, { q: input, limit: this.suggestionsLimit })
+                    let data = {
+                        q: input,
+                        type: this.searchType,
+                        limit: this.suggestionsLimit
+                    };
+
+                    axios.post(this.ajaxURL, data)
                         .then(function(response) {
-                            if (response.data.length > 0) {
-                                resolve(response.data);
-                            }
+                            resolve(response.data);
                         })
                         .catch(function(error) {
                             console.error('Error fetching search suggestions', error);
diff --git a/resources/views/pages/documentation.blade.php b/resources/views/pages/documentation.blade.php
new file mode 100644
index 0000000..0f97b93
--- /dev/null
+++ b/resources/views/pages/documentation.blade.php
@@ -0,0 +1,15 @@
+@extends('layouts/app')
+
+@section('content')
+
+    @intro(['padding' => 'pb-1v'])
+
+    <content class="pb-3v">
+
+        <div id="results" class="pt-1v">
+            @include('partials.search-results', ['search_type' => 'product', 'result_url_suffix' => '#documents'])
+        </div>
+
+    </content>
+
+@endsection
diff --git a/resources/views/pages/search.blade.php b/resources/views/pages/search.blade.php
index 9675bab..fcd52f5 100644
--- a/resources/views/pages/search.blade.php
+++ b/resources/views/pages/search.blade.php
@@ -7,66 +7,7 @@
               data-ga-options='{"search_term":"{{ request()->get('q') }}"}'>
         <text-block :title="$page->page_heading"/>
 
-        <div class="search-results-layout">
-
-            <div class="search-results-main">
-
-                <div class="bg-grey-100 p-1v">
-                    <form action="{{ $nav->getHrefByName('recherche') }}" method="get"
-                          class="flex justify-between items-center sm:block">
-
-                        <search-field placeholder="{{ __('Saisissez votre recherche') }}"
-                                      value="{{ request()->get('q') }}"
-                                      :autofocus="{{ empty(request()->get('q')) ? 'true' : 'false' }}">
-                        </search-field>
-
-                        <button
-                            class="btn flex items-center py-3 px-8 font-display text-lg rounded ml-4 sm:mt-4 sm:mx-auto">
-                            @svg('search', 'fill-current mr-2')
-                            {{ __('Rechercher') }}
-                        </button>
-                    </form>
-                </div>
-
-                <div class="search-results mt-6">
-                    <div class="text-navy mb-2">{{ count($results) }}
-                        @if(count($results) == 1)
-                            {{ __('résultat') }}
-                        @else
-                            {{ __('résultats') }}
-                        @endif
-                    </div>
-
-                    @foreach ($results as $result)
-                        <div class="search-result py-5 @if(!$loop->last) border-b-2 border-grey-100 @endif">
-
-                            <div class="breadcrumbs sm:text-sm">
-                                @foreach ($result['breadcrumbs'] as $breadcrumb)
-                                    <div @if(!$loop->last) class="breadcrumbs-item" @endif>
-                                        <a class="breadcrumbs-link"
-                                           @if ($breadcrumb->url)href="{{ $breadcrumb->url }}" @endif>
-                                            {{ $breadcrumb->title }}
-                                        </a>
-                                    </div>
-                                @endforeach
-                            </div>
-
-                            <a class="text-2xl sm:text-xl xs:text-lg font-display mt-1 inline-block animated-underline"
-                               href="{{ $result['url'] }}">{{ $result['title'] }}</a>
-                        </div>
-                    @endforeach
-                </div>
-
-            </div>
-
-            <div class="search-results-sidebar">
-                <div class="bg-grey-100 p-1v">
-                    @form
-                </div>
-            </div>
-
-        </div>
-
+        @include('partials.search-results')
 
     </content>
 
diff --git a/resources/views/pages/services.blade.php b/resources/views/pages/services.blade.php
index 241ff0a..9e26351 100644
--- a/resources/views/pages/services.blade.php
+++ b/resources/views/pages/services.blade.php
@@ -1,8 +1,8 @@
 @extends('layouts.app')
 @section('content')
-    @intro(['padding' => 'pb-4v'])
+    @intro(['padding' => 'pb-2v'])
 
-    <full-width padding="pb-4v">
+    <full-width padding="pb-3v">
         <content>
             <columns>
                 <column class="pr-1v sm:pr-0">
diff --git a/resources/views/pages/support.blade.php b/resources/views/pages/support.blade.php
deleted file mode 100644
index b26799e..0000000
--- a/resources/views/pages/support.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('layouts/app')
-
-@section('content')
-
-    @intro(['padding' => 'pb-4v'])
-
-@endsection
diff --git a/resources/views/partials/form.blade.php b/resources/views/partials/form.blade.php
index 8e680e8..83d493a 100644
--- a/resources/views/partials/form.blade.php
+++ b/resources/views/partials/form.blade.php
@@ -12,7 +12,7 @@
     <div id="contact-form">
         <div class="ajax-form flex flex-col max-w-half">
             @if($page->get('form_intro'))
-                <div class="form-info text-navy">@markdown($page->get('form_intro'))</div>
+                <div class="form-info text-navy mb-6">@markdown($page->get('form_intro'))</div>
             @endif
             <form {!! $gaattrs !!} class="text-navy mailform" action="{{ $action ?? '/ajax/mailform' }}" method="post"
                   data-confirmation="{{$page->get('form_confirmation')??__('Votre message a bien été envoyé')}}"
diff --git a/resources/views/partials/search-results.blade.php b/resources/views/partials/search-results.blade.php
new file mode 100644
index 0000000..048a7f3
--- /dev/null
+++ b/resources/views/partials/search-results.blade.php
@@ -0,0 +1,60 @@
+<div class="search-results-layout">
+
+    <div class="search-results-main">
+
+        <div class="bg-grey-100 p-1v">
+            <form action="{{ $nav->getHrefById($page->id) }}#results" method="get"
+                  class="flex justify-between items-center sm:block">
+
+                <search-field placeholder="{{ __('Saisissez votre recherche') }}"
+                              value="{{ request()->get('q') }}"
+                              search-type="{{ $search_type ?? '' }}"
+                              :autofocus="{{ empty(request()->get('q')) ? 'true' : 'false' }}">
+                </search-field>
+
+                <button
+                    class="btn flex items-center py-3 px-8 font-display text-lg rounded ml-4 sm:mt-4 sm:mx-auto">
+                    @svg('search', 'fill-current mr-2')
+                    {{ __('Rechercher') }}
+                </button>
+            </form>
+        </div>
+
+        <div class="search-results mt-6">
+            <div class="text-navy mb-2">{{ count($results) }}
+                @if(count($results) == 1)
+                    {{ __('résultat') }}
+                @else
+                    {{ __('résultats') }}
+                @endif
+            </div>
+
+            @foreach ($results as $result)
+                <div class="search-result py-5 @if(!$loop->last) border-b-2 border-grey-100 @endif">
+
+                    <div class="breadcrumbs sm:text-sm">
+                        @foreach ($result['breadcrumbs'] as $breadcrumb)
+                            <div @if(!$loop->last) class="breadcrumbs-item" @endif>
+                                <a class="breadcrumbs-link"
+                                   @if ($breadcrumb->url)href="{{ $breadcrumb->url }}" @endif>
+                                    {{ $breadcrumb->title }}
+                                </a>
+                            </div>
+                        @endforeach
+                    </div>
+
+                    <a class="text-2xl sm:text-xl xs:text-lg font-display mt-1 inline-block animated-underline"
+                       href="{{ $result['url'] }}{{ $result_url_suffix ?? '' }}">{{ $result['title'] }}</a>
+                </div>
+            @endforeach
+        </div>
+
+    </div>
+
+    <div class="search-results-sidebar">
+        <div class="bg-grey-100 p-1v">
+            @form
+        </div>
+    </div>
+
+</div>
-- 
2.39.5