From 4089ba01e0881c89a72332e13bc3a80b6bddec2a Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Mon, 29 Jun 2026 22:15:55 +0000
Subject: [PATCH] =DashboardManager overhaul. A bit easier to modify the output of pages. Still have to get the account pages to work as expected, as well as verify the integrations and others are working - but registrar/content pages work as expected. Also fixed up the table generation in CRUD.js and CRUDSkeleton.php
---
JVBase.php | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/JVBase.php b/JVBase.php
index f0b0c3d..1a3f4f7 100644
--- a/JVBase.php
+++ b/JVBase.php
@@ -11,7 +11,7 @@
use JVBase\managers\LoginManager;
use JVBase\managers\MagicLinkManager;
use JVBase\managers\queue\Queue;
-use JVBase\managers\DashboardManager;
+use JVBase\managers\Dashboard\DashboardManager;
use JVBase\managers\DirectoryManager;
use JVBase\managers\ReferralManager;
use JVBase\managers\RoleManager;
@@ -123,7 +123,7 @@
'forms' => new FormRoutes()
];
- if (Site::has('magicLink')) {
+ if (Site::has('magic_link')) {
// $this->routes['magicLink'] = new MagicLinkRoutes();
$this->managers['magicLink'] = new MagicLinkManager();
}
@@ -132,9 +132,6 @@
$this->routes['referral'] = new ReferralRoutes();
}
- if (Site::has('dashboard')) {
- $this->managers['dash'] = new DashboardManager();
- }
if (Site::hasIntegration('square')) {
$this->routes['square'] = new IntegrationsSquareRoutes();
@@ -151,7 +148,7 @@
$this->managers['notifications'] = new NotificationManager();
$this->routes['notifications'] = new NotificationsRoutes();
}
- if (!empty(Registrar::getFeatured('approve_new'))) {
+ if (!empty(Registrar::withFeature('approve_new'))) {
$this->managers['approvals'] = new ApprovalManager();
}
if (Site::has('feed_block') || Site::has('dashboard')) {
@@ -183,13 +180,13 @@
if ($membership && $membership->has('invitable')) {
$this->managers['invitations'] = new InvitationsManager();
}
- if (!empty(Registrar::getFeatured('has_responses'))) {
+ if (!empty(Registrar::withFeature('has_responses'))) {
$this->routes['comments'] = new ResponseRoutes();
}
- if (!empty(Registrar::getFeatured('karma'))) {
+ if (!empty(Registrar::withFeature('karma'))) {
$this->routes['vote'] = new VoteRoutes();
}
- if (!empty(Registrar::getFeatured('karma'))
+ if (!empty(Registrar::withFeature('karma'))
|| ($membership && $membership->has('member_verified')) ||
($membership && $membership->has('term_approval'))) {
$this->routes['approvals'] = new ApprovalRoutes();
@@ -198,6 +195,11 @@
$this->routes['invites'] = new Invitations();
}
+
+ if (Site::has('dashboard')) {
+ $this->managers['dash'] = new DashboardManager();
+ }
+
$this->setupIntegrations();
add_action('wp_footer', [$this, 'additionalActions']);
@@ -219,6 +221,11 @@
return array_merge(array_keys($this->content), array_keys($this->taxonomies));
}
+ public function favourites(): FavouritesManager|false
+ {
+ return $this->managers['favourites'] ?? false;
+ }
+
public function dashboard(): DashboardManager|false
{
return $this->managers['dash'] ?? false;
@@ -367,10 +374,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