@okjavis/nodebb-theme-javis 2.5.2 → 2.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okjavis/nodebb-theme-javis",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "description": "Modern, premium NodeBB theme for JAVIS Community - Extends Harmony with custom styling",
   "main": "theme.js",
   "scripts": {
@@ -34,6 +34,7 @@
     "scss/",
     "static/",
     "templates/",
+    "public/",
     "theme.js",
     "theme.scss",
     "theme.json",

package/plugin.json

@@ -9,8 +9,7 @@
     { "hook": "static:app.load", "method": "init" },
     { "hook": "filter:widgets.getAreas", "method": "defineWidgetAreas" },
     { "hook": "filter:admin.header.build", "method": "addAdminNavigation" },
-    { "hook": "filter:config.get", "method": "getThemeConfig" },
-    { "hook": "filter:settings.get", "method": "getAdminSettings" }
+    { "hook": "filter:config.get", "method": "getThemeConfig" }
   ],
   "staticDirs": {
     "static": "./static"

package/public/admin.js

@@ -0,0 +1,17 @@
+'use strict';
+
+define('admin/plugins/javis', ['settings'], function (Settings) {
+	var ACP = {};
+
+	ACP.init = function () {
+		// Load settings from 'harmony' key for compatibility with parent theme
+		Settings.load('harmony', $('.javis-settings'));
+
+		$('#save').on('click', function () {
+			// Save to 'harmony' key for compatibility
+			Settings.save('harmony', $('.javis-settings'));
+		});
+	};
+
+	return ACP;
+});

package/theme.js

@@ -9,11 +9,9 @@ const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
 const _ = require.main.require('lodash');
 
-const controllers = require('./lib/controllers');
-
 const theme = {};
 
-// JAVIS defaults - openSidebars is 'on' by default
+// Harmony's defaults - we override openSidebars to 'on'
 const defaults = {
   enableQuickReply: 'on',
   enableBreadcrumbs: 'on',
@@ -35,24 +33,24 @@ theme.init = async function (params) {
   const { router } = params;
   const routeHelpers = require.main.require('./src/routes/helpers');
 
-  // Admin panel route
-  routeHelpers.setupAdminPageRoute(router, '/admin/plugins/javis', [], controllers.renderAdminPage);
+  // Admin panel route - render using Harmony's admin template structure
+  routeHelpers.setupAdminPageRoute(router, '/admin/plugins/javis', [], (req, res) => {
+    res.render('admin/plugins/javis', {
+      title: 'JAVIS Theme',
+    });
+  });
 };
 
 /**
- * Load theme config
+ * Load theme config - replaces Harmony's loadThemeConfig
  * Uses JAVIS defaults (with openSidebars: 'on')
  */
 async function loadThemeConfig(uid) {
-  const [harmonyConfig, javisConfig, userConfig] = await Promise.all([
-    meta.settings.get('harmony'),  // Read from Harmony's settings (parent theme)
-    meta.settings.get('javis'),    // Read from JAVIS-specific settings
+  const [themeConfig, userConfig] = await Promise.all([
+    meta.settings.get('harmony'),
     user.getSettings(uid),
   ]);
 
-  // Merge: Harmony settings first, then JAVIS overrides
-  const themeConfig = { ...harmonyConfig, ...javisConfig };
-
   // 3-tier cascade: JAVIS defaults -> theme settings -> user settings
   const config = { ...defaults, ...themeConfig, ...(_.pick(userConfig, Object.keys(defaults))) };
 
@@ -71,9 +69,6 @@ async function loadThemeConfig(uid) {
   return config;
 }
 
-// Export loadThemeConfig for potential use by other modules
-theme.loadThemeConfig = loadThemeConfig;
-
 /**
  * Hook: filter:config.get
  * Sets config.theme with JAVIS-specific defaults
@@ -84,20 +79,6 @@ theme.getThemeConfig = async function (config) {
   return config;
 };
 
-/**
- * Hook: filter:settings.get
- * Provide default values for admin settings
- */
-theme.getAdminSettings = async function (hookData) {
-  if (hookData.plugin === 'javis') {
-    hookData.values = {
-      ...defaults,
-      ...hookData.values,
-    };
-  }
-  return hookData;
-};
-
 theme.defineWidgetAreas = async (areas) => {
   // Define widget areas like Harmony does
   const locations = ['header', 'sidebar', 'footer'];