Merge Conflicts

This commit is contained in:
Sagnik
2026-04-12 02:07:43 +05:30
3 changed files with 2245 additions and 2025 deletions

View File

@@ -1,5 +1,201 @@
<<<<<<< HEAD
{"root":["../../src/app.tsx","../../src/main.tsx","../../src/app/oracle/page.tsx","../../src/components/layout/loginscreen.tsx","../../src/components/layout/sidebar.tsx","../../src/components/modules/catalyst.tsx","../../src/components/modules/dashboard.tsx","../../src/components/modules/groundtruthpicker.tsx","../../src/components/modules/inventory.tsx","../../src/components/modules/oracle.tsx","../../src/components/modules/sentinel.tsx","../../src/components/modules/settings.tsx","../../src/components/oracle/leadinspector.tsx","../../src/components/oracle/pipelineview.tsx","../../src/components/oracle/mockleads.ts","../../src/components/sentinel/journeyriver/inspectorpanel.tsx","../../src/components/sentinel/journeyriver/riverpath.tsx","../../src/components/sentinel/journeyriver/index.tsx","../../src/components/ui/accordion.tsx","../../src/components/ui/alert-dialog.tsx","../../src/components/ui/alert.tsx","../../src/components/ui/aspect-ratio.tsx","../../src/components/ui/avatar.tsx","../../src/components/ui/badge.tsx","../../src/components/ui/breadcrumb.tsx","../../src/components/ui/button-group.tsx","../../src/components/ui/button.tsx","../../src/components/ui/calendar.tsx","../../src/components/ui/card.tsx","../../src/components/ui/carousel.tsx","../../src/components/ui/chart.tsx","../../src/components/ui/checkbox.tsx","../../src/components/ui/collapsible.tsx","../../src/components/ui/command.tsx","../../src/components/ui/context-menu.tsx","../../src/components/ui/dialog.tsx","../../src/components/ui/drawer.tsx","../../src/components/ui/dropdown-menu.tsx","../../src/components/ui/empty.tsx","../../src/components/ui/field.tsx","../../src/components/ui/form.tsx","../../src/components/ui/hover-card.tsx","../../src/components/ui/input-group.tsx","../../src/components/ui/input-otp.tsx","../../src/components/ui/input.tsx","../../src/components/ui/item.tsx","../../src/components/ui/kbd.tsx","../../src/components/ui/label.tsx","../../src/components/ui/menubar.tsx","../../src/components/ui/navigation-menu.tsx","../../src/components/ui/pagination.tsx","../../src/components/ui/popover.tsx","../../src/components/ui/progress.tsx","../../src/components/ui/radio-group.tsx","../../src/components/ui/resizable.tsx","../../src/components/ui/scroll-area.tsx","../../src/components/ui/select.tsx","../../src/components/ui/separator.tsx","../../src/components/ui/sheet.tsx","../../src/components/ui/sidebar.tsx","../../src/components/ui/skeleton.tsx","../../src/components/ui/slider.tsx","../../src/components/ui/sonner.tsx","../../src/components/ui/spinner.tsx","../../src/components/ui/switch.tsx","../../src/components/ui/table.tsx","../../src/components/ui/tabs.tsx","../../src/components/ui/textarea.tsx","../../src/components/ui/toggle-group.tsx","../../src/components/ui/toggle.tsx","../../src/components/ui/tooltip.tsx","../../src/hooks/use-mobile.ts","../../src/lib/oraclequeryclient.ts","../../src/lib/utils.ts","../../src/oracle/components/branchbar.tsx","../../src/oracle/components/canvasviewport.tsx","../../src/oracle/components/componentregistry.tsx","../../src/oracle/components/promptrail.tsx","../../src/oracle/components/rollbackconfirmmodal.tsx","../../src/oracle/components/sharemodal.tsx","../../src/oracle/components/renderers/activitystreamrenderer.tsx","../../src/oracle/components/renderers/barchartrenderer.tsx","../../src/oracle/components/renderers/errornoticerenderer.tsx","../../src/oracle/components/renderers/geomaprenderer.tsx","../../src/oracle/components/renderers/kpitilerenderer.tsx","../../src/oracle/components/renderers/linechartrenderer.tsx","../../src/oracle/components/renderers/pipelineboardrenderer.tsx","../../src/oracle/components/renderers/rendererwrapper.tsx","../../src/oracle/components/renderers/tablerenderer.tsx","../../src/oracle/components/renderers/timelinerenderer.tsx","../../src/oracle/components/review/mergereviewdrawer.tsx","../../src/oracle/hooks/useoracleexecution.ts","../../src/oracle/hooks/useoraclepage.ts","../../src/oracle/lib/oracleapiclient.ts","../../src/oracle/lib/oracledemodata.ts","../../src/oracle/types/canvas.ts","../../src/store/usecurrencystore.ts","../../src/store/usemarketingstore.ts","../../src/store/usestore.ts","../../src/types/crm.ts","../../src/types/index.ts","../../src/utils/curvegenerator.ts"],"version":"5.9.3"}
{
"root": [
"../../src/app.tsx",
"../../src/main.tsx",
"../../src/app/oracle/page.tsx",
"../../src/components/layout/loginscreen.tsx",
"../../src/components/layout/sidebar.tsx",
"../../src/components/modules/catalyst.tsx",
"../../src/components/modules/dashboard.tsx",
"../../src/components/modules/groundtruthpicker.tsx",
"../../src/components/modules/inventory.tsx",
"../../src/components/modules/oracle.tsx",
"../../src/components/modules/sentinel.tsx",
"../../src/components/modules/settings.tsx",
"../../src/components/oracle/leadinspector.tsx",
"../../src/components/oracle/pipelineview.tsx",
"../../src/components/oracle/mockleads.ts",
"../../src/components/sentinel/journeyriver/inspectorpanel.tsx",
"../../src/components/sentinel/journeyriver/riverpath.tsx",
"../../src/components/sentinel/journeyriver/index.tsx",
"../../src/components/ui/accordion.tsx",
"../../src/components/ui/alert-dialog.tsx",
"../../src/components/ui/alert.tsx",
"../../src/components/ui/aspect-ratio.tsx",
"../../src/components/ui/avatar.tsx",
"../../src/components/ui/badge.tsx",
"../../src/components/ui/breadcrumb.tsx",
"../../src/components/ui/button-group.tsx",
"../../src/components/ui/button.tsx",
"../../src/components/ui/calendar.tsx",
"../../src/components/ui/card.tsx",
"../../src/components/ui/carousel.tsx",
"../../src/components/ui/chart.tsx",
"../../src/components/ui/checkbox.tsx",
"../../src/components/ui/collapsible.tsx",
"../../src/components/ui/command.tsx",
"../../src/components/ui/context-menu.tsx",
"../../src/components/ui/dialog.tsx",
"../../src/components/ui/drawer.tsx",
"../../src/components/ui/dropdown-menu.tsx",
"../../src/components/ui/empty.tsx",
"../../src/components/ui/field.tsx",
"../../src/components/ui/form.tsx",
"../../src/components/ui/hover-card.tsx",
"../../src/components/ui/input-group.tsx",
"../../src/components/ui/input-otp.tsx",
"../../src/components/ui/input.tsx",
"../../src/components/ui/item.tsx",
"../../src/components/ui/kbd.tsx",
"../../src/components/ui/label.tsx",
"../../src/components/ui/menubar.tsx",
"../../src/components/ui/navigation-menu.tsx",
"../../src/components/ui/pagination.tsx",
"../../src/components/ui/popover.tsx",
"../../src/components/ui/progress.tsx",
"../../src/components/ui/radio-group.tsx",
"../../src/components/ui/resizable.tsx",
"../../src/components/ui/scroll-area.tsx",
"../../src/components/ui/select.tsx",
"../../src/components/ui/separator.tsx",
"../../src/components/ui/sheet.tsx",
"../../src/components/ui/sidebar.tsx",
"../../src/components/ui/skeleton.tsx",
"../../src/components/ui/slider.tsx",
"../../src/components/ui/sonner.tsx",
"../../src/components/ui/spinner.tsx",
"../../src/components/ui/switch.tsx",
"../../src/components/ui/table.tsx",
"../../src/components/ui/tabs.tsx",
"../../src/components/ui/textarea.tsx",
"../../src/components/ui/toggle-group.tsx",
"../../src/components/ui/toggle.tsx",
"../../src/components/ui/tooltip.tsx",
"../../src/hooks/use-mobile.ts",
"../../src/lib/oraclequeryclient.ts",
"../../src/lib/utils.ts",
"../../src/oracle/components/branchbar.tsx",
"../../src/oracle/components/canvasviewport.tsx",
"../../src/oracle/components/componentregistry.tsx",
"../../src/oracle/components/promptrail.tsx",
"../../src/oracle/components/rollbackconfirmmodal.tsx",
"../../src/oracle/components/sharemodal.tsx",
"../../src/oracle/components/renderers/activitystreamrenderer.tsx",
"../../src/oracle/components/renderers/barchartrenderer.tsx",
"../../src/oracle/components/renderers/errornoticerenderer.tsx",
"../../src/oracle/components/renderers/geomaprenderer.tsx",
"../../src/oracle/components/renderers/kpitilerenderer.tsx",
"../../src/oracle/components/renderers/linechartrenderer.tsx",
"../../src/oracle/components/renderers/pipelineboardrenderer.tsx",
"../../src/oracle/components/renderers/rendererwrapper.tsx",
"../../src/oracle/components/renderers/tablerenderer.tsx",
"../../src/oracle/components/renderers/timelinerenderer.tsx",
"../../src/oracle/components/review/mergereviewdrawer.tsx",
"../../src/oracle/hooks/useoracleexecution.ts",
"../../src/oracle/hooks/useoraclepage.ts",
"../../src/oracle/lib/oracleapiclient.ts",
"../../src/oracle/lib/oracledemodata.ts",
"../../src/oracle/types/canvas.ts",
"../../src/store/usecurrencystore.ts",
"../../src/store/usemarketingstore.ts",
"../../src/store/usestore.ts",
"../../src/types/crm.ts",
"../../src/types/index.ts",
"../../src/utils/curvegenerator.ts"
],
"version": "5.9.3"
}
=======
{"root":["../../src/app.tsx","../../src/global.d.ts","../../src/main.tsx","../../src/app/oracle/page.tsx","../../src/components/layout/loginscreen.tsx","../../src/components/layout/notificationcenter.tsx","../../src/components/layout/sidebar.tsx","../../src/components/modules/catalyst.tsx","../../src/components/modules/dashboard.tsx","../../src/components/modules/inventory.tsx","../../src/components/modules/oracle.tsx","../../src/components/modules/sentinel.tsx","../../src/components/modules/settings.tsx","../../src/components/modules/sentinel/perceptionplayer.tsx","../../src/components/modules/sentinel/sentinellivesession.tsx","../../src/components/oracle/leadinspector.tsx","../../src/components/oracle/pipelineview.tsx","../../src/components/oracle/mockleads.ts","../../src/components/sentinel/journeyriver/inspectorpanel.tsx","../../src/components/sentinel/journeyriver/riverpath.tsx","../../src/components/sentinel/journeyriver/index.tsx","../../src/components/ui/accordion.tsx","../../src/components/ui/alert-dialog.tsx","../../src/components/ui/alert.tsx","../../src/components/ui/aspect-ratio.tsx","../../src/components/ui/avatar.tsx","../../src/components/ui/badge.tsx","../../src/components/ui/breadcrumb.tsx","../../src/components/ui/button-group.tsx","../../src/components/ui/button.tsx","../../src/components/ui/calendar.tsx","../../src/components/ui/card.tsx","../../src/components/ui/carousel.tsx","../../src/components/ui/chart.tsx","../../src/components/ui/checkbox.tsx","../../src/components/ui/collapsible.tsx","../../src/components/ui/command.tsx","../../src/components/ui/context-menu.tsx","../../src/components/ui/dialog.tsx","../../src/components/ui/drawer.tsx","../../src/components/ui/dropdown-menu.tsx","../../src/components/ui/empty.tsx","../../src/components/ui/field.tsx","../../src/components/ui/form.tsx","../../src/components/ui/hover-card.tsx","../../src/components/ui/input-group.tsx","../../src/components/ui/input-otp.tsx","../../src/components/ui/input.tsx","../../src/components/ui/item.tsx","../../src/components/ui/kbd.tsx","../../src/components/ui/label.tsx","../../src/components/ui/menubar.tsx","../../src/components/ui/navigation-menu.tsx","../../src/components/ui/pagination.tsx","../../src/components/ui/popover.tsx","../../src/components/ui/progress.tsx","../../src/components/ui/radio-group.tsx","../../src/components/ui/resizable.tsx","../../src/components/ui/scroll-area.tsx","../../src/components/ui/select.tsx","../../src/components/ui/separator.tsx","../../src/components/ui/sheet.tsx","../../src/components/ui/sidebar.tsx","../../src/components/ui/skeleton.tsx","../../src/components/ui/slider.tsx","../../src/components/ui/sonner.tsx","../../src/components/ui/spinner.tsx","../../src/components/ui/switch.tsx","../../src/components/ui/table.tsx","../../src/components/ui/tabs.tsx","../../src/components/ui/textarea.tsx","../../src/components/ui/toggle-group.tsx","../../src/components/ui/toggle.tsx","../../src/components/ui/tooltip.tsx","../../src/hooks/use-mobile.ts","../../src/hooks/usemediapipefacelandmarker.ts","../../src/hooks/usevelocitysocket.ts","../../src/lib/api.ts","../../src/lib/oraclequeryclient.ts","../../src/lib/utils.ts","../../src/store/usemarketingstore.ts","../../src/store/usestore.ts","../../src/types/crm.ts","../../src/types/index.ts","../../src/utils/curvegenerator.ts","../../src/utils/landmarkpacketencoder.ts"],"version":"5.9.3"}
{
"root": [
"../../src/app.tsx",
"../../src/global.d.ts",
"../../src/main.tsx",
"../../src/app/oracle/page.tsx",
"../../src/components/layout/loginscreen.tsx",
"../../src/components/layout/notificationcenter.tsx",
"../../src/components/layout/sidebar.tsx",
"../../src/components/modules/catalyst.tsx",
"../../src/components/modules/dashboard.tsx",
"../../src/components/modules/inventory.tsx",
"../../src/components/modules/oracle.tsx",
"../../src/components/modules/sentinel.tsx",
"../../src/components/modules/settings.tsx",
"../../src/components/modules/sentinel/perceptionplayer.tsx",
"../../src/components/modules/sentinel/sentinellivesession.tsx",
"../../src/components/oracle/leadinspector.tsx",
"../../src/components/oracle/pipelineview.tsx",
"../../src/components/oracle/mockleads.ts",
"../../src/components/sentinel/journeyriver/inspectorpanel.tsx",
"../../src/components/sentinel/journeyriver/riverpath.tsx",
"../../src/components/sentinel/journeyriver/index.tsx",
"../../src/components/ui/accordion.tsx",
"../../src/components/ui/alert-dialog.tsx",
"../../src/components/ui/alert.tsx",
"../../src/components/ui/aspect-ratio.tsx",
"../../src/components/ui/avatar.tsx",
"../../src/components/ui/badge.tsx",
"../../src/components/ui/breadcrumb.tsx",
"../../src/components/ui/button-group.tsx",
"../../src/components/ui/button.tsx",
"../../src/components/ui/calendar.tsx",
"../../src/components/ui/card.tsx",
"../../src/components/ui/carousel.tsx",
"../../src/components/ui/chart.tsx",
"../../src/components/ui/checkbox.tsx",
"../../src/components/ui/collapsible.tsx",
"../../src/components/ui/command.tsx",
"../../src/components/ui/context-menu.tsx",
"../../src/components/ui/dialog.tsx",
"../../src/components/ui/drawer.tsx",
"../../src/components/ui/dropdown-menu.tsx",
"../../src/components/ui/empty.tsx",
"../../src/components/ui/field.tsx",
"../../src/components/ui/form.tsx",
"../../src/components/ui/hover-card.tsx",
"../../src/components/ui/input-group.tsx",
"../../src/components/ui/input-otp.tsx",
"../../src/components/ui/input.tsx",
"../../src/components/ui/item.tsx",
"../../src/components/ui/kbd.tsx",
"../../src/components/ui/label.tsx",
"../../src/components/ui/menubar.tsx",
"../../src/components/ui/navigation-menu.tsx",
"../../src/components/ui/pagination.tsx",
"../../src/components/ui/popover.tsx",
"../../src/components/ui/progress.tsx",
"../../src/components/ui/radio-group.tsx",
"../../src/components/ui/resizable.tsx",
"../../src/components/ui/scroll-area.tsx",
"../../src/components/ui/select.tsx",
"../../src/components/ui/separator.tsx",
"../../src/components/ui/sheet.tsx",
"../../src/components/ui/sidebar.tsx",
"../../src/components/ui/skeleton.tsx",
"../../src/components/ui/slider.tsx",
"../../src/components/ui/sonner.tsx",
"../../src/components/ui/spinner.tsx",
"../../src/components/ui/switch.tsx",
"../../src/components/ui/table.tsx",
"../../src/components/ui/tabs.tsx",
"../../src/components/ui/textarea.tsx",
"../../src/components/ui/toggle-group.tsx",
"../../src/components/ui/toggle.tsx",
"../../src/components/ui/tooltip.tsx",
"../../src/hooks/use-mobile.ts",
"../../src/hooks/usemediapipefacelandmarker.ts",
"../../src/hooks/usevelocitysocket.ts",
"../../src/lib/api.ts",
"../../src/lib/oraclequeryclient.ts",
"../../src/lib/utils.ts",
"../../src/store/usemarketingstore.ts",
"../../src/store/usestore.ts",
"../../src/types/crm.ts",
"../../src/types/index.ts",
"../../src/utils/curvegenerator.ts",
"../../src/utils/landmarkpacketencoder.ts"
],
"version": "5.9.3"
}
>>>>>>> feat/#15

File diff suppressed because it is too large Load Diff

View File

@@ -235,22 +235,29 @@
"chunk-7GZ4CI6Q": {
"file": "chunk-7GZ4CI6Q.js"
},
"chunk-7GZ4CI6Q": {
"file": "chunk-7GZ4CI6Q.js"
},
"chunk-OAEA5FZL": {
"file": "chunk-OAEA5FZL.js"
},
"chunk-5ESDTKMP": {
"file": "chunk-5ESDTKMP.js""chunk-5ESDTKMP": {
"file": "chunk-5ESDTKMP.js"
},
"chunk-NJ4V5H3P": {
"file": "chunk-NJ4V5H3P.js""chunk-NJ4V5H3P": {
"file": "chunk-NJ4V5H3P.js"
},
"chunk-L3Z576C2": {
"file": "chunk-L3Z576C2.js"
},
"chunk-6MXH2QM6": {
"file": "chunk-6MXH2QM6.js""chunk-6MXH2QM6": {
"file": "chunk-6MXH2QM6.js"
},
"chunk-GUQHL3N7": {
"file": "chunk-GUQHL3N7.js""chunk-GUQHL3N7": {
"file": "chunk-GUQHL3N7.js"
},
"chunk-EQCCHGRT": {
@@ -259,6 +266,9 @@
"chunk-YWBEB5PG": {
"file": "chunk-YWBEB5PG.js"
},
"chunk-YWBEB5PG": {
"file": "chunk-YWBEB5PG.js"
},
"chunk-TXHHHGR3": {
"file": "chunk-TXHHHGR3.js"
},
@@ -268,6 +278,12 @@
"chunk-2VUH7NEY": {
"file": "chunk-2VUH7NEY.js"
},
"chunk-23FVUG5N": {
"file": "chunk-23FVUG5N.js"
},
"chunk-2VUH7NEY": {
"file": "chunk-2VUH7NEY.js"
},
"chunk-YF4B4G2L": {
"file": "chunk-YF4B4G2L.js"
=======
@@ -324,4 +340,4 @@
"file": "chunk-G3PMV62Z.js"
}
}
}
}