diff --git a/src/App.css b/src/App.css index bc15b85..b517c0b 100644 --- a/src/App.css +++ b/src/App.css @@ -1,4 +1,4 @@ -.CompanyNameContainer { +/*.CompanyNameContainer { padding: 12px 12px 0 12px; color: #e67e22; font-weight: bold; @@ -42,7 +42,7 @@ .CompanyNameContainer span:nth-child(5) { animation-delay: 1000ms; } - + */ .Subtitle { text-align: center; color: #9b59b6; diff --git a/src/App.js b/src/App.js index fa414e5..c0c74a0 100644 --- a/src/App.js +++ b/src/App.js @@ -66,9 +66,9 @@ export default function App() { } console.info( - "\n %c Customer Dashboard %c v1.0.0 %c \n", + "\n %c ZeitAdler Dashboard %c BETA %c \n", "background-color: #555;color: #fff;padding: 3px 2px 3px 3px;border-radius: 3px 0 0 3px;font-family: DejaVu Sans,Verdana,Geneva,sans-serif;text-shadow: 0 1px 0 rgba(1, 1, 1, 0.3)", - "background-color: #bc81e0;background-image: linear-gradient(90deg, #e67e22, #9b59b6);color: #fff;padding: 3px 3px 3px 2px;border-radius: 0 3px 3px 0;font-family: DejaVu Sans,Verdana,Geneva,sans-serif;text-shadow: 0 1px 0 rgba(1, 1, 1, 0.3)", + "background-color: #bc81e0;background-image: linear-gradient(90deg, #6878d6, #4d61d6);color: #fff;padding: 3px 3px 3px 2px;border-radius: 0 3px 3px 0;font-family: DejaVu Sans,Verdana,Geneva,sans-serif;text-shadow: 0 1px 0 rgba(1, 1, 1, 0.3)", "background-color: transparent" ); diff --git a/src/Components/SideMenu/index.js b/src/Components/SideMenu/index.js index 8aaf551..ebe3cc3 100644 --- a/src/Components/SideMenu/index.js +++ b/src/Components/SideMenu/index.js @@ -1,10 +1,7 @@ import { AppstoreOutlined, - BgColorsOutlined, CalendarOutlined, - ClusterOutlined, EditOutlined, - FileImageOutlined, MessageOutlined, QuestionCircleOutlined, ScissorOutlined, @@ -20,6 +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"; export function SideMenuContent({ setIsSideMenuCollapsed, @@ -30,7 +28,6 @@ export function SideMenuContent({ const location = useLocation(); const [selectedKeys, setSelectedKeys] = useState("/"); const { t } = useTranslation(); - //const lastSubscribedTopic = useRef(""); const navigate = useNavigate(); @@ -43,45 +40,6 @@ export function SideMenuContent({ }, ]; - /* - // website - - let websites = { - label: t("sideMenu.website.title"), - children: [], - type: "group", - key: "/website", - }; - - let groupWebsite = { - label: t("sideMenu.website.title"), - icon: , - children: [], - key: "/website", - }; - - groupWebsite.children.push({ - label: t("sideMenu.website.colorPalette"), - icon: , - key: Constants.ROUTE_PATHS.WEBSITE_COLOR_PALETTE, - }); - - groupWebsite.children.push({ - label: t("sideMenu.website.banner"), - icon: , - key: Constants.ROUTE_PATHS.WEBSITE_BANNER, - }); - - groupWebsite.children.push({ - label: t("sideMenu.website.socials"), - icon: , - key: Constants.ROUTE_PATHS.WEBSITE_SOCIALS, - }); - - websites.children.push(groupWebsite); - - items.push(websites); */ - // stores let stores = { @@ -183,26 +141,6 @@ export function SideMenuContent({ setSelectedKeys(pathname); - //lastSubscribedTopic.current = pathname; - /* - const subscribeTopicMessage = () => - webSocketContext.SendSocketMessage( - SentMessagesCommands.SubscribeToTopic, - { - topic: pathname, - browserTabSession: BrowserTabSession, - } - ); - - subscribeTopicMessage(); - - const handleSubscribeTopicMessage = () => subscribeTopicMessage(); - - document.addEventListener( - wsConnectionCustomEventName, - handleSubscribeTopicMessage - ); */ - // auto close sideMenu on mobile // this will prevent to auto close sideMenu on first render as the useEffects will be called after the first render if (contentFirstRender.current) { @@ -216,12 +154,6 @@ export function SideMenuContent({ ) { setIsSideMenuCollapsed(true); } - /* - return () => - document.removeEventListener( - wsConnectionCustomEventName, - handleSubscribeTopicMessage - ); */ }, [location.pathname]); return ( @@ -241,18 +173,15 @@ export function SideMenuContent({ overflowY: "hidden", }} > -
-
- C - O - M - P - A - N - Y -
- -
Dashboard
+
+
diff --git a/src/Pages/Login/index.js b/src/Pages/Login/index.js index 49ffb35..35aa8f9 100644 --- a/src/Pages/Login/index.js +++ b/src/Pages/Login/index.js @@ -13,6 +13,7 @@ import { MyUsernameFormInput, } from "../../Components/MyFormInputs"; import { useTranslation } from "react-i18next"; +import { ReactComponent as ZeitAdler } from "../../ZeitAdler.svg"; export default function Login() { const { t } = useTranslation(); @@ -96,6 +97,15 @@ export default function Login() { } > +
+ +
+ + + +