From 2bb9aaaf24b794b528e3894ee9f9c42ca6d7fe93 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Thu, 01 Jan 2026 21:08:58 +0000
Subject: [PATCH] =FeedRoutes: extractTaxonomies added
---
jvb.php | 759 ++++++++--------------------------------------------------
1 files changed, 105 insertions(+), 654 deletions(-)
diff --git a/jvb.php b/jvb.php
index 816a013..7989497 100644
--- a/jvb.php
+++ b/jvb.php
@@ -129,17 +129,69 @@
require(JVB_DIR . '/activate.php');
require(JVB_DIR . '/inc/helpers/all.php');
+require(JVB_DIR . '/inc/ui/_setup.php');
require(JVB_DIR . '/inc/meta/_setup.php');
+require(JVB_DIR . '/inc/importers/_setup.php');
require(JVB_DIR . '/inc/managers/_setup.php');
-function jvbIcon($name, $options = []) {
- return IconsManager::getInstance()->getIcon($name, $options);
+/**
+ * Get an icon element
+ *
+ * @param string $name Icon name
+ * @param array $options Options array:
+ * - 'source' => 'icons'|'dash'|'forms'|etc. (default: 'icons')
+ * - 'style' => 'regular'|'bold'|'fill'|etc.
+ * - 'label' => 'Accessible label'
+ * - 'decorative' => true
+ * - 'class' => 'additional classes'
+ * - 'size' => 24
+ * @return string HTML icon element
+ */
+function jvbIcon(string $name, array $options = []): string
+{
+ $source = $options['source'] ?? 'icons';
+
+ // Remove source from options before passing to IconsManager
+ unset($options['source']);
+
+ return IconsManager::for($source)->get($name, $options);
}
-function jvbCSSIcon($name, $options = []) {
- $style = array_key_exists('style', $options) ? $options['style'] : null;
- return IconsManager::getInstance()->getCSSIcon($name, $style);
+/**
+ * Get a CSS data URI for an icon
+ *
+ * @param string $name Icon name
+ * @param array $options Options array:
+ * - 'style' => 'regular'|'bold'|'fill'|etc.
+ * - 'source' => 'icons'|'dash'|'forms'|etc. (for tracking purposes)
+ * @return string data:image/svg+xml;base64,... URL
+ */
+function jvbCSSIcon(string $name, array $options = []): string
+{
+ $style = $options['style'] ?? null;
+ $source = $options['source'] ?? 'icons';
+
+ return IconsManager::for($source)->getCSSIcon($name, $style);
}
+
+/**
+ * Get a dashboard icon
+ */
+function jvbDashIcon(string $name, array $options = []): string
+{
+ $options['source'] = 'dash';
+ return jvbIcon($name, $options);
+}
+
+/**
+ * Get a form editor icon
+ */
+function jvbFormIcon(string $name, array $options = []): string
+{
+ $options['source'] = 'forms';
+ return jvbIcon($name, $options);
+}
+
require(JVB_DIR . '/inc/integrations/_setup.php');
require(JVB_DIR . '/inc/rest/_setup.php');
@@ -244,671 +296,49 @@
function jvbScripts():void
{
- /**
- * Register Scripts
- */
- //Helper functions used by other classes
- wp_register_script(
- 'jvb-utility',
- JVB_URL.'assets/js/min/utility.min.js',
- [],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- wp_register_script(
- 'jvb-favourites',
- JVB_URL.'assets/js/min/favourites.min.js',
- [
- 'jvb-queue',
- 'jvb-data-store'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
- wp_register_script(
- 'jvb-votes',
- JVB_URL.'assets/js/min/votes.min.js',
- [
- 'jvb-queue',
- 'jvb-data-store'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- wp_register_script(
- 'jvb-settings',
- JVB_URL.'assets/js/min/settings.min.js',
- [
-// 'jvb-queue',
- 'jvb-utility',
- 'jvb-data-store'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- wp_register_script(
- 'jvb-popup',
- JVB_URL.'assets/js/min/popup.min.js',
- [
- 'jvb-a11y'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true
- ]
- );
-
- //Main js image resizing, and gallery
- //TODO: lots of overlap between modals and this, utilize a11y for trapFocus,
- wp_register_script(
- 'jvb-media',
- JVB_URL.'assets/js/min/media.min.js',
- [],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- wp_register_script(
- 'jvb-copy-hours',
- JVB_URL.'assets/js/min/hours.min.js',
- [
- 'jvb-form',
- 'jvb-utility',
- 'jvb-modal',
- 'jvb-a11y'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //Includes the escape and outside click listeners and intersection observers
- //TODO: make the Modals class use this?
-// wp_register_script(
-// 'jvb-ui',
-// JVB_URL.'assets/js/min/ui.min.js',
-// [],
-// '1.0.0',
-// [
-// 'strategy' => 'defer',
-// 'in_footer' => true,
-// ]
-// );
-
- wp_register_script(
- 'jvb-gallery',
- JVB_URL.'assets/js/min/gallery.min.js',
- [
- 'jvb-utility',
- 'jvb-queue'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- wp_register_script(
- 'jvb-integrations',
- JVB_URL.'assets/js/min/integrations.min.js',
- [],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true
- ]
- );
-
-
- $integration_nonces = [
- 'jvb_square_sync' => wp_create_nonce('jvb_square_sync'),
- 'jvb_gmb_sync_reviews' => wp_create_nonce('jvb_gmb_sync'),
- 'jvb_gmb_test_api' => wp_create_nonce('jvb_gmb_test'),
- 'jvb_bluesky_test_post' => wp_create_nonce('jvb_bluesky_test'),
- 'jvb_facebook_test_post' => wp_create_nonce('jvb_facebook_test'),
- 'jvb_instagram_test_post' => wp_create_nonce('jvb_instagram_test'),
- 'jvb_instagram_sync_media' => wp_create_nonce('jvb_instagram_sync'),
- 'jvb_umami_refresh_data' => wp_create_nonce('jvb_umami_refresh'),
- 'jvb_export_integration_settings' => wp_create_nonce('jvb_integration_export'),
- ];
- $data = [
- 'ajaxUrl' => admin_url('admin-ajax.php'),
- 'nonce' => wp_create_nonce('jvb_integrations'),
- 'nonces' => $integration_nonces,
-// 'services' => array_keys(jvbConnect()->getAvailableServices()),
- 'userId' => get_current_user_id(),
- 'baseUrl' => admin_url('admin.php?page=' . BASE)
- ];
- wp_localize_script(
- 'jvb-integrations',
- 'jvbIntegrationsConfig',
- $data
- );
-
- //The On-This-Page menu. TODO: just include in ui?
- wp_register_script(
- 'jvb-page-nav',
- JVB_URL.'assets/js/min/page-nav.min.js',
- [],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //A11y accessibility
- wp_register_script(
- 'jvb-a11y',
- JVB_URL.'assets/js/min/a11y.min.js',
- [],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //Central Error Management
- wp_register_script(
- 'jvb-error',
- JVB_URL.'assets/js/min/error.min.js',
- [
-
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //Cache Management
- wp_register_script(
- 'jvb-cache',
- JVB_URL.'assets/js/min/cache.min.js',
- [],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- wp_register_Script(
- 'jvb-data-store',
- JVB_URL.'assets/js/min/dataStore.min.js',
- [],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //Tabs functionality
- wp_register_script(
- 'jvb-tabs',
- JVB_URL.'assets/js/min/tabs.min.js',
- [
- 'jvb-a11y'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //Modal functionality
- wp_register_script(
- 'jvb-modal',
- JVB_URL.'assets/js/min/modal.min.js',
- [
- 'jvb-a11y'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //Central Queue Management
- wp_register_script(
- 'jvb-queue',
- JVB_URL.'assets/js/min/queue.min.js',
- [
- 'jvb-a11y',
- 'jvb-error',
- 'jvb-data-store',
- 'jvb-utility',
- 'jvb-popup'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //TaxonomySelector.js
- wp_register_script(
- 'jvb-selector',
- JVB_URL.'assets/js/min/selector.min.js',
- [
- 'jvb-utility',
- 'jvb-a11y',
- 'jvb-error',
- 'jvb-data-store',
- 'jvb-modal',
-// 'jvb-loading'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- wp_register_script(
- 'jvb-creator',
- JVB_URL.'assets/js/min/creator.min.js',
- ['jvb-selector'],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true
- ]
- );
-
- //PostSelector.js
- wp_register_script(
- 'jvb-post-selector',
- JVB_URL.'assets/js/min/postSelector.min.js',
- [
- 'jvb-selector'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
-// //Central Loading Manager
-// wp_register_script(
-// 'jvb-loading',
-// JVB_URL.'assets/js/min/loading.min.js',
-// [],
-// '1.0.0',
-// [
-// 'strategy' => 'defer',
-// 'in_footer' => true,
-// ]
-// );
-// wp_localize_script(
-// 'jvb-loading',
-// 'loadingQuips',
-// [
-// 'quips' => json_encode(apply_filters(
-// 'jvbLoadingQuips',
-// []
-// ))
-// ]
-// );
-
- //Upload Manager
- wp_register_script(
- 'jvb-handle-selection',
- JVB_URL.'assets/js/min/handleSelection.min.js',
- [
- 'jvb-a11y',
- 'jvb-utility',
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
- wp_register_script(
- 'jvb-drag-handler',
- JVB_URL.'assets/js/min/dragHandler.min.js',
- [
- 'jvb-a11y',
- 'jvb-utility',
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //Upload Manager
- wp_register_script(
- 'jvb-uploader',
- JVB_URL.'assets/js/min/uploader.min.js',
- [
- 'jvb-cache',
- 'jvb-a11y',
- 'jvb-utility',
- 'jvb-handle-selection',
- 'jvb-modal',
- 'jvb-drag-handler',
-// 'jvb-loading',
- 'jvb-queue',
- 'jvb-notifications'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- wp_register_script(
- 'quill-js',
- 'https://cdn.jsdelivr.net/npm/quill@2.0.3/dist/quill.js',
- [],
- null,
- true
- );
-
- wp_register_script(
- 'sortable-js',
- 'https://cdn.jsdelivr.net/npm/sortablejs@latest/Sortable.min.js',
- array(),
- null,
- true
- );
-
- //Custom Dashboard Navigator
-// wp_register_script(
-// 'jvb-dashboard-navigator',
-// JVB_URL.'assets/js/min/DashboardNavigator.min.js',
-// [
-// 'jvb-a11y',
-// 'jvb-loading',
-// 'jvb-content',
-// 'jvb-crud',
-// 'jvb-tabs'
-// ],
-// '1.0.0',
-// [
-// 'strategy' => 'defer',
-// 'in_footer' => true,
-// ]
-// );
-
- //Notifications
- wp_register_script(
- 'jvb-notifications',
- JVB_URL.'assets/js/min/notifications.min.js',
- [
- 'jvb-utility',
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //Base Form Handler
- wp_register_script(
- 'jvb-form',
- JVB_URL.'assets/js/min/form.min.js',
- [
- 'jvb-utility',
- 'jvb-tabs',
- 'jvb-selector',
- 'jvb-uploader',
- 'sortable-js',
- 'jvb-populate-form',
- 'jvb-quill',
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- wp_register_script(
- 'jvb-populate-form',
- JVB_URL.'assets/js/min/populate.min.js',
- [],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
- wp_register_script(
- 'jvb-quill',
- JVB_URL.'assets/js/min/quill.min.js',
- [
- 'quill-js'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
- //CRUD Base Manager
- wp_register_script(
- 'jvb-crud',
- JVB_URL.'assets/js/min/crud.min.js',
- [
- 'jvb-selector',
- 'jvb-settings',
- 'jvb-a11y',
- 'jvb-error',
- 'jvb-data-store',
- 'jvb-populate-form',
- 'jvb-queue',
- 'jvb-utility',
- 'jvb-quill',
- 'jvb-form',
- 'jvb-view',
- 'jvb-modal'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- wp_register_script(
- 'jvb-view',
- JVB_URL.'assets/js/min/view.min.js',
- [
- 'jvb-settings',
- 'jvb-a11y',
- 'jvb-utility',
- 'jvb-data-store',
- 'jvb-error',
- 'jvb-populate-form'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //Bio Manager TODO: Replace with Form Handler
- wp_register_script(
- 'jvb-bio',
- JVB_URL.'assets/js/min/bioManager.min.js',
- [
- 'jvb-tabs',
- 'jvb-form',
- 'jvb-queue'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //Shop Manager TODO: Replace with Form Handler
- wp_register_script(
- 'jvb-shop',
- JVB_URL.'assets/js/min/shopManager.min.js',
- [
- 'jvb-tabs',
- 'jvb-form',
- 'jvb-queue'
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //Content Manager TODO: Replace with CRUD.js
- wp_register_script(
- 'jvb-content',
- JVB_URL.'assets/js/min/ContentManager.min.js',
- [
- 'jvb-queue',
- 'jvb-cache',
- 'jvb-error',
- 'jvb-uploader',
- 'jvb-utility',
- 'jvb-modal',
- 'jvb-selector',
- 'jvb-post-selector',
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //Favourites Manager TODO: Replace with CRUD.js
- wp_register_script(
- 'jvb-favourites',
- JVB_URL.'assets/js/min/favouritesManager.min.js',
- [
- 'jvb-a11y',
- 'jvb-queue',
- 'jvb-cache',
- 'jvb-error',
- 'jvb-utility',
- 'jvb-tabs',
- 'jvb-selector',
- 'jvb-notifications',
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //News Manager TODO: Replace with CRUD.js
- wp_register_script(
- 'jvb-news',
- JVB_URL.'assets/js/min/news.min.js',
- [
- 'jvb-a11y',
- 'jvb-queue',
- 'jvb-cache',
- 'jvb-error',
- 'jvb-utility',
- 'jvb-modal',
- 'jvb-selector',
- 'jvb-tabs',
- ],
- '1.0.0',
- [
- 'strategy' => 'defer',
- 'in_footer' => true,
- ]
- );
-
- //Notification Manager TODO: Replace with CRUD? Not quite...
- wp_register_script(
- 'jvb-notification-manager',
- JVB_URL.'assets/js/min/notificationManager.min.js',
- [
- 'jvb-a11y',
- 'jvb-tabs',
- ]
- );
-
- wp_register_script(
- 'jvb-navigation',
- JVB_URL.'assets/js/min/navigation.min.js',
- );
-
add_action('wp_head', 'jvbInlineNavStyles');
if (Features::forSite()->has('dashboard')) {
wp_enqueue_script('jvb-queue');
}
+ wp_enqueue_script('jvb-auth');
wp_enqueue_script('jvb-settings');
wp_enqueue_script('jvb-navigation');
// wp_enqueue_script('jvb-ui');
- wp_enqueue_script('jvb-media');
+// wp_enqueue_script('jvb-media');
wp_enqueue_script('jvb-gallery');
wp_enqueue_script('jvb-cache');
+ $interactions = [];
+ if (Features::forSite()->has('favourites')) {
+ $interactions[] = 'favourites';
+ }
+ if (Features::anyContentHas('karma') ||
+ Features::anyTaxonomyHas('karma') ||
+ Features::anyUserHas('karma')) {
+ $interactions[] = 'karma';
+ }
+ if (Features::forSite()->has('notifications')) {
+ $interactions[] = 'notifications';
+ }
- $userID = get_current_user_id();
- $queue = (is_user_logged_in()) ?
- [
- 'api' => rest_url('jvb/v1/'),
- 'currentUser' => $userID,
- 'nonce' => wp_create_nonce('wp_rest'),
- 'dash' => wp_create_nonce('dash-'.$userID),
- 'favourites' => wp_create_nonce('favourites-'.$userID),
- 'notifications' => wp_create_nonce('notifications-'.$userID),
- 'labels' => jvbGetLabels(),
- ] :
- [
- 'api' => rest_url('jvb/v1/'),
- 'nonce' => wp_create_nonce('wp_rest'),
- 'currentUser' => false,
- 'redirect' => wp_login_url(home_url(add_query_arg(null, null))), // Current URL as redirect
- 'labels' => jvbGetLabels(),
- ];
+ if (!empty($interactions)) {
+ wp_enqueue_script('jvb-interactions');
+ foreach($interactions as $interaction) {
+ wp_enqueue_script('jvb-'.$interaction);
+ }
+ }
- wp_localize_script('jvb-utility', 'jvbSettings', $queue);
+ $queue = [
+ 'api' => rest_url('jvb/v1/'),
+ 'redirect' => wp_login_url(home_url(add_query_arg(null, null))),
+ 'labels' => jvbGetLabels(),
+ ];
+
+ wp_localize_script('jvb-auth', 'jvbSettings', $queue);
$initUserSettings = 'async function initUserItems() {
@@ -1031,6 +461,10 @@
jvbAddScriptDependency('jvb-feed-view-script', 'jvb-queue');
jvbAddScriptDependency('jvb-feed-view-script', 'jvb-selector');
+ jvbAddScriptDependency('jvb-feed-view-script', 'jvb-data-store');
+ jvbAddScriptDependency('jvb-feed-view-script', 'jvb-cache');
+ jvbAddScriptDependency('jvb-feed-view-script', 'jvb-a11y');
+ jvbAddScriptDependency('jvb-feed-view-script', 'jvb-utility');
jvbAddScriptDependency('jvb-feed-view-script', 'jvb-gallery');
// jvbAddScriptDependency('jvb-feed-view-script', 'jvb-loading');
jvbAddScriptDependency('jvb-forms-view-script', 'jvb-queue');
@@ -1113,3 +547,20 @@
// }
// return $result;
//}, 10, 3);
+
+add_filter('rest_authentication_errors', function($result) {
+
+ // Don't override existing authentication
+ if (is_wp_error($result) || $result === true) {
+ return $result;
+ }
+
+ // Try to authenticate from cookie
+ $cookie_user = wp_validate_auth_cookie('', 'logged_in');
+
+ if ($cookie_user) {
+ wp_set_current_user($cookie_user);
+ return true;
+ }
+ return $result;
+}, 99);
--
Gitblit v1.10.0