From fe6e14a9ea576597b5ff5de2c12947f8f88cf751 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Mon, 29 Apr 2024 16:35:29 +0530
Subject: [PATCH] fixed design
---
public/assets/css/FrontendCss/style.css | 3 +-
public/assets/css/style.bundle.css | 4 +
.../manage_user_add.blade.php | 14 +-
.../Pages/manage_leads/edit-lead.blade.php | 838 +-----------------
.../pre_owned_investmentV2.blade.php | 6 +-
.../components/angel-fund-product.blade.php | 4 +-
...und-for-distressed-asset-product.blade.php | 6 +-
...l-commercial-real-estate-product.blade.php | 2 +-
...l-industrial-real-estate-product.blade.php | 4 +-
...obal-private-credit-fund-product.blade.php | 6 +-
...obal-private-equity-fund-product.blade.php | 4 +-
.../global-r-e-i-t-s-product.blade.php | 4 +-
...-residential-real-estate-product.blade.php | 2 +-
...bal-venture-capital-fund-product.blade.php | 4 +-
.../components/hedge-fund-product.blade.php | 4 +-
...n-commercial-real-estate-product.blade.php | 2 +-
...n-industrial-real-estate-product.blade.php | 2 +-
.../infrastructure-fund-product.blade.php | 4 +-
.../long-only-equity-funds.blade.php | 4 +-
.../components/p-i-p-e-fund-product.blade.php | 4 +-
.../private-credit-fund-product.blade.php | 6 +-
.../private-equity-fund-product.blade.php | 4 +-
...private-real-estate-fund-product.blade.php | 4 +-
.../venture-capital-fund-product.blade.php | 8 +-
24 files changed, 64 insertions(+), 879 deletions(-)
diff --git a/public/assets/css/FrontendCss/style.css b/public/assets/css/FrontendCss/style.css
index 600b4b1..a0aedca 100644
--- a/public/assets/css/FrontendCss/style.css
+++ b/public/assets/css/FrontendCss/style.css
@@ -485,7 +485,7 @@ h4.inner-title {
.assets-card .middle-sec {
display: flex;
background-color: #e8c69f;
- padding: 12px 7px;
+ padding:8px 7px;
align-items: center;
justify-content: space-between;
}
@@ -495,6 +495,7 @@ h4.inner-title {
font-size: 15px;
display: flex;
align-items: center;
+ line-height: 20px;
}
.assets-card .org span {
diff --git a/public/assets/css/style.bundle.css b/public/assets/css/style.bundle.css
index b14565c..0896d79 100644
--- a/public/assets/css/style.bundle.css
+++ b/public/assets/css/style.bundle.css
@@ -11950,6 +11950,10 @@ fieldset:disabled .btn {
min-width: 150px !important
}
+.min-w-135px {
+ min-width: 135px !important
+}
+
.min-w-175px {
min-width: 175px !important
}
diff --git a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php
index 4a731c2..29e7db2 100644
--- a/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php
+++ b/resources/views/Admin/Pages/manage_investors/manage_user_product/manage_user_add.blade.php
@@ -14,7 +14,7 @@
-
+
+
@@ -288,6 +289,7 @@
@endforeach --}}
+
@@ -1492,7 +1494,7 @@
digits: 'Please enter digits',
},
pan: {
- required: 'Please enter pan',
+ required: 'Please enter PAN number',
digits: 'Please enter digits',
},
interest_accrued: {
@@ -1611,7 +1613,7 @@
digits: 'Please enter digits',
},
pan: {
- required: 'Please enter pan',
+ required: 'Please enter PAN number',
digits: 'Please enter digits',
},
total_active_investment: {
@@ -1748,7 +1750,7 @@
digits: 'Please enter digits',
},
pan: {
- required: 'Please enter pan',
+ required: 'Please enter PAN number',
},
investment_platform: 'Please select investment platform',
total_value_of_the_property: {
@@ -1914,7 +1916,7 @@
digits: 'Please enter digits',
},
pan: {
- required: 'Please enter pan',
+ required: 'Please enter PAN number',
},
investment_platform: 'Please select investment platform',
fund_category: 'Please enter fund category',
diff --git a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
index d8123f6..7ffefcc 100644
--- a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
+++ b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
@@ -275,6 +275,9 @@
right: 2%;
box-shadow: 0px 3px 6px 0px;
}
+ .accordion-item .accordion-button::after {
+ transform: rotate(0deg);
+ }
#myDIV p:hover {
background-color: #87ceeba6;
@@ -741,18 +744,9 @@
-
- Company
-
-
+
-
-
-
-
-
- Email
+ City
@@ -905,45 +899,6 @@
-<<<<<<< HEAD
-
-
-
-
-
-
-
-
-
-
-
-
-
Attachments
-
-
-
-
Upload
- File
-
Link(URL)
-
-=======
-
-
-
- @forelse($lead->attachment as $data)
- @if ($data->type == 'Image')
- - Download
- File
-
By {{ $data->admin->name }} At
- {{ $data->created_at->format('H:i:s d/m/y') }}
-
- @else
- - {{ $data->path }}
-
By {{ $data->admin->name }} At
- {{ $data->created_at->format('H:i:s d/m/y') }}
-
- @endif
- @empty
- No Attachment
- @endforelse
-
-
-
-
-
@@ -1029,9 +957,9 @@
@forelse($lead->tasks_meetings as $data)
@php($openActivity = true)
@if ($data->status == 0)
-
+
-
+
@@ -3124,489 +3048,6 @@
@endsection
@section('scripts')
-<<<<<<< HEAD
-
-
+
@endsection
diff --git a/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php b/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php
index a3aa852..c60789a 100644
--- a/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php
+++ b/resources/views/Admin/Pages/pre_owned_investment/pre_owned_investmentV2.blade.php
@@ -69,7 +69,7 @@
class="text-start align-top text-muted fw-bold fs-7 text-uppercase gs-0">
Sr no |
Product |
-
Expected Selling Price |
+
Expected Selling Price |
Seller Name |
Email |
Contact |
@@ -131,7 +131,7 @@
class="text-start align-top text-muted fw-bold fs-7 text-uppercase gs-0">
Sr no |
Product |
-
Expected Selling Price |
+
Expected Selling Price |
Seller Name |
Email |
Contact |
@@ -192,7 +192,7 @@
class="text-start align-top text-muted fw-bold fs-7 text-uppercase gs-0">
Sr no |
Product |
-
Expected Selling Price |
+
Expected Selling Price |
Seller Name |
Email |
Contact |
diff --git a/resources/views/components/angel-fund-product.blade.php b/resources/views/components/angel-fund-product.blade.php
index 9055290..3cdaedd 100644
--- a/resources/views/components/angel-fund-product.blade.php
+++ b/resources/views/components/angel-fund-product.blade.php
@@ -34,8 +34,8 @@
Close Date: Approx. Sep 2030
-
Target IRR: {{ $data->alternative_investment_fund->target_irr }}
|
-
Tenure From Final Date:
+
Target IRR: {{ $data->alternative_investment_fund->target_irr }}
|
+
Tenure From Final Date:
{{ $data->alternative_investment_fund->tenure_from_final_date }}
diff --git a/resources/views/components/fund-for-distressed-asset-product.blade.php b/resources/views/components/fund-for-distressed-asset-product.blade.php
index 1ffeeea..de4a2db 100644
--- a/resources/views/components/fund-for-distressed-asset-product.blade.php
+++ b/resources/views/components/fund-for-distressed-asset-product.blade.php
@@ -16,7 +16,7 @@
@else
 }})
@endif
-

+
{{$data->alternative_investment_fund->fund_name}}
Category: {{$data->categorys->category_name}}
@@ -29,8 +29,8 @@
Close Date: Approx. Sep 2030
-
Target IRR: {{$data->alternative_investment_fund->target_irr}}
|
-
Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}
+
Target IRR: {{$data->alternative_investment_fund->target_irr}}
|
+
Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}
Minimum Investment: {{$data->alternative_investment_fund->minimum_investment}}
diff --git a/resources/views/components/global-commercial-real-estate-product.blade.php b/resources/views/components/global-commercial-real-estate-product.blade.php
index 8031b3f..026c8cf 100644
--- a/resources/views/components/global-commercial-real-estate-product.blade.php
+++ b/resources/views/components/global-commercial-real-estate-product.blade.php
@@ -30,7 +30,7 @@
Close Date: Approx. Sep 2030
-
Type : {{$data->real_estate->project_type}}
|
+
Type : {{$data->real_estate->project_type}}
|
diff --git a/resources/views/components/global-industrial-real-estate-product.blade.php b/resources/views/components/global-industrial-real-estate-product.blade.php
index 290bd4d..5aa7091 100644
--- a/resources/views/components/global-industrial-real-estate-product.blade.php
+++ b/resources/views/components/global-industrial-real-estate-product.blade.php
@@ -30,8 +30,8 @@
Close Date: Approx. Sep 2030
-
Type : {{$data->real_estate->project_type}}
|
-
Price per sqft : {{$data->real_estate->price_per_sq_ft}}
+
Type : {{$data->real_estate->project_type}}
|
+
Price per sqft : {{$data->real_estate->price_per_sq_ft}}
Total Price: {{$data->real_estate->total_price}}
diff --git a/resources/views/components/global-private-credit-fund-product.blade.php b/resources/views/components/global-private-credit-fund-product.blade.php
index 16a5ec0..aca3f5d 100644
--- a/resources/views/components/global-private-credit-fund-product.blade.php
+++ b/resources/views/components/global-private-credit-fund-product.blade.php
@@ -36,9 +36,9 @@
Close Date: Approx. Sep 2030
-
1 yrs return: {{ $data->funds->year1_return }}%
-
|
-
3 yrs return:
+
1 yrs return: {{ $data->funds->year1_return }}%
+
|
+
3 yrs return:
{{ $data->funds->year3_return }}%
diff --git a/resources/views/components/global-private-equity-fund-product.blade.php b/resources/views/components/global-private-equity-fund-product.blade.php
index d7cf061..25e1535 100644
--- a/resources/views/components/global-private-equity-fund-product.blade.php
+++ b/resources/views/components/global-private-equity-fund-product.blade.php
@@ -33,8 +33,8 @@
Property Location: {{ $gireData->funds->issuer }}
- Carpet Area: {{ $gireData->funds->nav_per_unit }}
|
- Area in Sq. Ft.: {{ $gireData->funds->nav_per_unit }}
+ Carpet Area: {{ $gireData->funds->nav_per_unit }}
|
+ Area in Sq. Ft.: {{ $gireData->funds->nav_per_unit }}
Total Price: {{ $gireData->funds->fund_aum }}
diff --git a/resources/views/components/global-r-e-i-t-s-product.blade.php b/resources/views/components/global-r-e-i-t-s-product.blade.php
index 79070d0..c1e670e 100644
--- a/resources/views/components/global-r-e-i-t-s-product.blade.php
+++ b/resources/views/components/global-r-e-i-t-s-product.blade.php
@@ -36,8 +36,8 @@
Property Location: {{ $gireData->exchanges->name }}
- Carpet Area: {{ $gireData->exchanges->beta }}
|
- Area in Sq. Ft.: {{ $gireData->exchanges->beta }}
+ Carpet Area: {{ $gireData->exchanges->beta }}
|
+ Area in Sq. Ft.: {{ $gireData->exchanges->beta }}
Total Price: {{ $gireData->exchanges->beta }}
diff --git a/resources/views/components/global-residential-real-estate-product.blade.php b/resources/views/components/global-residential-real-estate-product.blade.php
index 849d395..c0d5215 100644
--- a/resources/views/components/global-residential-real-estate-product.blade.php
+++ b/resources/views/components/global-residential-real-estate-product.blade.php
@@ -30,7 +30,7 @@
Close Date: Approx. Sep 2030
- Type : {{$data->real_estate->project_type}}
|
+ Type : {{$data->real_estate->project_type}}
|
diff --git a/resources/views/components/global-venture-capital-fund-product.blade.php b/resources/views/components/global-venture-capital-fund-product.blade.php
index c8879ab..ff5f6c6 100644
--- a/resources/views/components/global-venture-capital-fund-product.blade.php
+++ b/resources/views/components/global-venture-capital-fund-product.blade.php
@@ -66,9 +66,9 @@
- Carpet Area: {{ $gireData->funds->nav_per_unit }}
|
+ Carpet Area: {{ $gireData->funds->nav_per_unit }}
|
- Area in Sq. Ft.: {{ $gireData->funds->nav_per_unit }}
+ Area in Sq. Ft.: {{ $gireData->funds->nav_per_unit }}
diff --git a/resources/views/components/hedge-fund-product.blade.php b/resources/views/components/hedge-fund-product.blade.php
index c5a6d6c..cec172d 100644
--- a/resources/views/components/hedge-fund-product.blade.php
+++ b/resources/views/components/hedge-fund-product.blade.php
@@ -33,8 +33,8 @@
Close Date: Approx. Sep 2030
- Target IRR: {{ $data->alternative_investment_fund->target_irr }}
|
- Tenure From Final Date:
+
Target IRR: {{ $data->alternative_investment_fund->target_irr }}
|
+ Tenure From Final Date:
{{ $data->alternative_investment_fund->tenure_from_final_date }}
diff --git a/resources/views/components/indian-commercial-real-estate-product.blade.php b/resources/views/components/indian-commercial-real-estate-product.blade.php
index 8c9b3aa..606aeb0 100644
--- a/resources/views/components/indian-commercial-real-estate-product.blade.php
+++ b/resources/views/components/indian-commercial-real-estate-product.blade.php
@@ -29,7 +29,7 @@
Close Date: Approx. Sep 2030
- Type: {{$data->realEstate->project_type}}
|
+ Type: {{$data->realEstate->project_type}}
diff --git a/resources/views/components/indian-industrial-real-estate-product.blade.php b/resources/views/components/indian-industrial-real-estate-product.blade.php
index a28d388..768638b 100644
--- a/resources/views/components/indian-industrial-real-estate-product.blade.php
+++ b/resources/views/components/indian-industrial-real-estate-product.blade.php
@@ -30,7 +30,7 @@
Close Date: Approx. Sep 2030
- Type : {{$ffdaData->realEstate->project_type}}
|
+ Type : {{$ffdaData->realEstate->project_type}}
diff --git a/resources/views/components/infrastructure-fund-product.blade.php b/resources/views/components/infrastructure-fund-product.blade.php
index 5f0bd4c..562db42 100644
--- a/resources/views/components/infrastructure-fund-product.blade.php
+++ b/resources/views/components/infrastructure-fund-product.blade.php
@@ -30,8 +30,8 @@
Close Date: Approx. Sep 2030
- Target IRR: {{$data->alternative_investment_fund->target_irr}}
|
- Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}
+ Target IRR: {{$data->alternative_investment_fund->target_irr}}
|
+ Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}
Minimum Investment: {{$data->alternative_investment_fund->minimum_investment}}
diff --git a/resources/views/components/long-only-equity-funds.blade.php b/resources/views/components/long-only-equity-funds.blade.php
index ce3a4d3..40ce7cf 100644
--- a/resources/views/components/long-only-equity-funds.blade.php
+++ b/resources/views/components/long-only-equity-funds.blade.php
@@ -35,8 +35,8 @@
Close Date: Approx. Sep 2030
- Target IRR: {{ $data->alternative_investment_fund->target_irr }}
|
- Tenure From Final Date:
+
Target IRR: {{ $data->alternative_investment_fund->target_irr }}
|
+ Tenure From Final Date:
{{ $data->alternative_investment_fund->tenure_from_final_date }}
diff --git a/resources/views/components/p-i-p-e-fund-product.blade.php b/resources/views/components/p-i-p-e-fund-product.blade.php
index a9f97fd..d88246e 100644
--- a/resources/views/components/p-i-p-e-fund-product.blade.php
+++ b/resources/views/components/p-i-p-e-fund-product.blade.php
@@ -29,8 +29,8 @@
Close Date: Approx. Sep 2030
- Target IRR: {{$data->alternative_investment_fund->target_irr}}
|
- Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}
+ Target IRR: {{$data->alternative_investment_fund->target_irr}}
|
+ Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}
Minimum Investment: {{$data->alternative_investment_fund->minimum_investment}}
diff --git a/resources/views/components/private-credit-fund-product.blade.php b/resources/views/components/private-credit-fund-product.blade.php
index 7306a73..60032ab 100644
--- a/resources/views/components/private-credit-fund-product.blade.php
+++ b/resources/views/components/private-credit-fund-product.blade.php
@@ -36,9 +36,9 @@
{{-- --}}
-
Target IRR:{{ $data->alternative_investment_fund->target_irr ?? 'N/A'}}
-
|
-
Tenure From Final Date:{{ $data->alternative_investment_fund->tenure_from_final_date ?? 'N/A' }}
+
Target IRR:{{ $data->alternative_investment_fund->target_irr ?? 'N/A'}}
+
|
+
Tenure From Final Date:{{ $data->alternative_investment_fund->tenure_from_final_date ?? 'N/A' }}
{{--
--}}
diff --git a/resources/views/components/private-equity-fund-product.blade.php b/resources/views/components/private-equity-fund-product.blade.php
index 68d3293..c73b602 100644
--- a/resources/views/components/private-equity-fund-product.blade.php
+++ b/resources/views/components/private-equity-fund-product.blade.php
@@ -33,8 +33,8 @@
Close Date: Approx. Sep 2030
- Target IRR: {{ $data->alternative_investment_fund->target_irr }}
|
- Tenure From Final Date:
+
Target IRR: {{ $data->alternative_investment_fund->target_irr }}
|
+ Tenure From Final Date:
{{ $data->alternative_investment_fund->tenure_from_final_date }}
diff --git a/resources/views/components/private-real-estate-fund-product.blade.php b/resources/views/components/private-real-estate-fund-product.blade.php
index 7cb6b9c..b10c187 100644
--- a/resources/views/components/private-real-estate-fund-product.blade.php
+++ b/resources/views/components/private-real-estate-fund-product.blade.php
@@ -33,8 +33,8 @@
Close Date: Approx. Sep 2030
- Target IRR: {{ $data->alternative_investment_fund->target_irr }}
|
- Tenure From Final Date:
+
Target IRR: {{ $data->alternative_investment_fund->target_irr }}
|
+ Tenure From Final Date:
{{ $data->alternative_investment_fund->tenure_from_final_date }}
diff --git a/resources/views/components/venture-capital-fund-product.blade.php b/resources/views/components/venture-capital-fund-product.blade.php
index 6e53846..557fec3 100644
--- a/resources/views/components/venture-capital-fund-product.blade.php
+++ b/resources/views/components/venture-capital-fund-product.blade.php
@@ -21,7 +21,7 @@
{{$data->alternative_investment_fund->fund_name}}
Category: {{$data->categorys->category_name}}
-
+
+
Target IRR: {{$data->alternative_investment_fund->target_irr}}
|
+
Tenure From Final Date: {{$data->alternative_investment_fund->tenure_from_final_date}}
Minimum Investment: {{$data->alternative_investment_fund->minimum_investment}}