diff --git a/webapp/.vscode/launch.json b/webapp/.vscode/launch.json new file mode 100644 index 0000000..7d5f3de --- /dev/null +++ b/webapp/.vscode/launch.json @@ -0,0 +1,25 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Debug CRA Tests", + "type": "node", + "request": "launch", + "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts", + "args": [ + "test", + "--runInBand", + "--no-cache", + "--watchAll=false" + ], + "cwd": "${workspaceRoot}", + "protocol": "inspector", + "console": "integratedTerminal", + "internalConsoleOptions": "neverOpen", + "env": { + "CI": "true" + }, + "disableOptimisticBPs": true + } + ] +} diff --git a/webapp/package.json b/webapp/package.json index fabcb40..2444a45 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -10,9 +10,13 @@ "@types/node": "^12.0.0", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", + "chroma-js": "^2.1.2", + "jss": "^10.8.2", "react": "^17.0.2", "react-dom": "^17.0.2", + "react-jss": "^10.8.2", "react-scripts": "4.0.3", + "theming": "^3.3.0", "typescript": "^4.1.2", "web-vitals": "^1.0.1" }, @@ -58,6 +62,7 @@ "@storybook/addon-links": "^6.3.12", "@storybook/node-logger": "^6.3.12", "@storybook/preset-create-react-app": "^3.2.0", - "@storybook/react": "^6.3.12" + "@storybook/react": "^6.3.12", + "@types/chroma-js": "^2.1.3" } } diff --git a/webapp/src/components/DAGSvgs/Board.tsx b/webapp/src/components/DAGSvgs/Board.tsx new file mode 100644 index 0000000..886f8d3 --- /dev/null +++ b/webapp/src/components/DAGSvgs/Board.tsx @@ -0,0 +1,40 @@ +import { FC } from "react"; +import useWindowSize from "utils/useWindowSize"; +import { useBoardStyles } from "./styles"; + +export const SVGBoard: FC<{ + graphHeight?: number, +}> =({ + children, + graphHeight = 300, +}) => { + + // state + const { ratioWbh } = useWindowSize(); + const { classes, theme } = useBoardStyles({}); + + // alias + const graphWidth = Math.round(graphHeight * ratioWbh); + + // render + return
= 0.75 ? 'row' : 'column' + }}> +
+ + + + + + + {children} + +
+
+} diff --git a/webapp/src/components/DAGSvgs/DAGEdge.tsx b/webapp/src/components/DAGSvgs/DAGEdge.tsx new file mode 100644 index 0000000..f220f01 --- /dev/null +++ b/webapp/src/components/DAGSvgs/DAGEdge.tsx @@ -0,0 +1,63 @@ +import { EdgeDirection, Point } from "types/graphs" + + + +export interface EdgeProp { + p1: Point, + p2: Point, + direction: EdgeDirection, + color: string, + debug?: boolean, +} +export const DAGEdge = ({ + p1: [x1,y1], + p2: [x2,y2], + direction, + color, + debug=false, +}: EdgeProp) => { + const [mx,my] = [(x1+x2)/2, (y1+y2)/2] + let [cx1,cy1] = [(x1+mx)/2, (y1+my)/2] + let [cx2, cy2] = [(x2 + mx) / 2, (y2 + my) / 2] + const l1 = Math.sqrt((cy1 - y1) ** 2 + (cx1 - x1) ** 2) + const l2 = Math.sqrt((cy2 - y2) ** 2 + (cx2 - x2) ** 2) + const theta = Math.atan2(y2 -y1, x2-x1) + if ((theta < Math.PI / 2) && (theta > -Math.PI / 2)) { + cy1 = y1 - 0.5 * l1 * Math.sin(theta) + cx1 = x1 + 2 * l1 * Math.cos(theta) + cy2 = y2 + 0.5 * l2 * Math.sin(theta) + cx2 = x2 - 2 * l2 * Math.cos(theta) + } else if (theta === Math.PI) { + cy1 *= 1.5 + cx1 = x1 - 2 * l1 * Math.cos(theta) + cy2 *= 0.9 + } else if ((theta > Math.PI / 2) && (theta < Math.PI)) { + cy2 += l2 * Math.sin(theta) + cx2 += 10 * l2 * Math.cos(theta) + cx1 -= 10 * l1 * Math.cos(theta) + } + + return <> + {debug && <> + + + + + + + {theta} + } + 2') ? + "url(#arrow)" : '' + } + markerEnd={ + (direction === '1->2' || direction === '1<->2') ? + "url(#arrow)" : '' + } + /> + +} diff --git a/webapp/src/components/DAGSvgs/DAGNode.stories.tsx b/webapp/src/components/DAGSvgs/DAGNode.stories.tsx new file mode 100644 index 0000000..aab1ee9 --- /dev/null +++ b/webapp/src/components/DAGSvgs/DAGNode.stories.tsx @@ -0,0 +1,65 @@ +import React from "react"; +import { ComponentMeta, ComponentStory } from '@storybook/react'; +import { DAGNode } from "./DAGNode"; +import { SVGBoard } from './Board'; +import { NODE_HEIGHT, NODE_WIDTH } from './constants'; +import { DAGEdge } from "./DAGEdge"; + +const GRAPH_HEIGHT = 300; + +export default { + title: 'DAGSvgs/DAGNode', + component: DAGNode, + parameters: { actions: { argTypesRegex: '^on.*' } }, + args: { + height: NODE_HEIGHT, + width: NODE_WIDTH, + text: "Test", + loc: [NODE_WIDTH * 2,GRAPH_HEIGHT / 2] + } +} as ComponentMeta; + +export const Basic: ComponentStory = args => + + + +export const WithEdge: ComponentStory = args => + + +WithEdge.args = { + ...(WithEdge.args ?? {}), + edge: { + color: 'white', + loc: [ NODE_WIDTH * 4, NODE_HEIGHT * 2 ] + } +} + +export const WithManyEdge: ComponentStory = args => + + {[ + // TODO: make it nicer to view when from behind + // [0, 0], + // [args.loc[0] - args.width, args.loc[1] + args.height / 2], // behind + // [args.loc[0] - 0.5*args.width, args.loc[1] + args.height ], // behind + // [args.loc[0], args.loc[1] + args.height ], // behind + // [args.loc[0], args.loc[1] + 2 * args.height ], // behind + [args.loc[0] + args.width / 2, args.loc[1] + 2 * args.height ], // below + [args.loc[0] + args.width, args.loc[1] + args.height * 2], // down + [args.loc[0] + args.width, args.loc[1] - args.height * 2], // up + [args.loc[0] + 2*args.width, args.loc[1] + args.height * 2], // down right + [args.loc[0] + 2*args.width, args.loc[1] + args.height / 2], // forward + [args.loc[0] + 2*args.width, args.loc[1] - args.height * 2], // up right + ].map((p: any) => )} + diff --git a/webapp/src/components/DAGSvgs/DAGNode.tsx b/webapp/src/components/DAGSvgs/DAGNode.tsx new file mode 100644 index 0000000..464b576 --- /dev/null +++ b/webapp/src/components/DAGSvgs/DAGNode.tsx @@ -0,0 +1,61 @@ +import Color from "chroma-js"; +import { PencilIcon } from "components/Icons" +import { useNodeStyles } from "./styles" +import { Node, Point } from "types/graphs"; +import { DAGEdge } from "./DAGEdge"; + + + +export interface NodeProp extends Node { + height: number; + width: number; + onXClick?: () => void; + onOpenClick?: () => void; + edge?: { + color: string; + loc: Point; + } +} +export const DAGNode = ({ + loc: [x, y], + text, + height, + width, + onXClick = () => { }, + onOpenClick = () => { }, + color, + edge, +}: NodeProp) => { + const { classes, theme } = useNodeStyles({ + color, + nodeHeight: height, + nodeWidth: width, + }); + return <> + +
+
+
+ +
+
+ + {text} + +
+
+ +
+
+
+
+ {edge && } + +} diff --git a/webapp/src/components/DAGSvgs/constants.ts b/webapp/src/components/DAGSvgs/constants.ts new file mode 100644 index 0000000..f7485fe --- /dev/null +++ b/webapp/src/components/DAGSvgs/constants.ts @@ -0,0 +1,5 @@ + + + +export const NODE_WIDTH = 100 as const; +export const NODE_HEIGHT = 40 as const; diff --git a/webapp/src/components/DAGSvgs/styles.ts b/webapp/src/components/DAGSvgs/styles.ts new file mode 100644 index 0000000..979120d --- /dev/null +++ b/webapp/src/components/DAGSvgs/styles.ts @@ -0,0 +1,144 @@ +import { Styles } from "jss"; +import Color from 'chroma-js'; +import { createAppUseStyles } from "styles/theme"; +import { Node } from "types/graphs"; + + +export const useBoardStyles = createAppUseStyles(theme => ({ + root: { + height: '99%', + width: '99%', + color: theme.primaryAccent, + background: theme.primary, + display: 'flex', + flexDirection: 'row', + }, + dag: { + borderWidth: 1, + borderStyle: 'solid', + borderColor: theme.secondaryAccent, + width: '100%', + }, + svg: { + height: '99%', + width: '99%', + padding: 0, + margin: 0, + }, + circle: { + fill: Color(theme.secondary).set('rgb.b', 125).hex(), + }, + infoBox: { + paddingLeft: '10px', + paddingRight: '10px', + display: 'flex', + flexDirection: 'column', + justifyContent: 'flex-start', + overflow: 'auto', + }, + dagEdge: { + stroke: theme.secondaryAccent, + }, +})) + +export const useNodeStyles = createAppUseStyles<{ + color: Node['color'], + nodeHeight: number, + nodeWidth: number, +}>(theme => { + const edgeStyle: Styles = { + flex: '1', + display: 'flex', + flexDirection: 'column', + flexWrap: 'nowrap', + borderRadius: '1em', + justifyContent: 'space-around', + alignItems: 'center', + '&:hover': { + backgroundColor: theme.primaryAccent, + cursor: 'pointer', + } + } + const buttonStyle: Styles = { + fontSize: '8px', + backgroundColor: "rgba(0,0,0,0)", + color: theme.primaryAccent, + borderStyle: 'none', + height: '15px', + width: '15px', + cursor: 'pointer', + transition: "500ms east-out", + } + return { + root: { + display: 'flex', + flexDirection: 'column', + justifyContent: 'flex-end', + height: `100%`, + maxHeight: `100%`, + maxWidth: '100%', + width: '100%', + fontSize: 10, + }, + inner: ({ color }) => ({ + position: 'relative', + display: 'flex', + flexDirection: 'row', + backgroundColor: theme.secondary, + borderRadius: '1em', + flex: 1, + height: `100%`, + maxHeight: `100%`, + maxWidth: '100%', + marginTop: '2.5px', + marginBottom: '2.5px', + borderTopWidth: '1px', + borderTopStyle: 'solid', + borderTopLeftRadius: '10px', + borderTopRightRadius: '10px', + borderTopColor: color === 'red' ? Color(theme.secondary).set('rgb.r', 125).hex() : + color === 'blue' ? Color(theme.secondary).set('rgb.b', 125).hex() : + color === 'green' ? Color(theme.secondary).set('rgb.g', 125).hex() : + 'none' + }), + textWrap: { + display: 'flex', + flex: 4, + textAlign: 'center', + justifyContent: 'center', + alignItems: 'center', + height: '100%', + maxHeight: '100%', + maxWidth: "50%", + }, + text: { + textOverflow: 'ellipsis', + overflow: "hidden", + whiteSpace: "nowrap", + }, + buttonDelete: { + ...buttonStyle, + "&:hover": { + color: theme.primary, + } + }, + buttonEdit: { + ...buttonStyle, + "&:hover": { + transform: "rotate(45deg)" + } + }, + leftEdge: { + ...edgeStyle, + borderLef: `1px ${theme.secondaryAccent} solid`, + borderTopRightRadius: 0, + borderBottomRightRadius: 0, + }, + rightEdge: { + ...edgeStyle, + borderRight: `1px ${theme.secondaryAccent} solid`, + borderTopLeftRadius: 0, + borderBottomLeftRadius: 0, + }, + } +}) diff --git a/webapp/src/stories/Button.stories.tsx b/webapp/src/stories/Button.stories.tsx deleted file mode 100644 index c331bd4..0000000 --- a/webapp/src/stories/Button.stories.tsx +++ /dev/null @@ -1,41 +0,0 @@ -import React from 'react'; -import { ComponentStory, ComponentMeta } from '@storybook/react'; - -import { Button } from './Button'; - -// More on default export: https://storybook.js.org/docs/react/writing-stories/introduction#default-export -export default { - title: 'Example/Button', - component: Button, - // More on argTypes: https://storybook.js.org/docs/react/api/argtypes - argTypes: { - backgroundColor: { control: 'color' }, - }, -} as ComponentMeta; - -// More on component templates: https://storybook.js.org/docs/react/writing-stories/introduction#using-args -const Template: ComponentStory = (args) => - ); -}; diff --git a/webapp/src/stories/Header.stories.tsx b/webapp/src/stories/Header.stories.tsx deleted file mode 100644 index 4b11b34..0000000 --- a/webapp/src/stories/Header.stories.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import React from 'react'; -import { ComponentStory, ComponentMeta } from '@storybook/react'; - -import { Header } from './Header'; - -export default { - title: 'Example/Header', - component: Header, -} as ComponentMeta; - -const Template: ComponentStory = (args) =>
; - -export const LoggedIn = Template.bind({}); -LoggedIn.args = { - user: {}, -}; - -export const LoggedOut = Template.bind({}); -LoggedOut.args = {}; diff --git a/webapp/src/stories/Header.tsx b/webapp/src/stories/Header.tsx deleted file mode 100644 index 96250c5..0000000 --- a/webapp/src/stories/Header.tsx +++ /dev/null @@ -1,47 +0,0 @@ -import React from 'react'; - -import { Button } from './Button'; -import './header.css'; - -interface HeaderProps { - user?: {}; - onLogin: () => void; - onLogout: () => void; - onCreateAccount: () => void; -} - -export const Header = ({ user, onLogin, onLogout, onCreateAccount }: HeaderProps) => ( -
-
-
- - - - - - - -

Acme

-
-
- {user ? ( -
-
-
-); diff --git a/webapp/src/stories/Introduction.stories.mdx b/webapp/src/stories/Introduction.stories.mdx deleted file mode 100644 index 42c4a87..0000000 --- a/webapp/src/stories/Introduction.stories.mdx +++ /dev/null @@ -1,211 +0,0 @@ -import { Meta } from '@storybook/addon-docs'; -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 `src/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{' '} - src/stories/Introduction.stories.mdx -
diff --git a/webapp/src/stories/Page.stories.tsx b/webapp/src/stories/Page.stories.tsx deleted file mode 100644 index 8c8cab2..0000000 --- a/webapp/src/stories/Page.stories.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import React from 'react'; -import { ComponentStory, ComponentMeta } from '@storybook/react'; - -import { Page } from './Page'; -import * as HeaderStories from './Header.stories'; - -export default { - title: 'Example/Page', - component: Page, -} as ComponentMeta; - -const Template: ComponentStory = (args) => ; - -export const LoggedIn = Template.bind({}); -LoggedIn.args = { - // More on composing args: https://storybook.js.org/docs/react/writing-stories/args#args-composition - ...HeaderStories.LoggedIn.args, -}; - -export const LoggedOut = Template.bind({}); -LoggedOut.args = { - ...HeaderStories.LoggedOut.args, -}; diff --git a/webapp/src/stories/Page.tsx b/webapp/src/stories/Page.tsx deleted file mode 100644 index f35c4c8..0000000 --- a/webapp/src/stories/Page.tsx +++ /dev/null @@ -1,67 +0,0 @@ -import React from 'react'; - -import { Header } from './Header'; -import './page.css'; - -interface PageProps { - user?: {}; - onLogin: () => void; - onLogout: () => void; - onCreateAccount: () => void; -} - -export const Page = ({ user, onLogin, onLogout, onCreateAccount }: PageProps) => ( -
-
- -
-

Pages in Storybook

-

- We recommend building UIs with a{' '} - - component-driven - {' '} - process starting with atomic components and ending with pages. -

-

- Render pages with mock data. This makes it easy to build and review page states without - needing to navigate to them in your app. Here are some handy patterns for managing page data - in Storybook: -

-
    -
  • - Use a higher-level connected component. Storybook helps you compose such data from the - "args" of child component stories -
  • -
  • - Assemble data in the page component from your services. You can mock these services out - using Storybook. -
  • -
-

- Get a guided tutorial on component-driven development at{' '} - - Storybook tutorials - - . Read more in the{' '} - - docs - - . -

-
- Tip Adjust the width of the canvas with the{' '} - - - - - - Viewports addon in the toolbar -
-
-
-); diff --git a/webapp/src/stories/assets/code-brackets.svg b/webapp/src/stories/assets/code-brackets.svg deleted file mode 100644 index 73de947..0000000 --- a/webapp/src/stories/assets/code-brackets.svg +++ /dev/null @@ -1 +0,0 @@ -illustration/code-brackets \ No newline at end of file diff --git a/webapp/src/stories/assets/colors.svg b/webapp/src/stories/assets/colors.svg deleted file mode 100644 index 17d58d5..0000000 --- a/webapp/src/stories/assets/colors.svg +++ /dev/null @@ -1 +0,0 @@ -illustration/colors \ No newline at end of file diff --git a/webapp/src/stories/assets/comments.svg b/webapp/src/stories/assets/comments.svg deleted file mode 100644 index 6493a13..0000000 --- a/webapp/src/stories/assets/comments.svg +++ /dev/null @@ -1 +0,0 @@ -illustration/comments \ No newline at end of file diff --git a/webapp/src/stories/assets/direction.svg b/webapp/src/stories/assets/direction.svg deleted file mode 100644 index 65676ac..0000000 --- a/webapp/src/stories/assets/direction.svg +++ /dev/null @@ -1 +0,0 @@ -illustration/direction \ No newline at end of file diff --git a/webapp/src/stories/assets/flow.svg b/webapp/src/stories/assets/flow.svg deleted file mode 100644 index 8ac27db..0000000 --- a/webapp/src/stories/assets/flow.svg +++ /dev/null @@ -1 +0,0 @@ -illustration/flow \ No newline at end of file diff --git a/webapp/src/stories/assets/plugin.svg b/webapp/src/stories/assets/plugin.svg deleted file mode 100644 index 29e5c69..0000000 --- a/webapp/src/stories/assets/plugin.svg +++ /dev/null @@ -1 +0,0 @@ -illustration/plugin \ No newline at end of file diff --git a/webapp/src/stories/assets/repo.svg b/webapp/src/stories/assets/repo.svg deleted file mode 100644 index f386ee9..0000000 --- a/webapp/src/stories/assets/repo.svg +++ /dev/null @@ -1 +0,0 @@ -illustration/repo \ No newline at end of file diff --git a/webapp/src/stories/assets/stackalt.svg b/webapp/src/stories/assets/stackalt.svg deleted file mode 100644 index 9b7ad27..0000000 --- a/webapp/src/stories/assets/stackalt.svg +++ /dev/null @@ -1 +0,0 @@ -illustration/stackalt \ No newline at end of file diff --git a/webapp/src/stories/button.css b/webapp/src/stories/button.css deleted file mode 100644 index dc91dc7..0000000 --- a/webapp/src/stories/button.css +++ /dev/null @@ -1,30 +0,0 @@ -.storybook-button { - font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-weight: 700; - border: 0; - border-radius: 3em; - cursor: pointer; - display: inline-block; - line-height: 1; -} -.storybook-button--primary { - color: white; - background-color: #1ea7fd; -} -.storybook-button--secondary { - color: #333; - background-color: transparent; - box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 0px 1px inset; -} -.storybook-button--small { - font-size: 12px; - padding: 10px 16px; -} -.storybook-button--medium { - font-size: 14px; - padding: 11px 20px; -} -.storybook-button--large { - font-size: 16px; - padding: 12px 24px; -} diff --git a/webapp/src/stories/header.css b/webapp/src/stories/header.css deleted file mode 100644 index acadc9e..0000000 --- a/webapp/src/stories/header.css +++ /dev/null @@ -1,26 +0,0 @@ -.wrapper { - font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; - border-bottom: 1px solid rgba(0, 0, 0, 0.1); - padding: 15px 20px; - display: flex; - align-items: center; - justify-content: space-between; -} - -svg { - display: inline-block; - vertical-align: top; -} - -h1 { - font-weight: 900; - font-size: 20px; - line-height: 1; - margin: 6px 0 6px 10px; - display: inline-block; - vertical-align: top; -} - -button + button { - margin-left: 10px; -} diff --git a/webapp/src/stories/page.css b/webapp/src/stories/page.css deleted file mode 100644 index 51c9d09..0000000 --- a/webapp/src/stories/page.css +++ /dev/null @@ -1,69 +0,0 @@ -section { - font-family: 'Nunito Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-size: 14px; - line-height: 24px; - padding: 48px 20px; - margin: 0 auto; - max-width: 600px; - color: #333; -} - -h2 { - font-weight: 900; - font-size: 32px; - line-height: 1; - margin: 0 0 4px; - display: inline-block; - vertical-align: top; -} - -p { - margin: 1em 0; -} - -a { - text-decoration: none; - color: #1ea7fd; -} - -ul { - padding-left: 30px; - margin: 1em 0; -} - -li { - margin-bottom: 8px; -} - -.tip { - display: inline-block; - border-radius: 1em; - font-size: 11px; - line-height: 12px; - font-weight: 700; - background: #e7fdd8; - color: #66bf3c; - padding: 4px 12px; - margin-right: 10px; - vertical-align: top; -} - -.tip-wrapper { - font-size: 13px; - line-height: 20px; - margin-top: 40px; - margin-bottom: 40px; -} - -.tip-wrapper svg { - display: inline-block; - height: 12px; - width: 12px; - margin-right: 4px; - vertical-align: top; - margin-top: 3px; -} - -.tip-wrapper svg path { - fill: #1ea7fd; -} diff --git a/webapp/src/types/graphs.ts b/webapp/src/types/graphs.ts new file mode 100644 index 0000000..3880d45 --- /dev/null +++ b/webapp/src/types/graphs.ts @@ -0,0 +1,16 @@ +export type Point = [number, number]; +export interface Node { + loc: Point; + text: string; + color: 'red' | 'blue' | 'green'; +} +export interface Edge { + from: string; + to: string; + direction: '1->2' | '1<->2' | '1<-2'; +} +export type EdgeDirection = Edge['direction']; +export interface DAG { + nodes: Record; + edges: Array; +} diff --git a/webapp/src/utils/useWindowSize.ts b/webapp/src/utils/useWindowSize.ts new file mode 100644 index 0000000..8adabdd --- /dev/null +++ b/webapp/src/utils/useWindowSize.ts @@ -0,0 +1,42 @@ +import { useState, useEffect } from "react"; + +// Define general type for useWindowSize hook, which includes width and height +interface Size { + width: number; + height: number; + ratioWbh: number; +} + +// Hook +export default function useWindowSize(): Size { + // Initialize state with undefined width/height so server and client renders match + // Learn more here: https://joshwcomeau.com/react/the-perils-of-rehydration/ + const [windowSize, setWindowSize] = useState({ + width: window.innerWidth, + height: window.innerHeight, + ratioWbh: window.innerWidth / window.innerHeight, + }); + + useEffect(() => { + // Handler to call on window resize + function handleResize() { + // Set window width/height to state + setWindowSize({ + width: window.innerWidth, + height: window.innerHeight, + ratioWbh: window.innerWidth / window.innerHeight, + }); + } + + // Add event listener + window.addEventListener("resize", handleResize); + + // Call handler right away so state gets updated with initial window size + handleResize(); + + // Remove event listener on cleanup + return () => window.removeEventListener("resize", handleResize); + }, []); // Empty array ensures that effect is only run on mount + + return windowSize; +} \ No newline at end of file diff --git a/webapp/tsconfig.json b/webapp/tsconfig.json index a273b0c..9fdba87 100644 --- a/webapp/tsconfig.json +++ b/webapp/tsconfig.json @@ -1,26 +1,28 @@ { - "compilerOptions": { - "target": "es5", - "lib": [ - "dom", - "dom.iterable", - "esnext" - ], - "allowJs": true, - "skipLibCheck": true, - "esModuleInterop": true, - "allowSyntheticDefaultImports": true, - "strict": true, - "forceConsistentCasingInFileNames": true, - "noFallthroughCasesInSwitch": true, - "module": "esnext", - "moduleResolution": "node", - "resolveJsonModule": true, - "isolatedModules": true, - "noEmit": true, - "jsx": "react-jsx" - }, - "include": [ - "src" - ] + "compilerOptions": { + "target": "es5", + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], + "allowJs": true, + "skipLibCheck": true, + "esModuleInterop": true, + "allowSyntheticDefaultImports": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "noFallthroughCasesInSwitch": true, + "module": "esnext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "jsx": "react-jsx", + "rootDir": "./", + "baseUrl": "./src" + }, + "include": [ + "src" + ] } diff --git a/webapp/yarn.lock b/webapp/yarn.lock index bb59fba..b4d4597 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -2049,7 +2049,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.7.6", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.9.2": version "7.16.3" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ== @@ -2204,6 +2204,18 @@ dependencies: "@emotion/memoize" "0.7.4" +"@emotion/is-prop-valid@^0.7.3": + version "0.7.3" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.7.3.tgz#a6bf4fa5387cbba59d44e698a4680f481a8da6cc" + integrity sha512-uxJqm/sqwXw3YPA5GXX365OBcJGFtxUVkB6WyezqFHlNe9jqUWH5ur2O2M8dGBz61kn1g3ZBlzUunFQXQIClhA== + dependencies: + "@emotion/memoize" "0.7.1" + +"@emotion/memoize@0.7.1": + version "0.7.1" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.1.tgz#e93c13942592cf5ef01aa8297444dc192beee52f" + integrity sha512-Qv4LTqO11jepd5Qmlp3M1YEjBumoTHcHFdgPTQ+sFlIL5myi/7xu/POwP7IRu6odBdmLXdtIs1D6TuW6kbwbbg== + "@emotion/memoize@0.7.4": version "0.7.4" resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" @@ -3614,6 +3626,11 @@ resolved "https://registry.yarnpkg.com/@types/braces/-/braces-3.0.1.tgz#5a284d193cfc61abb2e5a50d36ebbc50d942a32b" integrity sha512-+euflG6ygo4bn0JHtn4pYqcXwRtLvElQ7/nnjDu7iYG56H0+OhCd7d6Ug0IE3WcFpZozBKW2+80FUbv5QGk5AQ== +"@types/chroma-js@^2.1.3": + version "2.1.3" + resolved "https://registry.yarnpkg.com/@types/chroma-js/-/chroma-js-2.1.3.tgz#0b03d737ff28fad10eb884e0c6cedd5ffdc4ba0a" + integrity sha512-1xGPhoSGY1CPmXLCBcjVZSQinFjL26vlR8ZqprsBWiFyED4JacJJ9zHhh5aaUXqbY9B37mKQ73nlydVAXmr1+g== + "@types/color-convert@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.0.tgz#8f5ee6b9e863dcbee5703f5a517ffb13d3ea4e22" @@ -5654,6 +5671,13 @@ chownr@^2.0.0: resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== +chroma-js@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-2.1.2.tgz#1075cb9ae25bcb2017c109394168b5cf3aa500ec" + integrity sha512-ri/ouYDWuxfus3UcaMxC1Tfp3IE9K5iQzxc2hSxbBRVNQFut1UuGAsZmiAf2mOUubzGJwgMSv9lHg+XqLaz1QQ== + dependencies: + cross-env "^6.0.3" + chrome-trace-event@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" @@ -6170,6 +6194,13 @@ create-react-context@0.3.0: gud "^1.0.0" warning "^4.0.3" +cross-env@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941" + integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag== + dependencies: + cross-spawn "^7.0.0" + cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -6240,6 +6271,15 @@ css-has-pseudo@^0.10.0: postcss "^7.0.6" postcss-selector-parser "^5.0.0-rc.4" +css-jss@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/css-jss/-/css-jss-10.8.2.tgz#a7c7c9d5ae0c5f8f1731769298fde1af957e7cba" + integrity sha512-KjsoKnBV4C9p+F+zW9jNXCai0UYU5K+3eyo+lJX/fY8UBEQd/yNREnHsLD1VMMzBwHRvrA8eQHvqmAL+XNLYcw== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.8.2" + jss-preset-default "10.8.2" + css-loader@4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.3.0.tgz#c888af64b2a5b2e85462c72c0f4a85c7e2e0821e" @@ -6315,6 +6355,14 @@ css-tree@^1.1.2: mdn-data "2.0.14" source-map "^0.6.1" +css-vendor@^2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d" + integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ== + dependencies: + "@babel/runtime" "^7.8.3" + is-in-browser "^1.0.2" + css-what@^3.2.1: version "3.4.2" resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" @@ -8573,7 +8621,7 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoist-non-react-statics@^3.3.0: +hoist-non-react-statics@^3.2.0, hoist-non-react-statics@^3.3.0: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -8782,6 +8830,11 @@ human-signals@^1.1.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== +hyphenate-style-name@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d" + integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== + iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -9243,6 +9296,11 @@ is-hexadecimal@^1.0.0: resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== +is-in-browser@^1.0.2, is-in-browser@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" + integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU= + is-map@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" @@ -10164,6 +10222,140 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" +jss-plugin-camel-case@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.8.2.tgz#8d7f915c8115afaff8cbde08faf610ec9892fba6" + integrity sha512-2INyxR+1UdNuKf4v9It3tNfPvf7IPrtkiwzofeKuMd5D58/dxDJVUQYRVg/n460rTlHUfsEQx43hDrcxi9dSPA== + dependencies: + "@babel/runtime" "^7.3.1" + hyphenate-style-name "^1.0.3" + jss "10.8.2" + +jss-plugin-compose@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-compose/-/jss-plugin-compose-10.8.2.tgz#1faf7687d96d8c329e01a138e4cdb30e440fb01b" + integrity sha512-X7fDQJ6IlIJoT8A3zc++LuC1hmSGKVudb3LyXp+vHv8r2hzzfXEEZty3y2CaC5CGrWcLlYquXENjqLNmLYMgMA== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.8.2" + tiny-warning "^1.0.2" + +jss-plugin-default-unit@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.8.2.tgz#c66f12e02e0815d911b85c02c2a979ee7b4ce69a" + integrity sha512-UZ7cwT9NFYSG+SEy7noRU50s4zifulFdjkUNKE+u6mW7vFP960+RglWjTgMfh79G6OENZmaYnjHV/gcKV4nSxg== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.8.2" + +jss-plugin-expand@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-expand/-/jss-plugin-expand-10.8.2.tgz#3f730d7b59107b3d6da421c6cfed071e1ee64afd" + integrity sha512-Iy4qsZbEcomXz5aBZJYGwnzK23vK3hqlwGleqmd19fY3L+WbqTmUnW8W0fWeXSuCkw2NknBTAJuEpFcgm3b0Pw== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.8.2" + +jss-plugin-extend@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-extend/-/jss-plugin-extend-10.8.2.tgz#90e9e9cc798a21d3df0368de26d2881fd5c4b841" + integrity sha512-NYu0cJ/Zb50ySPkegzbXQQfhXza0VpaRVXdXDex30yXqZpGcAdmhSg4HTv8vzHiL1v3uIOm641FYQX9WvLgSWw== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.8.2" + tiny-warning "^1.0.2" + +jss-plugin-global@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.8.2.tgz#1a35632a693cf50113bcc5ffe6b51969df79c4ec" + integrity sha512-UaYMSPsYZ7s/ECGoj4KoHC2jwQd5iQ7K+FFGnCAILdQrv7hPmvM2Ydg45ThT/sH46DqktCRV2SqjRuxeBH8nRA== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.8.2" + +jss-plugin-nested@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.8.2.tgz#79f3c7f75ea6a36ae72fe52e777035bb24d230c7" + integrity sha512-acRvuPJOb930fuYmhkJaa994EADpt8TxI63Iyg96C8FJ9T2xRyU5T6R1IYKRwUiqZo+2Sr7fdGzRTDD4uBZaMA== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.8.2" + tiny-warning "^1.0.2" + +jss-plugin-props-sort@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.8.2.tgz#e25a7471868652c394562b6dc5433dcaea7dff6f" + integrity sha512-wqdcjayKRWBZnNpLUrXvsWqh+5J5YToAQ+8HNBNw0kZxVvCDwzhK2Nx6AKs7p+5/MbAh2PLgNW5Ym/ysbVAuqQ== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.8.2" + +jss-plugin-rule-value-function@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.8.2.tgz#55354b55f1b2968a15976729968f767f02d64049" + integrity sha512-bW0EKAs+0HXpb6BKJhrn94IDdiWb0CnSluTkh0rGEgyzY/nmD1uV/Wf6KGlesGOZ9gmJzQy+9FFdxIUID1c9Ug== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.8.2" + tiny-warning "^1.0.2" + +jss-plugin-rule-value-observable@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-observable/-/jss-plugin-rule-value-observable-10.8.2.tgz#59c0516c3e6176566512eafeb698d45676046ba8" + integrity sha512-NaJCfsEg8/6l/E8HstwL2w8kHj2LHhwoG4fXxefmdvNKmJMwBpnjech5dEPL72It4bZfIIYoynWbyxo3Q0ZKQQ== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.8.2" + symbol-observable "^1.2.0" + +jss-plugin-template@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-template/-/jss-plugin-template-10.8.2.tgz#e3951a9fc8a6fb54dd0601483e237e6769789a37" + integrity sha512-oTVwYRUCuCLslHxuH73F15kFmDxc4YEJIn8kHBnNpGr99ZbQdRIgPabosVTfkgE8czuyTx0KM5u8zEeuL+v66A== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.8.2" + tiny-warning "^1.0.2" + +jss-plugin-vendor-prefixer@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.8.2.tgz#ebb4a482642f34091e454901e21176441dd5f475" + integrity sha512-DeGv18QsSiYLSVIEB2+l0af6OToUe0JB+trpzUxyqD2QRC/5AzzDrCrYffO5AHZ81QbffYvSN/pkfZaTWpRXlg== + dependencies: + "@babel/runtime" "^7.3.1" + css-vendor "^2.0.8" + jss "10.8.2" + +jss-preset-default@10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-preset-default/-/jss-preset-default-10.8.2.tgz#d2d275ac8469554f930f72fb3169dab88015721b" + integrity sha512-mgkr6DAZuvkEleHFEpOkm8Y+sTdK/r0HH8PxToLHgaWHbYS0JAb0g1tBSUMG24kFj98VOYLTllK1o0J4lWU/uw== + dependencies: + "@babel/runtime" "^7.3.1" + jss "10.8.2" + jss-plugin-camel-case "10.8.2" + jss-plugin-compose "10.8.2" + jss-plugin-default-unit "10.8.2" + jss-plugin-expand "10.8.2" + jss-plugin-extend "10.8.2" + jss-plugin-global "10.8.2" + jss-plugin-nested "10.8.2" + jss-plugin-props-sort "10.8.2" + jss-plugin-rule-value-function "10.8.2" + jss-plugin-rule-value-observable "10.8.2" + jss-plugin-template "10.8.2" + jss-plugin-vendor-prefixer "10.8.2" + +jss@10.8.2, jss@^10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss/-/jss-10.8.2.tgz#4b2a30b094b924629a64928236017a52c7c97505" + integrity sha512-FkoUNxI329CKQ9OQC8L72MBF9KPf5q8mIupAJ5twU7G7XREW7ahb+7jFfrjZ4iy1qvhx1HwIWUIvkZBDnKkEdQ== + dependencies: + "@babel/runtime" "^7.3.1" + csstype "^3.0.2" + is-in-browser "^1.1.3" + tiny-warning "^1.0.2" + "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82" @@ -12559,7 +12751,7 @@ prompts@^2.4.0: kleur "^3.0.3" sisteransi "^1.0.5" -prop-types@^15.0.0, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.0.0, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -12797,6 +12989,11 @@ react-dev-utils@^11.0.3: strip-ansi "6.0.0" text-table "0.2.0" +react-display-name@^0.2.4: + version "0.2.5" + resolved "https://registry.yarnpkg.com/react-display-name/-/react-display-name-0.2.5.tgz#304c7cbfb59ee40389d436e1a822c17fe27936c6" + integrity sha512-I+vcaK9t4+kypiSgaiVWAipqHRXYmZIuAiS8vzFvXHHXVigg/sMKwlRgLy6LH2i3rmP+0Vzfl5lFsFRwF1r3pg== + react-docgen-typescript-plugin@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-1.0.0.tgz#f3b13df1acf3126957c689c47cd8552d42734feb" @@ -12908,6 +13105,23 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== +react-jss@^10.8.2: + version "10.8.2" + resolved "https://registry.yarnpkg.com/react-jss/-/react-jss-10.8.2.tgz#b1bf1496daa47083b6073d1ef794f0645bec02c1" + integrity sha512-/lLFIv1H6GA5RkvNb7TdXcJMBaSvSpfmSYsDisj4WI7MmqXUouoKfkZUJzG7CWq8xnIxik0WWYjFcGOvx0Sasw== + dependencies: + "@babel/runtime" "^7.3.1" + "@emotion/is-prop-valid" "^0.7.3" + css-jss "10.8.2" + hoist-non-react-statics "^3.2.0" + is-in-browser "^1.1.3" + jss "10.8.2" + jss-preset-default "10.8.2" + prop-types "^15.6.0" + shallow-equal "^1.2.0" + theming "^3.3.0" + tiny-warning "^1.0.2" + react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" @@ -13836,6 +14050,11 @@ shallow-clone@^3.0.0: dependencies: kind-of "^6.0.2" +shallow-equal@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da" + integrity sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA== + shallowequal@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" @@ -14525,6 +14744,11 @@ svgo@^1.0.0, svgo@^1.2.2: unquote "~1.1.1" util.promisify "~1.0.0" +symbol-observable@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== + symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -14670,6 +14894,16 @@ text-table@0.2.0, text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= +theming@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/theming/-/theming-3.3.0.tgz#dacabf04aa689edde35f1e1c117ec6de73fbf870" + integrity sha512-u6l4qTJRDaWZsqa8JugaNt7Xd8PPl9+gonZaIe28vAhqgHMIG/DOyFPqiKN/gQLQYj05tHv+YQdNILL4zoiAVA== + dependencies: + hoist-non-react-statics "^3.3.0" + prop-types "^15.5.8" + react-display-name "^0.2.4" + tiny-warning "^1.0.2" + throat@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" @@ -14705,6 +14939,11 @@ timsort@^0.3.0: resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= +tiny-warning@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" + integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== + tmpl@1.0.x: version "1.0.4" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"