From 87c92babf8c39600558247c70d975e0f8ceceda5 Mon Sep 17 00:00:00 2001
From: Daniel Xue <daniel.l.xue@gmail.com>
Date: Fri, 23 Feb 2024 18:17:36 -0500
Subject: [PATCH] Minor fixes

* ws domain to 127.0.0.1 for dev to avoid CORS
* FAQ feedback portion alignment
* removed beta tag from analytics
* tip no longer displayed on mobile
---
 .../components/Course/CourseSidebarNav.tsx    | 11 +---------
 frontend/components/Guide/InstructorGuide.tsx |  9 ++++----
 .../Guide/InstructorGuideContent.tsx          | 20 +++++++++++++++++
 frontend/components/Guide/StudentGuide.tsx    |  9 ++++----
 .../components/Guide/StudentGuideContent.tsx  | 22 ++++++++++++++++++-
 .../components/Home/Dashboard/Dashboard.tsx   |  7 ++++--
 frontend/pages/courses/[course]/index.tsx     |  2 +-
 7 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/frontend/components/Course/CourseSidebarNav.tsx b/frontend/components/Course/CourseSidebarNav.tsx
index 158a25f5d..e8b42b3ce 100644
--- a/frontend/components/Course/CourseSidebarNav.tsx
+++ b/frontend/components/Course/CourseSidebarNav.tsx
@@ -1,5 +1,5 @@
 import { useContext } from "react";
-import { Segment, Menu, Image, Icon, Label } from "semantic-ui-react";
+import { Segment, Menu, Image, Icon } from "semantic-ui-react";
 import { useRouter } from "next/router";
 import Link from "next/link";
 
@@ -90,15 +90,6 @@ const CourseSidebarNav = (props: CourseSidebarProps) => {
                                 }}
                             />
                             Analytics
-                            <Label
-                                color="violet"
-                                content="Beta"
-                                size="tiny"
-                                style={{
-                                    float: "none",
-                                    verticalAlign: "bottom",
-                                }}
-                            />
                         </Menu.Item>
                     </Link>
                 )}
diff --git a/frontend/components/Guide/InstructorGuide.tsx b/frontend/components/Guide/InstructorGuide.tsx
index a8778033a..332ca400b 100644
--- a/frontend/components/Guide/InstructorGuide.tsx
+++ b/frontend/components/Guide/InstructorGuide.tsx
@@ -7,6 +7,7 @@ import {
     HoldOfficeHours,
     Analytics,
     Settings,
+    Feedback,
 } from "./InstructorGuideContent";
 import { useSection } from "./utils";
 
@@ -32,6 +33,8 @@ export default function InstructorGuide() {
 
     const [SettingsHeader, SettingsBody] = useSection("Settings", Settings);
 
+    const [FeedbackHeader, FeedbackBody] = useSection("Feedback", Feedback);
+
     return (
         <>
             <Segment basic>
@@ -43,6 +46,7 @@ export default function InstructorGuide() {
                     <HoldOHHeader />
                     <AnalyticsHeader />
                     <SettingsHeader />
+                    <FeedbackHeader />
                 </List>
             </Segment>
 
@@ -52,10 +56,7 @@ export default function InstructorGuide() {
             <HoldOHBody />
             <AnalyticsBody />
             <SettingsBody />
-            <p>
-                Have any lingering questions? Please email us at contact@ohq.io
-                - we&apos;re happy to help!
-            </p>
+            <FeedbackBody />
         </>
     );
 }
diff --git a/frontend/components/Guide/InstructorGuideContent.tsx b/frontend/components/Guide/InstructorGuideContent.tsx
index 135b8358f..7c7f1d5af 100644
--- a/frontend/components/Guide/InstructorGuideContent.tsx
+++ b/frontend/components/Guide/InstructorGuideContent.tsx
@@ -292,3 +292,23 @@ export const Settings = ({ ref }) => (
         </Segment>
     </div>
 );
+
+export const Feedback = ({ ref }) => (
+    <div ref={ref}>
+        <Segment basic>
+            <h3>Feedback</h3>
+            <Divider />
+            <p>
+                Have any lingering questions? Please email us at contact@ohq.io
+                or fill out{" "}
+                <a
+                    href="https://airtable.com/appFRa4NQvNMEbWsA/shrX0oFscDxpo1TnF"
+                    rel="noopener"
+                >
+                    this feedback form
+                </a>{" "}
+                - we&apos;re happy to help!
+            </p>
+        </Segment>
+    </div>
+);
diff --git a/frontend/components/Guide/StudentGuide.tsx b/frontend/components/Guide/StudentGuide.tsx
index 1e0b38757..dd2aa6831 100644
--- a/frontend/components/Guide/StudentGuide.tsx
+++ b/frontend/components/Guide/StudentGuide.tsx
@@ -6,6 +6,7 @@ import {
     JoiningOfficeHours,
     WhileInQueue,
     Settings,
+    Feedback,
 } from "./StudentGuideContent";
 import { useSection } from "./utils";
 
@@ -27,6 +28,8 @@ export default function StudentGuide() {
         WhileInQueue
     );
     const [SettingsHeader, SettingsBody] = useSection("Settings", Settings);
+    const [FeedbackHeader, FeedbackBody] = useSection("Feedback", Feedback);
+
     return (
         <>
             <Segment basic>
@@ -37,6 +40,7 @@ export default function StudentGuide() {
                     <JoiningOHHeader />
                     <WhileInQueueHeader />
                     <SettingsHeader />
+                    <FeedbackHeader />
                 </List>
             </Segment>
 
@@ -45,10 +49,7 @@ export default function StudentGuide() {
             <JoiningOHBody />
             <WhileInQueueBody />
             <SettingsBody />
-            <p>
-                Have any lingering questions? Please email us at contact@ohq.io
-                - we&apos;re happy to help!
-            </p>
+            <FeedbackBody />
         </>
     );
 }
diff --git a/frontend/components/Guide/StudentGuideContent.tsx b/frontend/components/Guide/StudentGuideContent.tsx
index d774d7331..8ad400fcb 100644
--- a/frontend/components/Guide/StudentGuideContent.tsx
+++ b/frontend/components/Guide/StudentGuideContent.tsx
@@ -1,4 +1,4 @@
-import { Segment, List } from "semantic-ui-react";
+import { Segment, List, Divider } from "semantic-ui-react";
 
 import { CenteredImage } from "./utils";
 
@@ -163,3 +163,23 @@ export const Settings = ({ ref }) => (
         </Segment>
     </div>
 );
+
+export const Feedback = ({ ref }) => (
+    <div ref={ref}>
+        <Segment basic>
+            <h3>Feedback</h3>
+            <Divider />
+            <p>
+                Have any lingering questions? Please email us at contact@ohq.io
+                or fill out{" "}
+                <a
+                    href="https://airtable.com/appFRa4NQvNMEbWsA/shrX0oFscDxpo1TnF"
+                    rel="noopener"
+                >
+                    this feedback form
+                </a>{" "}
+                - we&apos;re happy to help!
+            </p>
+        </Segment>
+    </div>
+);
diff --git a/frontend/components/Home/Dashboard/Dashboard.tsx b/frontend/components/Home/Dashboard/Dashboard.tsx
index 33000115d..025b75338 100644
--- a/frontend/components/Home/Dashboard/Dashboard.tsx
+++ b/frontend/components/Home/Dashboard/Dashboard.tsx
@@ -2,6 +2,7 @@ import { useContext, useState, useEffect } from "react";
 import { Grid, Header, Segment, Message } from "semantic-ui-react";
 import Alert from "@material-ui/lab/Alert";
 import Snackbar from "@material-ui/core/Snackbar";
+import { useMediaQuery } from "@material-ui/core";
 import InstructorCourses from "./InstructorCourses";
 import StudentCourses from "./StudentCourses";
 import Footer from "../../common/Footer";
@@ -9,7 +10,7 @@ import { AuthUserContext } from "../../../context/auth";
 import { Kind, UserMembership } from "../../../types";
 import { useMemberships } from "../../../hooks/data-fetching/dashboard";
 import { isLeadershipRole } from "../../../utils/enums";
-import { CHANGELOG_TOKEN } from "../../../constants";
+import { CHANGELOG_TOKEN, MOBILE_BP } from "../../../constants";
 import ModalShowNewChanges from "./Modals/ModalShowNewChanges";
 import updatedMd from "../../Changelog/changelogfile.md";
 import tips from "./tips.json";
@@ -55,6 +56,8 @@ const Dashboard = () => {
 
     const [tipDisp, setTipDisp] = useState(false);
 
+    const isMobile = useMediaQuery(`(max-width: ${MOBILE_BP})`);
+
     const getTip = () => {
         const filteredTips = canCreateCourse
             ? tips
@@ -89,7 +92,7 @@ const Dashboard = () => {
                                 <Header as="h2">Student Courses</Header>
                             </Segment>
                         </Segment>
-                        {tipDisp && (
+                        {tipDisp && !isMobile && (
                             <div
                                 style={{
                                     position: "absolute",
diff --git a/frontend/pages/courses/[course]/index.tsx b/frontend/pages/courses/[course]/index.tsx
index 9efbd30df..2b3e789b6 100644
--- a/frontend/pages/courses/[course]/index.tsx
+++ b/frontend/pages/courses/[course]/index.tsx
@@ -36,7 +36,7 @@ const QueuePage = (props: QueuePageProps) => {
             url="/api/ws/subscribe/"
             findOrigin={
                 process.env.NODE_ENV === "development"
-                    ? () => "ws://localhost:8000"
+                    ? () => "ws://127.0.0.1:8000"
                     : undefined
             }
         >