Merge branch 'users'

app/Http/Controllers/Profile/ProfileController.php

@@ -43,9 +43,9 @@ public function updateAuthUser (Request $request)
     public function updatePasswordAuthUser(Request $request)
     {
         $this->validate($request, [
-            'current' => 'required',
-            'password' => 'required|confirmed',
-            'password_confirmation' => 'required'
+            'current' => 'required|string',
+            'password' => 'required|string|confirmed',
+            'password_confirmation' => 'required|string'
         ]);
 
         $user = User::find(Auth::id());

app/Http/Controllers/Users/UserController.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Http\Controllers\Users;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Storage;
+
+use Avatar;
+
+use App\User;
+
+class UserController extends Controller
+{
+    public function filter (Request $request)
+    {
+        $query = User::query();
+
+        if($request->search) {
+            $query->where('name', 'LIKE', '%'.$request->search.'%');
+        }
+
+        $users = $query->orderBy($request->column, $request->direction)
+                    ->paginate($request->perPage);
+
+        return $users;
+    }
+
+    public function show ($user)
+    {
+        return User::findOrFail($user);
+    }
+
+    public function store (Request $request)
+    {
+        $this->validate($request, [
+            'name' => 'required|string',
+            'email' => 'required|email|unique:users',
+            'password' => 'required|string'
+        ]);
+
+        $user = User::create([
+            'name' => $request->name,
+            'email' => $request->email,
+            'password' => Hash::make($request->password)
+        ]);
+
+        $avatar = Avatar::create($user->name)->getImageObject()->encode('png');
+        Storage::put('avatars/'.$user->id.'/avatar.png', (string) $avatar);
+
+        return $user;
+    }
+
+    public function update (Request $request)
+    {
+        $this->validate($request, [
+            'name' => 'required|string',
+            'email' => 'required|email|unique:users,email,'.$request->id,
+            'password' => 'string|nullable'
+        ]);
+
+        $user = User::find($request->id);
+
+        if ($user->name != $request->name) {
+            $avatar = Avatar::create($request->name)->getImageObject()->encode('png');
+            Storage::put('avatars/'.$user->id.'/avatar.png', (string) $avatar);
+            $user->name = $request->name;
+        }
+        if ($user->email != $request->email) {
+            $user->email = $request->email;
+        }
+        if ($request->password != '') {
+            $user->password = Hash::make($request->password);
+        }
+
+        $user->save();
+
+        return $user;
+    }
+
+    public function destroy ($user)
+    {
+        return User::destroy($user);
+    }
+}

app/User.php

@@ -5,12 +5,14 @@
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 use Storage;
 
 class User extends Authenticatable
 {
     use Notifiable;
+    use SoftDeletes;
 
     /**
      * The attributes that are mass assignable.
@@ -30,6 +32,8 @@ class User extends Authenticatable
         'password', 'remember_token',
     ];
 
+    protected $dates = ['deleted_at'];
+
     protected $appends = ['avatar_url'];
 
     public function getAvatarUrlAttribute()

database/migrations/2014_10_12_000000_create_users_table.php

@@ -22,6 +22,7 @@ public function up()
             $table->string('avatar')->default('avatar.png');
             $table->rememberToken();
             $table->timestamps();
+            $table->softDeletes();
         });
     }
 

package.json

@@ -27,6 +27,8 @@
         "perfect-scrollbar": "^1.4.0",
         "simple-line-icons": "^2.4.1",
         "vue-clip": "^1.0.0",
+        "vue-moment": "^4.0.0",
+        "vue-multiselect": "^2.1.0",
         "vue-toasted": "^1.1.24"
     }
 }