Stephen_Gesityan
/
MIF_E31222882
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modal tidak tertutup kalau error

This commit is contained in:
Stephen Gesityan 2025-05-17 19:23:05 +07:00
parent 19423cac45
commit 68ade5ce60
1 changed files with 108 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
resources/views/layouts/main.blade.php
View File

@ -21,7 +21,10 @@
</head> </head>
<body class="font-poppins"> <body class="font-poppins">
<header class="fixed top-0 w-full bg-white shadow-sm z-50" x-data="{ showModal: false, modalType: '' }"> <header class="fixed top-0 w-full bg-white shadow-sm z-50" x-data="{
showModal: {{ $errors->any() || session('login_error') || session('register_error') ? 'true' : 'false' }},
modalType: '{{ session('login_error') ? 'login' : (session('register_error') ? 'register' : ($errors->any() ? (old('email') && !old('name') ? 'login' : 'register') : '')) }}'
}">
<nav x-data="{ isMobileMenuOpen: false }" class="relative py-4 px-4 lg:px-44 flex items-center justify-between"> <nav x-data="{ isMobileMenuOpen: false }" class="relative py-4 px-4 lg:px-44 flex items-center justify-between">
<a href="/"> <a href="/">
<img src="{{ asset('images/carimeja3.png') }}" alt="carimeja.com" class="w-24"> <img src="{{ asset('images/carimeja3.png') }}" alt="carimeja.com" class="w-24">
@ -116,8 +119,6 @@ class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100
</div> </div>
</nav> </nav>
<!-- Modal --> <!-- Modal -->
<div x-show="showModal" x-cloak x-transition:enter="transition ease-out duration-300" <div x-show="showModal" x-cloak x-transition:enter="transition ease-out duration-300"
x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100" x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100"
@ -137,21 +138,25 @@ class="absolute top-3 right-4 text-gray-500 hover:text-gray-700 text-xl">
<div> <div>
<h2 class="text-xl font-semibold mb-4">Masuk</h2> <h2 class="text-xl font-semibold mb-4">Masuk</h2>
<!-- Error message for validation errors --> <!-- Error message for login errors -->
@if($errors->any()) @if(session('login_error') || ($errors->any() && old('email') && !old('name')))
<div class="bg-red-100 border-l-4 border-red-500 text-red-700 p-4 mb-4" role="alert"> <div class="bg-red-100 border-l-4 border-red-500 text-red-700 p-4 mb-4" role="alert">
@if(session('login_error'))
<p>{{ session('login_error') }}</p>
@else
<ul> <ul>
@foreach($errors->all() as $error) @foreach($errors->all() as $error)
<li>{{ $error }}</li> <li>{{ $error }}</li>
@endforeach @endforeach
</ul> </ul>
@endif
</div> </div>
@endif @endif
<form method="POST" action="{{ route('login') }}" class="space-y-4"> <form method="POST" action="{{ route('login') }}" class="space-y-4">
@csrf @csrf
<input type="email" name="email" placeholder="Email" class="w-full border px-4 py-2 rounded" <input type="email" name="email" value="{{ old('email') }}" placeholder="Email"
required> class="w-full border px-4 py-2 rounded" required>
<input type="password" name="password" placeholder="Password" <input type="password" name="password" placeholder="Password"
class="w-full border px-4 py-2 rounded" required> class="w-full border px-4 py-2 rounded" required>
@ -177,23 +182,27 @@ class="w-full bg-blue-600 hover:bg-blue-700 text-white py-2 rounded">Masuk</butt
<div> <div>
<h2 class="text-xl font-semibold mb-4">Daftar</h2> <h2 class="text-xl font-semibold mb-4">Daftar</h2>
<!-- Error message for validation errors --> <!-- Error message for register errors -->
@if($errors->any()) @if(session('register_error') || ($errors->any() && old('name')))
<div class="bg-red-100 border-l-4 border-red-500 text-red-700 p-4 mb-4" role="alert"> <div class="bg-red-100 border-l-4 border-red-500 text-red-700 p-4 mb-4" role="alert">
@if(session('register_error'))
<p>{{ session('register_error') }}</p>
@else
<ul> <ul>
@foreach($errors->all() as $error) @foreach($errors->all() as $error)
<li>{{ $error }}</li> <li>{{ $error }}</li>
@endforeach @endforeach
</ul> </ul>
@endif
</div> </div>
@endif @endif
<form method="POST" action="{{ route('register') }}" class="space-y-4"> <form method="POST" action="{{ route('register') }}" class="space-y-4">
@csrf @csrf
<input type="text" name="name" placeholder="Nama Lengkap" <input type="text" name="name" value="{{ old('name') }}" placeholder="Nama Lengkap"
class="w-full border px-4 py-2 rounded" required>
<input type="email" name="email" value="{{ old('email') }}" placeholder="Email"
class="w-full border px-4 py-2 rounded" required> class="w-full border px-4 py-2 rounded" required>
<input type="email" name="email" placeholder="Email" class="w-full border px-4 py-2 rounded"
required>
<input type="password" name="password" placeholder="Password" <input type="password" name="password" placeholder="Password"
class="w-full border px-4 py-2 rounded" required> class="w-full border px-4 py-2 rounded" required>
<input type="password" name="password_confirmation" placeholder="Konfirmasi Password" <input type="password" name="password_confirmation" placeholder="Konfirmasi Password"
@ -208,10 +217,9 @@ class="w-full bg-blue-600 hover:bg-blue-700 text-white py-2 rounded">Daftar</but
</div> </div>
</template> </template>
</div> </div>
</div> </div>
</header> </header>
<main class="pt-20"> <main class="pt-20">
@if (session('success') || session('error')) @if (session('success') || session('error'))
<div id="floating-alert" style=" <div id="floating-alert" style="