From 76e6002b16c81e4d4486d3723ae00637f4621bf4 Mon Sep 17 00:00:00 2001 From: Vishal Babu Date: Wed, 5 Feb 2025 22:26:30 +0530 Subject: [PATCH] search result changes --- app/Http/Controllers/SearchController.php | 15 +++- resources/css/search-main.css | 4 - resources/views/file/index.blade.php | 18 +--- resources/views/layouts/app.blade.php | 93 ++++++++++++++------ resources/views/search/basicsearch.blade.php | 50 +++++------ routes/web.php | 4 +- 6 files changed, 103 insertions(+), 81 deletions(-) diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 0100ac8..d2b82ea 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -21,12 +21,19 @@ public function autoComplete(Request $request) public function basicSearch(Request $request) { - $item = $request->input('item'); + $item = $request->input('term'); // Get the search term from the request - $searchResults = ContentCatalogue::where('title', 'like', '%' . $item . '%')->get(); + // Perform the search query with pagination + $searchResults = ContentCatalogue::where('title', 'like', '%' . $item . '%')->paginate(1); // Adjust pagination size - $view = view('search.basicsearch', compact('searchResults'))->render(); + if ($request->ajax()) { + // Render the content part (search results) alone + $view = view('search.basicsearch', compact('searchResults'))->render(); - return response()->json($view); + return response()->json($view); + } + + // If it's not an AJAX request, return the normal view + return view('search.basicsearch', compact('searchResults')); } } diff --git a/resources/css/search-main.css b/resources/css/search-main.css index 0254248..e8a4fe7 100644 --- a/resources/css/search-main.css +++ b/resources/css/search-main.css @@ -1174,7 +1174,3 @@ legend { object-fit: fit; margin-bottom: 10px; } - -.card-body { - text-align: center; -} \ No newline at end of file diff --git a/resources/views/file/index.blade.php b/resources/views/file/index.blade.php index 37923c3..baa781f 100644 --- a/resources/views/file/index.blade.php +++ b/resources/views/file/index.blade.php @@ -46,7 +46,7 @@
- +
@@ -104,21 +104,7 @@ $('#reset-button').click(function () { $('#file-upload-form').validate().resetForm(); }); - - - @if (session('success')) - toastr.success("{{ session('success') }}", "Success", { - closeButton: true, - progressBar: true, - timeOut: 5000 // Time in milliseconds (5 seconds) - }); - @elseif(session('error')) - toastr.error("{{ session('error') }}", "Error", { - closeButton: true, - progressBar: true, - timeOut: 5000 // Time in milliseconds (5 seconds) - }); - @endif + diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index d2a2cce..dee4025 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -9,22 +9,19 @@ {{ config('app.name', 'KMS') }} - @vite(['resources/css/feather/feather.css', 'resources/css/vertical-layout-light/style.css', - 'resources/css/mdi/css/materialdesignicons.min.css', 'resources/css/toastr.min.css', - 'resources/css/dataTables.dataTables.min.css', 'resources/css/bootstrap.min.css', 'resources/css/search-main.css', - 'resources/css/jquery-ui.min.css']) + @vite(['resources/css/feather/feather.css', 'resources/css/vertical-layout-light/style.css', 'resources/css/mdi/css/materialdesignicons.min.css', 'resources/css/bootstrap.min.css', 'resources/css/toastr.min.css', 'resources/css/dataTables.dataTables.min.css', 'resources/css/search-main.css', 'resources/css/jquery-ui.min.css']) + - @@ -68,21 +65,37 @@ - - - \ No newline at end of file + diff --git a/resources/views/search/basicsearch.blade.php b/resources/views/search/basicsearch.blade.php index 8405a13..0f2de68 100644 --- a/resources/views/search/basicsearch.blade.php +++ b/resources/views/search/basicsearch.blade.php @@ -1,36 +1,32 @@
- -
-
- File icon -
-
Document 1
-

PDF Document

-

Last modified: Feb 5, 2025

+ @if (!empty($searchResults)) + @foreach ($searchResults as $searchItems) + +
+
+ File icon +
+
{{ $searchItems->title }}
+

PDF Document

+

Last modified: Feb 5, 2025

+
+
+ @endforeach + +
+ {!! $searchResults->links() !!}
-
- - -
-
- File icon -
-
Document 1
-

PDF Document

-

Last modified: Feb 5, 2025

-
+ @else + +
+

No results found.

-
- - -
-

No results found.

-
+ @endif
+ diff --git a/routes/web.php b/routes/web.php index b8ed0ac..0d7bfbe 100644 --- a/routes/web.php +++ b/routes/web.php @@ -27,9 +27,9 @@ Route::get('/Download/{filename}', [FileController::class, 'download'])->name('File.download'); Route::get('/Directory', [DirectoryController::class, 'index'])->name('directory.index'); - + Route::get('/Search/Listings', [SearchController::class, 'autoComplete'])->name('search.autocomplete'); - Route::post('/Search/basicSearch', [SearchController::class, 'basicSearch'])->name('search.search'); + Route::match(['get', 'post'],'/Search/basicSearch', [SearchController::class, 'basicSearch'])->name('search.search'); }); require __DIR__ . '/auth.php';