Browse Source

update fix UI and flow menu

master
ibnu 1 year ago
parent
commit
d6e27665e9
  1. BIN
      .env.swp
  2. BIN
      public/assets/img/398.jpg
  3. BIN
      public/assets/img/8487305.jpg
  4. 9
      resources/views/addons/SettingPlatform/manajement_asset.blade.php
  5. 15
      resources/views/addons/SettingPlatform/manajement_user.blade.php
  6. 18
      resources/views/auth/login.blade.php
  7. 17
      resources/views/auth/register.blade.php
  8. 9
      resources/views/dashboard/peminjaman.blade.php
  9. 9
      resources/views/dashboard/pengembalian.blade.php
  10. 6
      resources/views/layouts/main.blade.php
  11. 25
      resources/views/layouts/navbar.blade.php
  12. 2
      resources/views/layouts/navigation.blade.php
  13. 26
      resources/views/layouts/sidebar.blade.php
  14. 14
      routes/web.php

BIN
.env.swp

Binary file not shown.

BIN
public/assets/img/398.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 512 KiB

BIN
public/assets/img/8487305.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 394 KiB

9
resources/views/addons/SettingPlatform/manajement_asset.blade.php

@ -2,21 +2,24 @@
@section('title', 'Setting Platform')
@section('content')
<div class="container-fluid">
<h1 class="h3 mb-2 text-gray-800">Tabel Asset</h1>
<!-- <h1 class="h3 mb-2 text-gray-800">Tabel Asset</h1>
<div class="mb-4">
<p>Our Item Tables are enhanced with the help of the DataTables plugin. This is a powerful tool that allows you
to explore return data in a more interactive and efficient way</p>
<a href="#" class="btn btn-success btn-icon-split" data-toggle="modal" data-target="#tambahDataModal">
<span class="text">+ Tambah data</span>
</a>
</div>
</div> -->
<div class="card shadow mb-4">
<div class="card-header py-3">
<div class="row">
<div class="col-6">
<h5 class="m-0 font-weight-bold text-primary mt-2">DataTables Asset</h5>
<h5 class="m-0 font-weight-bold text-primary mt-2">Data Asset</h5>
</div>
<div class="col-6 text-right">
<a href="#" class="btn btn-success btn-icon-split" data-toggle="modal" data-target="#tambahDataModal">
<span class="text">+ Tambah data</span>
</a>
<a href="{{ route('assetcetakpdf.cetakpdf') }}" class="btn btn-success btn-icon-split ml-auto"
target="_blank">
<span class="text">Cetak PDF</span>

15
resources/views/addons/SettingPlatform/manajement_user.blade.php

@ -3,17 +3,26 @@
@section('content')
{{-- <h1>Halaman Manajement User</h1> --}}
<div class="container-fluid">
<h1 class="h3 mb-2 text-gray-800">Tabel User</h1>
<!-- <h1 class="h3 mb-2 text-gray-800">Tabel User</h1>
<div class="mb-4">
<p>Our User Tables are enhanced with the help of the DataTables plugin. This is a powerful tool that allows you
to explore return data in a more interactive and efficient way</p>
{{-- <a href="#" class="btn btn-success btn-icon-split" data-toggle="modal" data-target="#tambahDataModal">
<span class="text">+ Tambah data</span> --}}
</a>
</div>
</div> -->
<div class="card shadow mb-4">
<div class="card-header py-3">
<h6 class="m-0 font-weight-bold text-primary">DataTables User</h6>
<div class="row">
<div class="col-6">
<h5 class="m-0 font-weight-bold text-primary mt-2">Data User</h5>
</div>
<div class="col-6 text-right">
{{--<a href="#" class="btn btn-success btn-icon-split" data-toggle="modal" data-target="#tambahDataModal">
<span class="text">+ Tambah data</span>
</a>--}}
</div>
</div>
</div>
<div class="card-body">
<div class="table-responsive">

18
resources/views/auth/login.blade.php

@ -35,7 +35,7 @@
<div class="card-body p-0">
<!-- Nested Row within Card Body -->
<div class="row">
<img src="{{ asset('assets/img/fotocewe.png') }}" alt="Login Image"
<img src="{{ asset('assets/img/8487305.jpg') }}" alt="Login Image"
class="col-lg-5 d-none d-lg-block">
<div class="col-lg-6">
<div class="p-5">
@ -57,9 +57,9 @@
</div>
<div class="form-group">
<div class="custom-control custom-checkbox small">
<label for="remember_me" class="custom-control-label">
<input id="remember_me" type="checkbox" name="remember"
<input id="remember_me" type="checkbox" name="remember"
class="custom-control-input">
<label for="remember_me" class="custom-control-label">
<span>Remember Me</span>
</label>
</div>
@ -69,23 +69,23 @@
Login
</button>
<hr>
<a href="#" class="btn btn-google btn-user btn-block">
<!-- <a href="#" class="btn btn-google btn-user btn-block">
<i class="fab fa-google fa-fw"></i> Login with Google
</a>
<a href="#" class="btn btn-facebook btn-user btn-block">
<i class="fab fa-facebook-f fa-fw"></i> Login with Facebook
</a>
</a> -->
</form>
<hr>
<div class="text-center">
<!-- <hr> -->
<!-- <div class="text-center">
@if (Route::has('password.request'))
<a class="small" href="{{ route('password.request') }}">Forgot your
password?</a>
@endif
</div>
</div> -->
<div class="text-center">
<a class="small" href="{{ url('/register') }}">Create an Account!</a>
<label class="small">Copy Rigth SIOPAS</label>
</div>
</div>
</div>

17
resources/views/auth/register.blade.php

@ -30,7 +30,7 @@
<div class="card-body p-0">
<!-- Nested Row within Card Body -->
<div class="row">
<img src="{{ asset('assets/img/fotocowo.png') }}" alt="Register Image"
<img src="{{ asset('assets/img/8487305.jpg') }}" alt="Register Image"
class="col-lg-5 d-none d-lg-block">
<div class="col-lg-7">
<div class="p-5">
@ -97,20 +97,7 @@
Register Account
</button>
<hr>
<a href="#" class="btn btn-google btn-user btn-block">
<i class="fab fa-google fa-fw"></i> Register with Google
</a>
<a href="#" class="btn btn-facebook btn-user btn-block">
<i class="fab fa-facebook-f fa-fw"></i> Register with Facebook
</a>
</form>
<hr>
<div class="text-center">
@if (Route::has('password.request'))
<a class="small" href="{{ route('password.request') }}">Forgot your
password?</a>
@endif
</div>
</form>
<div class="text-center">
<a class="small" href="{{ url('/login') }}">Already have an account? Login!</a>
</div>

9
resources/views/dashboard/peminjaman.blade.php

@ -2,14 +2,7 @@
@section('title', 'Peminjaman')
@section('content')
<div class="container-fluid">
<h1 class="h3 mb-2 text-gray-800">Tabel Peminjaman</h1>
<div class="mb-4">
<p>Our Loan Tables are enhanced with the help of the DataTables plugin. This is a powerful tool that allows you
to explore return data in a more interactive and efficient way</p>
<a href="#" class="btn btn-success btn-icon-split" data-toggle="modal" data-target="#tambahDataModal">
<span class="text">+ Tambah peminjaman</span>
</a>
</div>
<!-- <h1 class="h3 mb-2 text-gray-800">Tabel Peminjaman</h1> -->
<div class="card shadow mb-4">
<div class="card-header py-3">
<h6 class="m-0 font-weight-bold text-primary">Data Peminjaman</h6>

9
resources/views/dashboard/pengembalian.blade.php

@ -2,14 +2,7 @@
@section('title', 'Pengembalian')
@section('content')
<div class="container-fluid">
<h1 class="h3 mb-2 text-gray-800">Tabel Pengembalian</h1>
<div class="mb-4">
<p>Our Returns Table is enhanced with the help of DataTables plugin. This is a powerful tool that allows you to
explore return data in a more interactive and efficient way</p>
{{-- <a href="#" class="btn btn-success btn-icon-split" data-toggle="modal" data-target="#tambahDataModal">
<span class="text">+ Tambah peminjaman</span> --}}
</a>
</div>
<!-- <h1 class="h3 mb-2 text-gray-800">Tabel Pengembalian</h1> -->
<div class="card shadow mb-4">
<div class="card-header py-3">
<h6 class="m-0 font-weight-bold text-primary">Data Asset</h6>

6
resources/views/layouts/main.blade.php

@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
<meta name="author" content="">
<title>SB Admin 2 - Dashboard</title>
<title>SIOPAS - Dashboard</title>
@include('layouts.link')
</head>
@ -28,7 +28,7 @@
@include('layouts.navbar')
<!-- Begin Page Content -->
<div class="container-fluid">
<!-- <div class="container-fluid"> -->
<!-- allert update data foto -->
{{-- @if (session()->has('success'))
<div id="success-alert" class="alert alert-success floating-alert">
@ -50,7 +50,7 @@
@endif
<!-- allert update data foto -->
@yield('content')
</div>
<!-- </div> -->
<!-- /.container-fluid -->
</div>

25
resources/views/layouts/navbar.blade.php

@ -6,7 +6,7 @@
</button>
<!-- Topbar Search -->
<form class="d-none d-sm-inline-block form-inline mr-auto ml-md-3 my-2 my-md-0 mw-100 navbar-search">
<!-- <form class="d-none d-sm-inline-block form-inline mr-auto ml-md-3 my-2 my-md-0 mw-100 navbar-search">
<div class="input-group">
<input type="text" class="form-control bg-light border-0 small" placeholder="Search for..."
aria-label="Search" aria-describedby="basic-addon2">
@ -16,7 +16,7 @@
</button>
</div>
</div>
</form>
</form> -->
<!-- Topbar Navbar -->
<ul class="navbar-nav ml-auto">
@ -28,7 +28,7 @@
<i class="fas fa-search fa-fw"></i>
</a>
<!-- Dropdown - Messages -->
<div class="dropdown-menu dropdown-menu-right p-3 shadow animated--grow-in"
<!-- <div class="dropdown-menu dropdown-menu-right p-3 shadow animated--grow-in"
aria-labelledby="searchDropdown">
<form class="form-inline mr-auto w-100 navbar-search">
<div class="input-group">
@ -41,7 +41,7 @@
</div>
</div>
</form>
</div>
</div> -->
</li>
<!-- Nav Item - Alerts -->
@ -61,7 +61,8 @@
<a class="dropdown-item d-flex align-items-center" href="#">
<div class="mr-3">
<div class="icon-circle bg-primary">
<i class="fas fa-file-alt text-white"></i>
<!-- <i class="fas fa-file-alt text-white"></i> -->
<i class="fas fa-download text-white"></i>
</div>
</div>
<div>
@ -73,7 +74,7 @@
<a class="dropdown-item d-flex align-items-center" href="#">
<div class="mr-3">
<div class="icon-circle bg-success">
<i class="fas fa-donate text-white"></i>
<i class="fas fa-upload text-white"></i>
</div>
</div>
<div>
@ -99,14 +100,14 @@
<!-- Nav Item - Messages -->
<li class="nav-item dropdown no-arrow mx-1">
<a class="nav-link dropdown-toggle" href="#" id="messagesDropdown" role="button"
<!-- <a class="nav-link dropdown-toggle" href="#" id="messagesDropdown" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-envelope fa-fw"></i>
<i class="fas fa-envelope fa-fw"></i> -->
<!-- Counter - Messages -->
<span class="badge badge-danger badge-counter">7</span>
</a>
<!-- <span class="badge badge-danger badge-counter">7</span> -->
<!-- </a> -->
<!-- Dropdown - Messages -->
<div class="dropdown-list dropdown-menu dropdown-menu-right shadow animated--grow-in"
<!-- <div class="dropdown-list dropdown-menu dropdown-menu-right shadow animated--grow-in"
aria-labelledby="messagesDropdown">
<h6 class="dropdown-header">
Message Center
@ -161,7 +162,7 @@
</a>
<a class="dropdown-item text-center small text-gray-500" href="#">Read More
Messages</a>
</div>
</div> -->
</li>
<div class="topbar-divider d-none d-sm-block"></div>

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

@ -84,7 +84,7 @@
<div class="pt-4 pb-1 border-t border-gray-200 dark:border-gray-600">
<div class="px-4">
<div class="font-medium text-base text-gray-800 dark:text-gray-200">{{ Auth::user()->name }}</div>
<div class="font-medium text-sm text-gray-500">{{ Auth::user()->email }}</div>
<!-- <div class="font-medium text-sm text-gray-500">{{ Auth::user()->email }}</div> -->
</div>
<div class="mt-3 space-y-1">

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

@ -21,7 +21,7 @@
<hr class="sidebar-divider">
<!-- Nav Item - Pages Collapse Menu -->
{{-- <li class="nav-item">
<!-- {{-- <li class="nav-item">
<a class="nav-link" href="{{ url('/dashboard/transaksi') }}">
<span class="ml-4">Transaksi</span>
</a>
@ -37,7 +37,7 @@
<a class="collapse-item" href="{{ url('/dashboard/barangKeluar') }}">Barang Keluar</a>
</div>
</div>
</li>
</li> -->
<li class="nav-item">
<a class="nav-link" href="{{ url('/dashboard/peminjaman') }}">
<span class="ml-4">Peminjaman</span>
@ -54,30 +54,18 @@
<!-- Heading -->
<div class="sidebar-heading">
Addons
Master Data
</div>
<!-- Nav Item - Pages Collapse Menu -->
<li class="nav-item">
<a class="nav-link" href="{{ url('/dashboard/pengadaan') }}">
<span class="ml-4">Pengadaan</span>
<a class="nav-link" href="{{ route('asset.index') }}">
<span class="ml-4">Asset</span>
</a>
</li>
{{-- <li class="nav-item">
<a class="nav-link" href="{{ url('/dashboard/product') }}">
<span class="ml-4">Setting Platform</span>
</a>
</li> --}}
<li class="nav-item">
<a class="nav-link" href="#" data-toggle="collapse" data-target="#collapsePlatform" aria-expanded="true"
aria-controls="collapsePlatform">
<span class="ml-4">Setting Platform</span>
<a class="nav-link" href="{{ route('user.index') }}">
<span class="ml-4">User</span>
</a>
<div id="collapsePlatform" class="collapse" aria-labelledby="headingPlatform" data-parent="#accordionSidebar">
<div class="bg-white py-2 collapse-inner rounded">
<a class="collapse-item" href="{{ route('user.index') }}">Manajemen User</a>
<a class="collapse-item" href="{{ route('asset.index') }}">Manajemen Asset</a>
</div>
</div>
</li>
</ul>

14
routes/web.php

@ -26,22 +26,10 @@ use App\Http\Controllers\SettingPlatformController;
|
*/
// Route::get('/coba', function () {
// return view('landing_page.layouts.main');
// });
Route::get('/logincoba', function () {
// return view('landing_page.login');
return view('login');
});
Route::get('/', function () {
// return view('welcome');
// return view('landing_page.layouts.main');
return view('login');
return view('auth.login');
});
Route::middleware('auth')->group(function () {

Loading…
Cancel
Save