From de317675a8069b747cb253ba3e2b5dc394ca36ef Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sat, 18 Jul 2026 21:44:51 +0000
Subject: [PATCH] =Base Integrations mainly done - doing a test with setting up the Square integration to follow
---
JVBase.php | 103 +++++++++++++++++++++++++++------------------------
1 files changed, 55 insertions(+), 48 deletions(-)
diff --git a/JVBase.php b/JVBase.php
index ea4f09c..36f94ca 100644
--- a/JVBase.php
+++ b/JVBase.php
@@ -1,52 +1,53 @@
<?php
namespace JVBase;
-use JVBase\blocks\CustomBlocks;
+use JVBase\admin\SEOAdmin;
+use JVBase\base\SchemaHelper;
use JVBase\base\Site;
+use JVBase\blocks\CustomBlocks;
+use JVBase\managers\AdminPages;
use JVBase\managers\ApprovalManager;
+use JVBase\managers\Dashboard\DashboardManager;
+use JVBase\managers\DirectoryManager;
use JVBase\managers\EmailManager;
use JVBase\managers\ErrorHandler;
use JVBase\managers\FavouritesManager;
use JVBase\managers\InvitationsManager;
use JVBase\managers\LoginManager;
use JVBase\managers\MagicLinkManager;
+use JVBase\managers\NotificationManager;
use JVBase\managers\queue\Queue;
-use JVBase\managers\Dashboard\DashboardManager;
-use JVBase\managers\DirectoryManager;
use JVBase\managers\ReferralManager;
use JVBase\managers\RoleManager;
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\AdminRoutes;
+use JVBase\rest\routes\ApprovalRoutes;
use JVBase\rest\routes\ContentRoutes;
-use JVBase\rest\routes\TermRoutes;
-use JVBase\rest\routes\UploadRoutes;
-use JVBase\rest\routes\SettingsRoutes;
use JVBase\rest\routes\ContentTermsRoutes;
-use JVBase\rest\routes\SEORoutes;
-use JVBase\rest\routes\QueueRoutes;
use JVBase\rest\routes\ErrorRoutes;
+use JVBase\rest\routes\FavouritesRoutes;
+use JVBase\rest\routes\FeedRoutes;
use JVBase\rest\routes\FormRoutes;
+use JVBase\rest\routes\IntegrationsHelcimRoutes;
+use JVBase\rest\routes\IntegrationsRoutes;
+use JVBase\rest\routes\IntegrationsSquareRoutes;
+use JVBase\rest\routes\Invitations;
use JVBase\rest\routes\LoginRoutes;
use JVBase\rest\routes\NewsRoutes;
+use JVBase\rest\routes\NotificationsRoutes;
+use JVBase\rest\routes\OptionsRoutes;
+use JVBase\rest\routes\QueueRoutes;
use JVBase\rest\routes\ReferralRoutes;
use JVBase\rest\routes\ResponseRoutes;
-use JVBase\rest\routes\OptionsRoutes;
+use JVBase\rest\routes\SEORoutes;
+use JVBase\rest\routes\SettingsRoutes;
+use JVBase\rest\routes\TermRoutes;
+use JVBase\rest\routes\UploadRoutes;
use JVBase\rest\routes\VoteRoutes;
-use JVBase\rest\routes\Invitations;
-use JVBase\rest\routes\ApprovalRoutes;
-use JVBase\rest\routes\AdminRoutes;
-use JVBase\rest\routes\IntegrationsRoutes;
-use JVBase\base\SchemaHelper;
+use UserRoutes;
if (!defined('ABSPATH')) {
exit;
@@ -64,16 +65,16 @@
protected CustomBlocks $customBlocks;
protected array $serviceMap = [
- 'maps' => 'JVBase\integrations\GoogleMaps',
- 'square' => 'JVBase\integrations\Square',
- 'facebook' => 'JVBase\integrations\Facebook',
- 'helcim' => 'JVBase\integrations\Helcim',
- 'instagram' => 'JVBase\integrations\Instagram',
- 'bluesky' => 'JVBase\integrations\BlueSky',
- 'gmb' => 'JVBase\integrations\GoogleMyBusiness',
- 'cloudflare' => 'JVBase\integrations\Cloudflare',
- 'umami' => 'JVBase\integrations\Umami',
- 'postmark' => 'JVBase\integrations\PostMark',
+ 'maps' => 'JVBase\integrations\services\GoogleMaps',
+ 'square' => 'JVBase\integrations\services\Square',
+ 'facebook' => 'JVBase\integrations\services\Facebook',
+ 'helcim' => 'JVBase\integrations\services\Helcim',
+ 'instagram' => 'JVBase\integrations\services\Instagram',
+ 'bluesky' => 'JVBase\integrations\services\BlueSky',
+ 'gmb' => 'JVBase\integrations\services\GoogleMyBusiness',
+ 'cloudflare' => 'JVBase\integrations\services\Cloudflare',
+ 'umami' => 'JVBase\integrations\services\Umami',
+ 'postmark' => 'JVBase\integrations\services\PostMark',
];
public static function getInstance(): JVB
@@ -85,7 +86,7 @@
}
- public function __construct()
+ private function __construct()
{
$this->customBlocks = new CustomBlocks();
$this->managers = [
@@ -120,10 +121,11 @@
'queue' => new QueueRoutes(),
'settings' => new SettingsRoutes(),
'upload' => new UploadRoutes(),
- 'forms' => new FormRoutes()
+ 'forms' => new FormRoutes(),
+ 'user' => new UserRoutes()
];
- if (Site::has('magicLink')) {
+ if (Site::has('magic_link')) {
// $this->routes['magicLink'] = new MagicLinkRoutes();
$this->managers['magicLink'] = new MagicLinkManager();
}
@@ -212,7 +214,7 @@
protected function setupIntegrations(): void
{
foreach(array_keys(Site::getIntegrations()) as $integration) {
- $this->integrations[$integration] = new $this->serviceMap[$integration]();
+ $this->integrations[$integration] = $this->serviceMap[$integration]::getInstance();
}
}
@@ -294,17 +296,22 @@
public function connect(string $service, ?int $userID = null): mixed
{
- if ($userID) {
- if (!$this->userCanConnect($service, $userID)) {
- return null;
- }
-
- if (!array_key_exists($service, $this->integrations)) {
- return null;
- }
- return new $this->serviceMap[$service]($userID);
+// if ($userID) {
+// if (!$this->userCanConnect($service, $userID)) {
+// return null;
+// }
+//
+// if (!array_key_exists($service, $this->integrations)) {
+// return null;
+// }
+//
+// return $this->serviceMap[$service]::getInstance($userID);
+// }
+ $instance = $this->integrations[$service]??null;
+ if ($instance) {
+ $instance->switchUser($userID);
}
- return (array_key_exists($service, $this->integrations)) ? $this->integrations[$service] : null;
+ return $instance;
}
public function userCanConnect(string $service, int $userID): bool
@@ -374,10 +381,10 @@
?>
<section class="main-actions">
<div class="buttons col">
- <?= implode($buttons); ?>
+ <?= implode('', $buttons); ?>
</div>
<div class="actions">
- <?= implode($contents); ?>
+ <?= implode('', $contents); ?>
</div>
</section>
<?php
--
Gitblit v1.10.0