From 168419cf2429bf20be39056bb6acf4a7b3c307fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 26 Mar 2024 09:57:34 -0400
Subject: [PATCH 1/5] feat: add hook to modify sorting options/fields

---
 src/topics/sorted.js | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/topics/sorted.js b/src/topics/sorted.js
index d244eefe61..23f55b63cb 100644
--- a/src/topics/sorted.js
+++ b/src/topics/sorted.js
@@ -159,18 +159,24 @@ module.exports = function (Topics) {
 			return tids;
 		}
 
-		const topicData = await Topics.getTopicsFields(tids, [
-			'tid', 'timestamp', 'lastposttime', 'upvotes', 'downvotes', 'postcount', 'pinned',
-		]);
-		const sortMap = {
-			recent: sortRecent,
-			old: sortOld,
-			create: sortCreate,
-			posts: sortPopular,
-			votes: sortVotes,
-			views: sortViews,
-		};
-		const sortFn = sortMap[params.sort] || sortRecent;
+		const { sortMap, fields } = await plugins.hooks.fire('filter:topics.sortOptions', {
+			params,
+			fields: [
+				'tid', 'timestamp', 'lastposttime', 'upvotes', 'downvotes', 'postcount', 'pinned',
+			],
+			sortMap: {
+				recent: sortRecent,
+				old: sortOld,
+				create: sortCreate,
+				posts: sortPopular,
+				votes: sortVotes,
+				views: sortViews,
+			},
+		});
+		console.log(params.sort);
+		const topicData = await Topics.getTopicsFields(tids, fields);
+		const sortFn = sortMap.hasOwnProperty(params.sort) && sortMap[params.sort] ?
+			sortMap[params.sort] : sortRecent;
 
 		if (params.floatPinned) {
 			floatPinned(topicData, sortFn);

From 3b2d8551d7b24a66e37a69b7d0c8bf028da17cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 26 Mar 2024 10:08:30 -0400
Subject: [PATCH 2/5] refactor: remove log

---
 src/topics/sorted.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/topics/sorted.js b/src/topics/sorted.js
index 23f55b63cb..92cc2f6ed6 100644
--- a/src/topics/sorted.js
+++ b/src/topics/sorted.js
@@ -173,7 +173,7 @@ module.exports = function (Topics) {
 				views: sortViews,
 			},
 		});
-		console.log(params.sort);
+
 		const topicData = await Topics.getTopicsFields(tids, fields);
 		const sortFn = sortMap.hasOwnProperty(params.sort) && sortMap[params.sort] ?
 			sortMap[params.sort] : sortRecent;

From 8b3811a19892bedfaba92b72dd9c647c2af4d709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Mon, 25 Mar 2024 16:04:54 -0400
Subject: [PATCH 3/5] make checkboxes more visible

---
 src/views/partials/acceptTos.tpl    | 7 +++----
 src/views/partials/gdpr_consent.tpl | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/partials/acceptTos.tpl b/src/views/partials/acceptTos.tpl
index f5dafb2423..c9f7ba42fb 100644
--- a/src/views/partials/acceptTos.tpl
+++ b/src/views/partials/acceptTos.tpl
@@ -1,9 +1,8 @@
 <div>
 	<label for="agree-terms">[[register:terms-of-use]]</label>
 	<div class="tos">{termsOfUse}</div>
-	<div class="checkbox">
-		<label>
-			<input type="checkbox" name="agree-terms" id="agree-terms"> [[register:agree-to-terms-of-use]]
-		</label>
+	<div class="form-check">
+		<input class="form-check-input border-gray-500" type="checkbox" name="agree-terms" id="agree-terms">
+		<label class="form-check-label">[[register:agree-to-terms-of-use]]</label>
 	</div>
 </div>
\ No newline at end of file
diff --git a/src/views/partials/gdpr_consent.tpl b/src/views/partials/gdpr_consent.tpl
index 21ec19074c..ea25aeb43c 100644
--- a/src/views/partials/gdpr_consent.tpl
+++ b/src/views/partials/gdpr_consent.tpl
@@ -2,7 +2,7 @@
 	<p class="lead">[[user:consent.lead]]</p>
 	<p>[[user:consent.intro]]</p>
 	<div class="form-check mb-3">
-		<input class="form-check-input" type="checkbox" name="gdpr_agree_data" id="gdpr_agree_data">
+		<input class="form-check-input border-gray-500" type="checkbox" name="gdpr_agree_data" id="gdpr_agree_data" role="switch">
 		<label class="form-check-label" for="gdpr_agree_data">[[register:gdpr-agree-data]]</label>
 	</div>
 
@@ -16,7 +16,7 @@
 	</p>
 
 	<div class="form-check">
-		<input class="form-check-input" type="checkbox" name="gdpr_agree_email" id="gdpr_agree_email">
+		<input class="form-check-input border-gray-500" type="checkbox" name="gdpr_agree_email" id="gdpr_agree_email" role="switch">
 		<label class="form-check-label" for="gdpr_agree_email">[[register:gdpr-agree-email]]</label>
 	</div>
 </div>
\ No newline at end of file

From ba9bcd0166e3ac4aa27c9e645c5516f00361ab0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 26 Mar 2024 10:22:11 -0400
Subject: [PATCH 4/5] remove border gray

---
 src/views/partials/acceptTos.tpl    | 2 +-
 src/views/partials/gdpr_consent.tpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/partials/acceptTos.tpl b/src/views/partials/acceptTos.tpl
index c9f7ba42fb..d077d692b1 100644
--- a/src/views/partials/acceptTos.tpl
+++ b/src/views/partials/acceptTos.tpl
@@ -2,7 +2,7 @@
 	<label for="agree-terms">[[register:terms-of-use]]</label>
 	<div class="tos">{termsOfUse}</div>
 	<div class="form-check">
-		<input class="form-check-input border-gray-500" type="checkbox" name="agree-terms" id="agree-terms">
+		<input class="form-check-input" type="checkbox" name="agree-terms" id="agree-terms">
 		<label class="form-check-label">[[register:agree-to-terms-of-use]]</label>
 	</div>
 </div>
\ No newline at end of file
diff --git a/src/views/partials/gdpr_consent.tpl b/src/views/partials/gdpr_consent.tpl
index ea25aeb43c..1759d39589 100644
--- a/src/views/partials/gdpr_consent.tpl
+++ b/src/views/partials/gdpr_consent.tpl
@@ -2,7 +2,7 @@
 	<p class="lead">[[user:consent.lead]]</p>
 	<p>[[user:consent.intro]]</p>
 	<div class="form-check mb-3">
-		<input class="form-check-input border-gray-500" type="checkbox" name="gdpr_agree_data" id="gdpr_agree_data" role="switch">
+		<input class="form-check-input" type="checkbox" name="gdpr_agree_data" id="gdpr_agree_data" role="switch">
 		<label class="form-check-label" for="gdpr_agree_data">[[register:gdpr-agree-data]]</label>
 	</div>
 
@@ -16,7 +16,7 @@
 	</p>
 
 	<div class="form-check">
-		<input class="form-check-input border-gray-500" type="checkbox" name="gdpr_agree_email" id="gdpr_agree_email" role="switch">
+		<input class="form-check-input" type="checkbox" name="gdpr_agree_email" id="gdpr_agree_email" role="switch">
 		<label class="form-check-label" for="gdpr_agree_email">[[register:gdpr-agree-email]]</label>
 	</div>
 </div>
\ No newline at end of file

From c6915398f911d703e6638fc17f510dcf73c9736e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 26 Mar 2024 10:24:20 -0400
Subject: [PATCH 5/5] chore: up harmony

---
 install/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/package.json b/install/package.json
index c940dbc967..48e82063ed 100644
--- a/install/package.json
+++ b/install/package.json
@@ -103,8 +103,8 @@
         "nodebb-plugin-ntfy": "1.7.3",
         "nodebb-plugin-spam-be-gone": "2.2.1",
         "nodebb-rewards-essentials": "1.0.0",
-        "nodebb-theme-harmony": "1.2.40",
-        "nodebb-theme-lavender": "7.1.7",
+        "nodebb-theme-harmony": "1.2.43",
+        "nodebb-theme-lavender": "7.1.8",
         "nodebb-theme-peace": "2.2.4",
         "nodebb-theme-persona": "13.3.11",
         "nodebb-widget-essentials": "7.0.15",