From df8fbf72eec41bdb410097ce3f4c64fc4b9d0fbe Mon Sep 17 00:00:00 2001 From: Devansh Bawari Date: Thu, 7 Dec 2023 14:17:23 +0530 Subject: [PATCH] feat: acl improved and component refined --- .../views/components/tree/checkbox.blade.php | 10 +-- .../views/components/tree/item.blade.php | 88 ++++++++++--------- .../views/components/tree/radio.blade.php | 8 +- .../views/components/tree/view.blade.php | 81 +++++++++-------- .../views/settings/roles/create.blade.php | 16 ++-- .../views/settings/roles/edit.blade.php | 25 +++--- .../default/build/assets/app-13ce049d.css | 1 + .../default/build/assets/app-27dce206.css | 1 - .../default/build/assets/app-51464fb5.js | 36 ++++++++ .../default/build/assets/app-d6e62d71.js | 36 -------- .../themes/admin/default/build/manifest.json | 4 +- 11 files changed, 160 insertions(+), 146 deletions(-) create mode 100644 public/themes/admin/default/build/assets/app-13ce049d.css delete mode 100644 public/themes/admin/default/build/assets/app-27dce206.css create mode 100644 public/themes/admin/default/build/assets/app-51464fb5.js delete mode 100644 public/themes/admin/default/build/assets/app-d6e62d71.js diff --git a/packages/Webkul/Admin/src/Resources/views/components/tree/checkbox.blade.php b/packages/Webkul/Admin/src/Resources/views/components/tree/checkbox.blade.php index 25631091719..9ccb2dbf390 100644 --- a/packages/Webkul/Admin/src/Resources/views/components/tree/checkbox.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/components/tree/checkbox.blade.php @@ -1,5 +1,4 @@ @pushOnce('scripts') - - -@endPushOnce \ No newline at end of file +@endPushOnce diff --git a/packages/Webkul/Admin/src/Resources/views/components/tree/item.blade.php b/packages/Webkul/Admin/src/Resources/views/components/tree/item.blade.php index ef8855159d0..825fd2e7378 100644 --- a/packages/Webkul/Admin/src/Resources/views/components/tree/item.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/components/tree/item.blade.php @@ -1,9 +1,8 @@ @pushOnce('scripts') - -@endPushOnce \ No newline at end of file +@endPushOnce diff --git a/packages/Webkul/Admin/src/Resources/views/components/tree/radio.blade.php b/packages/Webkul/Admin/src/Resources/views/components/tree/radio.blade.php index 89e9c716af0..fa6ca4e0b03 100644 --- a/packages/Webkul/Admin/src/Resources/views/components/tree/radio.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/components/tree/radio.blade.php @@ -1,5 +1,4 @@ @pushOnce('scripts') - - -@endPushOnce \ No newline at end of file +@endPushOnce diff --git a/packages/Webkul/Admin/src/Resources/views/components/tree/view.blade.php b/packages/Webkul/Admin/src/Resources/views/components/tree/view.blade.php index e708bd7ccc2..928e9cc3f28 100644 --- a/packages/Webkul/Admin/src/Resources/views/components/tree/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/components/tree/view.blade.php @@ -1,18 +1,20 @@ @props([ - 'inputType' => 'checkbox' + 'inputType' => 'checkbox', + 'isAcl' => 'false', ]) -except('input-type') }} +except(['input-type', 'is-acl']) }} input-type="{{ $inputType }}" + :is-acl="{{ $isAcl }}" > - + @pushOnce('scripts') @@ -148,7 +157,7 @@ class: [ @if ($inputType == 'checkbox') -@else +@else @endif diff --git a/packages/Webkul/Admin/src/Resources/views/settings/roles/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/roles/create.blade.php index 14740b61e45..6c36046b1b0 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/roles/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/roles/create.blade.php @@ -3,7 +3,7 @@ @lang('admin::app.settings.roles.create.title') - + {!! view_render_event('bagisto.admin.settings.roles.create.before') !!} @@ -32,8 +32,8 @@ class="transparent-button hover:bg-gray-200 dark:hover:bg-gray-800 dark:text-whi -