merge: develop

This commit is contained in:
Mar0xy 2023-11-04 21:52:12 +01:00
commit db29a5c2da
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
134 changed files with 282 additions and 282 deletions

View file

@ -65,7 +65,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="buttons">
<MkButton class="button" inline primary style="margin-right: 12px;" @click="save(ad)">
<i
class="ph-floppy-disk ph-bold pg-lg"
class="ph-floppy-disk ph-bold ph-lg"
></i> {{ i18n.ts.save }}
</MkButton>
<MkButton class="button" inline danger @click="remove(ad)">

View file

@ -53,7 +53,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkSwitch>
<p v-if="announcement.reads">{{ i18n.t('nUsersRead', { n: announcement.reads }) }}</p>
<div class="buttons _buttons">
<MkButton class="button" inline primary @click="save(announcement)"><i class="ph-floppy-disk ph-bold pg-lg"></i> {{ i18n.ts.save }}</MkButton>
<MkButton class="button" inline primary @click="save(announcement)"><i class="ph-floppy-disk ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
<MkButton v-if="announcement.id != null" class="button" inline @click="archive(announcement)"><i class="ph-check ph-bold ph-lg"></i> {{ i18n.ts._announcement.end }} ({{ i18n.ts.archive }})</MkButton>
<MkButton v-if="announcement.id != null" class="button" inline danger @click="del(announcement)"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.delete }}</MkButton>
</div>

View file

@ -50,7 +50,7 @@ const headerTabs = $computed(() => []);
definePageMetadata(computed(() => ({
title: i18n.ts.approvals,
icon: 'ph-chalkboard-teacher ph-bold pg-lg',
icon: 'ph-chalkboard-teacher ph-bold ph-lg',
})));
</script>

View file

@ -57,7 +57,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</FormSlot>
</template>
<MkButton primary @click="save"><i class="ph-floppy-disk ph-bold pg-lg"></i> {{ i18n.ts.save }}</MkButton>
<MkButton primary @click="save"><i class="ph-floppy-disk ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
</div>
</FormSuspense>
</div>

View file

@ -35,6 +35,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.database,
icon: 'ph-database ph-bold pg-lg',
icon: 'ph-database ph-bold ph-lg',
});
</script>

View file

@ -45,7 +45,7 @@ const router = useRouter();
const indexInfo = {
title: i18n.ts.controlPanel,
icon: 'ph-gear ph-bold pg-lg',
icon: 'ph-gear ph-bold ph-lg',
hideHeader: true,
};
@ -101,12 +101,12 @@ const menuDef = $computed(() => [{
}, {
title: i18n.ts.administration,
items: [{
icon: 'ph-gauge ph-bold pg-lg',
icon: 'ph-gauge ph-bold ph-lg',
text: i18n.ts.dashboard,
to: '/admin/overview',
active: currentPage?.route.name === 'overview',
}, {
icon: 'ph-users ph-bold pg-lg',
icon: 'ph-users ph-bold ph-lg',
text: i18n.ts.users,
to: '/admin/users',
active: currentPage?.route.name === 'users',
@ -121,12 +121,12 @@ const menuDef = $computed(() => [{
to: '/admin/approvals',
active: currentPage?.route.name === 'approvals',
}, {
icon: 'ph-seal-check ph-bold pg-lg',
icon: 'ph-seal-check ph-bold ph-lg',
text: i18n.ts.roles,
to: '/admin/roles',
active: currentPage?.route.name === 'roles',
}, {
icon: 'ph-smiley ph-bold pg-lg',
icon: 'ph-smiley ph-bold ph-lg',
text: i18n.ts.customEmojis,
to: '/admin/emojis',
active: currentPage?.route.name === 'emojis',
@ -166,7 +166,7 @@ const menuDef = $computed(() => [{
to: '/admin/abuses',
active: currentPage?.route.name === 'abuses',
}, {
icon: 'ph-list ph-bold pg-lg-search',
icon: 'ph-list ph-bold ph-lg-search',
text: i18n.ts.moderationLogs,
to: '/admin/modlog',
active: currentPage?.route.name === 'modlog',
@ -174,7 +174,7 @@ const menuDef = $computed(() => [{
}, {
title: i18n.ts.settings,
items: [{
icon: 'ph-gear ph-bold pg-lg',
icon: 'ph-gear ph-bold ph-lg',
text: i18n.ts.general,
to: '/admin/settings',
active: currentPage?.route.name === 'settings',
@ -204,7 +204,7 @@ const menuDef = $computed(() => [{
to: '/admin/security',
active: currentPage?.route.name === 'security',
}, {
icon: 'ph-planet ph-bold pg-lg',
icon: 'ph-planet ph-bold ph-lg',
text: i18n.ts.relays,
to: '/admin/relays',
active: currentPage?.route.name === 'relays',
@ -219,7 +219,7 @@ const menuDef = $computed(() => [{
to: '/admin/proxy-account',
active: currentPage?.route.name === 'proxy-account',
}, {
icon: 'ph-arrow-square-out ph-bold pg-lg',
icon: 'ph-arrow-square-out ph-bold ph-lg',
text: i18n.ts.externalServices,
to: '/admin/external-services',
active: currentPage?.route.name === 'external-services',
@ -232,7 +232,7 @@ const menuDef = $computed(() => [{
}, {
title: i18n.ts.info,
items: [{
icon: 'ph-database ph-bold pg-lg',
icon: 'ph-database ph-bold ph-lg',
text: i18n.ts.database,
to: '/admin/database',
active: currentPage?.route.name === 'database',
@ -314,7 +314,7 @@ const lookup = (ev) => {
},
}, {
text: i18n.ts.instance,
icon: 'ph-planet ph-bold pg-lg',
icon: 'ph-planet ph-bold ph-lg',
action: () => {
alert('TODO');
},

View file

@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<span>{{ i18n.ts.silencedInstances }}</span>
<template #caption>{{ i18n.ts.silencedInstancesDescription }}</template>
</MkTextarea>
<MkButton primary @click="save"><i class="ph-floppy-disk ph-bold pg-lg"></i> {{ i18n.ts.save }}</MkButton>
<MkButton primary @click="save"><i class="ph-floppy-disk ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
</FormSuspense>
</MkSpacer>
</MkStickyContainer>

View file

@ -62,6 +62,6 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.moderationLogs,
icon: 'ph-list ph-bold pg-lg-search',
icon: 'ph-list ph-bold ph-lg-search',
});
</script>

View file

@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkLoading v-if="fetching"/>
<div v-else :class="$style.root">
<div class="item _panel users">
<div class="icon"><i class="ph-users ph-bold pg-lg"></i></div>
<div class="icon"><i class="ph-users ph-bold ph-lg"></i></div>
<div class="body">
<div class="value">
<MkNumber :value="stats.originalUsersCount" style="margin-right: 0.5em;"/>
@ -29,7 +29,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</div>
<div class="item _panel instances">
<div class="icon"><i class="ph-planet ph-bold pg-lg"></i></div>
<div class="icon"><i class="ph-planet ph-bold ph-lg"></i></div>
<div class="body">
<div class="value">
<MkNumber :value="stats.instances" style="margin-right: 0.5em;"/>
@ -38,7 +38,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</div>
<div class="item _panel emojis">
<div class="icon"><i class="ph-smiley ph-bold pg-lg"></i></div>
<div class="icon"><i class="ph-smiley ph-bold ph-lg"></i></div>
<div class="body">
<div class="value">
<MkNumber :value="customEmojis.length" style="margin-right: 0.5em;"/>

View file

@ -177,7 +177,7 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.dashboard,
icon: 'ph-gauge ph-bold pg-lg',
icon: 'ph-gauge ph-bold ph-lg',
});
</script>

View file

@ -84,7 +84,7 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.relays,
icon: 'ph-planet ph-bold pg-lg',
icon: 'ph-planet ph-bold ph-lg',
});
</script>

View file

@ -87,10 +87,10 @@ const headerTabs = $computed(() => []);
definePageMetadata(computed(() => role ? {
title: i18n.ts._role.edit + ': ' + role.name,
icon: 'ph-seal-check ph-bold pg-lg',
icon: 'ph-seal-check ph-bold ph-lg',
} : {
title: i18n.ts._role.new,
icon: 'ph-seal-check ph-bold pg-lg',
icon: 'ph-seal-check ph-bold ph-lg',
}));
</script>

View file

@ -39,7 +39,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkSelect>
<MkSelect v-model="role.target" :readonly="readonly">
<template #label><i class="ph-users ph-bold pg-lg"></i> {{ i18n.ts._role.assignTarget }}</template>
<template #label><i class="ph-users ph-bold ph-lg"></i> {{ i18n.ts._role.assignTarget }}</template>
<template #caption><div v-html="i18n.ts._role.descriptionOfAssignTarget.replaceAll('\n', '<br>')"></div></template>
<option value="manual">{{ i18n.ts._role.manual }}</option>
<option value="conditional">{{ i18n.ts._role.conditional }}</option>
@ -588,7 +588,7 @@ let q = $ref('');
function getPriorityIcon(option) {
if (option.priority === 2) return 'ph-arrow-up ph-bold ph-lg';
if (option.priority === 1) return 'ph-arrow-up ph-bold ph-lg';
return 'ph-circle ph-bold pg-lg';
return 'ph-circle ph-bold ph-lg';
}
function matchQuery(keywords: string[]): boolean {

View file

@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<XEditor :modelValue="role" readonly/>
</MkFolder>
<MkFolder v-if="role.target === 'manual'" defaultOpen>
<template #icon><i class="ph-users ph-bold pg-lg"></i></template>
<template #icon><i class="ph-users ph-bold ph-lg"></i></template>
<template #label>{{ i18n.ts.users }}</template>
<template #suffix>{{ role.usersCount }}</template>
<div class="_gaps">
@ -173,7 +173,7 @@ const headerTabs = $computed(() => []);
definePageMetadata(computed(() => ({
title: i18n.ts.role + ': ' + role.name,
icon: 'ph-seal-check ph-bold pg-lg',
icon: 'ph-seal-check ph-bold ph-lg',
})));
</script>

View file

@ -264,7 +264,7 @@ const headerTabs = $computed(() => []);
definePageMetadata(computed(() => ({
title: i18n.ts.roles,
icon: 'ph-seal-check ph-bold pg-lg',
icon: 'ph-seal-check ph-bold ph-lg',
})));
</script>

View file

@ -59,7 +59,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkSwitch>
-->
<MkButton primary @click="save"><i class="ph-floppy-disk ph-bold pg-lg"></i> {{ i18n.ts.save }}</MkButton>
<MkButton primary @click="save"><i class="ph-floppy-disk ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
</div>
</MkFolder>
@ -97,7 +97,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #label>Summaly Proxy URL</template>
</MkInput>
<MkButton primary @click="save"><i class="ph-floppy-disk ph-bold pg-lg"></i> {{ i18n.ts.save }}</MkButton>
<MkButton primary @click="save"><i class="ph-floppy-disk ph-bold ph-lg"></i> {{ i18n.ts.save }}</MkButton>
</div>
</MkFolder>
</div>

View file

@ -228,7 +228,7 @@ const headerTabs = $computed(() => []);
definePageMetadata({
title: i18n.ts.general,
icon: 'ph-gear ph-bold pg-lg',
icon: 'ph-gear ph-bold ph-lg',
});
</script>

View file

@ -140,7 +140,7 @@ const headerTabs = $computed(() => []);
definePageMetadata(computed(() => ({
title: i18n.ts.users,
icon: 'ph-users ph-bold pg-lg',
icon: 'ph-users ph-bold ph-lg',
})));
</script>