nodebb-theme-harmony 1.0.40 → 1.0.42

package/lib/controllers.js

@@ -14,9 +14,14 @@ Controllers.renderThemeSettings = async (req, res, next) => {
 	if (!userData) {
 		return next();
 	}
+	const lib = require('../library');
+	userData.theme = await lib.loadThemeConfig(userData.uid);
 
 	userData.title = '[[themes/harmony:settings.title]]';
-	userData.breadcrumbs = helpers.buildBreadcrumbs([{ text: userData.username, url: `/user/${userData.userslug}` }, { text: '[[themes/harmony:settings.title]]' }]);
+	userData.breadcrumbs = helpers.buildBreadcrumbs([
+		{ text: userData.username, url: `/user/${userData.userslug}` },
+		{ text: '[[themes/harmony:settings.title]]' },
+	]);
 
 	res.render('account/theme', userData);
 };

package/library.js

@@ -134,7 +134,7 @@ library.defineWidgetAreas = async function (areas) {
 	return areas;
 };
 
-async function loadThemeConfig(uid) {
+library.loadThemeConfig = async function (uid) {
 	const [themeConfig, userConfig] = await Promise.all([
 		meta.settings.get('harmony'),
 		user.getSettings(uid),
@@ -149,10 +149,10 @@ async function loadThemeConfig(uid) {
 	config.openSidebars = config.openSidebars === 'on';
 	config.chatModals = config.chatModals === 'on';
 	return config;
-}
+};
 
 library.getThemeConfig = async function (config) {
-	config.theme = await loadThemeConfig(config.uid);
+	config.theme = await library.loadThemeConfig(config.uid);
 	config.openDraftsOnPageLoad = false;
 	return config;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-harmony",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "nbbpm": {
     "compatibility": "^3.0.0"
   },

package/public/settings.js

@@ -14,12 +14,14 @@ define('forum/account/theme', ['forum/account/header', 'api', 'settings', 'alert
 			const formEl = document.getElementById('theme-settings');
 			saveEl.addEventListener('click', async () => {
 				const themeSettings = settings.helper.serializeForm($(formEl));
-				await api.put(`/users/${app.user.uid}/settings`, {
+				await api.put(`/users/${ajaxify.data.uid}/settings`, {
 					settings: {
 						...themeSettings,
 					},
 				});
-				config.theme = (await api.get('/api/config')).theme;
+				if (ajaxify.data.isSelf) {
+					config.theme = (await api.get('/api/config')).theme;
+				}
 				alerts.success('[[success:settings-saved]]');
 			});
 		}

package/templates/account/theme.tpl

@@ -8,22 +8,22 @@
 
 <form id="theme-settings" role="form">
 	<div class="form-check mb-3">
-		<input class="form-check-input" type="checkbox" id="enableQuickReply" name="enableQuickReply" {{{ if config.theme.enableQuickReply }}}checked{{{ end }}}>
+		<input class="form-check-input" type="checkbox" id="enableQuickReply" name="enableQuickReply" {{{ if theme.enableQuickReply }}}checked{{{ end }}}>
 		<label class="form-check-label" for="enableQuickReply">[[themes/harmony:settings.enableQuickReply]]</label>
 	</div>
 
 	<div class="form-check mb-3">
-		<input class="form-check-input" type="checkbox" id="centerHeaderElements" name="centerHeaderElements" {{{ if config.theme.centerHeaderElements }}}checked{{{ end }}}>
+		<input class="form-check-input" type="checkbox" id="centerHeaderElements" name="centerHeaderElements" {{{ if theme.centerHeaderElements }}}checked{{{ end }}}>
 		<label class="form-check-label" for="centerHeaderElements">[[themes/harmony:settings.centerHeaderElements]]</label>
 	</div>
 
 	<div class="form-check mb-3">
-		<input class="form-check-input" type="checkbox" id="mobileTopicTeasers" name="mobileTopicTeasers" {{{ if config.theme.mobileTopicTeasers }}}checked{{{ end }}}>
+		<input class="form-check-input" type="checkbox" id="mobileTopicTeasers" name="mobileTopicTeasers" {{{ if theme.mobileTopicTeasers }}}checked{{{ end }}}>
 		<label class="form-check-label" for="mobileTopicTeasers">[[themes/harmony:settings.mobileTopicTeasers]]</label>
 	</div>
 
 	<div class="form-check mb-3">
-		<input class="form-check-input" type="checkbox" id="stickyToolbar" name="stickyToolbar" {{{ if config.theme.stickyToolbar }}}checked{{{ end }}}>
+		<input class="form-check-input" type="checkbox" id="stickyToolbar" name="stickyToolbar" {{{ if theme.stickyToolbar }}}checked{{{ end }}}>
 		<label class="form-check-label" for="stickyToolbar">
 			[[themes/harmony:settings.stickyToolbar]]
 			<p class="form-text mb-0">
@@ -33,7 +33,7 @@
 	</div>
 
 	<div class="form-check mb-3">
-		<input class="form-check-input" type="checkbox" id="autohideBottombar" name="autohideBottombar" {{{ if config.theme.autohideBottombar }}}checked{{{ end }}}>
+		<input class="form-check-input" type="checkbox" id="autohideBottombar" name="autohideBottombar" {{{ if theme.autohideBottombar }}}checked{{{ end }}}>
 		<label class="form-check-label" for="autohideBottombar">
 			[[themes/harmony:settings.autohideBottombar]]
 			<p class="form-text mb-0">
@@ -43,7 +43,7 @@
 	</div>
 
 	<div class="form-check mb-3">
-		<input class="form-check-input" type="checkbox" id="chatModals" name="chatModals" {{{ if config.theme.chatModals }}}checked{{{ end }}}>
+		<input class="form-check-input" type="checkbox" id="chatModals" name="chatModals" {{{ if theme.chatModals }}}checked{{{ end }}}>
 		<label class="form-check-label" for="chatModals">
 			[[themes/harmony:settings.chatModals]]
 		</label>

package/templates/partials/sidebar-left.tpl

@@ -1,4 +1,4 @@
-<nav class="{{{ if config.theme.openSidebars}}}open{{{ end }}} text-dark bg-light sidebar sidebar-left start-0 border-end vh-100 d-none d-lg-flex flex-column justify-content-between sticky-top">
+<nav component="sidebar/left" class="{{{ if config.theme.openSidebars}}}open{{{ end }}} text-dark bg-light sidebar sidebar-left start-0 border-end vh-100 d-none d-lg-flex flex-column justify-content-between sticky-top">
 	<ul id="main-nav" class="list-unstyled d-flex flex-column w-100 gap-2 mt-2">
 		{{{ each navigation }}}
 		{{{ if displayMenuItem(@root, @index) }}}

package/templates/partials/sidebar-right.tpl

@@ -1,4 +1,4 @@
-<nav class="{{{ if config.theme.openSidebars}}}open{{{ end }}} text-dark bg-light sidebar sidebar-right end-0 border-start vh-100 d-none d-lg-flex flex-column sticky-top">
+<nav component="sidebar/right" class="{{{ if config.theme.openSidebars}}}open{{{ end }}} text-dark bg-light sidebar sidebar-right end-0 border-start vh-100 d-none d-lg-flex flex-column sticky-top">
 	{{{ if config.loggedIn }}}
 	<ul id="logged-in-menu" class="list-unstyled d-flex flex-column w-100 gap-2 mt-2">
 	<!-- IMPORT partials/sidebar/logged-in-menu.tpl -->