From 3d25ad7de4fdbb3eba2cde2a62422e6be5d79a0a Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 25 Aug 2026 22:57:22 +0000
Subject: [PATCH] =It's been a minute. I went through the Routes and associated Managers and ensured they played together well. Reworked the Cache.php, and I think I caught all the references. Moving away from JVBase() root class, to individuall classes that are Instanced. Double checked for the ABSPATH check in every file, and added index.php to every directory that didn't already have it. Also still working on the MenuBlock to work with WooCommerce for now for Northeh
---
inc/managers/Dashboard/Dashboard.php | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/inc/managers/Dashboard/DashboardManager.php b/inc/managers/Dashboard/Dashboard.php
similarity index 93%
rename from inc/managers/Dashboard/DashboardManager.php
rename to inc/managers/Dashboard/Dashboard.php
index 2f7c43e..43d6c52 100644
--- a/inc/managers/Dashboard/DashboardManager.php
+++ b/inc/managers/Dashboard/Dashboard.php
@@ -1,12 +1,13 @@
<?php
namespace JVBase\managers\Dashboard;
-use JetBrains\PhpStorm\NoReturn;use JVBase\base\Site;use JVBase\forms\TaxonomySelector;use JVBase\managers\Cache;use JVBase\managers\IconsManager;use JVBase\managers\LoginManager;use JVBase\managers\RoleManager;use JVBase\meta\Form;use JVBase\meta\Meta;use JVBase\registrar\Fields;use JVBase\registrar\Registrar;use JVBase\ui\Navigation;use JVBase\ui\Tabs;
+use JetBrains\PhpStorm\NoReturn;use JVBase\base\Site;use JVBase\forms\TaxonomySelector;use JVBase\Instance;use JVBase\integrations\ServiceMap;use JVBase\managers\Cache;use JVBase\managers\IconsManager;use JVBase\managers\Login;use JVBase\managers\Roles;use JVBase\meta\Form;use JVBase\meta\Meta;use JVBase\registrar\Fields;use JVBase\registrar\Registrar;use JVBase\ui\Navigation;use JVBase\ui\Tabs;
if (!defined('ABSPATH')) {
exit;
}
-class DashboardManager {
+class Dashboard {
+ use Instance, ServiceMap;
public static string $based;
protected string $slug = 'dash';
protected string $baseURl;
@@ -14,9 +15,10 @@
protected array $pages = [];
protected array $sections = [];
protected Cache $cache;
- public function __construct() {
+
+ private function __construct() {
self::$based = BASE.$this->slug;
- $this->cache = Cache::for('dashboard')->connect('post');
+ $this->cache = Cache::for('dashboard', 'post');
if (JVB_TESTING) {
$this->cache->flush();
}
@@ -289,7 +291,7 @@
return;
}
//Redirect to custom dashboard
- if (is_user_logged_in() && isOurPeople()) {
+ if (is_admin() && isOurPeople()) {
$this->redirectToDashboard();
}
}
@@ -351,11 +353,11 @@
foreach ($content as $c) {
$registrar = Registrar::getInstance($c);
$page = $this->addPage($registrar->getPlural(), $c, $registrar->getIcon());
- $page->setPermission(RoleManager::getPermissionName('edit', $c));
+ $page->setPermission(Roles::getPermissionName('edit', $c));
$page->setSection('content');
$page->setScripts(['jvb-crud', 'jvb-creator']);
$this->sections[$c] = new Section($registrar->getPlural(), $c, $registrar->getIcon(), 'content');
- $this->sections[$c]->setPermission(RoleManager::getPermissionName('edit', $c));
+ $this->sections[$c]->setPermission(Roles::getPermissionName('edit', $c));
$this->sections[$c]->setIsLink(true);
$taxonomies = $registrar->registrar->taxonomies;
@@ -363,7 +365,7 @@
$taxReg = Registrar::getInstance($tax);
if ($taxReg) {
$taxPage = $this->addPage($taxReg->getPlural(), $tax, $registrar->getIcon(), $page->getID());
- $taxPage->setPermission(RoleManager::getPermissionName('edit', $c));
+ $taxPage->setPermission(Roles::getPermissionName('edit', $c));
$taxPage->setSection($c);
$taxPage->setScripts(['jvb-crud', 'jvb-creator']);
@@ -376,7 +378,7 @@
foreach ($contentTax as $c) {
$registrar = Registrar::getInstance($c);
$page = $this->addPage($registrar->getPlural(), $c, $registrar->getIcon());
- $page->setPermission(RoleManager::getPermissionName('edit', $c));
+ $page->setPermission(Roles::getPermissionName('edit', $c));
$page->setSection($c);
//TODO: add artist management and invitations, if applicable
}
@@ -511,18 +513,7 @@
$this->sections['integrations']->setIsLink(true);
foreach (array_keys(Site::getIntegrations()) as $integration) {
- $integration = match($integration) {
- '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',
- };
+ $integration = $this->getService($integration);
$title = $integration::title();
$icon = $integration::icon();
if ($integration::hasExtraOptions()) {
@@ -765,7 +756,7 @@
echo '<p>Alternatively, you can always login using the magic link, which sets a temporary password for 15 minutes.</p>';
}
?>
- <?= LoginManager::getInstance()->renderLoginForm('resetpass'); ?>
+ <?= Login::getInstance()->renderLoginForm('resetpass'); ?>
<?php
}
--
Gitblit v1.10.0