Vishal.Chandora/freeu-project
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing bugs

Browse Source
This commit is contained in:
Ritikesh yadav
2024-06-27 16:58:21 +05:30
parent c26ecdf7f7
commit c1ac914547
12 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/Frontend/ProfileController.php
View File

@@ -529,19 +529,21 @@ class ProfileController extends Controller
$id = $request->id;
// dd(Auth::guard('users')->user());
// dd(getAllNotifications());
$userNotifications = User::find(auth()->guard('users')->user()->id);
if ($id) {
Auth::guard('users')->user()->unreadNotifications->where('id', $id)->markAsRead();
$userNotifications->notifications->where('id', $id)->markAsRead();
}
$notifications = Auth::guard('users')->user()->notifications;
// dd($notifications);
// $notifications = Auth::guard('users')->user()->notifications;
// dd($userNotifications->notifications->toArray());
$notificationHTML = '';
$count = 0;
foreach ($notifications as $data) {
$count++;
$read_at = $data->read_at ? 'style="color:#808080"' : 'style="color:black"';
$oddEven = $count % 2 == 1 ? 'odd' : 'even';
// $count = 0;
foreach ($userNotifications->notifications as $data) {
// $count++;
$background_color = $data->read_at ? 'style="background-color:#efecec"' : 'style="background-color:white"';
$read_at = $data->read_at ? 'style="color:#a3a0a0"' : 'style="color:black"';
// $oddEven = $count % 2 == 1 ? 'odd' : 'even';
// $notificationHTML .= "<li class='item list-item ".$oddEven."' style='color:" . $read_at . ";'>
$notificationHTML .= "<li class='item list-item ".$oddEven."' >
$notificationHTML .= "<li class='item list-item ' ".$background_color." >
<a class='read_notification' ".$read_at . "
data-id='" . $data->id . "'>" . $data->data['message'] . "
<p class='mb-0'>
@@ -551,7 +553,7 @@ class ProfileController extends Controller
</li>";
}
if ($notificationHTML) {
return response()->json(['status' => 200, 'data' => $notificationHTML, 'count'=>Auth::guard('users')->user()->unreadNotifications->count()]);
return response()->json(['status' => 200, 'data' => $notificationHTML, 'count'=>$userNotifications->unreadNotifications->count()]);
}
}
}

2
app/Http/Resources/AngelFundResource.php
View File

@@ -65,7 +65,7 @@ class AngelFundResource extends JsonResource
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
'isin_code' => $this->isin_code,
'focused_funds' => $this->focused_funds,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,

2
app/Http/Resources/FundForDistressedAssetResource.php
View File

@@ -69,7 +69,7 @@ class FundForDistressedAssetResource extends JsonResource
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
// 'isin_code' => $this->isin_code,
'focused_funds' => $this->focused_funds,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,

2
app/Http/Resources/HedgeFundResource.php
View File

@@ -74,7 +74,7 @@ class HedgeFundResource extends JsonResource
'focused_real_estate_sectors'=>$this->focused_real_estate_sectors,
'rera_complied_property' =>$this->rera_complied_property,
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
];

2
app/Http/Resources/InfrastructureFundResource.php
View File

@@ -68,7 +68,7 @@ class InfrastructureFundResource extends JsonResource
'minimum_investment' => $this->minimum_investment,
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
'focused_funds' => $this->focused_funds,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,

2
app/Http/Resources/LongOnlyEquityResource.php
View File

@@ -77,7 +77,7 @@ class LongOnlyEquityResource extends JsonResource
'isin_code' => $this->isin_code,
'focused_real_estate_sectors' => $this->focused_real_estate_sectors,
'rera_complied_property' => $this->rera_complied_property,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),

2
app/Http/Resources/PrivateEquityFundResource.php
View File

@@ -69,7 +69,7 @@ class PrivateEquityFundResource extends JsonResource
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
'isin_code' => $this->isin_code,
'focused_funds' => $this->focused_funds,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,

2
app/Http/Resources/PrivateInvestmentInPublicEquityFundResource.php
View File

@@ -71,7 +71,7 @@ class PrivateInvestmentInPublicEquityFundResource extends JsonResource
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
'isin_code' => $this->isin_code,
'focused_funds' => $this->focused_funds,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,

2
app/Http/Resources/PrivateRealEstateFundResource.php
View File

@@ -71,7 +71,7 @@ class PrivateRealEstateFundResource extends JsonResource
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
'isin_code' => $this->isin_code,
'focused_funds' => $this->focused_funds,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,

2
app/Http/Resources/VentureCapitalFundResource.php
View File

@@ -77,7 +77,7 @@ class VentureCapitalFundResource extends JsonResource
'trading_strategy_used' => $this->trading_strategy_used,
'involved_in_short_selling' => $this->involved_in_short_selling,
'description' => Product::find($this->products_id) == null ? null : Product::where('id',$this->products_id)->value('description'),
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment_irr_dpi_rvpi_tvpi,
'return_on_investment_irr_dpi_rvpi_tvpi' => $this->return_on_investment,
'valuation_per_security_nav' => $this->valuation_per_security_nav,
];

16
public/assets/css/FrontendCss/style.css
View File

@@ -5527,6 +5527,14 @@ span.color-red {
width: 70px;
}
.inn_to_testi {
height: auto;
width: 100%;
}
.faqs-content .dropdown .dropdown-menu {
height: auto;
}
.investor-profile .invest-view-form .form-sec {
width: 100%;
}
@@ -6437,7 +6445,9 @@ span.color-red {
}
.notifications li.item {
padding: 5px;
list-style: none;
border-radius: 5px;
}
ul.notification-drop {
@@ -6468,7 +6478,7 @@ ul.notification-drop {
.inn_to_testi {
width: 80%;
background: #fff;
box-shadow: 0 0 16px 0px #EDD9C2;
box-shadow: 0 0 16px 0px #edd9c2;
padding: 20px;
vertical-align: middle;
border-radius: 10px;
@@ -6514,7 +6524,7 @@ button.swal2-confirm.btn.yellow-btn.popup-button {
}
.notifications .list-item p strong {
font-weight: normal;
font-size: 13px !important;
font-size: 12px !important;
width: 100%;
display: flex;
justify-content: end;
@@ -6524,7 +6534,7 @@ ul#user_notification {
padding: 0;
}
a.read_notification {
font-size: 15px !important;
font-size: 13px !important;
}
p.regist,
p.regist a {

11
resources/views/Frontend/menu-after-lg.blade.php
View File

@@ -579,9 +579,7 @@
{{-- </li> --}}
{{-- </ul> --}}
{{-- </div> --}}
<div
{{-- class="dropdown notifications {{ getUnreadMessage() > 0 ? 'red_dot' : '' }}"> --}}
class="dropdown notifications ">
<div {{-- class="dropdown notifications {{ getUnreadMessage() > 0 ? 'red_dot' : '' }}"> --}} class="dropdown notifications ">
<a class="btn dropdown-toggle" type="button" data-bs-toggle="dropdown"
aria-expanded="false">
@@ -600,10 +598,11 @@
<ul id="user_notification">
@forelse(getAllNotifications() as $data)
<li class="item list-item {{ $loop->odd ? 'odd' : 'even' }}">
<li class="item list-item "
style="background-color:{{ $data->read_at ? '#efecec' : 'white' }}">
<a class="read_notification"
style="color:{{ $data->read_at ? '#808080' : 'black' }}"
data-id="{{ $data->id }}">
style="color:{{ $data->read_at ? '#a3a0a0' : 'black' }}"
data-id="{{ $data->id }}">
{{ $data->data['message'] }}
<p class="mb-0">
<strong>{{ $data->created_at->diffForHumans() }}</strong>