Refactored Queue Forms to make consistent with other forms and betwee…

…n each other
pennlabs · Oct 13, 2024 · 853bd07 · 853bd07
1 parent 6921ea8
commit 853bd07
Show file tree

Hide file tree

Showing 10 changed files with 683 additions and 853 deletions.
diff --git a/frontend/components/Course/InstructorQueuePage/CreateQueue/CreateQueue.tsx b/frontend/components/Course/InstructorQueuePage/CreateQueue/CreateQueue.tsx
diff --git a/frontend/components/Course/InstructorQueuePage/InstructorQueuePage.tsx b/frontend/components/Course/InstructorQueuePage/InstructorQueuePage.tsx
@@ -6,7 +6,7 @@ import Snackbar from "@material-ui/core/Snackbar";
 import InstructorQueues from "./InstructorQueues";
 import Announcements from "../Announcements";
 import QueueSettings from "./QueueSettings/QueueSettings";
-import CreateQueue from "./CreateQueue/CreateQueue";
+import QueueCreate from "./QueueCreate/QueueCreate";
 import { AuthUserContext } from "../../../context/auth";
 import { useQueues, useStaff } from "../../../hooks/data-fetching/course";
 import {
@@ -143,7 +143,7 @@ const InstructorQueuePage = (props: InstructorQueuePageProps) => {
                 )}
                 {pageState.kind === PageStateEnum.CREATE && (
                     <Grid.Row style={{ marginTop: "1rem" }}>
-                        <CreateQueue
+                        <QueueCreate
                             courseId={courseId}
                             mutate={mutate}
                             successFunc={() => setSuccess(true)}

diff --git a/frontend/components/Course/InstructorQueuePage/QuestionCard.tsx b/frontend/components/Course/InstructorQueuePage/QuestionCard.tsx
@@ -197,17 +197,19 @@ const QuestionCard = (props: QuestionCardProps) => {
                                     inverted
                                     position="left center"
                                 />
-                                <QuestionTimer
-                                    questionStartTime={
-                                        question.timeResponseStarted ||
-                                        question.timeAsked
-                                    }
-                                    timerStartTime={
-                                        (queue.questionTimerEnabled &&
-                                            queue.questionTimerStartTime) ||
-                                        10
-                                    }
-                                />
+                                {queue.questionTimerEnabled &&
+                                    question.timeResponseStarted && (
+                                        <QuestionTimer
+                                            questionStartTime={
+                                                question.timeResponseStarted
+                                            }
+                                            timerStartTime={
+                                                (queue.questionTimerEnabled &&
+                                                    queue.questionTimerStartTime) ||
+                                                10
+                                            }
+                                        />
+                                    )}
                             </div>
                         </Header>
                     </div>