DONE: fix conflict on authcontroller

app/Http/Controllers/AuthMobile/AuthController.php

@@ -14,12 +14,6 @@ use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
-<<<<<<< HEAD
-use Illuminate\Support\Facades\Mail;
-use App\Mail\ResetPassword;
-use App\Mail\VerifyEmail;
-=======
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
 
 class AuthController extends Controller
 {
@@ -65,11 +59,6 @@ class AuthController extends Controller
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
         $verificationToken = Str::random(60);
-<<<<<<< HEAD
-        
-=======
-
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
         $user = new User;
         $user->name = $fields['name'];
         $user->username = $fields['username'];
@@ -87,11 +76,7 @@ class AuthController extends Controller
         $user->email_verified_at = null;
         $user->save();
 
-<<<<<<< HEAD
         $verifyUrl = url('/api/verifyEmail').'?'.http_build_query([
-=======
-        $verifyUrl = url('/api/verifyEmail').'?'.http_build_query([
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
             'email' => $user->email,
             'token' => $verificationToken,
         ]);
@@ -117,11 +102,7 @@ class AuthController extends Controller
         ]);
 
         if ($validator->fails()) {
-<<<<<<< HEAD
             return redirect()->away($redirectBase.'?email_verified=0&message='.urlencode('Pautan pengesahan tidak sah.'));
-=======
-            return redirect()->away($redirectBase.'?email_verified=0&message='.urlencode('Pautan pengesahan tidak sah.'));
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
         }
 
         $user = User::where('email', $request->email)
@@ -129,13 +110,8 @@ class AuthController extends Controller
             ->where('is_verified', 0)
             ->first();
 
-<<<<<<< HEAD
         if (! $user) {
             return redirect()->away($redirectBase.'?email_verified=0&message='.urlencode('Pautan pengesahan tidak sah atau emel telah disahkan.'));
-=======
-        if (! $user) {
-            return redirect()->away($redirectBase.'?email_verified=0&message='.urlencode('Pautan pengesahan tidak sah atau emel telah disahkan.'));
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
         }
 
         $user->is_verified = 1;
@@ -174,11 +150,7 @@ class AuthController extends Controller
                             'statusAkaun' => 7,
                             'message' => 'Sila sahkan emel anda sebelum log masuk. Semak peti masuk anda untuk pautan pengesahan.',
                         ]);
-<<<<<<< HEAD
                     } elseif ($user->status == 'active') {
-=======
-                    } elseif ($user->status == 'active') {
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
                         $user->tokens()->delete();
                         $token = $user->createToken('myapptoken')->plainTextToken;
 
@@ -245,11 +217,7 @@ class AuthController extends Controller
         $user['is_verified'] = 0;
         $user->save();
 
-<<<<<<< HEAD
         $resetUrl = rtrim(config('app.app_pembida'), '/').'/reset-password/'.$token;
-=======
-        $resetUrl = rtrim(config('app.app_pembida'), '/').'/reset-password/'.$token;
->>>>>>> e29a5891c8ed9b8bdaf3fa1af5d422cd2edb6a75
 
         Mail::to($request->email)->send(new ResetPassword($user->name, $resetUrl));
 
@@ -320,59 +288,6 @@ class AuthController extends Controller
         ]);
     }
 
-    public function validateResetToken($token)
-    {
-        $user = User::where('token', $token)->where('is_verified', 0)->first();
-
-        if (!$user) {
-            return response()->json([
-                'success' => false,
-                'message' => 'Pautan tetapan semula kata laluan tidak sah atau telah tamat tempoh.',
-            ], 422);
-        }
-
-        return response()->json([
-            'success' => true,
-            'email' => $user->email,
-        ]);
-    }
-
-    public function updatePassword(Request $request)
-    {
-        $validator = Validator::make($request->all(), [
-            'token' => 'required|string',
-            'password' => 'required|string|min:6',
-            'confirm_password' => 'required|same:password',
-        ]);
-
-        if ($validator->fails()) {
-            return response()->json([
-                'success' => false,
-                'message' => $validator->errors()->first(),
-                'errors' => $validator->errors(),
-            ], 422);
-        }
-
-        $user = User::where('token', $request->token)->where('is_verified', 0)->first();
-
-        if (!$user) {
-            return response()->json([
-                'success' => false,
-                'message' => 'Pautan tetapan semula kata laluan tidak sah atau telah tamat tempoh.',
-            ], 422);
-        }
-
-        $user->password = Hash::make($request->password);
-        $user->token = null;
-        $user->is_verified = 0;
-        $user->save();
-
-        return response()->json([
-            'success' => true,
-            'message' => 'Katalaluan anda telah berjaya dikemaskini.',
-        ]);
-    }
-
     public function getProfile()
     {
         $user = Auth::user();