diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json index 5f1d375..84e57ba 100644 --- a/web/src/i18n/locales/en.json +++ b/web/src/i18n/locales/en.json @@ -389,9 +389,12 @@ "address": "Public address", "addressHint": "Where friends reach this server, like https://music.example.org. Plain http is only for a network of your own.", "saveSettings": "Save settings", - "keyOfThis": "Key of this server: {{id}}.", + "keyOfThis": "Key of this server", + "thisServer": "This server", "keyHint": "The other admin sees the same key for your server: compare them to be sure.", "invites": "Invites", + "makeTitle": "Invite a friend", + "useTitle": "You got an invite", "makeInvite": "Make an invite", "invite": "Invite", "copy": "Copy", diff --git a/web/src/i18n/locales/it.json b/web/src/i18n/locales/it.json index 069acd0..5a85df9 100644 --- a/web/src/i18n/locales/it.json +++ b/web/src/i18n/locales/it.json @@ -389,9 +389,12 @@ "address": "Indirizzo pubblico", "addressHint": "Dove gli amici raggiungono questo server, come https://musica.example.org. Il semplice http va bene solo su una rete tua.", "saveSettings": "Salva le impostazioni", - "keyOfThis": "Chiave di questo server: {{id}}.", + "keyOfThis": "Chiave di questo server", + "thisServer": "Questo server", "keyHint": "L'altro admin vede la stessa chiave per il tuo server: confrontatele per essere sicuri.", "invites": "Inviti", + "makeTitle": "Invita un amico", + "useTitle": "Hai ricevuto un invito", "makeInvite": "Crea un invito", "invite": "Invito", "copy": "Copia", diff --git a/web/src/lib/groupKey.ts b/web/src/lib/groupKey.ts new file mode 100644 index 0000000..96f8e7d --- /dev/null +++ b/web/src/lib/groupKey.ts @@ -0,0 +1,4 @@ +/** A key in groups of four, the way two admins read it to each other: "81ae 4d57 0686 356c". */ +export function groupKey(id: string): string { + return id.replace(/(.{4})(?=.)/g, '$1 ') +} diff --git a/web/src/pages/admin/FederationBlock.tsx b/web/src/pages/admin/FederationBlock.tsx new file mode 100644 index 0000000..f71277d --- /dev/null +++ b/web/src/pages/admin/FederationBlock.tsx @@ -0,0 +1,11 @@ +import type { ReactNode } from 'react' + +/** A part of the Federation page: its title, then what is in it, divided from the part before by a line. */ +export default function FederationBlock({ title, children }: { title: string; children: ReactNode }) { + return ( +
+

{title}

+ {children} +
+ ) +} diff --git a/web/src/pages/admin/FederationFriends.tsx b/web/src/pages/admin/FederationFriends.tsx index 03d3ff8..a73ab0c 100644 --- a/web/src/pages/admin/FederationFriends.tsx +++ b/web/src/pages/admin/FederationFriends.tsx @@ -4,6 +4,8 @@ import { useApproveFriend, useCheckFriend, useRemoveFriend, type FederationFrien import { Button } from '@/components/ui/button' import Confirm from './Confirm' import { errorText } from './errorText' +import { groupKey } from '@/lib/groupKey' +import FederationBlock from './FederationBlock' const SCOPES = ['admin.federation.errors', 'admin.errors'] @@ -17,36 +19,52 @@ export default function FederationFriends({ friends }: { friends: FederationFrie const error = approve.error ?? remove.error ?? check.error return ( -
-

{t('admin.federation.friends')}

+ {friends.length === 0 ? (

{t('admin.federation.none')}

) : ( -
+ ) } diff --git a/web/src/pages/admin/FederationInvites.tsx b/web/src/pages/admin/FederationInvites.tsx index 33b2e50..b3b63e5 100644 --- a/web/src/pages/admin/FederationInvites.tsx +++ b/web/src/pages/admin/FederationInvites.tsx @@ -5,6 +5,7 @@ import { Button } from '@/components/ui/button' import { Input } from '@/components/ui/input' import { Label } from '@/components/ui/label' import { errorText } from './errorText' +import FederationBlock from './FederationBlock' const SCOPES = ['admin.federation.errors', 'admin.errors'] @@ -25,13 +26,18 @@ function MakeInvite() { } } - const until = invite ? new Intl.DateTimeFormat(i18n.language, { dateStyle: 'medium', timeStyle: 'short' }).format(new Date(invite.expires_at)) : '' + const until = invite + ? new Intl.DateTimeFormat(i18n.language, { + dateStyle: 'medium', + timeStyle: 'short', + }).format(new Date(invite.expires_at)) + : '' return ( -
+
+

{t('admin.federation.makeTitle')}

)} - + ) } diff --git a/web/src/pages/admin/FederationSettings.tsx b/web/src/pages/admin/FederationSettings.tsx index 9de79d0..c6469df 100644 --- a/web/src/pages/admin/FederationSettings.tsx +++ b/web/src/pages/admin/FederationSettings.tsx @@ -5,6 +5,8 @@ import { Button } from '@/components/ui/button' import { Input } from '@/components/ui/input' import { Label } from '@/components/ui/label' import { errorText } from './errorText' +import { groupKey } from '@/lib/groupKey' +import FederationBlock from './FederationBlock' const SCOPES = ['admin.federation.errors', 'admin.errors'] @@ -21,24 +23,31 @@ function Form({ federation }: { federation: Federation }) { } return ( - -
- - setName(e.target.value)} /> -

{t('admin.federation.nameHint')}

+ +
+
+ + setName(e.target.value)} /> +

{t('admin.federation.nameHint')}

+
+
+ + setAddress(e.target.value)} + /> +

{t('admin.federation.addressHint')}

+
-
- - setAddress(e.target.value)} - /> -

{t('admin.federation.addressHint')}

+
+ {t('admin.federation.keyOfThis')} + {groupKey(federation.key_id)} +

{t('admin.federation.keyHint')}