diff --git a/src/App.js b/src/App.js index ca30930..7e29f48 100644 --- a/src/App.js +++ b/src/App.js @@ -1,7 +1,7 @@ import "antd/dist/reset.css"; import "./App.css"; import Login from "./Pages/Login"; -import { Layout, Space, Spin, Typography } from "antd"; +import { Layout, Spin, Typography } from "antd"; import { Constants, UseUserSession, myFetch } from "./utils"; import DashboardLayout from "./Components/DashboardLayout"; import SideBarProvider from "./Contexts/SideBarContext"; @@ -13,7 +13,7 @@ import { useEffect, useState } from "react"; import StoresProvider from "./Contexts/StoresContext"; import { clarity } from "react-microsoft-clarity"; import { useTranslation } from "react-i18next"; -import { ReactComponent as ZeitAdler } from "./ZeitAdler.svg"; +import MyAppLogo from "./Components/MyAppLogo"; export function Loading() { const { t } = useTranslation(); @@ -28,7 +28,7 @@ export function Loading() { height: "100vh", }} > - setIsSideMenuCollapsed(!isSideMenuCollapsed)} style={{ fontSize: "16px", width: 64, height: 64 }} /> + +
+ {window.document.body.clientWidth < BreakpointLgWidth && ( + + )} +
+ +
); } diff --git a/src/Components/MyAppLogo/index.js b/src/Components/MyAppLogo/index.js new file mode 100644 index 0000000..3bcfacc --- /dev/null +++ b/src/Components/MyAppLogo/index.js @@ -0,0 +1,5 @@ +import { ReactComponent as ZeitAdler } from "../../ZeitAdler.svg"; + +export default function MyAppLogo({ ...props }) { + return ; +} diff --git a/src/Components/SideMenu/index.js b/src/Components/SideMenu/index.js index c2795c3..84d130c 100644 --- a/src/Components/SideMenu/index.js +++ b/src/Components/SideMenu/index.js @@ -17,7 +17,7 @@ import { BreakpointLgWidth, Constants, isDevelopmentEnv } from "../../utils"; import { useTranslation } from "react-i18next"; import { useSideBarContext } from "../../Contexts/SideBarContext"; import { useStoresContext } from "../../Contexts/StoresContext"; -import { ReactComponent as ZeitAdler } from "../../ZeitAdler.svg"; +import MyAppLogo from "../MyAppLogo"; export function SideMenuContent({ setIsSideMenuCollapsed, @@ -181,7 +181,7 @@ export function SideMenuContent({ padding: 10, }} > - + {isDevelopmentEnv() && (

DEV

diff --git a/src/Pages/Login/index.js b/src/Pages/Login/index.js index 3e2ef03..f730a56 100644 --- a/src/Pages/Login/index.js +++ b/src/Pages/Login/index.js @@ -13,7 +13,7 @@ import { MyUsernameFormInput, } from "../../Components/MyFormInputs"; import { useTranslation } from "react-i18next"; -import { ReactComponent as ZeitAdler } from "../../ZeitAdler.svg"; +import MyAppLogo from "../../Components/MyAppLogo"; export default function Login() { const { t } = useTranslation(); @@ -95,7 +95,7 @@ export default function Login() { justifyContent: "center", }} > - +