Redo some search stuff

lolibrary · Mar 24, 2024 · a739698 · a739698
1 parent 265313c
commit a739698
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/resources/js/app.js b/resources/js/app.js
@@ -79,21 +79,3 @@ $(() => {
 const image = document.head.querySelector('meta[name="default-image"]');
 
 window.defaultImage = image ? image.content : '/images/default.png';
-
-
-
-// /**
-//  * Next, we will create a fresh Vue application instance and attach it to
-//  * the page. Then, you may begin adding components to this application
-//  * or customize the JavaScript scaffolding to fit your unique needs.
-//  */
-
-// Vue.component('v-pagination', require('./components/Pagination.vue').default);
-// Vue.component('search-page', require('./components/Search.vue').default);
-// Vue.component('v-select', require('vue-select').VueSelect);
-// Vue.component('b-form-radio-group', require('bootstrap-vue').BFormRadioGroup);
-// Vue.component('search-result', require('./components/Result.vue').default);
-
-// const app = new Vue({
-//     el: '#app'
-// });
diff --git a/resources/js/search.js b/resources/js/search.js
@@ -34,12 +34,17 @@ import Slider from "bootstrap-slider";
                 searchJs.triggerSearch(evt);
             });
 
+            $('#search-results')
+            .on('click', '.page-link', (evt) => {
+                searchJs.triggerSearch(evt);
+            });
+
             $('.match_type input:radio, .year_match_type input:radio')
             .on('click', (evt) => {
                 $(evt.currentTarget).parent().parent().find('label').removeClass('active');
                 $(evt.currentTarget).parent().addClass('active');
                 searchJs.doSearch();
-            })
+            });
 
 
             $('#search').on('keypress', (evt) => {
@@ -80,11 +85,14 @@ import Slider from "bootstrap-slider";
         doSearch: () => {
             let form = document.getElementById('search-form');
             let form_values = searchJs.getFormValues();
+            let page = document.getElementById('search-page').value;
             searchJs.loader.css('display', 'block');
             searchJs.results.css('display', 'none');
             searchJs.error.css('display', 'none');
+            let form_data = new FormData(form);
+            form_data.set('page', page); 
             window.history.pushState(null, null, '/search/?' + $.param(form_values));
-            fetch('/search', { method: "POST", headers: searchJs.headers, body: new FormData(form)})
+            fetch('/search', { method: "POST", headers: searchJs.headers, body: form_data})
                 .then((response) => {
                     if (response.ok) {
                         return response.text()
@@ -137,6 +145,10 @@ import Slider from "bootstrap-slider";
         },
         getFormValues: () => {
             let form_values = $('#search-form').serializeArray();
+            let page = $('#search-page').val();
+            if (page && page > 1) {
+                form_values.push({name: "page", value: page.toString()});
+            }
             let exclude_matching = ['search'];
             let filter_names = form_values.map((form_obj) => form_obj.name.replace('[]', ''));
             return form_values.filter((form_obj) => {

diff --git a/resources/views/components/search-results.blade.php b/resources/views/components/search-results.blade.php
@@ -16,4 +16,5 @@
 
 @if ($items->count() > 0)
     {{ $items->links() }}
+    <input type="hidden" id="search-page" value="{{ $items->meta->current_page }}">
 @endif