diff --git a/app/Http/Controllers/Admin/Dashboard.php b/app/Http/Controllers/Admin/Dashboard.php index aa6bd5a2..658158d1 100644 --- a/app/Http/Controllers/Admin/Dashboard.php +++ b/app/Http/Controllers/Admin/Dashboard.php @@ -7,14 +7,6 @@ use App\Http\Requests; class Dashboard extends Controller { - /** - * Dashboard constructor. - */ - public function __construct() - { - parent::__construct(); - } - public function getIndex() { return view('admin.dashboard'); } diff --git a/app/Http/routes.php b/app/Http/routes.php index 8157fa26..e0455cf6 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -1,63 +1,50 @@ ['web']], function () { // display login form Route::get('login', 'Admin\Login@getLoginForm') ->name('loginForm'); - // --------------------------------------------------------------- - // @todo move to admin group (protect it) + // handle login + Route::post('admin/login', 'Admin\Login@postLogin') + ->name('login'); +}); + +/*******************************************************************************/ + +/** + * This route group serves to handle request in admin + */ +Route::group([ + 'middleware' => ['auth'], + 'namespace' => 'Admin', + 'prefix' => 'admin' + ], function () { + + // display dashboard with some usefull information + Route::get('/', 'Dashboard@getIndex'); // display form for creating new user - Route::get('admin/users/new', 'Admin\UserManagement@getNewUser') + Route::get('admin/users/new', 'UserManagement@getNewUser') ->name('users.new'); // display form for edit of existing user - Route::get('admin/users/edit/{id}', 'Admin\UserManagement@getEditExistingUser') + Route::get('admin/users/edit/{id}', 'UserManagement@getEditExistingUser') ->name('users.edit'); // display user detail in admin - Route::get('admin/users/{id}', 'Admin\UserManagement@getDetail') + Route::get('admin/users/{id}', 'UserManagement@getDetail') ->name('users.detail'); // display list of all users registered into our system - Route::get('admin/users/overview/{state?}', 'Admin\UsersManagement@getOverview') + Route::get('admin/users/overview/{state?}', 'UserManagement@getOverview') ->name('users.overview'); // POST methods Route::post('login', 'Admin\Login@postLogin') ->name('login'); }); - -// list of admin routes -Route::group([ - 'middleware' => ['auth'], - 'namespace' => 'Admin', - 'prefix' => 'admin' - ], function () { - Route::get('/', 'Dashboard@getIndex') - ->name('admin.dashboard'); -}); diff --git a/app/Models/User.php b/app/Models/User.php index b336ac21..9a34c241 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -55,4 +55,4 @@ class User extends Model implements AuthenticableInterface throw new ValidationException(Validator::class, 'Invalid request'); } } -} \ No newline at end of file +} diff --git a/app/Providers/AdminProvider.php b/app/Providers/AdminProvider.php index 1e3e0373..4095bcfb 100644 --- a/app/Providers/AdminProvider.php +++ b/app/Providers/AdminProvider.php @@ -28,7 +28,7 @@ class AdminProvider extends ServiceProvider $menu->url(action('Admin\Dashboard@getIndex'), trans('admin/mainMenu.dashboard'), 1, ['icon' => 'fa fa-dashboard']); $menu->dropdown(trans('admin/mainMenu.userManagement'), function($sub) { $sub->url(action('Admin\UserManagement@getNewUser'), trans('admin/mainMenu.newUser'), 1, ['icon' => 'fa fa-user-plus']); - $sub->url(action('Admin\UsersManagement@getOverview', ['state' => 'all']), trans('admin/mainMenu.usersOverview'), 2, ['icon' => 'fa fa-users']); + $sub->url(action('Admin\UserManagement@getOverview', ['state' => 'all']), trans('admin/mainMenu.usersOverview'), 2, ['icon' => 'fa fa-users']); }, ['icon' => 'fa fa-users']); }); diff --git a/database/schema.sql b/database/schema.sql index 7067fead..d8fefd9e 100644 --- a/database/schema.sql +++ b/database/schema.sql @@ -1,5 +1,5 @@ -- MySQL Script generated by MySQL Workbench --- Čt 21. leden 2016, 00:19:53 CET +-- Čt 21. leden 2016, 01:17:14 CET -- Model: New Model Version: 1.0 -- MySQL Workbench Forward Engineering