Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into container-profile-forms-ui

# Conflicts:
#	routes/web.php
This commit is contained in:
edmondlang
2021-09-24 19:56:07 +08:00
15 changed files with 314 additions and 33 deletions
+7 -6
View File
@@ -7,6 +7,7 @@ use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
use App\Models\CompanyConnection;
use App\Models\Container;
use Illuminate\Support\Facades\Crypt;
use Illuminate\Support\Facades\Route;
/*
@@ -22,9 +23,9 @@ use Illuminate\Support\Facades\Route;
require __DIR__ . '/template.php';
Route::get('/', function () {
return view('welcome');
});
Route::get('', function () {
return view('pages.accounts.login');
})->name('login');
Route::group(['prefix' => 'swagger'], function () {
Route::get('/', function () {
@@ -35,9 +36,9 @@ Route::group(['prefix' => 'swagger'], function () {
});
});
Route::get('', function () {
return view('pages.accounts.login');//temporary showing welcome page.
})->name('login');
Route::get('/business/claim/{hash}', function ($hash) {
return view('pages.accounts.claim_business', ['id' => Crypt::decryptString($hash)]);
})->name('company.claim');
Route::get('/account/email/verification/{token}', function ($token) {
return view('pages.accounts.email_verified', ['token' => $token]);