Merge branch 'main' into release

client/gatsby-browser.js

@@ -10,6 +10,8 @@ The full terms of this copyright and license should always be found in the root
  * See: https://www.gatsbyjs.org/docs/browser-apis/
  */
 
+import "regenerator-runtime/runtime";
+
 import wrapWithProvider from "./wrap-with-provider";
 
 import { loadSentry } from "./src/utils";

client/gatsby-ssr.js

@@ -5,11 +5,20 @@ Permission to use, copy, modify, and distribute this software and its documentat
 The full terms of this copyright and license should always be found in the root directory of this software deliverable as "license.txt" and if these terms are not found with this software, please contact the USC Stevens Center for the full license.
 */
 /**
- * Implement Gatsby's SSR (Server Side Rendering) APIs in this file.
+ * Implement Gatsby's Browser APIs in this file.
  *
- * See: https://www.gatsbyjs.org/docs/ssr-apis/
+ * See: https://www.gatsbyjs.org/docs/browser-apis/
  */
 
+import "regenerator-runtime/runtime";
+
 import wrapWithProvider from "./wrap-with-provider";
 
+import { loadSentry } from "./src/utils";
+
+if (process.env.GATSBY_IS_SENTRY_ENABLED === "true") {
+  console.log("Loading sentry");
+  loadSentry();
+}
+
 export const wrapRootElement = wrapWithProvider;

client/package.json

@@ -29,6 +29,7 @@
     "react-redux": "^7.2.9",
     "react-resize-detector": "^7.1.2",
     "react-scroll": "^1.8.9",
+    "react-speech-recognition": "^3.10.0",
     "redux": "^4.1.1",
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.4.2",
@@ -45,6 +46,7 @@
     "@types/react-dom": "^17.0.18",
     "@types/react-redux": "^7.1.25",
     "@types/react-scroll": "^1.8.6",
+    "@types/react-speech-recognition": "^3.9.5",
     "@types/smoothscroll-polyfill": "^0.3.1",
     "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^4.29.1",

client/src/components/input.tsx

@@ -6,13 +6,24 @@ The full terms of this copyright and license should always be found in the root
 */
 import React, { useEffect, useState } from "react";
 import { useSelector, useDispatch } from "react-redux";
-import { Button, Divider, Paper, InputBase } from "@mui/material";
+import SpeechRecognition, {
+  useSpeechRecognition,
+} from "react-speech-recognition";
+import {
+  Button,
+  Divider,
+  Paper,
+  InputBase,
+  InputAdornment,
+  IconButton,
+} from "@mui/material";
+import { Mic, MicOutlined } from "@mui/icons-material";
+import SendRoundedIcon from "@mui/icons-material/SendRounded";
 import { makeStyles } from "tss-react/mui";
 
 import { sendQuestion, userInputChanged } from "store/actions";
 import { Config, MentorQuestionSource, QuestionInput, State } from "types";
 import { isMobile } from "react-device-detect";
-import SendRoundedIcon from "@mui/icons-material/SendRounded";
 
 import "styles/layout.css";
 import { useWithScreenOrientation } from "use-with-orientation";
@@ -65,6 +76,13 @@ function Input(): JSX.Element {
     (s) => s.questionInput
   );
   const { displayFormat } = useWithScreenOrientation();
+  const {
+    transcript,
+    listening,
+    browserSupportsSpeechRecognition,
+    resetTranscript,
+  } = useSpeechRecognition();
+  const [stt, setSTT] = React.useState<string>("");
 
   const [animatingInputField, setAnimatingInputField] =
     useState<boolean>(false);
@@ -75,6 +93,13 @@ function Input(): JSX.Element {
       : setAnimatingInputField(true);
   }, [questionInput]);
 
+  useEffect(() => {
+    onQuestionInputChanged(
+      questionInput.question + transcript.substr(stt.length)
+    );
+    setSTT(transcript);
+  }, [transcript]);
+
   function handleQuestionChanged(
     question: string,
     source: MentorQuestionSource
@@ -114,6 +139,18 @@ function Input(): JSX.Element {
     onQuestionInputSend();
   }
 
+  function toggleSTT() {
+    if (listening) {
+      SpeechRecognition.stopListening();
+      resetTranscript();
+      setSTT("");
+    } else {
+      resetTranscript();
+      setSTT("");
+      SpeechRecognition.startListening();
+    }
+  }
+
   // Input field keyboard was lowered
   const onBlur = () => {
     if (isMobile) {
@@ -140,6 +177,10 @@ function Input(): JSX.Element {
         classes={{
           input: classes.input,
         }}
+        disabled={listening}
+        style={{
+          backgroundColor: listening ? "rgba(26, 107, 155, 0.1)" : "white",
+        }}
         placeholder={curQuestion || "Ask a question"}
         onChange={(e) => {
           onQuestionInputChanged(e.target.value);
@@ -149,6 +190,17 @@ function Input(): JSX.Element {
         onKeyPress={onKeyPress}
       />
       <Divider className={classes.divider} />
+      {browserSupportsSpeechRecognition ? (
+        <InputAdornment position="start">
+          <IconButton color="primary" edge="start" onClick={toggleSTT}>
+            {listening ? (
+              <Mic style={{ color: "#1a6b9b" }} />
+            ) : (
+              <MicOutlined style={{ color: "gray" }} />
+            )}
+          </IconButton>
+        </InputAdornment>
+      ) : undefined}
       <Button
         data-cy="input-send"
         className={`send-question-btn-${displayFormat}`}