Merge branch 'omis_dharma' of ssh://bibgit.com:22022/dharmaraj/New-OMIS

This commit is contained in:
2024-04-07 10:29:00 +05:45
47 changed files with 3873 additions and 268 deletions

View File

@ -1,6 +1,6 @@
<!DOCTYPE html>
<html lang="en" data-layout="vertical" data-topbar="light" data-sidebar="dark" data-sidebar-size="lg"
data-sidebar-image="none" data-preloader="disable">
data-sidebar-image="none" data-preloader="enable">
<head>
@ -28,7 +28,7 @@
<link href="{{ asset('assets/css/toastr.css') }}" rel="stylesheet" type="text/css" />
<!-- Nepali DatePicker Css -->
<link href="{{ asset('assets/css/nepaliDatePicker.min.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/css/nepali.datepicker.v4.0.1.min.css') }}" rel="stylesheet" type="text/css" />
<!-- Filepond css -->
<link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet" />
@ -41,6 +41,9 @@
<!-- Icons Css -->
<link href="{{ asset('assets/css/icons.min.css') }}" rel="stylesheet" type="text/css" />
<!-- Sweetalert Css -->
<link href="{{ asset('assets/libs/sweetalert2/sweetalert2.min.css') }}" rel="stylesheet" type="text/css" />
<!-- custom Css-->
<link href="{{ asset('assets/css/custom.min.css') }}" rel="stylesheet" type="text/css" />
@ -80,7 +83,6 @@
<!-- END layout-wrapper -->
<!--start back-to-top-->
<button onclick="topFunction()" class="btn btn-danger btn-icon" id="back-to-top">
<i class="ri-arrow-up-line"></i>
@ -99,7 +101,7 @@
<!-- Theme Settings -->
@include('layouts.partials.theme-setting')
{{-- @include('layouts.partials.theme-setting') --}}
<!-- JAVASCRIPT -->
<script src="{{ asset('assets/libs/bootstrap/js/bootstrap.bundle.min.js') }}"></script>
@ -111,7 +113,7 @@
<script src="{{ asset('assets/js/plugins.js') }}"></script>
<script src="{{ asset('assets/libs/@ckeditor/ckeditor5-build-classic/build/ckeditor.js') }}"></script>
<script src="{{ asset('assets/libs/toastr/toastr.min.js') }}"></script>
<script src="{{ asset('assets/libs/nepalidatepicker/jquery.nepaliDatePicker.min.js') }}"></script>
<script src="{{ asset('assets/libs/nepalidatepicker/nepali.datepicker.v4.0.1.min.js') }}"></script>
<script src="https://cdn.datatables.net/1.11.5/js/jquery.dataTables.min.js"></script>
<script src="https://cdn.datatables.net/1.11.5/js/dataTables.bootstrap5.min.js"></script>
<script src="https://cdn.datatables.net/responsive/2.2.9/js/dataTables.responsive.min.js"></script>
@ -126,6 +128,11 @@
<!--apexcharts-->
<script src="{{ asset('assets/libs/apexcharts/apexcharts.min.js') }}"></script>
<!-- Sweet alert js -->
<script src="{{ asset('assets/libs/sweetalert2/sweetalert2.min.js') }}"></script>
<script src="{{ asset('assets/js/pages/sweetalerts.init.js') }}"></script>
<!-- projects js -->
<script src="{{ asset('assets/js/pages/dashboard-projects.init.js') }}"></script>
@ -137,7 +144,7 @@
<script src="{{ asset('assets/js/app.js') }}"></script>
<!-- Custom js -->
<script type="module" src="{{ asset('assets/js/custom.js') }}"></script>
<script src="{{ asset('assets/js/custom.js') }}"></script>
@stack('js')
</body>

View File

@ -33,14 +33,14 @@
<!-- start Dashboard Menu -->
<li class="menu-title"><span data-key="t-menu">Menu</span></li>
<li class="nav-item">
<a class="nav-link menu-link" href="#sidebarDashboards" data-bs-toggle="collapse" role="button"
aria-expanded="false" aria-controls="sidebarDashboards">
<i class="ri-dashboard-2-line"></i> <span data-key="t-dashboards">Dashboards</span>
<a class="nav-link menu-link active" href="#MenuOne" data-bs-toggle="collapse" role="button"
aria-expanded="true" aria-controls="MenuOne">
<i class="ri-dashboard-2-line"></i> <span data-key="t-dashboards">Dashboard</span>
</a>
<div class="menu-dropdown collapse" id="sidebarDashboards">
<div class="menu-dropdown collapse" id="MenuOne">
<ul class="nav nav-sm flex-column">
<li class="nav-item">
<a href="#" class="nav-link" data-key="t-setting"> Website Setting </a>
<a href="#" class="nav-link" data-key="t-setting"> Setting </a>
</li>
</ul>
</div>
@ -48,11 +48,11 @@
<!-- end Dashboard Menu -->
<li class="menu-title"><i class="ri-more-fill"></i> <span data-key="t-pages">Pages</span></li>
<li class="nav-item">
<a class="nav-link menu-link" href="#sidebarDashboards" data-bs-toggle="collapse" role="button"
aria-expanded="false" aria-controls="sidebarDashboards">
<i class="ri-dashboard-2-line"></i> <span data-key="t-dashboards">Website Resources</span>
<a class="nav-link menu-link" href="#MenuTwo" data-bs-toggle="collapse" role="button"
aria-expanded="false" aria-controls="MenuTwo">
<i class="ri-dashboard-2-line"></i> <span data-key="t-resources">Website Resources</span>
</a>
<div class="menu-dropdown collapse" id="sidebarDashboards">
<div class="menu-dropdown collapse" id="MenuTwo">
<ul class="nav nav-sm flex-column">
<li class="nav-item">
<a href="#" class="nav-link" data-key="t-slider"> Slider </a>
@ -70,6 +70,12 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link menu-link" href="{{ route('employee.index') }}">
<i class="ri-honour-line"></i> <span data-key="t-widgets">Employee</span>
</a>
</li>
</ul>
</div>
<!-- Sidebar -->