Skip to content

Commit

Permalink
update view
Browse files Browse the repository at this point in the history
  • Loading branch information
@punkestu
punkestu committed Oct 4, 2024
1 parent 9518bce commit e6e091d
Show file tree
Hide file tree
Showing 8 changed files with 102 additions and 101 deletions.
3 changes: 3 additions & 0 deletions app/Providers/AppServiceProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,8 @@ public function boot(): void
Gate::define('admin', function () {
return Auth::user()->role->name === 'admin';
});
Gate::define('cabangOwner', function ($user, $cabang) {
return $user->role->name === 'admin' || $user->profile->cabang_id === $cabang->id;
});
}
}
2 changes: 1 addition & 1 deletion resources/views/account/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<p class="text-center">Email: {{ $akun->email }}</p>
</div>
<a href="/akun/edit"
class="bg-[#003285] hover:bg-[#003285] duration-200 text-gray-800 px-4 py-2 rounded-lg font-semibold text-center">Edit</a>
class="bg-[#003285] hover:bg-[#003285] text-white duration-200 px-4 py-2 rounded-lg font-semibold text-center">Edit</a>
@if ($akun->role->name == 'admin')
<a href="/akun/add"
class="bg-[#7186F3] hover:bg-[#435EEF] duration-200 text-white px-4 py-2 rounded-lg font-semibold text-center">Buat
Expand Down
2 changes: 1 addition & 1 deletion resources/views/auth/login.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<input type="email" name="email" placeholder="Email" class="px-4 py-2 border rounded-md">
<input type="password" name="password" placeholder="Password" class="px-4 py-2 border rounded-md">
<button type="submit"
class="font-semibold bg-[#003285] hover:opacity-100 opacity-80 duration-200 px-4 py-2 rounded-md">Login</button>
class="font-semibold bg-[#003285] text-white hover:opacity-100 opacity-80 duration-200 px-4 py-2 rounded-md">Login</button>
<a href="/forget-password" class="text-blue-500 underline text-sm">Lupa password?</a>
</form>
</main>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/footer.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<footer class="bg-[#003285] flex flex-col md:flex-row items-center md:items-start justify-between gap-8 p-8 text-lg">
<footer class="bg-[#003285] text-white flex flex-col md:flex-row items-center md:items-start justify-between gap-8 p-8 text-lg">
<aside class="md:max-w-[33%] flex-grow flex flex-col gap-2">
<h2 class="font-bold text-center">KONTAK</h2>
<p class="text-center md:text-left">
Expand Down
6 changes: 3 additions & 3 deletions resources/views/components/header.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class="md:min-w-1/4 hidden md:flex flex-col sm:flex-row items-center justify-aro
<button class="flex items-center gap-1">Rotasi <img src="/images/icons/moreArrow.svg"
class="duration-300"></button>
<div
class="max-h-0 duration-300 absolute flex flex-col gap-1 bg-white mt-4 text-gray-800 text-base font-light overflow-hidden">
class="max-h-0 duration-300 absolute flex flex-col gap-1 mt-4 text-white text-base font-light overflow-hidden">
<div class="flex flex-col gap-1 px-2 py-1 bg-[#003285]">
<a href="/rotasi/denah">Denah Rotasi</a>
<hr>
Expand All @@ -24,9 +24,9 @@ class="max-h-0 duration-300 absolute flex flex-col gap-1 bg-white mt-4 text-gray
<a class="text-gray-500" href="#">Promosi</a>
@auth
<a href="/akun">Akun</a>
<a href="/logout">Logout</a>
<a href="/logout" class="text-white">Logout</a>
@else
<a href="/login">Login</a>
<a href="/login" class="text-white">Login</a>
@endauth
</nav>
<div class="hidden md:block absolute h-full right-0 z-40 w-40">
Expand Down
6 changes: 3 additions & 3 deletions resources/views/rotasi/denah/cabang.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<body class="font-sans tracking-wider text-lg">
@include('components.header', ['static' => true])
<main>
<section class="bg-[#FFEFB2] p-8 flex flex-col md:grid md:grid-cols-3 gap-8">
<section class="bg-[#1144ee11] p-8 flex flex-col md:grid md:grid-cols-3 gap-8">
<aside class="col-span-3 md:col-span-1 sm:h-full flex flex-col">
<div class="flex items-center justify-center h-64 rounded-lg">
<img src="{{ $cabang->thumbnail_url && $cabang->thumbnail_url != 'NULL' ? $cabang->thumbnail_url : '/images/default_tower.jpg' }}"
Expand All @@ -18,7 +18,7 @@
<h1 id="nama" class="p-2 font-semibold text-lg">
{{ $cabang->nama }}
</h1>
@can('admin')
@can('cabangOwner', $cabang)
<div class="px-2 flex flex-wrap gap-2">
@foreach ($cabang->kelases as $kelas)
<p class="text-xs bg-gray-300 px-2 py-1 rounded-md">{{ $kelas->kelas->nama_kelas }}</p>
Expand All @@ -27,7 +27,7 @@
@endcan
<pre style="white-space: pre-wrap;white-space: -moz-pre-wrap;white-space: -pre-wrap;white-space: -o-pre-wrap;"
class="p-2 break-all w-full font-sans">{{ $cabang->alamat }}</pre>
@can('admin')
@can('cabangOwner', $cabang)
<a class="bg-[#7186F3] hover:bg-[#435EEF] duration-200 text-white w-full text-center p-2 rounded-lg font-semibold mb-2"
href="/personel/cabang/{{ $cabang->id }}">Personel</a>
<a href="/rotasi/denah/input/{{ $cabang->id }}"
Expand Down
180 changes: 89 additions & 91 deletions resources/views/rotasi/denah/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,12 @@ class="w-20 h-20 z-40 p-2 bg-white rounded-full">
</div>
</section>
{{-- Map end --}}
@can('admin')
<div class="flex justify-center p-4 text-sm font-semibold">
<div id="tab-cabang" class="flex gap-2 border-2 border-[#003285] rounded-md p-2">
<button id="list" class="rounded-lg bg-[#003285] px-2 py-1">List Cabang</button>
<button id="summary" class="rounded-lg px-2 py-1">Summary Cabang</button>
</div>
<div class="flex justify-center p-4 text-sm font-semibold">
<div id="tab-cabang" class="flex gap-2 border-2 border-[#003285] rounded-md p-2">
<button id="list" class="rounded-lg bg-[#003285] text-white px-2 py-1">List Cabang</button>
<button id="summary" class="rounded-lg px-2 py-1">Summary Cabang</button>
</div>
@endcan
</div>
<section id="cabang-list" class="p-4 w-full flex flex-col-reverse sm:grid sm:grid-cols-2 gap-2">
<aside
class="col-span-2 sm:col-span-1 text-[#474747] pb-2 pe-2 flex flex-col gap-2 max-h-[70vh] overflow-y-auto">
Expand Down Expand Up @@ -77,105 +75,105 @@ class="self-end bg-[#7186F3] hover:bg-[#435EEF] duration-200 text-white px-4 py-
</div>
</aside>
</section>
@can('admin')
<section id="cabang-summary" class="hidden p-4">
<div id="anak-cabang" class="flex flex-col gap-4">
@if (count($cabangs) === 0)
<p class="text-center my-auto">Tidak ada data</p>
@endif
@foreach ($cabangs as $cabang)
<a class="border-2 border-[#003285] rounded-md px-4 py-2 flex flex-col sm:flex-row items-center justify-between"
href="/rotasi/selektif?lokasi={{ $cabang->nama }}">
<span class="sm:max-w-[40%] font-semibold">
{{ $cabang->nama }}
</span>
<span class="flex-grow flex justify-center sm:justify-end gap-2">
<span class="flex flex-col items-center">
<span class="font-medium">Pengajuan</span>
<span class="flex gap-2">
<span class="flex items-center">
<img class="w-5" src="/images/icons/in.svg" alt="in">
{{ count($cabang->inAll) }}
</span>
<span class="flex items-center">
<img class="w-5" src="/images/icons/out.svg" alt="out">
{{ count($cabang->outAll) }}
</span>
<section id="cabang-summary" class="hidden p-4">
<div id="anak-cabang" class="flex flex-col gap-4">
@if (count($cabangs) === 0)
<p class="text-center my-auto">Tidak ada data</p>
@endif
@foreach ($cabangs as $cabang)
<a class="border-2 border-[#003285] rounded-md px-4 py-2 flex flex-col sm:flex-row items-center justify-between"
@can('admin') href="/rotasi/selektif?lokasi={{ $cabang->nama }}" @endcan>
<span class="sm:max-w-[40%] font-semibold">
{{ $cabang->nama }}
</span>
<span class="flex-grow flex justify-center sm:justify-end gap-2">
<span class="flex flex-col items-center">
<span class="font-medium">Pengajuan</span>
<span class="flex gap-2">
<span class="flex items-center">
<img class="w-5" src="/images/icons/in.svg" alt="in">
{{ count($cabang->inAll) }}
</span>
<span class="flex items-center">
<img class="w-5" src="/images/icons/out.svg" alt="out">
{{ count($cabang->outAll) }}
</span>
</span>
<span class="flex flex-col items-center">
<span class="font-medium">Diterima</span>
<span class="flex gap-2">
<span class="flex items-center">
<img class="w-5" src="/images/icons/in.svg" alt="in">
{{ count($cabang->inDapat) }}
</span>
<span class="flex items-center">
<img class="w-5" src="/images/icons/out.svg" alt="out">
{{ count($cabang->outDapat) }}
</span>
</span>
<span class="flex flex-col items-center">
<span class="font-medium">Diterima</span>
<span class="flex gap-2">
<span class="flex items-center">
<img class="w-5" src="/images/icons/in.svg" alt="in">
{{ count($cabang->inDapat) }}
</span>
<span class="flex items-center">
<img class="w-5" src="/images/icons/out.svg" alt="out">
{{ count($cabang->outDapat) }}
</span>
</span>
<span class="flex flex-col items-center">
<span class="font-medium">Disetujui</span>
<span class="flex gap-2">
<span class="flex items-center">
<img class="w-5" src="/images/icons/in.svg" alt="in">
{{ count($cabang->inDiterima) }}
</span>
<span class="flex items-center">
<img class="w-5" src="/images/icons/out.svg" alt="out">
{{ count($cabang->outDiterima) }}
</span>
</span>
<span class="flex flex-col items-center">
<span class="font-medium">Disetujui</span>
<span class="flex gap-2">
<span class="flex items-center">
<img class="w-5" src="/images/icons/in.svg" alt="in">
{{ count($cabang->inDiterima) }}
</span>
<span class="flex items-center">
<img class="w-5" src="/images/icons/out.svg" alt="out">
{{ count($cabang->outDiterima) }}
</span>
</span>
<span class="flex flex-col items-center">
<span class="font-medium">Ditolak</span>
<span class="flex gap-2">
<span class="flex items-center">
<img class="w-5" src="/images/icons/in.svg" alt="in">
{{ count($cabang->inTidakDapat) }}
</span>
<span class="flex items-center">
<img class="w-5" src="/images/icons/out.svg" alt="out">
{{ count($cabang->outTidakDapat) }}
</span>
</span>
<span class="flex flex-col items-center">
<span class="font-medium">Ditolak</span>
<span class="flex gap-2">
<span class="flex items-center">
<img class="w-5" src="/images/icons/in.svg" alt="in">
{{ count($cabang->inTidakDapat) }}
</span>
<span class="flex items-center">
<img class="w-5" src="/images/icons/out.svg" alt="out">
{{ count($cabang->outTidakDapat) }}
</span>
</span>
</span>
</a>
@endforeach
</div>
</section>
@endcan
</span>
</a>
@endforeach
</div>
</section>
</main>
@include('components.footer')
<script src="/script/nav.js"></script>
<script src="/script/map.js"></script>
<script src="/script/debounce.js"></script>
@can('admin')
<script>
function openListCabang() {
document.getElementById('cabang-list').classList.remove('hidden');
document.getElementById('cabang-list').classList.add('flex');
document.getElementById('cabang-list').classList.add('sm:grid');
document.getElementById('cabang-summary').classList.add('hidden');
document.querySelector('#tab-cabang #list').classList.add('bg-[#003285]');
document.querySelector('#tab-cabang #summary').classList.remove('bg-[#003285]');
}
<script>
function openListCabang() {
document.getElementById('cabang-list').classList.remove('hidden');
document.getElementById('cabang-list').classList.add('flex');
document.getElementById('cabang-list').classList.add('sm:grid');
document.getElementById('cabang-summary').classList.add('hidden');
document.querySelector('#tab-cabang #list').classList.add('bg-[#003285]');
document.querySelector('#tab-cabang #list').classList.add('text-white');
document.querySelector('#tab-cabang #summary').classList.remove('bg-[#003285]');
document.querySelector('#tab-cabang #summary').classList.remove('text-white');
}
function openSummaryCabang() {
document.getElementById('cabang-list').classList.add('hidden');
document.getElementById('cabang-list').classList.remove('flex');
document.getElementById('cabang-list').classList.remove('sm:grid');
document.getElementById('cabang-summary').classList.remove('hidden');
document.querySelector('#tab-cabang #list').classList.remove('bg-[#003285]');
document.querySelector('#tab-cabang #summary').classList.add('bg-[#003285]');
}
document.querySelector('#tab-cabang #list').addEventListener('click', openListCabang);
document.querySelector('#tab-cabang #summary').addEventListener('click', openSummaryCabang);
</script>
@endcan
function openSummaryCabang() {
document.getElementById('cabang-list').classList.add('hidden');
document.getElementById('cabang-list').classList.remove('flex');
document.getElementById('cabang-list').classList.remove('sm:grid');
document.getElementById('cabang-summary').classList.remove('hidden');
document.querySelector('#tab-cabang #list').classList.remove('bg-[#003285]');
document.querySelector('#tab-cabang #list').classList.remove('text-white');
document.querySelector('#tab-cabang #summary').classList.add('bg-[#003285]');
document.querySelector('#tab-cabang #summary').classList.add('text-white');
}
document.querySelector('#tab-cabang #list').addEventListener('click', openListCabang);
document.querySelector('#tab-cabang #summary').addEventListener('click', openSummaryCabang);
</script>
<script>
var currentPage = 0;
const mapContainer = document.getElementById('map');
Expand Down
2 changes: 1 addition & 1 deletion resources/views/welcome.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class="blur-sm absolute z-0 opacity-50" />
setiap proses rotasi, demosi, dan promosi dilakukan dengan cara yang adil dan efisien.
</p>
</div>
<div class="grid md:grid-cols-3 gap-4">
<div class="grid md:grid-cols-3 gap-4 text-white">
<a href="/rotasi/denah"
class="bg-[#003285] font-semibold text-lg 2xl:text-xl flex justify-center items-center gap-3 p-4 rounded-xl 2xl:rounded-2xl">Rotasi
<img src="/images/icons/rotasi.svg" alt="rotasi" /></a>
Expand Down

0 comments on commit e6e091d

Please sign in to comment.