-
+
+
+
-
+
+
+
{selectedUser &&
}
diff --git a/app/src/store/scene/useSceneStore.ts b/app/src/store/scene/useSceneStore.ts
new file mode 100644
index 0000000..2456476
--- /dev/null
+++ b/app/src/store/scene/useSceneStore.ts
@@ -0,0 +1,28 @@
+import { create } from 'zustand';
+import { immer } from 'zustand/middleware/immer';
+
+interface SelectedVersionState {
+ selectedVersion: Version | null;
+ setSelectedVersion: (version: Version) => void;
+ clearSelectedVersion: () => void;
+}
+
+export const createSelectedVersionStore = () => {
+ return create
()(
+ immer((set) => ({
+ selectedVersion: null,
+ setSelectedVersion: (version) => {
+ set((state) => {
+ state.selectedVersion = version;
+ });
+ },
+ clearSelectedVersion: () => {
+ set((state) => {
+ state.selectedVersion = null;
+ });
+ },
+ }))
+ )
+}
+
+export type SelectedVersionType = ReturnType;
\ No newline at end of file
diff --git a/app/src/store/useCompareProductStore.ts b/app/src/store/simulation/useCompareProductStore.ts
similarity index 100%
rename from app/src/store/useCompareProductStore.ts
rename to app/src/store/simulation/useCompareProductStore.ts
diff --git a/app/src/store/useModuleStore.ts b/app/src/store/ui/useModuleStore.ts
similarity index 96%
rename from app/src/store/useModuleStore.ts
rename to app/src/store/ui/useModuleStore.ts
index 30a84af..e582e76 100644
--- a/app/src/store/useModuleStore.ts
+++ b/app/src/store/ui/useModuleStore.ts
@@ -1,42 +1,42 @@
-import { create } from "zustand";
-
-interface ModuleStore {
- activeModule: string;
- setActiveModule: (module: string) => void;
-}
-
-const useModuleStore = create((set) => ({
- activeModule: "builder", // Initial state
- setActiveModule: (module) => set({ activeModule: module }), // Update state
-}));
-
-export default useModuleStore;
-
-// New store for subModule
-
-type SubModule = 'properties' | 'simulations' | 'mechanics' | 'analysis' | 'zoneProperties'|"resourceManagement";
-
-interface SubModuleStore {
- subModule: SubModule;
- setSubModule: (subModule: SubModule) => void;
-}
-
-const useSubModuleStore = create((set) => ({
- subModule: "properties", // Initial subModule state
- setSubModule: (value) => set({ subModule: value }), // Update subModule state
-}));
-
-export { useSubModuleStore };
-
-interface ThreeDState {
- toggleThreeD: boolean;
- setToggleThreeD: (value: boolean) => void;
-}
-
-// Create the Zustand store
-const useThreeDStore = create((set) => ({
- toggleThreeD: true, // Initial state
- setToggleThreeD: (value) => set({ toggleThreeD: value }), // Action to update the state
-}));
-
+import { create } from "zustand";
+
+interface ModuleStore {
+ activeModule: string;
+ setActiveModule: (module: string) => void;
+}
+
+const useModuleStore = create((set) => ({
+ activeModule: "builder", // Initial state
+ setActiveModule: (module) => set({ activeModule: module }), // Update state
+}));
+
+export default useModuleStore;
+
+// New store for subModule
+
+type SubModule = 'properties' | 'simulations' | 'mechanics' | 'analysis' | 'zoneProperties'|"resourceManagement";
+
+interface SubModuleStore {
+ subModule: SubModule;
+ setSubModule: (subModule: SubModule) => void;
+}
+
+const useSubModuleStore = create((set) => ({
+ subModule: "properties", // Initial subModule state
+ setSubModule: (value) => set({ subModule: value }), // Update subModule state
+}));
+
+export { useSubModuleStore };
+
+interface ThreeDState {
+ toggleThreeD: boolean;
+ setToggleThreeD: (value: boolean) => void;
+}
+
+// Create the Zustand store
+const useThreeDStore = create((set) => ({
+ toggleThreeD: true, // Initial state
+ setToggleThreeD: (value) => set({ toggleThreeD: value }), // Action to update the state
+}));
+
export { useThreeDStore };
\ No newline at end of file
diff --git a/app/src/store/usePlayButtonStore.ts b/app/src/store/ui/usePlayButtonStore.ts
similarity index 97%
rename from app/src/store/usePlayButtonStore.ts
rename to app/src/store/ui/usePlayButtonStore.ts
index fe85d6a..a9eaf69 100644
--- a/app/src/store/usePlayButtonStore.ts
+++ b/app/src/store/ui/usePlayButtonStore.ts
@@ -1,49 +1,49 @@
-import { create } from "zustand";
-
-type PlayButtonStore = {
- isPlaying: boolean; // Updated state name to reflect the play/pause status more clearly
- setIsPlaying: (value: boolean) => void; // Updated setter function name for clarity
-};
-type PauseButtonStore = {
- isPaused: boolean; // Updated state name to reflect the play/pause status more clearly
- setIsPaused: (value: boolean) => void; // Updated setter function name for clarity
-};
-type ResetButtonStore = {
- isReset: boolean; // Updated state name to reflect the play/pause status more clearly
- setReset: (value: boolean) => void; // Updated setter function name for clarity
-};
-interface AnimationSpeedState {
- speed: number;
- setSpeed: (value: number) => void;
-}
-
-export const usePlayButtonStore = create((set) => ({
- isPlaying: false, // Default state for play/pause
- setIsPlaying: (value) => set({ isPlaying: value }), // Update isPlaying state
-}));
-export const useResetButtonStore = create((set) => ({
- isReset: false, // Default state for play/pause
- setReset: (value) => set({ isReset: value }), // Update isPlaying state
-}));
-export const usePauseButtonStore = create((set) => ({
- isPaused: false, // Default state for play/pause
- setIsPaused: (value) => set({ isPaused: value }), // Update isPlaying state
-}));
-export const useAnimationPlaySpeed = create((set) => ({
- speed: 1,
- setSpeed: (value) => set({ speed: value }),
-}));
-
-interface CameraModeState {
- walkMode: boolean;
- setWalkMode: (enabled: boolean) => void;
- toggleWalkMode: () => void;
-}
-
-const useCameraModeStore = create((set) => ({
- walkMode: false,
- setWalkMode: (enabled) => set({ walkMode: enabled }),
- toggleWalkMode: () => set((state) => ({ walkMode: !state.walkMode })),
-}));
-
-export default useCameraModeStore;
+import { create } from "zustand";
+
+type PlayButtonStore = {
+ isPlaying: boolean; // Updated state name to reflect the play/pause status more clearly
+ setIsPlaying: (value: boolean) => void; // Updated setter function name for clarity
+};
+type PauseButtonStore = {
+ isPaused: boolean; // Updated state name to reflect the play/pause status more clearly
+ setIsPaused: (value: boolean) => void; // Updated setter function name for clarity
+};
+type ResetButtonStore = {
+ isReset: boolean; // Updated state name to reflect the play/pause status more clearly
+ setReset: (value: boolean) => void; // Updated setter function name for clarity
+};
+interface AnimationSpeedState {
+ speed: number;
+ setSpeed: (value: number) => void;
+}
+
+export const usePlayButtonStore = create((set) => ({
+ isPlaying: false, // Default state for play/pause
+ setIsPlaying: (value) => set({ isPlaying: value }), // Update isPlaying state
+}));
+export const useResetButtonStore = create((set) => ({
+ isReset: false, // Default state for play/pause
+ setReset: (value) => set({ isReset: value }), // Update isPlaying state
+}));
+export const usePauseButtonStore = create((set) => ({
+ isPaused: false, // Default state for play/pause
+ setIsPaused: (value) => set({ isPaused: value }), // Update isPlaying state
+}));
+export const useAnimationPlaySpeed = create((set) => ({
+ speed: 1,
+ setSpeed: (value) => set({ speed: value }),
+}));
+
+interface CameraModeState {
+ walkMode: boolean;
+ setWalkMode: (enabled: boolean) => void;
+ toggleWalkMode: () => void;
+}
+
+const useCameraModeStore = create((set) => ({
+ walkMode: false,
+ setWalkMode: (enabled) => set({ walkMode: enabled }),
+ toggleWalkMode: () => set((state) => ({ walkMode: !state.walkMode })),
+}));
+
+export default useCameraModeStore;
diff --git a/app/src/store/useTemplateStore.ts b/app/src/store/ui/useTemplateStore.ts
similarity index 95%
rename from app/src/store/useTemplateStore.ts
rename to app/src/store/ui/useTemplateStore.ts
index d416154..ed446ef 100644
--- a/app/src/store/useTemplateStore.ts
+++ b/app/src/store/ui/useTemplateStore.ts
@@ -1,51 +1,51 @@
-import { create } from "zustand";
-
-export interface Widget {
- id: string;
- type: string;
- title: string;
- panel: string;
- data: any;
-}
-
-export interface Template {
- id: string;
- name: string;
- panelOrder: string[];
- widgets: Widget[];
- floatingWidget: any[]; // Fixed empty array type
- widgets3D: any[]; // Fixed empty array type
- snapshot?: string | null;
-}
-
-interface TemplateStore {
- templates: Template[];
- addTemplate: (template: Template) => void;
- setTemplates: (templates: Template[]) => void; // Changed from `setTemplate`
- removeTemplate: (id: string) => void;
-}
-
-export const useTemplateStore = create((set) => ({
- templates: [],
-
- // Add a new template to the list
- addTemplate: (template) =>
- set((state) => ({
- templates: [...state.templates, template],
- })),
-
- // Set (replace) the templates list with a new array
- setTemplates: (templates) =>
- set(() => ({
- templates, // Ensures no duplication
- })),
-
- // Remove a template by ID
- removeTemplate: (id) =>
- set((state) => ({
- templates: state.templates.filter((t) => t.id !== id),
- })),
-}));
-
-export default useTemplateStore;
-
+import { create } from "zustand";
+
+export interface Widget {
+ id: string;
+ type: string;
+ title: string;
+ panel: string;
+ data: any;
+}
+
+export interface Template {
+ id: string;
+ name: string;
+ panelOrder: string[];
+ widgets: Widget[];
+ floatingWidget: any[]; // Fixed empty array type
+ widgets3D: any[]; // Fixed empty array type
+ snapshot?: string | null;
+}
+
+interface TemplateStore {
+ templates: Template[];
+ addTemplate: (template: Template) => void;
+ setTemplates: (templates: Template[]) => void; // Changed from `setTemplate`
+ removeTemplate: (id: string) => void;
+}
+
+export const useTemplateStore = create((set) => ({
+ templates: [],
+
+ // Add a new template to the list
+ addTemplate: (template) =>
+ set((state) => ({
+ templates: [...state.templates, template],
+ })),
+
+ // Set (replace) the templates list with a new array
+ setTemplates: (templates) =>
+ set(() => ({
+ templates, // Ensures no duplication
+ })),
+
+ // Remove a template by ID
+ removeTemplate: (id) =>
+ set((state) => ({
+ templates: state.templates.filter((t) => t.id !== id),
+ })),
+}));
+
+export default useTemplateStore;
+
diff --git a/app/src/store/useThemeStore.ts b/app/src/store/ui/useThemeStore.ts
similarity index 97%
rename from app/src/store/useThemeStore.ts
rename to app/src/store/ui/useThemeStore.ts
index cab0940..944a77f 100644
--- a/app/src/store/useThemeStore.ts
+++ b/app/src/store/ui/useThemeStore.ts
@@ -1,11 +1,11 @@
-import { create } from "zustand";
-
-interface ThemeState {
- themeColor: string[]; // This should be an array of strings
- setThemeColor: (colors: string[]) => void; // This function will accept an array of strings
-}
-
-export const useThemeStore = create((set) => ({
- themeColor: ["#5c87df", "#EEEEFE", "#969BA7"],
- setThemeColor: (colors) => set({ themeColor: colors }),
-}));
+import { create } from "zustand";
+
+interface ThemeState {
+ themeColor: string[]; // This should be an array of strings
+ setThemeColor: (colors: string[]) => void; // This function will accept an array of strings
+}
+
+export const useThemeStore = create((set) => ({
+ themeColor: ["#5c87df", "#EEEEFE", "#969BA7"],
+ setThemeColor: (colors) => set({ themeColor: colors }),
+}));
diff --git a/app/src/store/useUIToggleStore.ts b/app/src/store/ui/useUIToggleStore.ts
similarity index 96%
rename from app/src/store/useUIToggleStore.ts
rename to app/src/store/ui/useUIToggleStore.ts
index cbee72f..71ca96b 100644
--- a/app/src/store/useUIToggleStore.ts
+++ b/app/src/store/ui/useUIToggleStore.ts
@@ -1,53 +1,53 @@
-import { create } from "zustand";
-
-interface ToggleState {
- toggleUILeft: boolean;
- toggleUIRight: boolean;
- setToggleUI: (value1: boolean, value2: boolean) => void;
-}
-
-export const useToggleStore = create((set) => ({
- toggleUILeft: true,
- toggleUIRight: false,
- setToggleUI: (value1: boolean, value2: boolean) => {
- set({ toggleUILeft: value1, toggleUIRight: value2 });
- },
-}));
-
-interface PlayerState {
- hidePlayer: boolean;
- setHidePlayer: (hide: boolean) => void;
-}
-
-// Create the Zustand store
-export const usePlayerStore = create((set) => ({
- hidePlayer: false, // initial state
- setHidePlayer: (hide) => set({ hidePlayer: hide }), // state updater
-}));
-
-interface MouseNoteState {
- Leftnote: string;
- Middlenote: string;
- Rightnote: string;
- setNotes: (notes: {
- Leftnote: string;
- Middlenote: string;
- Rightnote: string;
- }) => void;
- setLeftnote: (note: string) => void;
- setMiddlenote: (note: string) => void;
- setRightnote: (note: string) => void;
- resetNotes: () => void;
-}
-
-export const useMouseNoteStore = create((set) => ({
- Leftnote: '',
- Middlenote: '',
- Rightnote: '',
- setNotes: (notes) => set(notes),
- setLeftnote: (note) => set({ Leftnote: note }),
- setMiddlenote: (note) => set({ Middlenote: note }),
- setRightnote: (note) => set({ Rightnote: note }),
- resetNotes: () =>
- set({ Leftnote: '', Middlenote: '', Rightnote: '' }),
-}));
+import { create } from "zustand";
+
+interface ToggleState {
+ toggleUILeft: boolean;
+ toggleUIRight: boolean;
+ setToggleUI: (value1: boolean, value2: boolean) => void;
+}
+
+export const useToggleStore = create((set) => ({
+ toggleUILeft: true,
+ toggleUIRight: false,
+ setToggleUI: (value1: boolean, value2: boolean) => {
+ set({ toggleUILeft: value1, toggleUIRight: value2 });
+ },
+}));
+
+interface PlayerState {
+ hidePlayer: boolean;
+ setHidePlayer: (hide: boolean) => void;
+}
+
+// Create the Zustand store
+export const usePlayerStore = create((set) => ({
+ hidePlayer: false, // initial state
+ setHidePlayer: (hide) => set({ hidePlayer: hide }), // state updater
+}));
+
+interface MouseNoteState {
+ Leftnote: string;
+ Middlenote: string;
+ Rightnote: string;
+ setNotes: (notes: {
+ Leftnote: string;
+ Middlenote: string;
+ Rightnote: string;
+ }) => void;
+ setLeftnote: (note: string) => void;
+ setMiddlenote: (note: string) => void;
+ setRightnote: (note: string) => void;
+ resetNotes: () => void;
+}
+
+export const useMouseNoteStore = create((set) => ({
+ Leftnote: '',
+ Middlenote: '',
+ Rightnote: '',
+ setNotes: (notes) => set(notes),
+ setLeftnote: (note) => set({ Leftnote: note }),
+ setMiddlenote: (note) => set({ Middlenote: note }),
+ setRightnote: (note) => set({ Rightnote: note }),
+ resetNotes: () =>
+ set({ Leftnote: '', Middlenote: '', Rightnote: '' }),
+}));
diff --git a/app/src/store/useWidgetStore.ts b/app/src/store/ui/useWidgetStore.ts
similarity index 97%
rename from app/src/store/useWidgetStore.ts
rename to app/src/store/ui/useWidgetStore.ts
index 2d73c77..ff70d6b 100644
--- a/app/src/store/useWidgetStore.ts
+++ b/app/src/store/ui/useWidgetStore.ts
@@ -1,35 +1,35 @@
-import { create } from "zustand";
-
-export interface Widget {
- id: string;
- type: string; // Can be chart type or "progress"
- panel: "top" | "bottom" | "left" | "right";
- title: string;
- fontFamily?: string;
- fontSize?: string;
- fontWeight?: string;
- data?: any;
- Data?:any;
-}
-
-interface WidgetStore {
- draggedAsset: Widget | null; // The currently dragged widget asset
- widgets: Widget[]; // List of all widgets
- selectedChartId: any;
- setDraggedAsset: (asset: Widget | null) => void; // Setter for draggedAsset
- addWidget: (widget: Widget) => void; // Add a new widget
- setWidgets: (widgets: Widget[]) => void; // Replace the entire widgets array
- setSelectedChartId: (widget: any | null) => void; // Set the selected chart/widget
-}
-
-// Create the store with Zustand
-export const useWidgetStore = create((set) => ({
- draggedAsset: null,
- widgets: [],
- selectedChartId: null, // Initialize as null, not as an array
- setDraggedAsset: (asset) => set({ draggedAsset: asset }),
- addWidget: (widget) =>
- set((state) => ({ widgets: [...state.widgets, widget] })),
- setWidgets: (widgets) => set({ widgets }),
- setSelectedChartId: (widget) => set({ selectedChartId: widget }),
-}));
+import { create } from "zustand";
+
+export interface Widget {
+ id: string;
+ type: string; // Can be chart type or "progress"
+ panel: "top" | "bottom" | "left" | "right";
+ title: string;
+ fontFamily?: string;
+ fontSize?: string;
+ fontWeight?: string;
+ data?: any;
+ Data?:any;
+}
+
+interface WidgetStore {
+ draggedAsset: Widget | null; // The currently dragged widget asset
+ widgets: Widget[]; // List of all widgets
+ selectedChartId: any;
+ setDraggedAsset: (asset: Widget | null) => void; // Setter for draggedAsset
+ addWidget: (widget: Widget) => void; // Add a new widget
+ setWidgets: (widgets: Widget[]) => void; // Replace the entire widgets array
+ setSelectedChartId: (widget: any | null) => void; // Set the selected chart/widget
+}
+
+// Create the store with Zustand
+export const useWidgetStore = create((set) => ({
+ draggedAsset: null,
+ widgets: [],
+ selectedChartId: null, // Initialize as null, not as an array
+ setDraggedAsset: (asset) => set({ draggedAsset: asset }),
+ addWidget: (widget) =>
+ set((state) => ({ widgets: [...state.widgets, widget] })),
+ setWidgets: (widgets) => set({ widgets }),
+ setSelectedChartId: (widget) => set({ selectedChartId: widget }),
+}));
diff --git a/app/src/utils/mouseUtils/mouseHelper.ts b/app/src/utils/mouseUtils/mouseHelper.ts
index fa309cc..b0f1101 100644
--- a/app/src/utils/mouseUtils/mouseHelper.ts
+++ b/app/src/utils/mouseUtils/mouseHelper.ts
@@ -1,4 +1,4 @@
-import { useMouseNoteStore } from "../../store/useUIToggleStore";
+import { useMouseNoteStore } from "../../store/ui/useUIToggleStore";
const actionNotes: Record = {
'left+CONTROL': 'Box Select',
diff --git a/app/src/utils/shortcutkeys/handleShortcutKeys.ts b/app/src/utils/shortcutkeys/handleShortcutKeys.ts
index 159eceb..cfedb34 100644
--- a/app/src/utils/shortcutkeys/handleShortcutKeys.ts
+++ b/app/src/utils/shortcutkeys/handleShortcutKeys.ts
@@ -1,8 +1,8 @@
import React, { useEffect } from "react";
-import useModuleStore, { useSubModuleStore, useThreeDStore } from "../../store/useModuleStore";
-import { usePlayerStore, useToggleStore } from "../../store/useUIToggleStore";
+import useModuleStore, { useSubModuleStore, useThreeDStore } from "../../store/ui/useModuleStore";
+import { usePlayerStore, useToggleStore } from "../../store/ui/useUIToggleStore";
import useVersionHistoryVisibleStore, { useActiveSubTool, useActiveTool, useAddAction, useDfxUpload, useRenameModeStore, useSaveVersion, useSelectedComment, useShortcutStore, useToggleView, useToolMode, useViewSceneStore } from "../../store/builder/store";
-import useCameraModeStore, { usePlayButtonStore } from "../../store/usePlayButtonStore";
+import useCameraModeStore, { usePlayButtonStore } from "../../store/ui/usePlayButtonStore";
import { detectModifierKeys } from "./detectModifierKeys";
import { useSelectedZoneStore } from "../../store/visualization/useZoneStore";
import { useLogger } from "../../components/ui/log/LoggerContext";