diff --git a/.assets/Export.svg b/.assets/Export.svg new file mode 100644 index 00000000..4e51c0a3 --- /dev/null +++ b/.assets/Export.svg @@ -0,0 +1,3 @@ + + + diff --git a/.assets/Settings.svg b/.assets/Settings.svg new file mode 100644 index 00000000..c0c1a2a5 --- /dev/null +++ b/.assets/Settings.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/App/App.tsx b/src/App/App.tsx index ce402946..2202c683 100644 --- a/src/App/App.tsx +++ b/src/App/App.tsx @@ -24,6 +24,8 @@ import { EditorBar } from "../EditorBar/EditorBar"; import { Parameters, ParametersType } from "../Parameters/Parameters"; import { Login, supabase } from "../Login/Login"; import { Axes } from "../Viewer/objects/Axes"; +import { Upgrade } from "../Upgrade/Upgrade"; +import { Export } from "../Export/Export"; export const staging = localStorage.getItem("staging") ? true : false; @@ -272,21 +274,23 @@ export const analysisResults = analyzing(nodes, elements, assignments);`; + + + /> {(node) => ( - )} + )} @@ -294,10 +298,10 @@ export const analysisResults = analyzing(nodes, elements, assignments);`; {(element) => ( - )} + )} @@ -305,11 +309,11 @@ export const analysisResults = analyzing(nodes, elements, assignments);`; {(node, index) => ( - )} + )} @@ -317,14 +321,14 @@ export const analysisResults = analyzing(nodes, elements, assignments);`; {(element, index) => ( - )} + /> + )} @@ -332,11 +336,11 @@ export const analysisResults = analyzing(nodes, elements, assignments);`; {(support) => ( - )} + )} @@ -344,11 +348,11 @@ export const analysisResults = analyzing(nodes, elements, assignments);`; {(pointLoad) => ( - )} + )} @@ -365,7 +369,7 @@ export const analysisResults = analyzing(nodes, elements, assignments);`; (elementResult() as any)[settings.elementResults][0] || 0 } size={0.04 * settings.gridSize * displayScale()} - /> + /> )} @@ -381,21 +385,25 @@ export const analysisResults = analyzing(nodes, elements, assignments);`; (nodeResult() as any)[settings.nodeResults] || [0, 0, 0] } size={0.07 * settings.gridSize * displayScale()} - /> + /> )} - + + - + + + + solveModel({ key: (e.target as any).tag, value: e.value }) } - /> + /> ); } diff --git a/src/Export/Export.tsx b/src/Export/Export.tsx new file mode 100644 index 00000000..051a661d --- /dev/null +++ b/src/Export/Export.tsx @@ -0,0 +1,87 @@ +import { Show, createSignal, onMount } from "solid-js"; +export function Export() { + +function onExport(event:Event){ +event.preventDefault(); + } + + return ( + <> + {/* @ts-ignore */} + + + + + + + ); +} diff --git a/src/Layouter/Layouter.tsx b/src/Layouter/Layouter.tsx index 8f094e15..cd9dd414 100644 --- a/src/Layouter/Layouter.tsx +++ b/src/Layouter/Layouter.tsx @@ -69,9 +69,8 @@ export function Layouter(props: LayouterProps) { ref={resizerHorizontal!} >
- {c[3]} - {c[4]} - {c[5]} + {c.slice(2)} +
}