icon fixed

This commit is contained in:
armiejean 2025-05-22 08:19:48 +08:00
parent a8418b3bd0
commit f06ede20d5
11 changed files with 85 additions and 110 deletions

9
public/css/fontawesome.min.css vendored Normal file

File diff suppressed because one or more lines are too long

13
public/js/custom.js Normal file
View File

@ -0,0 +1,13 @@
$(document).ready(function () {
console.log('Sidebar script initialized');
$('#sidebarCollapse').on('click', function () {
console.log('Sidebar collapse clicked');
$('#sidebar').toggleClass('active');
$('#content').toggleClass('active');
});
$('.more-button, .body-overlay').on('click', function () {
console.log('More button or overlay clicked');
$('#sidebar, .body-overlay').toggleClass('show-nav');
});
});

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,216 +1,185 @@
<!Doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>CMS-Laravel</title>
<link rel="stylesheet" href="{{ asset('css/bootstrap.min.css') }}">
<link rel="stylesheet" href="{{ asset('css/custom.css') }}">
<link rel="stylesheet" href="{{ asset('css/fontawesome.min.css') }}">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700;900&display=swap" rel="stylesheet">
<link rel="icon" type="image/png" href="{{ asset('img/favicon_unioil.ico') }}">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css"
integrity="sha512-..." crossorigin="anonymous" referrerpolicy="no-referrer" />
<!-- Inline CSS to fix sidebar spacing -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<style>
#sidebar .components li {
margin-bottom: 5px; /* Reduce gap between sidebar items */
margin-bottom: 5px;
}
#sidebar .components li.dropdown {
margin-bottom: 0; /* Ensure dropdown items don't add extra space when collapsed */
margin-bottom: 0;
}
#sidebar .components li.dropdown .menu {
margin-top: 0; /* Remove extra space above dropdown menu */
margin-top: 0;
}
#sidebar .components li a {
padding: 10px 15px; /* Consistent padding for all sidebar links */
padding: 10px 15px;
}
</style>
</head>
<body>
<div class="wrapper">
<div class="body-overlay"></div>
@php
$memberManagement = ['card-member', 'locked-accounts'];
$homePage = ['photo-slider'];
$aboutUs = ['card-types', 'terms-and-privacy'];
$reports = ['registration-report', 'top-up-usage-report', 'mobile-usage-report', 'station-rating-report'];
$stationLocator = ['branches', 'stations', 'fuels'];
$fuelPriceUpdate = ['fuel-price-on-demand', 'fuel-price-schedule', 'fuel-price-update-logs'];
@endphp
<!-- Sidebar -->
<nav id="sidebar">
<div class="sidebar-header">
<h3><img src="img/logo.png" class="img-fluid" /><span></span></h3>
<h3><img src="{{ asset('img/logo.png') }}" class="img-fluid" /><span></span></h3>
</div>
<ul class="list-unstyled components">
<!-- Static Items -->
<li class="{{ Request::is('user-management') ? 'active' : '' }}">
@php
$memberManagement = ['card-member', 'locked-accounts'];
$homePage = ['photo-slider'];
$aboutUs = ['card-types', 'terms-and-privacy'];
$reports = ['registration-report', 'top-up-usage-report', 'mobile-usage-report', 'station-rating-report'];
$stationLocator = ['branches', 'stations', 'fuels'];
$fuelPriceUpdate = ['fuel-price-on-demand', 'fuel-price-schedule', 'fuel-price-update-logs'];
@endphp
<li class="{{ Route::is('user.management') ? 'active' : '' }}">
<a href="{{ route('user.management') }}" class="dashboard" style="display:flex">
<i class="fa-solid fa-users" style="padding-top:3px"></i><span>User Management</span>
</a>
</li>
<li class="{{ Request::is('notification') ? 'active' : '' }}">
<li class="{{ Route::is('notification') ? 'active' : '' }}">
<a href="{{ route('notification') }}" class="dashboard" style="display:flex">
<i class="fa-solid fa-bell" style="padding-top:3px"></i><span>Notifications</span>
</a>
</li>
<!-- Member Management -->
<li class="dropdown {{ in_array(Request::path(), $memberManagement) ? 'active' : '' }}">
<li class="dropdown {{ Route::is('card-member', 'locked-accounts') ? 'active' : '' }}">
<a href="#homeSubmenu1" data-toggle="collapse"
aria-expanded="{{ in_array(Request::path(), $memberManagement) ? 'true' : 'false' }}"
aria-expanded="{{ Route::is('card-member', 'locked-accounts') ? 'true' : 'false' }}"
class="dropdown-toggle" style="display:flex">
<i class="fa-solid fa-users-gear" style="padding-top:3px"></i><span>Member Management</span>
</a>
<ul class="collapse list-unstyled menu {{ in_array(Request::path(), $memberManagement) ? 'show' : '' }}"
<ul class="collapse list-unstyled menu {{ Route::is('card-member', 'locked-accounts') ? 'show' : '' }}"
id="homeSubmenu1">
<li class="{{ Request::is('card-member') ? 'active' : '' }}">
<li class="{{ Route::is('card-member') ? 'active' : '' }}">
<a href="{{ route('card-member') }}">Card Member</a>
</li>
<li class="{{ Request::is('locked-accounts') ? 'active' : '' }}">
<li class="{{ Route::is('locked-accounts') ? 'active' : '' }}">
<a href="{{ route('locked-accounts') }}">Locked Accounts</a>
</li>
</ul>
</li>
<!-- Home Page -->
<li class="dropdown {{ in_array(Request::path(), $homePage) ? 'active' : '' }}">
<li class="dropdown {{ Route::is('photo-slider') ? 'active' : '' }}">
<a href="#pageSubmenu2" data-toggle="collapse"
aria-expanded="{{ in_array(Request::path(), $homePage) ? 'true' : 'false' }}"
aria-expanded="{{ Route::is('photo-slider') ? 'true' : 'false' }}"
class="dropdown-toggle" style="display:flex">
<i class="fa-solid fa-mobile-screen" style="padding-top:3px"></i><span>Home Page (Mobile)</span>
</a>
<ul class="collapse list-unstyled menu {{ in_array(Request::path(), $homePage) ? 'show' : '' }}"
<ul class="collapse list-unstyled menu {{ Route::is('photo-slider') ? 'show' : '' }}"
id="pageSubmenu2">
<li class="{{ Request::is('photo-slider') ? 'active' : '' }}">
<li class="{{ Route::is('photo-slider') ? 'active' : '' }}">
<a href="{{ route('photo-slider') }}">Photo Slider</a>
</li>
</ul>
</li>
<!-- Static -->
<li class="{{ Request::is('promotions') ? 'active' : '' }}">
<li class="{{ Route::is('promotions') ? 'active' : '' }}">
<a href="{{ route('promotions') }}" class="dashboard" style="display:flex">
<i class="fa-solid fa-tag" style="padding-top:3px"></i><span>Promotions</span>
</a>
</li>
<li class="{{ Request::is('top-up') ? 'active' : '' }}">
<li class="{{ Route::is('top-up') ? 'active' : '' }}">
<a href="{{ route('top-up') }}" class="dashboard" style="display:flex">
<i class="fa-solid fa-wallet" style="padding-top:3px"></i><span>Top-Up</span>
</a>
</li>
<li class="{{ Request::is('top-up-settings') ? 'active' : '' }}">
<li class="{{ Route::is('top-up-settings') ? 'active' : '' }}">
<a href="{{ route('top-up-settings') }}" class="dashboard" style="display:flex">
<i class="fa-solid fa-cog" style="padding-top:3px"></i><span>Top Up Settings</span>
</a>
</li>
<!-- About Us -->
<li class="dropdown {{ in_array(Request::path(), $aboutUs) ? 'active' : '' }}">
<li class="dropdown {{ Route::is('card-types', 'terms-and-privacy') ? 'active' : '' }}">
<a href="#pageSubmenu3" data-toggle="collapse"
aria-expanded="{{ in_array(Request::path(), $aboutUs) ? 'true' : 'false' }}"
aria-expanded="{{ Route::is('card-types', 'terms-and-privacy') ? 'true' : 'false' }}"
class="dropdown-toggle" style="display:flex">
<i class="fa-solid fa-circle-info" style="padding-top:3px"></i><span>About Us</span>
</a>
<ul class="collapse list-unstyled menu {{ in_array(Request::path(), $aboutUs) ? 'show' : '' }}"
<ul class="collapse list-unstyled menu {{ Route::is('card-types', 'terms-and-privacy') ? 'show' : '' }}"
id="pageSubmenu3">
<li class="{{ Request::is('card-types') ? 'active' : '' }}">
<li class="{{ Route::is('card-types') ? 'active' : '' }}">
<a href="{{ route('card-types') }}">Card Types</a>
</li>
<li class="{{ Request::is('terms-and-privacy') ? 'active' : '' }}">
<li class="{{ Route::is('terms-and-privacy') ? 'active' : '' }}">
<a href="{{ route('terms-and-privacy') }}">Terms & Privacy</a>
</li>
</ul>
</li>
<!-- Reports -->
<li class="dropdown {{ in_array(Request::path(), $reports) ? 'active' : '' }}">
<li class="dropdown {{ Route::is('registration-report', 'top-up-usage-report', 'mobile-usage-report', 'station-rating-report') ? 'active' : '' }}">
<a href="#pageSubmenu4" data-toggle="collapse"
aria-expanded="{{ in_array(Request::path(), $reports) ? 'true' : 'false' }}"
aria-expanded="{{ Route::is('registration-report', 'top-up-usage-report', 'mobile-usage-report', 'station-rating-report') ? 'true' : 'false' }}"
class="dropdown-toggle" style="display:flex">
<i class="fa-solid fa-chart-column" style="padding-top:3px"></i><span>Reports</span>
</a>
<ul class="collapse list-unstyled menu {{ in_array(Request::path(), $reports) ? 'show' : '' }}"
<ul class="collapse list-unstyled menu {{ Route::is('registration-report', 'top-up-usage-report', 'mobile-usage-report', 'station-rating-report') ? 'show' : '' }}"
id="pageSubmenu4">
<li class="{{ Request::is('registration-report') ? 'active' : '' }}">
<li class="{{ Route::is('registration-report') ? 'active' : '' }}">
<a href="{{ route('registration-report') }}">Registration Report</a>
</li>
<li class="{{ Request::is('top-up-usage-report') ? 'active' : '' }}">
<li class="{{ Route::is('top-up-usage-report') ? 'active' : '' }}">
<a href="{{ route('top-up-usage-report') }}">Top-Up Usage Report</a>
</li>
<li class="{{ Request::is('mobile-usage-report') ? 'active' : '' }}">
<li class="{{ Route::is('mobile-usage-report') ? 'active' : '' }}">
<a href="{{ route('mobile-usage-report') }}">Mobile Usage Report</a>
</li>
<li class="{{ Request::is('station-rating-report') ? 'active' : '' }}">
<li class="{{ Route::is('station-rating-report') ? 'active' : '' }}">
<a href="{{ route('station-rating-report') }}">Station Rating Report</a>
</li>
</ul>
</li>
<!-- Static -->
<li class="{{ Request::is('system-parameters') ? 'active' : '' }}">
<li class="{{ Route::is('system-parameters') ? 'active' : '' }}">
<a href="{{ route('system-parameters') }}" style="display:flex">
<i class="fa-solid fa-sliders" style="padding-top:3px"></i><span>System Parameters</span>
</a>
</li>
<!-- Fuel Price Update -->
<li class="dropdown {{ in_array(Request::path(), $fuelPriceUpdate) ? 'active' : '' }}">
<li class="dropdown {{ Route::is('fuel-price-on-demand', 'fuel-price-schedule', 'fuel-price-update-logs') ? 'active' : '' }}">
<a href="#pageSubmenu6" data-toggle="collapse"
aria-expanded="{{ in_array(Request::path(), $fuelPriceUpdate) ? 'true' : 'false' }}"
aria-expanded="{{ Route::is('fuel-price-on-demand', 'fuel-price-schedule', 'fuel-price-update-logs') ? 'true' : 'false' }}"
class="dropdown-toggle" style="display:flex">
<i class="fa-solid fa-gas-pump" style="padding-top:3px"></i><span>Fuel Price Update</span>
</a>
<ul class="collapse list-unstyled menu {{ in_array(Request::path(), $fuelPriceUpdate) ? 'show' : '' }}"
<ul class="collapse list-unstyled menu {{ Route::is('fuel-price-on-demand', 'fuel-price-schedule', 'fuel-price-update-logs') ? 'show' : '' }}"
id="pageSubmenu6">
<li class="{{ Request::is('fuel-price-on-demand') ? 'active' : '' }}">
<li class="{{ Route::is('fuel-price-on-demand') ? 'active' : '' }}">
<a href="{{ route('fuel-price-on-demand') }}">On-Demand</a>
</li>
<li class="{{ Request::is('fuel-price-schedule') ? 'active' : '' }}">
<li class="{{ Route::is('fuel-price-schedule') ? 'active' : '' }}">
<a href="{{ route('fuel-price-schedule') }}">Schedule</a>
</li>
<li class="{{ Request::is('fuel-price-update-logs') ? 'active' : '' }}">
<li class="{{ Route::is('fuel-price-update-logs') ? 'active' : '' }}">
<a href="{{ route('fuel-price-update-logs') }}">Update Logs</a>
</li>
</ul>
</li>
<!-- Station Locator -->
<li class="dropdown {{ in_array(Request::path(), $stationLocator) ? 'active' : '' }}">
<li class="dropdown {{ Route::is('branches', 'stations', 'fuels') ? 'active' : '' }}">
<a href="#pageSubmenu5" data-toggle="collapse"
aria-expanded="{{ in_array(Request::path(), $stationLocator) ? 'true' : 'false' }}"
aria-expanded="{{ Route::is('branches', 'stations', 'fuels') ? 'true' : 'false' }}"
class="dropdown-toggle" style="display:flex">
<i class="fa-solid fa-location-dot" style="padding-top:3px"></i><span>Station Locator</span>
</a>
<ul class="collapse list-unstyled menu {{ in_array(Request::path(), $stationLocator) ? 'show' : '' }}"
<ul class="collapse list-unstyled menu {{ Route::is('branches', 'stations', 'fuels') ? 'show' : '' }}"
id="pageSubmenu5">
<li class="{{ Request::is('branches') ? 'active' : '' }}">
<li class="{{ Route::is('branches') ? 'active' : '' }}">
<a href="{{ route('branches') }}">Branches</a>
</li>
<li class="{{ Request::is('stations') ? 'active' : '' }}">
<li class="{{ Route::is('stations') ? 'active' : '' }}">
<a href="{{ route('stations') }}">Stations</a>
</li>
<li class="{{ Request::is('fuels') ? 'active' : '' }}">
<li class="{{ Route::is('fuels') ? 'active' : '' }}">
<a href="{{ route('fuels') }}">Fuels</a>
</li>
</ul>
</li>
</ul>
</nav>
<!-- Page Content -->
<div id="content">
<div class="top-navbar">
<nav class="navbar navbar-expand-lg" style="background-color:rgba(231, 70, 16, 0.84)">
@ -222,7 +191,7 @@
data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false"
aria-label="Toggle navigation">
<i class="fas fa-ellipsis-v"></i>
<i class="fa-solid fa-ellipsis-v"></i>
</button>
<div class="collapse navbar-collapse d-lg-block d-xl-block d-sm-none d-md-none d-none"
id="navbarSupportedContent">
@ -231,7 +200,7 @@
<a class="nav-link dropdown-toggle d-flex align-items-center gap-2" href="#"
role="button" data-toggle="dropdown">
<span style="margin-right:5px">{{ $user['admin']['username'] ?? 'Guest' }}</span>
<i class="fa-solid fa-user-circle" style="padding-right:5px"></i>
<i class="fa-solid fa-circle-user" style="padding-right:5px"></i>
</a>
<ul class="dropdown-menu dropdown-menu-end dropdown-menu-sm">
<li style="margin-right:5px">
@ -268,35 +237,19 @@
</div>
</div>
</div>
<!-- Footer -->
<footer class="bg-light py-3 mt-4">
<div class="container text-center">
<p class="mb-0 text-muted" style="font-family: 'Roboto', sans-serif; font-size: 0.9rem;">
All Rights Reserved &copy; 2025 Unioil CMS
All Rights Reserved © 2025 Unioil CMS
</p>
</div>
</footer>
</div>
</div>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="js/jquery-3.3.1.slim.min.js"></script>
<script src="js/popper.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="js/jquery-3.3.1.min.js"></script>
<script type="text/javascript">
$(document).ready(function() {
$('#sidebarCollapse').on('click', function() {
$('#sidebar').toggleClass('active');
$('#content').toggleClass('active');
});
$('.more-button,.body-overlay').on('click', function() {
$('#sidebar,.body-overlay').toggleClass('show-nav');
});
});
</script>
<script src="{{ asset('js/jquery-3.3.1.min.js') }}"></script>
<script src="{{ asset('js/popper.min.js') }}"></script>
<script src="{{ asset('js/bootstrap.min.js') }}"></script>
<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
<script src="{{ asset('js/custom.js') }}"></script>
</body>
<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
</html>