Merge pull request #44 from Rizki36/#43-bug-modal-pondok-produk

fix: fix bug link google and img
Rizki36 · May 29, 2022 · ed99669 · ed99669
2 parents b56e723 + 46ee23a
commit ed99669
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/app/Http/Requests/StoreLokasiRequest.php b/app/Http/Requests/StoreLokasiRequest.php
@@ -31,7 +31,7 @@ public function rules()
             'lat' => 'required|numeric',
             'lng' => 'required|numeric',
             'tipe' => 'required|numeric|in:1,2',
-            'link_google_maps' => 'required|string',
+            'link_google_maps' => 'required|string|url',
             'id_kecamatan' => 'required|string|max:255',
             'id_kelurahan' => 'required|string|max:255',
             'foto' => 'required|image|mimes:jpeg,png,jpg|max:2048',

diff --git a/app/Http/Requests/UpdateLokasiRequest.php b/app/Http/Requests/UpdateLokasiRequest.php
@@ -31,7 +31,7 @@ public function rules()
             'lat' => 'required|numeric',
             'lng' => 'required|numeric',
             'tipe' => 'required|numeric|in:1,2',
-            'link_google_maps' => 'required|string',
+            'link_google_maps' => 'required|string|url',
             'id_kecamatan' => 'required|string|max:255',
             'id_kelurahan' => 'required|string|max:255',
         ];

diff --git a/resources/views/pondok.blade.php b/resources/views/pondok.blade.php
@@ -13,7 +13,7 @@
                             style="background-color: white;position: absolute;z-index: 9;width: 300px;top: 20;left:40px">
                             <label>Kecamatan</label>
                             <select id="kecamatan-filter" class="form-control">
-                                <option>Filter Kecamatan</option>
+                                <option value="">Filter Kecamatan</option>
                                 @foreach ($kecamatan as $k)
                                     <option value="{{ $k->id }}">{{ $k->nama }}</option>
                                 @endforeach
@@ -155,9 +155,10 @@
 
                     $kecamatanFilter.addEventListener('change', function() {
                         const kecamatan = this.value;
-                        if (!kecamatan)
-                            map.setFilter('places', []);
-
+                        if (kecamatan == '') {
+                            map.setFilter('places', null);
+                            return;
+                        }
                         const layerID = `kec-${kecamatan}`;
                         map.setFilter('places', ['==', 'id_kecamatan', kecamatan]);
                     });
@@ -174,7 +175,7 @@ function showModal(data) {
             $alamatDetail.innerHTML = data?.alamat
             $deskripsiDetail.innerHTML = data?.deskripsi
             $linkDetail.href = data?.link_google_maps
-            $imgDetail.src = data?.gambar
+            $imgDetail.src = `{{ asset('images') }}/${data?.foto}`
 
             modalDetail.show($modalEl)
         }

diff --git a/resources/views/produk.blade.php b/resources/views/produk.blade.php
@@ -13,7 +13,7 @@
                             style="background-color: white;position: absolute;z-index: 9;width: 300px;top: 20;left:40px">
                             <label>Kecamatan</label>
                             <select id="kecamatan-filter" class="form-control">
-                                <option>Filter Kecamatan</option>
+                                <option value="">Filter Kecamatan</option>
                                 @foreach ($kecamatan as $k)
                                     <option value="{{ $k->id }}">{{ $k->nama }}</option>
                                 @endforeach
@@ -155,8 +155,10 @@
 
                     $kecamatanFilter.addEventListener('change', function() {
                         const kecamatan = this.value;
-                        if (!kecamatan)
-                            map.setFilter('places', []);
+                        if (kecamatan == '') {
+                            map.setFilter('places', null);
+                            return;
+                        }
 
                         const layerID = `kec-${kecamatan}`;
                         map.setFilter('places', ['==', 'id_kecamatan', kecamatan]);
@@ -174,7 +176,7 @@ function showModal(data) {
             $alamatDetail.innerHTML = data?.alamat
             $deskripsiDetail.innerHTML = data?.deskripsi
             $linkDetail.href = data?.link_google_maps
-            $imgDetail.src = data?.gambar
+            $imgDetail.src = `{{ asset('images') }}/${data?.foto}`
 
             modalDetail.show($modalEl)
         }