Update account.html

Author: kRxZykRxZy

account.html

@@ -63,84 +63,61 @@
         }
     </style>
     <script>
-        const serverUrl = 'https://image-hoster.onrender.com';
-
+        // Function to redirect user to ScratchAuth for authentication
         function registerScratchAuth() {
             const messageBox = document.getElementById("message");
-            const redirectLocation = encodeURIComponent(window.location.href);
+            const redirectLocation = encodeURIComponent(window.location.href); // Redirect back to this page after login
+
+            // URL for ScratchAuth with redirect parameter
             const authUrl = `https://auth.itinerary.eu.org/auth/?redirect=${redirectLocation}&name=Coding%20Hut&sign_in_method=cloud`;
 
             messageBox.style.color = "green";
-            messageBox.textContent = "Redirecting to Scratch Auth... Follow the steps there.";
+            messageBox.textContent = "Redirecting to ScratchAuth... Follow the steps there.";
+
+            setTimeout(() => {
+                window.location.href = authUrl; // Redirect to ScratchAuth login page
+            }, 2000);
+        }
+
+        // Function to redirect user to ubbload.netlify.app for APIAuth login
+        function registerApiAuth() {
+            const messageBox = document.getElementById("message");
+            const redirectLocation = encodeURIComponent(window.location.href); // Redirect back to this page after login
+
+            // URL for ubbload login, with redirect URL as a query parameter
+            const authUrl = `https://ubbload.netlify.app/login?redirect=${redirectLocation}`;
+
+            messageBox.style.color = "green";
+            messageBox.textContent = "Redirecting to APIAuth login (ubbload)... Follow the steps there.";
 
             setTimeout(() => {
-                window.location.href = authUrl;
+                window.location.href = authUrl; // Redirect to ubbload login page
             }, 2000);
         }
 
+        // Function to handle successful login (after redirect from ScratchAuth or ubbload)
         function checkAuth() {
             const urlParams = new URLSearchParams(window.location.search);
             const authSuccess = urlParams.get('success');
-            const username = urlParams.get('username');
+            const username = urlParams.get('username'); // Get the username parameter from the URL
 
             if (username) {
-                localStorage.setItem('username', username);
+                localStorage.setItem('username', username); // Store the username in localStorage
+                localStorage.setItem('loggedIn', 'true');  // Mark the user as logged in
+                window.location.href = 'index.html'; // Redirect to the main dashboard or home page
             }
-            
+
+            // If success is true (from ScratchAuth)
             if (authSuccess === 'true') {
                 localStorage.setItem('loggedIn', 'true');
                 window.location.href = 'index.html';
             }
         }
 
-        window.onload = checkAuth;
+        window.onload = checkAuth; // Call checkAuth when the page loads to handle login status
 
-        if (localStorage.getItem('verifiedUser')) {
-            window.location.href = 'index.html';
-        }
-
-        async function login() {
-            let username = document.getElementById('username').value.trim().toLowerCase();
-            if (!username) {
-                alert('Enter your Scratch username.');
-                return;
-            }
-
-            const response = await fetch(`${serverUrl}/login`, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ username })
-            });
-
-            const result = await response.json();
-            if (result.verified) {
-                localStorage.setItem('verifiedUser', username);
-                window.location.href = 'upload.html';
-            } else {
-                document.getElementById('codeMessage').textContent = result.message || 'Login failed. Please try again.';
-            }
-        }
-
-        async function verifyCode() {
-            let username = document.getElementById('username').value.trim().toLowerCase();
-            if (!username) {
-                alert('Enter your username first.');
-                return;
-            }
-
-            const response = await fetch(`${serverUrl}/verify`, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ username })
-            });
-
-            const result = await response.json();
-            if (result.verified) {
-                localStorage.setItem('verifiedUser', username);
-                window.location.href = 'index.html';
-            } else {
-                alert(result.message || 'Verification failed. Please try again.');
-            }
+        if (localStorage.getItem('loggedIn') === 'true') {
+            window.location.href = 'index.html'; // Redirect to the dashboard if already logged in
         }
     </script>
 </head>
@@ -154,23 +131,20 @@ <h2>Welcome! Please log in to continue.</h2>
         <button onclick="registerScratchAuth()">Register With ScratchAuth</button>
         <p id="message" class="message" aria-live="polite"></p>
         <p>
-            Please note: You will be redirected to an external site (Scratch Auth) for authentication. Once there, 
+            Please note: You will be redirected to an external site (ScratchAuth) for authentication. Once there, 
             choose the "Cloud Data" option for the quickest sign-in method.
         </p>
         <p>
             If you are unable to use the "Cloud Data" option, other sign-in methods are available on Scratch Auth's page, for example, profile commenting.
         </p>
-        <a href="https://github.com/Scratch-Coding-Hut/Scratch-Coding-Hut.github.io/issues/new">
-            <button>Having trouble signing in? Report an issue</button>
-        </a>
+
     </div>
 
     <div class="container">
         <h2>Login Using APIAuth</h2>
-        <input type="text" id="username" placeholder="Enter your Scratch username" />
-        <button onclick="login()">Login With APIAuth (Made by <a href="https://scratch.mit.edu/users/kRxZy_kRxZy/" target="_blank" style="color: red">kRxZy_kRxZy</a>)</button>
-        <p id="codeMessage" class="message"></p>
-        <button onclick="verifyCode()">Verify Code</button>
+        <button onclick="registerApiAuth()">Login With APIAuth (Made by <a href="https://scratch.mit.edu/users/kRxZy_kRxZy/" target="_blank" style="color: black">kRxZy_kRxZy</a>)</button>
     </div>
+       <div class="container"><a href="https://github.com/Scratch-Coding-Hut/Scratch-Coding-Hut.github.io/issues/new">
+            <button>Having trouble signing in? Report an issue</button></a><div>
 </body>
 </html>