From 4127a9a6eb192c4739c4cfe72d026ff22b8f9cdb Mon Sep 17 00:00:00 2001 From: Siklos Date: Fri, 5 Aug 2022 13:48:53 +0200 Subject: [PATCH 1/6] Add state.json to src/tests/resources for testing --- src/tests/resources/state.json | 182 +++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) create mode 100644 src/tests/resources/state.json diff --git a/src/tests/resources/state.json b/src/tests/resources/state.json new file mode 100644 index 0000000..2152cd1 --- /dev/null +++ b/src/tests/resources/state.json @@ -0,0 +1,182 @@ +{ + "isSidebarOpen": true, + "isElementsSidebarOpen": false, + "isHistoryOpen": false, + "configuration": { + "AvailableContainers": [ + { + "Type": "Chassis", + "Width": 500, + "Style": { + "fillOpacity": 0, + "borderWidth": 2, + "stroke": "red" + } + }, + { + "Type": "Trou", + "Width": 300, + "Style": { + "fillOpacity": 0, + "borderWidth": 2, + "stroke": "green" + } + }, + { + "Type": "Montant", + "Width": 100, + "Style": { + "fillOpacity": 0, + "borderWidth": 2, + "stroke": "blue", + "transform": "translateX(-50%)", + "transformOrigin": "center", + "transformBox": "fill-box" + } + } + ], + "AvailableSymbols": [ + { + "Height": 0, + "Image": { + "Base64Image": null, + "Name": null, + "Svg": null, + "Url": "https://www.manutan.fr/img/S/GRP/ST/AIG3930272.jpg" + }, + "Name": "Poteau structure", + "Width": 0, + "XPositionReference": 1 + }, + { + "Height": 0, + "Image": { + "Base64Image": null, + "Name": null, + "Svg": null, + "Url": "https://e7.pngegg.com/pngimages/647/127/png-clipart-svg-working-group-information-world-wide-web-internet-structure.png" + }, + "Name": "Joint de structure", + "Width": 0, + "XPositionReference": 0 + } + ], + "MainContainer": { + "Height": 200, + "Width": 1000 + } + }, + "history": [ + { + "MainContainer": { + "children": [], + "properties": { + "id": "main", + "parentId": "null", + "x": 0, + "y": 0, + "width": 1000, + "height": 200, + "fillOpacity": 0, + "stroke": "black" + }, + "userData": {} + }, + "TypeCounters": {} + }, + { + "MainContainer": { + "children": [ + { + "children": [], + "properties": { + "id": "Chassis-0", + "parentId": "main", + "x": 0, + "y": 0, + "width": 500, + "height": 200, + "fillOpacity": 0, + "borderWidth": 2, + "stroke": "red" + }, + "userData": { + "type": "Chassis" + } + } + ], + "properties": { + "id": "main", + "parentId": "null", + "x": 0, + "y": 0, + "width": 1000, + "height": 200, + "fillOpacity": 0, + "stroke": "black" + }, + "userData": {} + }, + "TypeCounters": { + "Chassis": 0 + }, + "SelectedContainerId": "main" + }, + { + "MainContainer": { + "children": [ + { + "children": [], + "properties": { + "id": "Chassis-0", + "parentId": "main", + "x": 0, + "y": 0, + "width": 500, + "height": 200, + "fillOpacity": 0, + "borderWidth": 2, + "stroke": "red" + }, + "userData": { + "type": "Chassis" + } + }, + { + "children": [], + "properties": { + "id": "Chassis-1", + "parentId": "main", + "x": 500, + "y": 0, + "width": 500, + "height": 200, + "fillOpacity": 0, + "borderWidth": 2, + "stroke": "red" + }, + "userData": { + "type": "Chassis" + } + } + ], + "properties": { + "id": "main", + "parentId": "null", + "x": 0, + "y": 0, + "width": 1000, + "height": 200, + "fillOpacity": 0, + "stroke": "black" + }, + "userData": {} + }, + "TypeCounters": { + "Chassis": 1 + }, + "SelectedContainerId": "main" + } + ], + "historyCurrentStep": 2 +} \ No newline at end of file From 893876ddaa24cc8c1a3bc1a6ac55651566afc4fd Mon Sep 17 00:00:00 2001 From: Siklos Date: Fri, 5 Aug 2022 13:49:22 +0200 Subject: [PATCH 2/6] Allow LoadEditor through external resource --- src/App.tsx | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index e6ea857..58e73c5 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -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 ( From d5f89523dbd9b812d74bc613fbf94a47aed5d74d Mon Sep 17 00:00:00 2001 From: Siklos Date: Fri, 5 Aug 2022 14:11:30 +0200 Subject: [PATCH 3/6] Update Readme --- README.md | 64 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 28 deletions(-) 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 From bc6d44db6a75b7ac00bc37723d738ce02bbe4075 Mon Sep 17 00:00:00 2001 From: Siklos Date: Fri, 5 Aug 2022 16:00:35 +0200 Subject: [PATCH 4/6] Fix stuck svg pan zoom + improve minimap --- src/Components/SVG/SVG.tsx | 37 ++++++++++--------------------------- src/Editor.tsx | 8 ++++++-- 2 files changed, 16 insertions(+), 29 deletions(-) diff --git a/src/Components/SVG/SVG.tsx b/src/Components/SVG/SVG.tsx index 9583571..c5404a2 100644 --- a/src/Components/SVG/SVG.tsx +++ b/src/Components/SVG/SVG.tsx @@ -5,12 +5,13 @@ import { ContainerModel } from './Elements/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 } @@ -22,12 +23,6 @@ export class SVG extends React.Component { constructor(props: ISVGProps) { super(props); this.state = { - viewBox: [ - 0, - 0, - window.innerWidth, - window.innerHeight - ], value: { viewerWidth: window.innerWidth, viewerHeight: window.innerHeight @@ -37,30 +32,12 @@ 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 }; @@ -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/Editor.tsx b/src/Editor.tsx index 5e24be6..3834f42 100644 --- a/src/Editor.tsx +++ b/src/Editor.tsx @@ -327,11 +327,15 @@ class Editor extends React.Component { ☰ History - + { current.MainContainer }
; diff --git a/src/Components/SVG/Elements/Container.tsx b/src/Components/SVG/Elements/Container.tsx index 94a4924..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,7 +8,7 @@ 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 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 3c73f3a..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 { 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 4d8c301..c11e39b 100644 --- a/src/Components/SVG/SVG.tsx +++ b/src/Components/SVG/SVG.tsx @@ -1,7 +1,7 @@ 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 { @@ -16,7 +16,7 @@ interface ISVGState { tool: Tool } -export class SVG extends React.Component { +export class SVG extends React.PureComponent { public state: ISVGState; public svg: React.RefObject; 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 =>