Merge pull request #34 from csci5117s24/fix_new_user

fix: error for new users
csci5117s24 · May 6, 2024 · b67ebb4 · b67ebb4
2 parents 39a2cfa + ea27efc
commit b67ebb4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/app/api/src/biz/water.js b/app/api/src/biz/water.js
@@ -163,7 +163,10 @@ function calStat(waterLogs, keyFunc, targetUnit) {
 
 
 async function FormatWaterLogs(userId, waterLogs) {
-    const waterGoal = await FindFromMongo("water_goal", {userId: userId});
+    let waterGoal = await FindFromMongo("water_goal", {userId: userId});
+    if (!waterGoal || waterGoal.length == 0) {
+        waterGoal = [{value: 0, unit: 'ml'}];
+    }
     const goalUnit = waterGoal[0].unit;
     return waterLogs.map((log) => {
         if (log.unit === goalUnit) {

diff --git a/app/src/routes/PageCalorie.jsx b/app/src/routes/PageCalorie.jsx
@@ -85,6 +85,10 @@ function PageCalorie() {
     }
 
     async function updateGoal() {
+        if (!goal || goal === 0) {
+            alert("calorie goal can not be empty or zero!");
+            return
+        }
         await setCalorieGoal(goal);
         const newAchieved = calAchieved(calorieLogs, goal);
         setEditGoal(false);
@@ -151,7 +155,11 @@ function PageCalorie() {
                 <h1 className='third-title'>Your Workouts 
                     <span className='title-link'><Link className='title-link' to="/exercise/workout"> Manage</Link></span>
                 </h1>
+                {workouts.length === 0 ? 
+                <div style={{marginBottom:'2rem'}}>You have no workouts yet. Click <Link to="/exercise/workout">here</Link> to add some. </div> :
                 <WorkoutList workouts={workouts} addCalorieLog={addCalorieLog}/>
+                }
+
                 <h1 className='third-title'>Your Exercise Logs for Today</h1>
                 <Link to="/exercise/calendar" style={{color: 'var(--my-blue)'}}> History</Link>
                 <CaloriesLogList calorieLogs={calorieLogs} deleteLog={removeCalorieLog}/>

diff --git a/app/src/routes/PageWeightGoal.jsx b/app/src/routes/PageWeightGoal.jsx
@@ -33,8 +33,10 @@ export function PageWeightGoal() {
     useEffect(() => {
         async function fetchData() {
             const curGoal = await getWeightGoal();
-            setGoal({value: curGoal.value, unit: curGoal.unit});
-            setDeadline(curGoal.deadline);
+            if (curGoal) {
+                setGoal({value: curGoal.value, unit: curGoal.unit});
+                setDeadline(curGoal.deadline);
+            }
         }
         fetchData();
     }, []);