Browse Source

sidebar

master
Gunawan19621 11 months ago
parent
commit
9a5b97ba07
  1. 1
      app/Http/Controllers/M_assetController.php
  2. 3
      composer.json
  3. 1521
      composer.lock
  4. 4
      resources/views/dashboard/Master_Data/Asset/index.blade.php
  5. 2
      resources/views/layouts/link.blade.php
  6. 26
      resources/views/layouts/sidebar.blade.php

1
app/Http/Controllers/M_assetController.php

@ -63,6 +63,7 @@ class M_assetController extends Controller
'date' => 'required', 'date' => 'required',
'qr_count' => 'nullable' 'qr_count' => 'nullable'
]); ]);
// dd($request);
try { try {
$currentUser = Auth::user(); $currentUser = Auth::user();
$validatedData = $request->except('_token'); $validatedData = $request->except('_token');

3
composer.json

@ -14,7 +14,8 @@
"laravel/tinker": "^2.8", "laravel/tinker": "^2.8",
"maatwebsite/excel": "^3.1", "maatwebsite/excel": "^3.1",
"php-open-source-saver/jwt-auth": "^2.1", "php-open-source-saver/jwt-auth": "^2.1",
"simplesoftwareio/simple-qrcode": "^4.2" "simplesoftwareio/simple-qrcode": "^4.2",
"tymon/jwt-auth": "^2.0"
}, },
"require-dev": { "require-dev": {
"fakerphp/faker": "^1.9.1", "fakerphp/faker": "^1.9.1",

1521
composer.lock generated

File diff suppressed because it is too large Load Diff

4
resources/views/dashboard/Master_Data/Asset/index.blade.php

@ -176,7 +176,7 @@
@endforeach @endforeach
<!-- Modal Print QR Asset--> <!-- Modal Print QR Asset-->
@foreach ($asset as $data) {{-- @foreach ($asset as $data)
<div class="modal fade" id="printQRModal{{ $data['id'] }}" tabindex="-1" role="dialog" <div class="modal fade" id="printQRModal{{ $data['id'] }}" tabindex="-1" role="dialog"
aria-labelledby="exampleModalLabel" aria-hidden="true"> aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
@ -231,5 +231,5 @@
</div> </div>
</div> </div>
</div> </div>
@endforeach @endforeach --}}
@endsection @endsection

2
resources/views/layouts/link.blade.php

@ -3,7 +3,7 @@
<link href="{{ asset('assets/vendor/fontawesome-free/css/custom.min.css') }}" rel="stylesheet" type="text/css"> <link href="{{ asset('assets/vendor/fontawesome-free/css/custom.min.css') }}" rel="stylesheet" type="text/css">
<link rel="stylesheet" <link rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i"> href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i">
{{-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css"> --}} <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
<!-- Custom styles for this template--> <!-- Custom styles for this template-->
<link href="{{ asset('assets/css/sb-admin-2.min.css') }}" rel="stylesheet"> <link href="{{ asset('assets/css/sb-admin-2.min.css') }}" rel="stylesheet">

26
resources/views/layouts/sidebar.blade.php

@ -22,12 +22,14 @@
<li class="nav-item {{ $active == 'menu-peminjaman' ? 'active' : '' }}"> <li class="nav-item {{ $active == 'menu-peminjaman' ? 'active' : '' }}">
<a class="nav-link" href="{{ route('dashboard.peminjaman.index') }}"> <a class="nav-link" href="{{ route('dashboard.peminjaman.index') }}">
<span class="ml-4">Peminjaman</span> <i class="fas fa-fw fa-upload"></i>
<span>Peminjaman</span>
</a> </a>
</li> </li>
<li class="nav-item {{ $active == 'menu-pengembalian' ? 'active' : '' }}"> <li class="nav-item {{ $active == 'menu-pengembalian' ? 'active' : '' }}">
<a class="nav-link" href="{{ route('dashboard.pengembalian.index') }}"> <a class="nav-link" href="{{ route('dashboard.pengembalian.index') }}">
<span class="ml-4">Pengembalian</span> <i class="fas fa-fw fa-download"></i>
<span>Pengembalian</span>
</a> </a>
</li> </li>
@ -42,22 +44,34 @@
<!-- Nav Item - Pages Collapse Menu --> <!-- Nav Item - Pages Collapse Menu -->
<li class="nav-item {{ $active == 'menu-role' ? 'active' : '' }}"> <li class="nav-item {{ $active == 'menu-role' ? 'active' : '' }}">
<a class="nav-link" href="{{ route('dashboard.role.index') }}"> <a class="nav-link" href="{{ route('dashboard.role.index') }}">
<span class="ml-4">Role</span> <i class="fas fa-solid fa-key"></i>
<span>Role</span>
</a> </a>
</li> </li>
<li class="nav-item {{ $active == 'menu-user' ? 'active' : '' }}"> <li class="nav-item {{ $active == 'menu-user' ? 'active' : '' }}">
<a class="nav-link" href="{{ route('dashboard.user.index') }}"> <a class="nav-link" href="{{ route('dashboard.user.index') }}">
<span class="ml-4">User</span> <i class="fas fa-fw fa-user"></i>
<span>User</span>
</a> </a>
</li> </li>
<li class="nav-item {{ $active == 'menu-asset' ? 'active' : '' }}"> <li class="nav-item {{ $active == 'menu-asset' ? 'active' : '' }}">
<a class="nav-link" href="{{ route('dashboard.asset.index') }}"> <a class="nav-link" href="{{ route('dashboard.asset.index') }}">
<span class="ml-4">Asset</span> <i class="fas fa-fw fa-chart-area"></i>
<span>Asset</span>
</a> </a>
</li> </li>
<li class="nav-item {{ $active == 'menu-warehouse' ? 'active' : '' }}"> <li class="nav-item {{ $active == 'menu-warehouse' ? 'active' : '' }}">
<a class="nav-link" href="{{ route('dashboard.warehouse.index') }}"> <a class="nav-link" href="{{ route('dashboard.warehouse.index') }}">
<span class="ml-4">Warehouse</span> <i class="fas fa-fw fa-table"></i>
<span>Warehouse</span>
</a> </a>
</li> </li>
<!-- Divider -->
<hr class="sidebar-divider d-none d-md-block">
<!-- Sidebar Toggler (Sidebar) -->
<div class="text-center d-none d-md-inline">
<button class="rounded-circle border-0" id="sidebarToggle"></button>
</div>
</ul> </ul>

Loading…
Cancel
Save