diff --git a/composer.json b/composer.json index e5350eb..1494cd7 100644 --- a/composer.json +++ b/composer.json @@ -7,6 +7,7 @@ "laravel" ], "license": "MIT", + "version": "8.2.2", "require": { "php": "^8.0.2", "anlutro/l4-settings": "^1.3", @@ -28,6 +29,7 @@ "livewire/livewire": "^3.0", "mhmiton/laravel-modules-livewire": "^2.1", "nwidart/laravel-modules": "^10.0", + "pharaonic/livewire-select2": "^1.2", "putrakuningan/logs-module": "dev-master", "putrakuningan/usermanager-module": "dev-sit", "simplesoftwareio/simple-qrcode": "^4.2", diff --git a/public/vendor/pharaonic/pharaonic.select2.min.js b/public/vendor/pharaonic/pharaonic.select2.min.js new file mode 100644 index 0000000..7b67384 --- /dev/null +++ b/public/vendor/pharaonic/pharaonic.select2.min.js @@ -0,0 +1 @@ +var Pharaonic;void 0===Pharaonic&&(Pharaonic={});var PharaonicSelect2={Select2:{init:function(){$('[data-pharaonic="select2"]:not("[data-select2-id]")').each(function(){Pharaonic.Select2.load($(this),$(this).is("[data-component-id]")?$(this).data("component-id"):null)})},load:function(a,e){var t,i,n,l,d;e&&(t={multiple:$(a).is("[multiple]"),tags:$(a).is("[data-tags]"),placeholder:$(a).is("[data-placeholder]")?$(a).data("placeholder"):"Select an option",language:$(a).is("[data-language]")?$(a).data("language"):"en",dir:$(a).is("[data-dir]")?$(a).data("dir"):"ltr",dropdownParent:$(a).is("[data-parent]")?$($(a).data("parent")):null,minimumResultsForSearch:$(a).is("[data-search-off]")?-1:0,allowClear:$(a).is("[data-clear]")},n=(i=a[0].attributes).getNamedItem("wire:model")||i.getNamedItem("wire:model.defer")||null,i.getNamedItem("class")||$(a).attr("class","form-select"),delete i,(a=$(a).select2(t))&&(l=n.value,d=0{Pharaonic.Select2.init()}),window.addEventListener("pharaonic.select2.load",a=>{Pharaonic.Select2.load($(a.detail.target),a.detail.component)}); diff --git a/resources/_keenthemes/src/js/components/search.js b/resources/_keenthemes/src/js/components/search.js index 97a91ea..8a1bfa2 100644 --- a/resources/_keenthemes/src/js/components/search.js +++ b/resources/_keenthemes/src/js/components/search.js @@ -50,6 +50,7 @@ var KTSearch = function(element, options) { the.toggleElement = _getElement('toggle'); the.submitElement = _getElement('submit'); the.toolbarElement = _getElement('toolbar'); + the.minLength = parseInt(_getOption('min-length')); the.resultsElement = _getElement('results'); the.suggestionElement = _getElement('suggestion'); @@ -146,7 +147,7 @@ var KTSearch = function(element, options) { var _focus = function() { the.element.classList.add('focus'); - if ( _getOption('show-on-focus') === true || the.inputElement.value.length >= minLength ) { + if ( _getOption('show-on-focus') === true || the.inputElement.value.length >= the.minLength ) { _show(); } } @@ -170,9 +171,7 @@ var KTSearch = function(element, options) { // Input var _input = function() { if ( _getOption('min-length') ) { - var minLength = parseInt(_getOption('min-length')); - - if ( the.inputElement.value.length >= minLength ) { + if ( the.inputElement.value.length >= the.minLength ) { _search(); } else if ( the.inputElement.value.length === 0 ) { _clear(); diff --git a/resources/_keenthemes/src/media/stock/600x600/img-87.jpg b/resources/_keenthemes/src/media/stock/600x600/img-87.jpg new file mode 100644 index 0000000..082e4be Binary files /dev/null and b/resources/_keenthemes/src/media/stock/600x600/img-87.jpg differ diff --git a/resources/_keenthemes/src/sass/components/_badge.scss b/resources/_keenthemes/src/sass/components/_badge.scss index 6886d3c..f1d7c05 100644 --- a/resources/_keenthemes/src/sass/components/_badge.scss +++ b/resources/_keenthemes/src/sass/components/_badge.scss @@ -63,13 +63,23 @@ &.badge-outline { border: 1px solid var(--#{$prefix}#{$name}); - color: var(--#{$prefix}#{$name}); background-color: transparent; + + @if $name == 'secondary' { + color: var(--#{$prefix}#{$name}-inverse); + } @else { + color: var(--#{$prefix}#{$name}); + } } } - .badge-light-#{$name} { - color: var(--#{$prefix}#{$name}); + .badge-light-#{$name} { background-color: var(--#{$prefix}#{$name}-light); + + @if $name == 'secondary' { + color: var(--#{$prefix}#{$name}-inverse); + } @else { + color: var(--#{$prefix}#{$name}); + } } } diff --git a/resources/_keenthemes/src/sass/components/_card.scss b/resources/_keenthemes/src/sass/components/_card.scss index 6ab6fbb..2941657 100644 --- a/resources/_keenthemes/src/sass/components/_card.scss +++ b/resources/_keenthemes/src/sass/components/_card.scss @@ -260,6 +260,10 @@ padding: $card-py $card-px !important; } +.card-border { + border: $card-border-width $card-border-style var(--#{$prefix}root-card-border-color) !important; +} + .card-px { padding-left: $card-px !important; padding-right: $card-px !important; diff --git a/resources/_keenthemes/src/sass/components/_variables.scss b/resources/_keenthemes/src/sass/components/_variables.scss index 629381d..ac54e4d 100644 --- a/resources/_keenthemes/src/sass/components/_variables.scss +++ b/resources/_keenthemes/src/sass/components/_variables.scss @@ -57,15 +57,15 @@ $primary-clarity: rgba(#1B84FF, 0.2) !default; $primary-inverse: $white !default; // Secondary colors -$secondary: #F9F9F9 !default; -$secondary-active: $gray-300 !default; +$secondary: $gray-200 !default; +$secondary-active: $gray-400 !default; $secondary-light: #F9F9F9 !default; $secondary-clarity: rgba(#F9F9F9, 0.2) !default; $secondary-inverse: $gray-800 !default; // Light colors $light: $gray-100 !default; -$light-active: #FCFCFC !default; +$light-active: $gray-200 !default; $light-light: #ffffff !default; $light-clarity: rgba($white, 0.2) !default; $light-inverse: $gray-800 !default; diff --git a/resources/_keenthemes/src/sass/components/buttons/_theme.scss b/resources/_keenthemes/src/sass/components/buttons/_theme.scss index 818c9eb..df520fc 100644 --- a/resources/_keenthemes/src/sass/components/buttons/_theme.scss +++ b/resources/_keenthemes/src/sass/components/buttons/_theme.scss @@ -60,6 +60,11 @@ .btn.btn-light-#{$name} { $color: var(--#{$prefix}#{$name}); $icon-color: var(--#{$prefix}#{$name}); + @if $name == 'secondary' { + $color: var(--#{$prefix}#{$name}-inverse); + $icon-color: var(--#{$prefix}#{$name}-inverse); + } + $border-color: var(--#{$prefix}#{$name}-light); $bg-color: var(--#{$prefix}#{$name}-light); @@ -112,6 +117,11 @@ $color-active: var(--#{$prefix}#{$name}); $icon-color-active: var(--#{$prefix}#{$name}); + @if $name == 'secondary' { + $color-active: var(--#{$prefix}#{$name}-inverse); + $icon-color-active: var(--#{$prefix}#{$name}-inverse); + } + $border-color-active: var(--#{$prefix}#{$name}-light); $bg-color-active: var(--#{$prefix}#{$name}-light); @@ -124,13 +134,27 @@ $color: var(--#{$prefix}#{$name}); $icon-color: var(--#{$prefix}#{$name}); $border-color: var(--#{$prefix}#{$name}); + + @if $name == 'secondary' { + $color: var(--#{$prefix}#{$name}-inverse); + $icon-color: var(--#{$prefix}#{$name}-inverse); + $border-color: var(--#{$prefix}#{$name}-inverse); + } + $bg-color: transparent; $color-active: var(--#{$prefix}#{$name}-active); $icon-color-active: var(--#{$prefix}#{$name}-active); $border-color-active: var(--#{$prefix}#{$name}); + @if $name == 'secondary' { + $color-active: var(--#{$prefix}#{$name}-inverse); + $icon-color-active: var(--#{$prefix}#{$name}-inverse); + $border-color-active: var(--#{$prefix}#{$name}-inverse); + } + $bg-color-active: var(--#{$prefix}#{$name}-light); + @include button-custom-variant($color, $icon-color, $border-color, $bg-color, $color-active, $icon-color-active, $border-color-active, $bg-color-active); } } @@ -257,6 +281,12 @@ $bg-color-active: get($value, base); $border-color-active: get($value, base); + @if $name == 'secondary' { + color: var(--#{$prefix}#{$name}-inverse); + } @else { + color: var(--#{$prefix}#{$name}); + } + @include button-custom-variant($color, $icon-color, $border-color, $bg-color, $color-active, $icon-color-active, $border-color-active, $bg-color-active); } } diff --git a/resources/_keenthemes/src/sass/components/helpers/_borders.scss b/resources/_keenthemes/src/sass/components/helpers/_borders.scss index 21e7dbe..68af155 100644 --- a/resources/_keenthemes/src/sass/components/helpers/_borders.scss +++ b/resources/_keenthemes/src/sass/components/helpers/_borders.scss @@ -21,6 +21,10 @@ // Hover border colors @each $name, $value in $theme-colors { + .border-#{$name}-clarity { + border-color: var(--#{$prefix}#{$name}-clarity) !important; + } + .border-hover-#{$name}:hover { border-color: var(--#{$prefix}#{$name}) !important; } @@ -30,6 +34,11 @@ } } +.border-hover-primary-clarity:hover, +.border-active-primary-clarity.active { + border-color: var(--#{$prefix}primary-clarity) !important; +} + // Hover transparent .border-hover-transparent:hover { border-color: transparent !important; diff --git a/resources/_keenthemes/src/sass/vendors/plugins/_datatables.scss b/resources/_keenthemes/src/sass/vendors/plugins/_datatables.scss index f396d40..dc44e20 100644 --- a/resources/_keenthemes/src/sass/vendors/plugins/_datatables.scss +++ b/resources/_keenthemes/src/sass/vendors/plugins/_datatables.scss @@ -266,7 +266,27 @@ table.dataTable tbody tr > .dtfc-fixed-right { // Child details .dtr-details { + display: table !important; + li { - display: flex; + display: table-row !important; + + .dtr-title { + padding-right: 0.75rem; + color: var(--#{$prefix}gray-900); + } + + .dtr-data { + color: var(--#{$prefix}gray-700); + } + + .dtr-title, + .dtr-data { + font-size: 1rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; + display: table-cell !important; + border-bottom: 1px solid var(--#{$prefix}border-color); + } } } diff --git a/resources/_keenthemes/tools/package.json b/resources/_keenthemes/tools/package.json index 418cb5b..1fcad4e 100644 --- a/resources/_keenthemes/tools/package.json +++ b/resources/_keenthemes/tools/package.json @@ -1,40 +1,40 @@ { "name": "keenthemes", - "version": "8.2.1", + "version": "1.0.0", "author": "Keenthemes", "homepage": "https://keenthemes.com/", "description": "Packages used by yarn, npm, gulp and webpack", "main": "gulpfile.js", "type": "module", "dependencies": { - "@ckeditor/ckeditor5-alignment": "40.0.0", - "@ckeditor/ckeditor5-build-balloon": "40.0.0", - "@ckeditor/ckeditor5-build-balloon-block": "40.0.0", - "@ckeditor/ckeditor5-build-classic": "40.0.0", - "@ckeditor/ckeditor5-build-decoupled-document": "40.0.0", - "@ckeditor/ckeditor5-build-inline": "40.0.0", - "@eonasdan/tempus-dominus": "^6.7.16", - "@fortawesome/fontawesome-free": "^6.4.2", + "@ckeditor/ckeditor5-alignment": "40.2.0", + "@ckeditor/ckeditor5-build-balloon": "40.2.0", + "@ckeditor/ckeditor5-build-balloon-block": "40.2.0", + "@ckeditor/ckeditor5-build-classic": "40.2.0", + "@ckeditor/ckeditor5-build-decoupled-document": "40.2.0", + "@ckeditor/ckeditor5-build-inline": "40.2.0", + "@eonasdan/tempus-dominus": "^6.9.4", + "@fortawesome/fontawesome-free": "^6.5.1", "@popperjs/core": "2.11.8", "@shopify/draggable": "^1.1.3", "@yaireo/tagify": "^4.17.9", "acorn": "^8.10.0", - "apexcharts": "3.44.0", + "apexcharts": "3.45.1", "autosize": "^6.0.1", - "axios": "^1.6.0", + "axios": "^1.6.2", "bootstrap": "5.3.2", "bootstrap-cookie-alert": "^1.2.2", "bootstrap-daterangepicker": "^3.1.0", - "bootstrap-icons": "^1.11.1", + "bootstrap-icons": "^1.11.2", "bootstrap-maxlength": "^1.10.1", "bootstrap-multiselectsplitter": "^1.0.4", "chalk": "^5.3.0", - "chart.js": "^4.4.0", + "chart.js": "^4.4.1", "clipboard": "^2.0.11", "countup.js": "^2.8.0", "cropperjs": "^1.6.1", - "datatables.net": "^1.13.6", - "datatables.net-bs5": "^1.13.6", + "datatables.net": "^1.13.8", + "datatables.net-bs5": "^1.13.8", "datatables.net-buttons": "^2.4.2", "datatables.net-buttons-bs5": "^2.4.2", "datatables.net-colreorder": "^1.7.0", @@ -51,15 +51,15 @@ "datatables.net-rowgroup-bs5": "^1.4.1", "datatables.net-rowreorder": "^1.4.1", "datatables.net-rowreorder-bs5": "^1.4.1", - "datatables.net-scroller": "^2.2.0", - "datatables.net-scroller-bs5": "^2.2.0", + "datatables.net-scroller": "^2.3.0", + "datatables.net-scroller-bs5": "^2.3.0", "datatables.net-select": "^1.7.0", "datatables.net-select-bs5": "^1.7.0", "dropzone": "^5.9.3", "es6-promise": "^4.2.8", "es6-promise-polyfill": "^1.2.0", "es6-shim": "^0.35.8", - "esri-leaflet": "^3.0.11", + "esri-leaflet": "^3.0.12", "esri-leaflet-geocoder": "^3.1.4", "flatpickr": "^4.6.13", "flot": "^4.2.6", @@ -77,8 +77,8 @@ "lozad": "^1.16.0", "moment": "^2.29.4", "nouislider": "^15.7.1", - "npm": "^10.2.1", - "pdfmake": "^0.2.7", + "npm": "^10.2.5", + "pdfmake": "^0.2.8", "prism-themes": "^1.9.0", "prismjs": "^1.29.0", "quill": "^1.3.7", @@ -88,7 +88,7 @@ "tiny-slider": "^2.9.4", "tinymce": "^5.8.2", "toastr": "^2.1.4", - "typed.js": "2.0.16", + "typed.js": "2.1.0", "vis-timeline": "^7.7.3", "wnumb": "^1.2.0" }, diff --git a/resources/mix/plugins.js b/resources/mix/plugins.js index 454c0d8..005f021 100644 --- a/resources/mix/plugins.js +++ b/resources/mix/plugins.js @@ -36,7 +36,7 @@ module.exports = [ // Select2 - Select2 is a jQuery based replacement for select boxes: https://select2.org/ 'node_modules/select2/dist/js/select2.full.js', - 'resources/_keenthemes/src//js/vendors/plugins/select2.init.js', + 'resources/_keenthemes/src/js/vendors/plugins/select2.init.js', // FormValidation - Best premium validation library for JavaScript. Zero dependencies. Learn more: https://formvalidation.io/ "resources/_keenthemes/src/plugins/@form-validation/umd/bundle/popular.min.js", @@ -64,7 +64,7 @@ module.exports = [ // DropzoneJS - is an open source library that provides drag'n'drop file uploads with image previews: https://www.dropzonejs.com/ 'node_modules/dropzone/dist/min/dropzone.min.js', - 'resources/_keenthemes/src//js/vendors/plugins/dropzone.init.js', + 'resources/_keenthemes/src/js/vendors/plugins/dropzone.init.js', // Quill - is a free, open source WYSIWYG editor built for the modern web. Completely customize it for any need with its modular architecture and expressive API: https://quilljs.com/ 'node_modules/quill/dist/quill.js', @@ -84,13 +84,13 @@ module.exports = [ // Sweetalert2 - a beautiful, responsive, customizable and accessible (WAI-ARIA) replacement for JavaScript's popup boxes: https://sweetalert2.github.io/ 'node_modules/sweetalert2/dist/sweetalert2.min.js', - 'resources/_keenthemes/src//js/vendors/plugins/sweetalert2.init.js', + 'resources/_keenthemes/src/js/vendors/plugins/sweetalert2.init.js', // CountUp.js - is a dependency-free, lightweight JavaScript class that can be used to quickly create animations that display numerical data in a more interesting way. 'node_modules/countup.js/dist/countUp.umd.js', // Chart.js - Simple yet flexible JavaScript charting for designers & developers - 'node_modules/chart.js/dist/chart.js', + 'node_modules/chart.js/dist/chart.umd.js', // Tiny slider - for all purposes, inspired by Owl Carousel. 'node_modules/tiny-slider/dist/min/tiny-slider.js', @@ -107,8 +107,3 @@ module.exports = [ 'node_modules/@eonasdan/tempus-dominus/dist/js/tempus-dominus.min.js', 'node_modules/@eonasdan/tempus-dominus/dist/plugins/customDateFormat.js', ]; - -// window.axios.defaults.headers.common = { -// 'X-Requested-With': 'XMLHttpRequest', -// 'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').getAttribute('content') -// }; diff --git a/resources/mix/plugins.scss b/resources/mix/plugins.scss index 4bc480d..f112cb7 100644 --- a/resources/mix/plugins.scss +++ b/resources/mix/plugins.scss @@ -56,7 +56,7 @@ @import "~tiny-slider/dist/tiny-slider.css"; // Keenthemes Vendors customization -@import "../_keenthemes/src//sass/plugins"; +@import "../_keenthemes/src/sass/plugins"; // Keenicons - High quality and pixel perfect font icons available in 3 styles, duotone, outline and solid for Metronic elements @import "../_keenthemes/src/plugins/keenicons/duotone/style.css"; diff --git a/resources/mix/scripts.js b/resources/mix/scripts.js index b2059fd..759d52a 100644 --- a/resources/mix/scripts.js +++ b/resources/mix/scripts.js @@ -1,8 +1,8 @@ const glob = require('glob'); // Keenthemes' plugins -var componentJs = glob.sync(`resources/_keenthemes/src//js/components/*.js`) || []; -var coreLayoutJs = glob.sync(`resources/_keenthemes/src//js/layout/*.js`) || []; +var componentJs = glob.sync(`resources/_keenthemes/src/js/components/*.js`) || []; +var coreLayoutJs = glob.sync(`resources/_keenthemes/src/js/layout/*.js`) || []; module.exports = [ ...componentJs, diff --git a/resources/mix/vendors/datatables/datatables.bundle.js b/resources/mix/vendors/datatables/datatables.bundle.js index 1d159e6..4829498 100644 --- a/resources/mix/vendors/datatables/datatables.bundle.js +++ b/resources/mix/vendors/datatables/datatables.bundle.js @@ -2,7 +2,7 @@ module.exports = [ 'node_modules/datatables.net/js/jquery.dataTables.js', 'node_modules/datatables.net-bs5/js/dataTables.bootstrap5.js', - 'resources/_keenthemes/src//js/vendors/plugins/datatables.init.js', + 'resources/_keenthemes/src/js/vendors/plugins/datatables.init.js', 'node_modules/jszip/dist/jszip.js', 'node_modules/pdfmake/build/pdfmake.js', 'node_modules/pdfmake/build/vfs_fonts.js', diff --git a/resources/mix/vendors/formrepeater/formrepeater.bundle.js b/resources/mix/vendors/formrepeater/formrepeater.bundle.js index 3b21f5f..3c392af 100644 --- a/resources/mix/vendors/formrepeater/formrepeater.bundle.js +++ b/resources/mix/vendors/formrepeater/formrepeater.bundle.js @@ -1,5 +1,7 @@ // Form Repeater - Creates an interface to add and remove a repeatable group of input elements: https://github.com/DubFriend/jquery.repeater module.exports = [ - 'node_modules/jquery.repeater/jquery.repeater.js' + 'node_modules/jquery.repeater/src/lib.js', + 'node_modules/jquery.repeater/src/jquery.input.js', + 'node_modules/jquery.repeater/src/repeater.js', ]; diff --git a/resources/views/layout/_auth.blade.php b/resources/views/layout/_auth.blade.php index e938cbf..f4365a9 100644 --- a/resources/views/layout/_auth.blade.php +++ b/resources/views/layout/_auth.blade.php @@ -23,12 +23,8 @@
-
- Terms - - Plans - - Contact Us +
+ PT Indo Artha Teknologi © {{ date('Y') }} - Daeng Deni Mardaeni
@@ -40,32 +36,11 @@
- - - Logo - - - - + - -

- Fast, Efficient and Productive -

- - -
- In this kind of post, the blogger - - introduces a person they’ve interviewed
and provides some background information about - - the interviewee - and their
work following this is a transcript of the interview. -
-
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index 6dd123e..f8fca7b 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -71,7 +71,7 @@ @endpush \ No newline at end of file diff --git a/resources/views/livewire/permission/role-modal.blade.php b/resources/views/livewire/permission/role-modal.blade.php index 98bcba2..8850889 100644 --- a/resources/views/livewire/permission/role-modal.blade.php +++ b/resources/views/livewire/permission/role-modal.blade.php @@ -18,7 +18,7 @@
-
+
@@ -30,7 +30,7 @@ - + @error('name') {{ $message }} @enderror @@ -57,7 +57,7 @@ @@ -77,7 +77,7 @@
@@ -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')]); }); @endpush \ No newline at end of file diff --git a/resources/views/livewire/user/add-user-modal.blade.php b/resources/views/livewire/user/add-user-modal.blade.php index aa211fa..fa5f9ac 100644 --- a/resources/views/livewire/user/add-user-modal.blade.php +++ b/resources/views/livewire/user/add-user-modal.blade.php @@ -18,8 +18,8 @@
- - + +
@@ -51,7 +51,7 @@ @@ -81,7 +81,7 @@ - + @error('name') {{ $message }} @enderror @@ -93,7 +93,7 @@ - + @error('email') {{ $message }} @enderror @@ -113,7 +113,7 @@
- +