From 6cb1d8891ac9716cb8cf3a4698ad1cd8a84c5936 Mon Sep 17 00:00:00 2001
From: Luna <lunalcampbell@gmail.com>
Date: Sun, 18 Jul 2021 10:35:34 -0700
Subject: [PATCH 1/2] changed the way the js recieves data from strings to json

---
 frontend/login.js       | 29 +++++++----------------------
 frontend/loginchange.js |  3 +--
 frontend/register.js    |  5 ++---
 3 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/frontend/login.js b/frontend/login.js
index 258ed71..ae58623 100644
--- a/frontend/login.js
+++ b/frontend/login.js
@@ -9,31 +9,16 @@ form.addEventListener("submit", async function(event) {
     uname = formData.get('uname');
     pin = formData.get('pin');
 
-    try {
-    const loginInfo = await loginFetch();
-
-    if (loginInfo === "pin matches") {
-        login()
-    } else if (loginInfo === "Incorrect pin" || loginInfo === `User ${uname} does not exist.`) {
-        incorrectLogin()
-    }
-    } catch {
-        document.querySelector("#incorrect").innerHTML = 'An Error has Occurred. Try again later.'
+    const response = await fetch(`/users/${uname}/${pin}`);
+    const loginInfo = await response.json();
+    
+    if (loginInfo.status === "ok") {
+      login()
+    } else {
+      incorrectLogin()
     }
 })
 
-async function loginFetch() {
-    const rawResponse = await fetch(`/api/users/${uname}/${pin}`, {
-        // credentials: "include",
-        method: 'GET',
-        headers: {
-            'Accept': 'text/plain'
-          },
-});
-const content = await rawResponse.text();
-return content
-}
-
 function login() {
     console.log('You have logged in!')
     document.querySelector("#username").innerHTML = `${uname}`
diff --git a/frontend/loginchange.js b/frontend/loginchange.js
index 3da1d64..561ca6f 100644
--- a/frontend/loginchange.js
+++ b/frontend/loginchange.js
@@ -55,10 +55,9 @@ async function loginChange() {
 const rawResponse = await fetch(`/api/users/change/${uname}/${pin}/${newUname}/${newPin}`, {
     method: 'POST',
     headers: {
-      'Accept': 'text/plain'
     },
     body: ""
 });
 document.querySelector("#incorrect").innerHTML = 'Login Changed!'
-window.location.replace("/login.html")
+window.location.replace("http://127.0.0.1:5500/login.html")
 }
diff --git a/frontend/register.js b/frontend/register.js
index daff33a..227f450 100644
--- a/frontend/register.js
+++ b/frontend/register.js
@@ -36,7 +36,7 @@ form.addEventListener("submit", async function(event) {
 })
 
 async function getUname() {
-  let response = await fetch(`/api/users/${uname}`);
+  let response = await fetch(`$/api/users/${uname}`);
   responseText = await response.text();
   return responseText;
 }
@@ -45,11 +45,10 @@ async function register() {
 const rawResponse = await fetch(`/api/register/${uname.toString().toLowerCase()}/${pin.toString()}/${pronouns.toString().toLowerCase().replace("/", ".")}`, {
     method: 'POST',
     headers: {
-      'Accept': 'text/plain'
     },
     body: ""
 });
 document.querySelector("#taken").innerHTML = 'Registered!'
-window.location.replace("/login.html")
+window.location.replace("http://127.0.0.1:5500/login.html")
 }
 

From 3afc56b71502e05128408dabe819dd4e22b6ae3f Mon Sep 17 00:00:00 2001
From: Luna <lunalcampbell@gmail.com>
Date: Sun, 18 Jul 2021 10:57:02 -0700
Subject: [PATCH 2/2] bug squash

---
 frontend/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/login.js b/frontend/login.js
index ae58623..2a905d3 100644
--- a/frontend/login.js
+++ b/frontend/login.js
@@ -9,7 +9,7 @@ form.addEventListener("submit", async function(event) {
     uname = formData.get('uname');
     pin = formData.get('pin');
 
-    const response = await fetch(`/users/${uname}/${pin}`);
+    const response = await fetch(`/api/users/${uname}/${pin}`);
     const loginInfo = await response.json();
     
     if (loginInfo.status === "ok") {