@@ -66,12 +66,12 @@ class UserController extends Controller | |||||
//This should probably be changed to not return a page | //This should probably be changed to not return a page | ||||
if (Auth::attempt($credentials)) { | if (Auth::attempt($credentials)) { | ||||
Log::debug(Auth::attempt($credentials)); | |||||
/* Log::debug("I don't know why this works") */ | |||||
$request->session()->regenerate(); | $request->session()->regenerate(); | ||||
return response()->json(["status" => "success"]); | |||||
} else { | |||||
abort(401); | |||||
} | } | ||||
/* return response()->json(["status" => "error"]); */ | |||||
} | } | ||||
public function logout(Request $request) { | public function logout(Request $request) { | ||||
@@ -40,7 +40,10 @@ function login(event) { | |||||
"password": document.getElementById("login_password").value}), | "password": document.getElementById("login_password").value}), | ||||
}).then(response => { | }).then(response => { | ||||
if (response.ok) { | if (response.ok) { | ||||
window.location.assign("/panel") | |||||
} else { | |||||
document.querySelector("#login_form .error").innerText = | |||||
"Invalid credentials." | |||||
} | } | ||||
}) | }) | ||||
event.preventDefault(); | event.preventDefault(); | ||||
@@ -77,7 +80,7 @@ if (!token) {getToken()} | |||||
if (window.location.pathname == '/') { | if (window.location.pathname == '/') { | ||||
document.getElementById('nav_toggle').addEventListener('click', toggleNav) | document.getElementById('nav_toggle').addEventListener('click', toggleNav) | ||||
document.getElementById('login_form').addEventListener('submit', login) | |||||
document.querySelector('#login_form button').addEventListener('click', login) | |||||
app.token = token | app.token = token | ||||
// console.log(app.token) | // console.log(app.token) | ||||
// console.log(app.$data.active) | // console.log(app.$data.active) | ||||
@@ -103,6 +103,10 @@ nav form button { | |||||
min-width: 5em; | min-width: 5em; | ||||
} | } | ||||
nav form p { | |||||
margin-top: 0; | |||||
} | |||||
nav form input,label { | nav form input,label { | ||||
opacity: 0.7; | opacity: 0.7; | ||||
} | } | ||||
@@ -18,7 +18,6 @@ | |||||
</a> | </a> | ||||
@guest | @guest | ||||
<form id='login_form' class= 'login' method='POST'> | <form id='login_form' class= 'login' method='POST'> | ||||
@csrf | |||||
<div> | <div> | ||||
<label for='sender_email'>Email</label> | <label for='sender_email'>Email</label> | ||||
<input required id='login_email' type='email' name='sender_email' placeholder='' | <input required id='login_email' type='email' name='sender_email' placeholder='' | ||||
@@ -29,6 +28,7 @@ spellcheck='false'> | |||||
<input required id='login_password' type='password' name='sender_password' placeholder='' spellcheck='false'> | <input required id='login_password' type='password' name='sender_password' placeholder='' spellcheck='false'> | ||||
</div> | </div> | ||||
<button class='login-btn'type="login">Log in</button> | <button class='login-btn'type="login">Log in</button> | ||||
<div><p class="error"></p></div> | |||||
</form> | </form> | ||||
<div id="nav_toggle" class="nav-toggle"><div> | <div id="nav_toggle" class="nav-toggle"><div> | ||||
@@ -53,5 +53,4 @@ Route::post('/reset-passowrd', [UserController::class, | |||||
'resetPassword'])->middleware('guest'); | 'resetPassword'])->middleware('guest'); | ||||
Route::post('/login', [UserController::class, | Route::post('/login', [UserController::class, | ||||
'login']); | |||||
'login'])->middleware('guest'); |