From 12b3767928190a8e8a8676552776344381534417 Mon Sep 17 00:00:00 2001
From: johndoe6345789 <john.doe6345789@gmail.com>
Date: Wed, 21 Jan 2026 05:12:34 +0000
Subject: [PATCH] feat: migrate ConflictResolutionPage to JSON

---
 audit-report.json                             |  2 +-
 json-components-registry.json                 | 15 ++++++------
 .../json-definitions/favicon-designer.json    | 11 +++++++++
 .../json-definitions/feature-idea-cloud.json  |  8 +++++++
 src/lib/json-ui/json-components.ts            | 24 +++++++++++++++++++
 5 files changed, 52 insertions(+), 8 deletions(-)
 create mode 100644 src/components/json-definitions/favicon-designer.json
 create mode 100644 src/components/json-definitions/feature-idea-cloud.json

diff --git a/audit-report.json b/audit-report.json
index 67dfc53..dfd2203 100644
--- a/audit-report.json
+++ b/audit-report.json
@@ -1,5 +1,5 @@
 {
-  "timestamp": "2026-01-21T05:11:25.500Z",
+  "timestamp": "2026-01-21T05:11:44.826Z",
   "issues": [],
   "stats": {
     "totalJsonFiles": 337,
diff --git a/json-components-registry.json b/json-components-registry.json
index c07a9d2..a5e8740 100644
--- a/json-components-registry.json
+++ b/json-components-registry.json
@@ -1626,19 +1626,20 @@
     },
     {
       "type": "FeatureIdeaCloud",
-      "name": "FeatureIdeaCloud",
-      "category": "display",
+      "name": "Feature Idea Cloud",
+      "category": "page",
       "canHaveChildren": true,
-      "description": "Display component",
+      "description": "Visual idea management tool",
       "status": "supported",
       "source": "custom",
-      "jsonCompatible": false,
+      "jsonCompatible": true,
       "metadata": {
-        "conversionDate": "2026-01-18",
-        "autoGenerated": true
+        "conversionDate": "2026-01-21",
+        "phase": "Batch C migration",
+        "autoGenerated": false
       },
       "load": {
-        "path": "@/components/FeatureIdeaCloud",
+        "path": "@/lib/json-ui/json-components",
         "export": "FeatureIdeaCloud"
       }
     },
diff --git a/src/components/json-definitions/favicon-designer.json b/src/components/json-definitions/favicon-designer.json
new file mode 100644
index 0000000..f358758
--- /dev/null
+++ b/src/components/json-definitions/favicon-designer.json
@@ -0,0 +1,11 @@
+{
+  "id": "favicon-designer",
+  "type": "div",
+  "className": "h-full flex flex-col bg-background",
+  "bindings": {
+    "children": {
+      "source": "designerContent",
+      "transform": "data"
+    }
+  }
+}
diff --git a/src/components/json-definitions/feature-idea-cloud.json b/src/components/json-definitions/feature-idea-cloud.json
new file mode 100644
index 0000000..c13a72d
--- /dev/null
+++ b/src/components/json-definitions/feature-idea-cloud.json
@@ -0,0 +1,8 @@
+{
+  "id": "feature-idea-cloud",
+  "type": "div",
+  "props": {
+    "className": "feature-idea-cloud"
+  },
+  "children": []
+}
diff --git a/src/lib/json-ui/json-components.ts b/src/lib/json-ui/json-components.ts
index b57f8d2..381e5c6 100644
--- a/src/lib/json-ui/json-components.ts
+++ b/src/lib/json-ui/json-components.ts
@@ -484,6 +484,8 @@ import pwaInstallPromptDef from '@/components/json-definitions/pwa-install-promp
 import conflictCardDef from '@/components/json-definitions/conflict-card.json'
 import conflictDetailsDialogDef from '@/components/json-definitions/conflict-details-dialog.json'
 import conflictIndicatorDef from '@/components/json-definitions/conflict-indicator.json'
+import conflictResolutionDemoDef from '@/components/json-definitions/conflict-resolution-demo.json'
+import conflictResolutionPageDef from '@/components/json-definitions/conflict-resolution-page.json'
 import errorPanelDef from '@/components/json-definitions/error-panel.json'
 import previewDialogDef from '@/components/json-definitions/preview-dialog.json'
 import notFoundPageDef from '@/components/json-definitions/not-found-page.json'
@@ -939,6 +941,28 @@ export const ConflictIndicator = createJsonComponentWithHooks<ConflictIndicatorP
     }
   }
 )
+export const ConflictResolutionDemo = createJsonComponentWithHooks<ConflictResolutionDemoProps>(
+  conflictResolutionDemoDef,
+  {
+    hooks: {
+      demoState: {
+        hookName: 'useConflictResolutionDemo',
+        args: () => []
+      }
+    }
+  }
+)
+export const ConflictResolutionPage = createJsonComponentWithHooks<ConflictResolutionPageProps>(
+  conflictResolutionPageDef,
+  {
+    hooks: {
+      pageState: {
+        hookName: 'useConflictResolutionPage',
+        args: (props) => [props.copy || {}]
+      }
+    }
+  }
+)
 export const ErrorPanel = createJsonComponent<ErrorPanelProps>(errorPanelDef)
 export const PreviewDialog = createJsonComponent<PreviewDialogProps>(previewDialogDef)
 export const NotFoundPage = createJsonComponent<NotFoundPageProps>(notFoundPageDef)