use global nav bar layout

lizzypy · Sep 17, 2023 · 9219e5f · 9219e5f
1 parent 236bd4b
commit 9219e5f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 28 deletions.
diff --git a/frontend/src/components/layout.tsx b/frontend/src/components/layout.tsx
@@ -1,9 +1,17 @@
 import Navbar from './Navbar'
+import {AppBar, Toolbar } from "@mui/material";
 
 export default function Layout({ children }) {
   return (
     <>
-      <Navbar/>
+      <AppBar position="static" sx={{ bgcolor: "pink" }}>
+                <section aria-label={"toolbar-section"}
+                         style={{display: "flex", flexDirection: "row", justifyContent: "right"}}>
+                    <Toolbar>
+                      <Navbar/>
+                    </Toolbar>
+                </section>
+      </AppBar>
       <main>{children}</main>
     </>
   )

diff --git a/frontend/src/pages/Participants.tsx b/frontend/src/pages/Participants.tsx
@@ -1,19 +1,10 @@
 import ParticipantsList from "../components/ParticipantsList";
 import {AppBar, Toolbar } from "@mui/material";
-import Navbar from "../components/Navbar";
 import type {NextPage} from 'next';
 
 export const Participants: NextPage = () => {
   return (
           <>
-            <AppBar position="static" sx={{ bgcolor: "pink" }}>
-                <section aria-label={"toolbar-section"}
-                         style={{display: "flex", flexDirection: "row", justifyContent: "right"}}>
-                    <Toolbar>
-                        <Navbar/>
-                    </Toolbar>
-                </section>
-            </AppBar>
             <section aria-label={"participants-section"}
                      style={{
                          padding: "40px 30px",

diff --git a/frontend/src/pages/Users.tsx b/frontend/src/pages/Users.tsx
@@ -3,7 +3,6 @@ import Box from '@mui/material/Box';
 import {AppBar, Toolbar } from "@mui/material";
 import useUsers from "../hooks/useUsers";
 import type {NextPage} from 'next';
-import Navbar from "../components/Navbar";
 import {Typography} from "@material-ui/core";
 
 export const Users: NextPage = () => {
@@ -27,14 +26,6 @@ export const Users: NextPage = () => {
 
     return (
         <div>
-            <AppBar position="static" sx={{ bgcolor: "pink" }}>
-                <section aria-label={"toolbar-section"}
-                         style={{display: "flex", flexDirection: "row", justifyContent: "right"}}>
-                    <Toolbar>
-                        <Navbar/>
-                    </Toolbar>
-                </section>
-            </AppBar>
             <section aria-label={"participants-section"}
                      style={{
                          padding: "40px 30px",

diff --git a/frontend/src/pages/Welcome.tsx b/frontend/src/pages/Welcome.tsx
@@ -3,7 +3,6 @@ import Box from '@mui/material/Box';
 import {AppBar, Toolbar } from "@mui/material";
 import useUsers from "../hooks/useUsers";
 import type {NextPage} from 'next';
-import Navbar from "../components/Navbar";
 import ParticipantsList from "../components/ParticipantsList";
 import {Typography} from "@material-ui/core";
 
@@ -28,14 +27,6 @@ export const Welcome: NextPage = () => {
 
     return (
         <div>
-            <AppBar position="static" sx={{ bgcolor: "pink" }}>
-                <section aria-label={"toolbar-section"}
-                         style={{display: "flex", flexDirection: "row", justifyContent: "right"}}>
-                    <Toolbar>
-                        <Navbar/>
-                    </Toolbar>
-                </section>
-            </AppBar>
             <section aria-label={"participants-section"}
                      style={{
                          padding: "40px 30px",