Merge branch 'main' of https://github.com/Ritikeshyadav/my-freeu into HritikFreeu
This commit is contained in:
Hritikkk9
@@ -34,7 +34,8 @@ class AngelFundController extends Controller
|
||||
$text = $category->category_name;
|
||||
$category_id = $category->id;
|
||||
$excelFileName = 'AngelFundsTemplate.xlsx';
|
||||
return view('Admin.Pages.manage_freeu_investment.upload-product.alternative-investment-fund', compact('text', 'category_id','excelFileName'));
|
||||
$route = route('manage.venture-capital-fund.store');
|
||||
return view('Admin.Pages.manage_freeu_investment.upload-product.alternative-investment-fund', compact('text', 'route', 'category_id','excelFileName'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -34,7 +34,8 @@ class InfrastructureFundController extends Controller
|
||||
$text = $category->category_name;
|
||||
$category_id = $category->id;
|
||||
$excelFileName = 'InfrastructureFundsTemplate.xlsx';
|
||||
return view('Admin.Pages.manage_freeu_investment.upload-product.alternative-investment-fund', compact('text', 'category_id','excelFileName'));
|
||||
$route = route('manage.venture-capital-fund.store');
|
||||
return view('Admin.Pages.manage_freeu_investment.upload-product.alternative-investment-fund', compact('text', 'route','category_id','excelFileName'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -34,7 +34,8 @@ class PrivateEquityFundController extends Controller
|
||||
$text = $category->category_name;
|
||||
$category_id = $category->id;
|
||||
$excelFileName = 'PrivateEquityFundsTemplate.xlsx';
|
||||
return view('Admin.Pages.manage_freeu_investment.upload-product.alternative-investment-fund', compact('text', 'category_id','excelFileName'));
|
||||
$route = route('manage.venture-capital-fund.store');
|
||||
return view('Admin.Pages.manage_freeu_investment.upload-product.alternative-investment-fund', compact('text','route', 'category_id','excelFileName'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -190,7 +190,7 @@ class HomeController extends Controller
|
||||
]);
|
||||
|
||||
if ($addLead) {
|
||||
$userName = auth()->guard('users')->user()->name;
|
||||
$userName = auth()->guard('users')->user()->name ?? $request->user()->name;
|
||||
$notify['message'] = "$userName is interested in a product!";
|
||||
$type = "Buyer Form";
|
||||
$users = User::admins()->get();
|
||||
|
||||
@@ -74,5 +74,6 @@ class Kernel extends HttpKernel
|
||||
'accessPermitted' => \App\Http\Middleware\AccessPermitted::class,
|
||||
'FrontendAccess' => \App\Http\Middleware\FrontendAccess::class,
|
||||
'AlreadyLoggedIn' => \App\Http\Middleware\AlreadyLoggedIn::class,
|
||||
'checkLoggedIn' => \App\Http\Middleware\checkLoggedIn::class,
|
||||
];
|
||||
}
|
||||
|
||||
27
app/Http/Middleware/checkLoggedIn.php
Normal file
27
app/Http/Middleware/checkLoggedIn.php
Normal file
@@ -0,0 +1,27 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
// use Auth;
|
||||
|
||||
class checkLoggedIn
|
||||
{
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
|
||||
* @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function handle(Request $request, Closure $next)
|
||||
{
|
||||
// dd('hello',\Auth::guard('users')->check());
|
||||
if(\Auth::guard('users')->check())
|
||||
{
|
||||
return \Redirect::to('/');
|
||||
}
|
||||
return $next($request);
|
||||
}
|
||||
}
|
||||
@@ -8,10 +8,14 @@
|
||||
<!-- <div class="row max-w-100 index_table mt-10"> -->
|
||||
<div class="row max-w-100 mt-10">
|
||||
<div class="add_new_investors my-5 mb-0">
|
||||
<div class="table_right_options " style=" text-align: right; margin-bottom: 15px;">
|
||||
<a class="btn btn-primary me-3" href="{{route('manage.products')}}">Back</a>
|
||||
</div>
|
||||
<!--begin::Card-->
|
||||
<div class="card mb-8">
|
||||
<!--begin::Card body-->
|
||||
{{--<form action="/manage-investments/alternative-investment-fund/post" method="POST" enctype="multipart/form-data" id="addProductForm">--}}
|
||||
@php($route = route('manage.venture-capital-fund.store'))
|
||||
<form action="{{$route}}" method="POST" enctype="multipart/form-data" id="addProductForm">
|
||||
@csrf
|
||||
<div class="card-body py-4">
|
||||
|
||||
@@ -17,7 +17,9 @@
|
||||
<div class="row max-w-100 mt-10">
|
||||
|
||||
<div class="add_new_investors my-5 mb-0">
|
||||
|
||||
<div class="table_right_options " style=" text-align: right; margin-bottom: 15px;">
|
||||
<a class="btn btn-primary me-3" href="{{route('manage.products')}}">Back</a>
|
||||
</div>
|
||||
<!--begin::Card-->
|
||||
|
||||
<div class="card mb-8">
|
||||
|
||||
@@ -17,7 +17,9 @@
|
||||
<div class="row max-w-100 mt-10">
|
||||
|
||||
<div class="add_new_investors my-5 mb-0">
|
||||
|
||||
<div class="table_right_options " style=" text-align: right; margin-bottom: 15px;">
|
||||
<a class="btn btn-primary me-3" href="{{route('manage.products')}}">Back</a>
|
||||
</div>
|
||||
<!--begin::Card-->
|
||||
|
||||
<div class="card mb-8">
|
||||
|
||||
@@ -17,7 +17,9 @@
|
||||
<div class="row max-w-100 mt-10">
|
||||
|
||||
<div class="add_new_investors my-5 mb-0">
|
||||
|
||||
<div class="table_right_options " style=" text-align: right; margin-bottom: 15px;">
|
||||
<a class="btn btn-primary me-3" href="{{route('manage.products')}}">Back</a>
|
||||
</div>
|
||||
<!--begin::Card-->
|
||||
|
||||
<div class="card mb-8">
|
||||
|
||||
@@ -121,9 +121,11 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@php($true = true)
|
||||
@foreach ($featuredMarketplaceListed['data'] as $freData)
|
||||
@if (array_key_exists('fractional-real-estate', $freData))
|
||||
@foreach ($freData['fractional-real-estate'] as $data)
|
||||
@php($true = false)
|
||||
<tr class="fractional-real-estate">
|
||||
<td>
|
||||
<div class="d-flex tb-img"
|
||||
@@ -199,6 +201,7 @@
|
||||
@foreach ($featuredMarketplaceListed['data'] as $aifData)
|
||||
@if (array_key_exists('alternative-investment-fund', $aifData))
|
||||
@foreach ($aifData['alternative-investment-fund'] as $data)
|
||||
@php($true = false)
|
||||
<tr class="alternative-investment-fund">
|
||||
<td>
|
||||
<div class="d-flex tb-img"
|
||||
@@ -277,6 +280,7 @@
|
||||
@foreach ($featuredMarketplaceListed['data'] as $opData)
|
||||
@if (array_key_exists('other-products', $opData))
|
||||
@foreach ($opData['other-products'] as $data)
|
||||
@php($true = false)
|
||||
<tr class="other-products">
|
||||
<td>
|
||||
<div class="d-flex tb-img"
|
||||
@@ -346,6 +350,27 @@
|
||||
@endforeach
|
||||
@endif
|
||||
@endforeach
|
||||
{{-- @if($true == true)
|
||||
<tr>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>
|
||||
<div>
|
||||
<h4 class="text-center">No product available</h4>
|
||||
</div>
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
@endif --}}
|
||||
{{-- <tr>
|
||||
<td>
|
||||
<div class="d-flex tb-img justify-content-center" style="width: 200px; text-align: left; align-items: center;">
|
||||
@@ -409,9 +434,11 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@php($secondTrue = true)
|
||||
@foreach ($nonFeaturedMarketplaceListed['data'] as $freData)
|
||||
@if (array_key_exists('fractional-real-estate', $freData))
|
||||
@foreach ($freData['fractional-real-estate'] as $data)
|
||||
@php($secondTrue = false)
|
||||
<tr class="fractional-real-estate">
|
||||
<td>
|
||||
<div class="d-flex tb-img"
|
||||
@@ -484,6 +511,7 @@
|
||||
@foreach ($nonFeaturedMarketplaceListed['data'] as $aifData)
|
||||
@if (array_key_exists('alternative-investment-fund', $aifData))
|
||||
@foreach ($aifData['alternative-investment-fund'] as $data)
|
||||
@php($secondTrue = false)
|
||||
<tr class="alternative-investment-fund">
|
||||
<td>
|
||||
<div class="d-flex tb-img"
|
||||
@@ -555,6 +583,7 @@
|
||||
@foreach ($nonFeaturedMarketplaceListed['data'] as $opData)
|
||||
@if (array_key_exists('other-products', $opData))
|
||||
@foreach ($opData['other-products'] as $data)
|
||||
@php($secondTrue = false)
|
||||
<tr class="other-products">
|
||||
<td>
|
||||
<div class="d-flex tb-img"
|
||||
@@ -624,6 +653,30 @@
|
||||
@endforeach
|
||||
@endif
|
||||
@endforeach
|
||||
@if($secondTrue == true)
|
||||
<tr>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
{{-- <td>No</td> --}}
|
||||
{{-- <td>Product</td> --}}
|
||||
<td>
|
||||
<div>
|
||||
<h4 class="text-center">No product available</h4>
|
||||
</div>
|
||||
</td>
|
||||
{{-- <td>Found</td> --}}
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
@endif
|
||||
{{-- <tr>
|
||||
<td>
|
||||
<div class="d-flex tb-img justify-content-center" style="width: 200px; text-align: left; align-items: center;">
|
||||
|
||||
@@ -117,6 +117,7 @@ use App\Http\Controllers\Frontend\GlobalRealAssetController;
|
||||
//admin update profile controller
|
||||
use App\Http\Controllers\Admin\AdminProfileController;
|
||||
use App\Http\Controllers\GlobalPrivateCreditController;
|
||||
use App\Http\Middleware\checkLoggedIn;
|
||||
use App\View\Components\LongOnlyEquityFunds;
|
||||
use Illuminate\Support\Facades\Request;
|
||||
|
||||
@@ -181,22 +182,23 @@ Route::post('update-user-password', [AdminProfileController::class, 'updateUsers
|
||||
// Route::get("login", [LoginController::class, 'index'])->name('login');
|
||||
Route::post("check_login", [LoginController::class, 'check_login'])->name('check_login');
|
||||
Route::get("logout", [LoginController::class, 'logout'])->name('logout');
|
||||
|
||||
Route::controller(UserLogin::class)->group(function () {
|
||||
Route::get("login", 'index')->name('login');
|
||||
|
||||
Route::get("register-investor", 'registerInvestor')->name('register-investor');
|
||||
Route::get("register-asset-managers", 'registerAssetManagers')->name('register-asset-managers');
|
||||
Route::get("register-intermediaries", 'registerIntermediaries')->name('register-intermediaries');
|
||||
|
||||
|
||||
Route::get("register", 'register')->name('register');
|
||||
Route::get("register_otp", 'registerOtp')->name('register_otp');
|
||||
Route::get("register-mobile-otp", 'registerMobileOtp')->name('register-mobile-otp');
|
||||
Route::get("forget-password", 'forgetPassword')->name('forget-password');
|
||||
Route::get("reset-password", 'resetPassword')->name('reset-password');
|
||||
Route::get("sign-out", 'signOut')->name('sign-out');
|
||||
Route::middleware('checkLoggedIn')->group(function(){
|
||||
Route::controller(UserLogin::class)->group(function () {
|
||||
Route::get("login", 'index')->name('login');
|
||||
|
||||
Route::get("register-investor", 'registerInvestor')->name('register-investor');
|
||||
Route::get("register-asset-managers", 'registerAssetManagers')->name('register-asset-managers');
|
||||
Route::get("register-intermediaries", 'registerIntermediaries')->name('register-intermediaries');
|
||||
|
||||
|
||||
Route::get("register", 'register')->name('register');
|
||||
Route::get("register_otp", 'registerOtp')->name('register_otp');
|
||||
Route::get("register-mobile-otp", 'registerMobileOtp')->name('register-mobile-otp');
|
||||
Route::get("forget-password", 'forgetPassword')->name('forget-password');
|
||||
Route::get("reset-password", 'resetPassword')->name('reset-password');
|
||||
});
|
||||
});
|
||||
Route::get("sign-out", [UserLogin::class,'signOut'])->name('sign-out');
|
||||
|
||||
Route::get('search-email', [Userlogin::class, 'searchEmail'])->name('search_email');
|
||||
|
||||
@@ -337,7 +339,7 @@ Route::view('how-it-works', 'Frontend.Pages.how_it_works')->name('how_it_works')
|
||||
Route::view('our_portfolio', 'Frontend.Pages.our_portfolio')->name('our_portfolio');
|
||||
|
||||
// login
|
||||
Route::view('login', 'Frontend.Pages.login')->name('login');
|
||||
Route::view('login', 'Frontend.Pages.login')->name('login')->middleware('checkLoggedIn');
|
||||
|
||||
// forgot password
|
||||
// Route::view('forget_password','Frontend.Pages.forget_password_request')->name('forget_password');
|
||||
|
||||
Reference in New Issue
Block a user