From 1f6ef5f11007fb7e2e6a3ef6aeebc5978071cce9 Mon Sep 17 00:00:00 2001
From: arifal <arifalhidayat10@gmail.com>
Date: Thu, 30 Jan 2025 12:10:42 +0700
Subject: [PATCH] fix service simbg login token and fix create new users

---
 .../Auth/RegisteredUserController.php         |  2 +-
 .../Controllers/Master/UsersController.php    |  6 +--
 app/ServiceSIMBG.php                          | 10 ++++-
 resources/views/auth/signup.blade.php         | 41 ++++++++++++++-----
 resources/views/master/users/create.blade.php | 11 +++--
 resources/views/master/users/index.blade.php  |  2 +-
 routes/web.php                                |  2 +
 7 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php
index 6d9b4cf..c9fd3fd 100755
--- a/app/Http/Controllers/Auth/RegisteredUserController.php
+++ b/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -20,7 +20,7 @@ class RegisteredUserController extends Controller
      */
     public function create()
     {
-        return view('auth.register');
+        return view('auth.signup');
     }
 
     /**
diff --git a/app/Http/Controllers/Master/UsersController.php b/app/Http/Controllers/Master/UsersController.php
index 166fe49..1f72c10 100644
--- a/app/Http/Controllers/Master/UsersController.php
+++ b/app/Http/Controllers/Master/UsersController.php
@@ -28,13 +28,13 @@ class UsersController extends Controller
         $request->validate([
             'name' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
-            'password' => ['required', 'confirmed', Rules\Password::defaults()],
+            'password' => ['required', 'confirmed', 'max:255'],
             'firstname' => ['required', 'string', 'max:255'],
             'lastname' => ['required', 'string', 'max:255'],
             'position' => ['required', 'string', 'max:255']
         ]);
 
-        dd($request);
+        // dd($request);
 
         $user = User::create([
             'name' => $request->name,
@@ -45,7 +45,7 @@ class UsersController extends Controller
             'position' => $request->position
         ]);
 
-        return redirect()->route('master.users')->with('success','Successfully registered');
+        return redirect()->route('users.index')->with('success','Successfully registered');
     }
     public function show($id){
         $user = User::find($id);
diff --git a/app/ServiceSIMBG.php b/app/ServiceSIMBG.php
index 6c2d206..e70e85c 100644
--- a/app/ServiceSIMBG.php
+++ b/app/ServiceSIMBG.php
@@ -118,7 +118,7 @@ class ServiceSIMBG
             'page' => 1,
             'size' => 20,
             'sort' => 'ASC',
-            'type' => 'task',
+            // 'type' => 'task',
         ]);
 
         $url = "/api/pbg/v1/list/?" . $queryParams;
@@ -139,11 +139,16 @@ class ServiceSIMBG
         $failedCount = 0;
 
         for ($currentPage = 1; $currentPage <= $totalPage; $currentPage++) {
+
+            $token = $this->getToken();
+            $simbg_token = $token->original['data']['token']['access'];
+            $headers = ['Authorization' => "Bearer " . $simbg_token];
+
             $queryParams = http_build_query([
                 'page' => $currentPage,
                 'size' => 20,
                 'sort' => 'ASC',
-                'type' => 'task'
+                // 'type' => 'task'
             ]);
 
             $url = "/api/pbg/v1/list/?" . $queryParams;
@@ -190,6 +195,7 @@ class ServiceSIMBG
                     // Synchronize additional details
                     $this->syncIndexIntegration($item['uid']);
                     $this->syncTaskDetailSubmit($item['uid']);
+                    Log::info("executed page: ". $currentPage);
                     $savedCount++;
                 } catch (Exception $e) {
                     $importDatasource->update([
diff --git a/resources/views/auth/signup.blade.php b/resources/views/auth/signup.blade.php
index f668082..e8ae0b7 100755
--- a/resources/views/auth/signup.blade.php
+++ b/resources/views/auth/signup.blade.php
@@ -27,29 +27,50 @@ class="authentication-bg"
                                         </p>
                               </div>
 
-                              <form action="{{ route('', 'index') }}" class="mt-4">
+                              <form action="{{ route('register') }}" class="mt-4" method="POST">
+                                   @csrf
                                    <div class="mb-3">
-                                        <label class="form-label" for="example-name">Name</label>
-                                        <input type="name" id="example-name" name="example-name"
+                                        <label class="form-label" for="name">Name</label>
+                                        <input type="name" id="name" name="name"
                                              class="form-control" placeholder="Enter your name">
                                    </div>
                                    <div class="mb-3">
-                                        <label class="form-label" for="example-email">Email</label>
-                                        <input type="email" id="example-email" name="example-email"
+                                        <label class="form-label" for="email">Email</label>
+                                        <input type="email" id="email" name="email"
                                              class="form-control" placeholder="Enter your email">
                                    </div>
                                    <div class="mb-3">
-                                        <label class="form-label" for="example-password">Password</label>
-                                        <input type="text" id="example-password" class="form-control"
+                                        <label class="form-label" for="password">Password</label>
+                                        <input type="password" id="password" class="form-control" name="password"
                                              placeholder="Enter your password">
                                    </div>
                                    <div class="mb-3">
+                                        <label class="form-label" for="password_confirmation">Password Confirmation</label>
+                                        <input type="password" id="password_confirmation" class="form-control" name="password_confirmation"
+                                             placeholder="Enter your password confirmation">
+                                   </div>
+                                   <div class="mb-3">
+                                        <label class="form-label" for="firstname">Firstname</label>
+                                        <input type="text" id="firstname" class="form-control" name="firstname"
+                                             placeholder="Enter your firstname">
+                                   </div>
+                                   <div class="mb-3">
+                                        <label class="form-label" for="lastname">Lastname</label>
+                                        <input type="text" id="lastname" class="form-control" name="lastname"
+                                             placeholder="Enter your lastname">
+                                   </div>
+                                   <div class="mb-3">
+                                        <label class="form-label" for="position">Position</label>
+                                        <input type="text" id="position" class="form-control" name="position"
+                                             placeholder="Enter your position">
+                                   </div>
+                                   <!-- <div class="mb-3">
                                         <div class="form-check">
                                              <input type="checkbox" class="form-check-input" id="checkbox-signin">
                                              <label class="form-check-label" for="checkbox-signin">I accept Terms
                                                   and Condition</label>
                                         </div>
-                                   </div>
+                                   </div> -->
 
                                    <div class="mb-1 text-center d-grid">
                                         <button class="btn btn-dark btn-lg fw-medium" type="submit">Sign
@@ -58,9 +79,9 @@ class="authentication-bg"
                               </form>
                          </div>
                     </div>
-                    <p class="text-center mt-4 text-white text-opacity-50">I already have an account
+                    <!-- <p class="text-center mt-4 text-white text-opacity-50">I already have an account
                          <a href="{{ route ('second' , ['auth','signin']) }}" class="text-decoration-none text-white fw-bold">Sign In</a>
-                    </p>
+                    </p> -->
                </div>
           </div>
      </div>
diff --git a/resources/views/master/users/create.blade.php b/resources/views/master/users/create.blade.php
index 3ef58ce..755f8c4 100644
--- a/resources/views/master/users/create.blade.php
+++ b/resources/views/master/users/create.blade.php
@@ -8,7 +8,7 @@
     <div class="col-lg-6">
         <div class="card">
             <div class="card-body">
-                <form action="{{route('master.users.store')}}" method="POST">
+                <form action="{{route('users.store')}}" method="POST">
                     @csrf
                     <div class="mb-3">
                         <label class="form-label" for="name">Name</label>
@@ -22,9 +22,14 @@
                     </div>
                     <div class="mb-3">
                         <label class="form-label" for="password">Password</label>
-                        <input type="text" id="password" class="form-control" name="password"
+                        <input type="password" id="password" class="form-control" name="password"
                                 placeholder="Enter your password" required>
                     </div>
+                    <div class="mb-3">
+                        <label class="form-label" for="password_confirmation">Password</label>
+                        <input type="password" id="password_confirmation" class="form-control" name="password_confirmation"
+                                placeholder="Enter your password confirmation" required>
+                    </div>
                     <div class="mb-3">
                         <label class="form-label" for="firstname">Firstname</label>
                         <input type="text" id="firstname" class="form-control" name="firstname"
@@ -41,7 +46,7 @@
                                 placeholder="Enter your position" required>
                     </div>
                     <!-- username, firstname, lastname, position -->
-                    <button type="submit" class="btn btn-outline-success width-lg">Create</button>
+                    <button type="submit" class="btn btn-success width-lg">Create</button>
                 </form>
             </div>
         </div>
diff --git a/resources/views/master/users/index.blade.php b/resources/views/master/users/index.blade.php
index bc43da0..664d784 100644
--- a/resources/views/master/users/index.blade.php
+++ b/resources/views/master/users/index.blade.php
@@ -10,7 +10,7 @@
 
 <div class="row">
     <div class="d-flex justify-content-end pb-3">
-        <a href="{{ route('users.create')}}" class="btn btn-outline-success width-lg">Create</a>
+        <a href="{{ route('users.create')}}" class="btn btn-success width-lg">Create</a>
     </div>
     {{$users}}
     <div>
diff --git a/routes/web.php b/routes/web.php
index e923b62..40d4e8c 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -13,6 +13,8 @@ require __DIR__ . '/auth.php';
 // auth 
 Route::group(['middleware' => 'auth'], function(){
 
+    Route::get('', [BigDataController::class, 'index'])->name('any');
+
     //dashboards
     Route::group(['prefix' => '/dashboards'], function(){
         Route::get('/bigdata', [BigDataController::class, 'index'])->name('home');