From 2c1b8fbe19695e94ca233856c213cc3268048c27 Mon Sep 17 00:00:00 2001
From: KhatamNugraha <nuganugraha2019@gmail.com>
Date: Tue, 17 Oct 2023 14:06:24 +0700
Subject: [PATCH] update login usermanager

---
 .../Auth/AuthenticatedSessionController.php   | 14 +++-
 .../auth/login-usermanager-old.blade.php      | 69 +++++++++++++++
 .../views/auth/login-usermanager.blade.php    | 36 ++++++--
 Resources/views/auth/login.blade.php          | 31 +++----
 Resources/views/partials/menu/_root.blade.php | 83 +++++++++++++------
 5 files changed, 175 insertions(+), 58 deletions(-)
 create mode 100644 Resources/views/auth/login-usermanager-old.blade.php

diff --git a/Http/Controllers/Auth/AuthenticatedSessionController.php b/Http/Controllers/Auth/AuthenticatedSessionController.php
index 09b7527..99b4692 100644
--- a/Http/Controllers/Auth/AuthenticatedSessionController.php
+++ b/Http/Controllers/Auth/AuthenticatedSessionController.php
@@ -6,6 +6,7 @@
     use App\Providers\RouteServiceProvider;
     use Illuminate\Http\Request;
     use Illuminate\Support\Facades\Auth;
+    use Modules\Usermanager\Entities\User;
     use Modules\Usermanager\Http\Requests\LoginRequest;
 
     class AuthenticatedSessionController extends Controller
@@ -39,20 +40,27 @@
 
             $userData = verify_user($id, $passwd, $SERVER_ADDR, $IPUserManager, $portUserManager, $appId);
 
-
             if (strlen($userData) > 1) {
                 $userRawArray = explode("\t", $userData);
+
                 foreach ($userRawArray as $rkey => $rval) {
+
                     [$key, $val] = explode('=', $rval);
                     $userArray[0][$key] = $val;
                 }
 
-                $user = User::where('user_id', '=', $request->email)->first();
+
+
+                $user = User::where('email', '=', $request->email)->first();
 
                 if (!$user) {
                     $user = User::create([
                         'name'    => $userArray[0]['NAMA_USER'],
-                        'user_id' => $userArray[0]['KD_USER']
+                        'user_id' => $userArray[0]['KD_USER'],
+                        'email'   => $request->email,
+                        'password'   => $request->password
+
+
                     ]);
 
                     switch ($userArray[0]['KD_GROUP']) {
diff --git a/Resources/views/auth/login-usermanager-old.blade.php b/Resources/views/auth/login-usermanager-old.blade.php
new file mode 100644
index 0000000..056901e
--- /dev/null
+++ b/Resources/views/auth/login-usermanager-old.blade.php
@@ -0,0 +1,69 @@
+<x-auth-layout>
+
+    <!--begin::Form-->
+    <form class="form w-100" novalidate="novalidate" id="kt_sign_in_form" data-kt-redirect-url="/" action="login">
+        @csrf
+        <!--begin::Heading-->
+        <div class="text-center mb-11">
+            <!--begin::Title-->
+            <h1 class="text-dark fw-bolder mb-3">
+                Sign In
+            </h1>
+            <!--end::Title-->
+
+            <!--begin::Subtitle-->
+            <div class="text-gray-500 fw-semibold fs-6">
+                Your Social Campaigns
+            </div>
+            <!--end::Subtitle--->
+        </div>
+        <!--begin::Heading-->
+
+        <!--begin::Input group--->
+        <div class="fv-row mb-8">
+            <!--begin::Email-->
+            <input type="text" placeholder="User ID" name="email" autocomplete="off" class="form-control bg-transparent" value=""/>
+            <!--end::Email-->
+        </div>
+
+        <!--end::Input group--->
+        <div class="fv-row mb-3">
+            <!--begin::Password-->
+            <input type="password" placeholder="Password" name="password" autocomplete="off" class="form-control bg-transparent" value=""/>
+            <!--end::Password-->
+        </div>
+        <!--end::Input group--->
+
+        <!--begin::Wrapper-->
+        <div class="d-flex flex-stack flex-wrap gap-3 fs-base fw-semibold mb-8">
+            <div></div>
+
+            <!--begin::Link-->
+            <a href="/forgot-password" class="link-primary">
+                Forgot Password ?
+            </a>
+            <!--end::Link-->
+        </div>
+        <!--end::Wrapper-->
+
+        <!--begin::Submit button-->
+        <div class="d-grid mb-10">
+            <button type="submit" id="kt_sign_in_submit" class="btn btn-primary">
+                @include('partials/general/_button-indicator', ['label' => 'Sign In'])
+            </button>
+        </div>
+        <!--end::Submit button-->
+
+        <!--begin::Sign up-->
+        <div class="text-gray-500 text-center fw-semibold fs-6">
+            Not a Member yet?
+
+            <a href="/register" class="link-primary">
+                Sign up
+            </a>
+        </div>
+        <!--end::Sign up-->
+    </form>
+    <!--end::Form-->
+
+</x-auth-layout>
diff --git a/Resources/views/auth/login-usermanager.blade.php b/Resources/views/auth/login-usermanager.blade.php
index 056901e..21537b6 100644
--- a/Resources/views/auth/login-usermanager.blade.php
+++ b/Resources/views/auth/login-usermanager.blade.php
@@ -13,23 +13,45 @@
 
             <!--begin::Subtitle-->
             <div class="text-gray-500 fw-semibold fs-6">
-                Your Social Campaigns
+                Aplikasi Konfirmasi Bank
             </div>
             <!--end::Subtitle--->
         </div>
         <!--begin::Heading-->
 
+        <!--begin::Login options-->
+        <div class="row g-3 mb-9">
+            <!--begin::Col-->
+            <div class="col-md-12">
+                  <img class="d-none d-lg-block mx-auto w-150px w-md-50 w-xl-150px mb-10 mb-lg-10" src="{{ image('logos/logo_agi.png') }}" alt=""/>
+                <!--begin::Google link--->
+                {{-- <a href="#" class="btn btn-flex btn-outline btn-text-gray-700 btn-active-color-primary bg-state-light flex-center text-nowrap w-100">
+                    <img alt="Logo" src="{{ image('svg/brand-logos/google-icon.svg') }}" class="h-15px me-3"/>
+                    Sign in with Google
+                </a> --}}
+                <!--end::Google link--->
+            </div>
+            <!--end::Col-->
+
+            <!--begin::Col-->
+
+            <!--end::Col-->
+        </div>
+        <!--end::Login options-->
+
+        <!--end::Separator-->
+
         <!--begin::Input group--->
         <div class="fv-row mb-8">
             <!--begin::Email-->
-            <input type="text" placeholder="User ID" name="email" autocomplete="off" class="form-control bg-transparent" value=""/>
+            <input type="text" placeholder="Email" name="email" autocomplete="off" class="form-control bg-transparent" value="demo@demo.com"/>
             <!--end::Email-->
         </div>
 
         <!--end::Input group--->
         <div class="fv-row mb-3">
             <!--begin::Password-->
-            <input type="password" placeholder="Password" name="password" autocomplete="off" class="form-control bg-transparent" value=""/>
+            <input type="password" placeholder="Password" name="password" autocomplete="off" class="form-control bg-transparent" value="demo"/>
             <!--end::Password-->
         </div>
         <!--end::Input group--->
@@ -39,9 +61,9 @@
             <div></div>
 
             <!--begin::Link-->
-            <a href="/forgot-password" class="link-primary">
+            {{-- <a href="/forgot-password" class="link-primary">
                 Forgot Password ?
-            </a>
+            </a> --}}
             <!--end::Link-->
         </div>
         <!--end::Wrapper-->
@@ -55,13 +77,13 @@
         <!--end::Submit button-->
 
         <!--begin::Sign up-->
-        <div class="text-gray-500 text-center fw-semibold fs-6">
+        {{-- <div class="text-gray-500 text-center fw-semibold fs-6">
             Not a Member yet?
 
             <a href="/register" class="link-primary">
                 Sign up
             </a>
-        </div>
+        </div> --}}
         <!--end::Sign up-->
     </form>
     <!--end::Form-->
diff --git a/Resources/views/auth/login.blade.php b/Resources/views/auth/login.blade.php
index 9561408..21537b6 100644
--- a/Resources/views/auth/login.blade.php
+++ b/Resources/views/auth/login.blade.php
@@ -13,7 +13,7 @@
 
             <!--begin::Subtitle-->
             <div class="text-gray-500 fw-semibold fs-6">
-                Your Social Campaigns
+                Aplikasi Konfirmasi Bank
             </div>
             <!--end::Subtitle--->
         </div>
@@ -22,34 +22,23 @@
         <!--begin::Login options-->
         <div class="row g-3 mb-9">
             <!--begin::Col-->
-            <div class="col-md-6">
+            <div class="col-md-12">
+                  <img class="d-none d-lg-block mx-auto w-150px w-md-50 w-xl-150px mb-10 mb-lg-10" src="{{ image('logos/logo_agi.png') }}" alt=""/>
                 <!--begin::Google link--->
-                <a href="#" class="btn btn-flex btn-outline btn-text-gray-700 btn-active-color-primary bg-state-light flex-center text-nowrap w-100">
+                {{-- <a href="#" class="btn btn-flex btn-outline btn-text-gray-700 btn-active-color-primary bg-state-light flex-center text-nowrap w-100">
                     <img alt="Logo" src="{{ image('svg/brand-logos/google-icon.svg') }}" class="h-15px me-3"/>
                     Sign in with Google
-                </a>
+                </a> --}}
                 <!--end::Google link--->
             </div>
             <!--end::Col-->
 
             <!--begin::Col-->
-            <div class="col-md-6">
-                <!--begin::Google link--->
-                <a href="#" class="btn btn-flex btn-outline btn-text-gray-700 btn-active-color-primary bg-state-light flex-center text-nowrap w-100">
-                    <img alt="Logo" src="{{ image('svg/brand-logos/apple-black.svg') }}" class="theme-light-show h-15px me-3"/>
-                    <img alt="Logo" src="{{ image('svg/brand-logos/apple-black-dark.svg') }}" class="theme-dark-show h-15px me-3"/>
-                    Sign in with Apple
-                </a>
-                <!--end::Google link--->
-            </div>
+
             <!--end::Col-->
         </div>
         <!--end::Login options-->
 
-        <!--begin::Separator-->
-        <div class="separator separator-content my-14">
-            <span class="w-125px text-gray-500 fw-semibold fs-7">Or with email</span>
-        </div>
         <!--end::Separator-->
 
         <!--begin::Input group--->
@@ -72,9 +61,9 @@
             <div></div>
 
             <!--begin::Link-->
-            <a href="/forgot-password" class="link-primary">
+            {{-- <a href="/forgot-password" class="link-primary">
                 Forgot Password ?
-            </a>
+            </a> --}}
             <!--end::Link-->
         </div>
         <!--end::Wrapper-->
@@ -88,13 +77,13 @@
         <!--end::Submit button-->
 
         <!--begin::Sign up-->
-        <div class="text-gray-500 text-center fw-semibold fs-6">
+        {{-- <div class="text-gray-500 text-center fw-semibold fs-6">
             Not a Member yet?
 
             <a href="/register" class="link-primary">
                 Sign up
             </a>
-        </div>
+        </div> --}}
         <!--end::Sign up-->
     </form>
     <!--end::Form-->
diff --git a/Resources/views/partials/menu/_root.blade.php b/Resources/views/partials/menu/_root.blade.php
index 9d0fd39..4a838a9 100644
--- a/Resources/views/partials/menu/_root.blade.php
+++ b/Resources/views/partials/menu/_root.blade.php
@@ -1,30 +1,59 @@
-@canany(['konfirmasibank.read','konfirmasibank.create','konfirmasibank.update','konfirmasibank.delete','konfirmasibank.'])
-            <!--Penambahan menu konfiramasibank-->
+@canany(['user.read','user.create','user.update','user.delete'])
+    <!--begin:Menu item-->
+    <div data-kt-menu-trigger="click" class="menu-item menu-accordion  {{ $route[0] == 'user' ? 'show' : '' }}">
+        <!--begin:Menu link-->
+        <span class="menu-link">
+					<span class="menu-icon">{!! getIcon('people', 'fs-2') !!}</span>
+					<span class="menu-title">User Management</span>
+					<span class="menu-arrow"></span>
+				</span>
+        <!--end:Menu link-->
+        <!--begin:Menu sub-->
+        <div class="menu-sub menu-sub-accordion">
             <!--begin:Menu item-->
-                <div data-kt-menu-trigger="click" class="menu-item menu-accordion  ">
-                    <!--begin:Menu link-->
-                    <span class="menu-link">
-                        <span class="menu-icon">{!! getIcon('people', 'fs-2') !!}</span>
-                        <span class="menu-title">Konfirmasi Bank</span>
-                        <span class="menu-arrow"></span>
-                    </span>
-                    <!--end:Menu link-->
-                    <!--begin:Menu sub-->
-                    <div class="menu-sub menu-sub-accordion">
-                        <!--begin:Menu item-->
-                        <div class="menu-item ">
-                            <!--begin:Menu link-->
-                            <a class="menu-link {{ isset($route[1]) && $route[1] == 'konfirmasibank' ? 'active' : '' }}" href="{{ route('konfirmasibank.index') }}">
-                                <span class="menu-bullet">
-                                    <span class="bullet bullet-dot"></span>
-                                </span>
-                                <span class="menu-title">Data Nasabah</span>
-                            </a>
-                            <!--end:Menu link-->
-                        </div>
-                        <!--end:Menu item-->
-                    </div>
-                    <!--end:Men sub-->
-                </div>
+            <div class="menu-item ">
+                <!--begin:Menu link-->
+                <a class="menu-link {{ isset($route[1]) && $route[1] == 'users' ? 'active' : '' }}" href="{{ route('user.users.index') }}">
+							<span class="menu-bullet">
+								<span class="bullet bullet-dot"></span>
+							</span>
+                    <span class="menu-title">Users</span>
+                </a>
+                <!--end:Menu link-->
+            </div>
             <!--end:Menu item-->
+
+            @canany(['role.read','role.create','role.update','role.delete'])
+            <!--begin:Menu item-->
+            <div class="menu-item">
+                <!--begin:Menu link-->
+                <a class="menu-link {{ isset($route[1]) && $route[1] == 'roles' ? 'active' : '' }}" href="{{ route('user.roles.index') }}">
+							<span class="menu-bullet">
+								<span class="bullet bullet-dot"></span>
+							</span>
+                    <span class="menu-title">Roles</span>
+                </a>
+                <!--end:Menu link-->
+            </div>
+            <!--end:Menu item-->
+            @endcanany
+
+            @canany(['permission.read','permission.create','permission.update','permission.delete'])
+            <!--begin:Menu item-->
+            <div class="menu-item">
+                <!--begin:Menu link-->
+                <a class="menu-link {{ isset($route[1]) && $route[1] == 'permissions' ? 'active' : '' }}" href="{{ route('user.permissions.index') }}">
+							<span class="menu-bullet">
+								<span class="bullet bullet-dot"></span>
+							</span>
+                    <span class="menu-title">Permissions</span>
+                </a>
+                <!--end:Menu link-->
+            </div>
+            <!--end:Menu item-->
+            @endcanany
+        </div>
+        <!--end:Menu sub-->
+    </div>
+    <!--end:Menu item-->
 @endcanany