From f4be611c51473359e6d41780f0313c446079e9d3 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 09 Jun 2026 15:19:24 +0000
Subject: [PATCH] =Switched the /base/options.php to the same pattern as Site.php: a class based approached rather than a filter. Updated Meta.php to play along with the defined fields from there in Meta::forOptions. Had to change openingHoursSpecificationsTrait.php to not use the translater functions __('text','textdomain') for now, as we load before init.
---
assets/js/concise/FrontendFavourites.js | 107 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 87 insertions(+), 20 deletions(-)
diff --git a/assets/js/concise/FrontendFavourites.js b/assets/js/concise/FrontendFavourites.js
index b558f5f..f986ff1 100644
--- a/assets/js/concise/FrontendFavourites.js
+++ b/assets/js/concise/FrontendFavourites.js
@@ -1,11 +1,15 @@
-class FrontendFavourites {
+class Favourites {
constructor() {
// Initialize DataStore for queue persistence
- this.store = window.jvbStore.register(
+ let store = window.jvbStore.register(
'favourites',
{
storeName: 'favourites',
+ keyPath: 'id',
endpoint: 'favourites',
+ headers: {
+ 'X-Action-Nonce': window.auth.getNonce('favourites')
+ },
indexes: [
{name: 'content', keyPath: 'content'},
{name: 'listId', keyPath: 'listId'},
@@ -13,7 +17,7 @@
TTL: 6 * 60 * 1000,
showLoading: false,
filters: {
- user: jvbSettings.currentUser,
+ user: window.auth.getUser(),
content: 'all',
order: 'desc',
orderby: 'date',
@@ -22,14 +26,21 @@
}
});
- this.listStore = window.jvbStore.register(
- 'favourites_lists',
- {
- storeName: 'lists',
- keyPath: 'listId',
- endpoint: 'favourites/lists',
- TTL: 6 * 60 * 1000,
- });
+ this.queue = {
+ add: new Map(),
+ remove: new Map(),
+ };
+
+ this.store = store.favourites;
+
+ // this.listStore = window.jvbStore.register(
+ // 'favourites_lists',
+ // {
+ // storeName: 'lists',
+ // keyPath: 'listId',
+ // endpoint: 'favourites/lists',
+ // TTL: 6 * 60 * 1000,
+ // });
this.store.subscribe((event, data) => {
switch (event) {
@@ -46,12 +57,10 @@
}
});
-
- this.store.fetch();
}
toggleFavourite(button) {
- if (!jvbSettings.currentUser) {
+ if (!window.auth.getUser()) {
window.location.href = jvbSettings.redirect + '&action=register&type=favourites';
return;
}
@@ -67,12 +76,67 @@
// Update button icon
button.innerHTML = jvbSettings.icons[button.classList.contains('favourited') ? 'heart-filled' : 'heart'];
- this.store.setItem(button.dataset.id, {
+ this.checkQueue(action, {
target_id: button.dataset.id,
action: action,
- type: button.dataset.type,
- artist: button.dataset.artist,
+ type: button.dataset.type
});
+ window.debouncer.schedule('favourites', this.postFavourites.bind(this), 200);
+
+
+ }
+
+ checkQueue(action, item) {
+ switch (action) {
+ case 'add':
+ if (this.queue.remove.has(item.target_id)) {
+ this.queue.remove.delete(item.target_id);
+ }
+ this.queue.add.set(item.target_id, item);
+ break;
+ case 'remove':
+ if (this.queue.add.has(item.target_id)) {
+ this.queue.add.delete(item.target_id);
+ }
+ this.queue.remove.set(item.target_id, item);
+ break;
+ default:
+ return;
+ }
+ }
+ async postFavourites() {
+ console.log(this.queue,'Posting favourites');
+ const response = await window.auth.fetch(
+ `${jvbSettings.api}favourites`,
+ {
+ method: 'POST',
+ headers: {
+ 'X-Action-Nonce': window.auth.getNonce('favourites')
+ },
+ body: {
+ user: window.auth.getUser(),
+ ... this.queue
+ }
+ }
+ );
+
+ if (response.ok) {
+ console.log('Posted favourites - clearing queue');
+ //Add or remove from store
+ for (let item of this.queue.add.entries()) {
+ await this.store.setItem(item.target_id,
+ item);
+ }
+ for (let item of this.queue.remove.entries()) {
+ await this.store.delete(item.target_id);
+ }
+ //Clear the favourite queue
+ this.queue.add.clear();
+ this.queue.remove.clear();
+ } else {
+ console.log(await response.json(), 'Something went wrong');
+ window.debouncer.schedule('favourites', this.postFavourites.bind(this), 200);
+ }
}
// async toggleFavourite(itemType, itemId) {
@@ -181,11 +245,14 @@
return this.store.get(favId) !== undefined;
}
}
+
document.addEventListener('DOMContentLoaded', function() {
window.jvbFavourites = false;
- if (jvbSettings.currentUser !== '') {
- window.jvbFavourites = new FrontendFavourites();
- }
+ window.auth.subscribe((event) => {
+ if (event === 'auth-loaded') {
+ window.jvbFavourites = new Favourites();
+ }
+ });
});
--
Gitblit v1.10.0