This commit is contained in:
ari committed 2021-12-28 21:53:41 -05:00
1 parent 9d8cc9ed3e
commit 8058e314db
27 files changed
+87608 -11878

No files matched your search

+11 -10
View File
@@ -1,11 +1,12 @@
module.exports = {
"stories": [
"../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx)"
],
"addons": [
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/preset-create-react-app"
]
}
"stories": [
"../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx)"
],
"addons": [
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/preset-create-react-app",
"@storybook/addon-queryparams",
]
}
+74865
View File
File diff suppressed because it is too large. Load diff
+4 -1
View File
@@ -15,6 +15,7 @@
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-jss": "^10.8.2",
"react-router-dom": "6",
"react-scripts": "4.0.3",
"theming": "^3.3.0",
"typescript": "^4.1.2",
@@ -60,9 +61,11 @@
"@storybook/addon-actions": "^6.3.12",
"@storybook/addon-essentials": "^6.3.12",
"@storybook/addon-links": "^6.3.12",
"@storybook/addon-queryparams": "^6.2.9",
"@storybook/node-logger": "^6.3.12",
"@storybook/preset-create-react-app": "^3.2.0",
"@storybook/react": "^6.3.12",
"@types/chroma-js": "^2.1.3"
"@types/chroma-js": "^2.1.3",
"@types/js-yaml": "^4.0.5"
}
}
-38
View File
@@ -1,38 +0,0 @@
.App {
text-align: center;
}
.App-logo {
height: 40vmin;
pointer-events: none;
}
@media (prefers-reduced-motion: no-preference) {
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
}
.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}
.App-link {
color: #61dafb;
}
@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
+3 -2
View File
@@ -1,11 +1,12 @@
import React from "react";
import App from "./App";
import { withQuery } from "@storybook/addon-queryparams";
const book = {
title: "App/App",
decorators: [withQuery],
component: App
};
export const Basic = () => <App/>
export const Basic = () => <App />
export default book;
-9
View File
@@ -1,9 +0,0 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import App from './App';
test('renders learn react link', () => {
render(<App />);
const linkElement = screen.getByText(/learn react/i);
expect(linkElement).toBeInTheDocument();
});
+8 -17
View File
@@ -1,24 +1,15 @@
import React from 'react';
import logo from './logo.svg';
import './App.css';
import { Routes, Route, BrowserRouter } from "react-router-dom";
import { AutomationRoute } from 'routes/automation';
function App() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<p>
Edit <code>src/App.tsx</code> and save to reload.
</p>
<a
className="App-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
Learn React
</a>
</header>
<div className="app">
<BrowserRouter>
<Routes>
<Route path="*" element={<AutomationRoute />} />
</Routes>
</BrowserRouter>
</div>
);
}
@@ -7,6 +7,7 @@ import { DAGBoardElmDims } from 'components/DAGSvgs/DAGBoard';
import { defaultAutomation } from '../../utils/defaults';
import { ArrowIcon, TrashIcon } from "components/Icons";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { useSearchParams } from "react-router-dom";
interface Props {
@@ -25,9 +26,12 @@ export const AutomationList: FC<Props> = ({
dims,
}) => {
// state
const [current, setCurrent] = useState(0);
const [searchParams, setSearchParams] = useSearchParams();
// const [current, setCurrent] = useState(0);
const [hideList, setHideList] = useState(false);
// alias
const current = Number(searchParams.get("current") ?? "0");
const setCurrent = (i: number) => setSearchParams({ current: String(i) });
const currentAuto = automations.length > 0 ? automations[current] : null;
const automationListListCls = "automation-list--list" + (hideList ? " hide" : " show")
// render
@@ -1,7 +1,10 @@
import { AutomationCondition, LogicCondition } from "types/automations/conditions";
export const genUpdateMethods = (condition: LogicCondition, onChange: (c: LogicCondition) => void) => (i: number) => ({
export const genUpdateMethods = (
condition: LogicCondition,
onChange: (c: LogicCondition) => void
) => (i: number) => ({
onUpdate: (update: AutomationCondition) => onChange({
...condition,
condition_data: {
@@ -24,26 +27,8 @@ export const genUpdateMethods = (condition: LogicCondition, onChange: (c: LogicC
)
}
})
} else {
const data = (c as LogicCondition).condition_data;
const update = {
...condition.condition_data,
conditions: [
...condition.condition_data.conditions.slice(0, i),
{
...c,
condition_data: {
...data,
conditions: data.conditions.slice(0, which).concat(data.conditions.concat(which+1))
}
},
...condition.condition_data.conditions.slice(i+1)
]
}
onChange({
...condition,
condition_data: update as any
})
} else {
throw new Error("Not Implemented")
}
}
})
+106 -102
View File
@@ -2,6 +2,8 @@ import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { DAGBoard, DAGElement, DAGNodeElm } from "./DAGBoard";
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, DISTANCE_FACTOR, CIRCLE_SIZE } from './constants';
import { AutomationAction } from 'types/automations/actions';
import { arrayToIter } from "utils/iter";
export default {
@@ -26,124 +28,126 @@ export default {
const nodeFromPoint = ([x, y, add = true]: any): DAGNodeElm => ({
type: 'node',
key: `${x},${y}`,
loc: [x, y],
onRemove() { },
onAdd: add ? () => { } : undefined,
node: {
$smType: 'action',
node: ({
alias: `${x},${y}`,
action: 'template',
action_data: {
value_template: ""
"$smType": "action",
"action": "wait",
"action_data": {
"wait_template": "",
}
} as AutomationAction)
});
function* makeDummyData(pts: Array<any>, extras: DAGElement[]): Generator<DAGElement> {
for (const p of pts) {
yield nodeFromPoint(p);
};
for (const e of extras) {
yield e;
}
})
}
export const Simple: ComponentStory<typeof DAGBoard> = args => <DAGBoard {...args} />
Simple.args = {
...Simple.args,
elements: [
[0, 0, false],
[1, 0, false],
[2, 1, false],
].map<DAGElement>(nodeFromPoint).concat([
{
type: 'edge',
key: 'e1',
p1: [0, 0],
p2: [1, 0],
direction: '1->2'
},
{
type: 'edge',
key: 'e2',
p1: [2, 1],
p2: [2, 3],
direction: '1->2'
},
{
type: 'circle',
key: 'c1',
loc: [2, 3]
},
{
type: 'edge',
key: 'e2',
p1: [2, 1],
p2: [2, 2],
direction: '1->2'
},
{
type: 'circle',
key: 'c1',
loc: [2, 2],
onClick: () => { }
}
])
elements: makeDummyData(
[
[0, 0, false],
[1, 0, false],
[2, 1, false],
],
[
{
type: 'edge',
p1: [0, 0],
p2: [1, 0],
direction: '1->2'
},
{
type: 'edge',
p1: [2, 1],
p2: [2, 3],
direction: '1->2'
},
{
type: 'circle',
icon: 'blank',
loc: [2, 3]
},
{
type: 'edge',
p1: [2, 1],
p2: [2, 2],
direction: '1->2'
},
{
type: 'circle',
loc: [2, 2],
icon: 'color',
color: 'red',
}
])
}
export const Complex: ComponentStory<typeof DAGBoard> = args => <DAGBoard {...args} />
Complex.args = {
...Complex.args,
elements: [
[0, 0, false],
[1, 0, false],
[2, 1, false],
[4, 1],
[3, 2],
[2, 3],
[5, 0, false],
[6, 0],
[0, 6],
].map<DAGElement>(nodeFromPoint).concat([
{
type: 'edge',
key: 'e1',
p1: [0, 0],
p2: [1, 0],
direction: '1->2'
},
{
type: 'edge',
key: 'e2',
p1: [2, 1],
p2: [4, 1],
direction: '1->2',
},
{
type: 'edge',
key: 'e3',
p1: [1, 0],
p2: [2, 1],
direction: '1->2',
toChild: true,
},
{
type: 'edge',
key: 'e4',
p1: [2, 1],
p2: [3, 2],
direction: '1->2',
toChild: true,
},
{
type: 'edge',
key: 'e5',
p1: [1, 0],
p2: [2, 3],
direction: '1->2',
toChild: true,
},
{
type: 'edge',
key: 'e6',
p1: [1, 0],
p2: [5, 0],
direction: '1->2'
},
])
elements: makeDummyData(
[
[0, 0, false],
[1, 0, false],
[2, 1, false],
[4, 1],
[3, 2],
[2, 3],
[5, 0, false],
[6, 0],
[0, 6],
],
[
{
type: 'edge',
p1: [0, 0],
p2: [1, 0],
direction: '1->2'
},
{
type: 'edge',
p1: [2, 1],
p2: [4, 1],
direction: '1->2',
},
{
type: 'edge',
p1: [1, 0],
p2: [2, 1],
direction: '1->2',
},
{
type: 'edge',
p1: [2, 1],
p2: [3, 2],
direction: '1->2',
},
{
type: 'edge',
p1: [1, 0],
p2: [2, 3],
direction: '1->2',
},
{
type: 'edge',
p1: [1, 0],
p2: [5, 0],
direction: '1->2'
},
]
)
}
+1 -1
View File
@@ -65,7 +65,7 @@ export interface DAGBoardElmDims {
}
export interface Props {
elements: Generator<DAGElement>;
elements: Generator<DAGElement> | Array<DAGElement>;
settings: DAGBoardSettings;
}
@@ -1,3 +1,4 @@
import { DAGBoardElmDims } from 'components/DAGSvgs/DAGBoard';
@@ -7,3 +8,12 @@ export const ADD_HEIGHT = 10 as const;
export const ADD_WIDTH = 10 as const;
export const CIRCLE_SIZE = 30 as const;
export const DISTANCE_FACTOR = 1.5 as const;
export const DEFAULT_DIMS: DAGBoardElmDims = {
nodeHeight: NODE_HEIGHT,
nodeWidth: NODE_WIDTH,
addHeight: ADD_HEIGHT,
addWidth: ADD_WIDTH,
circleSize: CIRCLE_SIZE,
distanceFactor: DISTANCE_FACTOR,
};
+14 -19
View File
@@ -1,26 +1,21 @@
import InputWrapper from "./InputWrapper";
export interface Props {
label: string;
value: boolean;
onChange: (v: boolean) => void;
label: string;
value: boolean;
onChange: (v: boolean) => void;
}
export default function InputBoolean({
label,
value=false,
onChange,
label,
value = false,
onChange,
}: Props) {
return <InputWrapper label={label} style={{
flexDirection: 'row',
justifyContent: 'space-between',
marginTop: '3%',
marginBottom: '3%'
return <InputWrapper label={label}>
<span className="checkbox" onClick={e => {
e.preventDefault()
onChange(!value)
}}>
<span className="checkbox" onClick={e => {
e.preventDefault()
onChange(!value)
}}>
{value ? '✔️' : ' '}
</span>
</InputWrapper>
}
{value ? '✔️' : ' '}
</span>
</InputWrapper>
}
@@ -1,8 +1,6 @@
import { FC, useState } from "react";
import { useToolTip } from "tooltip/context";
import InputText from "./InputText";
import InputWrapper from "./InputWrapper";
import { useInputBubblesStyles, useInputTextStyles } from "./styles";
import { useInputBubblesStyles } from "./styles";
export interface Props {
label: string;
+12 -11
View File
@@ -1,16 +1,17 @@
import { PropsWithChildren } from "react";
import { FC } from "react";
import { useInputWrapperStyles } from "./styles";
export interface Props {
label: string;
labelSize?: 'normal' | 'small';
noMargin?: boolean;
label: string;
labelSize?: 'normal' | 'small';
noMargin?: boolean;
}
export default function InputWrapper({label, children, labelSize='normal', noMargin=false}: PropsWithChildren<Props>) {
const {classes} = useInputWrapperStyles({labelSize, noMargin})
return <div className={classes.wrapper}>
<label className={classes.label}>{label}</label>
{children}
</div>
}
const InputWrapper: FC<Props> = ({ label, children, labelSize = 'normal', noMargin = false }) => {
const { classes } = useInputWrapperStyles({ labelSize, noMargin })
return <div className={classes.wrapper}>
<label className={classes.label}>{label}</label>
{children}
</div>
}
export default InputWrapper;
+29 -30
View File
@@ -1,39 +1,38 @@
import InputWrapper from "./InputWrapper";
import * as yaml from "js-yaml";
import { useEffect, useRef, useState } from "react";
import InputTextArea from "./InputTextArea";
export interface Props<T extends {}> {
label: string;
value: T;
onChange: (v: T) => void;
resizable?: boolean;
label: string;
value: T;
onChange: (v: T) => void;
resizable?: boolean;
}
export default function InputYaml<T>({
label,
value={} as any,
onChange,
resizable,
label,
value = {} as any,
onChange,
resizable,
}: Props<T>) {
const [text, setText] = useState("");
useEffect(() => {
setText(yaml.dump(value));
}, [value]);
const delayId = useRef<null | number>(null);
const delayedUpdate = (update: string) => {
setText(update)
if (delayId.current) {
window.clearTimeout(delayId.current);
delayId.current = null;
}
delayId.current = window.setTimeout(() => {
onChange(yaml.load(update) as any)
}, 1000);
const [text, setText] = useState("");
useEffect(() => {
setText(yaml.dump(value));
}, [value]);
const delayId = useRef<null | number>(null);
const delayedUpdate = (update: string) => {
setText(update)
if (delayId.current) {
window.clearTimeout(delayId.current);
delayId.current = null;
}
return <InputTextArea
label={label}
value={text}
onChange={delayedUpdate}
resizable={resizable}
/>
}
delayId.current = window.setTimeout(() => {
onChange(yaml.load(update) as any)
}, 1000);
}
return <InputTextArea
label={label}
value={text}
onChange={delayedUpdate}
resizable={resizable}
/>
}
@@ -1,4 +1,3 @@
import InputYaml from "components/Inputs/InputYaml";
import InputText from "components/Inputs/InputText";
import { ChooseAction } from "types/automations/actions";
import { OptionManager, updateActionData } from './OptionManager';
@@ -1,4 +1,4 @@
import { useEffect, useState } from 'react';
import { useState } from 'react';
import { AutomationNode, AutomationNodeTypes } from 'types/automations';
import { AutomationNodeSubtype } from 'types/automations';
import { getOptionManager } from './getOptionManager';
@@ -206,7 +206,7 @@ Multinode.args = {
entity_id: "light.kitchen"
}
}
}
} as any
]
}
-13
View File
@@ -1,13 +0,0 @@
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}
+1 -1
View File
@@ -1,6 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import './styles/root.css';
import App from './App';
import reportWebVitals from './reportWebVitals';
-1
View File
@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.6 KiB

+32
View File
@@ -0,0 +1,32 @@
import { AutomationList } from "components/AutomationList";
import { DEFAULT_DIMS } from "components/DAGSvgs/constants";
import { FC, useState } from "react";
import { useSearchParams } from "react-router-dom";
import { usePageTheme } from "styles/page";
import { AutomationData } from "types/automations";
export const AutomationRoute: FC = () => {
const { classes } = usePageTheme({});
const [searchParams, setSearchParams] = useSearchParams();
console.log(searchParams);
const [automations, setAutos] = useState<AutomationData[]>([]);
return <div className={classes.page}>
<AutomationList
dims={DEFAULT_DIMS}
automations={automations}
onUpdate={(i, auto) => setAutos([
...automations.slice(0, i),
auto,
...automations.slice(i + 1)
])}
onAdd={auto => setAutos([...automations, auto])}
onRemove={i => setAutos([
...automations.slice(0, i),
...automations.slice(i + 1)
])}
/>
</div>
}
+2 -2
View File
@@ -22,7 +22,7 @@ export const {
}));
export type GetThemeType<C extends Context<any>> = C extends Context<infer T> ? T : unknown;
export type ClassNamesOfStyle<F extends Function> = Record<keyof ReturnType<F>, string>;
export type ClassNamesOfStyle<F extends (...args: any) => any> = Record<keyof ReturnType<F>, string>;
export type AppTheme = GetThemeType<typeof ThemeContext>;
export const createAppUseStyles = <
Props extends {} = {},
@@ -32,7 +32,7 @@ export const createAppUseStyles = <
theme: AppTheme,
} => {
const theme = useTheme();
const useStyles = createUseStyles<C,Props,AppTheme>(f)
const useStyles = createUseStyles<C,Props,AppTheme>(f as any)
const classes = useStyles({...props, theme}) as Classes<keyof Styles<C, Props, AppTheme>>;
return {classes, theme};
}
+1 -1
View File
@@ -32,5 +32,5 @@ export type AutomationNodeSubtype<T extends AutomationNodeTypes = any> =
T extends undefined ? TriggerType :
T extends 'trigger' ? TriggerType :
T extends 'action' ? ActionType :
T extends 'condtion' ? ConditionType :
T extends 'condition' ? ConditionType :
never;
+6
View File
@@ -23,3 +23,9 @@ export function* chain<T>(genArray: Generator<T>[]): Generator<T> {
yield * gen
}
}
export function* arrayToIter<T>(arr: T[]): Generator<T> {
for (const e of arr) {
yield e
}
}
+12489 -11592
View File
File diff suppressed because it is too large. Load diff