deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update laravel framework from 9 to 11, removed some old packages

Browse Source
This commit is contained in:
Deon George
2024-07-04 15:03:11 +10:00
parent 1b4504cee2
commit 59dc825bf7
101 changed files with 1656 additions and 4062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
routes/channels.php
View File

@@ -11,6 +11,6 @@
|
*/
Broadcast::channel('App.User.{id}', function ($user, $id) {
return (int) $user->id === (int) $id;
});
//Broadcast::channel('App.User.{id}', function ($user, $id) {
// return (int) $user->id === (int) $id;
//});

18
routes/console.php
View File

@@ -1,18 +1,8 @@
<?php
use Illuminate\Foundation\Inspiring;
use Illuminate\Support\Facades\Artisan;
/*
|--------------------------------------------------------------------------
| Console Routes
|--------------------------------------------------------------------------
|
| This file is where you may define all of your Closure based console
| commands. Each Closure is bound to a command instance allowing a
| simple approach to interacting with each command's IO methods.
|
*/
Artisan::command('inspire', function () {
$this->comment(Inspiring::quote());
})->describe('Display an inspiring quote');
//Artisan::command('inspire', function () {
// $this->comment(Inspiring::quote());
//})->purpose('Display an inspiring quote')->hourly();

19
routes/web.php
View File

@@ -1,6 +1,7 @@
<?php
use Leenooks\Controllers\SwitchUserController;
use App\Http\Controllers\{AdminController,
Auth\LoginController,
Auth\SocialLoginController,
@@ -39,11 +40,12 @@ Auth::routes([
'confirm' => false, // for additional password confirmations
'verify' => false, // for email verification
]);
Route::get('logout',[LoginController::class,'logout'])
->name('logout-get');
// Account linking to OPENID host
Route::group(['middleware'=>['theme:adminlte-be']],function() {
Route::group([],function() {
Route::get('auth/{socialProvider}',[SocialLoginController::class,'redirectToProvider']);
Route::get('auth/{socialProvider}/callback',[SocialLoginController::class,'handleProviderCallback']);
Route::get('auth/{socialProvider}/token',[SocialLoginController::class,'handleBearerTokenCallback']);
@@ -61,7 +63,7 @@ Route::get('image/generic/{width}/{height}/{color}/{name?}',[MediaController::cl
->name('image');
// Our Admin Routes - for wholesalers
Route::group(['middleware'=>['theme:adminlte-be','auth','role:wholesaler'],'prefix'=>'a'],function() {
Route::group(['middleware'=>['auth','role:wholesaler'],'prefix'=>'a'],function() {
// Site Setup
Route::match(['get','post'],'setup',[AdminController::class,'setup']);
@@ -132,14 +134,14 @@ Route::group(['middleware'=>['theme:adminlte-be','auth','role:wholesaler'],'pref
});
// Our Reseller Routes
Route::group(['middleware'=>['theme:adminlte-be','auth','role:reseller'],'prefix'=>'r'],function() {
Route::group(['middleware'=>['auth','role:reseller'],'prefix'=>'r'],function() {
// Enable user switch
Route::get('switch/start/{user}',[SwitchUserController::class,'switch_start'])
->middleware('can:assume,user')
->name('switch.start');
// Reseller Reports
Route::group(['middleware'=>['theme:adminlte-be','auth','role:reseller'],'prefix'=>'report'],function() {
Route::group(['middleware'=>['auth','role:reseller'],'prefix'=>'report'],function() {
Route::get('domain',[ServiceController::class,'domain_list']);
Route::get('email',[ServiceController::class,'email_list']);
Route::get('hosting',[ServiceController::class,'hosting_list']);
@@ -156,7 +158,7 @@ Route::group(['middleware'=>['theme:adminlte-be','auth','role:reseller'],'prefix
});
// Our User Routes
Route::group(['middleware'=>['theme:adminlte-be','auth'],'prefix'=>'u'],function() {
Route::group(['middleware'=>['auth'],'prefix'=>'u'],function() {
Route::get('home',[HomeController::class,'home']);
Route::get('home/{o}',[HomeController::class,'home'])
->where('o','[0-9]+')
@@ -194,15 +196,16 @@ Route::group(['middleware'=>['theme:adminlte-be','auth'],'prefix'=>'u'],function
});
// Doorman Code Routes
Route::group(['middleware'=>['theme:adminlte-be'],'prefix'=>'u'],function() {
Route::group(['prefix'=>'u'],function() {
Route::get('invoice/{o}/email/{code}',[InvoiceController::class,'view'])
->where('o','[0-9]+')
->where('code','[0-9A-Z]{6}');
});
// Frontend Routes (Non-Authed Users)
Route::group(['middleware'=>['theme:metronic-fe']],function() {
Route::get('/',[WelcomeController::class,'home']);
Route::view('/','theme.frontend.metronic.welcome.home');
Route::group([],function() {
Route::get('order',[OrderController::class,'index']);
Route::post('order',[OrderController::class,'submit']);
});