From 56a9a1ccf764ff7a6af8f8a2292cb07443cb4aa7 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Thu, 28 May 2026 18:19:57 +0000
Subject: [PATCH] =New Gitbit setpu
---
JVBase.php | 144 +++++++++++++++++++++++++++++------------------
1 files changed, 88 insertions(+), 56 deletions(-)
diff --git a/JVBase.php b/JVBase.php
index a9519c0..f0b0c3d 100644
--- a/JVBase.php
+++ b/JVBase.php
@@ -2,10 +2,11 @@
namespace JVBase;
use JVBase\blocks\CustomBlocks;
-use JVBase\integrations\BlueSky;
-use JVBase\managers\Cache;
+use JVBase\base\Site;
+use JVBase\managers\ApprovalManager;
use JVBase\managers\EmailManager;
use JVBase\managers\ErrorHandler;
+use JVBase\managers\FavouritesManager;
use JVBase\managers\InvitationsManager;
use JVBase\managers\LoginManager;
use JVBase\managers\MagicLinkManager;
@@ -14,22 +15,23 @@
use JVBase\managers\DirectoryManager;
use JVBase\managers\ReferralManager;
use JVBase\managers\RoleManager;
-//use JVBase\managers\SchemaManager;
-use JVBase\managers\SEO\SchemaOutputManager;
-use JVBase\managers\SEO\SEOAdminPage;
+use JVBase\managers\SEO\render\SchemaOutput;
+use JVBase\admin\SEOAdmin;
use JVBase\managers\AdminPages;
use JVBase\managers\NotificationManager;
+use JVBase\managers\TaxonomyRelationships;
use JVBase\managers\UserTermsManager;
+use JVBase\registrar\Registrar;
use JVBase\rest\routes\FeedRoutes;
use JVBase\rest\routes\FavouritesRoutes;
use JVBase\rest\routes\IntegrationsSquareRoutes;
+use JVBase\rest\routes\IntegrationsHelcimRoutes;
use JVBase\rest\routes\NotificationsRoutes;
use JVBase\rest\routes\ContentRoutes;
use JVBase\rest\routes\TermRoutes;
use JVBase\rest\routes\UploadRoutes;
-//use JVBase\rest\routes\BioRoutes;
use JVBase\rest\routes\SettingsRoutes;
-//use JVBase\rest\routes\ShopRoutes;
+use JVBase\rest\routes\ContentTermsRoutes;
use JVBase\rest\routes\SEORoutes;
use JVBase\rest\routes\QueueRoutes;
use JVBase\rest\routes\ErrorRoutes;
@@ -37,15 +39,14 @@
use JVBase\rest\routes\LoginRoutes;
use JVBase\rest\routes\NewsRoutes;
use JVBase\rest\routes\ReferralRoutes;
-//use JVBase\rest\routes\MagicLinkRoutes;
use JVBase\rest\routes\ResponseRoutes;
use JVBase\rest\routes\OptionsRoutes;
use JVBase\rest\routes\VoteRoutes;
use JVBase\rest\routes\Invitations;
use JVBase\rest\routes\ApprovalRoutes;
-//use JVBase\rest\routes\AdminRoutes;
+use JVBase\rest\routes\AdminRoutes;
use JVBase\rest\routes\IntegrationsRoutes;
-use JVBase\utility\Features;
+use JVBase\base\SchemaHelper;
if (!defined('ABSPATH')) {
exit;
@@ -88,19 +89,30 @@
{
$this->customBlocks = new CustomBlocks();
$this->managers = [
- 'errors' => new ErrorHandler(),
- 'queue' => new Queue(),
-// 'dash' => new DashboardManager(),
- 'roles' => new RoleManager(),
-// 'forms' => new FormManager(),
- 'schema' => new SchemaOutputManager(),
- 'admin' => new AdminPages(),
- 'seoAdmin' => new SEOAdminPage(),
-// 'uploads' => new UploadManager(),
- 'userTerms' => new UserTermsManager(),
- 'email' => new EmailManager(),
+ 'errors' => new ErrorHandler(),
+ 'queue' => new Queue(),
+// 'dash' => new DashboardManager(),
+ 'roles' => new RoleManager(),
+// 'forms' => new FormManager(),
+// 'schema' => new SchemaOutputManager(),
+ 'admin' => new AdminPages(),
+ 'seoAdmin' => new SEOAdmin(),
+ 'seo' => new SchemaOutput(),
+ 'schemaHelper' => new SchemaHelper(),
+// 'uploads' => new UploadManager(),
+// 'userTerms' => new UserTermsManager(),
+ 'email' => new EmailManager(),
+// 'terms' => new TaxonomyRelationships(),
];
+ if (Site::has('feed_block')) {
+ $this->managers['terms'] = new TaxonomyRelationships();
+ }
+
+ if (Site::hasAll(['dashboard', 'membership', 'feed_block'])) {
+ $this->managers['userTerms'] = new UserTermsManager();
+ }
+
$this->routes = [
'login' => new LoginRoutes(),
'integrations' => new IntegrationsRoutes(),
@@ -111,69 +123,78 @@
'forms' => new FormRoutes()
];
- if (Features::forSite()->has('magicLink')) {
+ if (Site::has('magicLink')) {
// $this->routes['magicLink'] = new MagicLinkRoutes();
$this->managers['magicLink'] = new MagicLinkManager();
}
- if (Features::forSite()->has('referrals')) {
+ if (Site::has('referrals')) {
$this->managers['referral'] = new ReferralManager();
$this->routes['referral'] = new ReferralRoutes();
}
- if (Features::forSite()->has('dashboard')) {
+ if (Site::has('dashboard')) {
$this->managers['dash'] = new DashboardManager();
}
- if (Features::hasIntegration('square')) {
+ if (Site::hasIntegration('square')) {
$this->routes['square'] = new IntegrationsSquareRoutes();
}
+ if (Site::hasIntegration('helcim')) {
+ $this->routes['helcim'] = new IntegrationsHelcimRoutes();
+ }
- if (Features::forSite()->has('feed_block')) {
+ if (Site::has('feed_block')) {
$this->routes['feed'] = new FeedRoutes();
}
- if (jvbSiteHasNotifications()) {
+ $membership = Site::membership();
+ if ($membership && $membership->has('notifications')) {
$this->managers['notifications'] = new NotificationManager();
$this->routes['notifications'] = new NotificationsRoutes();
}
- if (Features::forSite()->has('feed_block') || jvbSiteHasDashboard()) {
+ if (!empty(Registrar::getFeatured('approve_new'))) {
+ $this->managers['approvals'] = new ApprovalManager();
+ }
+ if (Site::has('feed_block') || Site::has('dashboard')) {
$this->routes['term'] = new TermRoutes();
}
- if (Features::forSite()->has('is_directory')) {
+ if (Site::has('is_directory')) {
$this->managers['directory'] = new DirectoryManager();
}
- if (jvbSiteHasDashboard()) {
+ if (Site::has('dashboard')) {
$this->routes['error'] = new ErrorRoutes();
-// $this->routes['admin'] = new AdminRoutes();
+ $this->routes['admin'] = new AdminRoutes();
$this->routes['content'] = new ContentRoutes();
// $this->routes['bio'] = new BioRoutes();
// $this->routes['shop'] = new ShopRoutes();
+ $this->routes['contentTax'] = new ContentTermsRoutes();
$this->routes['options'] = new OptionsRoutes();
}
- if (jvbSiteHasFavourites()) {
+ if (Site::has('favourites')) {
+ $this->managers['favourites'] = new FavouritesManager();
$this->routes['favourites'] = new FavouritesRoutes();
}
- if (Features::forMembership()->has('forum')) {
+ if ($membership && $membership->has('forum')) {
$this->routes['news'] = new NewsRoutes();
}
- if (Features::forMembership()->has('invitable')) {
+ if ($membership && $membership->has('invitable')) {
$this->managers['invitations'] = new InvitationsManager();
}
- if (Features::anyContentHas('response') || Features::anyTaxonomyHas('response') || Features::anyUserHas('response')) {
+ if (!empty(Registrar::getFeatured('has_responses'))) {
$this->routes['comments'] = new ResponseRoutes();
}
- if (Features::anyContentHas('karma') || Features::anyTaxonomyHas('karma') || Features::anyUserHas('karma')) {
+ if (!empty(Registrar::getFeatured('karma'))) {
$this->routes['vote'] = new VoteRoutes();
}
- if (Features::anyContentHas('karma') || Features::anyTaxonomyHas('karma') || Features::anyUserHas('karma')
- || Features::forMembership()->has('member_verified') ||
- Features::forMembership()->has('term_approval')) {
+ if (!empty(Registrar::getFeatured('karma'))
+ || ($membership && $membership->has('member_verified')) ||
+ ($membership && $membership->has('term_approval'))) {
$this->routes['approvals'] = new ApprovalRoutes();
}
- if (Features::forMembership()->has('can_invite')) {
+ if ($membership && $membership->has('can_invite')) {
$this->routes['invites'] = new Invitations();
}
@@ -188,17 +209,9 @@
protected function setupIntegrations(): void
{
- if (array_key_exists('integrations', JVB_SITE)) {
- foreach (JVB_SITE['integrations'] as $service => $use) {
- if (!$use) {
- continue;
- }
- if (array_key_exists($service, $this->serviceMap)) {
- $this->integrations[$service] = new $this->serviceMap[$service]();
- }
-
- }
- }
+ foreach(array_keys(Site::getIntegrations()) as $integration) {
+ $this->integrations[$integration] = new $this->serviceMap[$integration]();
+ }
}
public function registeredContent(): array
@@ -264,8 +277,7 @@
public function getFields($type): array
{
- $content = JVB_CONTENT[$type] ?? JVB_TAXONOMY[$type] ?? JVB_USER[$type] ?? [];
- return $content['fields'] ?? [];
+ return Registrar::getFieldsFor($type)??[];
}
public function getContent($type): mixed
@@ -290,8 +302,9 @@
public function userCanConnect(string $service, int $userID): bool
{
- $allowed = JVB_USER[jvbUserRole($userID)]['integrations'] ?? [];
- return user_can($userID, 'manage_options') || in_array($service, $allowed);
+ $role = jvbUserRole($userID);
+ $registrar = Registrar::getInstance($role);
+ return user_can($userID, 'manage_options') || $registrar->hasIntegration($service);
}
public function getAvailableServices(bool $keys = true): array
@@ -352,7 +365,7 @@
if (!empty ($buttons)) {
?>
- <section class="additional-actions">
+ <section class="main-actions">
<div class="buttons col">
<?= implode($buttons); ?>
</div>
@@ -364,8 +377,27 @@
}
}
+ public function seo():SchemaOutput
+ {
+ return $this->managers['seo'];
+ }
+
public function blocks():CustomBlocks|bool
{
return $this->customBlocks??false;
}
+ public function schemaHelper():SchemaHelper
+ {
+ return $this->managers['schemaHelper'];
+ }
+
+ public function termRelationships():TaxonomyRelationships
+ {
+ return $this->managers['terms'];
+ }
+
+ public function approvals ():ApprovalManager|false
+ {
+ return $this->managers['approvals']??false;
+ }
}
--
Gitblit v1.10.0