conditionals for Coach Only functions; #56

BCIT-SSD-2020-21 · Apr 16, 2021 · cf9d2ba · cf9d2ba
1 parent d308cbd
commit cf9d2ba
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/src/components/atoms/Action.js b/src/components/atoms/Action.js
@@ -87,12 +87,16 @@ export default function SessionAction({action, authUser, dataUser}) {
                     <IconButton className={classes.dataButton} disabled={!actionEditMode} onClick={() => setStress(stress+1)}><AddCircleTwoToneIcon fontSize="small" className={classes.dataIcon} /></IconButton>
                 </Box>
             </Box>
-            <Box className={classes.actionButtons}>
-                {/* Coach Only */}
-                <Button className={classes.buttonSecondary} disabled={!ownerCoach} onClick={() => setActionEditMode(!actionEditMode)} >{actionEditMode ? 'done edit' : 'EDIT'}</Button>
-                <TextField className={classes.orderIndex} disabled={!actionEditMode} id="orderIndex" label="order index" value={orderIndex} onChange={(e) => setOrderIndex(e.target.value)} />
-                <Button className={classes.buttonPrimary} disabled={!ownerCoach} onClick={(e) => saveAction(e)} >DONE</Button>
-            </Box>
+            {
+                dataUser.userType === "coach" &&
+                <Box className={classes.actionButtons}>
+                    {/* Coach Only */}
+                    <Button className={classes.buttonSecondary} disabled={!ownerCoach} onClick={() => setActionEditMode(!actionEditMode)} >{actionEditMode ? 'done edit' : 'EDIT'}</Button>
+                    <TextField className={classes.orderIndex} disabled={!actionEditMode} id="orderIndex" label="order index" value={orderIndex} onChange={(e) => setOrderIndex(e.target.value)} />
+                    <Button className={classes.buttonPrimary} disabled={!ownerCoach} onClick={(e) => saveAction(e)} >DONE</Button>
+                </Box>
+            }
+
         </Card>
     )
 }
diff --git a/src/containers/SessionDetails.js b/src/containers/SessionDetails.js
@@ -35,8 +35,12 @@ export default function SessionDetails({authUser, dataUser, session, exitSession
             sessions: firebase.firestore.FieldValue.arrayUnion(session.id),
         }).then(() => changeTab(e, 0))
     }
-    const completeSession = () => {
+    const completeSession = (e) => {
         setSessionInProgress(false)
+        sessionsRef.doc(session.id).update({
+            status: 'completed',
+        })
+        changeTab(e, 1)
         // UPDATE Firestore (status, data fields)
         console.log("startSession clicked")
     }
@@ -80,7 +84,7 @@ export default function SessionDetails({authUser, dataUser, session, exitSession
 
                 <Box className={classes.sessionButtons}>
                     {session.status === "draft" && <Button className={classes.buttonPrimary} onClick={(e) => publishSession(e)}>Publish Session</Button>}
-                    <Button className={classes.buttonPrimary} onClick={() => startSession()}>Start Session</Button>
+                    { dataUser.userType === "coach" && <Button className={classes.buttonPrimary} onClick={() => startSession()}>Start Session</Button>}
                 </Box>
 
                 <Box className={classes.sessionButtons}>
@@ -102,12 +106,16 @@ export default function SessionDetails({authUser, dataUser, session, exitSession
 
             { addingAction && <NewActionForm action={actions[actions.length-1]} sessionId={session.id} authUser={authUser} dataUser={dataUser} toggleAddAction={toggleAddAction} />}
 
-            <Box className={classes.sessionActionsButtions}>
+            {
+                dataUser.userType === "coach" &&
+                <Box className={classes.sessionActionsButtions}>
                 {   session.status &&
                     <Button className={classes.buttonPrimary} onClick={() => toggleAddAction()}>{addingAction ? 'Cancel Add Set' : 'Add Set'}</Button>
                 }
-                <Button className={classes.buttonPrimary} onClick={() => completeSession()}>COMPLETE SESSION</Button>
+                <Button className={classes.buttonPrimary} onClick={(e) => completeSession(e)}>COMPLETE SESSION</Button>
             </Box>
+            }
+
 
         </Paper>
     )

diff --git a/src/pages/DashPage.js b/src/pages/DashPage.js
@@ -51,7 +51,11 @@ export default function DashPage({authUser, dataUser}) {
                 >
                     <Tab className={classes.tab} label="Upcoming" />
                     <Tab className={classes.tab} label="Completed" />
-                    <Tab className={classes.tab} label="Drafts" />
+                    {
+                        dataUser?.userType === 'coach' &&
+                        <Tab className={classes.tab} label="Drafts" />
+                    }
+
                     {
                         dataUser?.userType === 'coach' &&
                         <Tab className={classes.tab} label="Create Session" />

diff --git a/src/styles/sessionStyles.js b/src/styles/sessionStyles.js
@@ -155,7 +155,6 @@ const newSessionFormStyles = makeStyles(() => ({
         borderRadius: '15px',
         backgroundColor: holisticTheme.bgBtnPrimary,        
     },
-
 }))
 
 const sessionActionStyles = makeStyles(() => ({
-Original file line number
+Diff line change
@@ Expand Up / @@ -155,7 +155,6 @@ const newSessionFormStyles = makeStyles(() => ({ @@
             borderRadius: '15px',
             backgroundColor: holisticTheme.bgBtnPrimary,
         },
     }))
     const sessionActionStyles = makeStyles(() => ({
@@ Expand Down @@