From 766d3a6aeff49b7833e8688ee6901e26cfe338ff Mon Sep 17 00:00:00 2001
From: xander <63683502+xander113@users.noreply.github.com>
Date: Sat, 5 Mar 2022 12:31:44 -1200
Subject: [PATCH] javascript for login/reg finished

javascript should be finished with no errors. just php to go for now.
---
 web/app/Http/Controllers/Controller.php | 4 ++++
 web/app/Http/Kernel.php                 | 2 --
 web/resources/js/helpers/Auth.js        | 5 +++--
 web/resources/js/pages/Auth/Login.js    | 2 ++
 web/resources/js/pages/Auth/Register.js | 2 ++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/web/app/Http/Controllers/Controller.php b/web/app/Http/Controllers/Controller.php
index d921cd8..9c7b097 100644
--- a/web/app/Http/Controllers/Controller.php
+++ b/web/app/Http/Controllers/Controller.php
@@ -38,6 +38,10 @@ class Controller extends BaseController
             $messages = $valid->messages()->get('*');
             return Response()->json(['message'=>$error, 'badInputs'=>[array_keys($messages)]]);
         }
+
+        if (!User::where('username', Request::input('username'))->first()) {
+            return Response()->json(['message'=>"Sorry, that user wasn't found!", 'badInputs'=>['username']]);
+        }
         
         if (!Auth::attempt(Request::only('username', 'password'))) {
             return Response()->json(['message'=>'Sorry, thats the wrong password!', 'badInputs'=>['password']]);
diff --git a/web/app/Http/Kernel.php b/web/app/Http/Kernel.php
index 45b7ccd..7bc9cf6 100644
--- a/web/app/Http/Kernel.php
+++ b/web/app/Http/Kernel.php
@@ -20,8 +20,6 @@ class Kernel extends HttpKernel
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \Illuminate\Session\Middleware\StartSession::class,
-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
     ];
 
     /**
diff --git a/web/resources/js/helpers/Auth.js b/web/resources/js/helpers/Auth.js
index adc85ab..7ece9a8 100644
--- a/web/resources/js/helpers/Auth.js
+++ b/web/resources/js/helpers/Auth.js
@@ -28,10 +28,11 @@ export function CreateAccount(form)
     });
 }
 
-export const LoginToAccount = (form) => {
+export function LoginToAccount(form) {
 
     const body = form;
-
+    var badInputs = [];
+    
     return new Promise(async (resolve, reject)=>{
 
         await axios.post(`${protocol}apis.${url}/account/login`, body, {headers: {'X-CSRF-TOKEN': document.querySelector(`meta[name="csrf-token"]`).content}}).then(data=>{
diff --git a/web/resources/js/pages/Auth/Login.js b/web/resources/js/pages/Auth/Login.js
index fb837d0..63a76d6 100644
--- a/web/resources/js/pages/Auth/Login.js
+++ b/web/resources/js/pages/Auth/Login.js
@@ -22,6 +22,8 @@ const LoginForm = (props) => {
 				setValidity({error: true, message:res.message, inputs: res.inputs});
 				setTimeout(()=>{setValidity({...validity, error: false, inputs: res.inputs});}, 4000);
 			}
+			window.history.pushState(`/home`);
+			return;
 		}).catch(error=>console.log(error));
 		setWaitingForSubmission(false);
 	}
diff --git a/web/resources/js/pages/Auth/Register.js b/web/resources/js/pages/Auth/Register.js
index e9eed8b..bbfbe15 100644
--- a/web/resources/js/pages/Auth/Register.js
+++ b/web/resources/js/pages/Auth/Register.js
@@ -46,6 +46,8 @@ const RegisterForm = (props) => {
 				setValidity({error: true, message:res.message, inputs: res.inputs});
 				setTimeout(()=>{setValidity({...validity, error: false, inputs: res.inputs});}, 4000);
 			}
+			window.history.pushState(`/home`);
+			return;
 		}).catch(error=>console.log(error));
 		setWaitingForSubmission(false);
 	}