initial commit

elhagen13 · Dec 8, 2023 · 29be8b2 · 29be8b2
1 parent 1cbcb11
commit 29be8b2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/packages/studywell-frontend/src/App.js b/packages/studywell-frontend/src/App.js
@@ -10,7 +10,7 @@ function App() {
   return (
     <BrowserRouter>
       <Routes>
-        <Route path="/work/*" element={<WorkScreen />} />
+        <Route path="/work/:userId" element={<WorkScreen />} />
         <Route path="/" element={<LogIn />} />
         <Route path="/create" element={<CreateAccount />} />
       </Routes>

diff --git a/packages/studywell-frontend/src/pages/LogIn.js b/packages/studywell-frontend/src/pages/LogIn.js
@@ -23,7 +23,8 @@ function LogIn() {
       })
       .then((data) => {
         if (data !== null && data.user.password === password.value) {
-          navigate("/work");
+          const userId = data.user.id;
+          navigate(`/work/${userId}`);
         } else {
           setPassword(true);
         }

diff --git a/packages/studywell-frontend/src/pages/WorkScreen.js b/packages/studywell-frontend/src/pages/WorkScreen.js
@@ -7,12 +7,14 @@ import TotalTask from "../components/taskbar/TotalTask";
 import Navbar from "../components/navbar/NavBar";
 import { Route, Routes } from "react-router-dom";
 import React, { useState, useEffect } from "react";
+import { useParams } from 'react-router-dom';
 import TotalToDo from "../components/toDo/TotalToDo";
 
 function WorkScreen() {
   const [dataFromTask, updateToDoList] = useState("");
   const [breakCount, setBreakCount] = useState(1);
   const [tasks, setTasks] = useState([]);
+  const {userId} = useParams();
 
   const updateToDo = (task) => {
     console.log(task);
@@ -47,9 +49,9 @@ function WorkScreen() {
       });
   }
 
-  function postUser(task) {
+  function postUser(task, userId) {
     console.log(task);
-    const promise = fetch("https://studywell.azurewebsites.net/tasks", {
+    const promise = fetch("https://studywell.azurewebsites.net/tasks/${userId}", {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -63,7 +65,7 @@ function WorkScreen() {
   // eslint-disable-next-line
   function updateList(task) {
     console.log("Adding task:", task);
-    postUser(task)
+    postUser(task, userId)
       .then((res) => {
         console.log("Response from server:", res);
         return res.status === 200 ? res.json() : undefined;
@@ -106,6 +108,7 @@ function WorkScreen() {
           updateList={updateList}
           removeTask={removeTask}
           tasks={tasks}
+          userId={userId}
         />
       </div>
       <Routes>

diff --git a/studywell-backend/backend.js b/studywell-backend/backend.js
@@ -26,10 +26,11 @@ app.get("/tasks", (req, res) => {
   });
 });
 
-app.post("/tasks", (req, res) => {
+app.post("/tasks/:userId", (req, res) => {
   const taskToAdd = req.body;
   console.log(taskToAdd);
   taskToAdd.id = generateID();
+  taskToAdd.user_id = req.params.userId;
   taskModel
     .addTasks(taskToAdd)
     .then(() => {