diff --git a/src/App.tsx b/src/App.tsx index fd3a55c..6fef147 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -5,8 +5,8 @@ import Login from './components/Login'; import Register from './components/Register'; import Dog from './components/Dog'; import Qr from './components/Qr'; -import Header from './components/Header'; -import Footer from './components/Footer'; +import Header2 from './components/Header2'; +import Footer2 from './components/Footer2'; import Impressum from './components/Impressum'; import "bootstrap/dist/css/bootstrap.min.css"; import FileUpload from './components/FileUpload'; @@ -16,9 +16,18 @@ import {getUser} from './services/PhpApi' import { TUser } from './context/UserContext'; import PasswordReset from './components/PasswordReset'; import WantNewPw from './components/WantNewPw'; -import { MantineProvider } from '@mantine/core'; +import +{ + MantineProvider, + AppShell, + Navbar, + Header, + Aside, + Footer +} from '@mantine/core'; import { NotificationsProvider } from '@mantine/notifications'; import { notificationError } from './services/Notifications'; +import DogNavbar from './components/DogNavbar'; const App: React.FC = () => { @@ -50,10 +59,14 @@ const App: React.FC = () => return ( -
+ } + > +
- {user &&
} {user && } />} {/* {user && } />} */} @@ -69,11 +82,11 @@ const App: React.FC = () => {user && } />} {user && } />} -
-
+
+
); diff --git a/src/components/DogNavbar.tsx b/src/components/DogNavbar.tsx new file mode 100644 index 0000000..aa2b063 --- /dev/null +++ b/src/components/DogNavbar.tsx @@ -0,0 +1,26 @@ +import { Navbar, Text } from '@mantine/core' +import React from 'react' +import Footer2 from './Footer2' + +function DogNavbar({hasUser}:{hasUser: boolean}) +{ + return ( + ) +} + +export default DogNavbar diff --git a/src/components/Footer.tsx b/src/components/Footer2.tsx similarity index 78% rename from src/components/Footer.tsx rename to src/components/Footer2.tsx index 361eb57..f7a3e51 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer2.tsx @@ -1,10 +1,10 @@ import { Link } from 'react-router-dom'; import './Footer.css'; -function Footer() { +function Footer2() { return (
Impressum
); } -export default Footer; \ No newline at end of file +export default Footer2; \ No newline at end of file diff --git a/src/components/Header.tsx b/src/components/Header2.tsx similarity index 84% rename from src/components/Header.tsx rename to src/components/Header2.tsx index 1dc01bb..a1d068a 100644 --- a/src/components/Header.tsx +++ b/src/components/Header2.tsx @@ -5,7 +5,7 @@ import {logOut} from '../services/PhpApi' import { notificationSuccess } from '../services/Notifications'; -function Header() +function Header2() { const logOutForm = () => { @@ -17,10 +17,9 @@ function Header() return (
-
Header
); } -export default Header; \ No newline at end of file +export default Header2; \ No newline at end of file