From 3aada9949d51024a92a8b5c6cb70d12f9c3cac16 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 21 Dec 2025 19:59:48 +0000
Subject: [PATCH] =auth refactored via rest, referral system set up for Jane, some javascript consolidation
---
assets/js/concise/Notifications.js | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/assets/js/Notifications.js b/assets/js/concise/Notifications.js
similarity index 93%
rename from assets/js/Notifications.js
rename to assets/js/concise/Notifications.js
index 77fbd23..66bac6f 100644
--- a/assets/js/Notifications.js
+++ b/assets/js/concise/Notifications.js
@@ -82,7 +82,7 @@
this.isLoading = true;
const params = new URLSearchParams({
- user: jvbSettings.currentUser,
+ user: window.auth.getUser(),
status: 'unread',
limit: 5,
});
@@ -92,8 +92,8 @@
{
method: 'GET',
headers: {
- 'X-WP-Nonce': jvbSettings.nonce,
- 'action_nonce': jvbSettings.notifications
+ 'X-WP-Nonce': window.auth.getNonce(),
+ 'action_nonce': window.auth.getNonce('notifications')
}
}, {
context: 'notifications',
@@ -101,8 +101,6 @@
}
);
- console.log(data);
-
this.renderPreviewNotifications(data.notifications);
this.updateUnreadCount(data.total);
this.notificationsLoaded = true;
@@ -279,12 +277,12 @@
`${jvbSettings.api}notifications`, {
method: 'POST',
headers: {
- 'X-WP-Nonce': jvbSettings.nonce,
- 'action_nonce': jvbSettings.dash,
+ 'X-WP-Nonce': window.auth.getNonce(),
+ 'action_nonce': window.auth.getNonce('dash'),
},
body: {
notification: notificationId,
- user: jvbSettings.currentUser,
+ user: window.auth.getUser(),
}
}
);
@@ -335,13 +333,13 @@
async checkNotifications() {
try {
const params = new URLSearchParams({
- user: jvbSettings.currentUser,
+ user: window.auth.getUser(),
status: 'unread',
});
const response = await fetch(`${jvbSettings.api}notifications?${params.toString()}`, {
headers: {
- 'X-WP-Nonce': jvbSettings.nonce,
- 'action_nonce': jvbSettings.dash,
+ 'X-WP-Nonce': window.auth.getNonce(),
+ 'action_nonce': window.auth.getNonce('dash'),
'If-Modified-Since': this.lastCheck,
}
});
@@ -366,12 +364,16 @@
}
// Initialize when DOM is ready
-document.addEventListener('DOMContentLoaded', () => {
- window.jvbNotifications = new NotificationManager({
- position: 'bottom-right',
- maxVisibleNotifications: 5,
- displayDuration: 5000
- });
+document.addEventListener('DOMContentLoaded', async function(){
+ window.auth.subscribe((event) => {
+ if (event === 'auth-loaded') {
+ window.jvbNotifications = new NotificationManager({
+ position: 'bottom-right',
+ maxVisibleNotifications: 5,
+ displayDuration: 5000
+ });
+ }
+ });
});
function handleNotificationAction(button) {
--
Gitblit v1.10.0