From 7fc328b60ad086880a743b8dae332a9d294641a6 Mon Sep 17 00:00:00 2001 From: Raymond <101374892+raymonable@users.noreply.github.com> Date: Wed, 26 Feb 2025 19:09:15 -0500 Subject: [PATCH 01/14] feat: add bio to profile --- AquaNet/src/pages/UserHome.svelte | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/AquaNet/src/pages/UserHome.svelte b/AquaNet/src/pages/UserHome.svelte index 763f8bd7..53abb7a7 100644 --- a/AquaNet/src/pages/UserHome.svelte +++ b/AquaNet/src/pages/UserHome.svelte @@ -146,6 +146,19 @@ + {#if d.user.aquaUser?.profileBio} +
+
+
+
+ {t("settings.profile.bio")} + {d.user.aquaUser?.profileBio} +
+
+
+
+ {/if} +
From ff7abf4c41f29be00100c17d9b4830c914588fff Mon Sep 17 00:00:00 2001 From: Raymond <101374892+raymonable@users.noreply.github.com> Date: Wed, 26 Feb 2025 19:13:55 -0500 Subject: [PATCH 02/14] fix: remove div around box --- AquaNet/src/pages/UserHome.svelte | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/AquaNet/src/pages/UserHome.svelte b/AquaNet/src/pages/UserHome.svelte index 53abb7a7..49c4d9c2 100644 --- a/AquaNet/src/pages/UserHome.svelte +++ b/AquaNet/src/pages/UserHome.svelte @@ -147,16 +147,14 @@
{#if d.user.aquaUser?.profileBio} -
-
-
-
- {t("settings.profile.bio")} - {d.user.aquaUser?.profileBio} -
+
+
+
+ {t("settings.profile.bio")} + {d.user.aquaUser?.profileBio}
-
-
+
+
{/if} From 0a0f350a1d4f953d3e2014ec56010c50df4d4c8d Mon Sep 17 00:00:00 2001 From: Raymond <101374892+raymonable@users.noreply.github.com> Date: Wed, 26 Feb 2025 19:28:57 -0500 Subject: [PATCH 03/14] fix: textarea instead of input for bio --- AquaNet/src/app.sass | 6 +++++- AquaNet/src/pages/User/Settings.svelte | 18 +++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/AquaNet/src/app.sass b/AquaNet/src/app.sass index bc7bad14..7678ecbe 100644 --- a/AquaNet/src/app.sass +++ b/AquaNet/src/app.sass @@ -134,7 +134,7 @@ button.icon .error color: vars.$c-error -input +input, textarea border-radius: vars.$border-radius border: 1px solid transparent padding: 0.6em 1.2em @@ -144,6 +144,10 @@ input background-color: vars.$ov-lighter transition: vars.$transition box-sizing: border-box + resize: none + +textarea + height: 5em // Dropdown select diff --git a/AquaNet/src/pages/User/Settings.svelte b/AquaNet/src/pages/User/Settings.svelte index 75f0b9dd..1cbcccf7 100644 --- a/AquaNet/src/pages/User/Settings.svelte +++ b/AquaNet/src/pages/User/Settings.svelte @@ -28,8 +28,9 @@ [ 'displayName', t('settings.profile.name') ], [ 'username', t('settings.profile.username') ], [ 'password', t('settings.profile.password') ], + /* Neither of these did anything of importance [ 'country', t('settings.profile.country') ], - [ 'profileLocation', t('settings.profile.location') ], + [ 'profileLocation', t('settings.profile.location') ],*/ [ 'profileBio', t('settings.profile.bio') ], ] as const @@ -165,9 +166,14 @@
- changed = [...changed, field]} - placeholder={field === 'password' ? t('settings.profile.unchanged') : t('settings.profile.unset')}/> + {#if field == "profileBio"} + + {:else} + changed = [...changed, field]} + placeholder={field === 'password' ? t('settings.profile.unchanged') : t('settings.profile.unset')}/> + {/if} + {#if changed.includes(field) && me[field]}