diff --git a/packages/tupaia-web/.storybook/ReactRouterDecorator.tsx b/packages/tupaia-web/.storybook/ReactRouterDecorator.tsx new file mode 100644 index 0000000000..5d640ff82c --- /dev/null +++ b/packages/tupaia-web/.storybook/ReactRouterDecorator.tsx @@ -0,0 +1,27 @@ +import React, { useEffect } from 'react'; +import { action } from '@storybook/addon-actions'; +import { BrowserRouter, useLocation } from 'react-router-dom'; +import { Args } from '@storybook/react'; +import { DecoratorFunction } from '@storybook/csf'; + +const LocationChangeAction = ({ children }) => { + const location = useLocation(); + + useEffect(() => { + if (location.key !== 'default') action('React Router Location Change')(location); + }, [location]); + + return <>{children}; +}; + +const ReactRouterDecorator: DecoratorFunction = (Story, context) => { + return ( + + + + + + ); +}; + +export default ReactRouterDecorator; diff --git a/packages/tupaia-web/.storybook/main.ts b/packages/tupaia-web/.storybook/main.ts index bcd781cba5..96194a5be8 100644 --- a/packages/tupaia-web/.storybook/main.ts +++ b/packages/tupaia-web/.storybook/main.ts @@ -1,6 +1,6 @@ import type { StorybookConfig } from '@storybook/react-vite'; const config: StorybookConfig = { - stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], + stories: ['../stories/**/*.mdx', '../stories/**/*.stories.@(js|jsx|ts|tsx)'], addons: [ '@storybook/addon-links', '@storybook/addon-essentials', diff --git a/packages/tupaia-web/.storybook/preview.tsx b/packages/tupaia-web/.storybook/preview.tsx index 763b4020eb..660fc72347 100644 --- a/packages/tupaia-web/.storybook/preview.tsx +++ b/packages/tupaia-web/.storybook/preview.tsx @@ -1,15 +1,14 @@ import React from 'react'; import type { Preview } from '@storybook/react'; import { AppStyleProviders } from '../src/AppStyleProviders'; -import { DARK_BLUE, WHITE } from '../src/theme'; - +import ReactRouterDecorator from './ReactRouterDecorator'; const preview: Preview = { parameters: { backgrounds: { default: 'Dark', values: [ - { name: 'Dark', value: DARK_BLUE }, - { name: 'Light', value: WHITE }, + { name: 'Dark', value: '#135D8F' }, + { name: 'Light', value: '#ffffff' }, ], }, actions: { argTypesRegex: '^on[A-Z].*' }, @@ -21,6 +20,7 @@ const preview: Preview = { }, }, decorators: [ + ReactRouterDecorator, Story => { return ( diff --git a/packages/tupaia-web/package.json b/packages/tupaia-web/package.json index 8518eb5471..568b1360c1 100644 --- a/packages/tupaia-web/package.json +++ b/packages/tupaia-web/package.json @@ -40,7 +40,7 @@ "react": "^16.13.1", "react-dom": "^16.13.1", "react-router": "6.3.0", - "react-router-dom": "6.3.0", + "react-router-dom": "6.3.0", "styled-components": "^5.1.0", "vite-plugin-ejs": "^1.6.4", "vite-plugin-env-compatible": "^1.1.1" diff --git a/packages/tupaia-web/public/images/tupaia-logo-light.svg b/packages/tupaia-web/public/images/tupaia-logo-light.svg new file mode 100644 index 0000000000..9a15c95936 --- /dev/null +++ b/packages/tupaia-web/public/images/tupaia-logo-light.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/packages/tupaia-web/src/App.tsx b/packages/tupaia-web/src/App.tsx index 0ff12be8d2..e66328215e 100644 --- a/packages/tupaia-web/src/App.tsx +++ b/packages/tupaia-web/src/App.tsx @@ -4,12 +4,19 @@ */ import React from 'react'; import { AppStyleProviders } from './AppStyleProviders'; -import { Router } from './Router'; +import { Routes } from './Routes'; +import { Layout } from './layout'; +import { BrowserRouter } from 'react-router-dom'; const App = () => { return ( - + + {/** The Layout component needs to be inside BrowserRouter so that Link component from react-router-dom can be used (in menu etc.) */} + + + + ); }; diff --git a/packages/tupaia-web/src/AppStyleProviders.tsx b/packages/tupaia-web/src/AppStyleProviders.tsx index 35900ac04f..0c223b8085 100644 --- a/packages/tupaia-web/src/AppStyleProviders.tsx +++ b/packages/tupaia-web/src/AppStyleProviders.tsx @@ -3,29 +3,10 @@ * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ import React, { ReactNode } from 'react'; -import { - StylesProvider, - createMuiTheme, - ThemeProvider as MuiThemeProvider, -} from '@material-ui/core/styles'; +import { ThemeProvider as MuiThemeProvider, StylesProvider } from '@material-ui/core/styles'; import CssBaseline from '@material-ui/core/CssBaseline'; import { ThemeProvider } from 'styled-components'; - -// Base theme overrides. Any extra overrides should be added here, as needed. -const theme = createMuiTheme({ - palette: { - type: 'dark', - primary: { - main: '#0296c5', // Main blue (as seen on primary buttons) - }, - secondary: { - main: '##ee6230', // Tupaia Orange - }, - background: { - default: '#262834', // Dark blue background - }, - }, -}); +import { theme } from './theme'; export const AppStyleProviders = ({ children }: { children: ReactNode }) => ( diff --git a/packages/tupaia-web/src/Router.tsx b/packages/tupaia-web/src/Router.tsx deleted file mode 100644 index 319fcecffb..0000000000 --- a/packages/tupaia-web/src/Router.tsx +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Tupaia - * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd - */ -import React from 'react'; -import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom'; -import { - LandingPage, - LoginForm, - PasswordResetForm, - Project, - RegisterForm, - RequestAccessForm, - VerifyEmailForm, -} from './pages'; -import { DEFAULT_URL } from './constants'; - -/** - * This Router is using [version 6.3]{@link https://reactrouter.com/en/v6.3.0}, as later versions are not supported by our TS setup. See [this issue here]{@link https://github.com/remix-run/react-router/discussions/8364} - * This means the newer 'createBrowserRouter' and 'RouterProvider' can't be used here. - * - * **/ - -export const Router = () => ( - - - } /> - {/** - * The below user pages will actually be modals, which will be done when each view is created. There is an example at: https://github.com/remix-run/react-router/tree/dev/examples/modal - */} - } /> - } /> - } /> - } /> - } /> - } /> - {/** Because react-router v 6.3 doesn't support optional url segments, we need to handle dashboardCode with a splat/catch-all instead */} - } /> - - -); diff --git a/packages/tupaia-web/src/Routes.tsx b/packages/tupaia-web/src/Routes.tsx new file mode 100644 index 0000000000..e16b719442 --- /dev/null +++ b/packages/tupaia-web/src/Routes.tsx @@ -0,0 +1,36 @@ +/* + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ +import React from 'react'; +import { Navigate, Route, Routes as RouterRoutes } from 'react-router-dom'; +import { + LandingPage, + LoginForm, + PasswordResetForm, + Project, + RegisterForm, + RequestAccessForm, + VerifyEmailForm, +} from './pages'; +import { DEFAULT_URL } from './constants'; + +/** + * This Router is using [version 6.3]{@link https://reactrouter.com/en/v6.3.0}, as later versions are not supported by our TS setup. See [this issue here]{@link https://github.com/remix-run/react-router/discussions/8364} + * This means the newer 'createBrowserRouter' and 'RouterProvider' can't be used here. + * + * **/ + +export const Routes = () => ( + + } /> + } /> + } /> + } /> + } /> + } /> + } /> + {/** Because react-router v 6.3 doesn't support optional url segments, we need to handle dashboardCode with a splat/catch-all instead */} + } /> + +); diff --git a/packages/tupaia-web/src/components/Modal.tsx b/packages/tupaia-web/src/components/Modal.tsx new file mode 100644 index 0000000000..c40375c58b --- /dev/null +++ b/packages/tupaia-web/src/components/Modal.tsx @@ -0,0 +1,61 @@ +/* + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ +import React, { ReactNode } from 'react'; +import { Dialog, Paper as MuiPaper, useTheme, useMediaQuery } from '@material-ui/core'; +import MuiCloseIcon from '@material-ui/icons/Close'; +import styled from 'styled-components'; +import { IconButton } from '@tupaia/ui-components'; + +interface ModalProps { + children?: ReactNode; + onClose: () => void; + isOpen: boolean; +} + +const Wrapper = styled.div` + text-align: center; + overflow-x: hidden; + padding: 2em; +`; + +const CloseIcon = styled(MuiCloseIcon)` + width: 1.2em; + height: 1.2em; +`; + +const CloseButton = styled(IconButton)` + background-color: transparent; + min-width: initial; + position: absolute; + top: 0.6em; + right: 0.6em; +`; + +const Paper = styled(MuiPaper)` + background-color: ${({ theme }) => theme.palette.background.default}; + padding: 0; + color: rgba(255, 255, 255, 0.9); + overflow-y: auto; + max-width: 920px; + min-width: 300px; + // Prevent width from animating. + transition: transform 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; +`; + +export const Modal = ({ children, isOpen, onClose }: ModalProps) => { + // make the modal full screen at small screen sizes + const theme = useTheme(); + const fullScreen = useMediaQuery(theme.breakpoints.down('xs')); + return ( + + + + + + {children} + + + ); +}; diff --git a/packages/tupaia-web/src/components/index.ts b/packages/tupaia-web/src/components/index.ts index 652a972fc4..e5c2d245d9 100644 --- a/packages/tupaia-web/src/components/index.ts +++ b/packages/tupaia-web/src/components/index.ts @@ -2,3 +2,4 @@ * Tupaia * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ +export { Modal } from './Modal'; diff --git a/packages/tupaia-web/src/constants/colors.ts b/packages/tupaia-web/src/constants/colors.ts new file mode 100644 index 0000000000..2f8cb75b56 --- /dev/null +++ b/packages/tupaia-web/src/constants/colors.ts @@ -0,0 +1,5 @@ +/* + * Tupaia + * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd + */ +export const TRANSPARENT_BLACK = 'rgba(43, 45, 56, 0.94)'; diff --git a/packages/tupaia-web/src/constants/constants.ts b/packages/tupaia-web/src/constants/constants.ts index 308a6ed433..78ca63eb92 100644 --- a/packages/tupaia-web/src/constants/constants.ts +++ b/packages/tupaia-web/src/constants/constants.ts @@ -6,3 +6,5 @@ export const DEFAULT_PROJECT_CODE = 'explore'; export const DEFAULT_ENTITY_CODE = 'explore'; export const DEFAULT_URL = `${DEFAULT_PROJECT_CODE}/${DEFAULT_ENTITY_CODE}`; + +export const TUPAIA_LIGHT_LOGO_SRC = '/images/tupaia-logo-light.svg'; diff --git a/packages/tupaia-web/src/constants/index.ts b/packages/tupaia-web/src/constants/index.ts index c89172dfac..ec91fa77a7 100644 --- a/packages/tupaia-web/src/constants/index.ts +++ b/packages/tupaia-web/src/constants/index.ts @@ -2,4 +2,5 @@ * Tupaia * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ +export * from './colors'; export * from './constants'; diff --git a/packages/tupaia-web/src/layout/AuthModal.tsx b/packages/tupaia-web/src/layout/AuthModal.tsx new file mode 100644 index 0000000000..b19385f134 --- /dev/null +++ b/packages/tupaia-web/src/layout/AuthModal.tsx @@ -0,0 +1,100 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +import React, { ReactNode } from 'react'; +import { To, useNavigate } from 'react-router'; +import { Modal } from '../components'; +import styled from 'styled-components'; +import { TUPAIA_LIGHT_LOGO_SRC } from '../constants'; +import { Button, Typography } from '@material-ui/core'; +import { FONT_SIZES } from '../theme'; +import { OutlinedButton } from '@tupaia/ui-components'; + +const Logo = styled.img` + min-width: 110px; + margin-top: 1.8em; + margin-bottom: 3em; +`; + +const Title = styled(Typography)` + font-size: ${FONT_SIZES.viewTitle}; + font-weight: 500; +`; + +const Subtitle = styled(Typography)` + font-size: 1em; + margin-top: 1.4em; +`; + +const PrimaryButton = styled(Button).attrs({ + variant: 'contained', + color: 'primary', +})` + text-transform: none; + font-size: 1em; + width: 100%; + margin-left: 0 !important; + margin-top: 2em; +`; + +const SecondaryButton = styled(OutlinedButton).attrs({ + color: 'default', +})` + text-transform: none; + font-size: 1em; + width: 100%; + margin-left: 0 !important; + padding: 0.375em 1em; // to match the height of the primary button + border-color: ${({ theme }) => theme.palette.text.secondary}; + ${PrimaryButton} + & { + margin-top: 1.3em; + } +`; + +type ButtonProps = { + onClick: () => void; + text: string; +}; +interface AuthModalProps { + children?: ReactNode; + onClose?: () => void; + title?: string; + subtitle?: string; + navigateTo?: To | number; // the path to navigate to on close, if set. Numbers are acceptable for e.g. -1 meaning back 1 route + primaryButton?: ButtonProps; + secondaryButton?: ButtonProps; +} + +export const AuthModal = ({ + children, + onClose, + navigateTo = -1, + title, + subtitle, + primaryButton, + secondaryButton, +}: AuthModalProps) => { + const navigate = useNavigate(); + const onCloseModal = () => { + // navigate back to the previous route on close if no path is provided + navigate(navigateTo as To); + if (onClose) onClose(); + }; + // This modal will always be open in this case, because these are only visible on certain routes + return ( + + + {title} + {subtitle && {subtitle}} + {children} + {primaryButton && ( + {primaryButton.text} + )} + {secondaryButton && ( + {secondaryButton.text} + )} + + ); +}; diff --git a/packages/tupaia-web/src/layout/Layout.tsx b/packages/tupaia-web/src/layout/Layout.tsx new file mode 100644 index 0000000000..b7f4d896ac --- /dev/null +++ b/packages/tupaia-web/src/layout/Layout.tsx @@ -0,0 +1,39 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +import React, { ReactNode } from 'react'; +import styled from 'styled-components'; +import { EnvBanner } from '@tupaia/ui-components'; +import { TopBar } from './TopBar'; + +/** + * This is the layout for the entire app, which contains the top bar and the main content. This is used to wrap the entire app content + */ +const Container = styled.div` + position: fixed; + flex-direction: column; + flex-wrap: nowrap; + width: 100%; + pointer-events: none; + display: flex; + align-items: stretch; + align-content: stretch; + overflow-y: hidden; + height: 100%; + + svg.recharts-surface { + overflow: visible; + } +`; + +export const Layout = ({ children }: { children: ReactNode }) => { + return ( + + + + {children} + + ); +}; diff --git a/packages/tupaia-web/src/layout/MapLayout/MapLayout.tsx b/packages/tupaia-web/src/layout/MapLayout/MapLayout.tsx new file mode 100644 index 0000000000..e37ec61001 --- /dev/null +++ b/packages/tupaia-web/src/layout/MapLayout/MapLayout.tsx @@ -0,0 +1,71 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +import React from 'react'; +import styled from 'styled-components'; +import { MapWatermark } from './MapWatermark'; + +const MapContainer = styled.div` + height: 100vh; + transition: width 0.5s ease; + width: 100%; +`; + +export const Map = () => { + return {/* */}; +}; + +const Wrapper = styled.div` + flex: 1; + display: flex; + position: relative; +`; + +const MapControlsContainer = styled.div` + display: flex; + flex-direction: column; + flex: 1; + position: absolute; // make this absolutely positioned so that it lays over the map + width: 100%; + height: 100%; +`; + +const MapLegendWrapper = styled.div` + display: flex; + flex-direction: row; + align-items: flex-end; + justify-content: center; +`; + +const Watermark = styled(MapWatermark)` + margin-left: 2px; + margin-bottom: 16px; +`; + +// Placeholder for MapOverlaySelector component +const MapOverlaySelector = styled.div` + width: 25%; + margin: 2em; + height: 200px; + background-color: rgba(255, 255, 255, 0.2); +`; + +/** + * This is the layout for the lefthand side of the app, which contains the map controls and watermark, as well as the map + */ + +export const MapLayout = () => { + return ( + + + + {/** This is where the map legend would go */} + + + {/** This is where the tilepicker would go */} + + + ); +}; diff --git a/packages/tupaia-web/src/layout/MapLayout/MapWatermark.tsx b/packages/tupaia-web/src/layout/MapLayout/MapWatermark.tsx new file mode 100644 index 0000000000..931c2c32d3 --- /dev/null +++ b/packages/tupaia-web/src/layout/MapLayout/MapWatermark.tsx @@ -0,0 +1,38 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2022 Beyond Essential Systems Pty Ltd + */ + +import React, { AnchorHTMLAttributes } from 'react'; +import styled from 'styled-components'; + +const StyledLink = styled.a` + position: absolute; + display: block; + height: 20px; + width: 65px; + left: 0; + bottom: 0; + text-indent: -9999px; + z-index: 99999; + overflow: hidden; + + /* This is the recommended way of adding the watermark + @see https://docs.mapbox.com/help/how-mapbox-works/attribution */ + background-image: url(data:image/svg+xml;base64,<?xml version="1.0" encoding="utf-8"?><svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 80.47 20.02" style="enable-background:new 0 0 80.47 20.02;" xml:space="preserve"><style type="text/css">.st0{opacity:0.6;fill:#FFFFFF;enable-background:new    ;}.st1{opacity:0.6;enable-background:new    ;}</style><g><path class="st0" d="M79.29,13.61c0,0.11-0.09,0.2-0.2,0.2h-1.53c-0.12,0-0.23-0.06-0.29-0.16l-1.37-2.28l-1.37,2.28c-0.06,0.1-0.17,0.16-0.29,0.16h-1.53c-0.04,0-0.08-0.01-0.11-0.03c-0.09-0.06-0.12-0.18-0.06-0.27c0,0,0,0,0,0l2.31-3.5l-2.28-3.47c-0.02-0.03-0.03-0.07-0.03-0.11c0-0.11,0.09-0.2,0.2-0.2h1.53c0.12,0,0.23,0.06,0.29,0.16l1.34,2.25l1.33-2.24c0.06-0.1,0.17-0.16,0.29-0.16h1.53c0.04,0,0.08,0.01,0.11,0.03c0.09,0.06,0.12,0.18,0.06,0.27c0,0,0,0,0,0L76.96,10l2.31,3.5C79.28,13.53,79.29,13.57,79.29,13.61z"/><path class="st0" d="M63.09,9.16c-0.37-1.79-1.87-3.12-3.66-3.12c-0.98,0-1.93,0.4-2.6,1.12V3.37c0-0.12-0.1-0.22-0.22-0.22h-1.33c-0.12,0-0.22,0.1-0.22,0.22v10.21c0,0.12,0.1,0.22,0.22,0.22h1.33c0.12,0,0.22-0.1,0.22-0.22v-0.7c0.68,0.71,1.62,1.12,2.6,1.12c1.79,0,3.29-1.34,3.66-3.13C63.21,10.3,63.21,9.72,63.09,9.16L63.09,9.16z M59.12,12.41c-1.26,0-2.28-1.06-2.3-2.36V9.99c0.02-1.31,1.04-2.36,2.3-2.36s2.3,1.07,2.3,2.39S60.39,12.41,59.12,12.41z"/><path class="st0" d="M68.26,6.04c-1.89-0.01-3.54,1.29-3.96,3.13c-0.12,0.56-0.12,1.13,0,1.69c0.42,1.85,2.07,3.16,3.97,3.14c2.24,0,4.06-1.78,4.06-3.99S70.51,6.04,68.26,6.04z M68.24,12.42c-1.27,0-2.3-1.07-2.3-2.39s1.03-2.4,2.3-2.4s2.3,1.07,2.3,2.39S69.51,12.41,68.24,12.42L68.24,12.42z"/><path class="st1" d="M59.12,7.63c-1.26,0-2.28,1.06-2.3,2.36v0.06c0.02,1.31,1.04,2.36,2.3,2.36s2.3-1.07,2.3-2.39S60.39,7.63,59.12,7.63z M59.12,11.23c-0.6,0-1.09-0.53-1.11-1.19V10c0.01-0.66,0.51-1.19,1.11-1.19s1.11,0.54,1.11,1.21S59.74,11.23,59.12,11.23z"/><path class="st1" d="M68.24,7.63c-1.27,0-2.3,1.07-2.3,2.39s1.03,2.39,2.3,2.39s2.3-1.07,2.3-2.39S69.51,7.63,68.24,7.63z M68.24,11.23c-0.61,0-1.11-0.54-1.11-1.21s0.5-1.2,1.11-1.2s1.11,0.54,1.11,1.21S68.85,11.23,68.24,11.23z"/><path class="st0" d="M43.56,6.24h-1.33c-0.12,0-0.22,0.1-0.22,0.22v0.7c-0.68-0.71-1.62-1.12-2.6-1.12c-2.07,0-3.75,1.78-3.75,3.99s1.69,3.99,3.75,3.99c0.99,0,1.93-0.41,2.6-1.13v0.7c0,0.12,0.1,0.22,0.22,0.22h1.33c0.12,0,0.22-0.1,0.22-0.22V6.44c0-0.11-0.09-0.21-0.21-0.21C43.57,6.24,43.57,6.24,43.56,6.24z M42.02,10.05c-0.01,1.31-1.04,2.36-2.3,2.36s-2.3-1.07-2.3-2.39s1.03-2.4,2.29-2.4c1.27,0,2.28,1.06,2.3,2.36L42.02,10.05z"/><path class="st1" d="M39.72,7.63c-1.27,0-2.3,1.07-2.3,2.39s1.03,2.39,2.3,2.39s2.28-1.06,2.3-2.36V9.99C42,8.68,40.98,7.63,39.72,7.63z M38.62,10.02c0-0.67,0.5-1.21,1.11-1.21c0.61,0,1.09,0.53,1.11,1.19v0.04c-0.01,0.65-0.5,1.18-1.11,1.18S38.62,10.68,38.62,10.02z"/><path class="st0" d="M49.91,6.04c-0.98,0-1.93,0.4-2.6,1.12V6.45c0-0.12-0.1-0.22-0.22-0.22h-1.33c-0.12,0-0.22,0.1-0.22,0.22v10.21c0,0.12,0.1,0.22,0.22,0.22h1.33c0.12,0,0.22-0.1,0.22-0.22v-3.78c0.68,0.71,1.62,1.12,2.61,1.12c2.07,0,3.75-1.78,3.75-3.99S51.98,6.04,49.91,6.04z M49.6,12.42c-1.26,0-2.28-1.06-2.3-2.36V9.99c0.02-1.31,1.04-2.37,2.29-2.37c1.26,0,2.3,1.07,2.3,2.39S50.86,12.41,49.6,12.42L49.6,12.42z"/><path class="st1" d="M49.6,7.63c-1.26,0-2.28,1.06-2.3,2.36v0.06c0.02,1.31,1.04,2.36,2.3,2.36s2.3-1.07,2.3-2.39S50.86,7.63,49.6,7.63z M49.6,11.23c-0.6,0-1.09-0.53-1.11-1.19V10C48.5,9.34,49,8.81,49.6,8.81c0.6,0,1.11,0.55,1.11,1.21S50.21,11.23,49.6,11.23z"/><path class="st0" d="M34.36,13.59c0,0.12-0.1,0.22-0.22,0.22h-1.34c-0.12,0-0.22-0.1-0.22-0.22V9.24c0-0.93-0.7-1.63-1.54-1.63c-0.76,0-1.39,0.67-1.51,1.54l0.01,4.44c0,0.12-0.1,0.22-0.22,0.22h-1.34c-0.12,0-0.22-0.1-0.22-0.22V9.24c0-0.93-0.7-1.63-1.54-1.63c-0.81,0-1.47,0.75-1.52,1.71v4.27c0,0.12-0.1,0.22-0.22,0.22h-1.33c-0.12,0-0.22-0.1-0.22-0.22V6.44c0.01-0.12,0.1-0.21,0.22-0.21h1.33c0.12,0,0.21,0.1,0.22,0.21v0.63c0.48-0.65,1.24-1.04,2.06-1.05h0.03c1.04,0,1.99,0.57,2.48,1.48c0.43-0.9,1.33-1.48,2.32-1.49c1.54,0,2.79,1.19,2.76,2.65L34.36,13.59z"/><path class="st1" d="M80.32,12.97l-0.07-0.12L78.38,10l1.85-2.81c0.42-0.64,0.25-1.49-0.39-1.92c-0.01-0.01-0.02-0.01-0.03-0.02c-0.22-0.14-0.48-0.21-0.74-0.21h-1.53c-0.53,0-1.03,0.28-1.3,0.74l-0.32,0.53l-0.32-0.53c-0.28-0.46-0.77-0.74-1.31-0.74h-1.53c-0.57,0-1.08,0.35-1.29,0.88c-2.09-1.58-5.03-1.4-6.91,0.43c-0.33,0.32-0.62,0.69-0.85,1.09c-0.85-1.55-2.45-2.6-4.28-2.6c-0.48,0-0.96,0.07-1.41,0.22V3.37c0-0.78-0.63-1.41-1.4-1.41h-1.33c-0.77,0-1.4,0.63-1.4,1.4v3.57c-0.9-1.3-2.38-2.08-3.97-2.09c-0.7,0-1.39,0.15-2.02,0.45c-0.23-0.16-0.51-0.25-0.8-0.25h-1.33c-0.43,0-0.83,0.2-1.1,0.53c-0.02-0.03-0.04-0.05-0.07-0.08c-0.27-0.29-0.65-0.45-1.04-0.45h-1.32c-0.29,0-0.57,0.09-0.8,0.25C40.8,5,40.12,4.85,39.42,4.85c-1.74,0-3.27,0.95-4.16,2.38c-0.19-0.44-0.46-0.85-0.79-1.19c-0.76-0.77-1.8-1.19-2.88-1.19h-0.01c-0.85,0.01-1.67,0.31-2.34,0.84c-0.7-0.54-1.56-0.84-2.45-0.84h-0.03c-0.28,0-0.55,0.03-0.82,0.1c-0.27,0.06-0.53,0.15-0.78,0.27c-0.2-0.11-0.43-0.17-0.67-0.17h-1.33c-0.78,0-1.4,0.63-1.4,1.4v7.14c0,0.78,0.63,1.4,1.4,1.4h1.33c0.78,0,1.41-0.63,1.41-1.41c0,0,0,0,0,0V9.35c0.03-0.34,0.22-0.56,0.34-0.56c0.17,0,0.36,0.17,0.36,0.45v4.35c0,0.78,0.63,1.4,1.4,1.4h1.34c0.78,0,1.4-0.63,1.4-1.4l-0.01-4.35c0.06-0.3,0.24-0.45,0.33-0.45c0.17,0,0.36,0.17,0.36,0.45v4.35c0,0.78,0.63,1.4,1.4,1.4h1.34c0.78,0,1.4-0.63,1.4-1.4v-0.36c0.91,1.23,2.34,1.96,3.87,1.96c0.7,0,1.39-0.15,2.02-0.45c0.23,0.16,0.51,0.25,0.8,0.25h1.32c0.29,0,0.57-0.09,0.8-0.25v1.91c0,0.78,0.63,1.4,1.4,1.4h1.33c0.78,0,1.4-0.63,1.4-1.4v-1.69c0.46,0.14,0.94,0.22,1.42,0.21c1.62,0,3.07-0.83,3.97-2.1v0.5c0,0.78,0.63,1.4,1.4,1.4h1.33c0.29,0,0.57-0.09,0.8-0.25c0.63,0.3,1.32,0.45,2.02,0.45c1.83,0,3.43-1.05,4.28-2.6c1.47,2.52,4.71,3.36,7.22,1.89c0.17-0.1,0.34-0.21,0.5-0.34c0.21,0.52,0.72,0.87,1.29,0.86h1.53c0.53,0,1.03-0.28,1.3-0.74l0.35-0.58l0.35,0.58c0.28,0.46,0.77,0.74,1.31,0.74h1.52c0.77,0,1.39-0.63,1.38-1.39C80.47,13.38,80.42,13.17,80.32,12.97L80.32,12.97z M34.15,13.81h-1.34c-0.12,0-0.22-0.1-0.22-0.22V9.24c0-0.93-0.7-1.63-1.54-1.63c-0.76,0-1.39,0.67-1.51,1.54l0.01,4.44c0,0.12-0.1,0.22-0.22,0.22h-1.34c-0.12,0-0.22-0.1-0.22-0.22V9.24c0-0.93-0.7-1.63-1.54-1.63c-0.81,0-1.47,0.75-1.52,1.71v4.27c0,0.12-0.1,0.22-0.22,0.22h-1.33c-0.12,0-0.22-0.1-0.22-0.22V6.44c0.01-0.12,0.1-0.21,0.22-0.21h1.33c0.12,0,0.21,0.1,0.22,0.21v0.63c0.48-0.65,1.24-1.04,2.06-1.05h0.03c1.04,0,1.99,0.57,2.48,1.48c0.43-0.9,1.33-1.48,2.32-1.49c1.54,0,2.79,1.19,2.76,2.65l0.01,4.91C34.37,13.7,34.27,13.8,34.15,13.81C34.15,13.81,34.15,13.81,34.15,13.81z M43.78,13.59c0,0.12-0.1,0.22-0.22,0.22h-1.33c-0.12,0-0.22-0.1-0.22-0.22v-0.71C41.34,13.6,40.4,14,39.42,14c-2.07,0-3.75-1.78-3.75-3.99s1.69-3.99,3.75-3.99c0.98,0,1.92,0.41,2.6,1.12v-0.7c0-0.12,0.1-0.22,0.22-0.22h1.33c0.11-0.01,0.21,0.08,0.22,0.2c0,0.01,0,0.01,0,0.02V13.59z M49.91,14c-0.98,0-1.92-0.41-2.6-1.12v3.78c0,0.12-0.1,0.22-0.22,0.22h-1.33c-0.12,0-0.22-0.1-0.22-0.22V6.45c0-0.12,0.1-0.21,0.22-0.21h1.33c0.12,0,0.22,0.1,0.22,0.22v0.7c0.68-0.72,1.62-1.12,2.6-1.12c2.07,0,3.75,1.77,3.75,3.98S51.98,14,49.91,14z M63.09,10.87C62.72,12.65,61.22,14,59.43,14c-0.98,0-1.92-0.41-2.6-1.12v0.7c0,0.12-0.1,0.22-0.22,0.22h-1.33c-0.12,0-0.22-0.1-0.22-0.22V3.37c0-0.12,0.1-0.22,0.22-0.22h1.33c0.12,0,0.22,0.1,0.22,0.22v3.78c0.68-0.71,1.62-1.12,2.6-1.11c1.79,0,3.29,1.33,3.66,3.12C63.21,9.73,63.21,10.31,63.09,10.87L63.09,10.87L63.09,10.87z M68.26,14.01c-1.9,0.01-3.55-1.29-3.97-3.14c-0.12-0.56-0.12-1.13,0-1.69c0.42-1.85,2.07-3.15,3.97-3.14c2.25,0,4.06,1.78,4.06,3.99S70.5,14.01,68.26,14.01L68.26,14.01z M79.09,13.81h-1.53c-0.12,0-0.23-0.06-0.29-0.16l-1.37-2.28l-1.37,2.28c-0.06,0.1-0.17,0.16-0.29,0.16h-1.53c-0.04,0-0.08-0.01-0.11-0.03c-0.09-0.06-0.12-0.18-0.06-0.27c0,0,0,0,0,0l2.31-3.5l-2.28-3.47c-0.02-0.03-0.03-0.07-0.03-0.11c0-0.11,0.09-0.2,0.2-0.2h1.53c0.12,0,0.23,0.06,0.29,0.16l1.34,2.25l1.34-2.25c0.06-0.1,0.17-0.16,0.29-0.16h1.53c0.04,0,0.08,0.01,0.11,0.03c0.09,0.06,0.12,0.18,0.06,0.27c0,0,0,0,0,0L76.96,10l2.31,3.5c0.02,0.03,0.03,0.07,0.03,0.11C79.29,13.72,79.2,13.81,79.09,13.81C79.09,13.81,79.09,13.81,79.09,13.81L79.09,13.81z"/><path class="st0" d="M10,1.21c-4.87,0-8.81,3.95-8.81,8.81s3.95,8.81,8.81,8.81s8.81-3.95,8.81-8.81C18.81,5.15,14.87,1.21,10,1.21z M14.18,12.19c-1.84,1.84-4.55,2.2-6.38,2.2c-0.67,0-1.34-0.05-2-0.15c0,0-0.97-5.37,2.04-8.39c0.79-0.79,1.86-1.22,2.98-1.22c1.21,0,2.37,0.49,3.23,1.35C15.8,7.73,15.85,10.5,14.18,12.19z"/><path class="st1" d="M10,0.02c-5.52,0-10,4.48-10,10s4.48,10,10,10s10-4.48,10-10C19.99,4.5,15.52,0.02,10,0.02z M10,18.83c-4.87,0-8.81-3.95-8.81-8.81S5.13,1.2,10,1.2s8.81,3.95,8.81,8.81C18.81,14.89,14.87,18.83,10,18.83z"/><path class="st1" d="M14.04,5.98c-1.75-1.75-4.53-1.81-6.2-0.14C4.83,8.86,5.8,14.23,5.8,14.23s5.37,0.97,8.39-2.04C15.85,10.5,15.8,7.73,14.04,5.98z M11.88,9.87l-0.87,1.78l-0.86-1.78L8.38,9.01l1.77-0.86l0.86-1.78l0.87,1.78l1.77,0.86L11.88,9.87z"/><polygon class="st0" points="13.65,9.01 11.88,9.87 11.01,11.65 10.15,9.87 8.38,9.01 10.15,8.15 11.01,6.37 11.88,8.15 "/></g></svg>); + background-repeat: no-repeat; + background-position: 0 0; + background-size: 65px 20px; +`; + +export const MapWatermark = (props: AnchorHTMLAttributes) => ( + + Mapbox + +); diff --git a/packages/tupaia-web/src/layout/MapLayout/index.ts b/packages/tupaia-web/src/layout/MapLayout/index.ts new file mode 100644 index 0000000000..7d473704f9 --- /dev/null +++ b/packages/tupaia-web/src/layout/MapLayout/index.ts @@ -0,0 +1,7 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +export { MapLayout } from './MapLayout'; +export { MapWatermark } from './MapWatermark'; diff --git a/packages/tupaia-web/src/layout/Sidebar/ExpandButton.tsx b/packages/tupaia-web/src/layout/Sidebar/ExpandButton.tsx new file mode 100644 index 0000000000..261d9bc6db --- /dev/null +++ b/packages/tupaia-web/src/layout/Sidebar/ExpandButton.tsx @@ -0,0 +1,43 @@ +/* + * Tupaia + * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd + */ + +import React from 'react'; +import styled from 'styled-components'; +import { KeyboardArrowLeft, KeyboardArrowRight } from '@material-ui/icons'; +import { TRANSPARENT_BLACK } from '../../constants'; + +const SemiCircle = styled.div` + position: absolute; + top: 50%; + left: -30px; + display: flex; + justify-content: center; + align-items: center; + background-color: ${TRANSPARENT_BLACK}; + min-height: 60px; + min-width: 30px; + border-top-left-radius: 60px; + border-bottom-left-radius: 60px; + cursor: pointer; + pointer-events: auto; +`; + +const CloseArrowIcon = styled(KeyboardArrowRight)` + margin-left: 5px; +`; + +const OpenArrowIcon = styled(KeyboardArrowLeft)` + margin-left: 5px; +`; + +interface ExpandButtonProps { + isExpanded: boolean; + setIsExpanded: () => void; +} + +export const ExpandButton = ({ isExpanded, setIsExpanded }: ExpandButtonProps) => { + const arrowIcon = isExpanded ? : ; + return {arrowIcon}; +}; diff --git a/packages/tupaia-web/src/layout/Sidebar/Sidebar.tsx b/packages/tupaia-web/src/layout/Sidebar/Sidebar.tsx new file mode 100644 index 0000000000..c5c540b671 --- /dev/null +++ b/packages/tupaia-web/src/layout/Sidebar/Sidebar.tsx @@ -0,0 +1,46 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +import React, { useState } from 'react'; +import styled from 'styled-components'; +import { TRANSPARENT_BLACK } from '../../constants'; +import { ExpandButton } from './ExpandButton'; + +const MAX_SIDEBAR_EXPANDED_WIDTH = 1000; +const MAX_SIDEBAR_COLLAPSED_WIDTH = 350; + +const Panel = styled.div<{ + $isExpanded: boolean; +}>` + display: flex; + align-items: stretch; + flex-direction: column; + align-content: stretch; + position: relative; + overflow: visible; + background-color: ${TRANSPARENT_BLACK}; + pointer-events: auto; + height: 100%; + cursor: auto; + transition: width 0.5s ease, max-width 0.5s ease; + width: ${({ $isExpanded }) => ($isExpanded ? 45 : 30)}%; + min-width: 335px; + max-width: ${({ $isExpanded }) => + $isExpanded ? MAX_SIDEBAR_EXPANDED_WIDTH : MAX_SIDEBAR_COLLAPSED_WIDTH}px; +`; + +export const Sidebar = () => { + const [isExpanded, setIsExpanded] = useState(false); + + const toggleExpanded = () => { + setIsExpanded(!isExpanded); + }; + + return ( + + + + ); +}; diff --git a/packages/tupaia-web/src/layout/Sidebar/index.ts b/packages/tupaia-web/src/layout/Sidebar/index.ts new file mode 100644 index 0000000000..a1ac18fc21 --- /dev/null +++ b/packages/tupaia-web/src/layout/Sidebar/index.ts @@ -0,0 +1,6 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +export { Sidebar } from './Sidebar'; diff --git a/packages/tupaia-web/src/layout/TopBar/Logo.tsx b/packages/tupaia-web/src/layout/TopBar/Logo.tsx new file mode 100644 index 0000000000..02c14d97e4 --- /dev/null +++ b/packages/tupaia-web/src/layout/TopBar/Logo.tsx @@ -0,0 +1,89 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ +import React, { ReactNode } from 'react'; +import { Typography } from '@material-ui/core'; +import styled from 'styled-components'; +import { Link } from 'react-router-dom'; +import { DEFAULT_URL, TUPAIA_LIGHT_LOGO_SRC } from '../../constants'; + +const LogoWrapper = styled.div` + flex-grow: 1; + height: 100%; + display: flex; + align-items: center; +`; + +const LogoImage = styled.img` + max-height: 80%; + width: auto; + max-width: 50px; + @media screen and (min-width: ${({ theme }) => theme.breakpoints.values.sm}px) { + max-width: 100%; + } +`; + +const LogoLink = styled(Link)` + cursor: pointer; + pointer-events: auto; + padding: 0.5em; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + background: none; + border: none; +`; + +const Name = styled(Typography)` + font-style: normal; + font-weight: ${props => props.theme.typography.fontWeightBold}; + font-size: 1rem; + line-height: 1; + letter-spacing: 0.1rem; + @media screen and (min-width: ${({ theme }) => theme.breakpoints.values.sm}px) { + font-size: 1.2rem; + } + @media screen and (min-width: ${({ theme }) => theme.breakpoints.values.md}px) { + font-size: 1.5rem; + } +`; + +const NameWrapper = styled.div` + max-width: 100%; + ${LogoImage} + & { + margin-left: 1.2rem; + } +`; + +// If logo is from a custom landing page, don't wrap in clickable button +const LogoComponent = ({ + isCustomLandingPage, + children, +}: { + isCustomLandingPage: boolean; + children: ReactNode[]; +}) => (isCustomLandingPage ? <>{children} : {children}); + +export const Logo = () => { + // Here is where we should swap out the logo for the custom landing page logo if applicable + const logoSrc = TUPAIA_LIGHT_LOGO_SRC; + + // These will later come from custom landing pages, where applicable + const displayName = false; + const name = ''; + return ( + + + + {/** If a custom landing page has set to display the name in the header, display it here */} + {displayName && ( + + {name} + + )} + + + ); +}; diff --git a/packages/tupaia-web/src/layout/TopBar/TopBar.tsx b/packages/tupaia-web/src/layout/TopBar/TopBar.tsx new file mode 100644 index 0000000000..369314e83e --- /dev/null +++ b/packages/tupaia-web/src/layout/TopBar/TopBar.tsx @@ -0,0 +1,54 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +import React from 'react'; +import styled from 'styled-components'; +import { Logo } from './Logo'; +import { UserMenu } from '../UserMenu'; + +const TOP_BAR_HEIGHT = 60; +const TOP_BAR_HEIGHT_MOBILE = 50; +/* Both min height and height must be specified due to bugs in Firefox flexbox, that means that topbar height will be ignored even if using flex-basis. */ +const Header = styled.header<{ + $primaryColor?: string; + $secondaryColor?: string; +}>` + background-color: ${({ $primaryColor, theme }) => + $primaryColor || theme.palette.background.default}; + height: ${TOP_BAR_HEIGHT_MOBILE}px; + min-height: ${TOP_BAR_HEIGHT_MOBILE}px; + display: flex; + align-items: center; + z-index: 1000; + position: relative; + padding: 0 0.625em; + border-bottom: 1px solid rgba(151, 151, 151, 0.3); + > * { + background-color: ${({ $primaryColor, theme }) => + $primaryColor || theme.palette.background.default}; + } + button, + a, + p, + h1, + li { + color: ${({ $secondaryColor, theme }) => $secondaryColor || theme.palette.text.primary}; + } + @media screen and (min-width: ${({ theme }) => theme.breakpoints.values.sm}px) { + height: ${TOP_BAR_HEIGHT}px; + min-height: ${TOP_BAR_HEIGHT}px; + align-items: initial; + } +`; + +export const TopBar = () => { + // When handing custom landing pages, pass the primary and secondary colors to the Header component + return ( +
+ + +
+ ); +}; diff --git a/packages/tupaia-web/src/layout/TopBar/index.ts b/packages/tupaia-web/src/layout/TopBar/index.ts new file mode 100644 index 0000000000..a27c0a3605 --- /dev/null +++ b/packages/tupaia-web/src/layout/TopBar/index.ts @@ -0,0 +1,6 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +export { TopBar } from './TopBar'; diff --git a/packages/tupaia-web/src/layout/UserMenu/DrawerMenu.tsx b/packages/tupaia-web/src/layout/UserMenu/DrawerMenu.tsx new file mode 100644 index 0000000000..5cbc1cda2e --- /dev/null +++ b/packages/tupaia-web/src/layout/UserMenu/DrawerMenu.tsx @@ -0,0 +1,128 @@ +/* + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +import React, { ReactNode } from 'react'; +import styled from 'styled-components'; +import { Drawer as MuiDrawer } from '@material-ui/core'; +import { IconButton } from '@tupaia/ui-components'; +import CloseIcon from '@material-ui/icons/Close'; +import { MenuItem, MenuList } from './MenuList'; + +/** + * DrawerMenu is a drawer menu used when the user is on a mobile device + */ + +const Drawer = styled(MuiDrawer)` + @media screen and (min-width: ${props => props.theme.breakpoints.values.md}px) { + display: none; + } +`; + +const MenuWrapper = styled.div` + padding: 0 1.5em; + li a, + li button { + font-size: 1.2em; + padding: 0.8em; + line-height: 1.4; + text-align: left; + width: 100%; + font-weight: ${props => props.theme.typography.fontWeightRegular}; + color: inherit; + } + a > span { + text-decoration: underline; + } +`; + +const Username = styled.p` + font-weight: ${props => props.theme.typography.fontWeightMedium}; + text-transform: uppercase; + margin: 0; + width: 100%; + padding: 0 1em; +`; + +const MenuHeaderWrapper = styled.div` + padding: 0; +`; + +const MenuHeaderContainer = styled.div<{ + $secondaryColor?: string; +}>` + border-bottom: 1px solid + ${({ $secondaryColor, theme }) => $secondaryColor || theme.palette.text.primary}; + display: flex; + justify-content: flex-end; + padding: 0.8em 0; + align-items: center; + color: ${({ $secondaryColor }) => $secondaryColor}; +`; + +const MenuCloseIcon = styled(CloseIcon)<{ + $secondaryColor?: string; +}>` + width: 1.2em; + height: 1.2em; + fill: ${({ $secondaryColor, theme }) => $secondaryColor || theme.palette.text.primary}; +`; + +const MenuCloseButton = styled(IconButton)` + padding: 0; +`; + +interface DrawerMenuProps { + children: ReactNode; + menuOpen: boolean; + onCloseMenu: () => void; + primaryColor?: string; + secondaryColor?: string; + isUserLoggedIn: boolean; + currentUserUsername?: string; +} + +export const DrawerMenu = ({ + children, + menuOpen, + onCloseMenu, + primaryColor, + secondaryColor, + isUserLoggedIn, + currentUserUsername, +}: DrawerMenuProps) => { + return ( + + + + + {currentUserUsername && {currentUserUsername}} + + + + + + + {/** If the user is not logged in, show the register and login buttons */} + {!isUserLoggedIn && ( + <> + + Log in + + + Register + + + )} + {children} + + + + ); +}; diff --git a/packages/tupaia-web/src/layout/UserMenu/MenuList.tsx b/packages/tupaia-web/src/layout/UserMenu/MenuList.tsx new file mode 100644 index 0000000000..354275464c --- /dev/null +++ b/packages/tupaia-web/src/layout/UserMenu/MenuList.tsx @@ -0,0 +1,102 @@ +/* + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +import React, { ReactNode } from 'react'; +import styled from 'styled-components'; +import { Button, ListItem, ListItemProps } from '@material-ui/core'; +import { Link } from 'react-router-dom'; + +/** + * Menulist is a component that displays a list of menu items for the hamburger menu + */ +const MenuListWrapper = styled.ul<{ + $secondaryColor?: string; +}>` + list-style: none; + margin-block-start: 0; + margin-block-end: 0; + padding-inline-start: 0; + * { + color: ${({ $secondaryColor }) => $secondaryColor}; + } +`; + +const MenuItemButton = styled(Button)` + text-transform: none; + font-size: 1rem; + font-weight: ${props => props.theme.typography.fontWeightRegular}; + padding: 0.4em 1em; + line-height: 1.4; + width: 100%; + justify-content: flex-start; +`; + +const MenuItemLink = styled(Link)` + font-size: 1rem; + padding: 0.4em 1em; + line-height: 1.4; + width: 100%; + text-decoration: none; + &:hover, + &:focus { + text-decoration: none; + background-color: rgba(255, 255, 255, 0.08); + } +`; + +type MenuListItemType = ListItemProps & { + $secondaryColor?: string; +}; + +const MenuListItem = styled(ListItem)<{ + $secondaryColor?: string; +}>` + padding: 0; + color: ${({ $secondaryColor }) => $secondaryColor}; +` as MenuListItemType; + +interface MenuItemProps { + href?: string; + children: ReactNode; + onClick?: () => void; + onCloseMenu: () => void; + secondaryColor?: string; + target?: string; +} + +// If is a link, use a link component, else a button so that we have correct semantic HTML +export const MenuItem = ({ + href, + children, + onClick, + onCloseMenu, + secondaryColor, + target, +}: MenuItemProps) => { + const handleClickMenuItem = () => { + if (onClick) onClick(); + onCloseMenu(); + }; + return ( + + {href ? ( + + {children} + + ) : ( + {children} + )} + + ); +}; + +interface MenuListProps { + children: ReactNode; + secondaryColor?: string; +} + +export const MenuList = ({ children, secondaryColor }: MenuListProps) => { + return {children}; +}; diff --git a/packages/tupaia-web/src/layout/UserMenu/PopoverMenu.tsx b/packages/tupaia-web/src/layout/UserMenu/PopoverMenu.tsx new file mode 100644 index 0000000000..5c13ee9c58 --- /dev/null +++ b/packages/tupaia-web/src/layout/UserMenu/PopoverMenu.tsx @@ -0,0 +1,53 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +import React, { ReactNode } from 'react'; +import { Popover as MuiPopover } from '@material-ui/core'; +import { MenuList } from './MenuList'; +import styled from 'styled-components'; + +/** + * PopoverMenu is a popover menu used when the user is on a desktop device + */ + +const Popover = styled(MuiPopover)` + @media screen and (max-width: ${({ theme }) => theme.breakpoints.values.md}px) { + display: none; + } +`; + +interface PopoverMenuProps { + children: ReactNode; + primaryColor?: string; + menuOpen: boolean; + onCloseMenu: () => void; + secondaryColor?: string; +} +export const PopoverMenu = ({ + children, + primaryColor, + menuOpen, + onCloseMenu, + secondaryColor, +}: PopoverMenuProps) => { + return ( + document.getElementById('user-menu-button') as HTMLElement} + onClose={onCloseMenu} + anchorOrigin={{ + vertical: 'bottom', + horizontal: 'right', + }} + transformOrigin={{ + vertical: 'top', + horizontal: 'right', + }} + > + {children} + + ); +}; diff --git a/packages/tupaia-web/src/layout/UserMenu/UserMenu.tsx b/packages/tupaia-web/src/layout/UserMenu/UserMenu.tsx new file mode 100644 index 0000000000..2d1057cd70 --- /dev/null +++ b/packages/tupaia-web/src/layout/UserMenu/UserMenu.tsx @@ -0,0 +1,79 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +import React, { ReactNode, useState } from 'react'; +import MuiMenuIcon from '@material-ui/icons/Menu'; +import { Button, MenuList, useTheme } from '@material-ui/core'; +import styled from 'styled-components'; +import { PopoverMenu } from './PopoverMenu'; +import { DrawerMenu } from './DrawerMenu'; + +const UserMenuContainer = styled.div<{ + secondaryColor?: string; +}>` + display: flex; + align-items: center; + color: ${({ secondaryColor, theme }) => secondaryColor || theme.palette.text.primary}; +`; + +const MenuButton = styled(Button)` + width: 2em; + min-width: 2em; + height: 2em; + text-align: right; + padding: 0; + pointer-events: auto; +`; + +const MenuIcon = styled(MuiMenuIcon)` + width: 100%; + height: 100%; +`; + +export const UserMenu = () => { + const [menuOpen, setMenuOpen] = useState(false); + const toggleUserMenu = () => { + setMenuOpen(!menuOpen); + }; + + const onCloseMenu = () => { + setMenuOpen(false); + }; + + // Here will be the menu items logic. These will probably come from a context somewhere that handles when a user is logged in, and when it is a custom landing page + const menuItems = [] as ReactNode[]; + + const theme = useTheme(); + + // these will later be updated to handle custom landing pages + const primaryColor = theme.palette.background.default; + const secondaryColor = theme.palette.text.primary; + + return ( + + + + + {/** PopoverMenu is for larger (desktop size) screens, and DrawerMenu is for mobile screens. Each component takes care of the hiding and showing at different screen sizes. Eventually all the props will come from a context */} + + {menuItems} + + + {menuItems} + + + ); +}; diff --git a/packages/tupaia-web/src/layout/UserMenu/index.ts b/packages/tupaia-web/src/layout/UserMenu/index.ts new file mode 100644 index 0000000000..bc3f79334a --- /dev/null +++ b/packages/tupaia-web/src/layout/UserMenu/index.ts @@ -0,0 +1,6 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +export { UserMenu } from './UserMenu'; diff --git a/packages/tupaia-web/src/layout/index.ts b/packages/tupaia-web/src/layout/index.ts index 652a972fc4..2b862370e6 100644 --- a/packages/tupaia-web/src/layout/index.ts +++ b/packages/tupaia-web/src/layout/index.ts @@ -2,3 +2,7 @@ * Tupaia * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ +export { AuthModal } from './AuthModal'; +export { Layout } from './Layout'; +export { MapLayout } from './MapLayout'; +export { Sidebar } from './Sidebar'; diff --git a/packages/tupaia-web/src/pages/LoginForm.tsx b/packages/tupaia-web/src/pages/LoginForm.tsx index 8fff11ced8..aaa4b7396e 100644 --- a/packages/tupaia-web/src/pages/LoginForm.tsx +++ b/packages/tupaia-web/src/pages/LoginForm.tsx @@ -3,7 +3,19 @@ * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ import React from 'react'; +import { AuthModal } from '../layout'; export const LoginForm = () => { - return
LoginForm
; + return ( + {}, + text: 'Login', + }} + > +

Login form goes here

+ + ); }; diff --git a/packages/tupaia-web/src/pages/PasswordResetForm.tsx b/packages/tupaia-web/src/pages/PasswordResetForm.tsx index 23ac65c155..caf11b30a7 100644 --- a/packages/tupaia-web/src/pages/PasswordResetForm.tsx +++ b/packages/tupaia-web/src/pages/PasswordResetForm.tsx @@ -3,7 +3,8 @@ * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ import React from 'react'; +import { AuthModal } from '../layout'; export const PasswordResetForm = () => { - return
PasswordResetForm
; + return PasswordResetForm; }; diff --git a/packages/tupaia-web/src/pages/Project.tsx b/packages/tupaia-web/src/pages/Project.tsx index 58624d1348..a1c4acaad7 100644 --- a/packages/tupaia-web/src/pages/Project.tsx +++ b/packages/tupaia-web/src/pages/Project.tsx @@ -3,17 +3,28 @@ * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ import React from 'react'; -import { useParams } from 'react-router-dom'; +import styled from 'styled-components'; +import { MapLayout, Sidebar } from '../layout'; +const Container = styled.div` + display: flex; + flex-direction: row; + flex: 1; + overflow: hidden; +`; + +/** + * This is the layout for the project/* view. This contains the map and the sidebar, as well as any overlays that are not auth overlays (i.e. not needed in landing pages) + */ export const Project = () => { // Use these to fetch the project and any other entity info you might need - const { projectCode, entityCode, '*': dashboardCode } = useParams(); + // const { projectCode, entityCode, '*': dashboardCode } = useParams(); return ( -
-

Project: {projectCode}

-

Entity: {entityCode}

-

Dashboard: {dashboardCode}

-
+ + + + {/** This is where SessionExpiredDialog and any other overlays would go, as well as loading screen */} + ); }; diff --git a/packages/tupaia-web/src/pages/RegisterForm.tsx b/packages/tupaia-web/src/pages/RegisterForm.tsx index d13fd63870..3d9c43cee1 100644 --- a/packages/tupaia-web/src/pages/RegisterForm.tsx +++ b/packages/tupaia-web/src/pages/RegisterForm.tsx @@ -3,7 +3,8 @@ * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ import React from 'react'; +import { AuthModal } from '../layout'; export const RegisterForm = () => { - return
RegisterForm
; + return RegisterForm; }; diff --git a/packages/tupaia-web/src/pages/RequestAccessForm.tsx b/packages/tupaia-web/src/pages/RequestAccessForm.tsx index f40ceaa61a..a72144d0a6 100644 --- a/packages/tupaia-web/src/pages/RequestAccessForm.tsx +++ b/packages/tupaia-web/src/pages/RequestAccessForm.tsx @@ -3,7 +3,8 @@ * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ import React from 'react'; +import { AuthModal } from '../layout'; export const RequestAccessForm = () => { - return
RequestAccessForm
; + return RequestAccessForm; }; diff --git a/packages/tupaia-web/src/pages/VerifyEmailForm.tsx b/packages/tupaia-web/src/pages/VerifyEmailForm.tsx index 456dc92b09..422c76f4ad 100644 --- a/packages/tupaia-web/src/pages/VerifyEmailForm.tsx +++ b/packages/tupaia-web/src/pages/VerifyEmailForm.tsx @@ -3,7 +3,8 @@ * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ import React from 'react'; +import { AuthModal } from '../layout'; export const VerifyEmailForm = () => { - return
VerifyEmailForm
; + return VerifyEmailForm; }; diff --git a/packages/tupaia-web/src/theme/constants.ts b/packages/tupaia-web/src/theme/constants.ts new file mode 100644 index 0000000000..a15a725733 --- /dev/null +++ b/packages/tupaia-web/src/theme/constants.ts @@ -0,0 +1,12 @@ +/** + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ + +/** + * Theme constants that don't require being in the entire theme object, ie. things that won't change if a custom theme was applied + */ + +export const FONT_SIZES = { + viewTitle: '2em', +}; diff --git a/packages/tupaia-web/src/theme/index.ts b/packages/tupaia-web/src/theme/index.ts index 652a972fc4..f180c0a582 100644 --- a/packages/tupaia-web/src/theme/index.ts +++ b/packages/tupaia-web/src/theme/index.ts @@ -2,3 +2,5 @@ * Tupaia * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd */ +export * from './constants'; +export * from './theme'; diff --git a/packages/tupaia-web/src/theme/theme.ts b/packages/tupaia-web/src/theme/theme.ts new file mode 100644 index 0000000000..83ba090035 --- /dev/null +++ b/packages/tupaia-web/src/theme/theme.ts @@ -0,0 +1,16 @@ +import { createMuiTheme } from '@material-ui/core'; + +export const theme = createMuiTheme({ + palette: { + type: 'dark', + primary: { + main: '#1978D4', // Main blue (as seen on primary buttons) + }, + secondary: { + main: '#ee6230', // Tupaia Orange + }, + background: { + default: '#262834', // Dark blue background + }, + }, +}); diff --git a/packages/tupaia-web/src/types/mui.d.ts b/packages/tupaia-web/src/types/mui.d.ts new file mode 100644 index 0000000000..57a570aaf7 --- /dev/null +++ b/packages/tupaia-web/src/types/mui.d.ts @@ -0,0 +1,7 @@ +import { ListItemProps as MuiListItemProps } from '@material-ui/core'; + +declare module '@material-ui/core' { + export type ListItemProps = Omit & { + button?: boolean; // override this to make it optional, due to issue with 'button' prop in MuiListItemProps throwing an error when it is undefined + }; +} diff --git a/packages/tupaia-web/stories/Introduction.mdx b/packages/tupaia-web/stories/Introduction.mdx deleted file mode 100644 index ff7fc71fbf..0000000000 --- a/packages/tupaia-web/stories/Introduction.mdx +++ /dev/null @@ -1,213 +0,0 @@ -import { Meta } from '@storybook/blocks'; -import Code from './assets/code-brackets.svg'; -import Colors from './assets/colors.svg'; -import Comments from './assets/comments.svg'; -import Direction from './assets/direction.svg'; -import Flow from './assets/flow.svg'; -import Plugin from './assets/plugin.svg'; -import Repo from './assets/repo.svg'; -import StackAlt from './assets/stackalt.svg'; - - - - - -# Welcome to Storybook - -Storybook helps you build UI components in isolation from your app's business logic, data, and context. -That makes it easy to develop hard-to-reach states. Save these UI states as **stories** to revisit during development, testing, or QA. - -Browse example stories now by navigating to them in the sidebar. -View their code in the `stories` directory to learn how they work. -We recommend building UIs with a [**component-driven**](https://componentdriven.org) process starting with atomic components and ending with pages. - -
Configure
- - - -
Learn
- - - -
- TipEdit the Markdown in{' '} - stories/Introduction.stories.mdx -
diff --git a/packages/tupaia-web/stories/components/modal.stories.tsx b/packages/tupaia-web/stories/components/modal.stories.tsx new file mode 100644 index 0000000000..85e4532f61 --- /dev/null +++ b/packages/tupaia-web/stories/components/modal.stories.tsx @@ -0,0 +1,28 @@ +/* + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ +import React from 'react'; +import { Meta } from '@storybook/react'; +import { Modal } from '../../src/components/Modal'; +import { useState } from 'react'; +import { Button } from '@material-ui/core'; + +const meta: Meta = { + title: 'components/Modal', + component: Modal, +}; + +export default meta; + +export const Simple = () => { + const [isOpen, setIsOpen] = useState(true); + return ( + <> + + setIsOpen(false)}> + Hi, I am a modal + + + ); +}; diff --git a/packages/tupaia-web/stories/layout/authModal.stories.tsx b/packages/tupaia-web/stories/layout/authModal.stories.tsx new file mode 100644 index 0000000000..389aeb50c4 --- /dev/null +++ b/packages/tupaia-web/stories/layout/authModal.stories.tsx @@ -0,0 +1,58 @@ +/* + * Tupaia + * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd + */ +import React from 'react'; +import { Meta } from '@storybook/react'; +import { AuthModal } from '../../src/layout/AuthModal'; + +const meta: Meta = { + title: 'layout/AuthModal', + component: AuthModal, +}; + +export default meta; + +export const Simple = () => { + return ( + + Hi, I am an auth modal + + ); +}; + +export const PrimaryButton = () => { + return ( + {}, + }} + > + Hi, I am an auth modal + + ); +}; + +export const SecondaryButton = () => { + return ( + {}, + }} + secondaryButton={{ + text: 'Cancel', + onClick: () => {}, + }} + > + Hi, I am an auth modal + + ); +}; diff --git a/packages/tupaia-web/vite.config.ts b/packages/tupaia-web/vite.config.ts index eb7eae4fe5..b1faa2cd3c 100644 --- a/packages/tupaia-web/vite.config.ts +++ b/packages/tupaia-web/vite.config.ts @@ -14,6 +14,9 @@ const baseConfig = { port: 8088, open: true, }, + define: { + 'process.env': process.env, // to stop errors when libraries use 'process.env' + }, envPrefix: 'REACT_APP_', // to allow any existing REACT_APP_ env variables to be used; resolve: { preserveSymlinks: true, @@ -34,6 +37,7 @@ export default defineConfig(({ command }) => { return { ...baseConfig, define: { + ...baseConfig.define, global: {}, }, }; diff --git a/packages/ui-components/src/components/EnvBanner.tsx b/packages/ui-components/src/components/EnvBanner.tsx index bb688f0a7f..2e4b45ce94 100644 --- a/packages/ui-components/src/components/EnvBanner.tsx +++ b/packages/ui-components/src/components/EnvBanner.tsx @@ -24,13 +24,7 @@ const StyledBanner = styled(FlexCenter)<{ } `; -export const EnvBanner = ( - { - color = '#f39c12' - }: { - color?: CSSStyleDeclaration['color']; - } -) => { +export const EnvBanner = ({ color = '#f39c12' }: { color?: CSSStyleDeclaration['color'] }) => { const deploymentName = process.env.REACT_APP_DEPLOYMENT_NAME; if (