Move Header component to top level of the routes that need it
Change-Id: I1c20b1ccb52b12e7f1c047f5279f0ba6be98c5c7
diff --git a/client/src/pages/AccountSettings.tsx b/client/src/pages/AccountSettings.tsx
index f7b5e4f..218824e 100644
--- a/client/src/pages/AccountSettings.tsx
+++ b/client/src/pages/AccountSettings.tsx
@@ -18,13 +18,11 @@
import { Container } from '@mui/material';
import AccountPreferences from '../components/AccountPreferences';
-import Header from '../components/Header';
export default function AccountSettings() {
// TODO: Improve component and sub-components UI.
return (
<Container maxWidth="sm">
- <Header />
<AccountPreferences />
</Container>
);
diff --git a/client/src/pages/Messenger.tsx b/client/src/pages/Messenger.tsx
index 64aaaab..4f552b9 100644
--- a/client/src/pages/Messenger.tsx
+++ b/client/src/pages/Messenger.tsx
@@ -19,13 +19,11 @@
import { ReactNode } from 'react';
import ConversationList from '../components/ConversationList';
-import Header from '../components/Header';
const Messenger = ({ children }: { children?: ReactNode }) => {
return (
<Box display="flex" height="100%">
<Stack flexGrow={0} flexShrink={0} overflow="auto">
- <Header />
<ConversationList />
</Stack>
<Box flexGrow={1} display="flex" position="relative">
diff --git a/client/src/router.tsx b/client/src/router.tsx
index 680aa06..9872e51 100644
--- a/client/src/router.tsx
+++ b/client/src/router.tsx
@@ -20,6 +20,7 @@
import App, { appLoader } from './App';
import ContactList from './components/ContactList';
import ConversationView from './components/ConversationView';
+import Header from './components/Header';
import AuthProvider from './contexts/AuthProvider';
import CallManagerProvider from './contexts/CallManagerProvider';
import ConversationProvider from './contexts/ConversationProvider';
@@ -49,6 +50,7 @@
<WebSocketProvider>
<UserMediaProvider>
<CallManagerProvider>
+ <Header />
<Outlet />
</CallManagerProvider>
</UserMediaProvider>