diff --git a/src/frontend/public/favicon.ico b/src/frontend/public/favicon.ico index f6808b1e..5c9787d1 100644 Binary files a/src/frontend/public/favicon.ico and b/src/frontend/public/favicon.ico differ diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx index 21fd43c8..1220cd19 100644 --- a/src/frontend/src/App.tsx +++ b/src/frontend/src/App.tsx @@ -47,7 +47,7 @@ export default function App() { }; // add routes where you dont want navigation bar - const routesWithoutNavbar = ['/login', '/']; + const routesWithoutNavbar = ['/', '/login', '/forgot-password']; return ( <> diff --git a/src/frontend/src/assets/images/DTM-logo-white.svg b/src/frontend/src/assets/images/DTM-logo-white.svg new file mode 100644 index 00000000..1bb4c0f9 --- /dev/null +++ b/src/frontend/src/assets/images/DTM-logo-white.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/frontend/src/components/LandingPage/Home/index.tsx b/src/frontend/src/components/LandingPage/Home/index.tsx index bcd40eee..8cce815b 100644 --- a/src/frontend/src/components/LandingPage/Home/index.tsx +++ b/src/frontend/src/components/LandingPage/Home/index.tsx @@ -3,7 +3,7 @@ import { FlexColumn } from '@Components/common/Layouts'; import Image from '@Components/RadixComponents/Image'; import { Button } from '@Components/RadixComponents/Button'; import { motion } from 'framer-motion'; -import droneTaskingManagerLogo from '@Assets/images/LandingPage/DTM-logo-red.svg'; +import droneTaskingManagerLogo from '@Assets/images/DTM-logo-white.svg'; import droneBackgroundImage from '@Assets/images/LandingPage/DroneTM-bg.png'; import arrowSouth from '@Assets/images/LandingPage/arrow_south.svg'; import { setCommonState } from '@Store/actions/common'; diff --git a/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx b/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx index c7b37a07..c02ebd84 100644 --- a/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx +++ b/src/frontend/src/components/LandingPage/SignInOverlay/index.tsx @@ -1,9 +1,10 @@ import { useTypedDispatch } from '@Store/hooks'; +import useAuth from '@Hooks/useAuth'; import { useNavigate } from 'react-router-dom'; import { FlexColumn, FlexRow } from '@Components/common/Layouts'; import { Button } from '@Components/RadixComponents/Button'; import Image from '@Components/RadixComponents/Image'; -import droneTMLogo from '@Assets/images/LandingPage/dtm-logo-red.svg'; +import droneTMLogo from '@Assets/images/LandingPage/DTM-logo-red.svg'; import projectCreator from '@Assets/images/LandingPage/project-creator.svg'; import droneOperator from '@Assets/images/LandingPage/drone-operator.svg'; import Icon from '@Components/common/Icon'; @@ -14,6 +15,7 @@ import { slideVariants } from '@Constants/animations'; export default function SignInOverlay() { const dispatch = useTypedDispatch(); const navigate = useNavigate(); + const { isAuthenticated } = useAuth(); return ( { dispatch(setCommonState({ signInAs: 'Project Creator' })); - navigate('/login'); + if (isAuthenticated()) { + navigate('/projects'); + } else { + navigate('/login'); + } }} > I'm a Project Creator @@ -62,7 +68,11 @@ export default function SignInOverlay() { rightIcon="east" onClick={() => { dispatch(setCommonState({ signInAs: 'Drone Operator' })); - navigate('/login'); + if (isAuthenticated()) { + navigate('/projects'); + } else { + navigate('/login'); + } }} > I'm a Drone Operator diff --git a/src/frontend/src/components/common/Navbar/index.tsx b/src/frontend/src/components/common/Navbar/index.tsx index adad3168..eb12dace 100644 --- a/src/frontend/src/components/common/Navbar/index.tsx +++ b/src/frontend/src/components/common/Navbar/index.tsx @@ -1,6 +1,6 @@ import Image from '@Components/RadixComponents/Image'; import { NavLink } from 'react-router-dom'; -import dtmLogo from '@Assets/images/dtm-logo.svg'; +import dtmLogo from '@Assets/images/LandingPage/DTM-logo-red.svg'; import { navLinks } from '@Constants/index'; import UserProfile from '../UserProfile'; import { FlexRow } from '../Layouts'; @@ -10,7 +10,11 @@ export default function Navbar() { return (