Merge pull request #14 from andrew-fenton/navbar

fix recording bug
andrew-fenton · Sep 15, 2024 · eb13289 · eb13289
2 parents 2559146 + 5d7019a
commit eb13289
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/frontend/src/routes/recorder.jsx b/frontend/src/routes/recorder.jsx
@@ -11,8 +11,12 @@ function Recorder({transcript, setTranscript}) {
     useEffect(() => {
         if (done) {
             // Navigates to summary page with finished transcript state
-            navigateTo('/summary')
-        }
+
+            if (transcript.length > 0) {
+                navigateTo('/summary');
+                setDone(false);
+            }
+        } 
     }, [done]);
 
     const scrollToBottom = () => {

diff --git a/frontend/src/routes/summary.jsx b/frontend/src/routes/summary.jsx
@@ -31,7 +31,9 @@ function Summary({transcript}) {
                 console.log(response.data);
                 setSummary(response.data);
                 setIsLoading(false);
-            };
+            } else {
+                navigateTo('/record');
+            }
         } catch (err) {
             console.error(err);
         }

diff --git a/frontend/src/widgets/Navbar.jsx b/frontend/src/widgets/Navbar.jsx
@@ -12,8 +12,14 @@ function Navbar() {
             padding: "15px",
         }}>
             <div></div>
-            <h2><Link style={{ textDecoration: "none", color: "black", fontWeight: 600 }} to="/">memora.</Link></h2>
-            <FaBook size={30} style={{ color: "black" }}/>
+            <h2>
+                <Link style={{ textDecoration: "none", color: "black", fontWeight: 600 }} to="/">
+                    memora.
+                </Link>
+            </h2>
+            <Link to="/journal">
+                <FaBook size={30} style={{ color: "black" }}/>
+            </Link>
             <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,[email protected],100..700,0..1,-50..200" />
         </nav>
     );

diff --git a/frontend/src/widgets/VoiceButton.jsx b/frontend/src/widgets/VoiceButton.jsx
@@ -62,11 +62,13 @@ export default function VoiceButton({setTranscript, setDone}) {
         } else {
             recognition.stop();
             setIsVoiceActive(false);
-            setDone(true);
+
             if (transcribedText.length > 0) {
                 setTranscribedText(transcribedText)
             }
         }
+
+        setDone(isVoiceActive);
     };
 
     return (