merge fix

.gitattributes

@@ -18,3 +18,7 @@
 # Denote all files that are truly binary and should not be modified.
 *.png binary
 *.jpg binary
+*.mp4 binary
+*.svg binary
+*.ico binary
+*.gif binary

src/frontend/src/components/headerComponent/index.tsx

@@ -26,6 +26,17 @@ export default function Header(): JSX.Element {
         <Link to="/">
           <span className="ml-4 text-2xl">⛓️</span>
         </Link>
+        {location.pathname === "/admin" && (
+          <Button
+            onClick={() => {
+              navigate("/");
+            }}
+            variant="outline"
+            className=""
+          >
+            Main page
+          </Button>
+        )}
         {autoLogin === false && (
           <Button
             onClick={() => {
@@ -39,7 +50,7 @@ export default function Header(): JSX.Element {
           </Button>
         )}
 
-        {isAdmin && !autoLogin && (
+        {isAdmin && !autoLogin && location.pathname !== "/admin" && (
           <Button variant="outline" onClick={() => navigate("/admin")}>
             Admin page
           </Button>

src/frontend/src/pages/AdminPage/index.tsx

@@ -26,6 +26,7 @@ import {
 import ConfirmationModal from "../../modals/ConfirmationModal";
 import UserManagementModal from "../../modals/UserManagementModal";
 import { UserInputType } from "../../types/components";
+import Header from "../../components/headerComponent";
 
 export default function AdminPage() {
   const [inputValue, setInputValue] = useState("");
@@ -183,6 +184,7 @@ export default function AdminPage() {
 
   return (
     <>
+      <Header />
       {userData && (
         <div className="main-page-panel">
           <div className="m-auto flex h-full flex-row justify-center">

src/frontend/src/pages/ApiKeysPage/index.tsx

@@ -81,8 +81,7 @@ export default function ApiKeysPage() {
 
   return (
     <>
-      <Header />
+    <Header></Header>
-
       {userData && (
         <div className="main-page-panel">
           <div className="m-auto flex h-full flex-row justify-center">