From 69c75fba4f99ee52088f7de6fc33f0adfd69a9f8 Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 08:16:26 +0200 Subject: [PATCH 01/19] search --- resources/views/pages/index.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/pages/index.blade.php b/resources/views/pages/index.blade.php index 1696e5a..a23e066 100644 --- a/resources/views/pages/index.blade.php +++ b/resources/views/pages/index.blade.php @@ -127,6 +127,7 @@ class="w-full bg-blue-50 outline-blue-300 outline-offset-4 transition-colors mt- + From 92326c150e9ba2729713270cc6df26f1c32499e4 Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 09:48:08 +0200 Subject: [PATCH 02/19] search --- app/Http/Controllers/UserController.php | 10 +++++++--- app/Models/House.php | 1 - resources/views/pages/index.blade.php | 14 ++++++++------ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index a689308..19ebc06 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -13,13 +13,13 @@ class UserController extends Controller public function index():View | Paginator | App { $houses = House::all()->sortDesc(); +// pagination $houses = House::paginate(10); return view('pages.index', ['houses' => $houses]); } - public function search(Request $request) : View + public function search() : View { -// $city = $_POST['city']; $standard = $_POST['standard']; $monthly = $_POST['monthly']; @@ -35,6 +35,10 @@ public function search(Request $request) : View ->Orwhere('rent', 'LIKE', '%'.$rent.'%') ->Orwhere('commission', 'LIKE', '%'.$commission.'%') ->get(); - return view('pages.search', ['houses' => $houses]); + + if ($city == 'All' && $standard == 'All' && $monthly == 'All' && $rent == 'All' && $deposit == 'All' && $commission == 'All'){ + $houses = House::all(); + } + return view('pages.search', ['houses' => $houses]); } } diff --git a/app/Models/House.php b/app/Models/House.php index b89b638..6bc0808 100644 --- a/app/Models/House.php +++ b/app/Models/House.php @@ -8,7 +8,6 @@ /** * @method static create(array $array) * @method static select(string $string) - * @method static paginate(int $int) * @method static where(string $string, string $string1, string $string2) */ class House extends Model diff --git a/resources/views/pages/index.blade.php b/resources/views/pages/index.blade.php index a23e066..c58d576 100644 --- a/resources/views/pages/index.blade.php +++ b/resources/views/pages/index.blade.php @@ -230,6 +230,11 @@ class="flex flex-wrap justify-center w-full px-4 py-2 text-sm font-medium text-w +
+

+ {{ $houses->count() .' Apartments Found' }} +

+
@@ -237,11 +242,7 @@ class="flex flex-wrap justify-center w-full px-4 py-2 text-sm font-medium text-w
-
-

- {{ $houses->count() .' Apartments Found' }} -

-
+ @foreach( $houses as $house)
@@ -327,7 +328,7 @@ class="flex flex-wrap justify-center w-full px-4 py-2 text-sm font-medium text-w
+ class="px-6 py-4 mb-4 mr-2 text-xs font-semibold leading-none text-center text-blue-600 bg-blue-200 rounded hover:bg-blue-600 hover:text-gray-200 dark:bg-blue-800 dark:text-gray-200 dark:hover:bg-blue-700"> Contact @@ -350,6 +351,7 @@ class="px-6 py-4 mb-4 mr-2 text-xs font-semibold leading-none text-center text-b + From e95f90e6e29f050f1afa2f0d4c63fbfc44051f08 Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 09:56:27 +0200 Subject: [PATCH 03/19] color --- resources/views/pages/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/pages/index.blade.php b/resources/views/pages/index.blade.php index c58d576..0e2e94f 100644 --- a/resources/views/pages/index.blade.php +++ b/resources/views/pages/index.blade.php @@ -328,7 +328,7 @@ class="flex flex-wrap justify-center w-full px-4 py-2 text-sm font-medium text-w
+ class="px-6 py-4 mb-4 mr-2 text-xs font-semibold leading-none text-center rounded hover:bg-green-500 bg-green-600 text-white "> Contact From 4505d001c9a368e7e7a070d64dfb80581db41e4a Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 09:58:13 +0200 Subject: [PATCH 04/19] color --- resources/views/pages/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/pages/index.blade.php b/resources/views/pages/index.blade.php index 0e2e94f..c58d576 100644 --- a/resources/views/pages/index.blade.php +++ b/resources/views/pages/index.blade.php @@ -328,7 +328,7 @@ class="flex flex-wrap justify-center w-full px-4 py-2 text-sm font-medium text-w
+ class="px-6 py-4 mb-4 mr-2 text-xs font-semibold leading-none text-center text-blue-600 bg-blue-200 rounded hover:bg-blue-600 hover:text-gray-200 dark:bg-blue-800 dark:text-gray-200 dark:hover:bg-blue-700"> Contact From 0ebd6c6c8a6a636caa1aaeca871f4033bc7a6ea3 Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 10:24:44 +0200 Subject: [PATCH 05/19] filter --- app/Http/Controllers/UserController.php | 3 +++ resources/views/pages/index.blade.php | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 19ebc06..54fb758 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -39,6 +39,9 @@ public function search() : View if ($city == 'All' && $standard == 'All' && $monthly == 'All' && $rent == 'All' && $deposit == 'All' && $commission == 'All'){ $houses = House::all(); } + + + return view('pages.search', ['houses' => $houses]); } } diff --git a/resources/views/pages/index.blade.php b/resources/views/pages/index.blade.php index c58d576..6fa93a3 100644 --- a/resources/views/pages/index.blade.php +++ b/resources/views/pages/index.blade.php @@ -7,8 +7,8 @@ -
-
+
+
From 4220a3ea374ecf3c5989c849a07be52b9f1ec5c0 Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 10:48:58 +0200 Subject: [PATCH 06/19] file --- app/Http/Controllers/UserController.php | 6 +++++- resources/views/base.blade.php | 16 ++++++++++++++++ resources/views/pages/detail.blade.php | 13 +++++++++++++ resources/views/pages/index.blade.php | 25 ++++++------------------- routes/web.php | 9 ++++----- 5 files changed, 44 insertions(+), 25 deletions(-) create mode 100644 resources/views/base.blade.php create mode 100644 resources/views/pages/detail.blade.php diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 54fb758..6e822f4 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -41,7 +41,11 @@ public function search() : View } - return view('pages.search', ['houses' => $houses]); } + public function detail($id):View + { + $house = House::find($id); + return view('pages.detail', ['house' => $house]); + } } diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php new file mode 100644 index 0000000..52706d9 --- /dev/null +++ b/resources/views/base.blade.php @@ -0,0 +1,16 @@ + + + + + + + @vite(['resources/css/app.css', 'resources/js/app.js']) + @yield('title') + + +
+ @yield('content') +
+ + diff --git a/resources/views/pages/detail.blade.php b/resources/views/pages/detail.blade.php new file mode 100644 index 0000000..ca7fd9d --- /dev/null +++ b/resources/views/pages/detail.blade.php @@ -0,0 +1,13 @@ + + + + + + + Document + + +

salut

+ + diff --git a/resources/views/pages/index.blade.php b/resources/views/pages/index.blade.php index 6fa93a3..c752b2b 100644 --- a/resources/views/pages/index.blade.php +++ b/resources/views/pages/index.blade.php @@ -1,12 +1,6 @@ - - - - - Title - @vite(['resources/css/app.css', 'resources/js/app.js']) - - - +@extends('base') +@section('title', 'Home') +@section('content')
@@ -345,13 +339,6 @@ class="px-6 py-4 mb-4 mr-2 text-xs font-semibold leading-none text-center text-b @endforeach
- - - - - - - - - + +@endsection diff --git a/routes/web.php b/routes/web.php index e4f96de..743c9d9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -14,10 +14,9 @@ | */ -Route::controller(UserController::class)->group(function (){ - Route::get('/', 'index')->name('pages.index'); -// search - Route::post('/search', 'search')->name('pages.search'); - +Route::controller(UserController::class)->name('pages.')->group(function (){ + Route::get('/', 'index')->name('index'); + Route::post('/search', 'search')->name('search'); + Route::get('/detail/{id}', 'detail')->name('detail')->where(['id' => '[0-9]+','detail' => '[a-z]+' ]); }); From f016dfb6374b95df2e8947d352c81c68475d2c50 Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 11:16:52 +0200 Subject: [PATCH 07/19] file --- app/Http/Controllers/UserController.php | 8 ++- resources/views/base.blade.php | 1 + resources/views/layout/header.blade.php | 93 +++++++++++++++++++------ resources/views/pages/index.blade.php | 5 +- resources/views/pages/search.blade.php | 19 ++--- routes/web.php | 2 +- 6 files changed, 91 insertions(+), 37 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 6e822f4..832013d 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -43,9 +43,13 @@ public function search() : View return view('pages.search', ['houses' => $houses]); } - public function detail($id):View + public function detail(Request $request, string $id):View { - $house = House::find($id); + $id = $request->id; + if (!is_numeric($id)){ + abort(404); + } + $house = House::findOrfail($id); return view('pages.detail', ['house' => $house]); } } diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index 52706d9..f7b5abb 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -9,6 +9,7 @@ @yield('title') +
@yield('content')
diff --git a/resources/views/layout/header.blade.php b/resources/views/layout/header.blade.php index 7782436..50c5851 100644 --- a/resources/views/layout/header.blade.php +++ b/resources/views/layout/header.blade.php @@ -1,22 +1,75 @@ - - - Title - - - - -
-
- - - - +
+
+ + +
+
+
+
+ GNPropertie + +
+ + +
+ + + Contact + +
+
-
+
diff --git a/resources/views/pages/index.blade.php b/resources/views/pages/index.blade.php index c752b2b..972d9f0 100644 --- a/resources/views/pages/index.blade.php +++ b/resources/views/pages/index.blade.php @@ -232,7 +232,7 @@ class="flex flex-wrap justify-center w-full px-4 py-2 text-sm font-medium text-w
-
+
@@ -324,7 +324,7 @@ class="flex flex-wrap justify-center w-full px-4 py-2 text-sm font-medium text-w Contact - Details @@ -342,3 +342,4 @@ class="px-6 py-4 mb-4 mr-2 text-xs font-semibold leading-none text-center text-b @endsection + diff --git a/resources/views/pages/search.blade.php b/resources/views/pages/search.blade.php index 9befb82..bdfe542 100644 --- a/resources/views/pages/search.blade.php +++ b/resources/views/pages/search.blade.php @@ -1,12 +1,10 @@ - - - - - Title - @vite(['resources/css/app.css', 'resources/js/app.js']) - - -
+@extends('base') +@section('title', 'search') + +@include('layout.header') + +
+
@foreach( $houses as $house)
@@ -29,7 +27,6 @@ - {{-- taille de mots 20 --}} Location : {{ $house->city}}
  • @@ -108,5 +105,3 @@ class="px-6 py-4 mb-4 mr-2 text-xs font-semibold leading-none text-center text-b
    • @endforeach
    - - diff --git a/routes/web.php b/routes/web.php index 743c9d9..6289def 100644 --- a/routes/web.php +++ b/routes/web.php @@ -17,6 +17,6 @@ Route::controller(UserController::class)->name('pages.')->group(function (){ Route::get('/', 'index')->name('index'); Route::post('/search', 'search')->name('search'); - Route::get('/detail/{id}', 'detail')->name('detail')->where(['id' => '[0-9]+','detail' => '[a-z]+' ]); + Route::get('/detail/{id}', 'detail')->name('detail')->where(['id' => '[0-9]+','detail' => '[a-zA-Z0-9\-]+' ]); }); From cab528496ad7cba1a62ba0aff90645f131fe7b58 Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 11:19:36 +0200 Subject: [PATCH 08/19] js --- resources/views/base.blade.php | 1 + resources/views/layout/header.blade.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index f7b5abb..aba0707 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -14,4 +14,5 @@ @yield('content') + diff --git a/resources/views/layout/header.blade.php b/resources/views/layout/header.blade.php index 50c5851..15a0f7f 100644 --- a/resources/views/layout/header.blade.php +++ b/resources/views/layout/header.blade.php @@ -24,7 +24,7 @@ class="bi bi-list" viewBox="0 0 16 16">
    - Contact From 384aaf05349a81e51f056d75f32520818af7f79d Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 12:24:57 +0200 Subject: [PATCH 14/19] filament --- app/Filament/Resources/HouseResource.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Filament/Resources/HouseResource.php b/app/Filament/Resources/HouseResource.php index ee7ee9f..ad19a12 100644 --- a/app/Filament/Resources/HouseResource.php +++ b/app/Filament/Resources/HouseResource.php @@ -51,6 +51,11 @@ public static function form(Form $form): Form Select::make('monthly') ->required() ->options(['85', '100', '150', '200', '250', '300', '350', '400','450','500','550','600','650','700','750','800','850','900','950','1000']) + ->options('85') + ->options('100') + ->options('150') + ->options('200') + ->autofocus(), Select::make('rent') ->options(['1', '2', '3', '4', '5','6','7','8','9','10','11','12']) From 62e428c06a76ce285d11e7ba6cbb943f2816780c Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 12:26:15 +0200 Subject: [PATCH 15/19] filament --- app/Filament/Resources/HouseResource.php | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/Filament/Resources/HouseResource.php b/app/Filament/Resources/HouseResource.php index ad19a12..c04bbee 100644 --- a/app/Filament/Resources/HouseResource.php +++ b/app/Filament/Resources/HouseResource.php @@ -29,24 +29,24 @@ public static function form(Form $form): Form Select::make('city') ->required() ->options('Lefkosa') - ->options('Gazimagusa') - ->options('Girne') - ->options('Guzelyurt') - ->options('Lefke') - ->options('Yeni Iskele') +// ->options('Gazimagusa') +// ->options('Girne') +// ->options('Guzelyurt') +// ->options('Lefke') +// ->options('Yeni Iskele') ->autofocus() ->placeholder('City ex: Honolulu'), Select::make('standard') ->required() ->options('Studio') - ->options('1+1') - ->options('2+1') - ->options('3+1') - ->options('3+2') - ->options('4+1') - ->options('4+2') - ->options('Villa') - ->options('Room') +// ->options('1+1') +// ->options('2+1') +// ->options('3+1') +// ->options('3+2') +// ->options('4+1') +// ->options('4+2') +// ->options('Villa') +// ->options('Room') ->autofocus(), Select::make('monthly') ->required() From 233bd3802f11b3863a1433a881343120ba8c0974 Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 12:27:08 +0200 Subject: [PATCH 16/19] filament --- app/Filament/Resources/HouseResource.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/Filament/Resources/HouseResource.php b/app/Filament/Resources/HouseResource.php index c04bbee..28f886a 100644 --- a/app/Filament/Resources/HouseResource.php +++ b/app/Filament/Resources/HouseResource.php @@ -51,11 +51,6 @@ public static function form(Form $form): Form Select::make('monthly') ->required() ->options(['85', '100', '150', '200', '250', '300', '350', '400','450','500','550','600','650','700','750','800','850','900','950','1000']) - ->options('85') - ->options('100') - ->options('150') - ->options('200') - ->autofocus(), Select::make('rent') ->options(['1', '2', '3', '4', '5','6','7','8','9','10','11','12']) From 265f9adf32659ad6b54a0082156fc285893dcfb2 Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 12:28:19 +0200 Subject: [PATCH 17/19] Revert "file" This reverts commit f016dfb6 --- app/Http/Controllers/UserController.php | 7 +- resources/views/base.blade.php | 1 - resources/views/layout/header.blade.php | 93 ++++++------------------- resources/views/pages/index.blade.php | 5 +- resources/views/pages/search.blade.php | 19 +++-- routes/web.php | 2 +- 6 files changed, 39 insertions(+), 88 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 09ee931..6e822f4 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -13,6 +13,7 @@ class UserController extends Controller public function index():View | Paginator | App { $houses = House::all()->sortDesc(); +// pagination $houses = House::paginate(10); return view('pages.index', ['houses' => $houses]); @@ -42,9 +43,9 @@ public function search() : View return view('pages.search', ['houses' => $houses]); } - public function detail(Request $request, string $id):View + public function detail($id):View { - - + $house = House::find($id); + return view('pages.detail', ['house' => $house]); } } diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index aba0707..051b1c5 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -9,7 +9,6 @@ @yield('title') -
    @yield('content')
    diff --git a/resources/views/layout/header.blade.php b/resources/views/layout/header.blade.php index 50c5851..7782436 100644 --- a/resources/views/layout/header.blade.php +++ b/resources/views/layout/header.blade.php @@ -1,75 +1,22 @@ -
    -
    - - -
    -
    -
    -
    - GNPropertie - -
    - - -
    - - - Contact - -
    -
    + Log In
    -
    + diff --git a/resources/views/pages/index.blade.php b/resources/views/pages/index.blade.php index 6785fb6..5f264df 100644 --- a/resources/views/pages/index.blade.php +++ b/resources/views/pages/index.blade.php @@ -158,7 +158,7 @@ class="flex flex-wrap justify-center w-full px-4 py-2 text-sm font-medium text-w
    - +
    @@ -250,7 +250,7 @@ class="flex flex-wrap justify-center w-full px-4 py-2 text-sm font-medium text-w Contact - Details @@ -268,4 +268,3 @@ class="px-6 py-4 mb-4 mr-2 text-xs font-semibold leading-none text-center text-b @endsection - diff --git a/resources/views/pages/search.blade.php b/resources/views/pages/search.blade.php index bdfe542..9befb82 100644 --- a/resources/views/pages/search.blade.php +++ b/resources/views/pages/search.blade.php @@ -1,10 +1,12 @@ -@extends('base') -@section('title', 'search') - -@include('layout.header') - -
    -
    + + + + + Title + @vite(['resources/css/app.css', 'resources/js/app.js']) + + +
    @foreach( $houses as $house)
    @@ -27,6 +29,7 @@ + {{-- taille de mots 20 --}} Location : {{ $house->city}}
  • @@ -105,3 +108,5 @@ class="px-6 py-4 mb-4 mr-2 text-xs font-semibold leading-none text-center text-b
    • @endforeach
    + + diff --git a/routes/web.php b/routes/web.php index 6289def..743c9d9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -17,6 +17,6 @@ Route::controller(UserController::class)->name('pages.')->group(function (){ Route::get('/', 'index')->name('index'); Route::post('/search', 'search')->name('search'); - Route::get('/detail/{id}', 'detail')->name('detail')->where(['id' => '[0-9]+','detail' => '[a-zA-Z0-9\-]+' ]); + Route::get('/detail/{id}', 'detail')->name('detail')->where(['id' => '[0-9]+','detail' => '[a-z]+' ]); }); From ff13ca031c43525582c0fdf8c962e0f15fed095e Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 12:29:10 +0200 Subject: [PATCH 18/19] Revert "js" This reverts commit cab52849 --- resources/views/base.blade.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index 051b1c5..52706d9 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -13,5 +13,4 @@ @yield('content') - From 8ecfdc550202610717d1b86ab9752ad54c2718a0 Mon Sep 17 00:00:00 2001 From: jeanluckawel Date: Fri, 10 Nov 2023 13:01:16 +0200 Subject: [PATCH 19/19] filament --- app/Filament/Resources/HouseResource.php | 113 +++++++++++++++-------- app/Http/Controllers/UserController.php | 1 + resources/views/pages/index.blade.php | 93 ++++++++----------- 3 files changed, 115 insertions(+), 92 deletions(-) diff --git a/app/Filament/Resources/HouseResource.php b/app/Filament/Resources/HouseResource.php index 28f886a..e3a7446 100644 --- a/app/Filament/Resources/HouseResource.php +++ b/app/Filament/Resources/HouseResource.php @@ -27,44 +27,30 @@ public static function form(Form $form): Form ->autofocus() ->placeholder('Address ex: 1154 Fort Street Mall'), Select::make('city') - ->required() - ->options('Lefkosa') -// ->options('Gazimagusa') -// ->options('Girne') -// ->options('Guzelyurt') -// ->options('Lefke') -// ->options('Yeni Iskele') - ->autofocus() - ->placeholder('City ex: Honolulu'), + ->options(function () { + return House::all()->pluck('city', 'city'); + }), Select::make('standard') - ->required() - ->options('Studio') -// ->options('1+1') -// ->options('2+1') -// ->options('3+1') -// ->options('3+2') -// ->options('4+1') -// ->options('4+2') -// ->options('Villa') -// ->options('Room') - ->autofocus(), + ->options(function () { + return House::all()->pluck('standard', 'standard'); + }), Select::make('monthly') - ->required() - ->options(['85', '100', '150', '200', '250', '300', '350', '400','450','500','550','600','650','700','750','800','850','900','950','1000']) - ->autofocus(), + ->options(function () { + return House::all()->pluck('monthly', 'monthly'); + }), Select::make('rent') - ->options(['1', '2', '3', '4', '5','6','7','8','9','10','11','12']) - ->required(), + ->options(function () { + return House::all()->pluck('rent', 'rent'); + }), Select::make('deposit') - ->required() - ->options(['1', '2', '3']) - ->autofocus() , + ->options(function () { + return House::all()->pluck('deposit', 'deposit'); + }), Select::make('commission') - ->required() - ->options(['1', '2', '3', '4']) - ->autofocus(), + ->options(function () { + return House::all()->pluck('commission', 'commission'); + }), FileUpload::make('image') - ->required() ->imageCropAspectRatio('1:1') ->imageResizeTargetWidth('400') ->imageResizeTargetHeight('400') @@ -72,11 +58,66 @@ public static function form(Form $form): Form ->maxSize(1024 * 1024 * 2) // 2MB ->image() ->directory(config('image_upload_path')), - Select::make('house_statue') - ->default('Available') - ->options(['Available', 'Unavailable']) - ->required(), + ->options(function () { + return House::all()->pluck('house_statue', 'house_statue'); + }), +// Select::make('city') +// ->required() +// ->options('Lefkosa') +// ->options('Gazimagusa') +// ->options('Girne') +// ->options('Guzelyurt') +// ->options('Lefke') +// ->options('Yeni Iskele') +// ->autofocus() +// ->placeholder('City ex: Honolulu'), +// Select::make('standard') +// ->required() +// ->options('Studio') +// ->options('1+1') +// ->options('2+1') +// ->options('3+1') +// ->options('3+2') +// ->options('4+1') +// ->options('4+2') +// ->options('Villa') +// ->options('Room') +// ->autofocus(), +// Select::make('monthly') +// ->required() +// ->options(['85', '100', '150', '200', '250', '300', '350', '400','450','500','550','600','650','700','750','800','850','900','950','1000']) +// ->options('85') +// ->options('100') +// ->options('150') +// ->options('200') +// +// ->autofocus(), +// Select::make('rent') +// ->options(['1', '2', '3', '4', '5','6','7','8','9','10','11','12']) +// ->required(), +// Select::make('deposit') +// ->required() +// ->options(['1', '2', '3']) +// ->autofocus() , +// Select::make('commission') +// ->required() +// ->options(['1', '2', '3', '4']) +// ->autofocus(), +// FileUpload::make('image') +// ->required() +// ->imageCropAspectRatio('1:1') +// ->imageResizeTargetWidth('400') +// ->imageResizeTargetHeight('400') +// ->imageEditor() +// ->maxSize(1024 * 1024 * 2) // 2MB +// ->image() +// ->directory(config('image_upload_path')), +// +// Select::make('house_statue') +// ->default('Available') +// ->options(['Available', 'Unavailable']) +// ->required(), ]); } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 6e822f4..15bc3eb 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -34,6 +34,7 @@ public function search() : View ->Orwhere('monthly', 'LIKE', '%'.$monthly.'%') ->Orwhere('rent', 'LIKE', '%'.$rent.'%') ->Orwhere('commission', 'LIKE', '%'.$commission.'%') + ->distinct() ->get(); if ($city == 'All' && $standard == 'All' && $monthly == 'All' && $rent == 'All' && $deposit == 'All' && $commission == 'All'){ diff --git a/resources/views/pages/index.blade.php b/resources/views/pages/index.blade.php index 5f264df..309ba26 100644 --- a/resources/views/pages/index.blade.php +++ b/resources/views/pages/index.blade.php @@ -28,12 +28,12 @@ class="w-full bg-blue-50 outline-blue-300 outline-offset-4 transition-colors bg-blue-50 outline-blue-300 mt-2 py-2.5 px-4 text-gray-700 text-base font-normal border border-gray-200 rounded-lg " name="city" id="city"> - - - - - - + @php + $houses = \App\Models\House::orderBy('city', 'asc')->distinct()->get(['city']); + @endphp + @foreach($houses as $house) + + @endforeach
    @@ -42,16 +42,12 @@ class="w-full bg-blue-50 outline-blue-300 outline-offset-4 transition-colors bg- class="w-full bg-blue-50 outline-blue-300 outline-offset-4 transition-colors mt-2 py-2.5 px-4 text-gray-700 text-base font-normal border border-gray-200 rounded-lg " name="standard" id="standard"> - - - - - - - - - - + @php + $houses = \App\Models\House::orderBy('standard', 'asc')->distinct()->get(['standard']); + @endphp + @foreach($houses as $house) + + @endforeach
    @@ -59,26 +55,12 @@ class="w-full bg-blue-50 outline-blue-300 outline-offset-4 transition-colors mt- class="w-full bg-blue-50 outline-blue-300 outline-offset-4 transition-colors mt-2 py-2.5 px-4 text-gray-700 text-base font-normal border border-gray-200 rounded-lg " name="monthly" id="price"> - - - - - - - - - - - - - - - - - - - - + @php + $houses = \App\Models\House::orderBy('monthly', 'asc')->distinct()->get(['monthly']); + @endphp + @foreach($houses as $house) + + @endforeach
    @@ -87,18 +69,12 @@ class="w-full bg-blue-50 outline-blue-300 outline-offset-4 transition-colors mt- class="w-full bg-blue-50 outline-blue-300 outline-offset-4 transition-colors mt-2 py-2.5 px-4 text-gray-700 text-base font-normal border border-gray-200 rounded-lg " name="rent" id="rent"> - - - - - - - - - - - - + @php + $houses = \App\Models\House::orderBy('rent', 'asc')->distinct()->get(['rent']); + @endphp + @foreach($houses as $house) + + @endforeach
    @@ -107,9 +83,12 @@ class="w-full bg-blue-50 outline-blue-300 outline-offset-4 transition-colors mt- class="w-full bg-blue-50 outline-blue-300 outline-offset-4 transition-colors mt-2 py-2.5 px-4 text-gray-700 text-base font-normal border border-gray-200 rounded-lg " name="deposit" id="deposit"> - - - + @php + $houses = \App\Models\House::orderBy('deposit', 'asc')->distinct()->get(['deposit']); + @endphp + @foreach($houses as $house) + + @endforeach
    @@ -117,10 +96,12 @@ class="w-full bg-blue-50 outline-blue-300 outline-offset-4 transition-colors mt- class="w-full bg-blue-50 outline-blue-300 outline-offset-4 transition-colors mt-2 py-2.5 px-4 text-gray-700 text-base font-normal border border-gray-200 rounded-lg " name="commission" id="commision"> - - - - + @php + $houses = \App\Models\House::orderBy('commission', 'asc')->distinct()->get(['commission']); + @endphp + @foreach($houses as $house) + + @endforeach
    {{-- --}} @@ -250,7 +231,7 @@ class="flex flex-wrap justify-center w-full px-4 py-2 text-sm font-medium text-w Contact - Details