Compare commits

..

No commits in common. "fb0a4940d522d9d905c6db2467fb469f1087d735" and "2d46fa506531b942b0f1cf5567c3e986e9b67652" have entirely different histories.

9 changed files with 15 additions and 35 deletions

View File

@ -12,11 +12,11 @@
"daengdeni/laravel-id-generator": "^1.0", "daengdeni/laravel-id-generator": "^1.0",
"daengdeni/location-module": "dev-master", "daengdeni/location-module": "dev-master",
"daengdeni/logs-module": "dev-master", "daengdeni/logs-module": "dev-master",
"daengdeni/lpj-module": "dev-staging",
"daengdeni/usermanagement-module": "dev-master", "daengdeni/usermanagement-module": "dev-master",
"diglactic/laravel-breadcrumbs": "^10.0", "diglactic/laravel-breadcrumbs": "^9.0",
"intervention/image": "^3.10",
"joshbrw/laravel-module-installer": "^2.0", "joshbrw/laravel-module-installer": "^2.0",
"laravel/framework": "^12.0", "laravel/framework": "^11.9",
"laravel/pulse": "^1.2", "laravel/pulse": "^1.2",
"laravel/tinker": "^2.9", "laravel/tinker": "^2.9",
"maatwebsite/excel": "^3.1", "maatwebsite/excel": "^3.1",
@ -114,6 +114,11 @@
"name": "daengdeni/location-module", "name": "daengdeni/location-module",
"type": "vcs", "type": "vcs",
"url": "https://git.putrakuningan.com/daengdeni/location" "url": "https://git.putrakuningan.com/daengdeni/location"
},
{
"name": "daengdeni/lpj-module",
"type": "vcs",
"url": "https://git.putrakuningan.com/daengdeni/lpj"
} }
] ]
} }

View File

@ -4,6 +4,5 @@
"Usermanagement": true, "Usermanagement": true,
"Logs": true, "Logs": true,
"Authentication": true, "Authentication": true,
"Basicdata": true, "Basicdata": true
"ItSecurity": true
} }

View File

@ -14,7 +14,7 @@
"prettier-plugin-tailwindcss": "^0.6.6", "prettier-plugin-tailwindcss": "^0.6.6",
"sass": "^1.77.6", "sass": "^1.77.6",
"tailwindcss": "^3.4.13", "tailwindcss": "^3.4.13",
"vite": "^5.4.14" "vite": "5.4.6"
}, },
"dependencies": { "dependencies": {
"@popperjs/core": "^2.11.8", "@popperjs/core": "^2.11.8",
@ -28,7 +28,7 @@
"mini-svg-data-uri": "^1.4.4", "mini-svg-data-uri": "^1.4.4",
"notie": "^4.3.1", "notie": "^4.3.1",
"pdfobject": "^2.3.0", "pdfobject": "^2.3.0",
"sweetalert2": "^11.6.13", "sweetalert2": "^11.14.3",
"toastr": "^2.1.4", "toastr": "^2.1.4",
"tom-select": "^2.3.1" "tom-select": "^2.3.1"
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -7,7 +7,6 @@ import TomSelect from "tom-select";
import toast from "toastr"; import toast from "toastr";
import "toastr/build/toastr.css"; import "toastr/build/toastr.css";
import IMask from "imask"; import IMask from "imask";
// import FilerobotImageEditor from "filerobot-image-editor";
window.jQuery = $; window.jQuery = $;
window.$ = $; window.$ = $;
@ -16,18 +15,13 @@ window.Swal = Swal;
window.swal = Swal; window.swal = Swal;
window.IMask = IMask; window.IMask = IMask;
// window.FilerobotImageEditor = FilerobotImageEditor;
window.TomSelect = TomSelect;
document.querySelectorAll(".tomselect").forEach((el) => { document.querySelectorAll(".tomselect").forEach((el) => {
let settings = { let settings = {
plugins: ["dropdown_input", "remove_button", "clear_button"], plugins: ["dropdown_input"],
create: false, create: false,
createOnBlur: true, createOnBlur: true,
closeButton: true, closeButton: true,
html: function (data) {
return `<div class="${data.className}" title="${data.title}">&times;</div>`;
},
}; };
new TomSelect(el, settings); new TomSelect(el, settings);

View File

@ -10,8 +10,6 @@
<base href="/"> <base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
<link rel="stylesheet" href="{{ asset('vendor/dropzone/dropzone.min.css') }}" type="text/css" />
@vite(Module::getAssets()) @vite(Module::getAssets())
@stack('styles') @stack('styles')
</head> </head>
@ -26,10 +24,6 @@
<em class="hidden toastr" data-type="info" data-message=" {{ session('info') }}"></em> <em class="hidden toastr" data-type="info" data-message=" {{ session('info') }}"></em>
@endif @endif
@if (session('warning'))
<em class="hidden toastr" data-type="warning" data-message=" {{ session('warning') }}"></em>
@endif
@if (session('success')) @if (session('success'))
<em class="hidden toastr" data-type="success" data-message=" {{ session('success') }}"></em> <em class="hidden toastr" data-type="success" data-message=" {{ session('success') }}"></em>
@endif @endif
@ -57,8 +51,6 @@
} }
</script> </script>
<!--end::Theme mode setup on page load--> <!--end::Theme mode setup on page load-->
<script src="{{ asset('vendor/filerobot-image-editor/filerobot-image-editor.min.js') }}"></script>
<script src="{{ asset('vendor/dropzone/dropzone.min.js') }}"></script>
@yield('main') @yield('main')
@stack('scripts') @stack('scripts')

View File

@ -26,7 +26,7 @@
data-scrollable-wrappers="#sidebar_content" id="sidebar_scrollable" style="--tw-scrollbar-thumb-color: var(--tw-primary)"> data-scrollable-wrappers="#sidebar_content" id="sidebar_scrollable" style="--tw-scrollbar-thumb-color: var(--tw-primary)">
<div class="menu flex flex-col grow gap-0.5" data-menu="true" data-menu-accordion-expand-all="false" <div class="menu flex flex-col grow gap-0.5" data-menu="true" data-menu-accordion-expand-all="false"
id="sidebar_menu"> id="sidebar_menu">
<a class="menu-item" href="/"> <div class="menu-item" data-menu-item-toggle="accordion" data-menu-item-trigger="click">
<div <div
class="menu-link flex items-center grow cursor-pointer border border-transparent gap-[10px] pl-[10px] pr-[10px] py-[6px]" class="menu-link flex items-center grow cursor-pointer border border-transparent gap-[10px] pl-[10px] pr-[10px] py-[6px]"
tabindex="0"> tabindex="0">
@ -38,7 +38,7 @@
Dashboards Dashboards
</span> </span>
</div> </div>
</a> </div>
@php @php
$headingOtorisasi = 0; $headingOtorisasi = 0;
$headingMain = 0; $headingMain = 0;
@ -108,7 +108,7 @@
<div class="menu-accordion gap-0.5 pl-[10px] relative before:absolute before:left-[20px] before:top-0 before:bottom-0 before:border-l before:border-gray-200"> <div class="menu-accordion gap-0.5 pl-[10px] relative before:absolute before:left-[20px] before:top-0 before:bottom-0 before:border-l before:border-gray-200">
@foreach($menu->sub as $sub) @foreach($menu->sub as $sub)
@if(auth()->user()->hasRole($sub->roles)) @if(auth()->user()->hasRole($sub->roles))
<div class="menu-item {{ request()->routeIs($sub->path.'.*') && in_array(request()->route()->getName(), [$sub->path.'.index', $sub->path.'.create', $sub->path.'.edit', $sub->path.'.restore']) ? 'active' : '' }}"> <div class="menu-item {{ request()->routeIs($sub->path.'.*') && in_array(request()->route()->getName(), [$sub->path.'.index', $sub->path.'.create', $sub->path.'.edit']) ? 'active' : '' }}">
<a class="menu-link gap-[14px] pl-[10px] pr-[10px] py-[8px] border border-transparent items-center grow menu-item-active:bg-secondary-active dark:menu-item-active:bg-coal-300 dark:menu-item-active:border-gray-100 menu-item-active:rounded-lg hover:bg-secondary-active dark:hover:bg-coal-300 dark:hover:border-gray-100 hover:rounded-lg" <a class="menu-link gap-[14px] pl-[10px] pr-[10px] py-[8px] border border-transparent items-center grow menu-item-active:bg-secondary-active dark:menu-item-active:bg-coal-300 dark:menu-item-active:border-gray-100 menu-item-active:rounded-lg hover:bg-secondary-active dark:hover:bg-coal-300 dark:hover:border-gray-100 hover:rounded-lg"
href="{{ $sub->path ? route($sub->path.'.index') : '' }}" tabindex="0"> href="{{ $sub->path ? route($sub->path.'.index') : '' }}" tabindex="0">
<span <span