From e766272f308b18eae9e96991157850c03db6a47f Mon Sep 17 00:00:00 2001 From: Samir Omarov Date: Wed, 27 Sep 2023 16:37:13 +0200 Subject: [PATCH] add primary colors, zaplogo, footer --- packages/app/src/App.tsx | 4 ++- packages/app/src/IntakeThemeProvider.tsx | 4 ++- packages/app/src/components/Footer.tsx | 17 +++++---- packages/app/src/components/Logo.tsx | 38 ++++++++++++++++++++ packages/app/src/lib/i18n-en.json | 2 +- packages/app/src/pages/ProviderDashboard.tsx | 13 +++++++ 6 files changed, 68 insertions(+), 10 deletions(-) create mode 100644 packages/app/src/components/Logo.tsx create mode 100644 packages/app/src/pages/ProviderDashboard.tsx diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx index 6ea81b05..4ae27568 100644 --- a/packages/app/src/App.tsx +++ b/packages/app/src/App.tsx @@ -3,6 +3,7 @@ import { useAuth0 } from '@auth0/auth0-react'; import { ScrollToTop } from './components'; import { IntakeThemeProvider } from './IntakeThemeProvider'; import Version from './pages/Version'; +import ProviderDashboard from './pages/ProviderDashboard'; function App(): JSX.Element { const { isAuthenticated } = useAuth0(); @@ -13,7 +14,8 @@ function App(): JSX.Element { {!isAuthenticated ? ( - } />; + {/* } />; */} + } />; ) : ( diff --git a/packages/app/src/IntakeThemeProvider.tsx b/packages/app/src/IntakeThemeProvider.tsx index 12d3534e..bd522fb4 100644 --- a/packages/app/src/IntakeThemeProvider.tsx +++ b/packages/app/src/IntakeThemeProvider.tsx @@ -44,6 +44,7 @@ export const otherColors = { patientSubtitle: '#545454', wrongPatient: '#8F9AA7', cardBackground: '#F7F8F9', + footerBackground: '#263954', }; export const typography: TypographyOptions = { @@ -141,8 +142,9 @@ export const palette = { disabled: '#C3C9D2', }, primary: { - main: '#4D15B7', + main: '#2896C6', contrast: '#FFFFFF', + light: '#4AC0F2', }, secondary: { main: '#301367', diff --git a/packages/app/src/components/Footer.tsx b/packages/app/src/components/Footer.tsx index 390e86b2..e5ebec62 100644 --- a/packages/app/src/components/Footer.tsx +++ b/packages/app/src/components/Footer.tsx @@ -1,7 +1,8 @@ import { FC } from 'react'; import { Typography, Box } from '@mui/material'; -import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline'; import { useTranslation } from 'react-i18next'; +import { otherColors } from '../IntakeThemeProvider'; +import { Logo } from './Logo'; const Footer: FC = () => { const { t } = useTranslation(); @@ -10,17 +11,19 @@ const Footer: FC = () => { - - + {t('general.footer')} + + + ); }; diff --git a/packages/app/src/components/Logo.tsx b/packages/app/src/components/Logo.tsx new file mode 100644 index 00000000..bc0465da --- /dev/null +++ b/packages/app/src/components/Logo.tsx @@ -0,0 +1,38 @@ +import React from 'react'; + +export interface LogoProps { + width: number; +} + +export function Logo(props: LogoProps): JSX.Element { + return ( + + zapEHR Logo + + + + + + + + + ); +} diff --git a/packages/app/src/lib/i18n-en.json b/packages/app/src/lib/i18n-en.json index 9c4c0f5f..cef71474 100644 --- a/packages/app/src/lib/i18n-en.json +++ b/packages/app/src/lib/i18n-en.json @@ -31,7 +31,7 @@ } }, "firstName": "First name", - "footer": "This service is not for emergencies. If you believe that you or your child is having an emergency, and is at risk of harming themself or someone else, please call 988 or go to the nearest emergency room immediately.", + "footer": "Powered by", "lastName": "Last name", "required": "required field", "stateFullNames": { diff --git a/packages/app/src/pages/ProviderDashboard.tsx b/packages/app/src/pages/ProviderDashboard.tsx new file mode 100644 index 00000000..e45c160a --- /dev/null +++ b/packages/app/src/pages/ProviderDashboard.tsx @@ -0,0 +1,13 @@ +import React from 'react'; +import { Footer } from '../components'; + +const ProviderDashboard = (): JSX.Element => { + return ( +
+

Provider Dashboard

+
+ ); +}; + +export default ProviderDashboard;