From 948a2b1798b24d12a0bf6dbb9753bbc462444d24 Mon Sep 17 00:00:00 2001 From: Roman Hillje Date: Fri, 24 Feb 2023 15:30:18 +0100 Subject: [PATCH] Add option to show top bar with logo and username (#1) Co-authored-by: Fedde Schaeffer --- apps/genetics/public/assets/img/logo-org.png | Bin 0 -> 3842 bytes .../genetics/src/components/NavBar/NavBar.jsx | 18 +++- apps/platform/public/assets/img/logo-org.png | Bin 0 -> 3842 bytes apps/platform/src/components/NavBar.jsx | 26 ++++- .../src/components/NavPanel/NavPanel.jsx | 4 + apps/platform/src/config.js | 1 + packages/ui/index.js | 1 + packages/ui/src/TopBar.jsx | 89 ++++++++++++++++++ 8 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 apps/genetics/public/assets/img/logo-org.png create mode 100644 apps/platform/public/assets/img/logo-org.png create mode 100644 packages/ui/src/TopBar.jsx diff --git a/apps/genetics/public/assets/img/logo-org.png b/apps/genetics/public/assets/img/logo-org.png new file mode 100644 index 0000000000000000000000000000000000000000..76e8189a48fe26d1e611ce8160cb4f0468b83784 GIT binary patch literal 3842 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 E00o8=wg3PC literal 0 HcmV?d00001 diff --git a/apps/genetics/src/components/NavBar/NavBar.jsx b/apps/genetics/src/components/NavBar/NavBar.jsx index 0fe35028b..6cefddbb4 100644 --- a/apps/genetics/src/components/NavBar/NavBar.jsx +++ b/apps/genetics/src/components/NavBar/NavBar.jsx @@ -11,6 +11,8 @@ import classNames from 'classnames'; import Link from '../Link'; import OpenTargetsTitle from './OpenTargetsTitle'; import HeaderMenu from './HeaderMenu'; +import config from '../../config'; +import { TopBar } from 'ui'; const styles = theme => ({ navbar: { @@ -71,7 +73,18 @@ const MenuExternalLink = ({ classes, href, children }) => ( ); -const NavBar = ({ +const NavBar = props => ( + <> + {/* + * Outside of the NavBar AppBar to mirror + * apps/platform/src/components/NavBar.jsx. + */} + {config.showTopBar && } + + +) + +const NavBarContent = ({ classes, name, search, @@ -94,6 +107,9 @@ const NavBar = ({ color="primary" elevation={0} > + {/* push the content down so it isn't hidden behind the logo bar */} + {config.showTopBar && +
} {homepage ? null : (