diff --git a/app/src/SimulationDashboard/ControlPanel.tsx b/app/src/components/SimulationDashboard/ControlPanel.tsx similarity index 100% rename from app/src/SimulationDashboard/ControlPanel.tsx rename to app/src/components/SimulationDashboard/ControlPanel.tsx diff --git a/app/src/SimulationDashboard/DashboardEditor.tsx b/app/src/components/SimulationDashboard/DashboardEditor.tsx similarity index 99% rename from app/src/SimulationDashboard/DashboardEditor.tsx rename to app/src/components/SimulationDashboard/DashboardEditor.tsx index 4fff5bd..e3e4314 100644 --- a/app/src/SimulationDashboard/DashboardEditor.tsx +++ b/app/src/components/SimulationDashboard/DashboardEditor.tsx @@ -4,7 +4,7 @@ import ControlPanel from "./ControlPanel"; import SwapModal from "./SwapModal"; import DataModelPanel from "./components/models/DataModelPanel"; -import { useSceneContext } from "../modules/scene/sceneContext"; +import { useSceneContext } from "../../modules/scene/sceneContext"; import { calculateMinBlockSize } from "./functions/block/calculateMinBlockSize"; import { handleElementDragStart, handleElementResizeStart, handleBlockResizeStart, handleSwapStart, handleSwapTarget, handleBlockClick, handleElementClick } from "./functions/eventHandlers"; import BlockGrid from "./components/block/BlockGrid"; diff --git a/app/src/SimulationDashboard/SwapModal.tsx b/app/src/components/SimulationDashboard/SwapModal.tsx similarity index 100% rename from app/src/SimulationDashboard/SwapModal.tsx rename to app/src/components/SimulationDashboard/SwapModal.tsx diff --git a/app/src/SimulationDashboard/components/block/BlockComponent.tsx b/app/src/components/SimulationDashboard/components/block/BlockComponent.tsx similarity index 99% rename from app/src/SimulationDashboard/components/block/BlockComponent.tsx rename to app/src/components/SimulationDashboard/components/block/BlockComponent.tsx index f24d9e9..f159412 100644 --- a/app/src/SimulationDashboard/components/block/BlockComponent.tsx +++ b/app/src/components/SimulationDashboard/components/block/BlockComponent.tsx @@ -1,5 +1,5 @@ import type { RefObject } from "react"; -import { Block } from "../../../types/exportedTypes"; +import { Block } from "../../../../types/exportedTypes"; import ElementComponent from "../element/ElementComponent"; interface BlockComponentProps { diff --git a/app/src/SimulationDashboard/components/block/BlockEditor.tsx b/app/src/components/SimulationDashboard/components/block/BlockEditor.tsx similarity index 99% rename from app/src/SimulationDashboard/components/block/BlockEditor.tsx rename to app/src/components/SimulationDashboard/components/block/BlockEditor.tsx index 3ab052d..0e890d6 100644 --- a/app/src/SimulationDashboard/components/block/BlockEditor.tsx +++ b/app/src/components/SimulationDashboard/components/block/BlockEditor.tsx @@ -1,5 +1,5 @@ import type { RefObject } from "react"; -import { Block } from "../../../types/exportedTypes"; +import { Block } from "../../../../types/exportedTypes"; import { getAlphaFromRgba, rgbaToHex } from "../../functions/helpers/colorHandlers"; import { getCurrentBlockStyleValue } from "../../functions/helpers/getCurrentBlockStyleValue"; import { handleBackgroundColorChange } from "../../functions/helpers/handleBackgroundColorChange"; diff --git a/app/src/SimulationDashboard/components/block/BlockGrid.tsx b/app/src/components/SimulationDashboard/components/block/BlockGrid.tsx similarity index 97% rename from app/src/SimulationDashboard/components/block/BlockGrid.tsx rename to app/src/components/SimulationDashboard/components/block/BlockGrid.tsx index cf5ad5a..c2f02eb 100644 --- a/app/src/SimulationDashboard/components/block/BlockGrid.tsx +++ b/app/src/components/SimulationDashboard/components/block/BlockGrid.tsx @@ -1,5 +1,5 @@ import React, { type RefObject, useRef } from "react"; -import type { Block } from "../../../types/exportedTypes"; +import type { Block } from "../../../../types/exportedTypes"; import BlockComponent from "./BlockComponent"; // components/BlockGrid.tsx - Updated props diff --git a/app/src/SimulationDashboard/components/element/ElementComponent.tsx b/app/src/components/SimulationDashboard/components/element/ElementComponent.tsx similarity index 98% rename from app/src/SimulationDashboard/components/element/ElementComponent.tsx rename to app/src/components/SimulationDashboard/components/element/ElementComponent.tsx index 7955dbd..02d4b02 100644 --- a/app/src/SimulationDashboard/components/element/ElementComponent.tsx +++ b/app/src/components/SimulationDashboard/components/element/ElementComponent.tsx @@ -1,5 +1,5 @@ import React from "react"; -import type { UIElement } from "../../../types/exportedTypes"; +import type { UIElement } from "../../../../types/exportedTypes"; import { resolveElementValue } from "../../functions/helpers/resolveElementValue"; import ElementContent from "./ElementContent"; diff --git a/app/src/SimulationDashboard/components/element/ElementContent.tsx b/app/src/components/SimulationDashboard/components/element/ElementContent.tsx similarity index 99% rename from app/src/SimulationDashboard/components/element/ElementContent.tsx rename to app/src/components/SimulationDashboard/components/element/ElementContent.tsx index 6cb97c3..933309b 100644 --- a/app/src/SimulationDashboard/components/element/ElementContent.tsx +++ b/app/src/components/SimulationDashboard/components/element/ElementContent.tsx @@ -19,7 +19,7 @@ import { ResponsiveContainer, Cell, } from "recharts"; -import { UIElement } from "../../../types/exportedTypes"; +import { UIElement } from "../../../../types/exportedTypes"; interface ElementContentProps { element: UIElement; diff --git a/app/src/SimulationDashboard/components/element/ElementDropdown.tsx b/app/src/components/SimulationDashboard/components/element/ElementDropdown.tsx similarity index 100% rename from app/src/SimulationDashboard/components/element/ElementDropdown.tsx rename to app/src/components/SimulationDashboard/components/element/ElementDropdown.tsx diff --git a/app/src/SimulationDashboard/components/element/ElementEditor.tsx b/app/src/components/SimulationDashboard/components/element/ElementEditor.tsx similarity index 99% rename from app/src/SimulationDashboard/components/element/ElementEditor.tsx rename to app/src/components/SimulationDashboard/components/element/ElementEditor.tsx index 45d6244..2d17fc3 100644 --- a/app/src/SimulationDashboard/components/element/ElementEditor.tsx +++ b/app/src/components/SimulationDashboard/components/element/ElementEditor.tsx @@ -1,5 +1,5 @@ import type { RefObject } from "react"; -import { ExtendedCSSProperties, UIElement, Block } from "../../../types/exportedTypes"; +import { ExtendedCSSProperties, UIElement, Block } from "../../../../types/exportedTypes"; import { getCurrentElementStyleValue } from "../../functions/helpers/getCurrentElementStyleValue"; import type { DataModelManager } from "../../data/dataModel"; diff --git a/app/src/SimulationDashboard/components/models/DataModelPanel.tsx b/app/src/components/SimulationDashboard/components/models/DataModelPanel.tsx similarity index 100% rename from app/src/SimulationDashboard/components/models/DataModelPanel.tsx rename to app/src/components/SimulationDashboard/components/models/DataModelPanel.tsx diff --git a/app/src/SimulationDashboard/data/dataModel.ts b/app/src/components/SimulationDashboard/data/dataModel.ts similarity index 100% rename from app/src/SimulationDashboard/data/dataModel.ts rename to app/src/components/SimulationDashboard/data/dataModel.ts diff --git a/app/src/SimulationDashboard/data/defaultGraphData.ts b/app/src/components/SimulationDashboard/data/defaultGraphData.ts similarity index 100% rename from app/src/SimulationDashboard/data/defaultGraphData.ts rename to app/src/components/SimulationDashboard/data/defaultGraphData.ts diff --git a/app/src/SimulationDashboard/functions/block/calculateMinBlockSize.ts b/app/src/components/SimulationDashboard/functions/block/calculateMinBlockSize.ts similarity index 92% rename from app/src/SimulationDashboard/functions/block/calculateMinBlockSize.ts rename to app/src/components/SimulationDashboard/functions/block/calculateMinBlockSize.ts index e99bbf0..a366c20 100644 --- a/app/src/SimulationDashboard/functions/block/calculateMinBlockSize.ts +++ b/app/src/components/SimulationDashboard/functions/block/calculateMinBlockSize.ts @@ -1,4 +1,4 @@ -import type { Block } from "../../../types/exportedTypes"; +import type { Block } from "../../../../types/exportedTypes"; export const calculateMinBlockSize = (block: Block): Size => { let minWidth = 300; diff --git a/app/src/SimulationDashboard/functions/block/handleBlockDragStart.ts b/app/src/components/SimulationDashboard/functions/block/handleBlockDragStart.ts similarity index 100% rename from app/src/SimulationDashboard/functions/block/handleBlockDragStart.ts rename to app/src/components/SimulationDashboard/functions/block/handleBlockDragStart.ts diff --git a/app/src/SimulationDashboard/functions/eventHandlers/index.ts b/app/src/components/SimulationDashboard/functions/eventHandlers/index.ts similarity index 98% rename from app/src/SimulationDashboard/functions/eventHandlers/index.ts rename to app/src/components/SimulationDashboard/functions/eventHandlers/index.ts index f8451b5..92f0f2b 100644 --- a/app/src/SimulationDashboard/functions/eventHandlers/index.ts +++ b/app/src/components/SimulationDashboard/functions/eventHandlers/index.ts @@ -1,4 +1,4 @@ -import type { UIElement, Block } from "../../../types/exportedTypes"; +import type { UIElement } from "../../../../types/exportedTypes"; export const handleElementDragStart = ( elementId: string, diff --git a/app/src/SimulationDashboard/functions/helpers/colorHandlers.ts b/app/src/components/SimulationDashboard/functions/helpers/colorHandlers.ts similarity index 100% rename from app/src/SimulationDashboard/functions/helpers/colorHandlers.ts rename to app/src/components/SimulationDashboard/functions/helpers/colorHandlers.ts diff --git a/app/src/SimulationDashboard/functions/helpers/getCurrentBlockStyleValue.ts b/app/src/components/SimulationDashboard/functions/helpers/getCurrentBlockStyleValue.ts similarity index 75% rename from app/src/SimulationDashboard/functions/helpers/getCurrentBlockStyleValue.ts rename to app/src/components/SimulationDashboard/functions/helpers/getCurrentBlockStyleValue.ts index e199258..6c40a94 100644 --- a/app/src/SimulationDashboard/functions/helpers/getCurrentBlockStyleValue.ts +++ b/app/src/components/SimulationDashboard/functions/helpers/getCurrentBlockStyleValue.ts @@ -1,4 +1,4 @@ -import type { Block } from "../../../types/exportedTypes"; +import type { Block } from "../../../../types/exportedTypes"; export const getCurrentBlockStyleValue = ( currentBlock: Block, diff --git a/app/src/SimulationDashboard/functions/helpers/getCurrentElementStyleValue.ts b/app/src/components/SimulationDashboard/functions/helpers/getCurrentElementStyleValue.ts similarity index 74% rename from app/src/SimulationDashboard/functions/helpers/getCurrentElementStyleValue.ts rename to app/src/components/SimulationDashboard/functions/helpers/getCurrentElementStyleValue.ts index c210c6e..b1bec2f 100644 --- a/app/src/SimulationDashboard/functions/helpers/getCurrentElementStyleValue.ts +++ b/app/src/components/SimulationDashboard/functions/helpers/getCurrentElementStyleValue.ts @@ -1,4 +1,4 @@ -import type { UIElement } from "../../../types/exportedTypes"; +import type { UIElement } from "../../../../types/exportedTypes"; export const getCurrentElementStyleValue = ( currentElement: UIElement, diff --git a/app/src/SimulationDashboard/functions/helpers/handleBackgroundAlphaChange.ts b/app/src/components/SimulationDashboard/functions/helpers/handleBackgroundAlphaChange.ts similarity index 90% rename from app/src/SimulationDashboard/functions/helpers/handleBackgroundAlphaChange.ts rename to app/src/components/SimulationDashboard/functions/helpers/handleBackgroundAlphaChange.ts index 05c5a59..670e57c 100644 --- a/app/src/SimulationDashboard/functions/helpers/handleBackgroundAlphaChange.ts +++ b/app/src/components/SimulationDashboard/functions/helpers/handleBackgroundAlphaChange.ts @@ -1,4 +1,4 @@ -import type { Block } from "../../../types/exportedTypes"; +import type { Block } from "../../../../types/exportedTypes"; import { hexToRgba, rgbaToHex } from "./colorHandlers"; import { getCurrentBlockStyleValue } from "./getCurrentBlockStyleValue"; diff --git a/app/src/SimulationDashboard/functions/helpers/handleBackgroundColorChange.ts b/app/src/components/SimulationDashboard/functions/helpers/handleBackgroundColorChange.ts similarity index 91% rename from app/src/SimulationDashboard/functions/helpers/handleBackgroundColorChange.ts rename to app/src/components/SimulationDashboard/functions/helpers/handleBackgroundColorChange.ts index 7109e38..d025c51 100644 --- a/app/src/SimulationDashboard/functions/helpers/handleBackgroundColorChange.ts +++ b/app/src/components/SimulationDashboard/functions/helpers/handleBackgroundColorChange.ts @@ -1,4 +1,4 @@ -import type { Block } from "../../../types/exportedTypes"; +import type { Block } from "../../../../types/exportedTypes"; import { getAlphaFromRgba, hexToRgba } from "./colorHandlers"; import { getCurrentBlockStyleValue } from "./getCurrentBlockStyleValue"; diff --git a/app/src/SimulationDashboard/functions/helpers/handleBlurAmountChange.ts b/app/src/components/SimulationDashboard/functions/helpers/handleBlurAmountChange.ts similarity index 100% rename from app/src/SimulationDashboard/functions/helpers/handleBlurAmountChange.ts rename to app/src/components/SimulationDashboard/functions/helpers/handleBlurAmountChange.ts diff --git a/app/src/SimulationDashboard/functions/helpers/resolveElementValue.ts b/app/src/components/SimulationDashboard/functions/helpers/resolveElementValue.ts similarity index 96% rename from app/src/SimulationDashboard/functions/helpers/resolveElementValue.ts rename to app/src/components/SimulationDashboard/functions/helpers/resolveElementValue.ts index 7e72489..f82a7da 100644 --- a/app/src/SimulationDashboard/functions/helpers/resolveElementValue.ts +++ b/app/src/components/SimulationDashboard/functions/helpers/resolveElementValue.ts @@ -1,5 +1,5 @@ import { dataModelManager } from "../../data/dataModel"; -import type { UIElement } from "../../../types/exportedTypes"; +import type { UIElement } from "../../../../types/exportedTypes"; export const resolveElementValue = (element: UIElement) => { // Implementation from original code diff --git a/app/src/SimulationDashboard/functions/updateDataModelValue.ts b/app/src/components/SimulationDashboard/functions/updateDataModelValue.ts similarity index 100% rename from app/src/SimulationDashboard/functions/updateDataModelValue.ts rename to app/src/components/SimulationDashboard/functions/updateDataModelValue.ts diff --git a/app/src/components/layout/scenes/MainScene.tsx b/app/src/components/layout/scenes/MainScene.tsx index d80725f..ea2e800 100644 --- a/app/src/components/layout/scenes/MainScene.tsx +++ b/app/src/components/layout/scenes/MainScene.tsx @@ -33,7 +33,7 @@ import { recentlyViewedApi } from "../../../services/dashboard/recentlyViewedApi import { setAssetsApi } from "../../../services/builder/asset/floorAsset/setAssetsApi"; import { getVersionHistoryApi } from "../../../services/builder/versionControl/getVersionHistoryApi"; import { getUserData } from "../../../functions/getUserData"; -import DashboardEditor from "../../../SimulationDashboard/DashboardEditor"; +import DashboardEditor from "../../SimulationDashboard/DashboardEditor"; function MainScene() { const { setMainState, clearComparisonState } = useSimulationState(); diff --git a/app/src/store/simulation/useSimulationDashBoardStore.ts b/app/src/store/simulation/useSimulationDashBoardStore.ts index 8aad902..73eb5ef 100644 --- a/app/src/store/simulation/useSimulationDashBoardStore.ts +++ b/app/src/store/simulation/useSimulationDashBoardStore.ts @@ -1,7 +1,7 @@ import { MathUtils } from "three"; import { create } from "zustand"; import { immer } from "zustand/middleware/immer"; -import { defaultGraphData } from "../../SimulationDashboard/data/defaultGraphData"; +import { defaultGraphData } from "../../components/SimulationDashboard/data/defaultGraphData"; import { Block, UIElement, ExtendedCSSProperties } from "../../types/exportedTypes"; interface SimulationDashboardStore {