From 8f5bb18ee5cb7545ae7f1f74bf2d783f6466c65b Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 23 Dec 2022 14:09:48 -0500
Subject: [PATCH] feat: update default theme to harmony, move default footer
 widget to sidebar footer

---
 install/data/footer.json | 2 +-
 src/cli/reset.js         | 6 +++---
 src/install.js           | 4 ++--
 src/meta/css.js          | 4 ++--
 src/meta/themes.js       | 2 +-
 src/prestart.js          | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/install/data/footer.json b/install/data/footer.json
index 53b2176ade..c428e1eae2 100644
--- a/install/data/footer.json
+++ b/install/data/footer.json
@@ -2,7 +2,7 @@
 	{
 		"widget": "html",
 		"data" : {
-			"html": "<footer id=\"footer\" class=\"container footer\">\r\n\t<div>\r\n\t\tPowered by <a target=\"_blank\" href=\"https://nodebb.org\">NodeBB</a> | <a target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\">Contributors</a>\r\n\t</div>\r\n</footer>",
+			"html": "<footer id=\"footer\" class=\"container footer d-flex flex-column align-items-center gap-1 mb-2\">\n\t<span>Powered by <a class=\"link-secondary text-decoration-underline\" target=\"_blank\" href=\"https://nodebb.org\">NodeBB</a></span>\n\t<span><a class=\"link-secondary\" target=\"_blank\" href=\"//github.com/NodeBB/NodeBB/graphs/contributors\"><i class=\"fa fa-users\"></i> <span class=\"text-decoration-underline\">Contributors<span></a></span>\n</footer>",
 			"title":"",
 			"container":""
 		}
diff --git a/src/cli/reset.js b/src/cli/reset.js
index 2de33244bc..a05519b101 100644
--- a/src/cli/reset.js
+++ b/src/cli/reset.js
@@ -67,8 +67,8 @@ exports.reset = async function (options) {
 			'    -a\tall of the above',
 			'',
 			'Plugin and theme reset flags (-p & -t) can take a single argument',
-			'    e.g. ./nodebb reset -p nodebb-plugin-mentions, ./nodebb reset -t nodebb-theme-persona',
-			'         Prefix is optional, e.g. ./nodebb reset -p markdown, ./nodebb reset -t persona',
+			'    e.g. ./nodebb reset -p nodebb-plugin-mentions, ./nodebb reset -t nodebb-theme-harmony',
+			'         Prefix is optional, e.g. ./nodebb reset -p markdown, ./nodebb reset -t harmony',
 		].join('\n'));
 
 		process.exit(0);
@@ -105,7 +105,7 @@ async function resetTheme(themeId) {
 }
 
 async function resetThemes() {
-	await resetThemeTo('nodebb-theme-persona');
+	await resetThemeTo('nodebb-theme-harmony');
 }
 
 async function resetThemeTo(themeId) {
diff --git a/src/install.js b/src/install.js
index ba0f13e7be..d1229de531 100644
--- a/src/install.js
+++ b/src/install.js
@@ -250,7 +250,7 @@ async function enableDefaultTheme() {
 		return;
 	}
 
-	const defaultTheme = nconf.get('defaultTheme') || 'nodebb-theme-persona';
+	const defaultTheme = nconf.get('defaultTheme') || 'nodebb-theme-harmony';
 	console.log(`Enabling default theme: ${defaultTheme}`);
 	await meta.themes.set({
 		type: 'local',
@@ -530,7 +530,7 @@ async function setCopyrightWidget() {
 	]);
 
 	if (!footer && footerJSON) {
-		await db.setObjectField('widgets:global', 'footer', footerJSON);
+		await db.setObjectField('widgets:global', 'sidebar-footer', footerJSON);
 	}
 }
 
diff --git a/src/meta/css.js b/src/meta/css.js
index 41051e731f..e66d8ce601 100644
--- a/src/meta/css.js
+++ b/src/meta/css.js
@@ -184,8 +184,8 @@ async function getBundleMetadata(target) {
 	let themeData = null;
 	if (target === 'client') {
 		themeData = await db.getObjectFields('config', ['theme:type', 'theme:id', 'bootswatchSkin']);
-		const themeId = (themeData['theme:id'] || 'nodebb-theme-persona');
-		const baseThemePath = path.join(nconf.get('themes_path'), (themeData['theme:type'] && themeData['theme:type'] === 'local' ? themeId : 'nodebb-theme-persona'));
+		const themeId = (themeData['theme:id'] || 'nodebb-theme-harmony');
+		const baseThemePath = path.join(nconf.get('themes_path'), (themeData['theme:type'] && themeData['theme:type'] === 'local' ? themeId : 'nodebb-theme-harmony'));
 		paths.unshift(baseThemePath);
 		paths.unshift(`${baseThemePath}/node_modules`);
 
diff --git a/src/meta/themes.js b/src/meta/themes.js
index d4d3f58f45..e5d519c457 100644
--- a/src/meta/themes.js
+++ b/src/meta/themes.js
@@ -150,7 +150,7 @@ Themes.setupPaths = async () => {
 		currentThemeId: Meta.configs.get('theme:id'),
 	});
 
-	const themeId = data.currentThemeId || 'nodebb-theme-persona';
+	const themeId = data.currentThemeId || 'nodebb-theme-harmony';
 
 	if (process.env.NODE_ENV === 'development') {
 		winston.info(`[themes] Using theme ${themeId}`);
diff --git a/src/prestart.js b/src/prestart.js
index 48d4dc3d13..1af2d5ce68 100644
--- a/src/prestart.js
+++ b/src/prestart.js
@@ -75,7 +75,7 @@ function loadConfig(configFile) {
 	// Ensure themes_path is a full filepath
 	nconf.set('themes_path', path.resolve(paths.baseDir, nconf.get('themes_path')));
 	nconf.set('core_templates_path', path.join(paths.baseDir, 'src/views'));
-	nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-persona/templates'));
+	nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-harmony/templates'));
 
 	nconf.set('upload_path', path.resolve(nconf.get('base_dir'), nconf.get('upload_path')));
 	nconf.set('upload_url', '/assets/uploads');