Skip to content

Commit 9f606f6

Browse files
author
Ryan
committed
april fools
1 parent bda16dd commit 9f606f6

25 files changed

Lines changed: 67 additions & 33 deletions

frontend/components/Auth/AuthPrompt.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Grid, Button } from "semantic-ui-react";
33
import { useRouter, NextRouter } from "next/router";
44
import AboutModal from "../common/AboutModal";
55
import styles from "../../styles/landingpage.module.css";
6+
import { LOGO_PATH, LOGO_LOGIN_PATH } from "../../utils/branding";
67

78
const AuthPrompt = (): JSX.Element => {
89
const [showAboutModal, setShowAboutModal] = useState(false);
@@ -20,15 +21,15 @@ const AuthPrompt = (): JSX.Element => {
2021
<Grid columns={1} textAlign="center">
2122
<Grid.Row only="computer tablet">
2223
<img
23-
src="ohq-login.png"
24+
src={LOGO_LOGIN_PATH}
2425
width="600px"
2526
height="107px"
2627
alt="logo"
2728
/>
2829
</Grid.Row>
2930
<Grid.Row only="mobile">
3031
<img
31-
src="ohq.png"
32+
src={LOGO_PATH}
3233
width="217px"
3334
height="107px"
3435
alt="logo-mini"

frontend/components/Course/CourseSidebarNav.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import Link from "next/link";
66
import { AuthUserContext } from "../../context/auth";
77
import { useStaff } from "../../hooks/data-fetching/course";
88
import { Course } from "../../types";
9+
import { LOGO_SIDEBAR_PATH } from "../../utils/branding";
910

1011
interface CourseSidebarProps {
1112
course: Course;
@@ -35,7 +36,7 @@ const CourseSidebarNav = (props: CourseSidebarProps) => {
3536
<Segment basic>
3637
<Link href="/" as="/" legacyBehavior>
3738
<Image
38-
src="../../../ohq.png"
39+
src={LOGO_SIDEBAR_PATH}
3940
size="tiny"
4041
style={{ marginTop: "10px", cursor: "pointer" }}
4142
/>

frontend/components/Course/CourseWrapper.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { Course as CourseType, Membership } from "../../types";
1313
import CourseSidebarInstructorList from "./CourseSidebarInstructorList";
1414
import { MOBILE_BP } from "../../constants";
1515
import { browserSupportsNotifications } from "../../utils/notifications";
16+
import { isAprilFools } from "../../utils/branding";
1617

1718
interface CourseProps {
1819
render: (
@@ -38,9 +39,8 @@ const CourseWrapper = ({ render, ...props }: CourseProps) => {
3839

3940
const { staff } = useStaff(rawCourse.id, initialUser);
4041

41-
const isAprilFirst = false;
4242
const [notifs, setNotifs, play] = usePlayer(
43-
isAprilFirst ? aolAudio : bellAudio
43+
isAprilFools ? aolAudio : bellAudio
4444
);
4545
const [supportsNotifs, setSupportsNotifs] = useState(false);
4646
useEffect(() => setSupportsNotifs(browserSupportsNotifications()), []);

frontend/components/Course/InstructorQueuePage/InstructorQueuePage.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import QueueSettings from "./QueueSettings/QueueSettings";
99
import QueueCreate from "./QueueCreate/QueueCreate";
1010
import { AuthUserContext } from "../../../context/auth";
1111
import { useQueues, useStaff } from "../../../hooks/data-fetching/course";
12+
import { SITE_NAME } from "../../../utils/branding";
1213
import {
1314
Announcement,
1415
Queue,
@@ -104,7 +105,7 @@ const InstructorQueuePage = (props: InstructorQueuePageProps) => {
104105
{!isConnected && (
105106
<div style={{ paddingTop: "1rem" }}>
106107
<Message warning>
107-
You are not currently connected to OHQ. Reconnecting...
108+
You are not currently connected to {SITE_NAME}. Reconnecting...
108109
</Message>
109110
</div>
110111
)}

frontend/components/Course/StudentQueuePage/StudentQueuePage.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Grid, Message } from "semantic-ui-react";
33
import { WSContext } from "@pennlabs/rest-live-hooks";
44
import StudentQueues from "./StudentQueues";
55
import Announcements from "../Announcements";
6+
import { SITE_NAME } from "../../../utils/branding";
67

78
import {
89
useQueues,
@@ -46,7 +47,7 @@ const StudentQueuePage = (props: StudentQueuePageProps) => {
4647
{!isConnected && (
4748
<div style={{ paddingTop: "1rem" }}>
4849
<Message warning>
49-
You are not currently connected to OHQ. Reconnecting...
50+
You are not currently connected to {SITE_NAME}. Reconnecting...
5051
</Message>
5152
</div>
5253
)}

frontend/components/Guide/InstructorGuideContent.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import { Segment, Divider, List } from "semantic-ui-react";
22

33
import { CenteredImage } from "./utils";
4+
import { SITE_NAME } from "../../utils/branding";
45

56
export const CreateCourse = ({ ref }) => (
67
<div ref={ref}>
78
<Segment basic>
89
<h3>Create Your Course</h3>
910
<Divider />
1011
<p>
11-
Once you log in to OHQ, click &apos;Dashboard&apos; on the left,
12+
Once you log in to {SITE_NAME}, click &apos;Dashboard&apos; on the left,
1213
and then &apos;Create Course&apos; under &apos;Instructor
1314
Courses&apos;. If you do not see this option, please email
1415
contact@ohq.io.
@@ -21,7 +22,7 @@ export const CreateCourse = ({ ref }) => (
2122
creating the course.
2223
</p>
2324
<p>
24-
OHQ currently supports Zoom, BlueJeans, Google Meet, and Whereby
25+
{SITE_NAME} currently supports Zoom, BlueJeans, Google Meet, and Whereby
2526
meetings links. Please email us at contact@ohq.io to request
2627
additional link support.
2728
</p>
@@ -31,7 +32,7 @@ export const CreateCourse = ({ ref }) => (
3132
/>
3233
<br />
3334
<p>
34-
And that&apos;s it! You&apos;ve created your course on OHQ, and
35+
And that&apos;s it! You&apos;ve created your course on {SITE_NAME}, and
3536
you&apos;re ready to add students and instructors to the course.
3637
</p>
3738
</Segment>
@@ -66,7 +67,7 @@ export const InviteMembers = ({ ref }) => (
6667
with a Pennkey! For example:
6768
<b>agutmann@upenn.edu</b>. Students or
6869
instructors with alternative email address
69-
formats will not be able to log in to OHQ.
70+
formats will not be able to log in to {SITE_NAME}.
7071
🚨
7172
</List.Item>
7273
</List.List>
@@ -269,7 +270,7 @@ export const Analytics = ({ ref }) => (
269270
<h3>Analytics</h3>
270271
<Divider />
271272
<p>
272-
As an instructor, you can use OHQ&apos;s analytics to learn what
273+
As an instructor, you can use {SITE_NAME}&apos;s analytics to learn what
273274
your students are asking and assess how you&apos;re performing
274275
in office hours.
275276
</p>
@@ -301,7 +302,7 @@ export const Settings = ({ ref }) => (
301302
click &apos;Course Settings&apos; in the left menu.
302303
</p>
303304
<p>
304-
To change your account settings, go to the OHQ landing page and
305+
To change your account settings, go to the {SITE_NAME} landing page and
305306
click &apos;Account Settings&apos; in the left menu.
306307
</p>
307308
</Segment>

frontend/components/Guide/StudentGuideContent.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import { Segment, List } from "semantic-ui-react";
22

33
import { CenteredImage } from "./utils";
4+
import { SITE_NAME } from "../../utils/branding";
45

56
export const EnrollCourse = ({ ref }) => (
67
<div ref={ref}>
78
<Segment basic>
89
<h3>Enrolling in a Course</h3>
9-
<p>Courses on OHQ are either invite-only or not invite-only.</p>
10+
<p>Courses on {SITE_NAME} are either invite-only or not invite-only.</p>
1011
<p>
1112
If your course is invite-only, reach out to your course&apos;s
1213
teaching team to request an invitation. All they need to invite
@@ -81,14 +82,14 @@ export const Notifications = ({ ref }) => (
8182
enabling notifications when you reach the top of the line!
8283
</p>
8384
<p>
84-
OHQ will give you an audio notification ( you&apos;ll hear a
85+
{SITE_NAME} will give you an audio notification ( you&apos;ll hear a
8586
&quot;ding&quot;) when you reach the top of the queue. You can
8687
also enable SMS notifications.
8788
</p>
8889
<p>To enable SMS notifications:</p>
8990
<List bulleted>
9091
<List.Item>
91-
Navigate to the OHQ home page, and on the left menu, click
92+
Navigate to the {SITE_NAME} home page, and on the left menu, click
9293
into &quot;Account Settings.&quot;
9394
</List.Item>
9495
<List.Item>
@@ -181,7 +182,7 @@ export const Settings = ({ ref }) => (
181182
<h3>Settings</h3>
182183
<p>
183184
To change your profile information and notification settings, go
184-
to the OHQ landing page and click &apos;Account Setting&apos; in
185+
to the {SITE_NAME} landing page and click &apos;Account Setting&apos; in
185186
the left menu.
186187
</p>
187188
</Segment>

frontend/components/Guide/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { Divider, Segment, Header, Grid, Menu } from "semantic-ui-react";
44
import InstructorGuide from "./InstructorGuide";
55
import StudentGuide from "./StudentGuide";
66
import Footer from "../common/Footer";
7+
import { SITE_NAME } from "../../utils/branding";
78

89
enum Page {
910
Instructor = "Instructor",
@@ -31,11 +32,11 @@ export default function Guide() {
3132
Hi there! 🎉
3233
<br />
3334
<br />
34-
Welcome to OHQ, a centralized online office hours system
35+
Welcome to {SITE_NAME}, a centralized online office hours system
3536
that helps instructors like you manage office hours
3637
easily and intuitively, so you can focus on teaching and
3738
your students can focus on learning in office hours.
38-
This guide will walk you through using OHQ, so your
39+
This guide will walk you through using {SITE_NAME}, so your
3940
experience holding office hours can be as easy and
4041
straightforward as possible.
4142
</p>

frontend/components/Home/Dashboard/Dashboard.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { CHANGELOG_TOKEN, MOBILE_BP } from "../../../constants";
1515
import ModalShowNewChanges from "./Modals/ModalShowNewChanges";
1616
import updatedMd from "../../Changelog/changelogfile.md";
1717
import tips from "./Messages/tips.json";
18+
import { SITE_NAME } from "../../../utils/branding";
1819

1920
// TODO: try to readd new user stuff, rip out loading stuff
2021
const Dashboard = () => {
@@ -49,7 +50,7 @@ const Dashboard = () => {
4950
const [toastOpen, setToastOpen] = useState(false);
5051

5152
const [logToast] = useState({
52-
message: "View new changes to OHQ.io",
53+
message: `View new changes to ${SITE_NAME}.io`,
5354
success: true,
5455
});
5556
const [logOpen, setLogOpen] = useState(false);

frontend/components/Home/HomeSidebar.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import Link from "next/link";
66
import { useRouter } from "next/router";
77
import SignOutButton from "../SignOut";
88
import AboutModal from "../common/AboutModal";
9+
import { LOGO_SIDEBAR_PATH } from "../../utils/branding";
910

1011
const Sidebar = () => {
1112
const router = useRouter();
@@ -16,7 +17,7 @@ const Sidebar = () => {
1617
<Segment basic>
1718
<Link href="/" as="/" legacyBehavior>
1819
<Image
19-
src="../../../ohq.png"
20+
src={LOGO_SIDEBAR_PATH}
2021
size="tiny"
2122
style={{ marginTop: "10px", cursor: "pointer" }}
2223
/>

0 commit comments

Comments
 (0)