diff --git a/README.md b/README.md index 5ecff80..7fa3b5c 100644 --- a/README.md +++ b/README.md @@ -15,34 +15,6 @@ Run `npm ci` Run `npm run dev` -## Testing the API - -This program fetch the data structure from others application, allowing it to assemble them later. - -### With NodeJS - -```bash -node run ./test-server/node-http.js -``` - -The web server will be running at `http://localhost:5000` - -Configure the file `.env.development` with the url - - -### With bun - -Install `bun` - -Inside `test-server` folder, run : - -```bash -bun run http.js -``` - -The web server will be running at `http://localhost:5000` - -Configure the file `.env.development` with the url # Deploy @@ -57,3 +29,39 @@ Run `npm run build` Run `npm ci` Run `npm test` + + +# API + +You can preload a state by setting the `state` URL parameter +with a url address to a `state.json` file. + +Example: `http://localhost:4000/?state=http://localhost:5000/state.json` + +# Testing the external API + +This program fetch the data structure from others applications, allowing it to assemble them later. + +## With NodeJS + +```bash +node run ./test-server/node-http.js +``` + +The web server will be running at `http://localhost:5000` + +Configure the file `.env.development` with the url + +## With bun.sh + +Install `bun` + +Inside `test-server` folder, run : + +```bash +bun run http.js +``` + +The web server will be running at `http://localhost:5000` + +Configure the file `.env.development` with the url \ No newline at end of file diff --git a/src/App.tsx b/src/App.tsx index e6ea857..2b8c7fd 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import './App.scss'; import { MainMenu } from './Components/MainMenu/MainMenu'; -import { ContainerModel, findContainerById, IContainerModel, MakeIterator } from './Components/SVG/Elements/ContainerModel'; +import { ContainerModel, findContainerById, IContainerModel, MakeIterator } from './Interfaces/ContainerModel'; import Editor, { IEditorState } from './Editor'; import { AvailableContainer } from './Interfaces/AvailableContainer'; import { Configuration } from './Interfaces/Configuration'; @@ -40,6 +40,22 @@ export class App extends React.Component { }; } + componentDidMount() { + const queryString = window.location.search; + const urlParams = new URLSearchParams(queryString); + const state = urlParams.get('state'); + + if (state === null) { + return; + } + + fetch(state) + .then((response) => response.json()) + .then((data: IEditorState) => { + this.LoadState(data); + }); + } + public NewEditor() { // Fetch the configuration from the API fetchConfiguration().then((configuration: Configuration) => { @@ -86,18 +102,22 @@ export class App extends React.Component { const result = reader.result as string; const editorState: IEditorState = JSON.parse(result); - Revive(editorState); - - this.setState({ - configuration: editorState.configuration, - history: editorState.history, - historyCurrentStep: editorState.historyCurrentStep, - isLoaded: true - } as IAppState); + this.LoadState(editorState); }); reader.readAsText(file); } + private LoadState(editorState: IEditorState) { + Revive(editorState); + + this.setState({ + configuration: editorState.configuration, + history: editorState.history, + historyCurrentStep: editorState.historyCurrentStep, + isLoaded: true + } as IAppState); + } + public render() { if (this.state.isLoaded) { return ( diff --git a/src/Components/ElementsSidebar/ElementsSidebar.tsx b/src/Components/ElementsSidebar/ElementsSidebar.tsx index 4e599ef..c4ea51a 100644 --- a/src/Components/ElementsSidebar/ElementsSidebar.tsx +++ b/src/Components/ElementsSidebar/ElementsSidebar.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { motion } from 'framer-motion'; import { Properties } from '../Properties/Properties'; -import { IContainerModel, getDepth, MakeIterator } from '../SVG/Elements/ContainerModel'; +import { IContainerModel, getDepth, MakeIterator } from '../../Interfaces/ContainerModel'; interface IElementsSidebarProps { MainContainer: IContainerModel | null, @@ -13,7 +13,7 @@ interface IElementsSidebarProps { selectContainer: (container: IContainerModel) => void } -export class ElementsSidebar extends React.Component { +export class ElementsSidebar extends React.PureComponent { public iterateChilds(handleContainer: (container: IContainerModel) => void): React.ReactNode { if (!this.props.MainContainer) { return null; @@ -53,7 +53,7 @@ export class ElementsSidebar extends React.Component { duration: 0.150 }} className={ - `w-full elements-sidebar-row whitespace-pre + `w-full elements-sidebar-row whitespace-pre text-left text-sm font-medium transition-all ${selectedClass}` } key={key} diff --git a/src/Components/FloatingButton/FloatingButton.tsx b/src/Components/FloatingButton/FloatingButton.tsx new file mode 100644 index 0000000..fb5fc1c --- /dev/null +++ b/src/Components/FloatingButton/FloatingButton.tsx @@ -0,0 +1,10 @@ +import * as React from 'react'; + +interface IFloatingButtonProps { +} + +const FloatingButton: React.FC = (props: IFloatingButtonProps) => { + return <>; +}; + +export default FloatingButton; diff --git a/src/Components/History/History.tsx b/src/Components/History/History.tsx index 750fcc7..e77a8c7 100644 --- a/src/Components/History/History.tsx +++ b/src/Components/History/History.tsx @@ -9,7 +9,7 @@ interface IHistoryProps { jumpTo: (move: number) => void } -export class History extends React.Component { +export class History extends React.PureComponent { public render() { const isOpenClasses = this.props.isOpen ? 'right-0' : '-right-64'; @@ -33,7 +33,7 @@ export class History extends React.Component { key={move} onClick={() => this.props.jumpTo(move)} className={ - `w-full elements-sidebar-row whitespace-pre + `w-full elements-sidebar-row whitespace-pre text-left text-sm font-medium transition-all ${selectedClass}` } > diff --git a/src/Components/Properties/Properties.tsx b/src/Components/Properties/Properties.tsx index 61d0bff..65cfefd 100644 --- a/src/Components/Properties/Properties.tsx +++ b/src/Components/Properties/Properties.tsx @@ -6,20 +6,7 @@ interface IPropertiesProps { onChange: (key: string, value: string) => void } -interface IPropertiesState { - hasUpdate: boolean -} - -export class Properties extends React.Component { - public state: IPropertiesState; - - constructor(props: IPropertiesProps) { - super(props); - this.state = { - hasUpdate: false - }; - } - +export class Properties extends React.PureComponent { public render() { if (this.props.properties === undefined) { return
; diff --git a/src/Components/SVG/Elements/Container.tsx b/src/Components/SVG/Elements/Container.tsx index bf56127..a352bcd 100644 --- a/src/Components/SVG/Elements/Container.tsx +++ b/src/Components/SVG/Elements/Container.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { getDepth, IContainerModel } from './ContainerModel'; +import { getDepth, IContainerModel } from '../../../Interfaces/ContainerModel'; import { Dimension } from './Dimension'; export interface IContainerProps { @@ -8,13 +8,13 @@ export interface IContainerProps { const GAP = 50; -export class Container extends React.Component { +export class Container extends React.PureComponent { /** * Render the container * @returns Render the container */ public render(): React.ReactNode { - const containersElements = this.props.model.children.map(child => new Container({ model: child } as IContainerProps).render()); + const containersElements = this.props.model.children.map(child => ); const xText = Number(this.props.model.properties.width) / 2; const yText = Number(this.props.model.properties.height) / 2; const transform = `translate(${Number(this.props.model.properties.x)}, ${Number(this.props.model.properties.y)})`; diff --git a/src/Components/SVG/Elements/Dimension.tsx b/src/Components/SVG/Elements/Dimension.tsx index 276345f..96ab2c9 100644 --- a/src/Components/SVG/Elements/Dimension.tsx +++ b/src/Components/SVG/Elements/Dimension.tsx @@ -9,7 +9,7 @@ interface IDimensionProps { strokeWidth: number; } -export class Dimension extends React.Component { +export class Dimension extends React.PureComponent { public render() { const style = { stroke: 'black' diff --git a/src/Components/SVG/Elements/DimensionLayer.tsx b/src/Components/SVG/Elements/DimensionLayer.tsx index 610177b..3a3dee8 100644 --- a/src/Components/SVG/Elements/DimensionLayer.tsx +++ b/src/Components/SVG/Elements/DimensionLayer.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { ContainerModel, getDepth, MakeIterator } from './ContainerModel'; +import { ContainerModel, getDepth, MakeIterator } from '../../../Interfaces/ContainerModel'; import { Dimension } from './Dimension'; interface IDimensionLayerProps { @@ -22,15 +22,16 @@ const getDimensionsNodes = (root: ContainerModel): React.ReactNode[] => { const y = -(GAP * (getDepth(container) + 1)); const strokeWidth = 1; const text = width.toString(); - const dimension = new Dimension({ - id, - xStart, - xEnd, - y, - strokeWidth, - text - }); - dimensions.push(dimension.render()); + dimensions.push( + + ); } return dimensions; }; diff --git a/src/Components/SVG/Elements/Selector.tsx b/src/Components/SVG/Elements/Selector.tsx index 6fc1b9b..de6d9a3 100644 --- a/src/Components/SVG/Elements/Selector.tsx +++ b/src/Components/SVG/Elements/Selector.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { IContainerModel, getAbsolutePosition } from './ContainerModel'; +import { IContainerModel, getAbsolutePosition } from '../../../Interfaces/ContainerModel'; interface ISelectorProps { selected: IContainerModel | null diff --git a/src/Components/SVG/SVG.tsx b/src/Components/SVG/SVG.tsx index 9583571..c11e39b 100644 --- a/src/Components/SVG/SVG.tsx +++ b/src/Components/SVG/SVG.tsx @@ -1,33 +1,28 @@ import * as React from 'react'; import { ReactSVGPanZoom, Tool, Value, TOOL_PAN } from 'react-svg-pan-zoom'; import { Container } from './Elements/Container'; -import { ContainerModel } from './Elements/ContainerModel'; +import { ContainerModel } from '../../Interfaces/ContainerModel'; import { Selector } from './Elements/Selector'; interface ISVGProps { + width: number, + height: number, children: ContainerModel | ContainerModel[] | null, selected: ContainerModel | null } interface ISVGState { - viewBox: number[], value: Value, tool: Tool } -export class SVG extends React.Component { +export class SVG extends React.PureComponent { public state: ISVGState; public svg: React.RefObject; constructor(props: ISVGProps) { super(props); this.state = { - viewBox: [ - 0, - 0, - window.innerWidth, - window.innerHeight - ], value: { viewerWidth: window.innerWidth, viewerHeight: window.innerHeight @@ -37,38 +32,20 @@ export class SVG extends React.Component { this.svg = React.createRef(); } - resizeViewBox() { - this.setState({ - viewBox: [ - 0, - 0, - window.innerWidth, - window.innerHeight - ] - }); - } - - componentDidMount() { - window.addEventListener('resize', this.resizeViewBox.bind(this)); - } - - componentWillUnmount() { - window.removeEventListener('resize', this.resizeViewBox.bind(this)); - } - render() { const xmlns = ''; const properties = { - viewBox: this.state.viewBox.join(' '), + width: this.props.width, + height: this.props.height, xmlns }; let children: React.ReactNode | React.ReactNode[] = []; if (Array.isArray(this.props.children)) { - children = this.props.children.map(child => new Container({ model: child }).render()); + children = this.props.children.map(child => ); } else if (this.props.children !== null) { - children = new Container({ model: this.props.children }).render(); + children = ; } return ( @@ -79,6 +56,12 @@ export class SVG extends React.Component { defaultTool='pan' value={this.state.value} onChangeValue={value => this.setState({ value })} tool={this.state.tool} onChangeTool={tool => this.setState({ tool })} + miniatureProps={{ + position: 'left', + background: '#616264', + width: window.innerWidth - 12, + height: 120 + }} > { children } diff --git a/src/Components/Sidebar/Sidebar.tsx b/src/Components/Sidebar/Sidebar.tsx index af08ce9..dd34812 100644 --- a/src/Components/Sidebar/Sidebar.tsx +++ b/src/Components/Sidebar/Sidebar.tsx @@ -8,7 +8,7 @@ interface ISidebarProps { buttonOnClick: (type: string) => void; } -export default class Sidebar extends React.Component { +export default class Sidebar extends React.PureComponent { public render() { const listElements = this.props.componentOptions.map(componentOption => - + { current.MainContainer }