Merge pull request #340 from pennlabs/rt/april-fools

april fools

Author: ryantanen

frontend/components/Auth/AuthPrompt.tsx

@@ -3,6 +3,7 @@ import { Grid, Button } from "semantic-ui-react";
 import { useRouter, NextRouter } from "next/router";
 import AboutModal from "../common/AboutModal";
 import styles from "../../styles/landingpage.module.css";
+import { LOGO_PATH, LOGO_LOGIN_PATH } from "../../utils/branding";
 
 const AuthPrompt = (): JSX.Element => {
     const [showAboutModal, setShowAboutModal] = useState(false);
@@ -20,15 +21,15 @@ const AuthPrompt = (): JSX.Element => {
             <Grid columns={1} textAlign="center">
                 <Grid.Row only="computer tablet">
                     <img
-                        src="ohq-login.png"
+                        src={LOGO_LOGIN_PATH}
                         width="600px"
                         height="107px"
                         alt="logo"
                     />
                 </Grid.Row>
                 <Grid.Row only="mobile">
                     <img
-                        src="ohq.png"
+                        src={LOGO_PATH}
                         width="217px"
                         height="107px"
                         alt="logo-mini"

frontend/components/Course/CourseSidebarNav.tsx

@@ -6,6 +6,7 @@ import Link from "next/link";
 import { AuthUserContext } from "../../context/auth";
 import { useStaff } from "../../hooks/data-fetching/course";
 import { Course } from "../../types";
+import { LOGO_SIDEBAR_PATH, QUEUES_LABEL } from "../../utils/branding";
 
 interface CourseSidebarProps {
     course: Course;
@@ -35,7 +36,7 @@ const CourseSidebarNav = (props: CourseSidebarProps) => {
         <Segment basic>
             <Link href="/" as="/" legacyBehavior>
                 <Image
-                    src="../../../ohq.png"
+                    src={LOGO_SIDEBAR_PATH}
                     size="tiny"
                     style={{ marginTop: "10px", cursor: "pointer" }}
                 />
@@ -49,7 +50,7 @@ const CourseSidebarNav = (props: CourseSidebarProps) => {
                     >
                         <Menu.Item
                             style={noWrapStyle}
-                            name="Queues"
+                            name={QUEUES_LABEL}
                             icon="hourglass one"
                             active={router.pathname.endsWith("[course]")}
                             color="blue"

frontend/components/Course/CourseWrapper.tsx

@@ -13,6 +13,7 @@ import { Course as CourseType, Membership } from "../../types";
 import CourseSidebarInstructorList from "./CourseSidebarInstructorList";
 import { MOBILE_BP } from "../../constants";
 import { browserSupportsNotifications } from "../../utils/notifications";
+import { isAprilFools } from "../../utils/branding";
 
 interface CourseProps {
     render: (
@@ -38,9 +39,8 @@ const CourseWrapper = ({ render, ...props }: CourseProps) => {
 
     const { staff } = useStaff(rawCourse.id, initialUser);
 
-    const isAprilFirst = false;
     const [notifs, setNotifs, play] = usePlayer(
-        isAprilFirst ? aolAudio : bellAudio
+        isAprilFools ? aolAudio : bellAudio
     );
     const [supportsNotifs, setSupportsNotifs] = useState(false);
     useEffect(() => setSupportsNotifs(browserSupportsNotifications()), []);

frontend/components/Course/InstructorQueuePage/InstructorQueuePage.tsx

@@ -9,6 +9,7 @@ import QueueSettings from "./QueueSettings/QueueSettings";
 import QueueCreate from "./QueueCreate/QueueCreate";
 import { AuthUserContext } from "../../../context/auth";
 import { useQueues, useStaff } from "../../../hooks/data-fetching/course";
+import { SITE_NAME, QUEUE_LABEL } from "../../../utils/branding";
 import {
     Announcement,
     Queue,
@@ -104,7 +105,8 @@ const InstructorQueuePage = (props: InstructorQueuePageProps) => {
             {!isConnected && (
                 <div style={{ paddingTop: "1rem" }}>
                     <Message warning>
-                        You are not currently connected to OHQ. Reconnecting...
+                        You are not currently connected to {SITE_NAME}.
+                        Reconnecting...
                     </Message>
                 </div>
             )}
@@ -159,7 +161,7 @@ const InstructorQueuePage = (props: InstructorQueuePageProps) => {
                     onClose={() => setSuccess(false)}
                 >
                     <Alert severity="success" onClose={() => setSuccess(false)}>
-                        <span>Queue successfully created</span>
+                        <span>{QUEUE_LABEL} successfully created</span>
                     </Alert>
                 </Snackbar>
             </Grid>

frontend/components/Course/InstructorQueuePage/Queue.tsx

@@ -9,6 +9,7 @@ import ClearQueueModal from "./ClearQueueModal";
 import { Queue as QueueType, Question, Tag } from "../../../types";
 import { useQuestions } from "../../../hooks/data-fetching/course";
 import { MOBILE_BP } from "../../../constants";
+import { queueLabel } from "../../../utils/branding";
 
 interface QueueProps {
     courseId: number;
@@ -182,11 +183,12 @@ const Queue = (props: QueueProps) => {
                     <Grid.Column>
                         <Message>
                             <Message.Header>
-                                A rate-limiting quota is set on this queue.
+                                A rate-limiting quota is set on this{" "}
+                                {queueLabel}.
                             </Message.Header>
                             <p>
                                 {`A quota of ${queue.rateLimitQuestions} question(s) per ${queue.rateLimitMinutes} minutes(s) ` +
-                                    `per student is enforced when there are at least ${queue.rateLimitLength} student(s) in the queue.`}
+                                    `per student is enforced when there are at least ${queue.rateLimitLength} student(s) in the ${queueLabel}.`}
                             </p>
                         </Message>
                     </Grid.Column>

frontend/components/Course/StudentQueuePage/LastQuestionCard.tsx

@@ -1,6 +1,7 @@
 import { Segment, Message } from "semantic-ui-react";
 import { Question } from "../../../types";
 import { getFullName } from "../../../utils";
+import { QUEUE_LABEL } from "../../../utils/branding";
 
 const LastQuestionCard = ({ question }: { question: Question }) => {
     const timeString = (date) => {
@@ -21,7 +22,7 @@ const LastQuestionCard = ({ question }: { question: Question }) => {
             case "NOT_SPECIFIC":
                 return "Not Specific";
             case "WRONG_QUEUE":
-                return "Wrong Queue";
+                return `Wrong ${QUEUE_LABEL}`;
             case "MISSING_TEMPLATE":
                 return "Didn't Follow Template";
             default:

frontend/components/Course/StudentQueuePage/QuestionCard.tsx

@@ -13,6 +13,7 @@ import EditQuestionModal from "./EditQuestionModal";
 import DeleteQuestionModal from "./DeleteQuestionModal";
 import { Question, Course, Queue, Tag } from "../../../types";
 import { finishQuestion } from "../../../hooks/data-fetching/course";
+import { isAprilFools } from "../../../utils/branding";
 import LinkedText from "../../common/ui/LinkedText";
 
 interface QuestionCardProps {
@@ -89,7 +90,9 @@ const QuestionCard = (props: QuestionCardProps) => {
                                 }}
                             >
                                 {question.position !== -1 &&
-                                    `Position in Queue: #${question.position}`}
+                                    `Position in ${
+                                        isAprilFools ? "Stack" : "Queue"
+                                    }: #${question.position}`}
                             </Header>
                         </Grid.Column>
                         <Grid.Column width={6}>

frontend/components/Course/StudentQueuePage/QuestionForm.tsx

@@ -6,6 +6,7 @@ import { isValidVideoChatURL } from "../../../utils";
 import { createQuestion } from "../../../hooks/data-fetching/course";
 import { Question, Queue, Tag, VideoChatSetting } from "../../../types";
 import { STUD_DESC_CHAR_LIMIT, TEXT_CHAR_LIMIT } from "../../../constants";
+import { queueLabel } from "../../../utils/branding";
 
 interface QuestionFormProps {
     courseId: number;
@@ -90,15 +91,15 @@ const QuestionForm = (props: QuestionFormProps) => {
         let message: string;
         if (status) {
             if (status === 429) {
-                message = "Exceeded question quota for queue";
+                message = `Exceeded question quota for ${queueLabel}`;
             } else if (status === 409) {
                 message = "Incorrect pin";
             } else {
                 message = "Unable to create question";
             }
             props.toastFunc(null, message);
         } else {
-            message = "Question successfully added to queue";
+            message = `Question successfully added to ${queueLabel}`;
             props.toastFunc(message, null);
             await props.queueMutate(-1, null);
         }

frontend/components/Course/StudentQueuePage/StudentQueue.tsx

@@ -13,6 +13,7 @@ import {
 import Snackbar from "@material-ui/core/Snackbar";
 import Alert from "@material-ui/lab/Alert";
 import { mutateResourceListFunction } from "@pennlabs/rest-hooks/dist/types";
+import { isAprilFools, QUEUE_LABEL, queueLabel } from "../../../utils/branding";
 import QuestionForm from "./QuestionForm";
 import QuestionCard from "./QuestionCard";
 import { Queue, Course, Question, Tag } from "../../../types";
@@ -52,10 +53,10 @@ const MessageQuota = ({
         <Message color={queueLength >= rateLimitLength ? "red" : "green"}>
             <Message.Header>
                 {queueLength >= rateLimitLength ? "ACTIVE:" : "INACTIVE:"} A
-                rate-limiting quota is set on this queue.
+                rate-limiting quota is set on this {queueLabel}.
             </Message.Header>
             <p>
-                {`The quota will activate when there are at least ${rateLimitLength} student(s) in the queue. ` +
+                {`The quota will activate when there are at least ${rateLimitLength} student(s) in the ${queueLabel}. ` +
                     `When activated, the quota will allow you to ask up to ${rateLimitQuestions} question(s) per ${rateLimitMinutes} minute(s)`}
                 {data && (
                     <>
@@ -143,7 +144,7 @@ const StudentQueue = (props: StudentQueueProps) => {
                                         queue.questionsAsked || 0
                                     } user${
                                         queue.questionsAsked === 1 ? "" : "s"
-                                    } in queue`}
+                                    } in ${isAprilFools ? "stack" : "queue"}`}
                                     color="blue"
                                     icon="users"
                                 />
@@ -216,10 +217,10 @@ const StudentQueue = (props: StudentQueueProps) => {
                         )}
                         {!queue.active && questions.length === 0 && (
                             <Message
-                                header="Queue Closed"
+                                header={`${QUEUE_LABEL} Closed`}
                                 error
                                 icon="calendar times outline"
-                                content="This queue is currently closed. Contact course staff if you think this is an error."
+                                content={`This ${queueLabel} is currently closed. Contact course staff if you think this is an error.`}
                             />
                         )}
                         {queue.active &&

frontend/components/Course/StudentQueuePage/StudentQueuePage.tsx

@@ -3,6 +3,7 @@ import { Grid, Message } from "semantic-ui-react";
 import { WSContext } from "@pennlabs/rest-live-hooks";
 import StudentQueues from "./StudentQueues";
 import Announcements from "../Announcements";
+import { SITE_NAME } from "../../../utils/branding";
 
 import {
     useQueues,
@@ -46,7 +47,8 @@ const StudentQueuePage = (props: StudentQueuePageProps) => {
             {!isConnected && (
                 <div style={{ paddingTop: "1rem" }}>
                     <Message warning>
-                        You are not currently connected to OHQ. Reconnecting...
+                        You are not currently connected to {SITE_NAME}.
+                        Reconnecting...
                     </Message>
                 </div>
             )}