Skip to content

Commit 9612195

Browse files
syuilosyuilo
committed
enhance(frontend): tweak control panel
1 parent 4be307f commit 9612195

File tree

4 files changed

+93
-50
lines changed

4 files changed

+93
-50
lines changed

‎idea/MkDisableSection.vue

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<!--
2+
SPDX-FileCopyrightText: syuilo and misskey-project
3+
SPDX-License-Identifier: AGPL-3.0-only
4+
-->
5+
6+
<template>
7+
<div :class="[$style.root]">
8+
<div :inert="disabled" :class="[{ [$style.disabled]: disabled }]">
9+
<slot></slot>
10+
</div>
11+
<div v-if="disabled" :class="[$style.cover]"></div>
12+
</div>
13+
</template>
14+
15+
<script lang="ts" setup>
16+
defineProps<{
17+
disabled?: boolean;
18+
}>();
19+
</script>
20+
21+
<style lang="scss" module>
22+
.root {
23+
position: relative;
24+
}
25+
26+
.disabled {
27+
opacity: 0.7;
28+
}
29+
30+
.cover {
31+
position: absolute;
32+
top: 0;
33+
left: 0;
34+
width: 100%;
35+
height: 100%;
36+
cursor: not-allowed;
37+
--color: color(from var(--error) srgb r g b / 0.25);
38+
background-size: auto auto;
39+
background-image: repeating-linear-gradient(135deg, transparent, transparent 10px, var(--color) 4px, var(--color) 14px);
40+
}
41+
</style>

‎idea/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
使われなくなったけど消すのは勿体ない(将来使えるかもしれない)コードを入れておくとこ

‎packages/frontend/src/pages/admin/performance.vue

+19-18
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-only
4545
<MkFormFooter :form="fttForm"/>
4646
</template>
4747

48-
<div class="_gaps_m">
48+
<div class="_gaps">
4949
<MkSwitch v-model="fttForm.state.enableFanoutTimeline">
5050
<template #label>{{ i18n.ts.enable }}<span v-if="fttForm.modifiedStates.enableFanoutTimeline" class="_modified">{{ i18n.ts.modified }}</span></template>
5151
<template #caption>
@@ -54,26 +54,28 @@ SPDX-License-Identifier: AGPL-3.0-only
5454
</template>
5555
</MkSwitch>
5656

57-
<MkSwitch v-model="fttForm.state.enableFanoutTimelineDbFallback">
58-
<template #label>{{ i18n.ts._serverSettings.fanoutTimelineDbFallback }}<span v-if="fttForm.modifiedStates.enableFanoutTimelineDbFallback" class="_modified">{{ i18n.ts.modified }}</span></template>
59-
<template #caption>{{ i18n.ts._serverSettings.fanoutTimelineDbFallbackDescription }}</template>
60-
</MkSwitch>
57+
<template v-if="fttForm.state.enableFanoutTimeline">
58+
<MkSwitch v-model="fttForm.state.enableFanoutTimelineDbFallback">
59+
<template #label>{{ i18n.ts._serverSettings.fanoutTimelineDbFallback }}<span v-if="fttForm.modifiedStates.enableFanoutTimelineDbFallback" class="_modified">{{ i18n.ts.modified }}</span></template>
60+
<template #caption>{{ i18n.ts._serverSettings.fanoutTimelineDbFallbackDescription }}</template>
61+
</MkSwitch>
6162

62-
<MkInput v-model="fttForm.state.perLocalUserUserTimelineCacheMax" type="number">
63-
<template #label>perLocalUserUserTimelineCacheMax<span v-if="fttForm.modifiedStates.perLocalUserUserTimelineCacheMax" class="_modified">{{ i18n.ts.modified }}</span></template>
64-
</MkInput>
63+
<MkInput v-model="fttForm.state.perLocalUserUserTimelineCacheMax" type="number">
64+
<template #label>perLocalUserUserTimelineCacheMax<span v-if="fttForm.modifiedStates.perLocalUserUserTimelineCacheMax" class="_modified">{{ i18n.ts.modified }}</span></template>
65+
</MkInput>
6566

66-
<MkInput v-model="fttForm.state.perRemoteUserUserTimelineCacheMax" type="number">
67-
<template #label>perRemoteUserUserTimelineCacheMax<span v-if="fttForm.modifiedStates.perRemoteUserUserTimelineCacheMax" class="_modified">{{ i18n.ts.modified }}</span></template>
68-
</MkInput>
67+
<MkInput v-model="fttForm.state.perRemoteUserUserTimelineCacheMax" type="number">
68+
<template #label>perRemoteUserUserTimelineCacheMax<span v-if="fttForm.modifiedStates.perRemoteUserUserTimelineCacheMax" class="_modified">{{ i18n.ts.modified }}</span></template>
69+
</MkInput>
6970

70-
<MkInput v-model="fttForm.state.perUserHomeTimelineCacheMax" type="number">
71-
<template #label>perUserHomeTimelineCacheMax<span v-if="fttForm.modifiedStates.perUserHomeTimelineCacheMax" class="_modified">{{ i18n.ts.modified }}</span></template>
72-
</MkInput>
71+
<MkInput v-model="fttForm.state.perUserHomeTimelineCacheMax" type="number">
72+
<template #label>perUserHomeTimelineCacheMax<span v-if="fttForm.modifiedStates.perUserHomeTimelineCacheMax" class="_modified">{{ i18n.ts.modified }}</span></template>
73+
</MkInput>
7374

74-
<MkInput v-model="fttForm.state.perUserListTimelineCacheMax" type="number">
75-
<template #label>perUserListTimelineCacheMax<span v-if="fttForm.modifiedStates.perUserListTimelineCacheMax" class="_modified">{{ i18n.ts.modified }}</span></template>
76-
</MkInput>
75+
<MkInput v-model="fttForm.state.perUserListTimelineCacheMax" type="number">
76+
<template #label>perUserListTimelineCacheMax<span v-if="fttForm.modifiedStates.perUserListTimelineCacheMax" class="_modified">{{ i18n.ts.modified }}</span></template>
77+
</MkInput>
78+
</template>
7779
</div>
7880
</MkFolder>
7981

@@ -110,7 +112,6 @@ import MkSwitch from '@/components/MkSwitch.vue';
110112
import MkFolder from '@/components/MkFolder.vue';
111113
import MkInput from '@/components/MkInput.vue';
112114
import MkLink from '@/components/MkLink.vue';
113-
import MkButton from '@/components/MkButton.vue';
114115
import { useForm } from '@/scripts/use-form.js';
115116
import MkFormFooter from '@/components/MkFormFooter.vue';
116117

‎packages/frontend/src/pages/admin/settings.vue

+32-32
Original file line numberDiff line numberDiff line change
@@ -169,42 +169,44 @@ SPDX-License-Identifier: AGPL-3.0-only
169169
<template #label>{{ i18n.ts._urlPreviewSetting.enable }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewEnabled" class="_modified">{{ i18n.ts.modified }}</span></template>
170170
</MkSwitch>
171171

172-
<MkSwitch v-model="urlPreviewForm.state.urlPreviewRequireContentLength">
173-
<template #label>{{ i18n.ts._urlPreviewSetting.requireContentLength }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewRequireContentLength" class="_modified">{{ i18n.ts.modified }}</span></template>
174-
<template #caption>{{ i18n.ts._urlPreviewSetting.requireContentLengthDescription }}</template>
175-
</MkSwitch>
176-
177-
<MkInput v-model="urlPreviewForm.state.urlPreviewMaximumContentLength" type="number">
178-
<template #label>{{ i18n.ts._urlPreviewSetting.maximumContentLength }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewMaximumContentLength" class="_modified">{{ i18n.ts.modified }}</span></template>
179-
<template #caption>{{ i18n.ts._urlPreviewSetting.maximumContentLengthDescription }}</template>
180-
</MkInput>
172+
<template v-if="urlPreviewForm.state.urlPreviewEnabled">
173+
<MkSwitch v-model="urlPreviewForm.state.urlPreviewRequireContentLength">
174+
<template #label>{{ i18n.ts._urlPreviewSetting.requireContentLength }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewRequireContentLength" class="_modified">{{ i18n.ts.modified }}</span></template>
175+
<template #caption>{{ i18n.ts._urlPreviewSetting.requireContentLengthDescription }}</template>
176+
</MkSwitch>
181177

182-
<MkInput v-model="urlPreviewForm.state.urlPreviewTimeout" type="number">
183-
<template #label>{{ i18n.ts._urlPreviewSetting.timeout }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewTimeout" class="_modified">{{ i18n.ts.modified }}</span></template>
184-
<template #caption>{{ i18n.ts._urlPreviewSetting.timeoutDescription }}</template>
185-
</MkInput>
178+
<MkInput v-model="urlPreviewForm.state.urlPreviewMaximumContentLength" type="number">
179+
<template #label>{{ i18n.ts._urlPreviewSetting.maximumContentLength }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewMaximumContentLength" class="_modified">{{ i18n.ts.modified }}</span></template>
180+
<template #caption>{{ i18n.ts._urlPreviewSetting.maximumContentLengthDescription }}</template>
181+
</MkInput>
186182

187-
<MkInput v-model="urlPreviewForm.state.urlPreviewUserAgent" type="text">
188-
<template #label>{{ i18n.ts._urlPreviewSetting.userAgent }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewUserAgent" class="_modified">{{ i18n.ts.modified }}</span></template>
189-
<template #caption>{{ i18n.ts._urlPreviewSetting.userAgentDescription }}</template>
190-
</MkInput>
183+
<MkInput v-model="urlPreviewForm.state.urlPreviewTimeout" type="number">
184+
<template #label>{{ i18n.ts._urlPreviewSetting.timeout }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewTimeout" class="_modified">{{ i18n.ts.modified }}</span></template>
185+
<template #caption>{{ i18n.ts._urlPreviewSetting.timeoutDescription }}</template>
186+
</MkInput>
191187

192-
<div>
193-
<MkInput v-model="urlPreviewForm.state.urlPreviewSummaryProxyUrl" type="text">
194-
<template #label>{{ i18n.ts._urlPreviewSetting.summaryProxy }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewSummaryProxyUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
195-
<template #caption>[{{ i18n.ts.notUsePleaseLeaveBlank }}] {{ i18n.ts._urlPreviewSetting.summaryProxyDescription }}</template>
188+
<MkInput v-model="urlPreviewForm.state.urlPreviewUserAgent" type="text">
189+
<template #label>{{ i18n.ts._urlPreviewSetting.userAgent }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewUserAgent" class="_modified">{{ i18n.ts.modified }}</span></template>
190+
<template #caption>{{ i18n.ts._urlPreviewSetting.userAgentDescription }}</template>
196191
</MkInput>
197192

198-
<div :class="$style.subCaption">
199-
{{ i18n.ts._urlPreviewSetting.summaryProxyDescription2 }}
200-
<ul style="padding-left: 20px; margin: 4px 0">
201-
<li>{{ i18n.ts._urlPreviewSetting.timeout }} / key:timeout</li>
202-
<li>{{ i18n.ts._urlPreviewSetting.maximumContentLength }} / key:contentLengthLimit</li>
203-
<li>{{ i18n.ts._urlPreviewSetting.requireContentLength }} / key:contentLengthRequired</li>
204-
<li>{{ i18n.ts._urlPreviewSetting.userAgent }} / key:userAgent</li>
205-
</ul>
193+
<div>
194+
<MkInput v-model="urlPreviewForm.state.urlPreviewSummaryProxyUrl" type="text">
195+
<template #label>{{ i18n.ts._urlPreviewSetting.summaryProxy }}<span v-if="urlPreviewForm.modifiedStates.urlPreviewSummaryProxyUrl" class="_modified">{{ i18n.ts.modified }}</span></template>
196+
<template #caption>[{{ i18n.ts.notUsePleaseLeaveBlank }}] {{ i18n.ts._urlPreviewSetting.summaryProxyDescription }}</template>
197+
</MkInput>
198+
199+
<div :class="$style.subCaption">
200+
{{ i18n.ts._urlPreviewSetting.summaryProxyDescription2 }}
201+
<ul style="padding-left: 20px; margin: 4px 0">
202+
<li>{{ i18n.ts._urlPreviewSetting.timeout }} / key:timeout</li>
203+
<li>{{ i18n.ts._urlPreviewSetting.maximumContentLength }} / key:contentLengthLimit</li>
204+
<li>{{ i18n.ts._urlPreviewSetting.requireContentLength }} / key:contentLengthRequired</li>
205+
<li>{{ i18n.ts._urlPreviewSetting.userAgent }} / key:userAgent</li>
206+
</ul>
207+
</div>
206208
</div>
207-
</div>
209+
</template>
208210
</div>
209211
</MkFolder>
210212

@@ -230,7 +232,6 @@ SPDX-License-Identifier: AGPL-3.0-only
230232

231233
<script lang="ts" setup>
232234
import { ref, computed } from 'vue';
233-
import * as Misskey from 'misskey-js';
234235
import XHeader from './_header_.vue';
235236
import MkSwitch from '@/components/MkSwitch.vue';
236237
import MkInput from '@/components/MkInput.vue';
@@ -244,7 +245,6 @@ import { i18n } from '@/i18n.js';
244245
import { definePageMetadata } from '@/scripts/page-metadata.js';
245246
import MkButton from '@/components/MkButton.vue';
246247
import MkFolder from '@/components/MkFolder.vue';
247-
import MkSelect from '@/components/MkSelect.vue';
248248
import MkKeyValue from '@/components/MkKeyValue.vue';
249249
import { useForm } from '@/scripts/use-form.js';
250250
import MkFormFooter from '@/components/MkFormFooter.vue';

0 commit comments

Comments
 (0)