From b2a6f9e0e9084384faf89ad0752514c688abec3e Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Mon, 17 Jan 2022 13:08:18 +0800 Subject: [PATCH 1/4] fix register --- .../Controllers/AuthMobile/AuthController.php | 115 +++++++++--------- 1 file changed, 57 insertions(+), 58 deletions(-) diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php index bdbefc96..46f433a2 100644 --- a/app/Http/Controllers/AuthMobile/AuthController.php +++ b/app/Http/Controllers/AuthMobile/AuthController.php @@ -9,6 +9,7 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\Hash; use Carbon\Carbon; +use Auth; class AuthController extends Controller { @@ -21,56 +22,23 @@ class AuthController extends Controller 'password' => 'required|string|confirmed', 'notelbimbit' => 'required|string', 'register_agree' => 'required|integer', - // 'email' => 'required|string|unique:users,email', - // 'front_img' => 'required|mimes:jpg,png,jpeg|max:5048', - // 'back_img' => 'required|mimes:jpg,png,jpeg|max:5048' ]); - - // if(isset($name) && isset($username) && isset($nokp) && isset($password) && isset($notelbimbit) && isset($register_agree) ){ - - - foreach($images as $image){ - - $file = new File(); - $file->user_id = $request->input('user_id'); - $file->file_type = $request->input('file_type'); - $file->filename = $request->input('filename'); - // $image->front_img_filename = $request->input('front_img_filename'); - // $image->back_img_filename = $request->input('back_img_filename'); + $user = new User(); + $user->name = $request->input('name'); + $user->username = $request->input('username'); + $user->nokp = $request->input('nokp'); + $user->password = $request->input('password'); + $user->notelbimbit = $request->input('notelbimbit'); + $user->register_agree = $request->input('register_agree'); - // $image = base64_encode(file_get_contents($image)); - - // if(null !== ['front_img'] && null !== ['back_img']){ - - // // foreach() { - // $newFrontImageName = time().'.' . explode('/', explode(':', substr($request->front_img, 0, strpos($request->front_img, ';')))[1])[1]; - // $newBackImageName = time().'.' . explode('/', explode(':', substr($request->back_img, 0, strpos($request->back_img, ';')))[1])[1]; - - // \Image::make($request->front_img)->save(ppublic_path('ic/'.$folder_name).$newFrontImageName); - // \Image::make($request->back_img)->save(ppublic_path('ic/'.$folder_name).$newBackImageName); - - // $userPhoto = public_path('ic/'.$folder_name).$currentPhoto; - // // } - - // // //create a filename - // // $newFrontImageName = 'front-' . $request->nokp . '.' . $request->front_img->extension(); - - // // $newBackImageName = 'back-' . $request->nokp . '.' . $request->back_img->extension(); - - // // //save image in folder ic - // // $folder_name = $request->nokp; - // // $request->front_img->move(public_path('/ic/'.$folder_name), $newFrontImageName); - // // $request->back_img->move(public_path('/ic/'.$folder_name), $newBackImageName); - - // } - } - + if(isset($user['name']) && isset($user['username']) && isset($user['nokp']) && isset($user['password']) && isset($user['notelbimbit']) && isset($user['register_agree']) ){ + $currentdate = Carbon::now(); $currentdate = $currentdate->toDateString(); - $user = new User; + $user = new User(); $user->name = $fields['name']; $user->username = $fields['username']; $user->nokp = $fields['nokp']; @@ -78,24 +46,55 @@ class AuthController extends Controller $user->notelbimbit = $fields['notelbimbit']; $user->register_agree = $fields['register_agree']; $user->t_daftar = $currentdate; - $user->type = 2; //type 2 = pembida - $images = $request->images; - - if($user->save()) - { - foreach($images as $img) - { - $file = new File; - $file->user_id = $user->id; - $file->file_type = $img->file_type; - $file->filename = $img->filename; - $file->save(); - } - } + $user->user_type = 2; //type 2 = pembida - // } + $user->save(); + $images = $request->images; + + foreach($images as $image){ + // dd($user->id); + $file = new File(); + $file->file_type = $image['file_type']; + $file->filename = $image['filename']; + $file->user_id = $user['id']; + $file->save(); + + // File::create([ + // 'file_type '=> $image['file_type'], + // 'filename' => $image['filename'], + // 'user_id '=> $user->id + // ]); + + } + + // $getUserId = User::on('mysql') + // ->where('id','=', $user->id) + // ->first(); + + // // dd($getUserId); + + // if($user->id == $getUserId) + // { + // // $user = User::find(auth()->id()); + + // $images = $request->images; + // $images = new File(); + + // foreach($images as $img) + // { + // $file = new File; + // $file->user_id = $user->id; + // $file->file_type = $img->file_type; + // $file->filename = $img->filename; + // $file->save(); + // } + // } + + } + + // $user = Auth::user(); $token = $user->createToken('myapptoken')->plainTextToken; $response = [ From b35c79f5ee0bfcf33f250e098b06445556bdde97 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Mon, 17 Jan 2022 14:27:07 +0800 Subject: [PATCH 2/4] getUserProfile display --- app/Http/Controllers/AuthMobile/UserController.php | 14 +++++++++----- routes/api.php | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/AuthMobile/UserController.php b/app/Http/Controllers/AuthMobile/UserController.php index d91e4bbf..f06a0778 100644 --- a/app/Http/Controllers/AuthMobile/UserController.php +++ b/app/Http/Controllers/AuthMobile/UserController.php @@ -5,16 +5,20 @@ namespace App\Http\Controllers\AuthMobile; use App\Http\Controllers\Controller; use Illuminate\Http\Request; use App\Models\User; +use DB; 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); } } diff --git a/routes/api.php b/routes/api.php index 06b87474..b54d5a4e 100644 --- a/routes/api.php +++ b/routes/api.php @@ -25,7 +25,7 @@ Route::post('/forgotpassword', [ResetPassword::class, 'forgotpassword']); Route::group(['middleware' => ['auth:sanctum']], function () { Route::post('/logout', [AuthController::class, 'logout']); - Route::get('/user/profile/{nokp}', [UserController::class, 'getProfileUser']); + Route::get('/user/profile', [UserController::class, 'getProfileUser']); }); // Route::post('/login', function (Request $request) { From e9f27aa4f574a397f0a6c7286b04f0a94f583bd2 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Mon, 17 Jan 2022 16:32:13 +0800 Subject: [PATCH 3/4] userUpdateProfile --- .../Controllers/AuthMobile/UserController.php | 30 +++++++++++++++++++ routes/api.php | 1 + 2 files changed, 31 insertions(+) diff --git a/app/Http/Controllers/AuthMobile/UserController.php b/app/Http/Controllers/AuthMobile/UserController.php index f06a0778..11fd6ed2 100644 --- a/app/Http/Controllers/AuthMobile/UserController.php +++ b/app/Http/Controllers/AuthMobile/UserController.php @@ -3,9 +3,11 @@ 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 { @@ -21,4 +23,32 @@ class UserController extends Controller 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); + } + } diff --git a/routes/api.php b/routes/api.php index b54d5a4e..158a121e 100644 --- a/routes/api.php +++ b/routes/api.php @@ -26,6 +26,7 @@ Route::group(['middleware' => ['auth:sanctum']], function () { Route::post('/logout', [AuthController::class, 'logout']); Route::get('/user/profile', [UserController::class, 'getProfileUser']); + Route::put('/userUpdate/profile', [UserController::class, 'updateProfileUser']); }); // Route::post('/login', function (Request $request) { From 25b8725661082847bb0b05cb9b9425f507039a1e Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 19 Jan 2022 15:49:44 +0800 Subject: [PATCH 4/4] list lelong details --- app/Http/Controllers/AuthMobile/LelongController.php | 1 - routes/api.php | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AuthMobile/LelongController.php b/app/Http/Controllers/AuthMobile/LelongController.php index 0e27b68c..2b057812 100644 --- a/app/Http/Controllers/AuthMobile/LelongController.php +++ b/app/Http/Controllers/AuthMobile/LelongController.php @@ -13,6 +13,5 @@ class LelongController extends Controller ->where('t_lelong','=',$t_lelong) ->first(); - } } diff --git a/routes/api.php b/routes/api.php index 158a121e..51d182a4 100644 --- a/routes/api.php +++ b/routes/api.php @@ -4,6 +4,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; use App\Http\Controllers\AuthMobile\AuthController; use App\Http\Controllers\AuthMobile\UserController; +use App\Http\Controllers\AuthMobile\LelongController; /* |-------------------------------------------------------------------------- @@ -25,8 +26,11 @@ Route::post('/forgotpassword', [ResetPassword::class, 'forgotpassword']); Route::group(['middleware' => ['auth:sanctum']], function () { Route::post('/logout', [AuthController::class, 'logout']); + 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) {