fix profile update

bayurifkialghifari · bayurifkialghifari · commit d7af8274db3f · 2025-08-23T08:58:53.000+07:00
diff --git a/resources/js/app.js b/resources/js/app.js
@@ -1,4 +1,4 @@
-import "bootstrap";
+import * as bootstrap from "bootstrap";
 import "perfect-scrollbar";
 import "smooth-scrollbar";
 import "@popperjs/core";
@@ -9,6 +9,7 @@ import {
 } from "../../vendor/livewire/livewire/dist/livewire.esm";
 import Swal from "sweetalert2";
 
+window.bootstrap = bootstrap;
 window.Swal = Swal;
 window.Toast = Swal.mixin({
     toast: true,
diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php
@@ -31,7 +31,7 @@ class="col-6 d-lg-flex d-none h-100 my-auto pe-0 position-absolute top-0 start-0
                             />
                         </div>
                         <div class="text-center">
-                            <button type="submit" class="btn btn-lg bg-gradient-dark btn-lg w-100 mt-4 mb-0">
+                            <button type="submit" class="btn btn-lg bg-gradient-dark w-100 mt-4 mb-0">
                                 <i class="fa fa-lock me-2"></i>
                                 Confirm
                             </button>
diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php
@@ -35,7 +35,7 @@ class="col-6 d-lg-flex d-none h-100 my-auto pe-0 position-absolute top-0 start-0
                             />
                         </div>
                         <div class="text-center">
-                            <button type="submit" class="btn btn-lg bg-gradient-dark btn-lg w-100 mt-4 mb-0">
+                            <button type="submit" class="btn btn-lg bg-gradient-dark w-100 mt-4 mb-0">
                                 <i class="fa fa-envelope me-2"></i>
                                 Email Password Reset Link
                             </button>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -58,7 +58,7 @@ class="col-6 d-lg-flex d-none h-100 my-auto pe-0 position-absolute top-0 start-0
                             </label>
                         </div>
                         <div class="text-center">
-                            <button type="submit" class="btn btn-lg bg-gradient-dark btn-lg w-100 mt-4 mb-0">
+                            <button type="submit" class="btn btn-lg bg-gradient-dark w-100 mt-4 mb-0">
                                 <i class="fa fa-sign-in me-2"></i>
                                 Sign In
                             </button>
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
@@ -71,7 +71,7 @@ class="col-6 d-lg-flex d-none h-100 my-auto pe-0 position-absolute top-0 start-0
                             </label>
                         </div>
                         <div class="text-center">
-                            <button type="submit" class="btn btn-lg bg-gradient-dark btn-lg w-100 mt-4 mb-0">
+                            <button type="submit" class="btn btn-lg bg-gradient-dark w-100 mt-4 mb-0">
                                 <i class="fa fa-sign-in me-2"></i>
                                 Sign Up
                             </button>
diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php
@@ -48,7 +48,7 @@ class="col-6 d-lg-flex d-none h-100 my-auto pe-0 position-absolute top-0 start-0
                             />
                         </div>
                         <div class="text-center">
-                            <button type="submit" class="btn btn-lg bg-gradient-dark btn-lg w-100 mt-4 mb-0">
+                            <button type="submit" class="btn btn-lg bg-gradient-dark w-100 mt-4 mb-0">
                                 <i class="fa fa-save me-2"></i>
                                 Reset Password
                             </button>
diff --git a/resources/views/auth/verify-email.blade.php b/resources/views/auth/verify-email.blade.php
@@ -24,7 +24,7 @@ class="col-6 d-lg-flex d-none h-100 my-auto pe-0 position-absolute top-0 start-0
                     <form method="POST" action="{{ route('verification.send') }}">
                         @csrf
                         <div class="text-center">
-                            <button type="submit" class="btn btn-lg bg-gradient-dark btn-lg w-100 mt-4 mb-0">
+                            <button type="submit" class="btn btn-lg bg-gradient-dark w-100 mt-4 mb-0">
                                 <i class="fa fa-envelope me-2"></i>
                                 Resend Verification Email
                             </button>
@@ -38,7 +38,7 @@ class="col-6 d-lg-flex d-none h-100 my-auto pe-0 position-absolute top-0 start-0
                     <div class="text-center">
                         <form method="POST" action="{{ route('logout') }}">
                             @csrf
-                            <button type="submit" class="btn btn-lg bg-gradient-dark btn-lg w-100 mt-4 mb-0">
+                            <button type="submit" class="btn btn-lg bg-gradient-dark w-100 mt-4 mb-0">
                                 <i class="fa fa-sign-out-alt me-2"></i>
                                 Logout
                             </button>
diff --git a/resources/views/components/acc-alert.blade.php b/resources/views/components/acc-alert.blade.php
@@ -8,7 +8,6 @@
     @if(session()->has($type))
         <div x-data="{
             show: true,
-            session: '{{ $type }}',
             init() {
                 $nextTick(() => {
                     window.Toast.fire({
diff --git a/resources/views/components/acc-custom-alert.blade.php b/resources/views/components/acc-custom-alert.blade.php
@@ -0,0 +1,20 @@
+@props([
+    'session',
+    'type' => 'success',
+    'message' => null,
+])
+@if(session()->has($session))
+    <div x-data="{
+        show: true,
+        message: '{{ $message ?? session($session) }}',
+        init() {
+            $nextTick(() => {
+                window.Toast.fire({
+                    icon: '{{ $type }}',
+                    title: this.message,
+                });
+            });
+        }
+    }">
+    </div>
+@endif
diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php
@@ -1,11 +1,17 @@
-<x-app-layout>
-    <x-slot name="header">
-        <h2 class="font-semibold text-xl text-gray-800 leading-tight">
-            {{ __('Profile') }}
-        </h2>
-    </x-slot>
-
-    <div class="py-12">
+<x-layouts.cms>
+    <div class="py-0">
+        @php
+            $message = match(session('status')) {
+                'profile-updated' => 'Profile updated successfully.',
+                'password-updated' => 'Password updated successfully.',
+                'two-factor-authentication-enabled' => 'Two factor authentication enabled.',
+                'two-factor-authentication-disabled' => 'Two factor authentication disabled.',
+                'recovery-codes-generated' => 'Recovery codes generated successfully.',
+                'browser-sessions-logged-out' => 'Browser sessions logged out successfully.',
+                default => null,
+            };
+        @endphp
+        <x-acc-custom-alert session="status" :message="$message" />
         <div class="max-w-7xl mx-auto sm:px-6 lg:px-8 space-y-6">
             <div class="p-4 sm:p-8 bg-white shadow sm:rounded-lg">
                 <div class="max-w-xl">
@@ -26,4 +32,4 @@
             </div>
         </div>
     </div>
-</x-app-layout>
+</x-layouts.cms>
diff --git a/resources/views/profile/partials/delete-user-form.blade.php b/resources/views/profile/partials/delete-user-form.blade.php
@@ -1,55 +1,79 @@
-<section class="space-y-6">
+<section class="space-y-6" x-data x-init="
+    if({{ $errors->userDeletion->isNotEmpty() ? 'true' : 'false' }}) {
+        new bootstrap.Modal(document.getElementById('acc-modal')).show()
+    }
+">
     <header>
-        <h2 class="text-lg font-medium text-gray-900">
+        <h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">
             {{ __('Delete Account') }}
         </h2>
 
-        <p class="mt-1 text-sm text-gray-600">
+        <p class="mt-1 text-sm text-gray-600 dark:text-gray-400">
             {{ __('Once your account is deleted, all of its resources and data will be permanently deleted. Before deleting your account, please download any data or information that you wish to retain.') }}
         </p>
     </header>
 
-    <x-danger-button
-        x-data=""
-        x-on:click.prevent="$dispatch('open-modal', 'confirm-user-deletion')"
-    >{{ __('Delete Account') }}</x-danger-button>
+    <button class="btn btn-sm btn-danger"
+        x-data
+        @click="new bootstrap.Modal(document.getElementById('acc-modal')).show()"
+    >
+        <i class="fa fa-trash me-2"></i>
+        Delete Account
+    </button>
 
-    <x-modal name="confirm-user-deletion" :show="$errors->userDeletion->isNotEmpty()" focusable>
-        <form method="post" action="{{ route('profile.destroy') }}" class="p-6">
-            @csrf
-            @method('delete')
+    <div class="modal fade show mt-5" id="acc-modal" tabindex="-1" aria-labelledby="acc-modal-label" aria-hidden="true" focusable>
+        <div class="modal-dialog modal-md">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="acc-modal-label">Delete Account</h5>
+                    <button type="button" class="btn-close text-dark" data-bs-dismiss="modal" aria-label="Close">
+                        <i class="fas fa-times"></i>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <form method="post" action="{{ route('profile.destroy') }}">
+                        @csrf
+                        @method('delete')
 
-            <h2 class="text-lg font-medium text-gray-900">
-                {{ __('Are you sure you want to delete your account?') }}
-            </h2>
+                        <h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">
+                            {{ __('Are you sure you want to delete your account?') }}
+                        </h2>
 
-            <p class="mt-1 text-sm text-gray-600">
-                {{ __('Once your account is deleted, all of its resources and data will be permanently deleted. Please enter your password to confirm you would like to permanently delete your account.') }}
-            </p>
+                        <p class="mt-1 text-sm text-gray-600 dark:text-gray-400">
+                            {{ __('Once your account is deleted, all of its resources and data will be permanently deleted. Please enter your password to confirm you would like to permanently delete your account.') }}
+                        </p>
 
-            <div class="mt-6">
-                <x-input-label for="password" value="{{ __('Password') }}" class="sr-only" />
+                        <div>
+                            <label class="form-label fw-bold">
+                                Password
+                            </label>
+                            <x-acc-input
+                                type="password"
+                                model="password"
+                                placeholder="Enter your new password"
+                                :livewire="false"
+                            />
+                            <div>
+                                @if($errors->userDeletion->get('password'))
+                                    <span class="text-danger text-sm">{{ $errors->userDeletion->get('password')[0] }}</span>
+                                @endif
+                            </div>
+                        </div>
 
-                <x-text-input
-                    id="password"
-                    name="password"
-                    type="password"
-                    class="mt-1 block w-3/4"
-                    placeholder="{{ __('Password') }}"
-                />
+                        <div class="mt-3 flex justify-end">
+                            <button class="btn bg-gradient-dark btn-sm" type="button" data-bs-dismiss="modal">
+                                <i class="fa fa-times me-2"></i>
+                                {{ __('Cancel') }}
+                            </button>
 
-                <x-input-error :messages="$errors->userDeletion->get('password')" class="mt-2" />
+                            <button class="btn btn-sm btn-danger ml-3">
+                                <i class="fa fa-trash me-2"></i>
+                                {{ __('Delete Account') }}
+                            </button>
+                        </div>
+                    </form>
+                </div>
             </div>
-
-            <div class="mt-6 flex justify-end">
-                <x-secondary-button x-on:click="$dispatch('close')">
-                    {{ __('Cancel') }}
-                </x-secondary-button>
-
-                <x-danger-button class="ms-3">
-                    {{ __('Delete Account') }}
-                </x-danger-button>
-            </div>
-        </form>
-    </x-modal>
+        </div>
+    </div>
 </section>
diff --git a/resources/views/profile/partials/update-password-form.blade.php b/resources/views/profile/partials/update-password-form.blade.php
@@ -9,40 +9,66 @@
         </p>
     </header>
 
-    <form method="post" action="{{ route('password.update') }}" class="mt-6 space-y-6">
+    <form method="post" action="{{ route('password.update') }}" class="mt-1 space-y-6">
         @csrf
         @method('put')
 
-        <div>
-            <x-input-label for="update_password_current_password" :value="__('Current Password')" />
-            <x-text-input id="update_password_current_password" name="current_password" type="password" class="mt-1 block w-full" autocomplete="current-password" />
-            <x-input-error :messages="$errors->updatePassword->get('current_password')" class="mt-2" />
+        <div class="mb-3">
+            <label class="form-label fw-bold">
+                Current Password
+            </label>
+            <x-acc-input
+                type="password"
+                model="current_password"
+                placeholder="Enter your current password"
+                :livewire="false"
+            />
+            <div>
+                @if($errors->updatePassword->get('current_password'))
+                    <span class="text-danger text-sm">{{ $errors->updatePassword->get('current_password')[0] }}</span>
+                @endif
+            </div>
         </div>
 
-        <div>
-            <x-input-label for="update_password_password" :value="__('New Password')" />
-            <x-text-input id="update_password_password" name="password" type="password" class="mt-1 block w-full" autocomplete="new-password" />
-            <x-input-error :messages="$errors->updatePassword->get('password')" class="mt-2" />
+        <div class="mb-3">
+            <label class="form-label fw-bold">
+                New Password
+            </label>
+            <x-acc-input
+                type="password"
+                model="password"
+                placeholder="Enter your new password"
+                :livewire="false"
+            />
+            <div>
+                @if($errors->updatePassword->get('password'))
+                    <span class="text-danger text-sm">{{ $errors->updatePassword->get('password')[0] }}</span>
+                @endif
+            </div>
         </div>
 
         <div>
-            <x-input-label for="update_password_password_confirmation" :value="__('Confirm Password')" />
-            <x-text-input id="update_password_password_confirmation" name="password_confirmation" type="password" class="mt-1 block w-full" autocomplete="new-password" />
-            <x-input-error :messages="$errors->updatePassword->get('password_confirmation')" class="mt-2" />
+            <label class="form-label fw-bold">
+                Confirm New Password
+            </label>
+            <x-acc-input
+                type="password"
+                model="password_confirmation"
+                placeholder="Confirm your new password"
+                :livewire="false"
+            />
+            <div>
+                @if($errors->updatePassword->get('password_confirmation'))
+                    <span class="text-danger text-sm">{{ $errors->updatePassword->get('password_confirmation')[0] }}</span>
+                @endif
+            </div>
         </div>
 
         <div class="flex items-center gap-4">
-            <x-primary-button>{{ __('Save') }}</x-primary-button>
-
-            @if (session('status') === 'password-updated')
-                <p
-                    x-data="{ show: true }"
-                    x-show="show"
-                    x-transition
-                    x-init="setTimeout(() => show = false, 2000)"
-                    class="text-sm text-gray-600"
-                >{{ __('Saved.') }}</p>
-            @endif
+            <button type="submit" class="btn btn-sm bg-gradient-dark mt-4 mb-0">
+                <i class="fa fa-save me-2"></i>
+                Save
+            </button>
         </div>
     </form>
 </section>
diff --git a/resources/views/profile/partials/update-profile-information-form.blade.php b/resources/views/profile/partials/update-profile-information-form.blade.php
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
