From 736d8283c1716f22889b21b3817580e55001d828 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Sun, 22 Sep 2024 20:21:06 +0900 Subject: [PATCH] refactor --- packages/frontend/src/components/MkFolder.vue | 4 +--- packages/frontend/src/pages/admin/performance.vue | 4 ++-- packages/frontend/src/pages/admin/settings.vue | 14 +++++++------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/packages/frontend/src/components/MkFolder.vue b/packages/frontend/src/components/MkFolder.vue index 23eeb47115..fef174fc6f 100644 --- a/packages/frontend/src/components/MkFolder.vue +++ b/packages/frontend/src/components/MkFolder.vue @@ -41,7 +41,7 @@ SPDX-License-Identifier: AGPL-3.0-only <MkSpacer :marginMin="14" :marginMax="22"> <slot></slot> </MkSpacer> - <div v-if="withFooter" :class="$style.footer"> + <div v-if="$slots.footer" :class="$style.footer"> <slot name="footer"></slot> </div> </div> @@ -59,11 +59,9 @@ import { defaultStore } from '@/store.js'; const props = withDefaults(defineProps<{ defaultOpen?: boolean; maxHeight?: number | null; - withFooter?: boolean; }>(), { defaultOpen: false, maxHeight: null, - withFooter: false, }); const getBgColor = (el: HTMLElement) => { diff --git a/packages/frontend/src/pages/admin/performance.vue b/packages/frontend/src/pages/admin/performance.vue index 5f5b4b8610..00722e2fcc 100644 --- a/packages/frontend/src/pages/admin/performance.vue +++ b/packages/frontend/src/pages/admin/performance.vue @@ -37,7 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only </MkSwitch> </div> - <MkFolder :defaultOpen="true" :withFooter="true"> + <MkFolder :defaultOpen="true"> <template #icon><i class="ti ti-bolt"></i></template> <template #label>Misskey® Fan-out Timeline Technology™ (FTT)</template> <template v-if="enableFanoutTimeline" #suffix>Enabled</template> @@ -78,7 +78,7 @@ SPDX-License-Identifier: AGPL-3.0-only </div> </MkFolder> - <MkFolder :defaultOpen="true" :withFooter="true"> + <MkFolder :defaultOpen="true"> <template #icon><i class="ti ti-bolt"></i></template> <template #label>Misskey® Reactions Boost Technology™ (RBT)<span class="_beta">{{ i18n.ts.beta }}</span></template> <template v-if="enableReactionsBuffering" #suffix>Enabled</template> diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue index 6259088113..13ef494731 100644 --- a/packages/frontend/src/pages/admin/settings.vue +++ b/packages/frontend/src/pages/admin/settings.vue @@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only <MkSpacer :contentMax="700" :marginMin="16" :marginMax="32"> <FormSuspense :p="init"> <div class="_gaps_m"> - <MkFolder :defaultOpen="true" :withFooter="true"> + <MkFolder :defaultOpen="true"> <template #icon><i class="ti ti-info-circle"></i></template> <template #label>{{ i18n.ts.info }}</template> <template #footer> @@ -76,7 +76,7 @@ SPDX-License-Identifier: AGPL-3.0-only </div> </MkFolder> - <MkFolder :withFooter="true"> + <MkFolder> <template #icon><i class="ti ti-user-star"></i></template> <template #label>{{ i18n.ts.pinnedUsers }}</template> <template #footer> @@ -89,7 +89,7 @@ SPDX-License-Identifier: AGPL-3.0-only </MkTextarea> </MkFolder> - <MkFolder :withFooter="true"> + <MkFolder> <template #icon><i class="ti ti-cloud"></i></template> <template #label>{{ i18n.ts.files }}</template> <template #footer> @@ -111,7 +111,7 @@ SPDX-License-Identifier: AGPL-3.0-only </div> </MkFolder> - <MkFolder :withFooter="true"> + <MkFolder> <template #icon><i class="ti ti-world-cog"></i></template> <template #label>ServiceWorker</template> <template #footer> @@ -138,7 +138,7 @@ SPDX-License-Identifier: AGPL-3.0-only </div> </MkFolder> - <MkFolder :withFooter="true"> + <MkFolder> <template #icon><i class="ti ti-ad"></i></template> <template #label>{{ i18n.ts._ad.adsSettings }}</template> <template #footer> @@ -158,7 +158,7 @@ SPDX-License-Identifier: AGPL-3.0-only </div> </MkFolder> - <MkFolder :withFooter="true"> + <MkFolder> <template #icon><i class="ti ti-world-search"></i></template> <template #label>{{ i18n.ts._urlPreviewSetting.title }}</template> <template #footer> @@ -232,6 +232,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { ref, computed } from 'vue'; +import * as Misskey from 'misskey-js'; import XHeader from './_header_.vue'; import MkSwitch from '@/components/MkSwitch.vue'; import MkInput from '@/components/MkInput.vue'; @@ -247,7 +248,6 @@ import { definePageMetadata } from '@/scripts/page-metadata.js'; import MkButton from '@/components/MkButton.vue'; import MkFolder from '@/components/MkFolder.vue'; import MkSelect from '@/components/MkSelect.vue'; -import * as Misskey from 'misskey-js'; import MkKeyValue from '@/components/MkKeyValue.vue'; const proxyAccount = ref<Misskey.entities.UserDetailed | null>(null);