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"

-
+ + @csrf
- - Name +
- - Email +
- - Password +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
-

I already have an account + 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 @@

-
+ @csrf
@@ -22,9 +22,14 @@
-
+
+ + +
- +
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 @@
{{$users}}
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');