diff --git a/app/Http/View/Composers/UserMenuComposer.php b/app/Http/View/Composers/UserMenuComposer.php index 49767ce5..cffabb37 100644 --- a/app/Http/View/Composers/UserMenuComposer.php +++ b/app/Http/View/Composers/UserMenuComposer.php @@ -32,15 +32,15 @@ class UserMenuComposer $menuItems = [ ['label' => trans('general.user-center'), 'link' => route('user.home')], - ['label' => trans('general.profile'), 'link' => route('user.profile.')], + ['label' => trans('general.profile'), 'link' => route('user.profile.view')], ]; if ($user->isAdmin()) { array_push( $menuItems, ['label' => '', 'link' => '#divider'], - ['label' => trans('general.admin-panel'), 'link' => route('admin.')], - ['label' => trans('general.user-manage'), 'link' => route('admin.users.')], - ['label' => trans('general.report-manage'), 'link' => route('admin.reports.')], + ['label' => trans('general.admin-panel'), 'link' => route('admin.view')], + ['label' => trans('general.user-manage'), 'link' => route('admin.users.view')], + ['label' => trans('general.report-manage'), 'link' => route('admin.reports.view')], ['label' => 'Web CLI', 'link' => '#launch-cli'], ); } diff --git a/routes/web.php b/routes/web.php index 4d9d9e92..2c8ceb5f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -13,34 +13,35 @@ use App\Http\Middleware; | */ -Route::get('', 'HomeController@index'); +Route::get('', 'HomeController@index')->name('home'); Route::prefix('auth')->name('auth.')->group(function () { Route::middleware('guest')->group(function () { Route::get('login', 'AuthController@login')->name('login'); - Route::post('login', 'AuthController@handleLogin'); + Route::post('login', 'AuthController@handleLogin')->name('handle.login'); Route::get('register', 'AuthController@register')->name('register'); - Route::post('register', 'AuthController@handleRegister'); + Route::post('register', 'AuthController@handleRegister')->name('handle.register'); Route::get('forgot', 'AuthController@forgot')->name('forgot'); - Route::post('forgot', 'AuthController@handleForgot'); + Route::post('forgot', 'AuthController@handleForgot')->name('handle.forgot'); Route::get('reset/{uid}', 'AuthController@reset')->name('reset'); - Route::post('reset/{uid}', 'AuthController@handleReset'); + Route::post('reset/{uid}', 'AuthController@handleReset')->name('handle.reset'); }); Route::post('logout', 'AuthController@logout')->name('logout')->middleware('authorize'); - Route::any('captcha', 'AuthController@captcha'); + Route::any('captcha', 'AuthController@captcha')->name('captcha'); Route::middleware(['authorize', Middleware\EnsureEmailFilled::class]) + ->name('bind.') ->group(function () { - Route::view('bind', 'auth.bind'); - Route::post('bind', 'AuthController@fillEmail'); + Route::view('bind', 'auth.bind')->name('view'); + Route::post('bind', 'AuthController@fillEmail')->name('verify'); }); Route::get('verify/{user}', 'AuthController@verify')->name('verify'); - Route::post('verify/{user}', 'AuthController@handleVerify'); + Route::post('verify/{user}', 'AuthController@handleVerify')->name('handle.verify'); }); Route::prefix('user') @@ -48,27 +49,27 @@ Route::prefix('user') ->middleware(['authorize']) ->group(function () { Route::get('', 'UserController@index')->name('home'); - Route::post('notifications/{id}', 'NotificationsController@read')->name('notification'); + Route::post('notifications/{id}', 'NotificationsController@read')->name('notification.read'); Route::get('score-info', 'UserController@scoreInfo')->name('score'); Route::post('sign', 'UserController@sign')->name('sign'); - Route::get('reports', 'ReportController@track'); + Route::get('reports', 'ReportController@track')->name('list'); Route::prefix('profile')->name('profile.')->group(function () { - Route::get('', 'UserController@profile'); - Route::post('', 'UserController@handleProfile'); + Route::get('', 'UserController@profile')->name('view'); + Route::post('', 'UserController@handleProfile')->name('handle.profile'); Route::post('avatar', 'UserController@setAvatar')->name('avatar'); }); - Route::post('email-verification', 'UserController@sendVerificationEmail'); + Route::post('email-verification', 'UserController@sendVerificationEmail')->name('email-verification'); - Route::put('dark-mode', 'UserController@toggleDarkMode'); + Route::put('dark-mode', 'UserController@toggleDarkMode')->name('dark-mode'); Route::prefix('player') ->name('player.') ->middleware('verified') ->group(function () { - Route::get('', 'PlayerController@index')->name('page'); + Route::get('', 'PlayerController@index')->name('view'); Route::get('list', 'PlayerController@list')->name('list'); Route::post('', 'PlayerController@add')->name('add'); Route::put('{player}/textures', 'PlayerController@setTexture')->name('set'); @@ -78,7 +79,7 @@ Route::prefix('user') }); Route::prefix('closet')->name('closet.')->group(function () { - Route::get('', 'ClosetController@index')->name('page'); + Route::get('', 'ClosetController@index')->name('view'); Route::get('list', 'ClosetController@getClosetData')->name('list'); Route::get('ids', 'ClosetController@allIds')->name('ids'); Route::post('', 'ClosetController@add')->name('add'); @@ -110,8 +111,8 @@ Route::prefix('skinlib')->name('skinlib.')->group(function () { Route::get('list', 'SkinlibController@library')->name('list'); Route::middleware(['authorize', 'verified'])->group(function () { - Route::get('upload', 'SkinlibController@upload'); - Route::post('report', 'ReportController@submit'); + Route::get('upload', 'SkinlibController@upload')->name('upload'); + Route::post('report', 'ReportController@submit')->name('report'); }); }); @@ -119,19 +120,19 @@ Route::prefix('admin') ->name('admin.') ->middleware(['authorize', 'role:admin']) ->group(function () { - Route::get('', 'AdminController@index'); - Route::get('chart', 'AdminController@chartData'); - Route::post('notifications/send', 'NotificationsController@send'); + Route::get('', 'AdminController@index')->name('view'); + Route::get('chart', 'AdminController@chartData')->name('chart'); + Route::post('notifications/send', 'NotificationsController@send')->name('notification.send'); - Route::any('customize', 'OptionsController@customize'); - Route::any('score', 'OptionsController@score'); - Route::any('options', 'OptionsController@options'); - Route::any('resource', 'OptionsController@resource'); + Route::any('customize', 'OptionsController@customize')->name('customize'); + Route::any('score', 'OptionsController@score')->name('score'); + Route::any('options', 'OptionsController@options')->name('options'); + Route::any('resource', 'OptionsController@resource')->name('resource'); - Route::get('status', 'AdminController@status'); + Route::get('status', 'AdminController@status')->name('status'); Route::prefix('users')->name('users.')->group(function () { - Route::view('', 'admin.users'); + Route::view('', 'admin.users')->name('view'); Route::get('list', 'UsersManagementController@list')->name('list'); Route::prefix('{user}')->group(function () { Route::put('email', 'UsersManagementController@email')->name('email'); @@ -145,7 +146,7 @@ Route::prefix('admin') }); Route::prefix('players')->name('players.')->group(function () { - Route::view('', 'admin.players'); + Route::view('', 'admin.players')->name('view'); Route::get('list', 'PlayersManagementController@list')->name('list'); Route::prefix('{player}')->group(function () { Route::put('name', 'PlayersManagementController@name')->name('name'); @@ -155,56 +156,56 @@ Route::prefix('admin') }); }); - Route::prefix('closet')->group(function () { - Route::post('{user}', 'ClosetManagementController@add'); - Route::delete('{user}', 'ClosetManagementController@remove'); + Route::prefix('closet')->name('closet.')->group(function () { + Route::post('{user}', 'ClosetManagementController@add')->name('add'); + Route::delete('{user}', 'ClosetManagementController@remove')->name('remove'); }); Route::prefix('reports')->name('reports.')->group(function () { - Route::view('', 'admin.reports'); - Route::put('{report}', 'ReportController@review'); - Route::get('list', 'ReportController@manage'); + Route::view('', 'admin.reports')->name('view'); + Route::put('{report}', 'ReportController@review')->name('review'); + Route::get('list', 'ReportController@manage')->name('list'); }); - Route::prefix('i18n')->group(function () { - Route::view('', 'admin.i18n'); - Route::get('list', 'TranslationsController@list'); - Route::post('', 'TranslationsController@create'); - Route::put('{line}', 'TranslationsController@update'); - Route::delete('{line}', 'TranslationsController@delete'); + Route::prefix('i18n')->name('i18n.')->group(function () { + Route::view('', 'admin.i18n')->name('view'); + Route::get('list', 'TranslationsController@list')->name('list'); + Route::post('', 'TranslationsController@create')->name('create'); + Route::put('{line}', 'TranslationsController@update')->name('update'); + Route::delete('{line}', 'TranslationsController@delete')->name('delete'); }); - Route::prefix('plugins')->group(function () { - Route::get('data', 'PluginController@getPluginData'); + Route::prefix('plugins')->name('plugins.')->group(function () { + Route::get('data', 'PluginController@getPluginData')->name('data'); - Route::view('manage', 'admin.plugins'); - Route::post('manage', 'PluginController@manage'); - Route::any('config/{name}', 'PluginController@config'); - Route::get('readme/{name}', 'PluginController@readme'); + Route::view('manage', 'admin.plugins')->name('view'); + Route::post('manage', 'PluginController@manage')->name('view'); + Route::any('config/{name}', 'PluginController@config')->name('config'); + Route::get('readme/{name}', 'PluginController@readme')->name('readme'); Route::middleware('role:super-admin')->group(function () { - Route::post('upload', 'PluginController@upload'); - Route::post('wget', 'PluginController@wget'); + Route::post('upload', 'PluginController@upload')->name('upload'); + Route::post('wget', 'PluginController@wget')->name('wget'); }); - Route::prefix('market')->group(function () { - Route::view('', 'admin.market'); - Route::get('list', 'MarketController@marketData'); - Route::post('download', 'MarketController@download'); + Route::prefix('market')->name('market.')->group(function () { + Route::view('', 'admin.market')->name('view'); + Route::get('list', 'MarketController@marketData')->name('list'); + Route::post('download', 'MarketController@download')->name('download'); }); }); - Route::prefix('update')->middleware('role:super-admin')->group(function () { - Route::get('', 'UpdateController@showUpdatePage'); - Route::post('download', 'UpdateController@download'); + Route::prefix('update')->name('update.')->middleware('role:super-admin')->group(function () { + Route::get('', 'UpdateController@showUpdatePage')->name('view'); + Route::post('download', 'UpdateController@download')->name('download'); }); }); -Route::prefix('setup')->group(function () { +Route::prefix('setup')->name('setup.')->group(function () { Route::middleware('setup')->group(function () { - Route::view('', 'setup.wizard.welcome'); - Route::any('database', 'SetupController@database'); - Route::view('info', 'setup.wizard.info'); - Route::post('finish', 'SetupController@finish'); + Route::view('', 'setup.wizard.welcome')->name('view'); + Route::any('database', 'SetupController@database')->name('database'); + Route::view('info', 'setup.wizard.info')->name('info'); + Route::post('finish', 'SetupController@finish')->name('finish'); }); });