From 7d0df67c067eeb09f5f4c17af83b86b074f5ef71 Mon Sep 17 00:00:00 2001
From: sam <sam@vulpine.solutions>
Date: Wed, 5 Mar 2025 15:13:26 +0100
Subject: [PATCH 1/2] fix(frontend): fix moving pronouns

---
 .../src/lib/components/editor/PronounEntryEditor.svelte         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Foxnouns.Frontend/src/lib/components/editor/PronounEntryEditor.svelte b/Foxnouns.Frontend/src/lib/components/editor/PronounEntryEditor.svelte
index bcf5c15..64b354e 100644
--- a/Foxnouns.Frontend/src/lib/components/editor/PronounEntryEditor.svelte
+++ b/Foxnouns.Frontend/src/lib/components/editor/PronounEntryEditor.svelte
@@ -48,7 +48,7 @@
 			icon="chevron-down"
 			color="secondary"
 			tooltip={$t("editor.move-entry-down")}
-			onclick={() => moveValue(index, true)}
+			onclick={() => moveValue(index, false)}
 		/>
 		<input type="text" class="form-control" bind:value={value.value} autocomplete="off" />
 		<ButtonDropdown>

From 790b39f730a6df3e42d33225f01f7e5839cc8729 Mon Sep 17 00:00:00 2001
From: sam <sam@vulpine.solutions>
Date: Wed, 5 Mar 2025 15:13:44 +0100
Subject: [PATCH 2/2] fix(frontend): consistency in the editor

---
 .../src/lib/components/editor/AvatarEditor.svelte            | 2 +-
 .../src/lib/components/editor/CustomPreferencesNotice.svelte | 2 +-
 .../src/lib/components/editor/FieldsEditor.svelte            | 2 ++
 .../src/routes/settings/members/[id]/fields/+page.svelte     | 5 -----
 .../src/routes/settings/profile/fields/+page.svelte          | 5 -----
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Foxnouns.Frontend/src/lib/components/editor/AvatarEditor.svelte b/Foxnouns.Frontend/src/lib/components/editor/AvatarEditor.svelte
index a945bbf..288bcc5 100644
--- a/Foxnouns.Frontend/src/lib/components/editor/AvatarEditor.svelte
+++ b/Foxnouns.Frontend/src/lib/components/editor/AvatarEditor.svelte
@@ -130,7 +130,7 @@
 		accept="image/png, image/jpeg, image/gif, image/webp"
 	/>
 	<button
-		class="btn btn-secondary"
+		class="btn btn-primary"
 		disabled={!avatarExists || avatarTooLarge}
 		onclick={() => onclick(avatar)}
 	>
diff --git a/Foxnouns.Frontend/src/lib/components/editor/CustomPreferencesNotice.svelte b/Foxnouns.Frontend/src/lib/components/editor/CustomPreferencesNotice.svelte
index 319c1da..4efbdfe 100644
--- a/Foxnouns.Frontend/src/lib/components/editor/CustomPreferencesNotice.svelte
+++ b/Foxnouns.Frontend/src/lib/components/editor/CustomPreferencesNotice.svelte
@@ -4,5 +4,5 @@
 
 <div class="alert alert-secondary">
 	{$t("editor.custom-preference-notice")}
-	<a href="/settings/pref" class="alert-link">{$t("editor.custom-preference-notice-link")}</a>
+	<a href="/settings/prefs" class="alert-link">{$t("editor.custom-preference-notice-link")}</a>
 </div>
diff --git a/Foxnouns.Frontend/src/lib/components/editor/FieldsEditor.svelte b/Foxnouns.Frontend/src/lib/components/editor/FieldsEditor.svelte
index bcd3e78..bbc57d5 100644
--- a/Foxnouns.Frontend/src/lib/components/editor/FieldsEditor.svelte
+++ b/Foxnouns.Frontend/src/lib/components/editor/FieldsEditor.svelte
@@ -6,6 +6,7 @@
 	import FieldEditor from "./FieldEditor.svelte";
 	import FormStatusMarker from "./FormStatusMarker.svelte";
 	import NoscriptWarning from "./NoscriptWarning.svelte";
+	import CustomPreferencesNotice from "$components/editor/CustomPreferencesNotice.svelte";
 
 	type Props = {
 		fields: Field[];
@@ -45,6 +46,7 @@
 
 <NoscriptWarning />
 <FormStatusMarker form={ok} />
+<CustomPreferencesNotice />
 
 <h4>{$t("edit-profile.editing-fields-header")}</h4>
 
diff --git a/Foxnouns.Frontend/src/routes/settings/members/[id]/fields/+page.svelte b/Foxnouns.Frontend/src/routes/settings/members/[id]/fields/+page.svelte
index 7e86851..507289d 100644
--- a/Foxnouns.Frontend/src/routes/settings/members/[id]/fields/+page.svelte
+++ b/Foxnouns.Frontend/src/routes/settings/members/[id]/fields/+page.svelte
@@ -2,9 +2,7 @@
 	import { apiRequest } from "$api";
 	import ApiError, { type RawApiError } from "$api/error";
 	import { mergePreferences, type User } from "$api/models/user";
-	import CustomPreferencesNotice from "$components/editor/CustomPreferencesNotice.svelte";
 	import FieldsEditor from "$components/editor/FieldsEditor.svelte";
-	import NoscriptWarning from "$components/editor/NoscriptWarning.svelte";
 	import log from "$lib/log";
 	import ephemeralState from "$lib/state.svelte";
 	import type { PageData } from "./$types";
@@ -38,7 +36,4 @@
 	);
 </script>
 
-<NoscriptWarning />
-<CustomPreferencesNotice />
-
 <FieldsEditor bind:fields {ok} {allPreferences} {update} />
diff --git a/Foxnouns.Frontend/src/routes/settings/profile/fields/+page.svelte b/Foxnouns.Frontend/src/routes/settings/profile/fields/+page.svelte
index 3f47f74..b15d7c4 100644
--- a/Foxnouns.Frontend/src/routes/settings/profile/fields/+page.svelte
+++ b/Foxnouns.Frontend/src/routes/settings/profile/fields/+page.svelte
@@ -2,9 +2,7 @@
 	import { apiRequest } from "$api";
 	import ApiError, { type RawApiError } from "$api/error";
 	import { mergePreferences, type User } from "$api/models/user";
-	import CustomPreferencesNotice from "$components/editor/CustomPreferencesNotice.svelte";
 	import FieldsEditor from "$components/editor/FieldsEditor.svelte";
-	import NoscriptWarning from "$components/editor/NoscriptWarning.svelte";
 	import log from "$lib/log";
 	import ephemeralState from "$lib/state.svelte";
 	import type { PageData } from "./$types";
@@ -38,7 +36,4 @@
 	);
 </script>
 
-<NoscriptWarning />
-<CustomPreferencesNotice />
-
 <FieldsEditor bind:fields {ok} {allPreferences} {update} />