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
12 changed files with 19992 additions and 8419 deletions
Showing only changes of commit fcd9b89011 - Show all commits

View File

@ -103,6 +103,11 @@
"name": "putrakuningan/usermanager-module",
"type": "vcs",
"url": "https://git.putrakuningan.com/putrakuningan/Usermanager"
},
{
"name": "putrakuningan/writeoff-module",
"type": "vcs",
"url": "https://git.putrakuningan.com/putrakuningan/Writeoff"
}
]
}

13049
package-lock.json generated

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -5,22 +5,9 @@
<!--begin::Copyright-->
<div class="text-gray-900 order-2 order-md-1">
<span class="text-muted fw-semibold me-1">{{ date('Y') }}&copy;</span>
<a href="https://keenthemes.com" target="_blank" class="text-gray-800 text-hover-primary">Keenthemes</a>
<a href="https://putrakuningan.com" target="_blank" class="text-gray-800 text-hover-primary">Daeng Deni Mardaeni</a>
</div>
<!--end::Copyright-->
<!--begin::Menu-->
<ul class="menu menu-gray-600 menu-hover-primary fw-semibold order-1">
<li class="menu-item">
<a href="https://keenthemes.com" target="_blank" class="menu-link px-2">About</a>
</li>
<li class="menu-item">
<a href="https://devs.keenthemes.com" target="_blank" class="menu-link px-2">Support</a>
</li>
<li class="menu-item">
<a href="https://1.envato.market/EA4JP" target="_blank" class="menu-link px-2">Purchase</a>
</li>
</ul>
<!--end::Menu-->
</div>
<!--end::Footer container-->
</div>

View File

@ -2,6 +2,5 @@
<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-->

View File

@ -1,41 +1,6 @@
<!--begin::Navbar-->
<div class="app-navbar flex-shrink-0">
<!--begin::Search-->
<div class="app-navbar-item align-items-stretch ms-1 ms-md-3">
@include(config('settings.KT_THEME_LAYOUT_DIR').'/partials/sidebar-layout/search/_dropdown')
</div>
<!--end::Search-->
<!--begin::Activities-->
<div class="app-navbar-item ms-1 ms-md-4">
<!--begin::Drawer toggle-->
<div class="btn btn-icon btn-custom btn-icon-muted btn-active-light btn-active-color-primary w-35px h-35px" id="kt_activities_toggle">{!! getIcon('messages', 'fs-2') !!}</div>
<!--end::Drawer toggle-->
</div>
<!--end::Activities-->
<!--begin::Notifications-->
<div class="app-navbar-item ms-1 ms-md-4">
<!--begin::Menu- wrapper-->
<div class="btn btn-icon btn-custom btn-icon-muted btn-active-light btn-active-color-primary w-35px h-35px" data-kt-menu-trigger="{default: 'click', lg: 'hover'}" data-kt-menu-attach="parent" data-kt-menu-placement="bottom-end" id="kt_menu_item_wow">{!! getIcon('notification-status', 'fs-2') !!}</div>
@include('partials/menus/_notifications-menu')
<!--end::Menu wrapper-->
</div>
<!--end::Notifications-->
<!--begin::Chat-->
<div class="app-navbar-item ms-1 ms-md-4">
<!--begin::Menu wrapper-->
<div class="btn btn-icon btn-custom btn-icon-muted btn-active-light btn-active-color-primary w-35px h-35px position-relative" id="kt_drawer_chat_toggle">{!! getIcon('message-text-2', 'fs-2') !!}
<span class="bullet bullet-dot bg-success h-6px w-6px position-absolute translate-middle top-0 start-50 animation-blink"></span></div>
<!--end::Menu wrapper-->
</div>
<!--end::Chat-->
<!--begin::My apps links-->
<div class="app-navbar-item ms-1 ms-md-4">
<!--begin::Menu wrapper-->
<div class="btn btn-icon btn-custom btn-icon-muted btn-active-light btn-active-color-primary w-35px h-35px" data-kt-menu-trigger="{default: 'click', lg: 'hover'}" data-kt-menu-attach="parent" data-kt-menu-placement="bottom-end">{!! getIcon('element-11', 'fs-2') !!}</div>
@include('partials/menus/_my-apps-menu')
<!--end::Menu wrapper-->
</div>
<!--end::My apps links-->
<!--begin::User menu-->
<div class="app-navbar-item ms-1 ms-md-4" id="kt_header_user_menu_toggle">
<!--begin::Menu wrapper-->

View File

@ -1,9 +1,9 @@
<!--begin::Logo-->
<div class="app-sidebar-logo px-6" id="kt_app_sidebar_logo">
<!--begin::Logo image-->
<a href="{{ route('dashboard') }}">
<img alt="Logo" src="{{ image('logos/default-dark.svg') }}" class="h-25px app-sidebar-logo-default" />
<img alt="Logo" src="{{ image('logos/default-small.svg') }}" class="h-20px app-sidebar-logo-minimize" />
<a href="{{ route('dashboard') }}" style="margin:0px auto">
<img alt="Logo" src="{{ image('logos/logo_agi.png') }}" class="h-50px app-sidebar-logo-default" />
<img alt="Logo" src="{{ image('logos/logo_agi.png') }}" class="h-20px app-sidebar-logo-minimize" style="float:left" />
</a>
<!--end::Logo image-->
<!--begin::Sidebar toggle-->

View File

@ -8,87 +8,4 @@
{{ Breadcrumbs::render('dashboard') }}
@endsection
<!--begin::Row-->
<div class="row g-5 g-xl-10 mb-5 mb-xl-10">
<!--begin::Col-->
<div class="col-md-6 col-lg-6 col-xl-6 col-xxl-3 mb-md-5 mb-xl-10">
@include('partials/widgets/cards/_widget-20')
@include('partials/widgets/cards/_widget-7')
</div>
<!--end::Col-->
<!--begin::Col-->
<div class="col-md-6 col-lg-6 col-xl-6 col-xxl-3 mb-md-5 mb-xl-10">
@include('partials/widgets/cards/_widget-17')
@include('partials/widgets/lists/_widget-26')
</div>
<!--end::Col-->
<!--begin::Col-->
<div class="col-xxl-6">
@include('partials/widgets/engage/_widget-10')
</div>
<!--end::Col-->
</div>
<!--end::Row-->
<!--begin::Row-->
<div class="row gx-5 gx-xl-10">
<!--begin::Col-->
<div class="col-xxl-6 mb-5 mb-xl-10">
@include('partials/widgets/charts/_widget-8')
</div>
<!--end::Col-->
<!--begin::Col-->
<div class="col-xl-6 mb-5 mb-xl-10">
@include('partials/widgets/tables/_widget-16')
</div>
<!--end::Col-->
</div>
<!--end::Row-->
<!--begin::Row-->
<div class="row g-5 g-xl-10 mb-5 mb-xl-10">
<!--begin::Col-->
<div class="col-xxl-6">
@include('partials/widgets/cards/_widget-18')
</div>
<!--end::Col-->
<!--begin::Col-->
<div class="col-xl-6">
@include('partials/widgets/charts/_widget-36')
</div>
<!--end::Col-->
</div>
<!--end::Row-->
<!--begin::Row-->
<div class="row g-5 g-xl-10 mb-5 mb-xl-10">
<!--begin::Col-->
<div class="col-xl-4">
@include('partials/widgets/charts/_widget-35')
</div>
<!--end::Col-->
<!--begin::Col-->
<div class="col-xl-8">
@include('partials/widgets/tables/_widget-14')
</div>
<!--end::Col-->
</div>
<!--end::Row-->
<!--begin::Row-->
<div class="row gx-5 gx-xl-10">
<!--begin::Col-->
<div class="col-xl-4">
@include('partials/widgets/charts/_widget-31')
</div>
<!--end::Col-->
<!--begin::Col-->
<div class="col-xl-8">
@include('partials/widgets/charts/_widget-24')
</div>
<!--end::Col-->
</div>
<!--end::Row-->
</x-default-layout>

View File

@ -16,9 +16,7 @@
<!--end::Avatar-->
<!--begin::Username-->
<div class="d-flex flex-column">
<div class="fw-bold d-flex align-items-center fs-5">{{ Auth::user()->name}}
<span class="badge badge-light-success fw-bold fs-8 px-2 py-1 ms-2">Pro</span>
</div>
<div class="fw-bold d-flex align-items-center fs-5">{{ Auth::user()->name}}</div>
<a href="#" class="fw-semibold text-muted text-hover-primary fs-7">{{ Auth::user()->email }}</a>
</div>
<!--end::Username-->
@ -33,67 +31,6 @@
<a href="#" class="menu-link px-5">My Profile</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-5">
<a href="#" class="menu-link px-5">
<span class="menu-text">My Projects</span>
<span class="menu-badge">
<span class="badge badge-light-danger badge-circle fw-bold fs-7">3</span>
</span>
</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-5" data-kt-menu-trigger="{default: 'click', lg: 'hover'}" data-kt-menu-placement="left-start" data-kt-menu-offset="-15px, 0">
<a href="#" class="menu-link px-5">
<span class="menu-title">My Subscription</span>
<span class="menu-arrow"></span>
</a>
<!--begin::Menu sub-->
<div class="menu-sub menu-sub-dropdown w-175px py-4">
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="#" class="menu-link px-5">Referrals</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="#" class="menu-link px-5">Billing</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="#" class="menu-link px-5">Payments</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="#" class="menu-link d-flex flex-stack px-5">Statements
<span class="ms-2 lh-0" data-bs-toggle="tooltip" title="View your statements">{!! getIcon('information-5', 'fs-5') !!}</span></a>
</div>
<!--end::Menu item-->
<!--begin::Menu separator-->
<div class="separator my-2"></div>
<!--end::Menu separator-->
<!--begin::Menu item-->
<div class="menu-item px-3">
<div class="menu-content px-3">
<label class="form-check form-switch form-check-custom form-check-solid">
<input class="form-check-input w-30px h-20px" type="checkbox" value="1" checked="checked" name="notifications" />
<span class="form-check-label text-muted fs-7">Notifications</span>
</label>
</div>
</div>
<!--end::Menu item-->
</div>
<!--end::Menu sub-->
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-5">
<a href="#" class="menu-link px-5">My Statements</a>
</div>
<!--end::Menu item-->
<!--begin::Menu separator-->
<div class="separator my-2"></div>
<!--end::Menu separator-->
@ -107,70 +44,6 @@
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-5" data-kt-menu-trigger="{default: 'click', lg: 'hover'}" data-kt-menu-placement="left-start" data-kt-menu-offset="-15px, 0">
<a href="#" class="menu-link px-5">
<span class="menu-title position-relative">Language
<span class="fs-8 rounded bg-light px-3 py-2 position-absolute translate-middle-y top-50 end-0">English
<img class="w-15px h-15px rounded-1 ms-2" src="{{ image('flags/united-states.svg') }}" alt="" /></span>
</span>
</a>
<!--begin::Menu sub-->
<div class="menu-sub menu-sub-dropdown w-175px py-4">
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="#" class="menu-link d-flex px-5 active">
<span class="symbol symbol-20px me-4">
<img class="rounded-1" src="{{ image('flags/united-states.svg') }}" alt=""/>
</span>
English</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="#" class="menu-link d-flex px-5">
<span class="symbol symbol-20px me-4">
<img class="rounded-1" src="{{ image('flags/spain.svg') }}" alt=""/>
</span>
Spanish</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="#" class="menu-link d-flex px-5">
<span class="symbol symbol-20px me-4">
<img class="rounded-1" src="{{ image('flags/germany.svg') }}" alt=""/>
</span>
German</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="#" class="menu-link d-flex px-5">
<span class="symbol symbol-20px me-4">
<img class="rounded-1" src="{{ image('flags/japan.svg') }}" alt=""/>
</span>
Japanese</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-3">
<a href="#" class="menu-link d-flex px-5">
<span class="symbol symbol-20px me-4">
<img class="rounded-1" src="{{ image('flags/france.svg') }}" alt=""/>
</span>
French</a>
</div>
<!--end::Menu item-->
</div>
<!--end::Menu sub-->
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-5 my-1">
<a href="#" class="menu-link px-5">Account Settings</a>
</div>
<!--end::Menu item-->
<!--begin::Menu item-->
<div class="menu-item px-5">
<a class="button-ajax menu-link px-5" href="#" data-action="{{ route('logout') }}" data-method="post" data-csrf="{{ csrf_token() }}" data-reload="true">
Sign Out

View File

@ -24,12 +24,6 @@ Route::middleware(['auth', 'verified'])->group(function () {
Route::get('/dashboard', [DashboardController::class, 'index'])->name('dashboard');
Route::name('user-management.')->group(function () {
Route::resource('/user-management/users', UserManagementController::class);
Route::resource('/user-management/roles', RoleManagementController::class);
Route::resource('/user-management/permissions', PermissionManagementController::class);
});
});
Route::get('/error', function () {
@ -37,5 +31,3 @@ Route::get('/error', function () {
});
Route::get('/auth/redirect/{provider}', [SocialiteController::class, 'redirect']);
require __DIR__ . '/auth.php';

13876
yarn.lock

File diff suppressed because it is too large Load Diff