Login screen account creation

kthchew · Feb 12, 2024 · a581a41 · a581a41
1 parent 9e6e36a
commit a581a41
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 35 deletions.
diff --git a/Backend/server.js b/Backend/server.js
@@ -193,7 +193,7 @@ app.get('/registerAccount', async (req, res) => {
   }
 
   const hashedPassword = await bcrypt.hash(password, 10);
-  db.insertOne({username: username, password: hashedPassword, canvasUser: null, lastLogin: null, lastLogout: null})
+  db.insertOne({username: username, password: hashedPassword, canvasUser: null, lastLogin: Date.now(), lastLogout: null})
   return res.status(200).json({message: "User registered"});
 });
 

diff --git a/Frontend/src/App.jsx b/Frontend/src/App.jsx
@@ -4,13 +4,14 @@ import './App.css'
 import Login from "./Login"
 
 const API_URL = "http://localhost:3500"
-const API_KEY = "nolol"
+// const API_KEY = "nolol"
 
 function App() {
   const [courses, setCourses] = useState(null);
-  const [userId, setUserId] = useState(null);
-  const [userData, setUserData] = useState(null);
+  const [userId, setUserId] = useState(null); //canvas user id
+  const [userData, setUserData] = useState(null); //from db
   const [loginTime, setLoginTime] = useState(null);
+  const [apiKey, setApiKey] = useState(null)
 
 //due_at, points_possible, has_submitted_submissions, name, 
 
@@ -36,7 +37,7 @@ function App() {
   const getUserData = async () => {
     const res = await axios.get(`${API_URL}/getUser`, {
       params: {
-        "canvas_api_token": API_KEY
+        "canvas_api_token": apiKey
       }   
     })
     await setUserId(res.data.id)
@@ -65,19 +66,19 @@ function App() {
   }, [])
 
   useEffect(() => {
-    const loginUser = async () => {
-      if (!userId) {return}
+    // const loginUser = async () => {
+    //   if (!userId) {return}
 
-      const res = await axios.get(`${API_URL}/login`, {
-        params: {
-          "user_id": userId
-        }   
-      })
-      console.log(res.data.user)
-      await setUserData(res.data.user);
-    }
+    //   const res = await axios.get(`${API_URL}/login`, {
+    //     params: {
+    //       "user_id": userId
+    //     }   
+    //   })
+    //   console.log(res.data.user)
+    //   await setUserData(res.data.user);
+    // }
 
-    loginUser();
+    // loginUser();
   }, [userId])
 
   useEffect(() => {
@@ -86,7 +87,7 @@ function App() {
 
       const res = await axios.get(`${API_URL}/getCourses`, {
         params: {
-          "canvas_api_token": API_KEY
+          "canvas_api_token": apiKey
         }   
       })
 
@@ -96,7 +97,7 @@ function App() {
         var newAssignments = [];
         const assignments = await axios.get(`${API_URL}/getAssignments`, {
           params: {
-            "canvas_api_token": API_KEY,
+            "canvas_api_token": apiKey,
             "course_id": c.id,
           }   
         })
@@ -106,7 +107,7 @@ function App() {
           if (a.has_submitted_submissions) {
             var submission = await axios.get(`${API_URL}/getSubmission`, {
               params: {
-                "canvas_api_token": API_KEY,
+                "canvas_api_token": apiKey,
                 "course_id": c.id,
                 "assignment_id": a.id,
                 "user_id": userId
@@ -132,12 +133,12 @@ function App() {
     }
 
     getCourseData();
-  }, [userData, userId])
+  }, [userId, apiKey])
 
 
   return (
     <>
-      <Login loginTime={setLoginTime}/>
+      <Login setLoginTime={setLoginTime} apiKey={apiKey} setApiKey={setApiKey} setUserData={setUserData}/>
       <h1>Your course info {userId ? <>(UID: {userId})</> : <></>}</h1>
       {courses && courses.message != "No courses available" ? 
         courses.map((c) => {

diff --git a/Frontend/src/Login.jsx b/Frontend/src/Login.jsx
@@ -6,10 +6,9 @@ import "./css/Login.css"
 
 const API_URL = "http://localhost:3500"
 
-export default function Login({setLoginTime}) {
+export default function Login({setLoginTime, apiKey, setApiKey, setUserData}) {
   const [username, setUser] = useState("");
   const [password, setPassword] = useState("");
-  const [canvasAPIKey, setCanvasAPIKey] = useState("");
   const [logState, setLogState] = useState("login");
 
   const handleSubmit = (e) => {
@@ -23,13 +22,19 @@ export default function Login({setLoginTime}) {
     setLoginTime(Date.now());
 
     if (logState === "login") {
-      const temp = await axios.get(`${API_URL}/loginUser`, {
-        params: {
-          "username": username,
-          "password": password
-        }
-      })
-      console.log(temp)
+      try {
+        const temp = await axios.get(`${API_URL}/loginUser`, {
+          params: {
+            "username": username,
+            "password": password
+          }
+        })
+
+        setApiKey(localStorage.getItem("canvasAPIKey"))
+        setUserData(temp.data)
+      } catch (e) {
+        console.log(e);
+      }
 
     } else if (logState === "create") {
       try {
@@ -39,11 +44,13 @@ export default function Login({setLoginTime}) {
             "password": password
           }
         })
-        localStorage.setItem("canvasAPIKey", canvasAPIKey)
+        localStorage.setItem("canvasAPIKey", apiKey)
+
+        //LOG IN THE USER AS WELL
 
         console.log(temp)
       } catch (e) {
-        console.log("account creation failed")
+        console.log("account creation failed") //TELL THE USER IF THE USERNAME IS TAKEN
       }
     }
   }
@@ -74,8 +81,8 @@ export default function Login({setLoginTime}) {
                  type="password"/>
         </div>
         {
-          logState === "create" && <CanvasAPIKeyContainer keyVal={canvasAPIKey}
-                                                          setKey={setCanvasAPIKey}/>
+          logState === "create" && <CanvasAPIKeyContainer keyVal={apiKey}
+                                                          setKey={setApiKey}/>
         }
         <button type="submit">{logState === "login" ? "Login" : "Create Account"}</button>
       </form>
@@ -106,5 +113,8 @@ CanvasAPIKeyContainer.propTypes = {
   setKey: PropTypes.func
 }
 Login.propTypes = {
-  setLoginTime: PropTypes.func
+  setLoginTime: PropTypes.func,
+  apiKey: PropTypes.string,
+  setApiKey: PropTypes.func,
+  setUserData: PropTypes.func
 }