From 2a2303d1dccc120dd7aa5f6b6ade0f89e0064850 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 25 Nov 2025 07:42:23 +0000
Subject: [PATCH] =Feed block mostly good! Referrals look good to go. Ready for Madi and Heidi to approve
---
JVBase.php | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/JVBase.php b/JVBase.php
index 9f4519c..04bb699 100644
--- a/JVBase.php
+++ b/JVBase.php
@@ -3,6 +3,7 @@
use JVBase\integrations\BlueSky;
use JVBase\managers\ErrorHandler;
+use JVBase\managers\LoginManager;
use JVBase\managers\OperationQueue;
use JVBase\managers\DashboardManager;
use JVBase\managers\ReferralManager;
@@ -13,6 +14,7 @@
use JVBase\managers\UserTermsManager;
use JVBase\rest\routes\FeedRoutes;
use JVBase\rest\routes\FavouritesRoutes;
+use JVBase\rest\routes\IntegrationsSquareRoutes;
use JVBase\rest\routes\NotificationsRoutes;
use JVBase\rest\routes\ContentRoutes;
use JVBase\rest\routes\TermRoutes;
@@ -23,8 +25,10 @@
use JVBase\rest\routes\QueueRoutes;
use JVBase\rest\routes\ErrorRoutes;
use JVBase\rest\routes\FormRoutes;
+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;
@@ -58,6 +62,7 @@
'gmb' => 'JVBase\integrations\GoogleMyBusiness',
'cloudflare' => 'JVBase\integrations\Cloudflare',
'umami' => 'JVBase\integrations\Umami',
+ 'postmark' => 'JVBase\integrations\PostMark',
];
public static function getInstance():JVB
@@ -83,6 +88,10 @@
'userTerms' => new UserTermsManager(),
];
+
+ if (Features::forSite()->has('magicLink')) {
+ $this->routes['magicLink'] = new MagicLinkRoutes();
+ }
if (Features::forSite()->has('referrals')) {
$this->managers['referral'] = new ReferralManager();
$this->routes['referral'] = new ReferralRoutes();
@@ -92,24 +101,29 @@
$this->managers['dash'] = new DashboardManager();
}
+ if (Features::hasIntegration('square')){
+ $this->routes['square'] = new IntegrationsSquareRoutes();
+ }
+
$this->routes = [
+ 'login' => new LoginRoutes(),
'integrations' => new IntegrationsRoutes(),
];
- if (jvbSiteUsesFeedBlock()) {
+ if (Features::forSite()->has('feed_block')) {
$this->routes['feed'] = new FeedRoutes();
}
if (jvbSiteHasNotifications()) {
$this->managers['notifications'] = new NotificationManager();
$this->routes['notifications'] = new NotificationsRoutes();
}
- if (jvbSiteUsesFeedBlock() || jvbSiteHasDashboard()) {
+ if (Features::forSite()->has('feed_block') || jvbSiteHasDashboard()) {
$this->routes['term'] = new TermRoutes();
}
+ $this->routes['queue'] = new QueueRoutes();
+ $this->routes['settings']= new SettingsRoutes();
+ $this->routes['upload'] = new UploadRoutes();
if (jvbSiteHasDashboard()) {
- $this->routes['upload'] = new UploadRoutes();
- $this->routes['settings']= new SettingsRoutes();
- $this->routes['queue'] = new QueueRoutes();
$this->routes['error'] = new ErrorRoutes();
$this->routes['admin'] = new AdminRoutes();
$this->routes['content']= new ContentRoutes();
@@ -142,6 +156,8 @@
}
$this->setupIntegrations();
+
+ add_action('wp_footer', [$this, 'additionalActions']);
// $this->managers['notifications'] = new NotificationManager();
// Register activation hook
register_activation_hook(JVB_DIR . '/jvb.php', [$this, 'activate']);
@@ -247,7 +263,6 @@
public function activate():void
{
- error_log('Activate!');
// Activate roles - will be properly initialized after post types are registered
$this->roles()->activate();
}
@@ -262,4 +277,36 @@
return $this->managers['referral'];
}
+ public function additionalActions():void
+ {
+ if (LoginManager::isLogin()) {
+ return;
+ }
+ $extras = apply_filters('jvbAdditionalActions', []);
+ $extras = array_filter($extras, function ($extra) {
+ return is_array($extra) && array_key_exists('button', $extra) && array_key_exists('content', $extra);
+ });
+ if (empty ($extras)) {
+ return;
+ }
+ $buttons = array_map(function ($extra) {
+ return $extra['button'];
+ }, $extras);
+ $contents = array_map(function($extra) {
+ return $extra['content'];
+ }, $extras);
+
+ if (!empty ($buttons)) {
+ ?>
+ <section class="additional-actions">
+ <div class="buttons col">
+ <?= implode($buttons); ?>
+ </div>
+ <div class="actions">
+ <?= implode($contents); ?>
+ </div>
+ </section>
+ <?php
+ }
+ }
}
--
Gitblit v1.10.0