Merge pull request #44 from Ritikeshyadav/RitikeshFreeu

Ritikesh freeu
This commit is contained in:
Ritikeshyadav
2024-04-10 15:15:08 +05:30
committed by GitHub
6 changed files with 119 additions and 99 deletions

View File

@@ -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,

View File

@@ -154,7 +154,7 @@
{{-- </button> --}}
</h6>
<!--end::Radio-->
<div id="dashboardOne" class="accordion-collapse collapse"
<div id="dashboardOne" class="accordion-collapse collapse show"
aria-labelledby="dashboard-accordion"
data-bs-parent="#accordionExample">
<div class="accordion-body">
@@ -241,7 +241,7 @@
{{-- </button> --}}
</h6>
<!--end::Radio-->
<div id="manageCommissionOne" class="accordion-collapse collapse"
<div id="manageCommissionOne" class="accordion-collapse collapse show"
aria-labelledby="manageCommission-accordion"
data-bs-parent="#accordionExample">
<div class="accordion-body">
@@ -349,7 +349,7 @@
{{-- </button> --}}
</h6>
<!--end::Radio-->
<div id="investorOne" class="accordion-collapse collapse"
<div id="investorOne" class="accordion-collapse collapse show"
aria-labelledby="investor-accordion"
data-bs-parent="#accordionExample">
<div class="accordion-body">
@@ -475,7 +475,7 @@
</div>
</h6>
<!--end::Radio-->
<div id="primary_market" class="accordion-collapse collapse"
<div id="primary_market" class="accordion-collapse collapse show"
aria-labelledby="primary_market_accordion"
data-bs-parent="#accordionExample">
<div class="accordion-body">
@@ -577,7 +577,7 @@
</div>
</h6>
<!--end::Radio-->
<div id="secondaryMarketThree" class="accordion-collapse collapse"
<div id="secondaryMarketThree" class="accordion-collapse collapse show"
aria-labelledby="secondaryMarket-accordion"
data-bs-parent="#accordionExample">
<div class="accordion-body">
@@ -725,7 +725,7 @@
</div>
<!--end::Radio-->
</h6>
<div id="cmsPanelFour" class="accordion-collapse collapse"
<div id="cmsPanelFour" class="accordion-collapse collapse show"
aria-labelledby="cmsPanel-accordion"
data-bs-parent="#accordionExample">
<div class="accordion-body">
@@ -922,7 +922,7 @@
<!--end::Radio-->
<h6>
<div id="manageSubAdminFive"
class="accordion-collapse collapse"
class="accordion-collapse collapse show"
aria-labelledby="manageSubAdmin-accordion"
data-bs-parent="#accordionExample">
<div class="accordion-body">
@@ -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');
}

View File

@@ -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) {

View File

@@ -0,0 +1,12 @@
@extends('Admin.layouts.master')
@section('content')
<div class="text-center">
<div>
<img src="{{ asset('public/assets/media/FrontendImages/menu-logo.png') }}" width="50%" height="90%"
alt="logo">
</div>
<div>
<h1>Welcome to dashboard</h1>
</div>
</div>
@endsection

View File

@@ -1,58 +1,58 @@
@extends('Frontend.layouts.master')
@section('content')
<style>
/* CSS for the zoom effect */
.img-zoom {
cursor: pointer;
/* Change cursor to indicate the image is clickable */
transition: transform 0.2s;
/* Add smooth transition effect */
}
<style>
/* CSS for the zoom effect */
.img-zoom {
cursor: pointer;
/* Change cursor to indicate the image is clickable */
transition: transform 0.2s;
/* Add smooth transition effect */
}
.img-zoom:hover {
transform: scale(1.1);
/* Scale up the image on hover */
}
.img-zoom:hover {
transform: scale(1.1);
/* Scale up the image on hover */
}
.img-thumbs {
background: #eee;
border: 1px solid #ccc;
border-radius: 0.25rem;
margin: 1.5rem 0;
padding: 0.75rem;
}
.img-thumbs {
background: #eee;
border: 1px solid #ccc;
border-radius: 0.25rem;
margin: 1.5rem 0;
padding: 0.75rem;
}
.img-thumbs-hidden {
display: none;
}
.img-thumbs-hidden {
display: none;
}
.edit_wrapper-thumb,
.wrapper-thumb {
position: relative;
display: inline-block;
/*margin: 1rem 0;*/
justify-content: space-around;
}
.edit_wrapper-thumb,
.wrapper-thumb {
position: relative;
display: inline-block;
/*margin: 1rem 0;*/
justify-content: space-around;
}
.img-preview-thumb {
background: #fff;
border: 1px solid none;
border-radius: 0.25rem;
box-shadow: 0.125rem 0.125rem 0.0625rem rgba(0, 0, 0, 0.12);
margin-right: 1rem;
max-width: 140px;
padding: 0.25rem;
}
.img-preview-thumb {
background: #fff;
border: 1px solid none;
border-radius: 0.25rem;
box-shadow: 0.125rem 0.125rem 0.0625rem rgba(0, 0, 0, 0.12);
margin-right: 1rem;
max-width: 140px;
padding: 0.25rem;
}
/* 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 */
}
</style>
/* 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 */
}
</style>
<div class="product-banner">
<div class="container">
<div class="content aos-init aos-animate" data-aos="fade-right">
@@ -108,28 +108,35 @@
<!--</div>-->
<div class="table-invest">
<div class="container">
<div id="carouselExampleIndicators" class="carousel slide" data-bs-ride="carousel">
<div class="carousel-indicators">
@foreach($productData->product_images as $key => $image)
<button type="button" data-bs-target="#carouselExampleIndicators" data-bs-slide-to="{{ $key }}" class="{{ $key === 0 ? 'active' : '' }}" aria-label="Slide {{ $key + 1 }}"></button>
@endforeach
@if ($productData->product_images)
<div id="carouselExampleIndicators" class="carousel slide" data-bs-ride="carousel">
<div class="carousel-indicators">
@foreach ($productData->product_images as $key => $image)
<button type="button" data-bs-target="#carouselExampleIndicators"
data-bs-slide-to="{{ $key }}" class="{{ $key === 0 ? 'active' : '' }}"
aria-label="Slide {{ $key + 1 }}"></button>
@endforeach
</div>
<div class="carousel-inner">
@foreach ($productData->product_images as $key => $image)
<div class="carousel-item {{ $key === 0 ? 'active' : '' }}">
<img src="{{ asset('public/' . $image['images']) }}" class="d-block w-100 img-zoom"
alt="Image {{ $key }}">
</div>
@endforeach
</div>
<button class="carousel-control-prev" type="button" data-bs-target="#carouselExampleIndicators"
data-bs-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="visually-hidden">Previous</span>
</button>
<button class="carousel-control-next" type="button" data-bs-target="#carouselExampleIndicators"
data-bs-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="visually-hidden">Next</span>
</button>
</div>
<div class="carousel-inner">
@foreach($productData->product_images as $key => $image)
<div class="carousel-item {{ $key === 0 ? 'active' : '' }}">
<img src="{{ asset('public/'.$image['images']) }}" class="d-block w-100 img-zoom" alt="Image {{ $key }}">
</div>
@endforeach
</div>
<button class="carousel-control-prev" type="button" data-bs-target="#carouselExampleIndicators" data-bs-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="visually-hidden">Previous</span>
</button>
<button class="carousel-control-next" type="button" data-bs-target="#carouselExampleIndicators" data-bs-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="visually-hidden">Next</span>
</button>
</div>
@endif
<br />
<div class="categeory">
<div class="details aos-init aos-animate" data-aos="zoom-in">

View File

@@ -858,6 +858,7 @@ Route::middleware([BackendAccess::class])->group(function () {
Route::get("role_list", 'addPage')->name('role_list')->name('role_list');
Route::post("view_role", 'store')->name('view_role')->name('view_role');
Route::post("status", 'status')->name('status');
Route::view('welcome-to-dashboard', 'Admin.welcome_to_dashboard')->name('welcome-to-dashboard');
});
// Manage Sub Admin middleware