mirror of
https://github.com/elk-zone/elk.git
synced 2024-11-27 19:57:50 +03:00
feat(settings): up to 16 fields for glitch edition
This commit is contained in:
parent
88731ee18d
commit
217f1ea567
6 changed files with 61 additions and 47 deletions
|
@ -9,11 +9,22 @@ const { form } = defineModel<{
|
||||||
const dropdown = $ref<any>()
|
const dropdown = $ref<any>()
|
||||||
|
|
||||||
const fieldIcons = computed(() =>
|
const fieldIcons = computed(() =>
|
||||||
Array.from({ length: 4 }, (_, i) =>
|
Array.from({ length: maxAccountFieldCount.value }, (_, i) =>
|
||||||
getAccountFieldIcon(form.value.fieldsAttributes[i].name),
|
getAccountFieldIcon(form.value.fieldsAttributes[i].name),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const fieldCount = $computed(() => {
|
||||||
|
// find last non-empty field
|
||||||
|
const idx = [...form.value.fieldsAttributes].reverse().findIndex(f => f.name || f.value)
|
||||||
|
if (idx === -1)
|
||||||
|
return 1
|
||||||
|
return Math.min(
|
||||||
|
form.value.fieldsAttributes.length - idx + 1,
|
||||||
|
maxAccountFieldCount.value,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
const chooseIcon = (i: number, text: string) => {
|
const chooseIcon = (i: number, text: string) => {
|
||||||
form.value.fieldsAttributes[i].name = text
|
form.value.fieldsAttributes[i].name = text
|
||||||
dropdown[i]?.hide()
|
dropdown[i]?.hide()
|
||||||
|
@ -21,8 +32,16 @@ const chooseIcon = (i: number, text: string) => {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
<div space-y-2>
|
||||||
|
<div font-medium>
|
||||||
|
{{ $t('settings.profile.appearance.profile_metadata') }}
|
||||||
|
</div>
|
||||||
|
<div text-sm text-secondary>
|
||||||
|
{{ $t('settings.profile.appearance.profile_metadata_desc', [maxAccountFieldCount]) }}
|
||||||
|
</div>
|
||||||
|
|
||||||
<div flex="~ col gap4">
|
<div flex="~ col gap4">
|
||||||
<div v-for="i in 4" :key="i" flex="~ gap3" items-center>
|
<div v-for="i in fieldCount" :key="i" flex="~ gap3" items-center>
|
||||||
<CommonDropdown ref="dropdown" placement="left">
|
<CommonDropdown ref="dropdown" placement="left">
|
||||||
<CommonTooltip content="Pick a icon">
|
<CommonTooltip content="Pick a icon">
|
||||||
<button type="button" btn-action-icon>
|
<button type="button" btn-action-icon>
|
||||||
|
@ -57,4 +76,5 @@ const chooseIcon = (i: number, text: string) => {
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
1
composables/settings/metadata.ts
Normal file
1
composables/settings/metadata.ts
Normal file
|
@ -0,0 +1 @@
|
||||||
|
export const maxAccountFieldCount = computed(() => isGlitchEdition.value ? 16 : 4)
|
|
@ -55,6 +55,7 @@ export const currentUser = computed<UserLogin | undefined>(() => {
|
||||||
|
|
||||||
const publicInstance = ref<mastodon.v1.Instance | null>(null)
|
const publicInstance = ref<mastodon.v1.Instance | null>(null)
|
||||||
export const currentInstance = computed<null | mastodon.v1.Instance>(() => currentUser.value ? instances.value[currentUser.value.server] ?? null : publicInstance.value)
|
export const currentInstance = computed<null | mastodon.v1.Instance>(() => currentUser.value ? instances.value[currentUser.value.server] ?? null : publicInstance.value)
|
||||||
|
export const isGlitchEdition = computed(() => currentInstance.value?.version.includes('+glitch'))
|
||||||
|
|
||||||
export const publicServer = ref('')
|
export const publicServer = ref('')
|
||||||
export const currentServer = computed<string>(() => currentUser.value?.server || publicServer.value)
|
export const currentServer = computed<string>(() => currentUser.value?.server || publicServer.value)
|
||||||
|
|
|
@ -325,7 +325,7 @@
|
||||||
"display_name": "Display name",
|
"display_name": "Display name",
|
||||||
"label": "Appearance",
|
"label": "Appearance",
|
||||||
"profile_metadata": "Profile metadata",
|
"profile_metadata": "Profile metadata",
|
||||||
"profile_metadata_desc": "You can have up to 4 items displayed as a table on your profile",
|
"profile_metadata_desc": "You can have up to {0} items displayed as a table on your profile",
|
||||||
"title": "Edit profile"
|
"title": "Edit profile"
|
||||||
},
|
},
|
||||||
"featured_tags": {
|
"featured_tags": {
|
||||||
|
|
|
@ -268,7 +268,7 @@
|
||||||
"display_name": "Zichtbare naam",
|
"display_name": "Zichtbare naam",
|
||||||
"label": "Uiterlijk",
|
"label": "Uiterlijk",
|
||||||
"profile_metadata": "Profiel metadata",
|
"profile_metadata": "Profiel metadata",
|
||||||
"profile_metadata_desc": "Je kan tot en met 4 elementen als table zetten op je profiel zetten",
|
"profile_metadata_desc": "Je kan tot en met {0} elementen als table zetten op je profiel zetten",
|
||||||
"title": "Aanpassen profiel"
|
"title": "Aanpassen profiel"
|
||||||
},
|
},
|
||||||
"featured_tags": {
|
"featured_tags": {
|
||||||
|
|
|
@ -24,7 +24,7 @@ const onlineSrc = $computed(() => ({
|
||||||
const { form, reset, submitter, dirtyFields, isError } = useForm({
|
const { form, reset, submitter, dirtyFields, isError } = useForm({
|
||||||
form: () => {
|
form: () => {
|
||||||
// For complex types of objects, a deep copy is required to ensure correct comparison of initial and modified values
|
// For complex types of objects, a deep copy is required to ensure correct comparison of initial and modified values
|
||||||
const fieldsAttributes = Array.from({ length: 4 }, (_, i) => {
|
const fieldsAttributes = Array.from({ length: maxAccountFieldCount.value }, (_, i) => {
|
||||||
const field = { ...account?.fields?.[i] || { name: '', value: '' } }
|
const field = { ...account?.fields?.[i] || { name: '', value: '' } }
|
||||||
|
|
||||||
const linkElement = (parse(field.value)?.children?.[0])
|
const linkElement = (parse(field.value)?.children?.[0])
|
||||||
|
@ -151,16 +151,8 @@ onReactivated(refreshInfo)
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<!-- metadata -->
|
<!-- metadata -->
|
||||||
<div space-y-2>
|
|
||||||
<div font-medium>
|
|
||||||
{{ $t('settings.profile.appearance.profile_metadata') }}
|
|
||||||
</div>
|
|
||||||
<div text-sm text-secondary>
|
|
||||||
{{ $t('settings.profile.appearance.profile_metadata_desc') }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<SettingsProfileMetadata v-if="isHydrated" v-model:form="form" />
|
<SettingsProfileMetadata v-if="isHydrated" v-model:form="form" />
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- actions -->
|
<!-- actions -->
|
||||||
<div flex="~ gap2" justify-end>
|
<div flex="~ gap2" justify-end>
|
||||||
|
|
Loading…
Reference in a new issue