From e6672fe38ce5d99f3b3f026154f777aded7361de Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Thu, 29 Jan 2026 17:36:53 +0000
Subject: [PATCH] =Starting refactor of Meta and Routes to fluent-style

---
 JVBase.php |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/JVBase.php b/JVBase.php
index 45fc12e..b6b64a5 100644
--- a/JVBase.php
+++ b/JVBase.php
@@ -1,13 +1,16 @@
 <?php
 namespace JVBase;
 
+use JVBase\blocks\CustomBlocks;
 use JVBase\integrations\BlueSky;
+use JVBase\managers\cache\Cache;
 use JVBase\managers\EmailManager;
 use JVBase\managers\ErrorHandler;
 use JVBase\managers\LoginManager;
 use JVBase\managers\MagicLinkManager;
-use JVBase\managers\OperationQueue;
+use JVBase\managers\queue\Queue;
 use JVBase\managers\DashboardManager;
+use JVBase\managers\DirectoryManager;
 use JVBase\managers\ReferralManager;
 use JVBase\managers\RoleManager;
 //use JVBase\managers\SchemaManager;
@@ -56,6 +59,7 @@
 	protected array $integrations = [];
     protected array $blocks = [];
     protected array $routes = [];
+	protected CustomBlocks $customBlocks;
 
 	protected array $serviceMap = [
 		'maps' => 'JVBase\integrations\GoogleMaps',
@@ -81,9 +85,10 @@
 
     public function __construct()
     {
+		$this->customBlocks = new CustomBlocks();
         $this->managers = [
             'errors'        => new ErrorHandler(),
-            'queue'         => new OperationQueue(),
+            'queue'         => new Queue(),
 //            'dash'          => new DashboardManager(),
             'roles'         => new RoleManager(),
 //            'forms'         => new FormManager(),
@@ -133,6 +138,9 @@
             $this->routes['term'] = new TermRoutes();
         }
 
+		if (Features::forSite()->has('is_directory')) {
+			$this->managers['directory'] = new DirectoryManager();
+		}
 
         if (jvbSiteHasDashboard()) {
             $this->routes['error']  = new ErrorRoutes();
@@ -193,11 +201,15 @@
     {
         return array_merge(array_keys($this->content), array_keys($this->taxonomies));
     }
-    public function dashboard()
+    public function dashboard():DashboardManager|false
     {
-        return $this->managers['dash'];
+        return $this->managers['dash']??false;
     }
-    public function error()
+	public function directories():DirectoryManager|false
+	{
+		return $this->managers['directory']??false;
+	}
+    public function error():ErrorHandler
     {
         return $this->managers['errors'];
     }
@@ -205,11 +217,8 @@
     {
         return $this->managers['file'];
     }
-    public function cache()
-    {
-        return $this->managers['cache'];
-    }
-    public function queue()
+
+    public function queue():Queue
     {
         return $this->managers['queue'];
     }
@@ -217,9 +226,9 @@
 //    {
 //        return $this->managers['forms'];
 //    }
-    public function notification()
+    public function notification():NotificationManager|false
     {
-        return $this->managers['notifications'];
+        return $this->managers['notifications']??false;
     }
     public function routes($route):mixed
     {
@@ -228,7 +237,7 @@
         }
         return false;
     }
-    public function roles()
+    public function roles():RoleManager
     {
         return $this->managers['roles'];
     }
@@ -333,4 +342,9 @@
 			<?php
 		}
 	}
+
+	public function blocks():CustomBlocks|bool
+	{
+		return $this->customBlocks??false;
+	}
 }

--
Gitblit v1.10.0