Merge branch 'faiqahzaman'

app/Http/Controllers/AuthMobile/AuthController.php

@@ -8,6 +8,7 @@ use App\Models\File;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Carbon\Carbon;
+use Auth;
 use Illuminate\Support\Facades\Validator;
 
 class AuthController extends Controller
@@ -20,6 +21,7 @@ class AuthController extends Controller
             'password' => 'required|string|min:8',
             'notelbimbit' => 'required|string|unique:users',
             'register_agree' => 'required|integer'
+            
         ]);
         
         
@@ -59,7 +61,10 @@ class AuthController extends Controller
                 $file->file_type = $img['file_type'];
                 $file->filename = $img['filename'];
                 $file->save();
+
             }
+
+            
         }
         
         $token = $user->createToken('myapptoken')->plainTextToken;

app/Http/Controllers/AuthMobile/LelongController.php

@@ -13,6 +13,5 @@ class LelongController extends Controller
                     ->where('t_lelong','=',$t_lelong)
                     ->first();
 
-        
     }
 }

app/Http/Controllers/AuthMobile/UserController.php

@@ -3,18 +3,52 @@
 namespace App\Http\Controllers\AuthMobile;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Http\Request;
 use App\Models\User;
+use DB;
+use Carbon\Carbon;
 
 class UserController extends Controller
 {
     public function getProfileUser(Request $request){
 
-        $getUserNokp = Users::on('mysql7')
-        ->where('nokp','=',$nokp)
-        ->first();
+        $getUserNokp = User::where('nokp', $request->nokp)
+        ->join('file', function ($join) {
+            $join->on('users.id', '=', 'file.user_id');
+        })
+        ->get();
 
-        $users = DB::select('select * from users');
-        return view('User Profile',['users'=>$users]);
+        // $user = User::all();
+
+        return response()->json($getUserNokp);
     }
+
+    public function updateProfileUser(Request $request){
+
+        $validator = Validator::make($request->all(), [
+            'nokp' => 'required'
+        ]);
+
+        if ($validator->fails()) {
+            return response($validator->errors(), 201);
+        }
+
+        $currentdate = Carbon::now();
+        $currentdate = $currentdate->toDateString();
+
+        $user_update = User::where('nokp','=',$request->nokp)
+        ->update([
+            'bank_acc_pembeli' => $request->bank_acc_pembeli,
+            'bank_acc_no_pembeli' => $request->bank_acc_no_pembeli,
+            'alamat' => $request->alamat,
+            'notelbimbit' => $request->notelbimbit,
+            'notelpejabat' => $request->notelpejabat,
+            'email' => $request->email,
+            'updated_at' => $currentdate
+        ]);
+
+        return response()->json($user_update);
+    }
+    
 }

routes/api.php

@@ -5,6 +5,7 @@ use Illuminate\Support\Facades\Route;
 use App\Http\Controllers\AuthMobile\AuthController;
 use App\Http\Controllers\AuthMobile\UserController;
 use App\Http\Controllers\CartController;
+use App\Http\Controllers\AuthMobile\LelongController;
 
 /*
 |--------------------------------------------------------------------------
@@ -33,38 +34,13 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
     
     Route::post('/updateItem', [CartController::class, 'updateItem']);
     Route::get('/deleteItem/{id}', [CartController::class, 'deleteCart']);
+    Route::post('/forgotPassword', [NewPasswordController::class, 'forgotPassword']);
+    Route::post('/resetPassword', [NewPasswordController::class, 'reset']);
+    Route::get('/user/profile', [UserController::class, 'getProfileUser']);
+    Route::put('/userUpdate/profile', [UserController::class, 'updateProfileUser']);
+    Route::put('/lelong', [LelongController::class, 'listLelongDetails']);
 });
 
-// Route::post('/login', function (Request $request) {
-//     $request->validate([
-//         'username' => 'required|string',
-//         'password' => 'required|string',
-//     ]);
-
-//     $credentials = $request->only('username', 'password');
-    
-    
-//     if (Auth::guard('api')->attempt($credentials,true)) {
-//         $auth_user = Auth::guard('api')->user();
-
-//         // dd($auth_user);
-//         $user_login['name'] = $auth_user['name'];
-//         $user_login['username'] = $auth_user['username'];
-//         $user_login['password'] = $auth_user['password'];
-//         $user_login['icno'] = $auth_user['nokp'];
-//         $user_login['apitoken'] = $auth_user['remember_token'];
-//         return response()->json([
-//             'success' => true,
-//             'user' => $user_login
-//         ]);
-//     } else {
-//    //if authentication is unsuccessfull, notice how I return json parameters
-//         return response()->json([
-//             'success' => false,
-//             'message' => 'Invalid Email or Password',
-//         ], 401);
-//     }
-// });
 
 Route::get('/item','ApiController@biditem'); 
 Route::get('/jeniskarat','ApiController@karat');