From 53b74a5bc88e0b64559a9c35c70d6b67d35ef96e Mon Sep 17 00:00:00 2001
From: Lee Jones <lee@dragonflyrg.com>
Date: Sat, 22 Nov 2025 12:16:11 -0600
Subject: [PATCH 1/4] fixes tests.

---
 ...0251119224525_add_content_raw_to_posts.php |  24 ++++
 resources/views/admin/posts/create.php        |  82 +++++++++++-
 resources/views/admin/posts/edit.php          |  95 ++++++++++++-
 resources/views/blog/show.php                 | 113 +++++++++++++++-
 src/Cms/Controllers/Blog.php                  |  14 ++
 src/Cms/Models/Post.php                       | 125 +++++++++++++++++-
 src/Cms/Services/Post/Creator.php             |   6 +-
 src/Cms/Services/Post/Updater.php             |   6 +-
 tests/Cms/Services/Post/CreatorTest.php       |  22 +--
 tests/Cms/Services/Post/UpdaterTest.php       |  26 ++--
 10 files changed, 477 insertions(+), 36 deletions(-)
 create mode 100644 resources/database/migrate/20251119224525_add_content_raw_to_posts.php

diff --git a/resources/database/migrate/20251119224525_add_content_raw_to_posts.php b/resources/database/migrate/20251119224525_add_content_raw_to_posts.php
new file mode 100644
index 0000000..e4af076
--- /dev/null
+++ b/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();
+	}
+}
diff --git a/resources/views/admin/posts/create.php b/resources/views/admin/posts/create.php
index 7ea1aa2..e609888 100644
--- a/resources/views/admin/posts/create.php
+++ b/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>
diff --git a/resources/views/admin/posts/edit.php b/resources/views/admin/posts/edit.php
index 8ad2185..86d0203 100644
--- a/resources/views/admin/posts/edit.php
+++ b/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>
diff --git a/resources/views/blog/show.php b/resources/views/blog/show.php
index fb0b3a7..a7d7304 100644
--- a/resources/views/blog/show.php
+++ b/resources/views/blog/show.php
@@ -36,7 +36,7 @@
 		<?php endif; ?>
 
 		<div class="post-content">
-			<?= $renderedContent ?? htmlspecialchars( $Post->getBody() ) ?>
+			<?= $renderedContent ?>
 		</div>
 	</article>
 
@@ -47,3 +47,114 @@
 	</div>
 	<?php endif; ?>
 </div>
+
+<style>
+/* Post content styles */
+.post-content {
+	max-width: 800px;
+	margin: 0 auto;
+}
+
+.post-content h2 {
+	margin-top: 2rem;
+	margin-bottom: 1rem;
+	font-weight: 600;
+}
+
+.post-content h3 {
+	margin-top: 1.5rem;
+	margin-bottom: 0.75rem;
+	font-weight: 600;
+}
+
+.post-content h4 {
+	margin-top: 1.25rem;
+	margin-bottom: 0.5rem;
+	font-weight: 600;
+}
+
+.post-content p {
+	margin-bottom: 1rem;
+	line-height: 1.7;
+}
+
+.post-content ul,
+.post-content ol {
+	margin-bottom: 1rem;
+	padding-left: 2rem;
+}
+
+.post-content li {
+	margin-bottom: 0.5rem;
+	line-height: 1.6;
+}
+
+.post-content blockquote {
+	padding-left: 1.5rem;
+	border-left: 4px solid #dee2e6;
+	margin: 1.5rem 0;
+	color: #6c757d;
+}
+
+.post-content img {
+	max-width: 100%;
+	height: auto;
+	border-radius: 0.25rem;
+}
+
+.post-content figure {
+	margin: 2rem 0;
+}
+
+.post-content figcaption {
+	margin-top: 0.5rem;
+	font-size: 0.875rem;
+}
+
+.post-content pre {
+	background: #f8f9fa;
+	padding: 1rem;
+	border-radius: 0.25rem;
+	overflow-x: auto;
+}
+
+.post-content code {
+	background: #f8f9fa;
+	padding: 0.2rem 0.4rem;
+	border-radius: 0.25rem;
+	font-size: 0.875em;
+}
+
+.post-content pre code {
+	background: transparent;
+	padding: 0;
+}
+
+.post-content hr {
+	margin: 2rem 0;
+	border: 0;
+	border-top: 1px solid #dee2e6;
+}
+
+/* Widget styles */
+.post-content .latest-posts-widget {
+	margin: 2rem 0;
+	padding: 1.5rem;
+	background: #f8f9fa;
+	border-radius: 0.5rem;
+}
+
+.post-content .contact-form-widget {
+	margin: 2rem 0;
+	padding: 1.5rem;
+	background: #fff;
+	border: 1px solid #dee2e6;
+	border-radius: 0.5rem;
+}
+
+.post-content .map-widget {
+	margin: 2rem 0;
+	border-radius: 0.5rem;
+	overflow: hidden;
+}
+</style>
diff --git a/src/Cms/Controllers/Blog.php b/src/Cms/Controllers/Blog.php
index 749b10e..eee87a6 100644
--- a/src/Cms/Controllers/Blog.php
+++ b/src/Cms/Controllers/Blog.php
@@ -6,6 +6,9 @@
 use Neuron\Cms\Repositories\DatabasePostRepository;
 use Neuron\Cms\Repositories\DatabaseCategoryRepository;
 use Neuron\Cms\Repositories\DatabaseTagRepository;
+use Neuron\Cms\Services\Content\EditorJsRenderer;
+use Neuron\Cms\Services\Content\ShortcodeParser;
+use Neuron\Cms\Services\Widget\WidgetRenderer;
 use Neuron\Core\Exceptions\NotFound;
 use Neuron\Mvc\Application;
 use Neuron\Mvc\Requests\Request;
@@ -17,6 +20,7 @@ class Blog extends Content
 	private DatabasePostRepository $_postRepository;
 	private DatabaseCategoryRepository $_categoryRepository;
 	private DatabaseTagRepository $_tagRepository;
+	private EditorJsRenderer $_renderer;
 
 	/**
 	 * @param Application|null $app
@@ -33,6 +37,11 @@ public function __construct( ?Application $app = null )
 		$this->_postRepository = new DatabasePostRepository( $settings );
 		$this->_categoryRepository = new DatabaseCategoryRepository( $settings );
 		$this->_tagRepository = new DatabaseTagRepository( $settings );
+
+		// Initialize renderer with shortcode support
+		$widgetRenderer = new WidgetRenderer( $this->_postRepository );
+		$shortcodeParser = new ShortcodeParser( $widgetRenderer );
+		$this->_renderer = new EditorJsRenderer( $shortcodeParser );
 	}
 
 	/**
@@ -94,12 +103,17 @@ public function show( Request $request ): string
 		$categories = $this->_categoryRepository->all();
 		$tags = $this->_tagRepository->all();
 
+		// Render content from Editor.js JSON
+		$content = $post->getContent();
+		$renderedContent = $this->_renderer->render( $content );
+
 		return $this->renderHtml(
 			HttpResponseStatus::OK,
 			[
 				'Categories' => $categories,
 				'Tags'        => $tags,
 				'Post'        => $post,
+				'renderedContent' => $renderedContent,
 				'Title'       => $post->getTitle() . ' | ' . $this->getName()
 			],
 			'show'
diff --git a/src/Cms/Models/Post.php b/src/Cms/Models/Post.php
index 2b4db19..0b70a77 100644
--- a/src/Cms/Models/Post.php
+++ b/src/Cms/Models/Post.php
@@ -18,7 +18,8 @@ class Post extends Model
 	private ?int $_id = null;
 	private string $_title;
 	private string $_slug;
-	private string $_body;
+	private string $_body = '';  // Plain text fallback, derived from contentRaw
+	private string $_contentRaw = '{"blocks":[]}';  // JSON string for Editor.js
 	private ?string $_excerpt = null;
 	private ?string $_featuredImage = null;
 	private int $_authorId;
@@ -118,6 +119,55 @@ public function setBody( string $body ): self
 		return $this;
 	}
 
+	/**
+	 * Get content as array (decoded Editor.js JSON)
+	 */
+	public function getContent(): array
+	{
+		return json_decode( $this->_contentRaw, true ) ?? ['blocks' => []];
+	}
+
+	/**
+	 * Get raw content JSON string
+	 */
+	public function getContentRaw(): string
+	{
+		return $this->_contentRaw;
+	}
+
+	/**
+	 * Set content from Editor.js JSON string
+	 * Also extracts plain text to _body for backward compatibility
+	 */
+	public function setContent( string $jsonContent ): self
+	{
+		$this->_contentRaw = $jsonContent;
+		$this->_body = $this->extractPlainText( $jsonContent );
+		return $this;
+	}
+
+	/**
+	 * Set content from array (will be JSON encoded)
+	 * Also extracts plain text to _body for backward compatibility
+	 * @param array $content Content array to encode
+	 * @return self
+	 * @throws \JsonException If JSON encoding fails
+	 */
+	public function setContentArray( array $content ): self
+	{
+		$encoded = json_encode( $content );
+
+		if( $encoded === false )
+		{
+			$error = json_last_error_msg();
+			throw new \JsonException( "Failed to encode content array to JSON: {$error}" );
+		}
+
+		$this->_contentRaw = $encoded;
+		$this->_body = $this->extractPlainText( $encoded );
+		return $this;
+	}
+
 	/**
 	 * Get excerpt
 	 */
@@ -447,6 +497,31 @@ public static function fromArray( array $data ): static
 		$post->setTitle( $data['title'] ?? '' );
 		$post->setSlug( $data['slug'] ?? '' );
 		$post->setBody( $data['body'] ?? '' );
+
+		// Handle content (could be JSON string or array)
+		if( isset( $data['content_raw'] ) )
+		{
+			if( is_string( $data['content_raw'] ) )
+			{
+				$post->setContent( $data['content_raw'] );
+			}
+			elseif( is_array( $data['content_raw'] ) )
+			{
+				$post->setContentArray( $data['content_raw'] );
+			}
+		}
+		elseif( isset( $data['content'] ) )
+		{
+			if( is_string( $data['content'] ) )
+			{
+				$post->setContent( $data['content'] );
+			}
+			elseif( is_array( $data['content'] ) )
+			{
+				$post->setContentArray( $data['content'] );
+			}
+		}
+
 		$post->setExcerpt( $data['excerpt'] ?? null );
 		$post->setFeaturedImage( $data['featured_image'] ?? null );
 		$post->setAuthorId( (int)($data['author_id'] ?? 0) );
@@ -511,6 +586,7 @@ public function toArray(): array
 			'title' => $this->_title,
 			'slug' => $this->_slug,
 			'body' => $this->_body,
+			'content_raw' => $this->_contentRaw,
 			'excerpt' => $this->_excerpt,
 			'featured_image' => $this->_featuredImage,
 			'author_id' => $this->_authorId,
@@ -521,4 +597,51 @@ public function toArray(): array
 			'updated_at' => $this->_updatedAt?->format( 'Y-m-d H:i:s' ),
 		];
 	}
+
+	/**
+	 * Extract plain text from Editor.js JSON content
+	 *
+	 * @param string $jsonContent Editor.js JSON string
+	 * @return string Plain text extracted from blocks
+	 */
+	private function extractPlainText( string $jsonContent ): string
+	{
+		$data = json_decode( $jsonContent, true );
+
+		if( !$data || !isset( $data['blocks'] ) || !is_array( $data['blocks'] ) )
+		{
+			return '';
+		}
+
+		$text = [];
+
+		foreach( $data['blocks'] as $block )
+		{
+			if( !isset( $block['type'] ) || !isset( $block['data'] ) )
+			{
+				continue;
+			}
+
+			$blockText = match( $block['type'] )
+			{
+				'paragraph', 'header' => $block['data']['text'] ?? '',
+				'list' => isset( $block['data']['items'] ) && is_array( $block['data']['items'] )
+					? implode( "\n", $block['data']['items'] )
+					: '',
+				'quote' => $block['data']['text'] ?? '',
+				'code' => $block['data']['code'] ?? '',
+				'raw' => $block['data']['html'] ?? '',
+				default => ''
+			};
+
+			if( $blockText !== '' )
+			{
+				// Strip HTML tags from text
+				$blockText = strip_tags( $blockText );
+				$text[] = trim( $blockText );
+			}
+		}
+
+		return implode( "\n\n", array_filter( $text ) );
+	}
 }
diff --git a/src/Cms/Services/Post/Creator.php b/src/Cms/Services/Post/Creator.php
index afe0df6..9e1192c 100644
--- a/src/Cms/Services/Post/Creator.php
+++ b/src/Cms/Services/Post/Creator.php
@@ -36,7 +36,7 @@ public function __construct(
 	 * Create a new post
 	 *
 	 * @param string $title Post title
-	 * @param string $body Post body content
+	 * @param string $content Editor.js JSON content
 	 * @param int $authorId Author user ID
 	 * @param string $status Post status (draft, published, scheduled)
 	 * @param string|null $slug Optional custom slug (auto-generated if not provided)
@@ -48,7 +48,7 @@ public function __construct(
 	 */
 	public function create(
 		string $title,
-		string $body,
+		string $content,
 		int $authorId,
 		string $status,
 		?string $slug = null,
@@ -61,7 +61,7 @@ public function create(
 		$post = new Post();
 		$post->setTitle( $title );
 		$post->setSlug( $slug ?: $this->generateSlug( $title ) );
-		$post->setBody( $body );
+		$post->setContent( $content );
 		$post->setExcerpt( $excerpt );
 		$post->setFeaturedImage( $featuredImage );
 		$post->setAuthorId( $authorId );
diff --git a/src/Cms/Services/Post/Updater.php b/src/Cms/Services/Post/Updater.php
index 3ed0eb5..7a199ca 100644
--- a/src/Cms/Services/Post/Updater.php
+++ b/src/Cms/Services/Post/Updater.php
@@ -36,7 +36,7 @@ public function __construct(
 	 *
 	 * @param Post $post The post to update
 	 * @param string $title Post title
-	 * @param string $body Post body content
+	 * @param string $content Editor.js JSON content
 	 * @param string $status Post status
 	 * @param string|null $slug Custom slug
 	 * @param string|null $excerpt Excerpt
@@ -48,7 +48,7 @@ public function __construct(
 	public function update(
 		Post $post,
 		string $title,
-		string $body,
+		string $content,
 		string $status,
 		?string $slug = null,
 		?string $excerpt = null,
@@ -59,7 +59,7 @@ public function update(
 	{
 		$post->setTitle( $title );
 		$post->setSlug( $slug ?: $this->generateSlug( $title ) );
-		$post->setBody( $body );
+		$post->setContent( $content );
 		$post->setExcerpt( $excerpt );
 		$post->setFeaturedImage( $featuredImage );
 		$post->setStatus( $status );
diff --git a/tests/Cms/Services/Post/CreatorTest.php b/tests/Cms/Services/Post/CreatorTest.php
index f936088..3c2bf18 100644
--- a/tests/Cms/Services/Post/CreatorTest.php
+++ b/tests/Cms/Services/Post/CreatorTest.php
@@ -42,11 +42,14 @@ public function testCreatesPostWithRequiredFields(): void
 			->method( 'resolveFromString' )
 			->willReturn( [] );
 
+		$editorJsContent = '{"blocks":[{"type":"paragraph","data":{"text":"Test body content"}}]}';
+
 		$this->_mockPostRepository
 			->expects( $this->once() )
 			->method( 'create' )
-			->with( $this->callback( function( Post $post ) {
+			->with( $this->callback( function( Post $post ) use ( $editorJsContent ) {
 				return $post->getTitle() === 'Test Post'
+					&& $post->getContentRaw() === $editorJsContent
 					&& $post->getBody() === 'Test body content'
 					&& $post->getAuthorId() === 1
 					&& $post->getStatus() === Post::STATUS_DRAFT
@@ -56,12 +59,13 @@ public function testCreatesPostWithRequiredFields(): void
 
 		$result = $this->_creator->create(
 			'Test Post',
-			'Test body content',
+			$editorJsContent,
 			1,
 			Post::STATUS_DRAFT
 		);
 
 		$this->assertEquals( 'Test Post', $result->getTitle() );
+		$this->assertEquals( $editorJsContent, $result->getContentRaw() );
 		$this->assertEquals( 'Test body content', $result->getBody() );
 	}
 
@@ -85,7 +89,7 @@ public function testGeneratesSlugWhenNotProvided(): void
 
 		$result = $this->_creator->create(
 			'Test Post Title',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			1,
 			Post::STATUS_DRAFT
 		);
@@ -113,7 +117,7 @@ public function testUsesCustomSlugWhenProvided(): void
 
 		$result = $this->_creator->create(
 			'Test Post',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			1,
 			Post::STATUS_DRAFT,
 			'custom-slug'
@@ -143,7 +147,7 @@ public function testSetsPublishedDateForPublishedPosts(): void
 
 		$result = $this->_creator->create(
 			'Published Post',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			1,
 			Post::STATUS_PUBLISHED
 		);
@@ -172,7 +176,7 @@ public function testDoesNotSetPublishedDateForDraftPosts(): void
 
 		$result = $this->_creator->create(
 			'Draft Post',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			1,
 			Post::STATUS_DRAFT
 		);
@@ -213,7 +217,7 @@ public function testAttachesCategoriesToPost(): void
 
 		$result = $this->_creator->create(
 			'Test Post',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			1,
 			Post::STATUS_DRAFT,
 			null,
@@ -258,7 +262,7 @@ public function testResolvesTags(): void
 
 		$result = $this->_creator->create(
 			'Test Post',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			1,
 			Post::STATUS_DRAFT,
 			null,
@@ -292,7 +296,7 @@ public function testSetsOptionalFields(): void
 
 		$result = $this->_creator->create(
 			'Test Post',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			1,
 			Post::STATUS_DRAFT,
 			null,
diff --git a/tests/Cms/Services/Post/UpdaterTest.php b/tests/Cms/Services/Post/UpdaterTest.php
index a5881b2..a4209df 100644
--- a/tests/Cms/Services/Post/UpdaterTest.php
+++ b/tests/Cms/Services/Post/UpdaterTest.php
@@ -36,7 +36,9 @@ public function testUpdatesPostWithRequiredFields(): void
 		$post = new Post();
 		$post->setId( 1 );
 		$post->setTitle( 'Original Title' );
-		$post->setBody( 'Original Body' );
+		$post->setContent( '{"blocks":[{"type":"paragraph","data":{"text":"Original Body"}}]}' );
+
+		$updatedContent = '{"blocks":[{"type":"paragraph","data":{"text":"Updated Body"}}]}';
 
 		$this->_mockCategoryRepository
 			->method( 'findByIds' )
@@ -49,8 +51,9 @@ public function testUpdatesPostWithRequiredFields(): void
 		$this->_mockPostRepository
 			->expects( $this->once() )
 			->method( 'update' )
-			->with( $this->callback( function( Post $p ) {
+			->with( $this->callback( function( Post $p ) use ( $updatedContent ) {
 				return $p->getTitle() === 'Updated Title'
+					&& $p->getContentRaw() === $updatedContent
 					&& $p->getBody() === 'Updated Body'
 					&& $p->getStatus() === Post::STATUS_PUBLISHED;
 			} ) );
@@ -58,11 +61,12 @@ public function testUpdatesPostWithRequiredFields(): void
 		$result = $this->_updater->update(
 			$post,
 			'Updated Title',
-			'Updated Body',
+			$updatedContent,
 			Post::STATUS_PUBLISHED
 		);
 
 		$this->assertEquals( 'Updated Title', $result->getTitle() );
+		$this->assertEquals( $updatedContent, $result->getContentRaw() );
 		$this->assertEquals( 'Updated Body', $result->getBody() );
 		$this->assertEquals( Post::STATUS_PUBLISHED, $result->getStatus() );
 	}
@@ -90,7 +94,7 @@ public function testGeneratesSlugWhenNotProvided(): void
 		$result = $this->_updater->update(
 			$post,
 			'New Post Title',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			Post::STATUS_DRAFT
 		);
 
@@ -120,7 +124,7 @@ public function testUsesProvidedSlug(): void
 		$result = $this->_updater->update(
 			$post,
 			'Title',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			Post::STATUS_DRAFT,
 			'custom-slug'
 		);
@@ -164,7 +168,7 @@ public function testUpdatesCategories(): void
 		$result = $this->_updater->update(
 			$post,
 			'Title',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			Post::STATUS_DRAFT,
 			null,
 			null,
@@ -211,7 +215,7 @@ public function testUpdatesTags(): void
 		$result = $this->_updater->update(
 			$post,
 			'Title',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			Post::STATUS_DRAFT,
 			null,
 			null,
@@ -247,7 +251,7 @@ public function testUpdatesOptionalFields(): void
 		$result = $this->_updater->update(
 			$post,
 			'Title',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			Post::STATUS_DRAFT,
 			null,
 			'New excerpt',
@@ -278,7 +282,7 @@ public function testReturnsUpdatedPost(): void
 		$result = $this->_updater->update(
 			$post,
 			'Updated',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			Post::STATUS_DRAFT
 		);
 
@@ -314,7 +318,7 @@ public function testSetsPublishedAtWhenChangingToPublished(): void
 		$result = $this->_updater->update(
 			$post,
 			'Published Post',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			Post::STATUS_PUBLISHED
 		);
 
@@ -350,7 +354,7 @@ public function testDoesNotOverwriteExistingPublishedAt(): void
 		$result = $this->_updater->update(
 			$post,
 			'Updated Published Post',
-			'Body',
+			'{"blocks":[{"type":"paragraph","data":{"text":"Body"}}]}',
 			Post::STATUS_PUBLISHED
 		);
 

From e0e76e190202611e165628bc2a322ef3ca113274 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee@dragonflyrg.com>
Date: Tue, 25 Nov 2025 10:35:40 -0600
Subject: [PATCH 2/4] cleans up commands

---
 composer.json                                 |   8 +-
 .../Cli/Commands/Generate/EmailCommand.php    | 156 -------
 .../Cli/Commands/Generate/stubs/email.stub    |  61 ---
 .../Commands/Maintenance/DisableCommand.php   | 142 ------
 .../Commands/Maintenance/EnableCommand.php    | 228 ----------
 .../Commands/Maintenance/StatusCommand.php    | 259 -----------
 src/Cms/Cli/Commands/Queue/InstallCommand.php | 413 ------------------
 src/Cms/Cli/Commands/User/CreateCommand.php   | 197 ---------
 src/Cms/Cli/Commands/User/DeleteCommand.php   | 148 -------
 src/Cms/Cli/Commands/User/ListCommand.php     | 165 -------
 src/Cms/Cli/Provider.php                      |  12 -
 11 files changed, 2 insertions(+), 1787 deletions(-)
 delete mode 100644 src/Cms/Cli/Commands/Generate/EmailCommand.php
 delete mode 100644 src/Cms/Cli/Commands/Generate/stubs/email.stub
 delete mode 100644 src/Cms/Cli/Commands/Maintenance/DisableCommand.php
 delete mode 100644 src/Cms/Cli/Commands/Maintenance/EnableCommand.php
 delete mode 100644 src/Cms/Cli/Commands/Maintenance/StatusCommand.php
 delete mode 100644 src/Cms/Cli/Commands/Queue/InstallCommand.php
 delete mode 100644 src/Cms/Cli/Commands/User/CreateCommand.php
 delete mode 100644 src/Cms/Cli/Commands/User/DeleteCommand.php
 delete mode 100644 src/Cms/Cli/Commands/User/ListCommand.php

diff --git a/composer.json b/composer.json
index f223058..f2fa020 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "9.*",
-        "mikey179/vfsstream": "^1.6"
+        "mikey179/vfsstream": "^1.6",
+        "neuron-php/scaffolding": "0.8.*"
     },
     "autoload": {
         "psr-4": {
@@ -38,10 +39,5 @@
         "psr-4": {
             "Tests\\": "tests/"
         }
-    },
-    "extra": {
-        "neuron": {
-            "cli-provider": "Neuron\\Cms\\Cli\\Provider"
-        }
     }
 }
diff --git a/src/Cms/Cli/Commands/Generate/EmailCommand.php b/src/Cms/Cli/Commands/Generate/EmailCommand.php
deleted file mode 100644
index 4f5fd5a..0000000
--- a/src/Cms/Cli/Commands/Generate/EmailCommand.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-namespace Neuron\Cms\Cli\Commands\Generate;
-
-use Neuron\Cli\Commands\Command;
-
-/**
- * Generate email template files
- */
-class EmailCommand extends Command
-{
-	private string $_projectPath;
-	private string $_componentPath;
-
-	public function __construct()
-	{
-		$this->_projectPath = getcwd();
-		$this->_componentPath = dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) );
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string
-	{
-		return 'mail:generate';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getDescription(): string
-	{
-		return 'Generate a new email template';
-	}
-
-	/**
-	 * Configure the command
-	 */
-	public function configure(): void
-	{
-		// No additional configuration needed
-	}
-
-	/**
-	 * Execute the command
-	 */
-	public function execute( array $parameters = [] ): int
-	{
-		// Get template name from first parameter
-		$templateName = $parameters[0] ?? null;
-
-		if( !$templateName )
-		{
-			$this->output->error( "Please provide a template name" );
-			$this->output->info( "Usage: php neuron mail:generate <name>" );
-			$this->output->info( "Example: php neuron mail:generate welcome" );
-			return 1;
-		}
-
-		// Validate template name (should be lowercase with hyphens)
-		if( !preg_match( '/^[a-z][a-z0-9-]*$/', $templateName ) )
-		{
-			$this->output->error( "Template name must be lowercase and contain only letters, numbers, and hyphens" );
-			$this->output->error( "Example: welcome, password-reset, order-confirmation" );
-			return 1;
-		}
-
-		// Create the template file
-		if( !$this->createTemplate( $templateName ) )
-		{
-			return 1;
-		}
-
-		$this->output->success( "Email template created successfully!" );
-		$this->output->info( "Template: resources/views/emails/{$templateName}.php" );
-		$this->output->info( "" );
-		$this->output->info( "Usage in code:" );
-		$this->output->info( "  email()->to('user@example.com')" );
-		$this->output->info( "         ->subject('Welcome!')" );
-		$this->output->info( "         ->template('emails/{$templateName}', \$data)" );
-		$this->output->info( "         ->send();" );
-
-		return 0;
-	}
-
-	/**
-	 * Create the template file
-	 */
-	private function createTemplate( string $name ): bool
-	{
-		$emailsDir = $this->_projectPath . '/resources/views/emails';
-
-		// Create emails directory if it doesn't exist
-		if( !is_dir( $emailsDir ) )
-		{
-			if( !mkdir( $emailsDir, 0755, true ) )
-			{
-				$this->output->error( "Failed to create emails directory" );
-				return false;
-			}
-		}
-
-		$filePath = $emailsDir . '/' . $name . '.php';
-
-		// Check if file already exists
-		if( file_exists( $filePath ) )
-		{
-			$this->output->error( "Template already exists: resources/views/emails/{$name}.php" );
-			return false;
-		}
-
-		// Load stub template
-		$stubPath = $this->_componentPath . '/src/Cms/Cli/Commands/Generate/stubs/email.stub';
-
-		if( !file_exists( $stubPath ) )
-		{
-			$this->output->error( "Stub template not found: {$stubPath}" );
-			return false;
-		}
-
-		$content = file_get_contents( $stubPath );
-
-		// Create title from name (e.g., "welcome" -> "Welcome", "password-reset" -> "Password Reset")
-		$title = ucwords( str_replace( '-', ' ', $name ) );
-
-		// Replace placeholders
-		$replacements = [
-			'title' => $title,
-			'content' => '<p>Your email content goes here.</p>'
-		];
-
-		$content = $this->replacePlaceholders( $content, $replacements );
-
-		// Write the file
-		if( file_put_contents( $filePath, $content ) === false )
-		{
-			$this->output->error( "Failed to create template file" );
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Replace placeholders in content
-	 */
-	private function replacePlaceholders( string $content, array $replacements ): string
-	{
-		foreach( $replacements as $key => $value )
-		{
-			$content = str_replace( '{{' . $key . '}}', $value ?? '', $content );
-		}
-		return $content;
-	}
-}
diff --git a/src/Cms/Cli/Commands/Generate/stubs/email.stub b/src/Cms/Cli/Commands/Generate/stubs/email.stub
deleted file mode 100644
index 15a922d..0000000
--- a/src/Cms/Cli/Commands/Generate/stubs/email.stub
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{title}}</title>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            line-height: 1.6;
-            color: #333;
-            max-width: 600px;
-            margin: 0 auto;
-            padding: 20px;
-        }
-        .header {
-            background-color: #f8f9fa;
-            padding: 20px;
-            text-align: center;
-            border-bottom: 3px solid #007bff;
-        }
-        .content {
-            padding: 30px 20px;
-        }
-        .footer {
-            background-color: #f8f9fa;
-            padding: 20px;
-            text-align: center;
-            font-size: 12px;
-            color: #6c757d;
-            border-top: 1px solid #dee2e6;
-        }
-        .button {
-            display: inline-block;
-            padding: 12px 24px;
-            background-color: #007bff;
-            color: #ffffff;
-            text-decoration: none;
-            border-radius: 4px;
-            margin: 20px 0;
-        }
-    </style>
-</head>
-<body>
-    <div class="header">
-        <h1>{{title}}</h1>
-    </div>
-
-    <div class="content">
-        <p>Hello,</p>
-
-        {{content}}
-
-        <p>Best regards,<br>Your Team</p>
-    </div>
-
-    <div class="footer">
-        <p>&copy; <?= date('Y') ?> Your Company. All rights reserved.</p>
-    </div>
-</body>
-</html>
diff --git a/src/Cms/Cli/Commands/Maintenance/DisableCommand.php b/src/Cms/Cli/Commands/Maintenance/DisableCommand.php
deleted file mode 100644
index 355f8ed..0000000
--- a/src/Cms/Cli/Commands/Maintenance/DisableCommand.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-namespace Neuron\Cms\Cli\Commands\Maintenance;
-
-use Neuron\Cli\Commands\Command;
-use Neuron\Cms\Maintenance\MaintenanceManager;
-
-/**
- * CLI command for disabling maintenance mode.
- */
-class DisableCommand extends Command
-{
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string
-	{
-		return 'cms:maintenance:disable';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getDescription(): string
-	{
-		return 'Disable maintenance mode for the CMS';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function configure(): void
-	{
-		$this->addOption( 'config', 'c', true, 'Path to configuration directory' );
-		$this->addOption( 'force', 'f', false, 'Skip confirmation prompt' );
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function execute(): int
-	{
-		// Get configuration path
-		$configPath = $this->input->getOption( 'config', $this->findConfigPath() );
-
-		if( !$configPath || !is_dir( $configPath ) )
-		{
-			$this->output->error( 'Configuration directory not found: ' . ($configPath ?: 'none specified') );
-			$this->output->info( 'Use --config to specify the configuration directory' );
-			return 1;
-		}
-
-		// Determine base path
-		$basePath = dirname( $configPath );
-
-		// Create manager
-		$manager = new MaintenanceManager( $basePath );
-
-		// Check if maintenance mode is currently enabled
-		if( !$manager->isEnabled() )
-		{
-			$this->output->warning( 'Maintenance mode is not currently enabled' );
-			return 0;
-		}
-
-		// Get current status for display
-		$status = $manager->getStatus();
-
-		// Confirm action unless forced
-		if( !$this->input->hasOption( 'force' ) )
-		{
-			$this->output->info( 'Current maintenance mode status:' );
-			$this->output->info( 'Message: ' . ($status['message'] ?? 'N/A') );
-			$this->output->info( 'Enabled at: ' . ($status['enabled_at'] ?? 'Unknown') );
-			$this->output->info( 'Enabled by: ' . ($status['enabled_by'] ?? 'Unknown') );
-			$this->output->newLine();
-
-			if( !$this->confirm( 'Disable maintenance mode?' ) )
-			{
-				$this->output->info( 'Maintenance mode deactivation cancelled' );
-				return 0;
-			}
-		}
-
-		// Disable maintenance mode
-		$success = $manager->disable();
-
-		if( $success )
-		{
-			$this->output->success( 'Maintenance mode disabled successfully' );
-			$this->output->info( 'Site is now accessible to all users' );
-
-			return 0;
-		}
-		else
-		{
-			$this->output->error( 'Failed to disable maintenance mode' );
-			$this->output->info( 'Check write permissions for: ' . $basePath );
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Try to find the configuration directory
-	 *
-	 * @return string|null
-	 */
-	private function findConfigPath(): ?string
-	{
-		$locations = [
-			getcwd() . '/config',
-			dirname( getcwd() ) . '/config',
-			dirname( getcwd(), 2 ) . '/config',
-			dirname( __DIR__, 6 ) . '/config',
-			dirname( __DIR__, 7 ) . '/config',
-		];
-
-		foreach( $locations as $location )
-		{
-			if( is_dir( $location ) )
-			{
-				return $location;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Ask for confirmation
-	 *
-	 * @param string $question
-	 * @return bool
-	 */
-	private function confirm( string $question ): bool
-	{
-		$this->output->write( $question . ' [y/N] ' );
-		$answer = trim( fgets( STDIN ) );
-		return strtolower( $answer ) === 'y' || strtolower( $answer ) === 'yes';
-	}
-}
diff --git a/src/Cms/Cli/Commands/Maintenance/EnableCommand.php b/src/Cms/Cli/Commands/Maintenance/EnableCommand.php
deleted file mode 100644
index 58d3564..0000000
--- a/src/Cms/Cli/Commands/Maintenance/EnableCommand.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-
-namespace Neuron\Cms\Cli\Commands\Maintenance;
-
-use Neuron\Cli\Commands\Command;
-use Neuron\Cms\Maintenance\MaintenanceManager;
-use Neuron\Cms\Maintenance\MaintenanceConfig;
-use Neuron\Data\Setting\Source\Yaml;
-
-/**
- * CLI command for enabling maintenance mode.
- */
-class EnableCommand extends Command
-{
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string
-	{
-		return 'cms:maintenance:enable';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getDescription(): string
-	{
-		return 'Enable maintenance mode for the CMS';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function configure(): void
-	{
-		$this->addOption( 'message', 'm', true, 'Custom maintenance message' );
-		$this->addOption( 'allow-ip', 'a', true, 'Comma-separated list of allowed IP addresses' );
-		$this->addOption( 'retry-after', 'r', true, 'Retry-After header value in seconds' );
-		$this->addOption( 'config', 'c', true, 'Path to configuration directory' );
-		$this->addOption( 'force', 'f', false, 'Skip confirmation prompt' );
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function execute(): int
-	{
-		// Get configuration path
-		$configPath = $this->input->getOption( 'config', $this->findConfigPath() );
-
-		if( !$configPath || !is_dir( $configPath ) )
-		{
-			$this->output->error( 'Configuration directory not found: ' . ($configPath ?: 'none specified') );
-			$this->output->info( 'Use --config to specify the configuration directory' );
-			return 1;
-		}
-
-		// Determine base path
-		$basePath = dirname( $configPath );
-
-		// Load configuration
-		$config = $this->loadConfiguration( $configPath );
-
-		// Get or determine maintenance parameters
-		$message = $this->input->getOption( 'message' );
-		if( !$message )
-		{
-			$message = $config ? $config->getDefaultMessage() : null;
-		}
-
-		$allowedIps = $this->parseAllowedIps(
-			$this->input->getOption( 'allow-ip' ),
-			$config
-		);
-
-		$retryAfter = $this->input->getOption( 'retry-after' );
-		if( !$retryAfter && $config )
-		{
-			$retryAfter = $config->getRetryAfter();
-		}
-
-		// Confirm action unless forced
-		$skipConfirmation = (bool)$this->input->getOption( 'force' );
-
-		if( !$skipConfirmation )
-		{
-			$this->output->warning( 'This will enable maintenance mode for the site.' );
-			$this->output->info( 'Message: ' . $message );
-			$this->output->info( 'Allowed IPs: ' . implode( ', ', $allowedIps ) );
-
-			if( $retryAfter )
-			{
-				$hours = floor( $retryAfter / 3600 );
-				$minutes = floor( ($retryAfter % 3600) / 60 );
-				$timeStr = $hours > 0
-					? "{$hours}h " . ($minutes > 0 ? "{$minutes}m" : '')
-					: "{$minutes}m";
-				$this->output->info( 'Estimated downtime: ' . $timeStr );
-			}
-
-			if( !$this->confirm( 'Enable maintenance mode?' ) )
-			{
-				$this->output->info( 'Maintenance mode activation cancelled' );
-				return 0;
-			}
-		}
-		// Create manager and enable maintenance mode
-		$manager = new MaintenanceManager( $basePath );
-
-		$success = $manager->enable(
-			$message,
-			$allowedIps,
-			$retryAfter ? (int)$retryAfter : null,
-			get_current_user()
-		);
-
-		if( $success )
-		{
-			$this->output->success( 'Maintenance mode enabled successfully' );
-			$this->output->newLine();
-			$this->output->info( 'To disable maintenance mode, run:' );
-			$this->output->write( '  neuron cms:maintenance:disable' );
-
-			return 0;
-		}
-		else
-		{
-			$this->output->error( 'Failed to enable maintenance mode' );
-			$this->output->info( 'Check write permissions for: ' . $basePath );
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Parse allowed IPs from option or config
-	 *
-	 * @param string|null $ipOption
-	 * @param MaintenanceConfig|null $config
-	 * @return array
-	 */
-	private function parseAllowedIps( ?string $ipOption, ?MaintenanceConfig $config ): array
-	{
-		// Check if option was provided (even if empty)
-		if( $ipOption !== null )
-		{
-			// Empty string means no IPs allowed
-			if( $ipOption === '' )
-			{
-				return [];
-			}
-			return array_map( 'trim', explode( ',', $ipOption ) );
-		}
-
-		if( $config )
-		{
-			return $config->getAllowedIps();
-		}
-
-		return ['127.0.0.1', '::1'];
-	}
-
-	/**
-	 * Load maintenance configuration from config file
-	 *
-	 * @param string $configPath
-	 * @return MaintenanceConfig|null
-	 */
-	private function loadConfiguration( string $configPath ): ?MaintenanceConfig
-	{
-		$configFile = $configPath . '/neuron.yaml';
-
-		if( !file_exists( $configFile ) )
-		{
-			return null;
-		}
-
-		try
-		{
-			$settings = new Yaml( $configFile );
-			return MaintenanceConfig::fromSettings( $settings );
-		}
-		catch( \Exception $e )
-		{
-			$this->output->warning( 'Could not load configuration: ' . $e->getMessage() );
-			return null;
-		}
-	}
-
-	/**
-	 * Try to find the configuration directory
-	 *
-	 * @return string|null
-	 */
-	private function findConfigPath(): ?string
-	{
-		$locations = [
-			getcwd() . '/config',
-			dirname( getcwd() ) . '/config',
-			dirname( getcwd(), 2 ) . '/config',
-			dirname( __DIR__, 6 ) . '/config',
-			dirname( __DIR__, 7 ) . '/config',
-		];
-
-		foreach( $locations as $location )
-		{
-			if( is_dir( $location ) )
-			{
-				return $location;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Ask for confirmation
-	 *
-	 * @param string $question
-	 * @return bool
-	 */
-	private function confirm( string $question ): bool
-	{
-		$this->output->write( $question . ' [y/N] ' );
-		$answer = trim( fgets( STDIN ) );
-		return strtolower( $answer ) === 'y' || strtolower( $answer ) === 'yes';
-	}
-}
diff --git a/src/Cms/Cli/Commands/Maintenance/StatusCommand.php b/src/Cms/Cli/Commands/Maintenance/StatusCommand.php
deleted file mode 100644
index 8071016..0000000
--- a/src/Cms/Cli/Commands/Maintenance/StatusCommand.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-
-namespace Neuron\Cms\Cli\Commands\Maintenance;
-
-use Neuron\Cli\Commands\Command;
-use Neuron\Cms\Maintenance\MaintenanceManager;
-use DateTime;
-
-/**
- * CLI command for checking maintenance mode status.
- */
-class StatusCommand extends Command
-{
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string
-	{
-		return 'cms:maintenance:status';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getDescription(): string
-	{
-		return 'Show current maintenance mode status';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function configure(): void
-	{
-		$this->addOption( 'config', 'c', true, 'Path to configuration directory' );
-		$this->addOption( 'json', 'j', false, 'Output status in JSON format' );
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function execute(): int
-	{
-		// Get configuration path
-		$configPath = $this->input->getOption( 'config', $this->findConfigPath() );
-
-		if( !$configPath || !is_dir( $configPath ) )
-		{
-			$this->output->error( 'Configuration directory not found: ' . ($configPath ?: 'none specified') );
-			$this->output->info( 'Use --config to specify the configuration directory' );
-			return 1;
-		}
-
-		// Determine base path
-		$basePath = dirname( $configPath );
-
-		// Create manager
-		$manager = new MaintenanceManager( $basePath );
-
-		// Check if maintenance mode is enabled
-		$isEnabled = $manager->isEnabled();
-		$status = $manager->getStatus();
-
-		// Output in JSON format if requested
-		if( $this->input->hasOption( 'json' ) )
-		{
-			$this->outputJson( $isEnabled, $status );
-			return 0;
-		}
-
-		// Output in human-readable format
-		$this->outputHuman( $isEnabled, $status, $basePath );
-
-		return 0;
-	}
-
-	/**
-	 * Output status in JSON format
-	 *
-	 * @param bool $isEnabled
-	 * @param array|null $status
-	 * @return void
-	 */
-	private function outputJson( bool $isEnabled, ?array $status ): void
-	{
-		$output = [
-			'enabled' => $isEnabled,
-			'status' => $status
-		];
-
-		$this->output->write( json_encode( $output, JSON_PRETTY_PRINT ) );
-	}
-
-	/**
-	 * Output status in human-readable format
-	 *
-	 * @param bool $isEnabled
-	 * @param array|null $status
-	 * @param string $basePath
-	 * @return void
-	 */
-	private function outputHuman( bool $isEnabled, ?array $status, string $basePath ): void
-	{
-		$this->output->title( 'Maintenance Mode Status' );
-
-		if( !$isEnabled )
-		{
-			$this->output->success( 'Maintenance mode is DISABLED' );
-			$this->output->info( 'Site is accessible to all users' );
-			$this->output->newLine();
-			$this->output->info( 'To enable maintenance mode, run:' );
-			$this->output->write( '  neuron cms:maintenance:enable' );
-			return;
-		}
-
-		// Maintenance mode is enabled
-		$this->output->warning( 'Maintenance mode is ENABLED' );
-		$this->output->newLine();
-
-		if( $status )
-		{
-			// Message
-			$this->output->write( 'Message:' );
-			$this->output->write( '  ' . ($status['message'] ?? 'N/A') );
-			$this->output->newLine();
-
-			// Enabled at
-			if( isset( $status['enabled_at'] ) )
-			{
-				$enabledAt = $status['enabled_at'];
-				$duration = $this->getTimeSince( $enabledAt );
-
-				$this->output->write( 'Enabled at:' );
-				$this->output->write( '  ' . $enabledAt . ' (' . $duration . ' ago)' );
-				$this->output->newLine();
-			}
-
-			// Enabled by
-			if( isset( $status['enabled_by'] ) )
-			{
-				$this->output->write( 'Enabled by:' );
-				$this->output->write( '  ' . $status['enabled_by'] );
-				$this->output->newLine();
-			}
-
-			// Allowed IPs
-			if( isset( $status['allowed_ips'] ) && !empty( $status['allowed_ips'] ) )
-			{
-				$this->output->write( 'Allowed IPs:' );
-				foreach( $status['allowed_ips'] as $ip )
-				{
-					$this->output->write( '  - ' . $ip );
-				}
-				$this->output->newLine();
-			}
-
-			// Retry-After
-			if( isset( $status['retry_after'] ) && $status['retry_after'] )
-			{
-				$retryAfter = (int)$status['retry_after'];
-				$hours = floor( $retryAfter / 3600 );
-				$minutes = floor( ($retryAfter % 3600) / 60 );
-
-				$timeStr = '';
-				if( $hours > 0 )
-				{
-					$timeStr = "{$hours} hour" . ($hours > 1 ? 's' : '');
-					if( $minutes > 0 )
-					{
-						$timeStr .= " and {$minutes} minute" . ($minutes > 1 ? 's' : '');
-					}
-				}
-				elseif( $minutes > 0 )
-				{
-					$timeStr = "{$minutes} minute" . ($minutes > 1 ? 's' : '');
-				}
-				else
-				{
-					$timeStr = "{$retryAfter} seconds";
-				}
-
-				$this->output->write( 'Estimated downtime:' );
-				$this->output->write( '  ' . $timeStr );
-				$this->output->newLine();
-			}
-		}
-
-		// Maintenance file location
-		$this->output->info( 'Maintenance file: ' . $basePath . '/.maintenance.json' );
-		$this->output->newLine();
-
-		// Instructions
-		$this->output->info( 'To disable maintenance mode, run:' );
-		$this->output->write( '  neuron cms:maintenance:disable' );
-	}
-
-	/**
-	 * Calculate time since a given datetime
-	 *
-	 * @param string $datetime
-	 * @return string
-	 */
-	private function getTimeSince( string $datetime ): string
-	{
-		try
-		{
-			$enabledTime = new DateTime( $datetime );
-			$now = new DateTime();
-			$interval = $now->diff( $enabledTime );
-
-			if( $interval->d > 0 )
-			{
-				return $interval->d . ' day' . ($interval->d > 1 ? 's' : '');
-			}
-
-			if( $interval->h > 0 )
-			{
-				return $interval->h . ' hour' . ($interval->h > 1 ? 's' : '');
-			}
-
-			if( $interval->i > 0 )
-			{
-				return $interval->i . ' minute' . ($interval->i > 1 ? 's' : '');
-			}
-
-			return $interval->s . ' second' . ($interval->s !== 1 ? 's' : '');
-		}
-		catch( \Exception $e )
-		{
-			return 'unknown';
-		}
-	}
-
-	/**
-	 * Try to find the configuration directory
-	 *
-	 * @return string|null
-	 */
-	private function findConfigPath(): ?string
-	{
-		$locations = [
-			getcwd() . '/config',
-			dirname( getcwd() ) . '/config',
-			dirname( getcwd(), 2 ) . '/config',
-			dirname( __DIR__, 6 ) . '/config',
-			dirname( __DIR__, 7 ) . '/config',
-		];
-
-		foreach( $locations as $location )
-		{
-			if( is_dir( $location ) )
-			{
-				return $location;
-			}
-		}
-
-		return null;
-	}
-}
diff --git a/src/Cms/Cli/Commands/Queue/InstallCommand.php b/src/Cms/Cli/Commands/Queue/InstallCommand.php
deleted file mode 100644
index e6c70ab..0000000
--- a/src/Cms/Cli/Commands/Queue/InstallCommand.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?php
-
-namespace Neuron\Cms\Cli\Commands\Queue;
-
-use Neuron\Cli\Commands\Command;
-use Neuron\Data\Setting\SettingManager;
-use Neuron\Data\Setting\Source\Yaml;
-use Neuron\Patterns\Registry;
-
-/**
- * Install the job queue system
- *
- * Sets up database tables and configuration for the Neuron queue system
- */
-class InstallCommand extends Command
-{
-	private string $_projectPath;
-
-	public function __construct()
-	{
-		$this->_projectPath = getcwd();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string
-	{
-		return 'queue:install';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getDescription(): string
-	{
-		return 'Install the job queue system';
-	}
-
-	/**
-	 * Configure the command
-	 */
-	public function configure(): void
-	{
-		$this->addOption( 'force', 'f', false, 'Force installation even if already installed' );
-	}
-
-	/**
-	 * Execute the command
-	 */
-	public function execute( array $parameters = [] ): int
-	{
-		$this->output->info( "╔═══════════════════════════════════════╗" );
-		$this->output->info( "║  Job Queue Installation               ║" );
-		$this->output->info( "╚═══════════════════════════════════════╝" );
-		$this->output->write( "\n" );
-
-		// Check if jobs component is available
-		if( !class_exists( 'Neuron\\Jobs\\Queue\\QueueManager' ) )
-		{
-			$this->output->error( "Job queue component not found." );
-			$this->output->info( "Please install it first: composer require neuron-php/jobs" );
-			return 1;
-		}
-
-		$force = $this->input->hasOption( 'force' );
-
-		// Check if already installed
-		if( !$force && $this->isAlreadyInstalled() )
-		{
-			$this->output->warning( "Queue system appears to be already installed." );
-			$this->output->info( "  - Migration exists" );
-			$this->output->info( "  - Configuration exists" );
-			$this->output->write( "\n" );
-
-			if( !$this->input->confirm( "Do you want to continue anyway?", false ) )
-			{
-				$this->output->info( "Installation cancelled." );
-				return 0;
-			}
-		}
-
-		// Generate queue migration
-		$this->output->info( "Generating queue migration..." );
-
-		if( !$this->generateMigration() )
-		{
-			return 1;
-		}
-
-		// Add queue configuration
-		$this->output->info( "Adding queue configuration..." );
-
-		if( $this->addQueueConfig() )
-		{
-			$this->output->success( "Queue configuration added to neuron.yaml" );
-		}
-		else
-		{
-			$this->output->warning( "Could not add queue configuration automatically" );
-			$this->output->info( "Please add the following to config/neuron.yaml:" );
-			$this->output->write( "\n" );
-			$this->output->write( "queue:\n" );
-			$this->output->write( "  driver: database\n" );
-			$this->output->write( "  default: default\n" );
-			$this->output->write( "  retry_after: 90\n" );
-			$this->output->write( "  max_attempts: 3\n" );
-			$this->output->write( "  backoff: 0\n" );
-			$this->output->write( "\n" );
-		}
-
-		// Ask to run migration
-		$this->output->write( "\n" );
-
-		if( $this->input->confirm( "Would you like to run the queue migration now?", true ) )
-		{
-			if( !$this->runMigration() )
-			{
-				$this->output->error( "Migration failed!" );
-				$this->output->info( "You can run it manually with: php neuron db:migrate" );
-				return 1;
-			}
-		}
-		else
-		{
-			$this->output->info( "Remember to run migration with: php neuron db:migrate" );
-		}
-
-		// Display success and usage info
-		$this->output->write( "\n" );
-		$this->output->success( "Job Queue Installation Complete!" );
-		$this->output->write( "\n" );
-		$this->output->info( "Queue Configuration:" );
-		$this->output->info( "  Driver: database" );
-		$this->output->info( "  Default Queue: default" );
-		$this->output->info( "  Max Attempts: 3" );
-		$this->output->info( "  Retry After: 90 seconds" );
-		$this->output->write( "\n" );
-
-		$this->output->info( "Start a worker:" );
-		$this->output->info( "  php neuron jobs:work" );
-		$this->output->write( "\n" );
-
-		$this->output->info( "Dispatch a job:" );
-		$this->output->info( "  dispatch(new MyJob(), ['data' => 'value']);" );
-		$this->output->write( "\n" );
-
-		$this->output->info( "For more information, see: vendor/neuron-php/jobs/QUEUE.md" );
-
-		return 0;
-	}
-
-	/**
-	 * Check if queue is already installed
-	 */
-	private function isAlreadyInstalled(): bool
-	{
-		$migrationsDir = $this->_projectPath . '/db/migrate';
-		$snakeCaseName = $this->camelToSnake( 'CreateQueueTables' );
-
-		// Check for existing migration
-		$existingFiles = glob( $migrationsDir . '/*_' . $snakeCaseName . '.php' );
-
-		if( empty( $existingFiles ) )
-		{
-			return false;
-		}
-
-		// Check for queue config
-		$configFile = $this->_projectPath . '/config/neuron.yaml';
-
-		if( !file_exists( $configFile ) )
-		{
-			return false;
-		}
-
-		try
-		{
-			$yaml = new Yaml( $configFile );
-			$settings = new SettingManager( $yaml );
-			$driver = $settings->get( 'queue', 'driver' );
-
-			return !empty( $driver );
-		}
-		catch( \Exception $e )
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * Generate queue migration
-	 */
-	private function generateMigration(): bool
-	{
-		$migrationName = 'CreateQueueTables';
-		$snakeCaseName = $this->camelToSnake( $migrationName );
-		$migrationsDir = $this->_projectPath . '/db/migrate';
-
-		// Create migrations directory if it doesn't exist
-		if( !is_dir( $migrationsDir ) )
-		{
-			if( !mkdir( $migrationsDir, 0755, true ) )
-			{
-				$this->output->error( "Failed to create migrations directory!" );
-				return false;
-			}
-		}
-
-		// Check if migration already exists
-		$existingFiles = glob( $migrationsDir . '/*_' . $snakeCaseName . '.php' );
-
-		if( !empty( $existingFiles ) )
-		{
-			$existingFile = basename( $existingFiles[0] );
-			$this->output->info( "Queue migration already exists: $existingFile" );
-			return true;
-		}
-
-		// Create migration
-		$timestamp = date( 'YmdHis' );
-		$className = $migrationName;
-		$fileName = $timestamp . '_' . $snakeCaseName . '.php';
-		$filePath = $migrationsDir . '/' . $fileName;
-
-		$template = $this->getMigrationTemplate( $className );
-
-		if( file_put_contents( $filePath, $template ) === false )
-		{
-			$this->output->error( "Failed to create queue migration!" );
-			return false;
-		}
-
-		$this->output->success( "Created: db/migrate/$fileName" );
-		return true;
-	}
-
-	/**
-	 * Get migration template
-	 */
-	private function getMigrationTemplate( string $className ): string
-	{
-		return <<<PHP
-<?php
-
-use Phinx\Migration\AbstractMigration;
-
-/**
- * Create queue tables for job processing
- */
-class $className extends AbstractMigration
-{
-	/**
-	 * Create jobs and failed_jobs tables
-	 */
-	public function change()
-	{
-		// Jobs table
-		\$jobs = \$this->table( 'jobs', [ 'id' => false, 'primary_key' => [ 'id' ] ] );
-
-		\$jobs->addColumn( 'id', 'string', [ 'limit' => 255 ] )
-			->addColumn( 'queue', 'string', [ 'limit' => 255 ] )
-			->addColumn( 'payload', 'text' )
-			->addColumn( 'attempts', 'integer', [ 'default' => 0 ] )
-			->addColumn( 'reserved_at', 'integer', [ 'null' => true ] )
-			->addColumn( 'available_at', 'integer' )
-			->addColumn( 'created_at', 'integer' )
-			->addIndex( [ 'queue' ] )
-			->addIndex( [ 'available_at' ] )
-			->addIndex( [ 'reserved_at' ] )
-			->create();
-
-		// Failed jobs table
-		\$failedJobs = \$this->table( 'failed_jobs', [ 'id' => false, 'primary_key' => [ 'id' ] ] );
-
-		\$failedJobs->addColumn( 'id', 'string', [ 'limit' => 255 ] )
-			->addColumn( 'queue', 'string', [ 'limit' => 255 ] )
-			->addColumn( 'payload', 'text' )
-			->addColumn( 'exception', 'text' )
-			->addColumn( 'failed_at', 'integer' )
-			->addIndex( [ 'queue' ] )
-			->addIndex( [ 'failed_at' ] )
-			->create();
-	}
-}
-
-PHP;
-	}
-
-	/**
-	 * Add queue configuration to neuron.yaml
-	 */
-	private function addQueueConfig(): bool
-	{
-		$configFile = $this->_projectPath . '/config/neuron.yaml';
-
-		if( !file_exists( $configFile ) )
-		{
-			return false;
-		}
-
-		try
-		{
-			// Read existing config
-			$yaml = new Yaml( $configFile );
-			$settings = new SettingManager( $yaml );
-
-			// Check if queue config already exists
-			$existingDriver = $settings->get( 'queue', 'driver' );
-
-			if( $existingDriver )
-			{
-				return true; // Already configured
-			}
-
-			// Append queue configuration
-			$queueConfig = <<<YAML
-
-
-# Queue Configuration
-queue:
-  driver: database
-  default: default
-  retry_after: 90
-  max_attempts: 3
-  backoff: 0
-
-YAML;
-
-			file_put_contents( $configFile, $queueConfig, FILE_APPEND );
-
-			return true;
-		}
-		catch( \Exception $e )
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * Run the migration
-	 */
-	private function runMigration(): bool
-	{
-		$this->output->info( "Running migration..." );
-		$this->output->write( "\n" );
-
-		try
-		{
-			// Get the CLI application from the registry
-			$app = Registry::getInstance()->get( 'cli.application' );
-
-			if( !$app )
-			{
-				$this->output->error( "CLI application not found in registry!" );
-				return false;
-			}
-
-			// Check if db:migrate command exists
-			if( !$app->has( 'db:migrate' ) )
-			{
-				$this->output->error( "db:migrate command not found!" );
-				return false;
-			}
-
-			// Get the migrate command class
-			$commandClass = $app->getRegistry()->get( 'db:migrate' );
-
-			if( !class_exists( $commandClass ) )
-			{
-				$this->output->error( "Migrate command class not found: {$commandClass}" );
-				return false;
-			}
-
-			// Instantiate the migrate command
-			$migrateCommand = new $commandClass();
-
-			// Set input and output on the command
-			$migrateCommand->setInput( $this->input );
-			$migrateCommand->setOutput( $this->output );
-
-			// Configure the command
-			$migrateCommand->configure();
-
-			// Execute the migrate command
-			$exitCode = $migrateCommand->execute();
-
-			if( $exitCode !== 0 )
-			{
-				$this->output->error( "Migration failed with exit code: $exitCode" );
-				return false;
-			}
-
-			$this->output->write( "\n" );
-			$this->output->success( "Migration completed successfully!" );
-
-			return true;
-		}
-		catch( \Exception $e )
-		{
-			$this->output->error( "Error running migration: " . $e->getMessage() );
-			return false;
-		}
-	}
-
-	/**
-	 * Convert CamelCase to snake_case
-	 */
-	private function camelToSnake( string $input ): string
-	{
-		return strtolower( preg_replace( '/(?<!^)[A-Z]/', '_$0', $input ) );
-	}
-}
diff --git a/src/Cms/Cli/Commands/User/CreateCommand.php b/src/Cms/Cli/Commands/User/CreateCommand.php
deleted file mode 100644
index b5b9499..0000000
--- a/src/Cms/Cli/Commands/User/CreateCommand.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-
-namespace Neuron\Cms\Cli\Commands\User;
-
-use Neuron\Cli\Commands\Command;
-use Neuron\Cms\Models\User;
-use Neuron\Cms\Repositories\DatabaseUserRepository;
-use Neuron\Cms\Auth\PasswordHasher;
-use Neuron\Patterns\Registry;
-
-/**
- * Create a new user
- */
-class CreateCommand extends Command
-{
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string
-	{
-		return 'cms:user:create';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getDescription(): string
-	{
-		return 'Create a new user';
-	}
-
-	/**
-	 * Configure the command
-	 */
-	public function configure(): void
-	{
-		// Additional configuration can go here
-	}
-
-	/**
-	 * Execute the command
-	 */
-	public function execute( array $parameters = [] ): int
-	{
-		$this->output->writeln( "\n╔═══════════════════════════════════════╗" );
-		$this->output->writeln( "║  Neuron CMS - Create User             ║" );
-		$this->output->writeln( "╚═══════════════════════════════════════╝\n" );
-
-		// Load database configuration
-		$repository = $this->getUserRepository();
-		if( !$repository )
-		{
-			return 1;
-		}
-
-		$hasher = new PasswordHasher();
-
-		// Get username
-		$username = $this->prompt( "Enter username: " );
-		$username = trim( $username );
-
-		if( empty( $username ) )
-		{
-			$this->output->error( "Username is required!" );
-			return 1;
-		}
-
-		// Check if user exists
-		if( $repository->findByUsername( $username ) )
-		{
-			$this->output->error( "User '$username' already exists!" );
-			return 1;
-		}
-
-		// Get email
-		$email = $this->prompt( "Enter email: " );
-		$email = trim( $email );
-
-		if( empty( $email ) || !filter_var( $email, FILTER_VALIDATE_EMAIL ) )
-		{
-			$this->output->error( "Valid email is required!" );
-			return 1;
-		}
-
-		// Check if email exists
-		if( $repository->findByEmail( $email ) )
-		{
-			$this->output->error( "Email '$email' is already in use!" );
-			return 1;
-		}
-
-		// Get password
-		$password = $this->prompt( "Enter password (min 8 characters): " );
-
-		if( strlen( $password ) < 8 )
-		{
-			$this->output->error( "Password must be at least 8 characters long!" );
-			return 1;
-		}
-
-		// Validate password
-		if( !$hasher->meetsRequirements( $password ) )
-		{
-			$this->output->error( "Password does not meet requirements:" );
-
-			foreach( $hasher->getValidationErrors( $password ) as $error )
-			{
-				$this->output->writeln( "  - $error" );
-			}
-
-			$this->output->writeln( "" );
-			return 1;
-		}
-
-		// Get role
-		$this->output->writeln( "\nAvailable roles:" );
-		$this->output->writeln( "  1. Admin (full access)" );
-		$this->output->writeln( "  2. Editor (manage all content)" );
-		$this->output->writeln( "  3. Author (manage own content)" );
-		$this->output->writeln( "  4. Subscriber (read-only)" );
-
-		$roleChoice = $this->prompt( "\nSelect role (1-4) [3]: " );
-		$roleChoice = trim( $roleChoice ) ?: '3';
-
-		$roles = [
-			'1' => User::ROLE_ADMIN,
-			'2' => User::ROLE_EDITOR,
-			'3' => User::ROLE_AUTHOR,
-			'4' => User::ROLE_SUBSCRIBER,
-		];
-
-		$role = $roles[ $roleChoice ] ?? User::ROLE_AUTHOR;
-
-		// Create user
-		$user = new User();
-		$user->setUsername( $username );
-		$user->setEmail( $email );
-		$user->setPasswordHash( $hasher->hash( $password ) );
-		$user->setRole( $role );
-		$user->setStatus( User::STATUS_ACTIVE );
-		$user->setEmailVerified( true );
-
-		try
-		{
-			$repository->create( $user );
-
-			$this->output->success( "User created:" );
-			$this->output->writeln( "  ID: " . $user->getId() );
-			$this->output->writeln( "  Username: " . $user->getUsername() );
-			$this->output->writeln( "  Email: " . $user->getEmail() );
-			$this->output->writeln( "  Role: " . $user->getRole() );
-			$this->output->writeln( "" );
-
-			return 0;
-		}
-		catch( \Exception $e )
-		{
-			$this->output->error( "Error creating user: " . $e->getMessage() );
-			return 1;
-		}
-	}
-
-	/**
-	 * Get user repository
-	 */
-	private function getUserRepository(): ?DatabaseUserRepository
-	{
-		try
-		{
-			$settings = Registry::getInstance()->get( 'Settings' );
-
-			if( !$settings )
-			{
-				$this->output->error( "Application not initialized: Settings not found in Registry" );
-				$this->output->writeln( "This is a configuration error - the application should load settings into the Registry" );
-				return null;
-			}
-
-			return new DatabaseUserRepository( $settings );
-		}
-		catch( \Exception $e )
-		{
-			$this->output->error( "Database connection failed: " . $e->getMessage() );
-			return null;
-		}
-	}
-
-	/**
-	 * Prompt for user input
-	 */
-	private function prompt( string $message ): string
-	{
-		$this->output->write( $message, false );
-		return trim( fgets( STDIN ) );
-	}
-}
diff --git a/src/Cms/Cli/Commands/User/DeleteCommand.php b/src/Cms/Cli/Commands/User/DeleteCommand.php
deleted file mode 100644
index 06a4f3f..0000000
--- a/src/Cms/Cli/Commands/User/DeleteCommand.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-namespace Neuron\Cms\Cli\Commands\User;
-
-use Neuron\Cli\Commands\Command;
-use Neuron\Cms\Repositories\DatabaseUserRepository;
-use Neuron\Patterns\Registry;
-
-/**
- * Delete a user
- */
-class DeleteCommand extends Command
-{
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string
-	{
-		return 'cms:user:delete';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getDescription(): string
-	{
-		return 'Delete a user';
-	}
-
-	/**
-	 * Configure the command
-	 */
-	public function configure(): void
-	{
-		// Additional configuration can go here
-	}
-
-	/**
-	 * Execute the command
-	 */
-	public function execute( array $parameters = [] ): int
-	{
-		$identifier = $parameters['identifier'] ?? null;
-
-		if( !$identifier )
-		{
-			$this->output->error( "Please provide a user ID or username." );
-			$this->output->writeln( "Usage: php neuron cms:user:delete <id or username>" );
-			return 1;
-		}
-
-		$repository = $this->getUserRepository();
-		if( !$repository )
-		{
-			return 1;
-		}
-
-		// Find user by ID or username
-		$user = null;
-
-		if( is_numeric( $identifier ) )
-		{
-			$user = $repository->findById( (int)$identifier );
-		}
-		else
-		{
-			$user = $repository->findByUsername( $identifier );
-		}
-
-		if( !$user )
-		{
-			$this->output->error( "User '$identifier' not found." );
-			return 1;
-		}
-
-		// Display user info
-		$this->output->warning( "You are about to delete the following user:" );
-		$this->output->writeln( "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" );
-		$this->output->writeln( "  ID:       " . $user->getId() );
-		$this->output->writeln( "  Username: " . $user->getUsername() );
-		$this->output->writeln( "  Email:    " . $user->getEmail() );
-		$this->output->writeln( "  Role:     " . $user->getRole() );
-		$this->output->writeln( "  Status:   " . $user->getStatus() );
-		$this->output->writeln( "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" );
-
-		// Confirm deletion
-		$response = $this->prompt( "Are you sure you want to delete this user? Type 'DELETE' to confirm: " );
-
-		if( trim( $response ) !== 'DELETE' )
-		{
-			$this->output->error( "Deletion cancelled." );
-			return 1;
-		}
-
-		// Delete user
-		try
-		{
-			if( $repository->delete( $user->getId() ) )
-			{
-				$this->output->success( "User deleted successfully." );
-				return 0;
-			}
-
-			$this->output->error( "Failed to delete user." );
-			return 1;
-		}
-		catch( \Exception $e )
-		{
-			$this->output->error( "Error: " . $e->getMessage() );
-			return 1;
-		}
-	}
-
-	/**
-	 * Get user repository
-	 */
-	private function getUserRepository(): ?DatabaseUserRepository
-	{
-		try
-		{
-			$settings = Registry::getInstance()->get( 'Settings' );
-
-			if( !$settings )
-			{
-				$this->output->error( "Application not initialized: Settings not found in Registry" );
-				$this->output->writeln( "This is a configuration error - the application should load settings into the Registry" );
-				return null;
-			}
-
-			return new DatabaseUserRepository( $settings );
-		}
-		catch( \Exception $e )
-		{
-			$this->output->error( "Database connection failed: " . $e->getMessage() );
-			return null;
-		}
-	}
-
-	/**
-	 * Prompt for user input
-	 */
-	private function prompt( string $message ): string
-	{
-		$this->output->write( $message, false );
-		return trim( fgets( STDIN ) );
-	}
-}
diff --git a/src/Cms/Cli/Commands/User/ListCommand.php b/src/Cms/Cli/Commands/User/ListCommand.php
deleted file mode 100644
index faa0703..0000000
--- a/src/Cms/Cli/Commands/User/ListCommand.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-namespace Neuron\Cms\Cli\Commands\User;
-
-use Neuron\Cli\Commands\Command;
-use Neuron\Cms\Repositories\DatabaseUserRepository;
-use Neuron\Patterns\Registry;
-
-/**
- * List all users
- */
-class ListCommand extends Command
-{
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string
-	{
-		return 'cms:user:list';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getDescription(): string
-	{
-		return 'List all users';
-	}
-
-	/**
-	 * Configure the command
-	 */
-	public function configure(): void
-	{
-		// Additional configuration can go here
-	}
-
-	/**
-	 * Execute the command
-	 */
-	public function execute( array $parameters = [] ): int
-	{
-		$repository = $this->getUserRepository();
-		if( !$repository )
-		{
-			return 1;
-		}
-
-		$users = $repository->all();
-
-		if( empty( $users ) )
-		{
-			$this->output->info( "No users found." );
-			return 0;
-		}
-
-		$this->output->writeln( "" );
-		$this->displayUsersTable( $users );
-		$this->output->writeln( "\nTotal users: " . count( $users ) );
-
-		return 0;
-	}
-
-	/**
-	 * Display users in a formatted table
-	 */
-	private function displayUsersTable( array $users ): void
-	{
-		// Calculate column widths
-		$idWidth = 4;
-		$usernameWidth = 20;
-		$emailWidth = 30;
-		$roleWidth = 12;
-		$statusWidth = 10;
-		$createdWidth = 19;
-
-		// Header
-		$this->output->writeln( str_repeat( '─', $idWidth + $usernameWidth + $emailWidth + $roleWidth + $statusWidth + $createdWidth + 17 ) );
-		$this->output->writeln(
-			$this->pad( 'ID', $idWidth ) . ' │ ' .
-			$this->pad( 'Username', $usernameWidth ) . ' │ ' .
-			$this->pad( 'Email', $emailWidth ) . ' │ ' .
-			$this->pad( 'Role', $roleWidth ) . ' │ ' .
-			$this->pad( 'Status', $statusWidth ) . ' │ ' .
-			$this->pad( 'Created', $createdWidth )
-		);
-		$this->output->writeln( str_repeat( '─', $idWidth + $usernameWidth + $emailWidth + $roleWidth + $statusWidth + $createdWidth + 17 ) );
-
-		// Rows
-		foreach( $users as $user )
-		{
-			$this->output->writeln(
-				$this->pad( (string)$user->getId(), $idWidth ) . ' │ ' .
-				$this->pad( $this->truncate( $user->getUsername(), $usernameWidth ), $usernameWidth ) . ' │ ' .
-				$this->pad( $this->truncate( $user->getEmail(), $emailWidth ), $emailWidth ) . ' │ ' .
-				$this->pad( $user->getRole(), $roleWidth ) . ' │ ' .
-				$this->pad( $this->formatStatus( $user ), $statusWidth ) . ' │ ' .
-				$this->pad( $user->getCreatedAt()->format( 'Y-m-d H:i:s' ), $createdWidth )
-			);
-		}
-
-		$this->output->writeln( str_repeat( '─', $idWidth + $usernameWidth + $emailWidth + $roleWidth + $statusWidth + $createdWidth + 17 ) );
-	}
-
-	/**
-	 * Format user status
-	 */
-	private function formatStatus( $user ): string
-	{
-		if( $user->isLockedOut() )
-		{
-			return '🔒 Locked';
-		}
-
-		return $user->getStatus();
-	}
-
-	/**
-	 * Pad string to width
-	 */
-	private function pad( string $text, int $width ): string
-	{
-		return str_pad( $text, $width );
-	}
-
-	/**
-	 * Truncate string to width
-	 */
-	private function truncate( string $text, int $width ): string
-	{
-		if( strlen( $text ) <= $width )
-		{
-			return $text;
-		}
-
-		return substr( $text, 0, $width - 3 ) . '...';
-	}
-
-	/**
-	 * Get user repository
-	 */
-	private function getUserRepository(): ?DatabaseUserRepository
-	{
-		try
-		{
-			$settings = Registry::getInstance()->get( 'Settings' );
-
-			if( !$settings )
-			{
-				$this->output->error( "Application not initialized: Settings not found in Registry" );
-				$this->output->writeln( "This is a configuration error - the application should load settings into the Registry" );
-				return null;
-			}
-
-			return new DatabaseUserRepository( $settings );
-		}
-		catch( \Exception $e )
-		{
-			$this->output->error( "Database connection failed: " . $e->getMessage() );
-			return null;
-		}
-	}
-
-}
diff --git a/src/Cms/Cli/Provider.php b/src/Cms/Cli/Provider.php
index 4e43e9c..2c09766 100644
--- a/src/Cms/Cli/Provider.php
+++ b/src/Cms/Cli/Provider.php
@@ -55,17 +55,5 @@ public static function register( Registry $registry ): void
 			'cms:maintenance:status',
 			'Neuron\\Cms\\Cli\\Commands\\Maintenance\\StatusCommand'
 		);
-
-		// Email template generator
-		$registry->register(
-			'mail:generate',
-			'Neuron\\Cms\\Cli\\Commands\\Generate\\EmailCommand'
-		);
-
-		// Queue installation
-		$registry->register(
-			'queue:install',
-			'Neuron\\Cms\\Cli\\Commands\\Queue\\InstallCommand'
-		);
 	}
 }

From 81be2e5daec351389af50321a2ffc0906c9684da Mon Sep 17 00:00:00 2001
From: Lee Jones <lee@dragonflyrg.com>
Date: Tue, 25 Nov 2025 10:36:37 -0600
Subject: [PATCH 3/4] cleans up commands

---
 .../Commands/Maintenance/DisableCommand.php   | 142 ++++++++++
 .../Commands/Maintenance/EnableCommand.php    | 228 +++++++++++++++
 .../Commands/Maintenance/StatusCommand.php    | 259 ++++++++++++++++++
 src/Cms/Cli/Commands/User/CreateCommand.php   | 197 +++++++++++++
 src/Cms/Cli/Commands/User/DeleteCommand.php   | 148 ++++++++++
 src/Cms/Cli/Commands/User/ListCommand.php     | 165 +++++++++++
 6 files changed, 1139 insertions(+)
 create mode 100644 src/Cms/Cli/Commands/Maintenance/DisableCommand.php
 create mode 100644 src/Cms/Cli/Commands/Maintenance/EnableCommand.php
 create mode 100644 src/Cms/Cli/Commands/Maintenance/StatusCommand.php
 create mode 100644 src/Cms/Cli/Commands/User/CreateCommand.php
 create mode 100644 src/Cms/Cli/Commands/User/DeleteCommand.php
 create mode 100644 src/Cms/Cli/Commands/User/ListCommand.php

diff --git a/src/Cms/Cli/Commands/Maintenance/DisableCommand.php b/src/Cms/Cli/Commands/Maintenance/DisableCommand.php
new file mode 100644
index 0000000..355f8ed
--- /dev/null
+++ b/src/Cms/Cli/Commands/Maintenance/DisableCommand.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace Neuron\Cms\Cli\Commands\Maintenance;
+
+use Neuron\Cli\Commands\Command;
+use Neuron\Cms\Maintenance\MaintenanceManager;
+
+/**
+ * CLI command for disabling maintenance mode.
+ */
+class DisableCommand extends Command
+{
+	/**
+	 * @inheritDoc
+	 */
+	public function getName(): string
+	{
+		return 'cms:maintenance:disable';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getDescription(): string
+	{
+		return 'Disable maintenance mode for the CMS';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function configure(): void
+	{
+		$this->addOption( 'config', 'c', true, 'Path to configuration directory' );
+		$this->addOption( 'force', 'f', false, 'Skip confirmation prompt' );
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function execute(): int
+	{
+		// Get configuration path
+		$configPath = $this->input->getOption( 'config', $this->findConfigPath() );
+
+		if( !$configPath || !is_dir( $configPath ) )
+		{
+			$this->output->error( 'Configuration directory not found: ' . ($configPath ?: 'none specified') );
+			$this->output->info( 'Use --config to specify the configuration directory' );
+			return 1;
+		}
+
+		// Determine base path
+		$basePath = dirname( $configPath );
+
+		// Create manager
+		$manager = new MaintenanceManager( $basePath );
+
+		// Check if maintenance mode is currently enabled
+		if( !$manager->isEnabled() )
+		{
+			$this->output->warning( 'Maintenance mode is not currently enabled' );
+			return 0;
+		}
+
+		// Get current status for display
+		$status = $manager->getStatus();
+
+		// Confirm action unless forced
+		if( !$this->input->hasOption( 'force' ) )
+		{
+			$this->output->info( 'Current maintenance mode status:' );
+			$this->output->info( 'Message: ' . ($status['message'] ?? 'N/A') );
+			$this->output->info( 'Enabled at: ' . ($status['enabled_at'] ?? 'Unknown') );
+			$this->output->info( 'Enabled by: ' . ($status['enabled_by'] ?? 'Unknown') );
+			$this->output->newLine();
+
+			if( !$this->confirm( 'Disable maintenance mode?' ) )
+			{
+				$this->output->info( 'Maintenance mode deactivation cancelled' );
+				return 0;
+			}
+		}
+
+		// Disable maintenance mode
+		$success = $manager->disable();
+
+		if( $success )
+		{
+			$this->output->success( 'Maintenance mode disabled successfully' );
+			$this->output->info( 'Site is now accessible to all users' );
+
+			return 0;
+		}
+		else
+		{
+			$this->output->error( 'Failed to disable maintenance mode' );
+			$this->output->info( 'Check write permissions for: ' . $basePath );
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Try to find the configuration directory
+	 *
+	 * @return string|null
+	 */
+	private function findConfigPath(): ?string
+	{
+		$locations = [
+			getcwd() . '/config',
+			dirname( getcwd() ) . '/config',
+			dirname( getcwd(), 2 ) . '/config',
+			dirname( __DIR__, 6 ) . '/config',
+			dirname( __DIR__, 7 ) . '/config',
+		];
+
+		foreach( $locations as $location )
+		{
+			if( is_dir( $location ) )
+			{
+				return $location;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Ask for confirmation
+	 *
+	 * @param string $question
+	 * @return bool
+	 */
+	private function confirm( string $question ): bool
+	{
+		$this->output->write( $question . ' [y/N] ' );
+		$answer = trim( fgets( STDIN ) );
+		return strtolower( $answer ) === 'y' || strtolower( $answer ) === 'yes';
+	}
+}
diff --git a/src/Cms/Cli/Commands/Maintenance/EnableCommand.php b/src/Cms/Cli/Commands/Maintenance/EnableCommand.php
new file mode 100644
index 0000000..58d3564
--- /dev/null
+++ b/src/Cms/Cli/Commands/Maintenance/EnableCommand.php
@@ -0,0 +1,228 @@
+<?php
+
+namespace Neuron\Cms\Cli\Commands\Maintenance;
+
+use Neuron\Cli\Commands\Command;
+use Neuron\Cms\Maintenance\MaintenanceManager;
+use Neuron\Cms\Maintenance\MaintenanceConfig;
+use Neuron\Data\Setting\Source\Yaml;
+
+/**
+ * CLI command for enabling maintenance mode.
+ */
+class EnableCommand extends Command
+{
+	/**
+	 * @inheritDoc
+	 */
+	public function getName(): string
+	{
+		return 'cms:maintenance:enable';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getDescription(): string
+	{
+		return 'Enable maintenance mode for the CMS';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function configure(): void
+	{
+		$this->addOption( 'message', 'm', true, 'Custom maintenance message' );
+		$this->addOption( 'allow-ip', 'a', true, 'Comma-separated list of allowed IP addresses' );
+		$this->addOption( 'retry-after', 'r', true, 'Retry-After header value in seconds' );
+		$this->addOption( 'config', 'c', true, 'Path to configuration directory' );
+		$this->addOption( 'force', 'f', false, 'Skip confirmation prompt' );
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function execute(): int
+	{
+		// Get configuration path
+		$configPath = $this->input->getOption( 'config', $this->findConfigPath() );
+
+		if( !$configPath || !is_dir( $configPath ) )
+		{
+			$this->output->error( 'Configuration directory not found: ' . ($configPath ?: 'none specified') );
+			$this->output->info( 'Use --config to specify the configuration directory' );
+			return 1;
+		}
+
+		// Determine base path
+		$basePath = dirname( $configPath );
+
+		// Load configuration
+		$config = $this->loadConfiguration( $configPath );
+
+		// Get or determine maintenance parameters
+		$message = $this->input->getOption( 'message' );
+		if( !$message )
+		{
+			$message = $config ? $config->getDefaultMessage() : null;
+		}
+
+		$allowedIps = $this->parseAllowedIps(
+			$this->input->getOption( 'allow-ip' ),
+			$config
+		);
+
+		$retryAfter = $this->input->getOption( 'retry-after' );
+		if( !$retryAfter && $config )
+		{
+			$retryAfter = $config->getRetryAfter();
+		}
+
+		// Confirm action unless forced
+		$skipConfirmation = (bool)$this->input->getOption( 'force' );
+
+		if( !$skipConfirmation )
+		{
+			$this->output->warning( 'This will enable maintenance mode for the site.' );
+			$this->output->info( 'Message: ' . $message );
+			$this->output->info( 'Allowed IPs: ' . implode( ', ', $allowedIps ) );
+
+			if( $retryAfter )
+			{
+				$hours = floor( $retryAfter / 3600 );
+				$minutes = floor( ($retryAfter % 3600) / 60 );
+				$timeStr = $hours > 0
+					? "{$hours}h " . ($minutes > 0 ? "{$minutes}m" : '')
+					: "{$minutes}m";
+				$this->output->info( 'Estimated downtime: ' . $timeStr );
+			}
+
+			if( !$this->confirm( 'Enable maintenance mode?' ) )
+			{
+				$this->output->info( 'Maintenance mode activation cancelled' );
+				return 0;
+			}
+		}
+		// Create manager and enable maintenance mode
+		$manager = new MaintenanceManager( $basePath );
+
+		$success = $manager->enable(
+			$message,
+			$allowedIps,
+			$retryAfter ? (int)$retryAfter : null,
+			get_current_user()
+		);
+
+		if( $success )
+		{
+			$this->output->success( 'Maintenance mode enabled successfully' );
+			$this->output->newLine();
+			$this->output->info( 'To disable maintenance mode, run:' );
+			$this->output->write( '  neuron cms:maintenance:disable' );
+
+			return 0;
+		}
+		else
+		{
+			$this->output->error( 'Failed to enable maintenance mode' );
+			$this->output->info( 'Check write permissions for: ' . $basePath );
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Parse allowed IPs from option or config
+	 *
+	 * @param string|null $ipOption
+	 * @param MaintenanceConfig|null $config
+	 * @return array
+	 */
+	private function parseAllowedIps( ?string $ipOption, ?MaintenanceConfig $config ): array
+	{
+		// Check if option was provided (even if empty)
+		if( $ipOption !== null )
+		{
+			// Empty string means no IPs allowed
+			if( $ipOption === '' )
+			{
+				return [];
+			}
+			return array_map( 'trim', explode( ',', $ipOption ) );
+		}
+
+		if( $config )
+		{
+			return $config->getAllowedIps();
+		}
+
+		return ['127.0.0.1', '::1'];
+	}
+
+	/**
+	 * Load maintenance configuration from config file
+	 *
+	 * @param string $configPath
+	 * @return MaintenanceConfig|null
+	 */
+	private function loadConfiguration( string $configPath ): ?MaintenanceConfig
+	{
+		$configFile = $configPath . '/neuron.yaml';
+
+		if( !file_exists( $configFile ) )
+		{
+			return null;
+		}
+
+		try
+		{
+			$settings = new Yaml( $configFile );
+			return MaintenanceConfig::fromSettings( $settings );
+		}
+		catch( \Exception $e )
+		{
+			$this->output->warning( 'Could not load configuration: ' . $e->getMessage() );
+			return null;
+		}
+	}
+
+	/**
+	 * Try to find the configuration directory
+	 *
+	 * @return string|null
+	 */
+	private function findConfigPath(): ?string
+	{
+		$locations = [
+			getcwd() . '/config',
+			dirname( getcwd() ) . '/config',
+			dirname( getcwd(), 2 ) . '/config',
+			dirname( __DIR__, 6 ) . '/config',
+			dirname( __DIR__, 7 ) . '/config',
+		];
+
+		foreach( $locations as $location )
+		{
+			if( is_dir( $location ) )
+			{
+				return $location;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Ask for confirmation
+	 *
+	 * @param string $question
+	 * @return bool
+	 */
+	private function confirm( string $question ): bool
+	{
+		$this->output->write( $question . ' [y/N] ' );
+		$answer = trim( fgets( STDIN ) );
+		return strtolower( $answer ) === 'y' || strtolower( $answer ) === 'yes';
+	}
+}
diff --git a/src/Cms/Cli/Commands/Maintenance/StatusCommand.php b/src/Cms/Cli/Commands/Maintenance/StatusCommand.php
new file mode 100644
index 0000000..8071016
--- /dev/null
+++ b/src/Cms/Cli/Commands/Maintenance/StatusCommand.php
@@ -0,0 +1,259 @@
+<?php
+
+namespace Neuron\Cms\Cli\Commands\Maintenance;
+
+use Neuron\Cli\Commands\Command;
+use Neuron\Cms\Maintenance\MaintenanceManager;
+use DateTime;
+
+/**
+ * CLI command for checking maintenance mode status.
+ */
+class StatusCommand extends Command
+{
+	/**
+	 * @inheritDoc
+	 */
+	public function getName(): string
+	{
+		return 'cms:maintenance:status';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getDescription(): string
+	{
+		return 'Show current maintenance mode status';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function configure(): void
+	{
+		$this->addOption( 'config', 'c', true, 'Path to configuration directory' );
+		$this->addOption( 'json', 'j', false, 'Output status in JSON format' );
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function execute(): int
+	{
+		// Get configuration path
+		$configPath = $this->input->getOption( 'config', $this->findConfigPath() );
+
+		if( !$configPath || !is_dir( $configPath ) )
+		{
+			$this->output->error( 'Configuration directory not found: ' . ($configPath ?: 'none specified') );
+			$this->output->info( 'Use --config to specify the configuration directory' );
+			return 1;
+		}
+
+		// Determine base path
+		$basePath = dirname( $configPath );
+
+		// Create manager
+		$manager = new MaintenanceManager( $basePath );
+
+		// Check if maintenance mode is enabled
+		$isEnabled = $manager->isEnabled();
+		$status = $manager->getStatus();
+
+		// Output in JSON format if requested
+		if( $this->input->hasOption( 'json' ) )
+		{
+			$this->outputJson( $isEnabled, $status );
+			return 0;
+		}
+
+		// Output in human-readable format
+		$this->outputHuman( $isEnabled, $status, $basePath );
+
+		return 0;
+	}
+
+	/**
+	 * Output status in JSON format
+	 *
+	 * @param bool $isEnabled
+	 * @param array|null $status
+	 * @return void
+	 */
+	private function outputJson( bool $isEnabled, ?array $status ): void
+	{
+		$output = [
+			'enabled' => $isEnabled,
+			'status' => $status
+		];
+
+		$this->output->write( json_encode( $output, JSON_PRETTY_PRINT ) );
+	}
+
+	/**
+	 * Output status in human-readable format
+	 *
+	 * @param bool $isEnabled
+	 * @param array|null $status
+	 * @param string $basePath
+	 * @return void
+	 */
+	private function outputHuman( bool $isEnabled, ?array $status, string $basePath ): void
+	{
+		$this->output->title( 'Maintenance Mode Status' );
+
+		if( !$isEnabled )
+		{
+			$this->output->success( 'Maintenance mode is DISABLED' );
+			$this->output->info( 'Site is accessible to all users' );
+			$this->output->newLine();
+			$this->output->info( 'To enable maintenance mode, run:' );
+			$this->output->write( '  neuron cms:maintenance:enable' );
+			return;
+		}
+
+		// Maintenance mode is enabled
+		$this->output->warning( 'Maintenance mode is ENABLED' );
+		$this->output->newLine();
+
+		if( $status )
+		{
+			// Message
+			$this->output->write( 'Message:' );
+			$this->output->write( '  ' . ($status['message'] ?? 'N/A') );
+			$this->output->newLine();
+
+			// Enabled at
+			if( isset( $status['enabled_at'] ) )
+			{
+				$enabledAt = $status['enabled_at'];
+				$duration = $this->getTimeSince( $enabledAt );
+
+				$this->output->write( 'Enabled at:' );
+				$this->output->write( '  ' . $enabledAt . ' (' . $duration . ' ago)' );
+				$this->output->newLine();
+			}
+
+			// Enabled by
+			if( isset( $status['enabled_by'] ) )
+			{
+				$this->output->write( 'Enabled by:' );
+				$this->output->write( '  ' . $status['enabled_by'] );
+				$this->output->newLine();
+			}
+
+			// Allowed IPs
+			if( isset( $status['allowed_ips'] ) && !empty( $status['allowed_ips'] ) )
+			{
+				$this->output->write( 'Allowed IPs:' );
+				foreach( $status['allowed_ips'] as $ip )
+				{
+					$this->output->write( '  - ' . $ip );
+				}
+				$this->output->newLine();
+			}
+
+			// Retry-After
+			if( isset( $status['retry_after'] ) && $status['retry_after'] )
+			{
+				$retryAfter = (int)$status['retry_after'];
+				$hours = floor( $retryAfter / 3600 );
+				$minutes = floor( ($retryAfter % 3600) / 60 );
+
+				$timeStr = '';
+				if( $hours > 0 )
+				{
+					$timeStr = "{$hours} hour" . ($hours > 1 ? 's' : '');
+					if( $minutes > 0 )
+					{
+						$timeStr .= " and {$minutes} minute" . ($minutes > 1 ? 's' : '');
+					}
+				}
+				elseif( $minutes > 0 )
+				{
+					$timeStr = "{$minutes} minute" . ($minutes > 1 ? 's' : '');
+				}
+				else
+				{
+					$timeStr = "{$retryAfter} seconds";
+				}
+
+				$this->output->write( 'Estimated downtime:' );
+				$this->output->write( '  ' . $timeStr );
+				$this->output->newLine();
+			}
+		}
+
+		// Maintenance file location
+		$this->output->info( 'Maintenance file: ' . $basePath . '/.maintenance.json' );
+		$this->output->newLine();
+
+		// Instructions
+		$this->output->info( 'To disable maintenance mode, run:' );
+		$this->output->write( '  neuron cms:maintenance:disable' );
+	}
+
+	/**
+	 * Calculate time since a given datetime
+	 *
+	 * @param string $datetime
+	 * @return string
+	 */
+	private function getTimeSince( string $datetime ): string
+	{
+		try
+		{
+			$enabledTime = new DateTime( $datetime );
+			$now = new DateTime();
+			$interval = $now->diff( $enabledTime );
+
+			if( $interval->d > 0 )
+			{
+				return $interval->d . ' day' . ($interval->d > 1 ? 's' : '');
+			}
+
+			if( $interval->h > 0 )
+			{
+				return $interval->h . ' hour' . ($interval->h > 1 ? 's' : '');
+			}
+
+			if( $interval->i > 0 )
+			{
+				return $interval->i . ' minute' . ($interval->i > 1 ? 's' : '');
+			}
+
+			return $interval->s . ' second' . ($interval->s !== 1 ? 's' : '');
+		}
+		catch( \Exception $e )
+		{
+			return 'unknown';
+		}
+	}
+
+	/**
+	 * Try to find the configuration directory
+	 *
+	 * @return string|null
+	 */
+	private function findConfigPath(): ?string
+	{
+		$locations = [
+			getcwd() . '/config',
+			dirname( getcwd() ) . '/config',
+			dirname( getcwd(), 2 ) . '/config',
+			dirname( __DIR__, 6 ) . '/config',
+			dirname( __DIR__, 7 ) . '/config',
+		];
+
+		foreach( $locations as $location )
+		{
+			if( is_dir( $location ) )
+			{
+				return $location;
+			}
+		}
+
+		return null;
+	}
+}
diff --git a/src/Cms/Cli/Commands/User/CreateCommand.php b/src/Cms/Cli/Commands/User/CreateCommand.php
new file mode 100644
index 0000000..b5b9499
--- /dev/null
+++ b/src/Cms/Cli/Commands/User/CreateCommand.php
@@ -0,0 +1,197 @@
+<?php
+
+namespace Neuron\Cms\Cli\Commands\User;
+
+use Neuron\Cli\Commands\Command;
+use Neuron\Cms\Models\User;
+use Neuron\Cms\Repositories\DatabaseUserRepository;
+use Neuron\Cms\Auth\PasswordHasher;
+use Neuron\Patterns\Registry;
+
+/**
+ * Create a new user
+ */
+class CreateCommand extends Command
+{
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getName(): string
+	{
+		return 'cms:user:create';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getDescription(): string
+	{
+		return 'Create a new user';
+	}
+
+	/**
+	 * Configure the command
+	 */
+	public function configure(): void
+	{
+		// Additional configuration can go here
+	}
+
+	/**
+	 * Execute the command
+	 */
+	public function execute( array $parameters = [] ): int
+	{
+		$this->output->writeln( "\n╔═══════════════════════════════════════╗" );
+		$this->output->writeln( "║  Neuron CMS - Create User             ║" );
+		$this->output->writeln( "╚═══════════════════════════════════════╝\n" );
+
+		// Load database configuration
+		$repository = $this->getUserRepository();
+		if( !$repository )
+		{
+			return 1;
+		}
+
+		$hasher = new PasswordHasher();
+
+		// Get username
+		$username = $this->prompt( "Enter username: " );
+		$username = trim( $username );
+
+		if( empty( $username ) )
+		{
+			$this->output->error( "Username is required!" );
+			return 1;
+		}
+
+		// Check if user exists
+		if( $repository->findByUsername( $username ) )
+		{
+			$this->output->error( "User '$username' already exists!" );
+			return 1;
+		}
+
+		// Get email
+		$email = $this->prompt( "Enter email: " );
+		$email = trim( $email );
+
+		if( empty( $email ) || !filter_var( $email, FILTER_VALIDATE_EMAIL ) )
+		{
+			$this->output->error( "Valid email is required!" );
+			return 1;
+		}
+
+		// Check if email exists
+		if( $repository->findByEmail( $email ) )
+		{
+			$this->output->error( "Email '$email' is already in use!" );
+			return 1;
+		}
+
+		// Get password
+		$password = $this->prompt( "Enter password (min 8 characters): " );
+
+		if( strlen( $password ) < 8 )
+		{
+			$this->output->error( "Password must be at least 8 characters long!" );
+			return 1;
+		}
+
+		// Validate password
+		if( !$hasher->meetsRequirements( $password ) )
+		{
+			$this->output->error( "Password does not meet requirements:" );
+
+			foreach( $hasher->getValidationErrors( $password ) as $error )
+			{
+				$this->output->writeln( "  - $error" );
+			}
+
+			$this->output->writeln( "" );
+			return 1;
+		}
+
+		// Get role
+		$this->output->writeln( "\nAvailable roles:" );
+		$this->output->writeln( "  1. Admin (full access)" );
+		$this->output->writeln( "  2. Editor (manage all content)" );
+		$this->output->writeln( "  3. Author (manage own content)" );
+		$this->output->writeln( "  4. Subscriber (read-only)" );
+
+		$roleChoice = $this->prompt( "\nSelect role (1-4) [3]: " );
+		$roleChoice = trim( $roleChoice ) ?: '3';
+
+		$roles = [
+			'1' => User::ROLE_ADMIN,
+			'2' => User::ROLE_EDITOR,
+			'3' => User::ROLE_AUTHOR,
+			'4' => User::ROLE_SUBSCRIBER,
+		];
+
+		$role = $roles[ $roleChoice ] ?? User::ROLE_AUTHOR;
+
+		// Create user
+		$user = new User();
+		$user->setUsername( $username );
+		$user->setEmail( $email );
+		$user->setPasswordHash( $hasher->hash( $password ) );
+		$user->setRole( $role );
+		$user->setStatus( User::STATUS_ACTIVE );
+		$user->setEmailVerified( true );
+
+		try
+		{
+			$repository->create( $user );
+
+			$this->output->success( "User created:" );
+			$this->output->writeln( "  ID: " . $user->getId() );
+			$this->output->writeln( "  Username: " . $user->getUsername() );
+			$this->output->writeln( "  Email: " . $user->getEmail() );
+			$this->output->writeln( "  Role: " . $user->getRole() );
+			$this->output->writeln( "" );
+
+			return 0;
+		}
+		catch( \Exception $e )
+		{
+			$this->output->error( "Error creating user: " . $e->getMessage() );
+			return 1;
+		}
+	}
+
+	/**
+	 * Get user repository
+	 */
+	private function getUserRepository(): ?DatabaseUserRepository
+	{
+		try
+		{
+			$settings = Registry::getInstance()->get( 'Settings' );
+
+			if( !$settings )
+			{
+				$this->output->error( "Application not initialized: Settings not found in Registry" );
+				$this->output->writeln( "This is a configuration error - the application should load settings into the Registry" );
+				return null;
+			}
+
+			return new DatabaseUserRepository( $settings );
+		}
+		catch( \Exception $e )
+		{
+			$this->output->error( "Database connection failed: " . $e->getMessage() );
+			return null;
+		}
+	}
+
+	/**
+	 * Prompt for user input
+	 */
+	private function prompt( string $message ): string
+	{
+		$this->output->write( $message, false );
+		return trim( fgets( STDIN ) );
+	}
+}
diff --git a/src/Cms/Cli/Commands/User/DeleteCommand.php b/src/Cms/Cli/Commands/User/DeleteCommand.php
new file mode 100644
index 0000000..06a4f3f
--- /dev/null
+++ b/src/Cms/Cli/Commands/User/DeleteCommand.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace Neuron\Cms\Cli\Commands\User;
+
+use Neuron\Cli\Commands\Command;
+use Neuron\Cms\Repositories\DatabaseUserRepository;
+use Neuron\Patterns\Registry;
+
+/**
+ * Delete a user
+ */
+class DeleteCommand extends Command
+{
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getName(): string
+	{
+		return 'cms:user:delete';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getDescription(): string
+	{
+		return 'Delete a user';
+	}
+
+	/**
+	 * Configure the command
+	 */
+	public function configure(): void
+	{
+		// Additional configuration can go here
+	}
+
+	/**
+	 * Execute the command
+	 */
+	public function execute( array $parameters = [] ): int
+	{
+		$identifier = $parameters['identifier'] ?? null;
+
+		if( !$identifier )
+		{
+			$this->output->error( "Please provide a user ID or username." );
+			$this->output->writeln( "Usage: php neuron cms:user:delete <id or username>" );
+			return 1;
+		}
+
+		$repository = $this->getUserRepository();
+		if( !$repository )
+		{
+			return 1;
+		}
+
+		// Find user by ID or username
+		$user = null;
+
+		if( is_numeric( $identifier ) )
+		{
+			$user = $repository->findById( (int)$identifier );
+		}
+		else
+		{
+			$user = $repository->findByUsername( $identifier );
+		}
+
+		if( !$user )
+		{
+			$this->output->error( "User '$identifier' not found." );
+			return 1;
+		}
+
+		// Display user info
+		$this->output->warning( "You are about to delete the following user:" );
+		$this->output->writeln( "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" );
+		$this->output->writeln( "  ID:       " . $user->getId() );
+		$this->output->writeln( "  Username: " . $user->getUsername() );
+		$this->output->writeln( "  Email:    " . $user->getEmail() );
+		$this->output->writeln( "  Role:     " . $user->getRole() );
+		$this->output->writeln( "  Status:   " . $user->getStatus() );
+		$this->output->writeln( "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" );
+
+		// Confirm deletion
+		$response = $this->prompt( "Are you sure you want to delete this user? Type 'DELETE' to confirm: " );
+
+		if( trim( $response ) !== 'DELETE' )
+		{
+			$this->output->error( "Deletion cancelled." );
+			return 1;
+		}
+
+		// Delete user
+		try
+		{
+			if( $repository->delete( $user->getId() ) )
+			{
+				$this->output->success( "User deleted successfully." );
+				return 0;
+			}
+
+			$this->output->error( "Failed to delete user." );
+			return 1;
+		}
+		catch( \Exception $e )
+		{
+			$this->output->error( "Error: " . $e->getMessage() );
+			return 1;
+		}
+	}
+
+	/**
+	 * Get user repository
+	 */
+	private function getUserRepository(): ?DatabaseUserRepository
+	{
+		try
+		{
+			$settings = Registry::getInstance()->get( 'Settings' );
+
+			if( !$settings )
+			{
+				$this->output->error( "Application not initialized: Settings not found in Registry" );
+				$this->output->writeln( "This is a configuration error - the application should load settings into the Registry" );
+				return null;
+			}
+
+			return new DatabaseUserRepository( $settings );
+		}
+		catch( \Exception $e )
+		{
+			$this->output->error( "Database connection failed: " . $e->getMessage() );
+			return null;
+		}
+	}
+
+	/**
+	 * Prompt for user input
+	 */
+	private function prompt( string $message ): string
+	{
+		$this->output->write( $message, false );
+		return trim( fgets( STDIN ) );
+	}
+}
diff --git a/src/Cms/Cli/Commands/User/ListCommand.php b/src/Cms/Cli/Commands/User/ListCommand.php
new file mode 100644
index 0000000..faa0703
--- /dev/null
+++ b/src/Cms/Cli/Commands/User/ListCommand.php
@@ -0,0 +1,165 @@
+<?php
+
+namespace Neuron\Cms\Cli\Commands\User;
+
+use Neuron\Cli\Commands\Command;
+use Neuron\Cms\Repositories\DatabaseUserRepository;
+use Neuron\Patterns\Registry;
+
+/**
+ * List all users
+ */
+class ListCommand extends Command
+{
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getName(): string
+	{
+		return 'cms:user:list';
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getDescription(): string
+	{
+		return 'List all users';
+	}
+
+	/**
+	 * Configure the command
+	 */
+	public function configure(): void
+	{
+		// Additional configuration can go here
+	}
+
+	/**
+	 * Execute the command
+	 */
+	public function execute( array $parameters = [] ): int
+	{
+		$repository = $this->getUserRepository();
+		if( !$repository )
+		{
+			return 1;
+		}
+
+		$users = $repository->all();
+
+		if( empty( $users ) )
+		{
+			$this->output->info( "No users found." );
+			return 0;
+		}
+
+		$this->output->writeln( "" );
+		$this->displayUsersTable( $users );
+		$this->output->writeln( "\nTotal users: " . count( $users ) );
+
+		return 0;
+	}
+
+	/**
+	 * Display users in a formatted table
+	 */
+	private function displayUsersTable( array $users ): void
+	{
+		// Calculate column widths
+		$idWidth = 4;
+		$usernameWidth = 20;
+		$emailWidth = 30;
+		$roleWidth = 12;
+		$statusWidth = 10;
+		$createdWidth = 19;
+
+		// Header
+		$this->output->writeln( str_repeat( '─', $idWidth + $usernameWidth + $emailWidth + $roleWidth + $statusWidth + $createdWidth + 17 ) );
+		$this->output->writeln(
+			$this->pad( 'ID', $idWidth ) . ' │ ' .
+			$this->pad( 'Username', $usernameWidth ) . ' │ ' .
+			$this->pad( 'Email', $emailWidth ) . ' │ ' .
+			$this->pad( 'Role', $roleWidth ) . ' │ ' .
+			$this->pad( 'Status', $statusWidth ) . ' │ ' .
+			$this->pad( 'Created', $createdWidth )
+		);
+		$this->output->writeln( str_repeat( '─', $idWidth + $usernameWidth + $emailWidth + $roleWidth + $statusWidth + $createdWidth + 17 ) );
+
+		// Rows
+		foreach( $users as $user )
+		{
+			$this->output->writeln(
+				$this->pad( (string)$user->getId(), $idWidth ) . ' │ ' .
+				$this->pad( $this->truncate( $user->getUsername(), $usernameWidth ), $usernameWidth ) . ' │ ' .
+				$this->pad( $this->truncate( $user->getEmail(), $emailWidth ), $emailWidth ) . ' │ ' .
+				$this->pad( $user->getRole(), $roleWidth ) . ' │ ' .
+				$this->pad( $this->formatStatus( $user ), $statusWidth ) . ' │ ' .
+				$this->pad( $user->getCreatedAt()->format( 'Y-m-d H:i:s' ), $createdWidth )
+			);
+		}
+
+		$this->output->writeln( str_repeat( '─', $idWidth + $usernameWidth + $emailWidth + $roleWidth + $statusWidth + $createdWidth + 17 ) );
+	}
+
+	/**
+	 * Format user status
+	 */
+	private function formatStatus( $user ): string
+	{
+		if( $user->isLockedOut() )
+		{
+			return '🔒 Locked';
+		}
+
+		return $user->getStatus();
+	}
+
+	/**
+	 * Pad string to width
+	 */
+	private function pad( string $text, int $width ): string
+	{
+		return str_pad( $text, $width );
+	}
+
+	/**
+	 * Truncate string to width
+	 */
+	private function truncate( string $text, int $width ): string
+	{
+		if( strlen( $text ) <= $width )
+		{
+			return $text;
+		}
+
+		return substr( $text, 0, $width - 3 ) . '...';
+	}
+
+	/**
+	 * Get user repository
+	 */
+	private function getUserRepository(): ?DatabaseUserRepository
+	{
+		try
+		{
+			$settings = Registry::getInstance()->get( 'Settings' );
+
+			if( !$settings )
+			{
+				$this->output->error( "Application not initialized: Settings not found in Registry" );
+				$this->output->writeln( "This is a configuration error - the application should load settings into the Registry" );
+				return null;
+			}
+
+			return new DatabaseUserRepository( $settings );
+		}
+		catch( \Exception $e )
+		{
+			$this->output->error( "Database connection failed: " . $e->getMessage() );
+			return null;
+		}
+	}
+
+}

From 9ebd824a3f5783aab32443caf6625c6f017539aa Mon Sep 17 00:00:00 2001
From: Lee Jones <lee@dragonflyrg.com>
Date: Fri, 28 Nov 2025 20:39:13 -0500
Subject: [PATCH 4/4] way too much to mention.

---
 composer.json                                 |  3 +-
 .../app/Initializers/AuthInitializer.php      |  2 +-
 .../Initializers/MaintenanceInitializer.php   |  2 +-
 .../Initializers/PasswordResetInitializer.php |  2 +-
 .../Initializers/RegistrationInitializer.php  |  2 +-
 resources/views/http_codes/500.php            | 20 +++++++
 src/Bootstrap.php                             |  4 +-
 .../Cli/Commands/Install/InstallCommand.php   |  4 +-
 .../Commands/Maintenance/EnableCommand.php    |  2 +-
 src/Cms/Controllers/Admin/Categories.php      |  2 +-
 src/Cms/Controllers/Admin/Profile.php         |  2 +-
 src/Cms/Controllers/Admin/Users.php           |  2 +-
 src/Cms/Controllers/Content.php               |  8 +--
 src/Cms/Database/ConnectionFactory.php        |  2 +-
 src/Cms/Email/helpers.php                     |  2 +-
 src/Cms/Events/EmailVerifiedEvent.php         | 39 ++++++++++++
 .../Events/MaintenanceModeDisabledEvent.php   | 39 ++++++++++++
 .../Events/MaintenanceModeEnabledEvent.php    | 41 +++++++++++++
 .../Events/PasswordResetCompletedEvent.php    | 41 +++++++++++++
 .../Events/PasswordResetRequestedEvent.php    | 41 +++++++++++++
 src/Cms/Events/UserLoginEvent.php             | 43 ++++++++++++++
 src/Cms/Events/UserLoginFailedEvent.php       | 44 ++++++++++++++
 src/Cms/Events/UserLogoutEvent.php            | 41 +++++++++++++
 src/Cms/Maintenance/MaintenanceConfig.php     |  2 +-
 src/Cms/Maintenance/MaintenanceManager.php    | 31 +++++++++-
 .../DatabaseCategoryRepository.php            |  2 +-
 ...tabaseEmailVerificationTokenRepository.php |  2 +-
 .../Repositories/DatabasePageRepository.php   |  2 +-
 .../DatabasePasswordResetTokenRepository.php  |  2 +-
 .../Repositories/DatabasePostRepository.php   |  2 +-
 .../Repositories/DatabaseTagRepository.php    |  2 +-
 .../Repositories/DatabaseUserRepository.php   |  2 +-
 src/Cms/Services/Auth/Authentication.php      | 59 +++++++++++++++++++
 src/Cms/Services/Auth/EmailVerifier.php       |  5 +-
 src/Cms/Services/Auth/PasswordResetter.php    | 14 ++++-
 src/Cms/Services/Email/Sender.php             |  2 +-
 .../Services/Member/RegistrationService.php   |  2 +-
 tests/Cms/BlogControllerTest.php              |  4 +-
 .../Commands/Install/InstallCommandTest.php   |  4 +-
 tests/Cms/ContentControllerTest.php           |  2 +-
 .../Cms/Maintenance/MaintenanceConfigTest.php |  2 +-
 ...seEmailVerificationTokenRepositoryTest.php |  2 +-
 .../DatabaseUserRepositoryTest.php            |  2 +-
 tests/Cms/Services/AuthenticationTest.php     |  2 +-
 tests/Cms/Services/EmailVerifierTest.php      |  4 +-
 tests/Cms/Services/PasswordResetterTest.php   |  4 +-
 .../Cms/Services/RegistrationServiceTest.php  |  4 +-
 47 files changed, 498 insertions(+), 49 deletions(-)
 create mode 100644 resources/views/http_codes/500.php
 create mode 100644 src/Cms/Events/EmailVerifiedEvent.php
 create mode 100644 src/Cms/Events/MaintenanceModeDisabledEvent.php
 create mode 100644 src/Cms/Events/MaintenanceModeEnabledEvent.php
 create mode 100644 src/Cms/Events/PasswordResetCompletedEvent.php
 create mode 100644 src/Cms/Events/PasswordResetRequestedEvent.php
 create mode 100644 src/Cms/Events/UserLoginEvent.php
 create mode 100644 src/Cms/Events/UserLoginFailedEvent.php
 create mode 100644 src/Cms/Events/UserLogoutEvent.php

diff --git a/composer.json b/composer.json
index f2fa020..fca4ff0 100644
--- a/composer.json
+++ b/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.*",
diff --git a/resources/app/Initializers/AuthInitializer.php b/resources/app/Initializers/AuthInitializer.php
index 48e70af..b12a264 100644
--- a/resources/app/Initializers/AuthInitializer.php
+++ b/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;
diff --git a/resources/app/Initializers/MaintenanceInitializer.php b/resources/app/Initializers/MaintenanceInitializer.php
index b6e711c..d35e4e4 100644
--- a/resources/app/Initializers/MaintenanceInitializer.php
+++ b/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
 			{
diff --git a/resources/app/Initializers/PasswordResetInitializer.php b/resources/app/Initializers/PasswordResetInitializer.php
index ab38cea..8abeaf1 100644
--- a/resources/app/Initializers/PasswordResetInitializer.php
+++ b/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;
diff --git a/resources/app/Initializers/RegistrationInitializer.php b/resources/app/Initializers/RegistrationInitializer.php
index 17ad73a..7b1e898 100644
--- a/resources/app/Initializers/RegistrationInitializer.php
+++ b/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;
diff --git a/resources/views/http_codes/500.php b/resources/views/http_codes/500.php
new file mode 100644
index 0000000..2540e78
--- /dev/null
+++ b/resources/views/http_codes/500.php
@@ -0,0 +1,20 @@
+<div class="row">
+	<div class="col">
+		<h1 class="centered">Something went wrong on our end.</h1>
+		<p class="centered-text">The server encountered an unexpected error. Please try again later.</p>
+	</div>
+</div>
+
+<style>
+	.centered {
+		text-align: center;
+		margin-top: 100px; /* Adjust this value as needed */
+	}
+
+	.centered-text {
+		text-align: center;
+		margin-top: 20px;
+		font-size: 16px;
+		color: #666;
+	}
+</style>
\ No newline at end of file
diff --git a/src/Bootstrap.php b/src/Bootstrap.php
index 75e83a0..b50706a 100644
--- a/src/Bootstrap.php
+++ b/src/Bootstrap.php
@@ -1,8 +1,8 @@
 <?php
 namespace Neuron\Cms;
 
-use Neuron\Data\Object\Version;
-use Neuron\Data\Setting\Source\Yaml;
+use Neuron\Data\Objects\Version;
+use Neuron\Data\Settings\Source\Yaml;
 use Neuron\Mvc\Application;
 use Neuron\Orm\Model;
 use Neuron\Cms\Database\ConnectionFactory;
diff --git a/src/Cms/Cli/Commands/Install/InstallCommand.php b/src/Cms/Cli/Commands/Install/InstallCommand.php
index f8e6d81..f386ac6 100644
--- a/src/Cms/Cli/Commands/Install/InstallCommand.php
+++ b/src/Cms/Cli/Commands/Install/InstallCommand.php
@@ -6,8 +6,8 @@
 use Neuron\Cms\Models\User;
 use Neuron\Cms\Repositories\DatabaseUserRepository;
 use Neuron\Cms\Auth\PasswordHasher;
-use Neuron\Data\Setting\SettingManager;
-use Neuron\Data\Setting\Source\Yaml;
+use Neuron\Data\Settings\SettingManager;
+use Neuron\Data\Settings\Source\Yaml;
 use Neuron\Patterns\Registry;
 
 /**
diff --git a/src/Cms/Cli/Commands/Maintenance/EnableCommand.php b/src/Cms/Cli/Commands/Maintenance/EnableCommand.php
index 58d3564..63ec944 100644
--- a/src/Cms/Cli/Commands/Maintenance/EnableCommand.php
+++ b/src/Cms/Cli/Commands/Maintenance/EnableCommand.php
@@ -5,7 +5,7 @@
 use Neuron\Cli\Commands\Command;
 use Neuron\Cms\Maintenance\MaintenanceManager;
 use Neuron\Cms\Maintenance\MaintenanceConfig;
-use Neuron\Data\Setting\Source\Yaml;
+use Neuron\Data\Settings\Source\Yaml;
 
 /**
  * CLI command for enabling maintenance mode.
diff --git a/src/Cms/Controllers/Admin/Categories.php b/src/Cms/Controllers/Admin/Categories.php
index 268c8e1..746fcd8 100644
--- a/src/Cms/Controllers/Admin/Categories.php
+++ b/src/Cms/Controllers/Admin/Categories.php
@@ -8,7 +8,7 @@
 use Neuron\Cms\Services\Category\Updater;
 use Neuron\Cms\Services\Category\Deleter;
 use Neuron\Core\Exceptions\NotFound;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use Neuron\Mvc\Application;
 use Neuron\Mvc\Requests\Request;
 use Neuron\Mvc\Responses\HttpResponseStatus;
diff --git a/src/Cms/Controllers/Admin/Profile.php b/src/Cms/Controllers/Admin/Profile.php
index 30fc361..74ff398 100644
--- a/src/Cms/Controllers/Admin/Profile.php
+++ b/src/Cms/Controllers/Admin/Profile.php
@@ -7,7 +7,7 @@
 use Neuron\Cms\Services\User\Updater;
 use Neuron\Cms\Auth\PasswordHasher;
 use Neuron\Cms\Services\Auth\CsrfToken;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use Neuron\Mvc\Application;
 use Neuron\Mvc\Requests\Request;
 use Neuron\Mvc\Responses\HttpResponseStatus;
diff --git a/src/Cms/Controllers/Admin/Users.php b/src/Cms/Controllers/Admin/Users.php
index 881af81..5a9ab06 100644
--- a/src/Cms/Controllers/Admin/Users.php
+++ b/src/Cms/Controllers/Admin/Users.php
@@ -10,7 +10,7 @@
 use Neuron\Cms\Services\User\Deleter;
 use Neuron\Cms\Auth\PasswordHasher;
 use Neuron\Cms\Services\Auth\CsrfToken;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use Neuron\Mvc\Application;
 use Neuron\Mvc\Requests\Request;
 use Neuron\Mvc\Responses\HttpResponseStatus;
diff --git a/src/Cms/Controllers/Content.php b/src/Cms/Controllers/Content.php
index 1a04ade..bd26a1a 100644
--- a/src/Cms/Controllers/Content.php
+++ b/src/Cms/Controllers/Content.php
@@ -1,5 +1,6 @@
 <?php
 namespace Neuron\Cms\Controllers;
+use Neuron\Data\Factories;
 
 /**
  * Base content controller for the Neuron CMS framework.
@@ -50,7 +51,7 @@
 use League\CommonMark\Exception\CommonMarkException;
 use Neuron\Cms\Auth\SessionManager;
 use Neuron\Core\Exceptions\NotFound;
-use Neuron\Data\Object\Version;
+use Neuron\Data\Objects\Version;
 use Neuron\Mvc\Application;
 use Neuron\Mvc\Controllers\Base;
 use Neuron\Mvc\Requests\Request;
@@ -83,8 +84,7 @@ public function __construct( ?Application $app = null )
 
 		try
 		{
-			$version = new Version();
-			$version->loadFromFile( "../.version.json" );
+			$version = Factories\Version::fromFile( "../.version.json" );
 
 			Registry::getInstance()->set( 'version', 'v'.$version->getAsString() );
 		}
@@ -202,7 +202,7 @@ public function markdown( Request $request ): string
 	{
 		$viewData = array();
 
-		$page = $request->getRouteParameter( 'page' );
+		$page = $request->getRouteParameter( 'page' ) ?? 'index';
 
 		$viewData[ 'Title' ]		= $this->getName() . ' | ' . $this->getTitle();
 
diff --git a/src/Cms/Database/ConnectionFactory.php b/src/Cms/Database/ConnectionFactory.php
index 5e423bb..503a772 100644
--- a/src/Cms/Database/ConnectionFactory.php
+++ b/src/Cms/Database/ConnectionFactory.php
@@ -2,7 +2,7 @@
 
 namespace Neuron\Cms\Database;
 
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use PDO;
 use Exception;
 
diff --git a/src/Cms/Email/helpers.php b/src/Cms/Email/helpers.php
index a5392f4..7fea128 100644
--- a/src/Cms/Email/helpers.php
+++ b/src/Cms/Email/helpers.php
@@ -1,7 +1,7 @@
 <?php
 
 use Neuron\Cms\Services\Email\Sender;
-use Neuron\Data\Setting\ISettingSource;
+use Neuron\Data\Settings\ISettingSource;
 
 if( !function_exists( 'sendEmail' ) )
 {
diff --git a/src/Cms/Events/EmailVerifiedEvent.php b/src/Cms/Events/EmailVerifiedEvent.php
new file mode 100644
index 0000000..791642f
--- /dev/null
+++ b/src/Cms/Events/EmailVerifiedEvent.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Neuron\Cms\Events;
+
+use Neuron\Cms\Models\User;
+use Neuron\Events\IEvent;
+
+/**
+ * Event fired when a user successfully verifies their email address.
+ *
+ * This event is triggered when a user clicks the verification link in
+ * their email and their email address is confirmed.
+ *
+ * Use cases:
+ * - Send welcome email after verification
+ * - Trigger onboarding workflows
+ * - Grant additional permissions or access
+ * - Track email verification rates and timing
+ * - Enable email notifications for the user
+ * - Update user status and analytics
+ *
+ * @package Neuron\Cms\Events
+ */
+class EmailVerifiedEvent implements IEvent
+{
+	/**
+	 * @param User $user User whose email was verified
+	 */
+	public function __construct(
+		public readonly User $user
+	)
+	{
+	}
+
+	public function getName(): string
+	{
+		return 'email.verified';
+	}
+}
diff --git a/src/Cms/Events/MaintenanceModeDisabledEvent.php b/src/Cms/Events/MaintenanceModeDisabledEvent.php
new file mode 100644
index 0000000..660f553
--- /dev/null
+++ b/src/Cms/Events/MaintenanceModeDisabledEvent.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Neuron\Cms\Events;
+
+use Neuron\Cms\Models\User;
+use Neuron\Events\IEvent;
+
+/**
+ * Event fired when maintenance mode is disabled.
+ *
+ * This event is triggered when an administrator disables maintenance mode,
+ * making the site available to all users again.
+ *
+ * Use cases:
+ * - Notify administrators that site is back online
+ * - Update external status pages or monitoring systems
+ * - Log maintenance completion for compliance
+ * - Send notifications that site is available
+ * - Trigger cache warming or verification tasks
+ * - Update load balancer or CDN configurations
+ *
+ * @package Neuron\Cms\Events
+ */
+class MaintenanceModeDisabledEvent implements IEvent
+{
+	/**
+	 * @param string $disabledBy Username or identifier of who disabled maintenance mode
+	 */
+	public function __construct(
+		public readonly string $disabledBy
+	)
+	{
+	}
+
+	public function getName(): string
+	{
+		return 'maintenance.disabled';
+	}
+}
diff --git a/src/Cms/Events/MaintenanceModeEnabledEvent.php b/src/Cms/Events/MaintenanceModeEnabledEvent.php
new file mode 100644
index 0000000..0b75c02
--- /dev/null
+++ b/src/Cms/Events/MaintenanceModeEnabledEvent.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Neuron\Cms\Events;
+
+use Neuron\Cms\Models\User;
+use Neuron\Events\IEvent;
+
+/**
+ * Event fired when maintenance mode is enabled.
+ *
+ * This event is triggered when an administrator enables maintenance mode,
+ * making the site unavailable to regular users.
+ *
+ * Use cases:
+ * - Notify administrators of maintenance mode activation
+ * - Update external status pages or monitoring systems
+ * - Log maintenance windows for compliance
+ * - Send notifications to users about scheduled downtime
+ * - Trigger cache clearing or preparation tasks
+ * - Update load balancer or CDN configurations
+ *
+ * @package Neuron\Cms\Events
+ */
+class MaintenanceModeEnabledEvent implements IEvent
+{
+	/**
+	 * @param string $enabledBy Username or identifier of who enabled maintenance mode
+	 * @param string $message Maintenance message to display to users
+	 */
+	public function __construct(
+		public readonly string $enabledBy,
+		public readonly string $message
+	)
+	{
+	}
+
+	public function getName(): string
+	{
+		return 'maintenance.enabled';
+	}
+}
diff --git a/src/Cms/Events/PasswordResetCompletedEvent.php b/src/Cms/Events/PasswordResetCompletedEvent.php
new file mode 100644
index 0000000..3965877
--- /dev/null
+++ b/src/Cms/Events/PasswordResetCompletedEvent.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Neuron\Cms\Events;
+
+use Neuron\Cms\Models\User;
+use Neuron\Events\IEvent;
+
+/**
+ * Event fired when a user successfully completes a password reset.
+ *
+ * This event is triggered after a user uses a valid reset token
+ * and successfully changes their password.
+ *
+ * Use cases:
+ * - Send confirmation email of password change
+ * - Invalidate all existing sessions for security
+ * - Log password change for security audits
+ * - Track password reset completion rates
+ * - Alert user of successful password change
+ * - Update security compliance records
+ *
+ * @package Neuron\Cms\Events
+ */
+class PasswordResetCompletedEvent implements IEvent
+{
+	/**
+	 * @param User $user User who completed password reset
+	 * @param string $ip IP address where reset was completed
+	 */
+	public function __construct(
+		public readonly User $user,
+		public readonly string $ip
+	)
+	{
+	}
+
+	public function getName(): string
+	{
+		return 'password.reset_completed';
+	}
+}
diff --git a/src/Cms/Events/PasswordResetRequestedEvent.php b/src/Cms/Events/PasswordResetRequestedEvent.php
new file mode 100644
index 0000000..29fb644
--- /dev/null
+++ b/src/Cms/Events/PasswordResetRequestedEvent.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Neuron\Cms\Events;
+
+use Neuron\Cms\Models\User;
+use Neuron\Events\IEvent;
+
+/**
+ * Event fired when a user requests a password reset.
+ *
+ * This event is triggered when a password reset token is generated
+ * and the reset email is about to be sent.
+ *
+ * Use cases:
+ * - Security monitoring for reset request patterns
+ * - Track potential account takeover attempts
+ * - Send security alerts for unexpected reset requests
+ * - Log password reset activity for compliance
+ * - Implement rate limiting on reset requests
+ * - Detect and prevent password reset abuse
+ *
+ * @package Neuron\Cms\Events
+ */
+class PasswordResetRequestedEvent implements IEvent
+{
+	/**
+	 * @param User $user User who requested password reset
+	 * @param string $ip IP address of the request
+	 */
+	public function __construct(
+		public readonly User $user,
+		public readonly string $ip
+	)
+	{
+	}
+
+	public function getName(): string
+	{
+		return 'password.reset_requested';
+	}
+}
diff --git a/src/Cms/Events/UserLoginEvent.php b/src/Cms/Events/UserLoginEvent.php
new file mode 100644
index 0000000..d375e37
--- /dev/null
+++ b/src/Cms/Events/UserLoginEvent.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Neuron\Cms\Events;
+
+use Neuron\Cms\Models\User;
+use Neuron\Events\IEvent;
+
+/**
+ * Event fired when a user successfully logs in.
+ *
+ * This event is triggered after successful authentication when a user
+ * logs in to the system, either as an admin or member.
+ *
+ * Use cases:
+ * - Track user login activity for security audits
+ * - Send login notifications to users
+ * - Update last login timestamp
+ * - Detect unusual login patterns (location, time)
+ * - Generate analytics on user engagement
+ * - Trigger two-factor authentication workflows
+ *
+ * @package Neuron\Cms\Events
+ */
+class UserLoginEvent implements IEvent
+{
+	/**
+	 * @param User $user User who logged in
+	 * @param string $ip IP address of the login
+	 * @param float $timestamp Login timestamp (microtime)
+	 */
+	public function __construct(
+		public readonly User $user,
+		public readonly string $ip,
+		public readonly float $timestamp
+	)
+	{
+	}
+
+	public function getName(): string
+	{
+		return 'user.login';
+	}
+}
diff --git a/src/Cms/Events/UserLoginFailedEvent.php b/src/Cms/Events/UserLoginFailedEvent.php
new file mode 100644
index 0000000..186b657
--- /dev/null
+++ b/src/Cms/Events/UserLoginFailedEvent.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Neuron\Cms\Events;
+
+use Neuron\Events\IEvent;
+
+/**
+ * Event fired when a login attempt fails.
+ *
+ * This event is triggered when authentication fails due to invalid
+ * credentials, locked account, or other authentication errors.
+ *
+ * Use cases:
+ * - Security monitoring and brute force detection
+ * - Automatically lock accounts after failed attempts
+ * - Send security alerts for repeated failures
+ * - Track potential security threats and attack patterns
+ * - Generate security reports for compliance
+ * - Implement progressive delays on failed attempts
+ *
+ * @package Neuron\Cms\Events
+ */
+class UserLoginFailedEvent implements IEvent
+{
+	/**
+	 * @param string $identifier Username or email used in failed attempt
+	 * @param string $ip IP address of the failed login
+	 * @param float $timestamp Failure timestamp (microtime)
+	 * @param string $reason Reason for failure (invalid_credentials, account_locked, etc.)
+	 */
+	public function __construct(
+		public readonly string $identifier,
+		public readonly string $ip,
+		public readonly float $timestamp,
+		public readonly string $reason
+	)
+	{
+	}
+
+	public function getName(): string
+	{
+		return 'user.login_failed';
+	}
+}
diff --git a/src/Cms/Events/UserLogoutEvent.php b/src/Cms/Events/UserLogoutEvent.php
new file mode 100644
index 0000000..66bc312
--- /dev/null
+++ b/src/Cms/Events/UserLogoutEvent.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Neuron\Cms\Events;
+
+use Neuron\Cms\Models\User;
+use Neuron\Events\IEvent;
+
+/**
+ * Event fired when a user logs out.
+ *
+ * This event is triggered when a user explicitly logs out or when
+ * their session is terminated.
+ *
+ * Use cases:
+ * - Track user session duration and activity patterns
+ * - Clean up user-specific resources or temporary data
+ * - Log session end for security audits
+ * - Update user activity status (online/offline)
+ * - Trigger session analytics and reporting
+ * - Send logout confirmation notifications
+ *
+ * @package Neuron\Cms\Events
+ */
+class UserLogoutEvent implements IEvent
+{
+	/**
+	 * @param User $user User who logged out
+	 * @param float $sessionDuration Session duration in seconds
+	 */
+	public function __construct(
+		public readonly User $user,
+		public readonly float $sessionDuration
+	)
+	{
+	}
+
+	public function getName(): string
+	{
+		return 'user.logout';
+	}
+}
diff --git a/src/Cms/Maintenance/MaintenanceConfig.php b/src/Cms/Maintenance/MaintenanceConfig.php
index 8e74a1a..68a6ec1 100644
--- a/src/Cms/Maintenance/MaintenanceConfig.php
+++ b/src/Cms/Maintenance/MaintenanceConfig.php
@@ -2,7 +2,7 @@
 
 namespace Neuron\Cms\Maintenance;
 
-use Neuron\Data\Setting\Source\ISettingSource;
+use Neuron\Data\Settings\Source\ISettingSource;
 
 /**
  * Configuration handler for maintenance mode.
diff --git a/src/Cms/Maintenance/MaintenanceManager.php b/src/Cms/Maintenance/MaintenanceManager.php
index 500983c..93808fe 100644
--- a/src/Cms/Maintenance/MaintenanceManager.php
+++ b/src/Cms/Maintenance/MaintenanceManager.php
@@ -67,19 +67,44 @@ public function enable(
 			'enabled_by' => $enabledBy ?? get_current_user()
 		];
 
-		return $this->writeMaintenanceFile( $data );
+		$result = $this->writeMaintenanceFile( $data );
+
+		// Emit maintenance mode enabled event
+		if( $result )
+		{
+			\Neuron\Application\CrossCutting\Event::emit( new \Neuron\Cms\Events\MaintenanceModeEnabledEvent(
+				$data['enabled_by'],
+				$message
+			) );
+		}
+
+		return $result;
 	}
 
 	/**
 	 * Disable maintenance mode
 	 *
+	 * @param string|null $disabledBy User who disabled maintenance mode
 	 * @return bool Success status
 	 */
-	public function disable(): bool
+	public function disable( ?string $disabledBy = null ): bool
 	{
+		// Get who is disabling before we delete the file
+		$disabledByUser = $disabledBy ?? get_current_user();
+
 		if( file_exists( $this->_maintenanceFilePath ) )
 		{
-			return unlink( $this->_maintenanceFilePath );
+			$result = unlink( $this->_maintenanceFilePath );
+
+			// Emit maintenance mode disabled event
+			if( $result )
+			{
+				\Neuron\Application\CrossCutting\Event::emit( new \Neuron\Cms\Events\MaintenanceModeDisabledEvent(
+					$disabledByUser
+				) );
+			}
+
+			return $result;
 		}
 
 		return true;
diff --git a/src/Cms/Repositories/DatabaseCategoryRepository.php b/src/Cms/Repositories/DatabaseCategoryRepository.php
index 419a6bc..4e9977b 100644
--- a/src/Cms/Repositories/DatabaseCategoryRepository.php
+++ b/src/Cms/Repositories/DatabaseCategoryRepository.php
@@ -4,7 +4,7 @@
 
 use Neuron\Cms\Database\ConnectionFactory;
 use Neuron\Cms\Models\Category;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use PDO;
 use Exception;
 use DateTimeImmutable;
diff --git a/src/Cms/Repositories/DatabaseEmailVerificationTokenRepository.php b/src/Cms/Repositories/DatabaseEmailVerificationTokenRepository.php
index 59cca22..dcc0852 100644
--- a/src/Cms/Repositories/DatabaseEmailVerificationTokenRepository.php
+++ b/src/Cms/Repositories/DatabaseEmailVerificationTokenRepository.php
@@ -4,7 +4,7 @@
 
 use Neuron\Cms\Database\ConnectionFactory;
 use Neuron\Cms\Models\EmailVerificationToken;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use PDO;
 use Exception;
 use DateTimeImmutable;
diff --git a/src/Cms/Repositories/DatabasePageRepository.php b/src/Cms/Repositories/DatabasePageRepository.php
index fbd65f9..9ea4f8b 100644
--- a/src/Cms/Repositories/DatabasePageRepository.php
+++ b/src/Cms/Repositories/DatabasePageRepository.php
@@ -5,7 +5,7 @@
 use Neuron\Cms\Database\ConnectionFactory;
 use Neuron\Cms\Models\Page;
 use Neuron\Cms\Models\User;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use PDO;
 use Exception;
 use DateTimeImmutable;
diff --git a/src/Cms/Repositories/DatabasePasswordResetTokenRepository.php b/src/Cms/Repositories/DatabasePasswordResetTokenRepository.php
index edfed30..7a5cfcf 100644
--- a/src/Cms/Repositories/DatabasePasswordResetTokenRepository.php
+++ b/src/Cms/Repositories/DatabasePasswordResetTokenRepository.php
@@ -4,7 +4,7 @@
 
 use Neuron\Cms\Database\ConnectionFactory;
 use Neuron\Cms\Models\PasswordResetToken;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use PDO;
 use Exception;
 use DateTimeImmutable;
diff --git a/src/Cms/Repositories/DatabasePostRepository.php b/src/Cms/Repositories/DatabasePostRepository.php
index 2e6b90f..5eaa0bf 100644
--- a/src/Cms/Repositories/DatabasePostRepository.php
+++ b/src/Cms/Repositories/DatabasePostRepository.php
@@ -7,7 +7,7 @@
 use Neuron\Cms\Models\User;
 use Neuron\Cms\Models\Category;
 use Neuron\Cms\Models\Tag;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use PDO;
 use Exception;
 use DateTimeImmutable;
diff --git a/src/Cms/Repositories/DatabaseTagRepository.php b/src/Cms/Repositories/DatabaseTagRepository.php
index 851e4c8..0d91899 100644
--- a/src/Cms/Repositories/DatabaseTagRepository.php
+++ b/src/Cms/Repositories/DatabaseTagRepository.php
@@ -4,7 +4,7 @@
 
 use Neuron\Cms\Database\ConnectionFactory;
 use Neuron\Cms\Models\Tag;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use PDO;
 use Exception;
 use DateTimeImmutable;
diff --git a/src/Cms/Repositories/DatabaseUserRepository.php b/src/Cms/Repositories/DatabaseUserRepository.php
index ae8419b..d976370 100644
--- a/src/Cms/Repositories/DatabaseUserRepository.php
+++ b/src/Cms/Repositories/DatabaseUserRepository.php
@@ -4,7 +4,7 @@
 
 use Neuron\Cms\Database\ConnectionFactory;
 use Neuron\Cms\Models\User;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use PDO;
 use Exception;
 use DateTimeImmutable;
diff --git a/src/Cms/Services/Auth/Authentication.php b/src/Cms/Services/Auth/Authentication.php
index b2d00bd..a87682b 100644
--- a/src/Cms/Services/Auth/Authentication.php
+++ b/src/Cms/Services/Auth/Authentication.php
@@ -46,18 +46,41 @@ public function attempt( string $username, string $password, bool $remember = fa
 		{
 			// Perform dummy hash to normalize timing
 			$this->_passwordHasher->verify( $password, '$2y$10$dummyhashtopreventtimingattack1234567890' );
+
+			// Emit login failed event
+			\Neuron\Application\CrossCutting\Event::emit( new \Neuron\Cms\Events\UserLoginFailedEvent(
+				$username,
+				$_SERVER['REMOTE_ADDR'] ?? 'unknown',
+				microtime( true ),
+				'user_not_found'
+			) );
+
 			return false;
 		}
 
 		// Check if account is locked
 		if( $user->isLockedOut() )
 		{
+			// Emit login failed event
+			\Neuron\Application\CrossCutting\Event::emit( new \Neuron\Cms\Events\UserLoginFailedEvent(
+				$username,
+				$_SERVER['REMOTE_ADDR'] ?? 'unknown',
+				microtime( true ),
+				'account_locked'
+			) );
 			return false;
 		}
 
 		// Check if account is active
 		if( !$user->isActive() )
 		{
+			// Emit login failed event
+			\Neuron\Application\CrossCutting\Event::emit( new \Neuron\Cms\Events\UserLoginFailedEvent(
+				$username,
+				$_SERVER['REMOTE_ADDR'] ?? 'unknown',
+				microtime( true ),
+				'account_inactive'
+			) );
 			return false;
 		}
 
@@ -75,6 +98,15 @@ public function attempt( string $username, string $password, bool $remember = fa
 			}
 
 			$this->_userRepository->update( $user );
+
+			// Emit login failed event
+			\Neuron\Application\CrossCutting\Event::emit( new \Neuron\Cms\Events\UserLoginFailedEvent(
+				$username,
+				$_SERVER['REMOTE_ADDR'] ?? 'unknown',
+				microtime( true ),
+				'invalid_credentials'
+			) );
+
 			return false;
 		}
 
@@ -107,12 +139,20 @@ public function login( User $user, bool $remember = false ): void
 		// Store user ID in session
 		$this->_sessionManager->set( 'user_id', $user->getId() );
 		$this->_sessionManager->set( 'user_role', $user->getRole() );
+		$this->_sessionManager->set( 'login_time', microtime( true ) );
 
 		// Handle remember me
 		if( $remember )
 		{
 			$this->setRememberToken( $user );
 		}
+
+		// Emit user login event
+		\Neuron\Application\CrossCutting\Event::emit( new \Neuron\Cms\Events\UserLoginEvent(
+			$user,
+			$_SERVER['REMOTE_ADDR'] ?? 'unknown',
+			microtime( true )
+		) );
 	}
 
 	/**
@@ -120,6 +160,9 @@ public function login( User $user, bool $remember = false ): void
 	 */
 	public function logout(): void
 	{
+		$user = null;
+		$sessionDuration = 0.0;
+
 		// Clear remember token if exists
 		if( $this->check() )
 		{
@@ -128,6 +171,13 @@ public function logout(): void
 			{
 				$user->setRememberToken( null );
 				$this->_userRepository->update( $user );
+
+				// Calculate session duration
+				$loginTime = $this->_sessionManager->get( 'login_time' );
+				if( $loginTime )
+				{
+					$sessionDuration = microtime( true ) - $loginTime;
+				}
 			}
 		}
 
@@ -139,6 +189,15 @@ public function logout(): void
 		{
 			setcookie( 'remember_token', '', time() - 3600, '/', '', true, true );
 		}
+
+		// Emit user logout event
+		if( $user )
+		{
+			\Neuron\Application\CrossCutting\Event::emit( new \Neuron\Cms\Events\UserLogoutEvent(
+				$user,
+				$sessionDuration
+			) );
+		}
 	}
 
 	/**
diff --git a/src/Cms/Services/Auth/EmailVerifier.php b/src/Cms/Services/Auth/EmailVerifier.php
index 03073ac..125cf15 100644
--- a/src/Cms/Services/Auth/EmailVerifier.php
+++ b/src/Cms/Services/Auth/EmailVerifier.php
@@ -7,7 +7,7 @@
 use Neuron\Cms\Repositories\IEmailVerificationTokenRepository;
 use Neuron\Cms\Repositories\IUserRepository;
 use Neuron\Cms\Services\Email\Sender;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use Neuron\Log\Log;
 use Exception;
 
@@ -160,6 +160,9 @@ public function verifyEmail( string $plainToken ): bool
 
 		Log::info( "Email verified for user: {$user->getUsername()}" );
 
+		// Emit email verified event
+		\Neuron\Application\CrossCutting\Event::emit( new \Neuron\Cms\Events\EmailVerifiedEvent( $user ) );
+
 		return true;
 	}
 
diff --git a/src/Cms/Services/Auth/PasswordResetter.php b/src/Cms/Services/Auth/PasswordResetter.php
index bc3ffcd..1c97264 100644
--- a/src/Cms/Services/Auth/PasswordResetter.php
+++ b/src/Cms/Services/Auth/PasswordResetter.php
@@ -7,7 +7,7 @@
 use Neuron\Cms\Repositories\IPasswordResetTokenRepository;
 use Neuron\Cms\Repositories\IUserRepository;
 use Neuron\Cms\Services\Email\Sender;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use Neuron\Log\Log;
 use Exception;
 
@@ -103,6 +103,12 @@ public function requestReset( string $email ): bool
 		// Send reset email
 		$this->sendResetEmail( $email, $plainToken );
 
+		// Emit password reset requested event
+		\Neuron\Application\CrossCutting\Event::emit( new \Neuron\Cms\Events\PasswordResetRequestedEvent(
+			$user,
+			$_SERVER['REMOTE_ADDR'] ?? 'unknown'
+		) );
+
 		return true;
 	}
 
@@ -166,6 +172,12 @@ public function resetPassword( string $plainToken, string $newPassword ): bool
 		// Delete the token
 		$this->_tokenRepository->deleteByToken( hash( 'sha256', $plainToken ) );
 
+		// Emit password reset completed event
+		\Neuron\Application\CrossCutting\Event::emit( new \Neuron\Cms\Events\PasswordResetCompletedEvent(
+			$user,
+			$_SERVER['REMOTE_ADDR'] ?? 'unknown'
+		) );
+
 		return true;
 	}
 
diff --git a/src/Cms/Services/Email/Sender.php b/src/Cms/Services/Email/Sender.php
index 8045b9f..68f7e5e 100644
--- a/src/Cms/Services/Email/Sender.php
+++ b/src/Cms/Services/Email/Sender.php
@@ -4,7 +4,7 @@
 
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception as PHPMailerException;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use Neuron\Log\Log;
 
 /**
diff --git a/src/Cms/Services/Member/RegistrationService.php b/src/Cms/Services/Member/RegistrationService.php
index 236e83d..45497b4 100644
--- a/src/Cms/Services/Member/RegistrationService.php
+++ b/src/Cms/Services/Member/RegistrationService.php
@@ -6,7 +6,7 @@
 use Neuron\Cms\Auth\PasswordHasher;
 use Neuron\Cms\Models\User;
 use Neuron\Cms\Repositories\IUserRepository;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use Neuron\Dto\Dto;
 use Neuron\Events\Emitter;
 use Neuron\Cms\Events\UserCreatedEvent;
diff --git a/tests/Cms/BlogControllerTest.php b/tests/Cms/BlogControllerTest.php
index 1839211..8da5507 100644
--- a/tests/Cms/BlogControllerTest.php
+++ b/tests/Cms/BlogControllerTest.php
@@ -10,8 +10,8 @@
 use Neuron\Cms\Repositories\DatabasePostRepository;
 use Neuron\Cms\Repositories\DatabaseCategoryRepository;
 use Neuron\Cms\Repositories\DatabaseTagRepository;
-use Neuron\Data\Setting\Source\Memory;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\Source\Memory;
+use Neuron\Data\Settings\SettingManager;
 use Neuron\Mvc\Requests\Request;
 use Neuron\Patterns\Registry;
 use PDO;
diff --git a/tests/Cms/Cli/Commands/Install/InstallCommandTest.php b/tests/Cms/Cli/Commands/Install/InstallCommandTest.php
index 3322e69..f1b5a0d 100644
--- a/tests/Cms/Cli/Commands/Install/InstallCommandTest.php
+++ b/tests/Cms/Cli/Commands/Install/InstallCommandTest.php
@@ -5,8 +5,8 @@
 use PHPUnit\Framework\TestCase;
 use Neuron\Cms\Cli\Commands\Install\InstallCommand;
 use org\bovigo\vfs\vfsStream;
-use Neuron\Data\Setting\SettingManager;
-use Neuron\Data\Setting\Source\Yaml;
+use Neuron\Data\Settings\SettingManager;
+use Neuron\Data\Settings\Source\Yaml;
 
 class InstallCommandTest extends TestCase
 {
diff --git a/tests/Cms/ContentControllerTest.php b/tests/Cms/ContentControllerTest.php
index f5fe9a4..58a0775 100644
--- a/tests/Cms/ContentControllerTest.php
+++ b/tests/Cms/ContentControllerTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Cms;
 
 use Neuron\Cms\Controllers\Content;
-use Neuron\Data\Setting\Source\Memory;
+use Neuron\Data\Settings\Source\Memory;
 use Neuron\Mvc\Requests\Request;
 use Neuron\Mvc\Responses\HttpResponseStatus;
 use Neuron\Patterns\Registry;
diff --git a/tests/Cms/Maintenance/MaintenanceConfigTest.php b/tests/Cms/Maintenance/MaintenanceConfigTest.php
index 657c38c..b766bd6 100644
--- a/tests/Cms/Maintenance/MaintenanceConfigTest.php
+++ b/tests/Cms/Maintenance/MaintenanceConfigTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Cms\Maintenance;
 
 use Neuron\Cms\Maintenance\MaintenanceConfig;
-use Neuron\Data\Setting\Source\Yaml;
+use Neuron\Data\Settings\Source\Yaml;
 use org\bovigo\vfs\vfsStream;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Cms/Repositories/DatabaseEmailVerificationTokenRepositoryTest.php b/tests/Cms/Repositories/DatabaseEmailVerificationTokenRepositoryTest.php
index 257d2bf..ee000e1 100644
--- a/tests/Cms/Repositories/DatabaseEmailVerificationTokenRepositoryTest.php
+++ b/tests/Cms/Repositories/DatabaseEmailVerificationTokenRepositoryTest.php
@@ -5,7 +5,7 @@
 use PHPUnit\Framework\TestCase;
 use Neuron\Cms\Repositories\DatabaseEmailVerificationTokenRepository;
 use Neuron\Cms\Models\EmailVerificationToken;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use PDO;
 use DateTimeImmutable;
 
diff --git a/tests/Cms/Repositories/DatabaseUserRepositoryTest.php b/tests/Cms/Repositories/DatabaseUserRepositoryTest.php
index a02424f..635f6a3 100644
--- a/tests/Cms/Repositories/DatabaseUserRepositoryTest.php
+++ b/tests/Cms/Repositories/DatabaseUserRepositoryTest.php
@@ -5,7 +5,7 @@
 use PHPUnit\Framework\TestCase;
 use Neuron\Cms\Repositories\DatabaseUserRepository;
 use Neuron\Cms\Models\User;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use PDO;
 use DateTimeImmutable;
 
diff --git a/tests/Cms/Services/AuthenticationTest.php b/tests/Cms/Services/AuthenticationTest.php
index 3830b7b..20cdf0e 100644
--- a/tests/Cms/Services/AuthenticationTest.php
+++ b/tests/Cms/Services/AuthenticationTest.php
@@ -8,7 +8,7 @@
 use Neuron\Cms\Auth\PasswordHasher;
 use Neuron\Cms\Models\User;
 use Neuron\Cms\Repositories\DatabaseUserRepository;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\SettingManager;
 use DateTimeImmutable;
 use PDO;
 
diff --git a/tests/Cms/Services/EmailVerifierTest.php b/tests/Cms/Services/EmailVerifierTest.php
index 8d19f83..5af3f88 100644
--- a/tests/Cms/Services/EmailVerifierTest.php
+++ b/tests/Cms/Services/EmailVerifierTest.php
@@ -7,8 +7,8 @@
 use Neuron\Cms\Models\User;
 use Neuron\Cms\Repositories\IEmailVerificationTokenRepository;
 use Neuron\Cms\Repositories\IUserRepository;
-use Neuron\Data\Setting\Source\Memory;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\Source\Memory;
+use Neuron\Data\Settings\SettingManager;
 use PHPUnit\Framework\TestCase;
 
 class EmailVerifierTest extends TestCase
diff --git a/tests/Cms/Services/PasswordResetterTest.php b/tests/Cms/Services/PasswordResetterTest.php
index c6efc83..011190b 100644
--- a/tests/Cms/Services/PasswordResetterTest.php
+++ b/tests/Cms/Services/PasswordResetterTest.php
@@ -8,8 +8,8 @@
 use Neuron\Cms\Models\User;
 use Neuron\Cms\Repositories\IPasswordResetTokenRepository;
 use Neuron\Cms\Repositories\IUserRepository;
-use Neuron\Data\Setting\Source\Memory;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\Source\Memory;
+use Neuron\Data\Settings\SettingManager;
 use PHPUnit\Framework\TestCase;
 
 class PasswordResetterTest extends TestCase
diff --git a/tests/Cms/Services/RegistrationServiceTest.php b/tests/Cms/Services/RegistrationServiceTest.php
index f078bce..59933dc 100644
--- a/tests/Cms/Services/RegistrationServiceTest.php
+++ b/tests/Cms/Services/RegistrationServiceTest.php
@@ -7,8 +7,8 @@
 use Neuron\Cms\Models\User;
 use Neuron\Cms\Repositories\IUserRepository;
 use Neuron\Cms\Services\Member\RegistrationService;
-use Neuron\Data\Setting\Source\Memory;
-use Neuron\Data\Setting\SettingManager;
+use Neuron\Data\Settings\Source\Memory;
+use Neuron\Data\Settings\SettingManager;
 use Neuron\Events\Emitter;
 use PHPUnit\Framework\TestCase;