Skip to content

Commit

Permalink
fix navbar
Browse files Browse the repository at this point in the history
  • Loading branch information
gordnzhou committed Sep 15, 2024
1 parent 2d6aae1 commit 24fcd54
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 8 deletions.
4 changes: 4 additions & 0 deletions frontend/src/App.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#root {
height: 100%;
}

#app {
max-width: 1280px;
margin: 0 auto;
padding: 2rem;
Expand Down
12 changes: 7 additions & 5 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,13 @@ function App() {
return (
<Router>
<Navbar />
<Routes>
<Route path="/" element={<Root notes={notes}/>} />
<Route path="record" element={<Recorder transcript={transcript} setTranscript={setTranscript}/>} />
<Route path="summary" element={<Summary transcript={transcript}/>} />
</Routes>
<div id="app">
<Routes>
<Route path="/" element={<Root notes={notes}/>} />
<Route path="record" element={<Recorder transcript={transcript} setTranscript={setTranscript}/>} />
<Route path="summary" element={<Summary transcript={transcript}/>} />
</Routes>
</div>
</Router>
)
}
Expand Down
13 changes: 10 additions & 3 deletions frontend/src/widgets/Navbar.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
import { Link } from "react-router-dom";
import { FiMenu } from 'react-icons/fi'
import { FaBook } from "react-icons/fa";

function Navbar() {
return (
<nav style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', width: "100%", display: "top" }}>
<nav style={{
display: 'flex',
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
width: "100%",
padding: "15px",
}}>
<div></div>
<h2><Link style={{ textDecoration: "none", color: "black", fontWeight: 600 }} to="/">memora.</Link></h2>
<FiMenu size={30}/>
<FaBook size={30}/>
<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>
);
Expand Down

0 comments on commit 24fcd54

Please sign in to comment.