From 065f6f933205fcbc663ebb613e400119c49cea0a Mon Sep 17 00:00:00 2001
From: Frikky <frikky@shuffler.io>
Date: Tue, 20 May 2025 18:48:52 +0200
Subject: [PATCH] Minor fixes for frontend on shuffle with no internet

---
 frontend/src/App.jsx                |  2 +-
 frontend/src/views/AdminSetup.jsx   | 12 +++++++++---
 frontend/src/views/LoginPage.jsx    |  7 ++++++-
 frontend/src/views/LoginPageOld.jsx |  8 +++++++-
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index fa3ac7ea..caa9e1cb 100755
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -463,7 +463,7 @@ const App = (message, props) => {
 
         	<Route
         	  exact
-        	  path="/AdminSetup"
+        	  path="/adminsetup"
         	  element={
         	    <AdminSetup
         	      isLoaded={isLoaded}
diff --git a/frontend/src/views/AdminSetup.jsx b/frontend/src/views/AdminSetup.jsx
index 0365cf2f..65467300 100755
--- a/frontend/src/views/AdminSetup.jsx
+++ b/frontend/src/views/AdminSetup.jsx
@@ -68,13 +68,19 @@ const AdminAccount = (props) => {
       .then((response) =>
         response.json().then((responseJson) => {
           if (responseJson["success"] === false) {
-            setLoginInfo(responseJson["reason"]);
+            setLoginInfo(responseJson["reason"])
+
+			if (responseJson?.reason?.toLowerCase().includes("connection refused")) { 
+				navigate("/loginsetup")
+			}
+
           } else {
             if (responseJson.reason === "redirect") {
 			  setTimeout(() => {
-              	window.location.pathname = "/login";
+              	window.location.pathname = "/login"
 			  }, 2500)
             }
+
           }
         })
       )
@@ -111,7 +117,7 @@ const AdminAccount = (props) => {
           if (responseJson["success"] === false) {
             setLoginInfo(responseJson["reason"]);
           } else {
-            setLoginInfo("Successful register :)");
+            setLoginInfo("Successful register! Redirecting in a moment...");
 
 			setTimeout(() => {
             	window.location.pathname = "/login";
diff --git a/frontend/src/views/LoginPage.jsx b/frontend/src/views/LoginPage.jsx
index ccba780d..26bf6782 100755
--- a/frontend/src/views/LoginPage.jsx
+++ b/frontend/src/views/LoginPage.jsx
@@ -361,7 +361,7 @@ const LoginPage = props => {
 			console.log("Should login instead of register!")
 			setRegister(!register)
 		} else {
-			console.log("Path: " + path, "Register: " + register)
+			//console.log("Path: " + path, "Register: " + register)
 		}
 	}
 
@@ -468,6 +468,11 @@ const LoginPage = props => {
         response.json().then((responseJson) => {
           if (responseJson["success"] === false) {
             setLoginInfo(responseJson["reason"]);
+
+			if (responseJson?.reason?.toLowerCase().includes("connection refused")) { 
+				navigate("/loginsetup")
+			}
+
           } else {
             if (responseJson.sso_url !== undefined && responseJson.sso_url !== null) {
               setSSOUrl(responseJson.sso_url);
diff --git a/frontend/src/views/LoginPageOld.jsx b/frontend/src/views/LoginPageOld.jsx
index 541cd903..aaee73d6 100755
--- a/frontend/src/views/LoginPageOld.jsx
+++ b/frontend/src/views/LoginPageOld.jsx
@@ -85,7 +85,13 @@ const LoginDialog = (props) => {
       .then((response) =>
         response.json().then((responseJson) => {
           if (responseJson["success"] === false) {
-            setLoginInfo(responseJson["reason"]);
+            setLoginInfo(responseJson["reason"])
+
+			if (responseJson?.reason?.toLowerCase().includes("connection refused")) { 
+        		setLoginViewLoading(true) 
+          		start()
+			}
+
           } else {
 
             if (responseJson.sso_url !== undefined && responseJson.sso_url !== null) {