Merge conflicts remote-tracking branch 'origin/main' into ui

2025-03-27 16:16:31 +05:30
parent 49ea1b1ff2 c9d3287ad6
commit a906d9a60b
37 changed files with 1640 additions and 758 deletions
--- a/app/src/components/ui/componets/DraggableWidget.tsx
+++ b/app/src/components/ui/componets/DraggableWidget.tsx
@@ -45,9 +45,19 @@ export const DraggableWidget = ({
      activeSides: Side[];
      panelOrder: Side[];
      lockedPanels: Side[];
-      widgets: Widget[];
+      zoneId: string;
+      zoneViewPortTarget: number[];
+      zoneViewPortPosition: number[];
+      widgets: {
+        id: string;
+        type: string;
+        title: string;
+        panel: Side;
+        data: any;
+      }[];
    }>
  >;
+
  widget: any;
  hiddenPanels: string[];
  index: number;