From 98c1828ecc0cca76bf9ed092b90da89e809cb5e3 Mon Sep 17 00:00:00 2001 From: josh-willis-arcadis <168561922+josh-willis-arcadis@users.noreply.github.com> Date: Thu, 9 May 2024 14:51:53 -0500 Subject: [PATCH 1/4] Update desktop-nav.tsx add conditional render for branding element on mobile widths --- lib/components/app/desktop-nav.tsx | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/lib/components/app/desktop-nav.tsx b/lib/components/app/desktop-nav.tsx index e45a5027e..2d72304f3 100644 --- a/lib/components/app/desktop-nav.tsx +++ b/lib/components/app/desktop-nav.tsx @@ -9,6 +9,7 @@ import { accountLinks, getAuth0Config } from '../../util/auth' import { AppConfig } from '../../util/config-types' import { AppReduxState } from '../../util/state-types' import { DEFAULT_APP_TITLE } from '../../util/constants' +import { isMobile } from '@opentripplanner/core-utils/lib/ui' import InvisibleA11yLabel from '../util/invisible-a11y-label' import NavLoginButtonAuth0 from '../user/nav-login-button-auth0' @@ -104,16 +105,21 @@ const DesktopNav = ({ > - {/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */} - {/* @ts-ignore The dynamic tag is causing some trouble */} - - {/* A title is always rendered (e.g.for screen readers) - but is visually-hidden if a branding icon is used. */} -
{title}
-
+ + {!isMobile() && ( + <> + {/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */} + {/* @ts-ignore The dynamic tag is causing some trouble */} + + {/* A title is always rendered (e.g.for screen readers) + but is visually-hidden if a branding icon is used. */} +
{title}
+
+ + )}
From 0245d9a9f86cc602296b6f686de7a8107915e6cd Mon Sep 17 00:00:00 2001 From: josh-willis-arcadis <168561922+josh-willis-arcadis@users.noreply.github.com> Date: Mon, 13 May 2024 11:58:16 -0500 Subject: [PATCH 2/4] fix import order warning --- lib/components/app/desktop-nav.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/components/app/desktop-nav.tsx b/lib/components/app/desktop-nav.tsx index 2d72304f3..cd877b1b8 100644 --- a/lib/components/app/desktop-nav.tsx +++ b/lib/components/app/desktop-nav.tsx @@ -1,4 +1,5 @@ import { connect } from 'react-redux' +import { isMobile } from '@opentripplanner/core-utils/lib/ui' import { Nav, Navbar } from 'react-bootstrap' import { useIntl } from 'react-intl' import React from 'react' @@ -9,7 +10,6 @@ import { accountLinks, getAuth0Config } from '../../util/auth' import { AppConfig } from '../../util/config-types' import { AppReduxState } from '../../util/state-types' import { DEFAULT_APP_TITLE } from '../../util/constants' -import { isMobile } from '@opentripplanner/core-utils/lib/ui' import InvisibleA11yLabel from '../util/invisible-a11y-label' import NavLoginButtonAuth0 from '../user/nav-login-button-auth0' From bc795b7ea8fe64ef857ddf93f6be7030b2ac5d85 Mon Sep 17 00:00:00 2001 From: josh-willis-arcadis <168561922+josh-willis-arcadis@users.noreply.github.com> Date: Mon, 13 May 2024 12:01:54 -0500 Subject: [PATCH 3/4] ignore .vscode/settings.json ignore .vscode/settings.json --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 083a54cbd..edf4635dd 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ dist !example-config.yml !test-config.yml !har-mock-config.yml +.vscode/settings.json From 6e36eba45bd5b180cd37e2e11e905601c4cce944 Mon Sep 17 00:00:00 2001 From: josh-willis-arcadis <168561922+josh-willis-arcadis@users.noreply.github.com> Date: Tue, 14 May 2024 21:45:52 -0500 Subject: [PATCH 4/4] ignore vscode folder --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index edf4635dd..49f891d23 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,6 @@ dist !example-config.yml !test-config.yml !har-mock-config.yml -.vscode/settings.json + +# vscode extensions +.vscode