users fixup when update user, some UI improvements

modulr · Oct 23, 2018 · f094c27 · f094c27
1 parent 9b77904
commit f094c27
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 13 deletions.
diff --git a/app/Http/Controllers/Users/UserController.php b/app/Http/Controllers/Users/UserController.php
@@ -58,18 +58,24 @@ public function update (Request $request)
         $this->validate($request, [
             'name' => 'required|string',
             'email' => 'required|email|unique:users,email,'.$request->id,
-            'password' => 'string'
+            'password' => 'string|nullable'
         ]);
 
         $user = User::find($request->id);
 
-        $user->name = $request->name;
-        $user->email = $request->email;
-        $user->password = Hash::make($request->password);
-        $user->save();
+        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);
+        }
 
-        $avatar = Avatar::create($user->name)->getImageObject()->encode('png');
-        Storage::put('avatars/'.$user->id.'/avatar.png', (string) $avatar);
+        $user->save();
 
         return $user;
     }

diff --git a/resources/js/components/user/Create.vue b/resources/js/components/user/Create.vue
@@ -2,9 +2,6 @@
   <div class="card">
     <div class="card-header">
       <i class="fas fa-plus"></i> New User
-      <button class="btn btn-primary float-right" type="button" :disabled="submiting" @click="create" >
-        <i class="fas fa-spinner fa-spin" v-if="submiting"></i> Save
-      </button>
     </div>
     <div class="card-body">
       <form class="form-horizontal">
@@ -31,6 +28,15 @@
         </div>
       </form>
     </div>
+    <div class="card-footer">
+      <div class="form-group row">
+        <div class="col-md-9 offset-md-3">
+          <button class="btn btn-primary float-right" type="button" :disabled="submiting" @click="create" >
+            <i class="fas fa-spinner fa-spin" v-if="submiting"></i> Save
+          </button>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 

diff --git a/resources/js/components/user/Edit.vue b/resources/js/components/user/Edit.vue
@@ -2,9 +2,6 @@
   <div class="card">
     <div class="card-header">
       <i class="fas fa-pencil-alt"></i> Edit User
-      <button class="btn btn-primary float-right" type="button" :disabled="submiting" @click="update" >
-        <i class="fas fa-spinner fa-spin" v-if="submiting"></i> Save
-      </button>
     </div>
     <div class="card-body">
       <form class="form-horizontal">
@@ -51,6 +48,15 @@
         </div>
       </form>
     </div>
+    <div class="card-footer">
+      <div class="form-group row">
+        <div class="col-md-9 offset-md-3">
+          <button class="btn btn-primary float-right" type="button" :disabled="submiting" @click="update" >
+            <i class="fas fa-spinner fa-spin" v-if="submiting"></i> Save
+          </button>
+        </div>
+      </div>
+    </div>
   </div>
 </template>