Edit personal information (#527)

* Adding function to UserController, and modifie personalinformationblade

* #365 Edit all user attributs

* #365

* Update personal-information.blade.php

* deleted unnecessary files

* fixed package-lock.json

* merged the functions

* address properties

* sync package-lock with uran-2.x

* fixed the tests

* fix formatting

* fix formatting

Co-authored-by: Katkó Dominik <[email protected]>
Co-authored-by: vagrant <vagrant@homestead>
Co-authored-by: Katkó Dominik <[email protected]>

Author: 3 people

app/Http/Controllers/Secretariat/UserController.php

@@ -31,45 +31,38 @@ public function __construct()
         $this->middleware('auth');
     }
 
-    public function updateEmail(Request $request)
+    public function update(Request $request)
     {
         $user = Auth::user();
 
         $validator = Validator::make($request->all(), [
-            'email' => 'required|email|max:225|unique:users',
+            //only one should exist at a time
+            'email' => 'email|max:225|unique:users',
+            'phone_number' => 'string|min:16|max:18',
+            'mothers_name' => 'string|max:225',
+            'place_of_birth' => 'string|max:225',
+            'date_of_birth' => 'string|max:225',
+            'country' => 'string|max:255',
+            'county' => 'string|max:255',
+            'zip_code' => 'string|max:31',
+            'city' => 'string|max:255',
+            'street_and_number' => 'string|max:255',
         ]);
 
         if ($validator->fails()) {
             return redirect()->back()
                 ->withErrors($validator)
                 ->withInput();
         }
-        $user->update([
-            'email' => $request->email,
-        ]);
-
-        return redirect()->back()->with('message', __('general.successful_modification'));
-    }
-
-    public function updatePhone(Request $request)
-    {
-        $user = Auth::user();
-
-        if ($user->hasPersonalInformation()) {
-            $validator = Validator::make($request->all(), [
-                'phone_number' => 'required|string|min:16|max:18',
-            ]);
-
-            if ($validator->fails()) {
-                return redirect()->back()
-                    ->withErrors($validator)
-                    ->withInput();
-            }
-
-            $user->personalInformation->update([
-                'phone_number' => $request->phone_number,
-            ]);
+        if ($request->has('email')) {
+            $user->update(['email' => $request->email]);
+        }
+        if ($user->hasPersonalInformation() && $request->hasAny(
+            ['place_of_birth', 'date_of_birth', 'mothers_name', 'phone_number', 'country', 'county', 'zip_code', 'city', 'street_and_number']
+        )) {
+            $user->personalInformation->update($request->all());
         }
+        //TODO: educational information
 
         return redirect()->back()->with('message', __('general.successful_modification'));
     }

resources/views/auth/user.blade.php

@@ -20,7 +20,7 @@
             </div>
         </div>
         {{-- Personal information --}}
-        @include('user.personal-information', ['user' => $user, 'modifiable_email' => true, 'modifiable_phone' => true])
+        @include('user.personal-information', ['user' => $user, 'modifiable' => true])
         {{-- Educational information --}}
         @include('user.educational-information', ['user' => $user])
 
@@ -63,4 +63,4 @@ class="validate @error('new_password') invalid @enderror">
         </div>
     </div>
 </div>
-@endsection
+@endsection