diff --git a/app/Http/Resources/FractionalRealEstateResource.php b/app/Http/Resources/FractionalRealEstateResource.php index 9c9dc63..465be7d 100644 --- a/app/Http/Resources/FractionalRealEstateResource.php +++ b/app/Http/Resources/FractionalRealEstateResource.php @@ -18,8 +18,8 @@ class FractionalRealEstateResource extends JsonResource return [ 'id' => $this->id, 'products_id' => $this->products_id, - 'presentation' => Product::find($this->products_id) == null ? '' : Product::find($this->products_id)->value('presentation'), - 'fact_sheet' => Product::find($this->products_id) == null ? '' : Product::find($this->products_id)->value('fact_sheet'), + 'presentation' => Product::find($this->products_id) ? Product::find($this->products_id)->value('presentation') : null, + 'fact_sheet' => Product::find($this->products_id) ? Product::find($this->products_id)->value('fact_sheet') : null, 'companies_id' => $this->companies_id, 'slug' => $this->slug, 'property_name_and_location' => $this->property_name_and_location, diff --git a/resources/views/Admin/edit-sub-admin.blade.php b/resources/views/Admin/edit-sub-admin.blade.php index 8785a97..e4d0805 100644 --- a/resources/views/Admin/edit-sub-admin.blade.php +++ b/resources/views/Admin/edit-sub-admin.blade.php @@ -154,7 +154,7 @@ {{-- --}} -
@@ -241,7 +241,7 @@ {{-- --}} -
@@ -349,7 +349,7 @@ {{-- --}} -
@@ -475,7 +475,7 @@
-
@@ -577,7 +577,7 @@
-
@@ -725,7 +725,7 @@
-
@@ -922,7 +922,7 @@
@@ -1219,9 +1219,9 @@ } } else { if ($('#dashboardOne').hasClass('show') == true) { - $('#dashboardOne').removeClass('show'); - $('#dashboard').addClass('collapsed'); - $('#dashboard').prop('aria-expanded', false); + // $('#dashboardOne').removeClass('show'); + // $('#dashboard').addClass('collapsed'); + // $('#dashboard').prop('aria-expanded', false); } unCheckCheckbox('#dashboard'); } @@ -1237,9 +1237,9 @@ } } else { if ($('#manageCommissionOne').hasClass('show') == true) { - $('#manageCommissionOne').removeClass('show'); - $('#manageCommission').addClass('collapsed'); - $('#manageCommission').prop('aria-expanded', false); + // $('#manageCommissionOne').removeClass('show'); + // $('#manageCommission').addClass('collapsed'); + // $('#manageCommission').prop('aria-expanded', false); } unCheckCheckbox('#manageCommission'); } @@ -1256,9 +1256,9 @@ } } else { if ($('#investorOne').hasClass('show') == true) { - $('#investorOne').removeClass('show'); - $('#investor').addClass('collapsed'); - $('#investor').prop('aria-expanded', false); + // $('#investorOne').removeClass('show'); + // $('#investor').addClass('collapsed'); + // $('#investor').prop('aria-expanded', false); } unCheckCheckbox('#investor'); } @@ -1274,9 +1274,9 @@ } } else { if ($('#primary_market').hasClass('show') == true) { - $('#primary_market').removeClass('show'); - $('#primaryMarket').addClass('collapsed'); - $('#primaryMarket').prop('aria-expanded', false); + // $('#primary_market').removeClass('show'); + // $('#primaryMarket').addClass('collapsed'); + // $('#primaryMarket').prop('aria-expanded', false); } unCheckCheckbox('#primaryMarket'); } @@ -1293,9 +1293,9 @@ } } else { if ($('#secondaryMarketThree').hasClass('show') == true) { - $('#secondaryMarketThree').removeClass('show'); - $('#secondary_market').addClass('collapsed'); - $('#secondary_market').prop('aria-expanded', false); + // $('#secondaryMarketThree').removeClass('show'); + // $('#secondary_market').addClass('collapsed'); + // $('#secondary_market').prop('aria-expanded', false); } unCheckCheckbox('#secondary_market'); } @@ -1312,9 +1312,9 @@ } } else { if ($('#cmsPanelFour').hasClass('show') == true) { - $('#cmsPanelFour').removeClass('show'); - $('#cms_panel').addClass('collapsed'); - $('#cms_panel').prop('aria-expanded', false); + // $('#cmsPanelFour').removeClass('show'); + // $('#cms_panel').addClass('collapsed'); + // $('#cms_panel').prop('aria-expanded', false); } unCheckCheckbox('#cms_panel'); } @@ -1330,9 +1330,9 @@ } } else { if ($('#manageSubAdminFive').hasClass('show') == true) { - $('#manageSubAdminFive').removeClass('show'); - $('#manage_sub_admin').addClass('collapsed'); - $('#manage_sub_admin').prop('aria-expanded', false); + // $('#manageSubAdminFive').removeClass('show'); + // $('#manage_sub_admin').addClass('collapsed'); + // $('#manage_sub_admin').prop('aria-expanded', false); } unCheckCheckbox('#manage_sub_admin'); } diff --git a/resources/views/Admin/login/otp.blade.php b/resources/views/Admin/login/otp.blade.php index 799bff5..0882b40 100644 --- a/resources/views/Admin/login/otp.blade.php +++ b/resources/views/Admin/login/otp.blade.php @@ -200,7 +200,7 @@ // window.location.href='/dashboard'; setTimeout(() => { // location.reload(); - window.location.href = "{{route('dashboard')}}"; + window.location.href = "{{route('welcome-to-dashboard')}}"; }, 1000); } if (result.status == 400) { diff --git a/resources/views/Admin/welcome_to_dashboard.blade.php b/resources/views/Admin/welcome_to_dashboard.blade.php new file mode 100644 index 0000000..838e0b5 --- /dev/null +++ b/resources/views/Admin/welcome_to_dashboard.blade.php @@ -0,0 +1,12 @@ +@extends('Admin.layouts.master') +@section('content') +
+
+ logo +
+
+

Welcome to dashboard

+
+
+@endsection diff --git a/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php b/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php index 700ff02..e2e3746 100644 --- a/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php +++ b/resources/views/Frontend/Pages/fractional-real-estate/product.blade.php @@ -1,58 +1,58 @@ @extends('Frontend.layouts.master') @section('content') - + /* Additional CSS to style the images within the carousel */ + .carousel-inner img { + max-height: 350px; + /* Set maximum height for the images */ + max-width: 75%; + margin: 0 auto; + /* Center the images horizontally */ + } +
@@ -108,28 +108,35 @@
-