diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/AngelFundController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/AngelFundController.php index a150d6e..b2a258b 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/AngelFundController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/AngelFundController.php @@ -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')); } /** diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/InfrastructureFundController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/InfrastructureFundController.php index a24fc83..a0ae361 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/InfrastructureFundController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/InfrastructureFundController.php @@ -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')); } /** diff --git a/app/Http/Controllers/Admin/ManageFreeUInvestments/PrivateEquityFundController.php b/app/Http/Controllers/Admin/ManageFreeUInvestments/PrivateEquityFundController.php index bc3f124..440210a 100644 --- a/app/Http/Controllers/Admin/ManageFreeUInvestments/PrivateEquityFundController.php +++ b/app/Http/Controllers/Admin/ManageFreeUInvestments/PrivateEquityFundController.php @@ -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')); } /** diff --git a/app/Http/Controllers/Frontend/HomeController.php b/app/Http/Controllers/Frontend/HomeController.php index 2cfd916..69c492b 100644 --- a/app/Http/Controllers/Frontend/HomeController.php +++ b/app/Http/Controllers/Frontend/HomeController.php @@ -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(); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index e7a449b..0af3047 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -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, ]; } diff --git a/app/Http/Middleware/checkLoggedIn.php b/app/Http/Middleware/checkLoggedIn.php new file mode 100644 index 0000000..6f7395f --- /dev/null +++ b/app/Http/Middleware/checkLoggedIn.php @@ -0,0 +1,27 @@ +check()); + if(\Auth::guard('users')->check()) + { + return \Redirect::to('/'); + } + return $next($request); + } +} diff --git a/resources/views/Admin/Pages/manage_freeu_investment/upload-product/alternative-investment-fund.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/upload-product/alternative-investment-fund.blade.php index b7b4f80..8419792 100644 --- a/resources/views/Admin/Pages/manage_freeu_investment/upload-product/alternative-investment-fund.blade.php +++ b/resources/views/Admin/Pages/manage_freeu_investment/upload-product/alternative-investment-fund.blade.php @@ -8,10 +8,14 @@
+
+ Back +
{{--
--}} + @php($route = route('manage.venture-capital-fund.store')) @csrf
diff --git a/resources/views/Admin/Pages/manage_freeu_investment/upload-product/exchange.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/upload-product/exchange.blade.php index 62730d6..891330e 100644 --- a/resources/views/Admin/Pages/manage_freeu_investment/upload-product/exchange.blade.php +++ b/resources/views/Admin/Pages/manage_freeu_investment/upload-product/exchange.blade.php @@ -17,7 +17,9 @@
- +
+ Back +
diff --git a/resources/views/Admin/Pages/manage_freeu_investment/upload-product/funds.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/upload-product/funds.blade.php index c2a5cf5..866c9bc 100644 --- a/resources/views/Admin/Pages/manage_freeu_investment/upload-product/funds.blade.php +++ b/resources/views/Admin/Pages/manage_freeu_investment/upload-product/funds.blade.php @@ -17,7 +17,9 @@
- +
+ Back +
diff --git a/resources/views/Admin/Pages/manage_freeu_investment/upload-product/real-estate.blade.php b/resources/views/Admin/Pages/manage_freeu_investment/upload-product/real-estate.blade.php index 180f41a..330a9a0 100644 --- a/resources/views/Admin/Pages/manage_freeu_investment/upload-product/real-estate.blade.php +++ b/resources/views/Admin/Pages/manage_freeu_investment/upload-product/real-estate.blade.php @@ -17,7 +17,9 @@
- +
+ Back +
diff --git a/resources/views/Frontend/Pages/marketplace/index.blade.php b/resources/views/Frontend/Pages/marketplace/index.blade.php index 306defd..1b36cc6 100644 --- a/resources/views/Frontend/Pages/marketplace/index.blade.php +++ b/resources/views/Frontend/Pages/marketplace/index.blade.php @@ -121,9 +121,11 @@ + @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)
+ + + + + + + +
+

No product available

+
+ + + + + + + + + @endif --}} {{--
@@ -409,9 +434,11 @@ + @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)
+ + + + + + + {{-- No --}} + {{-- Product --}} + +
+

No product available

+
+ + {{-- Found --}} + + + + + + + + @endif {{--
diff --git a/routes/web.php b/routes/web.php index 9989e3b..7710a07 100644 --- a/routes/web.php +++ b/routes/web.php @@ -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');