putrakuningan/clara
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Metronic Version to 8.2.1 #1

Merged
putrakuningan merged 77 commits from dev into master 2024-05-04 09:46:45 +00:00
Conversation 0 Commits 77 Files Changed 2274 +26 -25
12 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 46d0298d18 - Show all commits

2
resources/views/layout/master.blade.php
View File

@ -71,7 +71,7 @@
<!--end::Javascript-->
<script>
document.addEventListener('livewire:load', () => {
document.addEventListener('livewire:init', () => {
Livewire.on('success', (message) => {
toastr.success(message);
});

2
resources/views/layout/partials/header-layout/header/_menu/_menu.blade.php
View File

@ -1195,7 +1195,7 @@
<!--begin:Menu link-->
<a class="menu-link" href="https://preview.keenthemes.com/laravel/metronic/docs/changelog" target="_blank">
<span class="menu-icon">{!! getIcon('code', 'fs-2') !!}</span>
<span class="menu-title">Changelog v8.2.0</span>
<span class="menu-title">Changelog v8.2.2</span>
</a>
<!--end:Menu link-->
</div>

1
resources/views/layout/partials/sidebar-layout/_sidebar.blade.php
View File

@ -2,5 +2,6 @@
<div id="kt_app_sidebar" class="app-sidebar flex-column" data-kt-drawer="true" data-kt-drawer-name="app-sidebar" data-kt-drawer-activate="{default: true, lg: false}" data-kt-drawer-overlay="true" data-kt-drawer-width="225px" data-kt-drawer-direction="start" data-kt-drawer-toggle="#kt_app_sidebar_mobile_toggle">
@include(config('settings.KT_THEME_LAYOUT_DIR').'/partials/sidebar-layout/sidebar/_logo')
@include(config('settings.KT_THEME_LAYOUT_DIR').'/partials/sidebar-layout/sidebar/_menu')
@include(config('settings.KT_THEME_LAYOUT_DIR').'/partials/sidebar-layout/sidebar/_footer')
</div>
<!--end::Sidebar-->

6
resources/views/livewire/permission/permission-modal.blade.php
View File

@ -38,7 +38,7 @@
<!--end::Notice-->
<!--end::Notice-->
<!--begin::Form-->
<form id="kt_modal_update_permission_form" class="form" action="#" wire:submit.prevent="submit">
<form id="kt_modal_update_permission_form" class="form" action="#" wire:submit="submit">
<!--begin::Input group-->
<div class="fv-row mb-7">
<!--begin::Label-->
@ -50,7 +50,7 @@
</label>
<!--end::Label-->
<!--begin::Input-->
<input class="form-control form-control-solid" placeholder="Enter a permission name" name="name" wire:model.defer="name"/>
<input class="form-control form-control-solid" placeholder="Enter a permission name" name="name" wire:model="name"/>
<!--end::Input-->
@error('name')
<span class="text-danger">{{ $message }}</span> @enderror
@ -83,7 +83,7 @@
const modal = document.querySelector('#kt_modal_update_permission');
modal.addEventListener('show.bs.modal', (e) => {
Livewire.emit('modal.show.permission_name', e.relatedTarget.getAttribute('data-permission-id'));
Livewire.dispatch('modal.show.permission_name', [e.relatedTarget.getAttribute('data-permission-id')]);
});
</script>
@endpush

10
resources/views/livewire/permission/role-modal.blade.php
View File

@ -18,7 +18,7 @@
<!--begin::Modal body-->
<div class="modal-body scroll-y mx-5 my-7">
<!--begin::Form-->
<form id="kt_modal_update_role_form" class="form" action="#" wire:submit.prevent="submit">
<form id="kt_modal_update_role_form" class="form" action="#" wire:submit="submit">
<!--begin::Scroll-->
<div class="d-flex flex-column scroll-y me-n7 pe-7" id="kt_modal_update_role_scroll" data-kt-scroll="true" data-kt-scroll-activate="{default: false, lg: true}" data-kt-scroll-max-height="auto"
data-kt-scroll-dependencies="#kt_modal_update_role_header" data-kt-scroll-wrappers="#kt_modal_update_role_scroll" data-kt-scroll-offset="300px">
@ -30,7 +30,7 @@
</label>
<!--end::Label-->
<!--begin::Input-->
<input class="form-control form-control-solid" placeholder="Enter a role name" name="name" wire:model.defer="name"/>
<input class="form-control form-control-solid" placeholder="Enter a role name" name="name" wire:model="name"/>
<!--end::Input-->
@error('name')
<span class="text-danger">{{ $message }}</span> @enderror
@ -57,7 +57,7 @@
<td>
<!--begin::Checkbox-->
<label class="form-check form-check-sm form-check-custom form-check-solid me-9">
<input class="form-check-input" type="checkbox" id="kt_roles_select_all" wire:model.defer="check_all" wire:change="checkAll" />
<input class="form-check-input" type="checkbox" id="kt_roles_select_all" wire:model="check_all" wire:change="checkAll" />
<span class="form-check-label" for="kt_roles_select_all">Select all</span>
</label>
<!--end::Checkbox-->
@ -77,7 +77,7 @@
<div class="d-flex">
<!--begin::Checkbox-->
<label class="form-check form-check-sm form-check-custom form-check-solid me-5 me-lg-20">
<input class="form-check-input" type="checkbox" wire:model.defer="checked_permissions" value="{{ $permission->name }}"/>
<input class="form-check-input" type="checkbox" wire:model="checked_permissions" value="{{ $permission->name }}"/>
<span class="form-check-label">{{ ucwords(Str::before($permission->name, ' ')) }}</span>
</label>
<!--end::Checkbox-->
@ -127,7 +127,7 @@
const modal = document.querySelector('#kt_modal_update_role');
modal.addEventListener('show.bs.modal', (e) => {
Livewire.emit('modal.show.role_name', e.relatedTarget.getAttribute('data-role-id'));
Livewire.dispatch('modal.show.role_name', [e.relatedTarget.getAttribute('data-role-id')]);
});
</script>
@endpush

12
resources/views/livewire/user/add-user-modal.blade.php
View File

@ -18,8 +18,8 @@
<!--begin::Modal body-->
<div class="modal-body px-5 my-7">
<!--begin::Form-->
<form id="kt_modal_add_user_form" class="form" action="#" wire:submit.prevent="submit" enctype="multipart/form-data">
<input type="hidden" wire:model.defer="user_id" name="user_id" value="{{ $user_id }}"/>
<form id="kt_modal_add_user_form" class="form" action="#" wire:submit="submit" enctype="multipart/form-data">
<input type="hidden" wire:model="user_id" name="user_id" value="{{ $user_id }}"/>
<!--begin::Scroll-->
<div class="d-flex flex-column scroll-y px-5 px-lg-10" id="kt_modal_add_user_scroll" data-kt-scroll="true" data-kt-scroll-activate="true" data-kt-scroll-max-height="auto" data-kt-scroll-dependencies="#kt_modal_add_user_header" data-kt-scroll-wrappers="#kt_modal_add_user_scroll" data-kt-scroll-offset="300px">
<!--begin::Input group-->
@ -51,7 +51,7 @@
<label class="btn btn-icon btn-circle btn-active-color-primary w-25px h-25px bg-body shadow" data-kt-image-input-action="change" data-bs-toggle="tooltip" title="Change avatar">
{!! getIcon('pencil','fs-7') !!}
<!--begin::Inputs-->
<input type="file" wire:model.defer="avatar" name="avatar" accept=".png, .jpg, .jpeg"/>
<input type="file" wire:model="avatar" name="avatar" accept=".png, .jpg, .jpeg"/>
<input type="hidden" name="avatar_remove"/>
<!--end::Inputs-->
</label>
@ -81,7 +81,7 @@
<label class="required fw-semibold fs-6 mb-2">Full Name</label>
<!--end::Label-->
<!--begin::Input-->
<input type="text" wire:model.defer="name" name="name" class="form-control form-control-solid mb-3 mb-lg-0" placeholder="Full name"/>
<input type="text" wire:model="name" name="name" class="form-control form-control-solid mb-3 mb-lg-0" placeholder="Full name"/>
<!--end::Input-->
@error('name')
<span class="text-danger">{{ $message }}</span> @enderror
@ -93,7 +93,7 @@
<label class="required fw-semibold fs-6 mb-2">Email</label>
<!--end::Label-->
<!--begin::Input-->
<input type="email" wire:model.defer="email" name="email" class="form-control form-control-solid mb-3 mb-lg-0" placeholder="example@domain.com"/>
<input type="email" wire:model="email" name="email" class="form-control form-control-solid mb-3 mb-lg-0" placeholder="example@domain.com"/>
<!--end::Input-->
@error('email')
<span class="text-danger">{{ $message }}</span> @enderror
@ -113,7 +113,7 @@
<!--begin::Radio-->
<div class="form-check form-check-custom form-check-solid">
<!--begin::Input-->
<input class="form-check-input me-3" id="kt_modal_update_role_option_{{ $role->id }}" wire:model.defer="role" name="role" type="radio" value="{{ $role->name }}" checked="checked"/>
<input class="form-check-input me-3" id="kt_modal_update_role_option_{{ $role->id }}" wire:model="role" name="role" type="radio" value="{{ $role->name }}" checked="checked"/>
<!--end::Input-->
<!--begin::Label-->
<label class="form-check-label" for="kt_modal_update_role_option_{{ $role->id }}">

2
resources/views/pages/apps/user-management/permissions/columns/_draw-scripts.js
View File

@ -14,7 +14,7 @@ document.querySelectorAll('[data-kt-action="delete_row"]').forEach(function (ele
}
}).then((result) => {
if (result.isConfirmed) {
Livewire.emit('delete_permission', this.getAttribute('data-permission-id'));
Livewire.dispatch('delete_permission', [this.getAttribute('data-permission-id')]);
}
});
});

2
resources/views/pages/apps/user-management/permissions/list.blade.php
View File

@ -73,7 +73,7 @@
document.getElementById('mySearchInput').addEventListener('keyup', function () {
window.LaravelDataTables['permissions-table'].search(this.value).draw();
});
document.addEventListener('livewire:load', function () {
document.addEventListener('livewire:init', function () {
Livewire.on('success', function () {
$('#kt_modal_update_permission').modal('hide');
window.LaravelDataTables['permissions-table'].ajax.reload();

4
resources/views/pages/apps/user-management/roles/columns/_draw-scripts.js
View File

@ -5,7 +5,7 @@ KTMenu.init();
document.querySelectorAll('[data-kt-action="delete_row"]').forEach(function (element) {
element.addEventListener('click', function () {
if (confirm('Are you sure you want to remove?')) {
Livewire.emit('delete_user', this.getAttribute('data-kt-user-id'));
Livewire.dispatch('delete_user', [this.getAttribute('data-kt-user-id')]);
}
});
});
@ -13,7 +13,7 @@ document.querySelectorAll('[data-kt-action="delete_row"]').forEach(function (ele
// Add click event listener to update buttons
document.querySelectorAll('[data-kt-action="update_row"]').forEach(function (element) {
element.addEventListener('click', function () {
Livewire.emit('update_user', this.getAttribute('data-kt-user-id'));
Livewire.dispatch('update_user', [this.getAttribute('data-kt-user-id')]);
});
});

4
resources/views/pages/apps/user-management/users/columns/_draw-scripts.js
View File

@ -17,7 +17,7 @@ document.querySelectorAll('[data-kt-action="delete_row"]').forEach(function (ele
}
}).then((result) => {
if (result.isConfirmed) {
Livewire.emit('delete_user', this.getAttribute('data-kt-user-id'));
Livewire.dispatch('delete_user', [this.getAttribute('data-kt-user-id')]);
}
});
});
@ -26,7 +26,7 @@ document.querySelectorAll('[data-kt-action="delete_row"]').forEach(function (ele
// Add click event listener to update buttons
document.querySelectorAll('[data-kt-action="update_row"]').forEach(function (element) {
element.addEventListener('click', function () {
Livewire.emit('update_user', this.getAttribute('data-kt-user-id'));
Livewire.dispatch('update_user', [this.getAttribute('data-kt-user-id')]);
});
});

2
resources/views/pages/apps/user-management/users/list.blade.php
View File

@ -60,7 +60,7 @@
document.getElementById('mySearchInput').addEventListener('keyup', function () {
window.LaravelDataTables['users-table'].search(this.value).draw();
});
document.addEventListener('livewire:load', function () {
document.addEventListener('livewire:init', function () {
Livewire.on('success', function () {
$('#kt_modal_add_user').modal('hide');
window.LaravelDataTables['users-table'].ajax.reload();

4
resources/views/vendor/breadcrumbs/bootstrap5.blade.php vendored
View File

@ -11,12 +11,12 @@
<!--end::Item-->
<!--begin::Item-->
<li class="breadcrumb-item">
<span class="bullet bg-gray-400 w-5px h-2px"></span>
<span class="bullet bg-gray-500 w-5px h-2px"></span>
</li>
<!--end::Item-->
@else
<!--begin::Item-->
<li class="breadcrumb-item text-dark">
<li class="breadcrumb-item text-gray-900">
{{ $breadcrumb->title }}
</li>
<!--end::Item-->