From 28fbdf16982393a584018d092eb6131b5c60c78c Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 14 Jan 2022 11:31:55 -0500 Subject: [PATCH] adjusted scrollbar for dag in all possible modes removed pages --- .../AutomationEditor/AutoInfoBox.stories.tsx | 4 +- .../AutomationEditor/index.stories.tsx | 4 +- .../AutomationList/AutomationList.stories.tsx | 4 +- .../ConnectedAutomationList.stories.tsx | 4 +- .../src/components/AutomationList/index.tsx | 1 - .../src/components/AutomationList/styles.css | 4 +- .../ConditionEditor.stories.tsx | 4 +- .../ConditionEditor/index.stories.tsx | 6 +-- webapp/src/components/DAGSvgs/Board.css | 32 ------------- webapp/src/components/DAGSvgs/Board.tsx | 7 +-- .../components/DAGSvgs/DAGBoard.stories.tsx | 15 ++++-- webapp/src/components/DAGSvgs/DAGBoard.tsx | 2 +- webapp/src/components/Icons/index.stories.tsx | 10 ++-- .../components/Inputs/InputList.stories.tsx | 6 +-- .../components/Inputs/InputNumber.stories.tsx | 10 ++-- .../components/Inputs/InputText.stories.tsx | 6 +-- .../Inputs/InputTextArea.stories.tsx | 6 +-- .../Inputs/InputTextBubble.stories.tsx | 14 +++--- .../components/Inputs/InputYaml.stories.tsx | 6 +-- .../MultiNodeEditors/index.stories.tsx | 9 ++-- .../components/NodeEditor/index.stories.tsx | 10 ++-- webapp/src/routes/automation.tsx | 6 +-- webapp/src/styles/page.css | 18 ++++++++ webapp/src/styles/page.ts | 46 ------------------- webapp/src/styles/root.css | 12 ++--- webapp/src/styles/theme.ts | 1 + 26 files changed, 92 insertions(+), 155 deletions(-) delete mode 100644 webapp/src/components/DAGSvgs/Board.css create mode 100644 webapp/src/styles/page.css delete mode 100644 webapp/src/styles/page.ts diff --git a/webapp/src/components/AutomationEditor/AutoInfoBox.stories.tsx b/webapp/src/components/AutomationEditor/AutoInfoBox.stories.tsx index a8d8b88..247e03d 100644 --- a/webapp/src/components/AutomationEditor/AutoInfoBox.stories.tsx +++ b/webapp/src/components/AutomationEditor/AutoInfoBox.stories.tsx @@ -1,6 +1,5 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { useState } from "react"; -import { usePageTheme } from "styles/page"; import { AutoInfoBox } from "./AutoInfoBox"; export default { @@ -11,10 +10,9 @@ export default { export const Basic: ComponentStory = args => { - const { classes } = usePageTheme({}); const [state, setState] = useState(args.metadata) return ( -
+
= args => { const [state, setState] = useState(args.automation) - const { classes } = usePageTheme({}); - return
+ return
= args => { - const { classes } = usePageTheme({}); const [autos, setAutos] = useState(args.automations) - return
+ return
{ args.onAdd(a); diff --git a/webapp/src/components/AutomationList/ConnectedAutomationList.stories.tsx b/webapp/src/components/AutomationList/ConnectedAutomationList.stories.tsx index ced6a11..6aae644 100644 --- a/webapp/src/components/AutomationList/ConnectedAutomationList.stories.tsx +++ b/webapp/src/components/AutomationList/ConnectedAutomationList.stories.tsx @@ -1,5 +1,4 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; -import { usePageTheme } from "styles/page"; import { ConnectedAutmationList } from "."; import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE, DISTANCE_FACTOR } from 'components/DAGSvgs/constants'; import { createMockAuto } from "utils/mocks"; @@ -24,9 +23,8 @@ export default { const Template: ComponentStory = args => { - const { classes } = usePageTheme({}); const api = useMockApiService(args.initialAutomations); - return
+ return
= args => { - const { classes } = usePageTheme({}); const [state, setState] = useState({ "$smType": "condition", "condition": "or", @@ -58,7 +56,7 @@ export const Basic: ComponentStory = args => { } }) return ( -
+
{ }} diff --git a/webapp/src/components/ConditionEditor/index.stories.tsx b/webapp/src/components/ConditionEditor/index.stories.tsx index 35fa9f2..a174bfd 100644 --- a/webapp/src/components/ConditionEditor/index.stories.tsx +++ b/webapp/src/components/ConditionEditor/index.stories.tsx @@ -1,7 +1,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { useState } from "react"; import { AutomationCondition } from "types/automations/conditions"; -import { usePageTheme } from "styles/page"; + import { ConditionEditor } from "."; export default { @@ -12,9 +12,9 @@ export default { const Template: ComponentStory = ({ condition, ...args }) => { - const { classes } = usePageTheme({}); + const [data, setData] = useState(condition); - return
+ return
{ diff --git a/webapp/src/components/DAGSvgs/Board.css b/webapp/src/components/DAGSvgs/Board.css deleted file mode 100644 index 3cbbfdd..0000000 --- a/webapp/src/components/DAGSvgs/Board.css +++ /dev/null @@ -1,32 +0,0 @@ -.board-btn { - position: absolute; -} -.board-btn:hover { - background: #5e44444f; - cursor: pointer; -} -.board-btn.right { - right: 0; - top: 0; - height: 100%; - width: 5%; -} -.board-btn.left { - left: 0; - top: 0; - height: 100%; - width: 5%; -} -.board-btn.top { - left: 0; - top: 0; - height: 5%; - width: 100%; -} - -.board-btn.bottom { - left: 0; - bottom: 0; - height: 5%; - width: 100%; -} diff --git a/webapp/src/components/DAGSvgs/Board.tsx b/webapp/src/components/DAGSvgs/Board.tsx index dc89d51..e7037dd 100644 --- a/webapp/src/components/DAGSvgs/Board.tsx +++ b/webapp/src/components/DAGSvgs/Board.tsx @@ -1,4 +1,3 @@ -import "./Board.css"; import { FC } from 'react'; import useWindowSize from "utils/useWindowSize"; import { useBoardStyles } from "./styles"; @@ -29,12 +28,10 @@ export const SVGBoard: FC<{ ); const { classes, theme } = useBoardStyles({ boardHeight: Math.max(nodeHeight, graphHeight) * zoomLevel, - boardWidth: Math.max(5 * nodeWidth, graphWidth) * zoomLevel, + boardWidth: Math.max(4 * nodeWidth, graphWidth) * zoomLevel, }); - - // render - return
+ return
, extras: DAGElement[]): Generator = args => +export const Simple: ComponentStory = args => { + + return
+ +
+} Simple.args = { ...Simple.args, elements: makeDummyData( @@ -94,7 +98,12 @@ Simple.args = { } -export const Complex: ComponentStory = args => +export const Complex: ComponentStory = args => { + + return
+ +
+} Complex.args = { ...Complex.args, elements: makeDummyData( diff --git a/webapp/src/components/DAGSvgs/DAGBoard.tsx b/webapp/src/components/DAGSvgs/DAGBoard.tsx index 86bb2db..88d8753 100644 --- a/webapp/src/components/DAGSvgs/DAGBoard.tsx +++ b/webapp/src/components/DAGSvgs/DAGBoard.tsx @@ -194,7 +194,7 @@ export const DAGBoard: FC = props => { ]; return = (args) => { - const { classes } = usePageTheme({}); - return
+ + return
@@ -28,8 +28,8 @@ IconList.args = { export const ButtonIconExample: ComponentStory = (args) => { - const { classes } = usePageTheme({}); - return
+ + return
{ArrowIcon}
} diff --git a/webapp/src/components/Inputs/InputList.stories.tsx b/webapp/src/components/Inputs/InputList.stories.tsx index 9bdc7a4..5c8c8d5 100644 --- a/webapp/src/components/Inputs/InputList.stories.tsx +++ b/webapp/src/components/Inputs/InputList.stories.tsx @@ -1,6 +1,6 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { useState } from "react"; -import { usePageTheme } from "styles/page"; + import InputList from "./InputList"; export default { @@ -11,9 +11,9 @@ export default { const Template: ComponentStory = args => { - const { classes } = usePageTheme({}); + const [value, setValue] = useState('') - return
+ return
} diff --git a/webapp/src/components/Inputs/InputNumber.stories.tsx b/webapp/src/components/Inputs/InputNumber.stories.tsx index 0d48330..852b3ab 100644 --- a/webapp/src/components/Inputs/InputNumber.stories.tsx +++ b/webapp/src/components/Inputs/InputNumber.stories.tsx @@ -1,6 +1,6 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { useState } from "react"; -import { usePageTheme } from "styles/page"; + import InputNumber from "./InputNumber"; export default { @@ -16,16 +16,16 @@ export default { export const NullStart: ComponentStory = args => { - const { classes } = usePageTheme({}); + const [value, setValue] = useState(undefined) - return
+ return
} export const SomeStuffAtStart: ComponentStory = args => { - const { classes } = usePageTheme({}); + const [value, setValue] = useState(10) - return
+ return
} diff --git a/webapp/src/components/Inputs/InputText.stories.tsx b/webapp/src/components/Inputs/InputText.stories.tsx index 1888afd..3fa0209 100644 --- a/webapp/src/components/Inputs/InputText.stories.tsx +++ b/webapp/src/components/Inputs/InputText.stories.tsx @@ -1,6 +1,6 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { useState } from "react"; -import { usePageTheme } from "styles/page"; + import InputText from "./InputText"; export default { @@ -11,9 +11,9 @@ export default { const Template: ComponentStory = args => { - const { classes } = usePageTheme({}); + const [value, setValue] = useState('') - return
+ return
} diff --git a/webapp/src/components/Inputs/InputTextArea.stories.tsx b/webapp/src/components/Inputs/InputTextArea.stories.tsx index 0b75a26..0ffc06f 100644 --- a/webapp/src/components/Inputs/InputTextArea.stories.tsx +++ b/webapp/src/components/Inputs/InputTextArea.stories.tsx @@ -1,6 +1,6 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { useState } from "react"; -import { usePageTheme } from "styles/page"; + import InputTextArea from "./InputTextArea"; export default { @@ -11,9 +11,9 @@ export default { const Template: ComponentStory = args => { - const { classes } = usePageTheme({}); + const [value, setValue] = useState('') - return
+ return
} diff --git a/webapp/src/components/Inputs/InputTextBubble.stories.tsx b/webapp/src/components/Inputs/InputTextBubble.stories.tsx index 5a2792d..d1b7f1f 100644 --- a/webapp/src/components/Inputs/InputTextBubble.stories.tsx +++ b/webapp/src/components/Inputs/InputTextBubble.stories.tsx @@ -1,6 +1,6 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { useState } from "react"; -import { usePageTheme } from "styles/page"; + import InputTextBubble, { InputEntity } from "./InputTextBubble"; export default { @@ -16,9 +16,9 @@ export default { export const ArrayText: ComponentStory = args => { - const { classes } = usePageTheme({}); + const [value, setValue] = useState(['wow', 'lots of bubbles', 'itchen', 'bathroom']) - return
+ return
@@ -26,18 +26,18 @@ export const ArrayText: ComponentStory = args => { } export const JustText: ComponentStory = args => { - const { classes } = usePageTheme({}); + const [value, setValue] = useState('hello') - return
+ return
} export const EntityId: ComponentStory = args => { - const { classes } = usePageTheme({}); + const [value, setValue] = useState(['sensor.bathroom']) - return
+ return
} diff --git a/webapp/src/components/Inputs/InputYaml.stories.tsx b/webapp/src/components/Inputs/InputYaml.stories.tsx index 57a50ff..3a8e07c 100644 --- a/webapp/src/components/Inputs/InputYaml.stories.tsx +++ b/webapp/src/components/Inputs/InputYaml.stories.tsx @@ -1,6 +1,6 @@ import { ComponentMeta, ComponentStory } from "@storybook/react"; import { useState } from "react"; -import { usePageTheme } from "styles/page"; + import InputYaml from "./InputYaml"; export default { @@ -11,11 +11,11 @@ export default { const Template: ComponentStory = args => { - const { classes } = usePageTheme({}); + const [value, setValue] = useState({ "test": "data" }) - return
+ return
} diff --git a/webapp/src/components/MultiNodeEditors/index.stories.tsx b/webapp/src/components/MultiNodeEditors/index.stories.tsx index 65f9cc4..e87c929 100644 --- a/webapp/src/components/MultiNodeEditors/index.stories.tsx +++ b/webapp/src/components/MultiNodeEditors/index.stories.tsx @@ -1,7 +1,6 @@ import React, { useState } from "react"; import { ComponentMeta, ComponentStory } from '@storybook/react'; import { MultiNodeEditor } from "."; -import { usePageTheme } from 'styles/page'; import { Button } from "components/Inputs/Button"; import { Modal } from "components/Modal"; @@ -35,16 +34,16 @@ export default { } as ComponentMeta export const Simple: ComponentStory = args => { - const { classes } = usePageTheme({}); - return
+ + return
} export const InAModal: ComponentStory = props => { - const { classes } = usePageTheme({}); + const [open, setOpen] = useState(false); const [state, setState] = useState(props.sequence); - return
+ return
const Base: ComponentStory = props => { - const { classes } = usePageTheme({}); - return
+ + return
}; @@ -70,9 +70,9 @@ Condition.args = { export const InAModal: ComponentStory = props => { - const { classes } = usePageTheme({}); + const [open, setOpen] = useState(false); - return
+ return
setOpen(!open)} /> diff --git a/webapp/src/routes/automation.tsx b/webapp/src/routes/automation.tsx index 10d0c84..898cff3 100644 --- a/webapp/src/routes/automation.tsx +++ b/webapp/src/routes/automation.tsx @@ -2,16 +2,16 @@ import { ApiService } from 'apiService/core'; import { ConnectedAutmationList } from "components/AutomationList"; import { DEFAULT_DIMS } from "components/DAGSvgs/constants"; import { FC } from "react"; -import { usePageTheme } from "styles/page"; + export const AutomationRoute: FC<{ api: ApiService }> = ({ api }) => { - const { classes } = usePageTheme({}); - return
+ + return
({ - page: { - // dims - height: '100vh', - width: '100vw', - margin: 0, - padding: 0, - overflow: 'auto', - maxWidth: '100vw', - maxHeight: '100vh', - - // font - fontSize: '16px', - fontFamily: 'Tahoma, Geneva, sans-serif', - color: theme.primaryAccent, - - // background - backgroundColor: theme.primary, - - // children - display: 'flex', - flexDirection: 'column', - justifyContent: 'flex-start', - alignItems: 'center', - - '> div': { - flex: 1, - }, - - // scroll - '&::-webkit-scrollbar': { - width: '10px' - }, - '&::-webkit-scrollbar-track': { - background: theme.secondary, - }, - '&::-webkit-scrollbar-thumb': { - background: theme.secondaryAccent, - }, - '&::-webkit-scrollbar-thumb:hover': { - background: theme.primaryAccent, - }, - } -})) \ No newline at end of file diff --git a/webapp/src/styles/root.css b/webapp/src/styles/root.css index e5992ac..854d2e8 100644 --- a/webapp/src/styles/root.css +++ b/webapp/src/styles/root.css @@ -1,10 +1,10 @@ :root { - --primary : #111111; - --secondary : #1c1c1c; - --primaryAccent : #bbbbbb; - --secondaryAccent: #929191; - touch-action : pan-x pan-y; - height : 100%; + --primary : #111111; + --secondary : #1c1c1c; + --primary-accent : #bbbbbb; + --secondary-accent: #929191; + touch-action : pan-x pan-y; + height : 100%; } diff --git a/webapp/src/styles/theme.ts b/webapp/src/styles/theme.ts index 8b3acfd..959e72e 100644 --- a/webapp/src/styles/theme.ts +++ b/webapp/src/styles/theme.ts @@ -1,4 +1,5 @@ import "styles/root.css"; +import "styles/page.css"; import { Classes } from "jss"; import { Context, createContext } from "react"