diff --git a/src/App.jsx b/src/App.jsx index 908ee2737..b5183bef6 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -83,7 +83,7 @@ function App() {
- +
diff --git a/src/components/DuosHeader.jsx b/src/components/DuosHeader.jsx index 60a3947df..0b082a60a 100644 --- a/src/components/DuosHeader.jsx +++ b/src/components/DuosHeader.jsx @@ -18,6 +18,7 @@ import Tab from '@mui/material/Tab'; import Box from '@mui/material/Box'; import {isFunction, isNil} from 'lodash/fp'; import {DAAUtils} from '../utils/DAAUtils'; +import SignInButton from '../components/SignInButton'; const styles = { drawerPaper: { @@ -138,6 +139,8 @@ export const headerTabsConfig = [ const NavigationTabsComponent = (props) => { const { + onSignIn, + history, orientation, makeNotifications, navbarDuosIcon, duosLogoImage, DuosLogo, navbarDuosText, @@ -221,11 +224,35 @@ const NavigationTabsComponent = (props) => { {contactUsButton} {supportrequestModal} + {/* Sign-in button location when window is narrow and menu is vertical */} + {!isLogged && orientation === 'vertical' &&
  • + +
  • } ) - }; + }
    {/* Navbar right side */} + {/* Sign-in button location when window is wider and menu is not vertical */} + {!isLogged && orientation !== 'vertical' && +
    + +
    + } {isLogged && (
    { - const { location, classes } = props; + const {location, classes, onSignIn, history} = props; const [state, setState] = useState({ showSupportRequestModal: false, hover: false, @@ -478,6 +505,8 @@ const DuosHeader = (props) => {
    {/* Standard navbar for medium sized displays and higher (pre-existing navbar) */} { onClose={() => toggleDrawer(false)} > {}} diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx index 9ac57d8aa..e635933d8 100644 --- a/src/pages/Home.jsx +++ b/src/pages/Home.jsx @@ -1,15 +1,11 @@ import React from 'react'; -import SignInButton from '../components/SignInButton'; import { ReadMore } from '../components/ReadMore'; import homeHeaderBackground from '../images/home_header_background.png'; import duosLogoImg from '../images/duos_logo.svg'; import duosDiagram from '../images/DUOS_Homepage_diagram.svg'; import { Link } from 'react-router-dom'; -import { Storage } from '../libs/storage'; const Home = (props) => { - const { onSignIn, history } = props; - const isLogged = Storage.userIsLogged(); const homeTitle = { color: '#FFFFFF', @@ -82,22 +78,11 @@ const Home = (props) => { display: 'block' }; - const signInPositionStyle = { - padding: '1em 1em 0 0', - alignItems: 'center', - position: 'absolute', - top: '0', - right: '1rem', - }; - return (
    Home header background - {!isLogged &&
    - -
    }
    DUOS logo

    Data Use Oversight System