Merge branch 'user_management' into authentication

app/Http/Controllers/Admin/AuthController.php

@@ -1,72 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use App\User;
-use Validator;
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\ThrottlesLogins;
-use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
-
-class AuthController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Registration & Login Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles the registration of new users, as well as the
-    | authentication of existing users. By default, this controller uses
-    | a simple trait to add these behaviors. Why don't you explore it?
-    |
-    */
-
-    use AuthenticatesAndRegistersUsers, ThrottlesLogins;
-
-    /**
-     * Where to redirect users after login / registration.
-     *
-     * @var string
-     */
-    protected $redirectTo = '/';
-
-    /**
-     * Create a new authentication controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest', ['except' => 'logout']);
-    }
-
-    /**
-     * Get a validator for an incoming registration request.
-     *
-     * @param  array  $data
-     * @return \Illuminate\Contracts\Validation\Validator
-     */
-    protected function validator(array $data)
-    {
-        return Validator::make($data, [
-            'name' => 'required|max:255',
-            'email' => 'required|email|max:255|unique:users',
-            'password' => 'required|confirmed|min:6',
-        ]);
-    }
-
-    /**
-     * Create a new user instance after a valid registration.
-     *
-     * @param  array  $data
-     * @return User
-     */
-    protected function create(array $data)
-    {
-        return User::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => bcrypt($data['password']),
-        ]);
-    }
-}

app/Http/Controllers/Admin/Controller.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller as BaseController;
+use App\Http\Requests;
+
+abstract class Controller extends BaseController
+{
+    /**
+     * Controller constructor.
+     */
+    public function __construct()
+    {
+
+    }
+}

app/Http/Controllers/Admin/Dashboard.php

@@ -3,11 +3,11 @@
 namespace App\Http\Controllers\Admin;
 
 use Illuminate\Http\Request;
-
 use App\Http\Requests;
-use App\Http\Controllers\Controller;
 
 class Dashboard extends Controller
 {
-    //
+    public function getIndex() {
+        return view('admin.dashboard');
+    }
 }

app/Http/Controllers/Admin/PasswordController.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\ResetsPasswords;
-
-class PasswordController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset requests
-    | and uses a simple trait to include this behavior. You're free to
-    | explore this trait and override any methods you wish to tweak.
-    |
-    */
-
-    use ResetsPasswords;
-
-    /**
-     * Create a new password controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
-}

app/Http/Controllers/Admin/UserManagement.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Http\Requests\CreateNewUserRequest;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
+
+class UserManagement extends Controller
+{
+    public function getNewUser()
+    {
+        // define list of roles, this list will be used in template for selecting proper role for user
+        $roles = [
+            User::ROLE_ADMIN   => 'admin/userManagement.role_' . User::ROLE_ADMIN,
+            User::ROLE_EDITOR  => 'admin/userManagement.role_' . User::ROLE_EDITOR,
+            User::ROLE_VISITOR => 'admin/userManagement.role_' . User::ROLE_VISITOR
+        ];
+
+        // render view
+        return $this->view('admin.userManagement.new', ['roles' => $roles]);
+    }
+
+    public function getEditExistingUser($id)
+    {
+        // try to find user
+        $user = User::findOrFail($id);
+
+        // render view
+        return $this->view('admin.userManagement.edit', ['user' => $user]);
+    }
+
+    public function getOverview($state = null)
+    {
+        echo $state;
+    }
+
+    /**
+     * Create new user
+     *
+     * This method saves new user into database
+     *
+     * @param CreateNewUserRequest $request
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    protected function postRegistration(CreateNewUserRequest $request)
+    {
+        // when user did not provide any username, use his email
+        $username = isset($request->username) && !empty($request->username) ? $request->username : $request->email;
+
+        // create new user
+        $user = new User();
+        $user->name = $request->name;
+        $user->email = $request->email;
+        $user->username = $username;
+        $user->role = $request->role;
+        $user->password = Hash::make($request->password);
+
+        // store user into database
+        $user->save();
+
+        // refresh page with information about successfull registration
+        return redirect()
+            ->route('users.new')
+            ->with('message', trans('admin/userManagement.registrationSuccessfull'));
+    }
+}