Feature/blog editor upgrade

composer.json

@@ -12,7 +12,8 @@
     "require": {
         "ext-curl": "*",
         "ext-json": "*",
-        "neuron-php/mvc": "^0.9.5",
+        "neuron-php/mvc": "0.9.*",
+        "neuron-php/data": "0.9.*",
         "neuron-php/cli": "0.8.*",
         "neuron-php/jobs": "0.2.*",
         "neuron-php/orm": "0.1.*",
@@ -21,7 +22,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "9.*",
-        "mikey179/vfsstream": "^1.6"
+        "mikey179/vfsstream": "^1.6",
+        "neuron-php/scaffolding": "0.8.*"
     },
     "autoload": {
         "psr-4": {
@@ -38,10 +40,5 @@
         "psr-4": {
             "Tests\\": "tests/"
         }
-    },
-    "extra": {
-        "neuron": {
-            "cli-provider": "Neuron\\Cms\\Cli\\Provider"
-        }
     }
 }

resources/app/Initializers/AuthInitializer.php

@@ -29,7 +29,7 @@ public function run( array $argv = [] ): mixed
 		// Get Settings from Registry
 		$settings = Registry::getInstance()->get( 'Settings' );
 
-		if( !$settings || !$settings instanceof \Neuron\Data\Setting\SettingManager )
+		if( !$settings || !$settings instanceof \Neuron\Data\Settings\SettingManager )
 		{
 			Log::error( "Settings not found in Registry, skipping auth initialization" );
 			return null;

resources/app/Initializers/MaintenanceInitializer.php

@@ -44,7 +44,7 @@ public function run( array $argv = [] ): mixed
 		$config = null;
 		$settings = Registry::getInstance()->get( 'Settings' );
 
-		if( $settings && $settings instanceof \Neuron\Data\Setting\SettingManager )
+		if( $settings && $settings instanceof \Neuron\Data\Settings\SettingManager )
 		{
 			try
 			{

resources/app/Initializers/PasswordResetInitializer.php

@@ -6,7 +6,7 @@
 use Neuron\Cms\Services\Auth\PasswordResetter;
 use Neuron\Cms\Repositories\DatabasePasswordResetTokenRepository;
 use Neuron\Cms\Repositories\DatabaseUserRepository;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use Neuron\Log\Log;
 use Neuron\Patterns\Registry;
 use Neuron\Patterns\IRunnable;

resources/app/Initializers/RegistrationInitializer.php

@@ -31,7 +31,7 @@ public function run( array $argv = [] ): mixed
 		// Get Settings from Registry
 		$settings = Registry::getInstance()->get( 'Settings' );
 
-		if( !$settings || !$settings instanceof \Neuron\Data\Setting\SettingManager )
+		if( !$settings || !$settings instanceof \Neuron\Data\Settings\SettingManager )
 		{
 			Log::error( "Settings not found in Registry, skipping registration initialization" );
 			return null;

resources/database/migrate/20251119224525_add_content_raw_to_posts.php

@@ -0,0 +1,24 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+/**
+ * Add content_raw column to posts table for Editor.js JSON storage
+ */
+class AddContentRawToPosts extends AbstractMigration
+{
+	/**
+	 * Add content_raw column
+	 */
+	public function change()
+	{
+		$table = $this->table( 'posts' );
+
+		$table->addColumn( 'content_raw', 'text', [
+			'null' => false,
+			'default' => '{"blocks":[]}',
+			'after' => 'body',
+			'comment' => 'Editor.js JSON content'
+		] )->update();
+	}
+}

resources/views/admin/posts/create.php

@@ -6,7 +6,7 @@
 
 	<div class="card">
 		<div class="card-body">
-			<form method="POST" action="<?= route_path('admin_posts_store') ?>">
+			<form method="POST" action="<?= route_path('admin_posts_store') ?>" id="post-form">
 				<?= csrf_field() ?>
 
 				<div class="mb-3">
@@ -21,9 +21,12 @@
 				</div>
 
 				<div class="mb-3">
-					<label for="content" class="form-label">Content</label>
-					<textarea class="form-control" id="content" name="content" rows="15" required></textarea>
-					<small class="form-text text-muted">Markdown supported</small>
+					<label class="form-label">Content</label>
+					<div id="editorjs" style="border: 1px solid #ddd; border-radius: 0.25rem; padding: 20px; min-height: 400px; background: #fff;"></div>
+					<input type="hidden" name="content" id="content-json">
+					<small class="form-text text-muted">
+						Use shortcodes for dynamic content: <code>[latest-posts limit="5"]</code>
+					</small>
 				</div>
 
 				<div class="mb-3">
@@ -67,3 +70,74 @@
 		</div>
 	</div>
 </div>
+
+<!-- Load Editor.js -->
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/editorjs@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/header@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/list@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/image@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/quote@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/code@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/delimiter@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/raw@latest"></script>
+
+<script>
+const editor = new EditorJS({
+	holder: 'editorjs',
+
+	placeholder: 'Start writing your post content...',
+
+	tools: {
+		header: {
+			class: Header,
+			config: {
+				levels: [2, 3, 4],
+				defaultLevel: 2
+			}
+		},
+		list: {
+			class: List,
+			inlineToolbar: true
+		},
+		image: {
+			class: ImageTool,
+			config: {
+				endpoints: {
+					byFile: '/admin/upload/image'
+				}
+			}
+		},
+		quote: {
+			class: Quote,
+			inlineToolbar: true
+		},
+		code: CodeTool,
+		delimiter: Delimiter,
+		raw: {
+			class: RawTool,
+			config: {
+				placeholder: 'Enter HTML or shortcodes like [latest-posts limit="5"]'
+			}
+		}
+	},
+
+	onChange: async () => {
+		const savedData = await editor.save();
+		document.getElementById('content-json').value = JSON.stringify(savedData);
+	}
+});
+
+// Save content before submit
+document.getElementById('post-form').addEventListener('submit', async (e) => {
+	e.preventDefault();
+
+	try {
+		const savedData = await editor.save();
+		document.getElementById('content-json').value = JSON.stringify(savedData);
+		e.target.submit();
+	} catch (error) {
+		console.error('Error saving editor content:', error);
+		alert('Error preparing content. Please try again.');
+	}
+});
+</script>

resources/views/admin/posts/edit.php

@@ -6,7 +6,7 @@
 
 	<div class="card">
 		<div class="card-body">
-			<form method="POST" action="<?= route_path('admin_posts_update', ['id' => $post->getId()]) ?>">
+			<form method="POST" action="<?= route_path('admin_posts_update', ['id' => $post->getId()]) ?>" id="post-form">
 				<input type="hidden" name="_method" value="PUT">
 				<?= csrf_field() ?>
 
@@ -22,9 +22,12 @@
 				</div>
 
 				<div class="mb-3">
-					<label for="content" class="form-label">Content</label>
-					<textarea class="form-control" id="content" name="content" rows="15" required><?= htmlspecialchars( $post->getBody() ) ?></textarea>
-					<small class="form-text text-muted">Markdown supported</small>
+					<label class="form-label">Content</label>
+					<div id="editorjs" style="border: 1px solid #ddd; border-radius: 0.25rem; padding: 20px; min-height: 400px; background: #fff;"></div>
+					<input type="hidden" name="content" id="content-json">
+					<small class="form-text text-muted">
+						Use shortcodes for dynamic content: <code>[latest-posts limit="5"]</code>
+					</small>
 				</div>
 
 				<div class="mb-3">
@@ -75,3 +78,87 @@
 		</div>
 	</div>
 </div>
+
+<!-- Load Editor.js -->
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/editorjs@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/header@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/list@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/image@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/quote@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/code@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/delimiter@latest"></script>
+<script src="https://cdn.jsdelivr.net/npm/@editorjs/raw@latest"></script>
+
+<script>
+// Load existing content safely
+const existingContentJson = <?= json_encode($post->getContentRaw(), JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT) ?>;
+
+let existingContent;
+try {
+	existingContent = JSON.parse(existingContentJson);
+} catch (error) {
+	console.error('Failed to parse existing content:', error);
+	existingContent = { blocks: [] };
+}
+
+const editor = new EditorJS({
+	holder: 'editorjs',
+
+	data: existingContent,
+
+	placeholder: 'Start writing your post content...',
+
+	tools: {
+		header: {
+			class: Header,
+			config: {
+				levels: [2, 3, 4],
+				defaultLevel: 2
+			}
+		},
+		list: {
+			class: List,
+			inlineToolbar: true
+		},
+		image: {
+			class: ImageTool,
+			config: {
+				endpoints: {
+					byFile: '/admin/upload/image'
+				}
+			}
+		},
+		quote: {
+			class: Quote,
+			inlineToolbar: true
+		},
+		code: CodeTool,
+		delimiter: Delimiter,
+		raw: {
+			class: RawTool,
+			config: {
+				placeholder: 'Enter HTML or shortcodes like [latest-posts limit="5"]'
+			}
+		}
+	},
+
+	onChange: async () => {
+		const savedData = await editor.save();
+		document.getElementById('content-json').value = JSON.stringify(savedData);
+	}
+});
+
+// Save content before submit
+document.getElementById('post-form').addEventListener('submit', async (e) => {
+	e.preventDefault();
+
+	try {
+		const savedData = await editor.save();
+		document.getElementById('content-json').value = JSON.stringify(savedData);
+		e.target.submit();
+	} catch (error) {
+		console.error('Error saving editor content:', error);
+		alert('Error preparing content. Please try again.');
+	}
+});
+</script>