From cf6f35cb1400c846d500a4c8dae0ea3346ce4dd7 Mon Sep 17 00:00:00 2001 From: Andrea Cioni Date: Wed, 1 May 2024 12:59:18 +0200 Subject: [PATCH] fix --- webapp/src/app/page.tsx | 46 ++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/webapp/src/app/page.tsx b/webapp/src/app/page.tsx index d0d8c1a..ea444f4 100644 --- a/webapp/src/app/page.tsx +++ b/webapp/src/app/page.tsx @@ -61,8 +61,7 @@ export default function Home() { const [username, setUsername] = useState(); const [password, setPassword] = useState(); const [qrCodeState, setQrCodeState] = useState("generating"); - const [domainPopupChecked, setDomainPopupChecked] = - useState(false); + const [domainPopupChecked, setDomainPopupChecked] = useState(false); const howToRef = useRef(); const howItWorksRef = useRef(); @@ -90,7 +89,7 @@ export default function Home() { useEffect(() => { const goToNewDomain = async () => { window.location.href = "https://keelink.fly.dev"; - } + }; const confirmReadPopup = async () => { return await swal.fire({ title: "🏗️ Domain moving 🏗️", @@ -107,25 +106,30 @@ export default function Home() { }; const showPopup = - (localStorage.getItem(LOCAL_STORAGE_DOMAIN_CHANGED_CHECKED) !== "true") && !document.URL.includes("keelink.fly.dev"); - - if ( - showPopup && - (document.URL.includes("keelink.cloud") || - document.URL.includes("localhost")) - ) { - confirmReadPopup().then(({ value, isConfirmed }) => { - if (isConfirmed) { - if (value) { - localStorage.setItem(LOCAL_STORAGE_DOMAIN_CHANGED_CHECKED, "true"); + document.URL.includes("keelink.cloud") || + document.URL.includes("localhost"); + + const automaticRedirectAccepted = + localStorage.getItem(LOCAL_STORAGE_DOMAIN_CHANGED_CHECKED) === "true"; + + if (showPopup && !automaticRedirectAccepted) { + if (!automaticRedirectAccepted) { + confirmReadPopup().then(({ value, isConfirmed }) => { + if (isConfirmed) { + if (value) { + localStorage.setItem( + LOCAL_STORAGE_DOMAIN_CHANGED_CHECKED, + "true" + ); + } + goToNewDomain(); + } else { + setDomainPopupChecked(true); } - goToNewDomain() - } else { - setDomainPopupChecked(true); - } - }); - } else { - goToNewDomain() + }); + } else { + goToNewDomain(); + } } }, []);