-
{user.name}
- {user.displayName &&
{user.displayName}
}
-
+
+
+ {
+ user.picture ? (
+
+ ) : (
+
+
+
+ )
+ }
+
+
{user.name}
+ {user.displayName &&
{user.displayName}
}
{
- user.admin && (
-
- admin
-
- )
- }
- {
- user.verified && (
-
- verified
-
- )
- }
- {
- user.verifier && (
-
- verifier
-
+ (user.admin || user.verified || user.verifier) && (
+
+ {user.admin && (
+
+ admin
+
+ )}
+ {user.verified && (
+
+ verified
+
+ )}
+ {user.verifier && (
+
+ verifier
+
+ )}
+
)
}
-
diff --git a/web/src/pages/admin/service-suggestions/[id].astro b/web/src/pages/admin/service-suggestions/[id].astro
index ecfb6ee..7bd63a5 100644
--- a/web/src/pages/admin/service-suggestions/[id].astro
+++ b/web/src/pages/admin/service-suggestions/[id].astro
@@ -127,7 +127,7 @@ const statusInfo = getServiceSuggestionStatusInfo(serviceSuggestion.status)
Submitted by:
-
+
{serviceSuggestion.user.name}
@@ -148,9 +148,10 @@ const statusInfo = getServiceSuggestionStatusInfo(serviceSuggestion.status)
serviceSuggestion.notes && (
Notes from user:
-
- {serviceSuggestion.notes}
-
+
)
}
diff --git a/web/src/pages/admin/service-suggestions/index.astro b/web/src/pages/admin/service-suggestions/index.astro
index db8b5e2..84a10e5 100644
--- a/web/src/pages/admin/service-suggestions/index.astro
+++ b/web/src/pages/admin/service-suggestions/index.astro
@@ -293,7 +293,7 @@ const makeSortUrl = (slug: string) => {
-
+
{suggestion.user.name}
|
diff --git a/web/src/pages/admin/services/[slug]/edit.astro b/web/src/pages/admin/services/[slug]/edit.astro
index 7ea2ad4..29727e2 100644
--- a/web/src/pages/admin/services/[slug]/edit.astro
+++ b/web/src/pages/admin/services/[slug]/edit.astro
@@ -211,8 +211,9 @@ const buttonSmallWarningClasses = cn(
id="description"
required
rows={4}
- class={inputBaseClasses}>{service.description}
+ class={inputBaseClasses}
+ set:text={service.description}
+ />
{
serviceInputErrors.description && (
{serviceInputErrors.description.join(', ')}
@@ -243,8 +244,8 @@ const buttonSmallWarningClasses = cn(
id="serviceUrls"
rows={3}
placeholder="https://example1.com\nhttps://example2.com"
- >{service.serviceUrls.join('\n')}
+ set:text={service.serviceUrls.join('\n')}
+ />
{
serviceInputErrors.serviceUrls && (
{serviceInputErrors.serviceUrls.join(', ')}
@@ -260,8 +261,8 @@ const buttonSmallWarningClasses = cn(
id="tosUrls"
rows={3}
placeholder="https://example1.com/tos\nhttps://example2.com/tos"
- >{service.tosUrls.join('\n')}
+ set:text={service.tosUrls.join('\n')}
+ />
{
serviceInputErrors.tosUrls && (
{serviceInputErrors.tosUrls.join(', ')}
@@ -277,8 +278,8 @@ const buttonSmallWarningClasses = cn(
id="onionUrls"
rows={3}
placeholder="http://example1.onion\nhttp://example2.onion"
- >{service.onionUrls.join('\n')}
+ set:text={service.onionUrls.join('\n')}
+ />
{
serviceInputErrors.onionUrls && (
{serviceInputErrors.onionUrls.join(', ')}
@@ -294,8 +295,8 @@ const buttonSmallWarningClasses = cn(
id="i2pUrls"
rows={3}
placeholder="http://example1.b32.i2p\nhttp://example2.b32.i2p"
- >{service.i2pUrls.join('\n')}
+ set:text={service.i2pUrls.join('\n')}
+ />
{/* Assuming i2pUrls might have errors, add error display if schema supports it */}
{
/* serviceInputErrors.i2pUrls && (
@@ -515,8 +516,9 @@ const buttonSmallWarningClasses = cn(
class={inputBaseClasses}
name="verificationSummary"
id="verificationSummary"
- rows={4}>{service.verificationSummary}
+ rows={4}
+ set:text={service.verificationSummary}
+ />
{
serviceInputErrors.verificationSummary && (
{serviceInputErrors.verificationSummary.join(', ')}
@@ -531,8 +533,9 @@ const buttonSmallWarningClasses = cn(
class={inputBaseClasses}
name="verificationProofMd"
id="verificationProofMd"
- rows={8}>{service.verificationProofMd}
+ rows={8}
+ set:text={service.verificationProofMd}
+ />
{
serviceInputErrors.verificationProofMd && (
{serviceInputErrors.verificationProofMd.join(', ')}
@@ -731,9 +734,8 @@ const buttonSmallWarningClasses = cn(
required
rows={3}
class={inputBaseClasses}
- >
- {event.content}
-
+ set:text={event.content}
+ />
{eventUpdateInputErrors.content && (
{eventUpdateInputErrors.content.join(', ')}
)}
@@ -847,8 +849,14 @@ const buttonSmallWarningClasses = cn(
-
+
{
eventInputErrors.content && (
{eventInputErrors.content.join(', ')}
@@ -1014,9 +1022,8 @@ const buttonSmallWarningClasses = cn(
id={`stepDescriptionEdit-${step.id}`}
rows={2}
class={inputBaseClasses}
- >
- {step.description}
-
+ set:text={step.description}
+ />
{verificationStepUpdateInputErrors.description && (
{verificationStepUpdateInputErrors.description.join(', ')}
@@ -1032,9 +1039,8 @@ const buttonSmallWarningClasses = cn(
id={`stepEvidenceMdEdit-${step.id}`}
rows={4}
class={inputBaseClasses}
- >
- {step.evidenceMd}
-
+ set:text={step.evidenceMd}
+ />
{verificationStepUpdateInputErrors.evidenceMd && (
{verificationStepUpdateInputErrors.evidenceMd.join(', ')}
@@ -1104,8 +1110,14 @@ const buttonSmallWarningClasses = cn(
-
+
{
verificationStepInputErrors.evidenceMd && (
{verificationStepInputErrors.evidenceMd.join(', ')}
diff --git a/web/src/pages/admin/services/new.astro b/web/src/pages/admin/services/new.astro
index 0482ad7..e1c04ff 100644
--- a/web/src/pages/admin/services/new.astro
+++ b/web/src/pages/admin/services/new.astro
@@ -64,7 +64,8 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
id="description"
required
class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
- >
+ set:text=""
+ />
{
inputErrors.description && (
{inputErrors.description.join(', ')}
@@ -80,7 +81,9 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
name="serviceUrls"
id="serviceUrls"
rows={3}
- placeholder="https://example1.com https://example2.com">
+ placeholder="https://example1.com https://example2.com"
+ set:text=""
+ />
{
inputErrors.serviceUrls && (
{inputErrors.serviceUrls.join(', ')}
@@ -96,7 +99,9 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
name="tosUrls"
id="tosUrls"
rows={3}
- placeholder="https://example1.com/tos https://example2.com/tos">
+ placeholder="https://example1.com/tos https://example2.com/tos"
+ set:text=""
+ />
{
inputErrors.tosUrls && (
{inputErrors.tosUrls.join(', ')}
@@ -112,7 +117,9 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
name="onionUrls"
id="onionUrls"
rows={3}
- placeholder="http://example.onion">
+ placeholder="http://example.onion"
+ set:text=""
+ />
{
inputErrors.onionUrls && (
{inputErrors.onionUrls.join(', ')}
@@ -266,7 +273,9 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
name="verificationSummary"
id="verificationSummary"
- rows={3}>
+ rows={3}
+ set:text=""
+ />
{
inputErrors.verificationSummary && (
{inputErrors.verificationSummary.join(', ')}
@@ -283,7 +292,9 @@ const inputErrors = isInputError(result?.error) ? result.error.fields : {}
class="font-title w-full rounded-md border border-green-500/30 bg-black/50 p-2 text-gray-300 placeholder-gray-500 focus:border-green-500 focus:ring-green-500"
name="verificationProofMd"
id="verificationProofMd"
- rows={10}>
+ rows={10}
+ set:text=""
+ />
{
inputErrors.verificationProofMd && (
{inputErrors.verificationProofMd.join(', ')}
diff --git a/web/src/pages/admin/users/[username].astro b/web/src/pages/admin/users/[username].astro
index e48eed0..76aab45 100644
--- a/web/src/pages/admin/users/[username].astro
+++ b/web/src/pages/admin/users/[username].astro
@@ -306,7 +306,7 @@ if (!user) return Astro.rewrite('/404')