lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #9702 from uberbrady/develop-v6-integration

Browse source 
Finished fixing the web routes file
This commit is contained in:
snipe 2021-06-11 17:15:35 -07:00 • committed by GitHub
commit 2ed2007888
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 130 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
routes/api.php
View file

@ -4,6 +4,16 @@ use App\Http\Controllers\Api;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
/*******************************************************************************************************************************
*
* FIXME FIXME FIXME
*
* The 'old' way of specifying routes (an array with 'as' for a name, and 'uses' for a controller) doesn't seem to work anymore.
* Almost all of these routes will need to be fixed (as has been done in the web.php routes file). Hopefully, a later version of
* Laravel Shift will do it for us maybe? Or we can get to it at some point later.
*
******************************************************************************************************************************/
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| API Routes | API Routes

267
routes/web.php
View file

@ -47,20 +47,20 @@ Route::group(['middleware' => 'auth'], function () {
Route::get( Route::get(
'locations/{locationId}/printassigned', 'locations/{locationId}/printassigned',
['as' => 'locations.print_assigned', 'uses' => [LocationsController::class, 'print_assigned']] [LocationsController::class, 'print_assigned']
); )->name('locations.print_assigned');
Route::get( Route::get(
'locations/{locationId}/printallassigned', 'locations/{locationId}/printallassigned',
['as' => 'locations.print_all_assigned', 'uses' => [LocationsController::class, 'print_all_assigned']] [LocationsController::class, 'print_all_assigned']
); )->name('locations.print_all_assigned');
/* /*
* Manufacturers * Manufacturers
*/ */
Route::group(['prefix' => 'manufacturers', 'middleware' => ['auth']], function () { Route::group(['prefix' => 'manufacturers', 'middleware' => ['auth']], function () {
Route::get('{manufacturers_id}/restore', ['as' => 'restore/manufacturer', 'uses' => [ManufacturersController::class, 'restore']]); Route::get('{manufacturers_id}/restore', [ManufacturersController::class, 'restore'] )->name('restore/manufacturer');
}); });
Route::resource('manufacturers', ManufacturersController::class, [ Route::resource('manufacturers', ManufacturersController::class, [
@ -107,7 +107,7 @@ Route::group(['middleware' => 'auth'], function () {
*/ */
Route::group(['middleware' => 'auth', 'prefix' => 'modals'], function () { Route::group(['middleware' => 'auth', 'prefix' => 'modals'], function () {
Route::get('{type}/{itemId?}', ['as' => 'modal.show', 'uses' => [ModalController::class, 'show']]); Route::get('{type}/{itemId?}', [ModalController::class, 'show'] )->name('modal.show');
}); });
/* /*
@ -122,10 +122,8 @@ Route::group(['middleware' => 'auth', 'prefix' => 'modals'], function () {
Route::group(['middleware' => 'auth'], function () { Route::group(['middleware' => 'auth'], function () {
Route::get( Route::get(
'display-sig/{filename}', 'display-sig/{filename}',
[ [ActionlogController::class, 'displaySig']
'as' => 'log.signature.view', )->name('log.signature.view');
'uses' => [ActionlogController::class, 'displaySig'], ]
);
}); });
/* /*
@ -138,63 +136,60 @@ Route::group(['middleware' => 'auth'], function () {
*/ */
Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser']], function () { Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser']], function () {
Route::get('settings', ['as' => 'settings.general.index', 'uses' => [SettingsController::class, 'getSettings']]); Route::get('settings', [SettingsController::class, 'getSettings'])->name('settings.general.index');
Route::post('settings', ['as' => 'settings.general.save', 'uses' => [SettingsController::class, 'postSettings']]); Route::post('settings', [SettingsController::class, 'postSettings'])->name('settings.general.save');
Route::get('branding', ['as' => 'settings.branding.index', 'uses' => [SettingsController::class, 'getBranding']]); Route::get('branding', [SettingsController::class, 'getBranding'])->name('settings.branding.index');
Route::post('branding', ['as' => 'settings.branding.save', 'uses' => [SettingsController::class, 'postBranding']]); Route::post('branding', [SettingsController::class, 'postBranding'])->name('settings.branding.save');
Route::get('security', ['as' => 'settings.security.index', 'uses' => [SettingsController::class, 'getSecurity']]); Route::get('security', [SettingsController::class, 'getSecurity'])->name('settings.security.index');
Route::post('security', ['as' => 'settings.security.save', 'uses' => [SettingsController::class, 'postSecurity']]); Route::post('security', [SettingsController::class, 'postSecurity'])->name('settings.security.save');
Route::get('groups', ['as' => 'settings.groups.index', 'uses' => [GroupsController::class, 'index']]); Route::get('groups', [GroupsController::class, 'index'])->name('settings.groups.index');
Route::get('localization', ['as' => 'settings.localization.index', 'uses' => [SettingsController::class, 'getLocalization']]); Route::get('localization', [SettingsController::class, 'getLocalization'])->name('settings.localization.index');
Route::post('localization', ['as' => 'settings.localization.save', 'uses' => [SettingsController::class, 'postLocalization']]); Route::post('localization', [SettingsController::class, 'postLocalization'])->name('settings.localization.save');
Route::get('notifications', ['as' => 'settings.alerts.index', 'uses' => [SettingsController::class, 'getAlerts']]); Route::get('notifications', [SettingsController::class, 'getAlerts'])->name('settings.alerts.index');
Route::post('notifications', ['as' => 'settings.alerts.save', 'uses' => [SettingsController::class, 'postAlerts']]); Route::post('notifications', [SettingsController::class, 'postAlerts'])->name('settings.alerts.save');
Route::get('slack', ['as' => 'settings.slack.index', 'uses' => [SettingsController::class, 'getSlack']]); Route::get('slack', [SettingsController::class, 'getSlack'])->name('settings.slack.index');
Route::post('slack', ['as' => 'settings.slack.save', 'uses' => [SettingsController::class, 'postSlack']]); Route::post('slack', [SettingsController::class, 'postSlack'])->name('settings.slack.save');
Route::get('asset_tags', ['as' => 'settings.asset_tags.index', 'uses' => [SettingsController::class, 'getAssetTags']]); Route::get('asset_tags', [SettingsController::class, 'getAssetTags'])->name('settings.asset_tags.index');
Route::post('asset_tags', ['as' => 'settings.asset_tags.save', 'uses' => [SettingsController::class, 'postAssetTags']]); Route::post('asset_tags', [SettingsController::class, 'postAssetTags'])->name('settings.asset_tags.save');
Route::get('barcodes', ['as' => 'settings.barcodes.index', 'uses' => [SettingsController::class, 'getBarcodes']]); Route::get('barcodes', [SettingsController::class, 'getBarcodes'])->name('settings.barcodes.index');
Route::post('barcodes', ['as' => 'settings.barcodes.save', 'uses' => [SettingsController::class, 'postBarcodes']]); Route::post('barcodes', [SettingsController::class, 'postBarcodes'])->name('settings.barcodes.save');
Route::get('labels', ['as' => 'settings.labels.index', 'uses' => [SettingsController::class, 'getLabels']]); Route::get('labels', [SettingsController::class, 'getLabels'])->name('settings.labels.index');
Route::post('labels', ['as' => 'settings.labels.save', 'uses' => [SettingsController::class, 'postLabels']]); Route::post('labels', [SettingsController::class, 'postLabels'])->name('settings.labels.save');
Route::get('ldap', ['as' => 'settings.ldap.index', 'uses' => [SettingsController::class, 'getLdapSettings']]); Route::get('ldap', [SettingsController::class, 'getLdapSettings'])->name('settings.ldap.index');
Route::post('ldap', ['as' => 'settings.ldap.save', 'uses' => [SettingsController::class, 'postLdapSettings']]); Route::post('ldap', [SettingsController::class, 'postLdapSettings'])->name('settings.ldap.save');
Route::get('phpinfo', ['as' => 'settings.phpinfo.index', 'uses' => [SettingsController::class, 'getPhpInfo']]); Route::get('phpinfo', [SettingsController::class, 'getPhpInfo'])->name('settings.phpinfo.index');
Route::get('oauth', ['as' => 'settings.oauth.index', 'uses' => [SettingsController::class, 'api']]); Route::get('oauth', [SettingsController::class, 'api'])->name('settings.oauth.index');
Route::get('purge', ['as' => 'settings.purge.index', 'uses' => [SettingsController::class, 'getPurge']]); Route::get('purge', [SettingsController::class, 'getPurge'])->name('settings.purge.index');
Route::post('purge', ['as' => 'settings.purge.save', 'uses' => [SettingsController::class, 'postPurge']]); Route::post('purge', [SettingsController::class, 'postPurge'])->name('settings.purge.save');
Route::get('login-attempts', ['as' => 'settings.logins.index', 'uses' => [SettingsController::class, 'getLoginAttempts']]); Route::get('login-attempts', [SettingsController::class, 'getLoginAttempts'])->name('settings.logins.index');
// Backups // Backups
Route::group(['prefix' => 'backups', 'middleware' => 'auth'], function () { Route::group(['prefix' => 'backups', 'middleware' => 'auth'], function () {
Route::get('download/{filename}', [ Route::get('download/{filename}',
'as' => 'settings.backups.download', [SettingsController::class, 'downloadFile'])->name('settings.backups.download');
'uses' => [SettingsController::class, 'downloadFile'], ]);
Route::delete('delete/{filename}', [ Route::delete('delete/{filename}',
'as' => 'settings.backups.destroy', [SettingsController::class, 'deleteFile'])->name('settings.backups.destroy');
'uses' => [SettingsController::class, 'deleteFile'], ]);
Route::post('/', [ Route::post('/',
'as' => 'settings.backups.create', [SettingsController::class, 'postBackups']
'uses' => [SettingsController::class, 'postBackups'], )->name('settings.backups.create');
]);
Route::get('/', ['as' => 'settings.backups.index', 'uses' => [SettingsController::class, 'getBackups']]); Route::get('/', [SettingsController::class, 'getBackups'])->name('settings.backups.index');
}); });
Route::resource('groups', GroupsController::class, [ Route::resource('groups', GroupsController::class, [
@ -202,7 +197,7 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser
'parameters' => ['group' => 'group_id'], 'parameters' => ['group' => 'group_id'],
]); ]);
Route::get('/', ['as' => 'settings.index', 'uses' => [SettingsController::class, 'index']]); Route::get('/', [SettingsController::class, 'index'])->name('settings.index');
}); });
/* /*
@ -214,10 +209,9 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser
| |
*/ */
Route::group(['prefix' => 'import', 'middleware' => ['auth']], function () { Route::group(['prefix' => 'import', 'middleware' => ['auth']], function () {
Route::get('/', [ Route::get('/',
'as' => 'imports.index', [ImportsController::class, 'index']
'uses' => [ImportsController::class, 'index'], )->name('imports.index');
]);
}); });
/* /*
@ -231,44 +225,44 @@ Route::group(['prefix' => 'import', 'middleware' => ['auth']], function () {
Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () { Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
// Profile // Profile
Route::get('profile', ['as' => 'profile', 'uses' => [ProfileController::class, 'getIndex']]); Route::get('profile', [ProfileController::class, 'getIndex'])->name('profile');
Route::post('profile', [ProfileController::class, 'postIndex']); Route::post('profile', [ProfileController::class, 'postIndex']);
Route::get('menu', ['as' => 'account.menuprefs', 'uses' => [ProfileController::class, 'getMenuState']]); Route::get('menu', [ProfileController::class, 'getMenuState'])->name('account.menuprefs');
Route::get('password', ['as' => 'account.password.index', 'uses' => [ProfileController::class, 'password']]); Route::get('password', [ProfileController::class, 'password'])->name('account.password.index');
Route::post('password', ['uses' => [ProfileController::class, 'passwordSave']]); Route::post('password', [ProfileController::class, 'passwordSave']);
Route::get('api', ['as' => 'user.api', 'uses' => [ProfileController::class, 'api']]); Route::get('api', [ProfileController::class, 'api'])->name('user.api');
// View Assets // View Assets
Route::get('view-assets', ['as' => 'view-assets', 'uses' => [ViewAssetsController::class, 'getIndex']]); Route::get('view-assets', [ViewAssetsController::class, 'getIndex'])->name('view-assets');
Route::get('requested', ['as' => 'account.requested', 'uses' => [ViewAssetsController::class, 'getRequestedAssets']]); Route::get('requested', [ViewAssetsController::class, 'getRequestedAssets'])->name('account.requested');
// Accept Asset // Accept Asset
Route::get( Route::get(
'accept-asset/{logID}', 'accept-asset/{logID}',
['as' => 'account/accept-assets', 'uses' => [ViewAssetsController::class, 'getAcceptAsset']] [ViewAssetsController::class, 'getAcceptAsset']
); )->name('account/accept-assets');
// Profile // Profile
Route::get( Route::get(
'requestable-assets', 'requestable-assets',
['as' => 'requestable-assets', 'uses' => [ViewAssetsController::class, 'getRequestableIndex']] [ViewAssetsController::class, 'getRequestableIndex']
); )->name('requestable-assets');
Route::get( Route::get(
'request-asset/{assetId}', 'request-asset/{assetId}',
['as' => 'account/request-asset', 'uses' => [ViewAssetsController::class, 'getRequestAsset']] [ViewAssetsController::class, 'getRequestAsset']
); )->name('account/request-asset');
Route::post( Route::post(
'request/{itemType}/{itemId}', 'request/{itemType}/{itemId}',
['as' => 'account/request-item', 'uses' => [ViewAssetsController::class, 'getRequestItem']] [ViewAssetsController::class, 'getRequestItem']
); )->name('account/request-item');
// Account Dashboard // Account Dashboard
Route::get('/', ['as' => 'account', 'uses' => [ViewAssetsController::class, 'getIndex']]); Route::get('/', [ViewAssetsController::class, 'getIndex'])->name('account');
Route::get('accept', [Account\AcceptanceController::class, 'index']) Route::get('accept', [Account\AcceptanceController::class, 'index'])
->name('account.accept'); ->name('account.accept');
@ -280,67 +274,63 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () {
}); });
Route::group(['middleware' => ['auth']], function () { Route::group(['middleware' => ['auth']], function () {
Route::get('reports/audit', [ Route::get('reports/audit',
'as' => 'reports.audit', [ReportsController::class, 'audit']
'uses' => [ReportsController::class, 'audit'], )->name('reports.audit');
]);
Route::get( Route::get(
'reports/depreciation', 'reports/depreciation',
['as' => 'reports/depreciation', 'uses' => [ReportsController::class, 'getDeprecationReport']] [ReportsController::class, 'getDeprecationReport']
); )->name('reports/depreciation');
Route::get( Route::get(
'reports/export/depreciation', 'reports/export/depreciation',
['as' => 'reports/export/depreciation', 'uses' => [ReportsController::class, 'exportDeprecationReport']] [ReportsController::class, 'exportDeprecationReport']
); )->name('reports/export/depreciation');
Route::get( Route::get(
'reports/asset_maintenances', 'reports/asset_maintenances',
['as' => 'reports/asset_maintenances', 'uses' => [ReportsController::class, 'getAssetMaintenancesReport']] [ReportsController::class, 'getAssetMaintenancesReport']
); )->name('reports/asset_maintenances');
Route::get( Route::get(
'reports/export/asset_maintenances', 'reports/export/asset_maintenances',
[ [ReportsController::class, 'exportAssetMaintenancesReport']
'as' => 'reports/export/asset_maintenances', )->name('reports/export/asset_maintenances');
'uses' => [ReportsController::class, 'exportAssetMaintenancesReport'],
]
);
Route::get( Route::get(
'reports/licenses', 'reports/licenses',
['as' => 'reports/licenses', 'uses' => [ReportsController::class, 'getLicenseReport']] [ReportsController::class, 'getLicenseReport']
); )->name('reports/licenses');
Route::get( Route::get(
'reports/export/licenses', 'reports/export/licenses',
['as' => 'reports/export/licenses', 'uses' => [ReportsController::class, 'exportLicenseReport']] [ReportsController::class, 'exportLicenseReport']
); )->name('reports/export/licenses');
Route::get('reports/accessories', ['as' => 'reports/accessories', 'uses' => [ReportsController::class, 'getAccessoryReport']]); Route::get('reports/accessories', [ReportsController::class, 'getAccessoryReport'])->name('reports/accessories');
Route::get( Route::get(
'reports/export/accessories', 'reports/export/accessories',
['as' => 'reports/export/accessories', 'uses' => [ReportsController::class, 'exportAccessoryReport']] [ReportsController::class, 'exportAccessoryReport']
); )->name('reports/export/accessories');
Route::get('reports/custom', ['as' => 'reports/custom', 'uses' => [ReportsController::class, 'getCustomReport']]); Route::get('reports/custom', [ReportsController::class, 'getCustomReport'])->name('reports/custom');
Route::post('reports/custom', [ReportsController::class, 'postCustom']); Route::post('reports/custom', [ReportsController::class, 'postCustom']);
Route::get( Route::get(
'reports/activity', 'reports/activity',
['as' => 'reports.activity', 'uses' => [ReportsController::class, 'getActivityReport']] [ReportsController::class, 'getActivityReport']
); )->name('reports.activity');
Route::post('reports/activity', [ReportsController::class, 'postActivityReport']); Route::post('reports/activity', [ReportsController::class, 'postActivityReport']);
Route::get( Route::get(
'reports/unaccepted_assets', 'reports/unaccepted_assets',
['as' => 'reports/unaccepted_assets', 'uses' => [ReportsController::class, 'getAssetAcceptanceReport']] [ReportsController::class, 'getAssetAcceptanceReport']
); )->name('reports/unaccepted_assets');
Route::get( Route::get(
'reports/export/unaccepted_assets', 'reports/export/unaccepted_assets',
['as' => 'reports/export/unaccepted_assets', 'uses' => [ReportsController::class, 'exportAssetAcceptanceReport']] [ReportsController::class, 'exportAssetAcceptanceReport']
); )->name('reports/export/unaccepted_assets');
}); });
Route::get( Route::get(
'auth/signin', 'auth/signin',
['uses' => [LoginController::class, 'legacyAuthRedirect']] [LoginController::class, 'legacyAuthRedirect']
); );
/* /*
@ -354,70 +344,51 @@ Route::get(
Route::group(['prefix' => 'setup', 'middleware' => 'web'], function () { Route::group(['prefix' => 'setup', 'middleware' => 'web'], function () {
Route::get( Route::get(
'user', 'user',
[ [SettingsController::class, 'getSetupUser']
'as' => 'setup.user', )->name('setup.user');
'uses' => [SettingsController::class, 'getSetupUser'], ]
);
Route::post( Route::post(
'user', 'user',
[ [SettingsController::class, 'postSaveFirstAdmin']
'as' => 'setup.user.save', )->name('setup.user.save');
'uses' => [SettingsController::class, 'postSaveFirstAdmin'], ]
);
Route::get( Route::get(
'migrate', 'migrate',
[ [SettingsController::class, 'getSetupMigrate']
'as' => 'setup.migrate', )->name('setup.migrate');
'uses' => [SettingsController::class, 'getSetupMigrate'], ]
);
Route::get( Route::get(
'done', 'done',
[ [SettingsController::class, 'getSetupDone']
'as' => 'setup.done', )->name('setup.done');
'uses' => [SettingsController::class, 'getSetupDone'], ]
);
Route::get( Route::get(
'mailtest', 'mailtest',
[ [SettingsController::class, 'ajaxTestEmail']
'as' => 'setup.mailtest', )->name('setup.mailtest');
'uses' => [SettingsController::class, 'ajaxTestEmail'], ]
);
Route::get( Route::get(
'/', '/',
[ [SettingsController::class, 'getSetupIndex']
'as' => 'setup', )->name('setup');
'uses' => [SettingsController::class, 'getSetupIndex'], ]
);
}); });
Route::middleware(['web'], function () {
Route::get( Route::get(
'two-factor-enroll', 'two-factor-enroll',
[ [LoginController::class, 'getTwoFactorEnroll']
'as' => 'two-factor-enroll', )->name('two-factor-enroll');
'middleware' => ['web'],
'uses' => [LoginController::class, 'getTwoFactorEnroll'], ]
);
Route::get( Route::get(
'two-factor', 'two-factor',
[ [LoginController::class, 'getTwoFactorAuth']
'as' => 'two-factor', )->name('two-factor');
'middleware' => ['web'],
'uses' => [LoginController::class, 'getTwoFactorAuth'], ]
);
Route::post( Route::post(
'two-factor', 'two-factor',
[ [LoginController::class, 'postTwoFactorAuth']
'as' => 'two-factor',
'middleware' => ['web'],
'uses' => [LoginController::class, 'postTwoFactorAuth'], ]
); );
});
@ -425,43 +396,27 @@ Route::group(['middleware' => 'web'], function () {
Route::get( Route::get(
'login', 'login',
[LoginController::class, 'showLoginForm'] [LoginController::class, 'showLoginForm']
// [
// 'as' => 'login',
// 'middleware' => ['web'],
// 'uses' => [LoginController::class, 'showLoginForm'], ]
)->name("login"); )->name("login");
Route::post( Route::post(
'login', 'login',
[LoginController::class, 'login'] [LoginController::class, 'login']
// [
// 'as' => 'login',
// 'middleware' => ['web'],
// 'uses' => [LoginController::class, 'login'], ]
); );
Route::get( Route::get(
'logout', 'logout',
[ [LoginController::class, 'logout']
'as' => 'logout', )->name('logout');
'uses' => [LoginController::class, 'logout'], ]
);
}); });
//Auth::routes(); //Auth::routes();
Route::get( Route::get(
'/health', '/health',
[ [HealthController::class, 'get']
'as' => 'health', )->name('health');
'uses' => [HealthController::class, 'get'],]
);
Route::middleware(['auth'])->get( Route::middleware(['auth'])->get(
'/', '/',
[DashboardController::class, 'index'] [DashboardController::class, 'index']
// [
// 'as' => 'home',
// 'middleware' => ['auth'],
// 'uses' => [DashboardController::class, 'index'], ]
)->name('home'); )->name('home');