Merge branch 'user_management' into dev

app/Http/routes.php

@@ -25,12 +25,37 @@
 Route::group(['middleware' => ['web']], function () {
 
     // display login form
+<<<<<<< HEAD
     Route::get('login', 'Admin\Login@getLoginForm')
          ->name('loginForm');
 
     // ---------------------------------------------------------------
     // @todo move to admin group (protect it)
 
+    // display form for creating new user
+    Route::get('admin/users/new', 'Admin\UserManagement@getNewUser')
+         ->name('users.new');
+
+    // display form for edit of existing user
+    Route::get('admin/users/edit/{id}', 'Admin\UserManagement@getEditExistingUser')
+         ->name('users.edit');
+
+    // display user detail in admin
+    Route::get('admin/users/{id}', 'Admin\UserManagement@getDetail')
+         ->name('users.detail');
+
+    // display list of all users registered into our system
+    Route::get('admin/users/overview/{state?}', 'Admin\UsersManagement@getOverview')
+         ->name('users.overview');
+=======
+    Route::get('login', function () {
+        return view('admin.loginForm.form');
+    });
+>>>>>>> user_management
+
+    // ---------------------------------------------------------------
+    // @todo move to admin group (protect it)
+
     // display form for creating new user
     Route::get('admin/users/new', 'Admin\UserManagement@getNewUser')
          ->name('users.new');
@@ -48,7 +73,22 @@ Route::group(['middleware' => ['web']], function () {
          ->name('users.overview');
 
     // POST methods
+<<<<<<< HEAD
     Route::post('login', 'Admin\Login@postLogin')
+=======
+    // ------------------------------------------
+
+    // create new user
+    Route::post('admin/users/new', 'Admin\UserManagement@postRegistration')
+         ->name('admin.users.registration');
+
+    // edit existing user
+    Route::post('admin/users/new', 'Admin\UserManagement@postRegistration')
+         ->name('admin.users.edit');
+
+    // handle login
+    Route::post('admin/login', 'Admin\Login@postLogin')
+>>>>>>> user_management
          ->name('login');
 });