client: refine ui

This commit is contained in:
syuilo 2021-11-28 20:07:37 +09:00
parent 335e4bd213
commit e8005c8d3a
48 changed files with 1744 additions and 1149 deletions

View file

@ -14,7 +14,9 @@
</div> </div>
<header v-if="title"><Mfm :text="title"/></header> <header v-if="title"><Mfm :text="title"/></header>
<div v-if="text" class="body"><Mfm :text="text"/></div> <div v-if="text" class="body"><Mfm :text="text"/></div>
<MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder" @keydown="onInputKeydown"></MkInput> <MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder" @keydown="onInputKeydown">
<template v-if="input.type === 'password'" #prefix><i class="fas fa-lock"></i></template>
</MkInput>
<MkSelect v-if="select" v-model="selectedValue" autofocus> <MkSelect v-if="select" v-model="selectedValue" autofocus>
<template v-if="select.items"> <template v-if="select.items">
<option v-for="item in select.items" :value="item.value">{{ item.text }}</option> <option v-for="item in select.items" :value="item.value">{{ item.text }}</option>
@ -165,6 +167,10 @@ export default defineComponent({
> .icon { > .icon {
font-size: 32px; font-size: 32px;
&.info {
color: #55c4dd;
}
&.success { &.success {
color: var(--success); color: var(--success);
} }

View file

@ -1,5 +1,5 @@
<template> <template>
<MkPopup ref="popup" #default="{point}" :manual-showing="manualShowing" :src="src" :front="true" @click="$refs.popup.close()" @opening="opening" @close="$emit('close')" @closed="$emit('closed')"> <MkPopup ref="popup" v-slot="{ point, close }" :manual-showing="manualShowing" :src="src" :front="true" @click="close()" @opening="opening" @close="$emit('close')" @closed="$emit('closed')">
<MkEmojiPicker ref="picker" class="ryghynhb _popup _shadow" :class="{ pointer: point === 'top' }" :show-pinned="showPinned" :as-reaction-picker="asReactionPicker" @chosen="chosen"/> <MkEmojiPicker ref="picker" class="ryghynhb _popup _shadow" :class="{ pointer: point === 'top' }" :show-pinned="showPinned" :as-reaction-picker="asReactionPicker" @chosen="chosen"/>
</MkPopup> </MkPopup>
</template> </template>

View file

@ -0,0 +1,35 @@
<template>
<div v-sticky-container v-panel class="adfeebaf _formBlock">
<div class="label"><slot name="label"></slot></div>
<div class="main _formRoot">
<slot></slot>
</div>
</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
export default defineComponent({
});
</script>
<style lang="scss" scoped>
.adfeebaf {
padding: 24px 24px;
border-radius: var(--radius);
> .label {
font-weight: bold;
padding: 0 0 16px 0;
&:empty {
display: none;
}
}
> .main {
}
}
</style>

View file

@ -5,6 +5,7 @@
<div ref="prefixEl" class="prefix"><slot name="prefix"></slot></div> <div ref="prefixEl" class="prefix"><slot name="prefix"></slot></div>
<input ref="inputEl" <input ref="inputEl"
v-model="v" v-model="v"
v-panel
:type="type" :type="type"
:disabled="disabled" :disabled="disabled"
:required="required" :required="required"
@ -27,7 +28,7 @@
</div> </div>
<div class="caption"><slot name="caption"></slot></div> <div class="caption"><slot name="caption"></slot></div>
<MkButton v-if="manualSave && changed" primary @click="updated"><i class="fas fa-save"></i> {{ $ts.save }}</MkButton> <MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="fas fa-check"></i> {{ $ts.save }}</MkButton>
</div> </div>
</template> </template>
@ -114,9 +115,9 @@ export default defineComponent({
const changed = ref(false); const changed = ref(false);
const invalid = ref(false); const invalid = ref(false);
const filled = computed(() => v.value !== '' && v.value != null); const filled = computed(() => v.value !== '' && v.value != null);
const inputEl = ref(null); const inputEl = ref<HTMLElement>();
const prefixEl = ref(null); const prefixEl = ref<HTMLElement>();
const suffixEl = ref(null); const suffixEl = ref<HTMLElement>();
const focus = () => inputEl.value.focus(); const focus = () => inputEl.value.focus();
const onInput = (ev) => { const onInput = (ev) => {
@ -208,7 +209,7 @@ export default defineComponent({
.matxzzsk { .matxzzsk {
> .label { > .label {
font-size: 0.85em; font-size: 0.85em;
padding: 0 0 8px 12px; padding: 0 0 8px 0;
user-select: none; user-select: none;
&:empty { &:empty {
@ -217,8 +218,8 @@ export default defineComponent({
} }
> .caption { > .caption {
font-size: 0.8em; font-size: 0.85em;
padding: 8px 0 0 12px; padding: 8px 0 0 0;
color: var(--fgTransparentWeak); color: var(--fgTransparentWeak);
&:empty { &:empty {
@ -242,8 +243,7 @@ export default defineComponent({
font-weight: normal; font-weight: normal;
font-size: 1em; font-size: 1em;
color: var(--fg); color: var(--fg);
background: var(--panel); border: solid 0.5px var(--panel);
border: solid 0.5px var(--inputBorder);
border-radius: 6px; border-radius: 6px;
outline: none; outline: none;
box-shadow: none; box-shadow: none;
@ -311,5 +311,9 @@ export default defineComponent({
} }
} }
} }
> .save {
margin: 8px 0 0 0;
}
} }
</style> </style>

View file

@ -0,0 +1,112 @@
<template>
<div class="ffcbddfc" :class="{ inline }">
<a v-if="external" class="main _button" :href="to" target="_blank">
<span class="icon"><slot name="icon"></slot></span>
<span class="text"><slot></slot></span>
<span class="right">
<span class="text"><slot name="suffix"></slot></span>
<i class="fas fa-external-link-alt icon"></i>
</span>
</a>
<MkA v-else class="main _button" :class="{ active }" :to="to" :behavior="behavior">
<span class="icon"><slot name="icon"></slot></span>
<span class="text"><slot></slot></span>
<span class="right">
<span class="text"><slot name="suffix"></slot></span>
<i class="fas fa-chevron-right icon"></i>
</span>
</MkA>
</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
export default defineComponent({
props: {
to: {
type: String,
required: true
},
active: {
type: Boolean,
required: false
},
external: {
type: Boolean,
required: false
},
behavior: {
type: String,
required: false,
},
inline: {
type: Boolean,
required: false
},
},
});
</script>
<style lang="scss" scoped>
.ffcbddfc {
display: block;
&.inline {
display: inline-block;
}
> .main {
display: flex;
align-items: center;
width: 100%;
box-sizing: border-box;
padding: 12px 14px 12px 14px;
background: var(--buttonBg);
border-radius: 6px;
font-size: 0.9em;
&:hover {
text-decoration: none;
background: var(--buttonHoverBg);
}
&.active {
color: var(--accent);
background: var(--buttonHoverBg);
}
> .icon {
margin-right: 0.75em;
flex-shrink: 0;
text-align: center;
opacity: 0.8;
&:empty {
display: none;
& + .text {
padding-left: 4px;
}
}
}
> .text {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
padding-right: 12px;
}
> .right {
margin-left: auto;
opacity: 0.7;
white-space: nowrap;
> .text:not(:empty) {
margin-right: 0.75em;
}
}
}
}
</style>

View file

@ -0,0 +1,44 @@
<template>
<FormSlot>
<template #label><slot name="label"></slot></template>
<div class="abcaccfa">
<slot :items="items"></slot>
<div v-if="empty" key="_empty_" class="empty">
<slot name="empty"></slot>
</div>
<MkButton v-show="more" class="button" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }" @click="fetchMore">
<template v-if="!moreFetching">{{ $ts.loadMore }}</template>
<template v-if="moreFetching"><MkLoading inline/></template>
</MkButton>
</div>
</FormSlot>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import MkButton from '@/components/ui/button.vue';
import FormSlot from './slot.vue';
import paging from '@/scripts/paging';
export default defineComponent({
components: {
MkButton,
FormSlot,
},
mixins: [
paging({}),
],
props: {
pagination: {
required: true
},
},
});
</script>
<style lang="scss" scoped>
.abcaccfa {
}
</style>

View file

@ -1,5 +1,6 @@
<template> <template>
<div <div
v-panel
class="novjtctn" class="novjtctn"
:class="{ disabled, checked }" :class="{ disabled, checked }"
:aria-checked="checked" :aria-checked="checked"
@ -50,9 +51,10 @@ export default defineComponent({
.novjtctn { .novjtctn {
position: relative; position: relative;
display: inline-block; display: inline-block;
margin: 8px 20px 0 0;
text-align: left; text-align: left;
cursor: pointer; cursor: pointer;
padding: 11px 14px;
border-radius: 6px;
transition: all 0.3s; transition: all 0.3s;
> * { > * {
@ -68,6 +70,14 @@ export default defineComponent({
} }
&.checked { &.checked {
background: var(--accentedBg) !important;
border-color: var(--accent);
color: var(--accent);
&, * {
cursor: default !important;
}
> .button { > .button {
border-color: var(--accent); border-color: var(--accent);
@ -79,6 +89,11 @@ export default defineComponent({
} }
} }
&:hover {
border-color: var(--inputBorderHover);
color: var(--accent);
}
> input { > input {
position: absolute; position: absolute;
width: 0; width: 0;
@ -89,8 +104,8 @@ export default defineComponent({
> .button { > .button {
position: absolute; position: absolute;
width: 20px; width: 14px;
height: 20px; height: 14px;
background: none; background: none;
border: solid 2px var(--inputBorder); border: solid 2px var(--inputBorder);
border-radius: 100%; border-radius: 100%;
@ -114,7 +129,6 @@ export default defineComponent({
> .label { > .label {
margin-left: 28px; margin-left: 28px;
display: block; display: block;
font-size: 16px;
line-height: 20px; line-height: 20px;
cursor: pointer; cursor: pointer;
} }

View file

@ -23,6 +23,8 @@ export default defineComponent({
}, },
render() { render() {
let options = this.$slots.default(); let options = this.$slots.default();
const label = this.$slots.label && this.$slots.label();
const caption = this.$slots.caption && this.$slots.caption();
// Fragment // Fragment
if (options.length === 1 && options[0].props == null) options = options[0].children; if (options.length === 1 && options[0].props == null) options = options[0].children;
@ -30,12 +32,21 @@ export default defineComponent({
return h('div', { return h('div', {
class: 'novjtcto' class: 'novjtcto'
}, [ }, [
...options.map(option => h(MkRadio, { ...(label ? [h('div', {
key: option.key, class: 'label'
value: option.props.value, }, [label])] : []),
modelValue: this.value, h('div', {
'onUpdate:modelValue': value => this.value = value, class: 'body'
}, option.children)) }, options.map(option => h(MkRadio, {
key: option.key,
value: option.props.value,
modelValue: this.value,
'onUpdate:modelValue': value => this.value = value,
}, option.children)),
),
...(caption ? [h('div', {
class: 'caption'
}, [caption])] : []),
]); ]);
} }
}); });
@ -43,12 +54,30 @@ export default defineComponent({
<style lang="scss"> <style lang="scss">
.novjtcto { .novjtcto {
&:first-child { > .label {
margin-top: 0; font-size: 0.85em;
padding: 0 0 8px 0;
user-select: none;
&:empty {
display: none;
}
} }
&:last-child { > .body {
margin-bottom: 0; display: grid;
grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
grid-gap: 12px;
}
> .caption {
font-size: 0.85em;
padding: 8px 0 0 0;
color: var(--fgTransparentWeak);
&:empty {
display: none;
}
} }
} }
</style> </style>

View file

@ -1,29 +1,27 @@
<template> <template>
<div class="timctyfi" :class="{ focused, disabled }"> <div class="timctyfi" :class="{ disabled }">
<div class="icon"><slot name="icon"></slot></div> <div class="label"><slot name="label"></slot></div>
<span class="label"><slot name="label"></slot></span> <div v-panel class="body">
<input <div ref="containerEl" class="container">
ref="input" <div class="track">
v-model="v" <div class="highlight" :style="{ width: (steppedValue * 100) + '%' }"></div>
type="range" </div>
:disabled="disabled" <div v-if="steps" class="ticks">
:min="min" <div v-for="i in (steps + 1)" class="tick" :style="{ left: (((i - 1) / steps) * 100) + '%' }"></div>
:max="max" </div>
:step="step" <div ref="thumbEl" v-tooltip="textConverter(finalValue)" class="thumb" :style="{ left: thumbPosition + 'px' }" @mousedown="onMousedown" @touchstart="onMousedown"></div>
:autofocus="autofocus" </div>
@focus="focused = true" </div>
@blur="focused = false"
@input="$emit('update:value', $event.target.value)"
/>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { computed, defineComponent, ref, watch } from 'vue';
import * as os from '@/os';
export default defineComponent({ export default defineComponent({
props: { props: {
value: { modelValue: {
type: Number, type: Number,
required: false, required: false,
default: 0 default: 0
@ -51,88 +49,198 @@ export default defineComponent({
autofocus: { autofocus: {
type: Boolean, type: Boolean,
required: false required: false
} },
textConverter: {
type: Function,
required: false,
default: (v) => v.toString(),
},
}, },
data() {
setup(props, context) {
const rawValue = ref((props.modelValue - props.min) / (props.max - props.min));
const steppedValue = computed(() => {
if (props.step) {
const step = props.step / (props.max - props.min);
return (step * Math.round(rawValue.value / step));
} else {
return rawValue.value;
}
});
const finalValue = computed(() => {
return (steppedValue.value * (props.max - props.min)) + props.min;
});
watch(finalValue, () => {
context.emit('update:modelValue', finalValue.value);
});
const thumbWidth = computed(() => {
if (thumbEl.value == null) return 0;
return thumbEl.value!.offsetWidth;
});
const thumbPosition = computed(() => {
if (containerEl.value == null) return 0;
return (containerEl.value.offsetWidth - thumbWidth.value) * steppedValue.value;
});
const steps = computed(() => {
if (props.step) {
return (props.max - props.min) / props.step;
} else {
return 0;
}
});
const containerEl = ref<HTMLElement>();
const thumbEl = ref<HTMLElement>();
const onMousedown = (ev: MouseEvent | TouchEvent) => {
ev.preventDefault();
const tooltipShowing = ref(true);
os.popup(import('@/components/ui/tooltip.vue'), {
showing: tooltipShowing,
text: computed(() => {
return props.textConverter(finalValue.value);
}),
source: thumbEl,
}, {}, 'closed');
const style = document.createElement('style');
style.appendChild(document.createTextNode('* { cursor: grabbing !important; } body * { pointer-events: none !important; }'));
document.head.appendChild(style);
const onDrag = (ev: MouseEvent | TouchEvent) => {
ev.preventDefault();
const containerRect = containerEl.value!.getBoundingClientRect();
const pointerX = ev.touches && ev.touches.length > 0 ? ev.touches[0].clientX : ev.clientX;
const pointerPositionOnContainer = pointerX - (containerRect.left + (thumbWidth.value / 2));
rawValue.value = Math.min(1, Math.max(0, pointerPositionOnContainer / (containerEl.value!.offsetWidth - thumbWidth.value)));
};
const onMouseup = () => {
document.head.removeChild(style);
tooltipShowing.value = false;
window.removeEventListener('mousemove', onDrag);
window.removeEventListener('touchmove', onDrag);
window.removeEventListener('mouseup', onMouseup);
window.removeEventListener('touchend', onMouseup);
};
window.addEventListener('mousemove', onDrag);
window.addEventListener('touchmove', onDrag);
window.addEventListener('mouseup', onMouseup, { once: true });
window.addEventListener('touchend', onMouseup, { once: true });
};
return { return {
v: this.value, rawValue,
focused: false finalValue,
steppedValue,
onMousedown,
containerEl,
thumbEl,
thumbPosition,
steps,
}; };
}, },
watch: {
value(v) {
this.v = parseFloat(v);
}
},
mounted() {
if (this.autofocus) {
this.$nextTick(() => {
this.$refs.input.focus();
});
}
}
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@use "sass:math";
.timctyfi { .timctyfi {
position: relative; position: relative;
margin: 8px;
> .icon { > .label {
display: inline-block; font-size: 0.85em;
width: 24px; padding: 0 0 8px 0;
text-align: center; user-select: none;
&:empty {
display: none;
}
} }
> .title { > .caption {
pointer-events: none; font-size: 0.85em;
font-size: 16px; padding: 8px 0 0 0;
color: var(--inputLabel); color: var(--fgTransparentWeak);
overflow: hidden;
&:empty {
display: none;
}
} }
> input { $thumbHeight: 20px;
-webkit-appearance: none; $thumbWidth: 20px;
-moz-appearance: none;
appearance: none;
background: var(--X10);
height: 7px;
margin: 0 8px;
outline: 0;
border: 0;
border-radius: 7px;
&.disabled { > .body {
opacity: 0.6; padding: 12px;
cursor: not-allowed; border-radius: 6px;
}
&::-webkit-slider-thumb { > .container {
-webkit-appearance: none; position: relative;
appearance: none; height: $thumbHeight;
cursor: pointer;
width: 20px;
height: 20px;
display: block;
border-radius: 50%;
border: none;
background: var(--accent);
box-shadow: 0 0 6px rgba(0, 0, 0, 0.3);
box-sizing: content-box;
}
&::-moz-range-thumb { > .track {
-moz-appearance: none; position: absolute;
appearance: none; top: 0;
cursor: pointer; bottom: 0;
width: 20px; left: 0;
height: 20px; right: 0;
display: block; margin: auto;
border-radius: 50%; width: calc(100% - #{$thumbWidth});
border: none; height: 3px;
background: var(--accent); background: rgba(0, 0, 0, 0.1);
box-shadow: 0 0 6px rgba(0, 0, 0, 0.3); border-radius: 999px;
overflow: clip;
> .highlight {
position: absolute;
top: 0;
left: 0;
height: 100%;
background: var(--accent);
opacity: 0.5;
transition: width 0.2s cubic-bezier(0,0,0,1);
}
}
> .ticks {
$tickWidth: 3px;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
margin: auto;
width: calc(100% - #{$thumbWidth});
> .tick {
position: absolute;
bottom: 0;
width: $tickWidth;
height: 3px;
margin-left: - math.div($tickWidth, 2);
background: var(--divider);
border-radius: 999px;
}
}
> .thumb {
position: absolute;
width: $thumbWidth;
height: $thumbHeight;
cursor: grab;
background: var(--accent);
border-radius: 999px;
transition: left 0.2s cubic-bezier(0,0,0,1);
&:hover {
background: var(--accentLighten);
}
}
} }
} }
} }

View file

@ -1,7 +1,7 @@
<template> <template>
<div v-size="{ max: [500] }" v-sticky-container class="vrtktovh"> <div v-size="{ max: [500] }" v-sticky-container class="vrtktovh _formBlock">
<div class="label"><slot name="label"></slot></div> <div class="label"><slot name="label"></slot></div>
<div class="main"> <div class="main _formRoot">
<slot></slot> <slot></slot>
</div> </div>
</div> </div>
@ -17,15 +17,33 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
.vrtktovh { .vrtktovh {
margin: 0;
border-top: solid 0.5px var(--divider); border-top: solid 0.5px var(--divider);
border-bottom: solid 0.5px var(--divider);
padding: 24px 0;
& + .vrtktovh {
border-top: none;
}
&:first-child {
border-top: none;
}
&:last-child {
border-bottom: none;
}
> .label { > .label {
font-weight: bold; font-weight: bold;
padding: 24px 0 16px 0; padding: 0 0 16px 0;
&:empty {
display: none;
}
} }
> .main { > .main {
margin-bottom: 32px;
} }
} }
</style> </style>

View file

@ -3,7 +3,7 @@
<div class="label" @click="focus"><slot name="label"></slot></div> <div class="label" @click="focus"><slot name="label"></slot></div>
<div ref="container" class="input" :class="{ inline, disabled, focused }" @click.prevent="onClick"> <div ref="container" class="input" :class="{ inline, disabled, focused }" @click.prevent="onClick">
<div ref="prefixEl" class="prefix"><slot name="prefix"></slot></div> <div ref="prefixEl" class="prefix"><slot name="prefix"></slot></div>
<select ref="inputEl" v-model="v" <select ref="inputEl" v-model="v" v-panel
class="select" class="select"
:disabled="disabled" :disabled="disabled"
:required="required" :required="required"
@ -201,7 +201,7 @@ export default defineComponent({
.vblkjoeq { .vblkjoeq {
> .label { > .label {
font-size: 0.85em; font-size: 0.85em;
padding: 0 0 8px 12px; padding: 0 0 8px 0;
user-select: none; user-select: none;
&:empty { &:empty {
@ -210,8 +210,8 @@ export default defineComponent({
} }
> .caption { > .caption {
font-size: 0.8em; font-size: 0.85em;
padding: 8px 0 0 12px; padding: 8px 0 0 0;
color: var(--fgTransparentWeak); color: var(--fgTransparentWeak);
&:empty { &:empty {
@ -242,8 +242,7 @@ export default defineComponent({
font-weight: normal; font-weight: normal;
font-size: 1em; font-size: 1em;
color: var(--fg); color: var(--fg);
background: var(--panel); border: solid 1px var(--panel);
border: solid 1px var(--inputBorder);
border-radius: 6px; border-radius: 6px;
outline: none; outline: none;
box-shadow: none; box-shadow: none;

View file

@ -18,11 +18,9 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
.adhpbeou { .adhpbeou {
margin: 1.5em 0;
> .label { > .label {
font-size: 0.85em; font-size: 0.85em;
padding: 0 0 8px 12px; padding: 0 0 8px 0;
user-select: none; user-select: none;
&:empty { &:empty {
@ -31,20 +29,13 @@ export default defineComponent({
} }
> .caption { > .caption {
font-size: 0.8em; font-size: 0.85em;
padding: 8px 0 0 12px; padding: 8px 0 0 0;
color: var(--fgTransparentWeak); color: var(--fgTransparentWeak);
&:empty { &:empty {
display: none; display: none;
} }
} }
> .content {
position: relative;
background: var(--panel);
border: solid 0.5px var(--inputBorder);
border-radius: 6px;
}
} }
</style> </style>

View file

@ -0,0 +1,98 @@
<template>
<transition name="fade" mode="out-in">
<div v-if="pending">
<MkLoading/>
</div>
<div v-else-if="resolved">
<slot :result="result"></slot>
</div>
<div v-else>
<div class="wszdbhzo">
<div><i class="fas fa-exclamation-triangle"></i> {{ $ts.somethingHappened }}</div>
<MkButton inline class="retry" @click="retry"><i class="fas fa-redo-alt"></i> {{ $ts.retry }}</MkButton>
</div>
</div>
</transition>
</template>
<script lang="ts">
import { defineComponent, PropType, ref, watch } from 'vue';
import MkButton from '@/components/ui/button.vue';
export default defineComponent({
components: {
MkButton
},
props: {
p: {
type: Function as PropType<() => Promise<any>>,
required: true,
}
},
setup(props, context) {
const pending = ref(true);
const resolved = ref(false);
const rejected = ref(false);
const result = ref(null);
const process = () => {
if (props.p == null) {
return;
}
const promise = props.p();
pending.value = true;
resolved.value = false;
rejected.value = false;
promise.then((_result) => {
pending.value = false;
resolved.value = true;
result.value = _result;
});
promise.catch(() => {
pending.value = false;
rejected.value = true;
});
};
watch(() => props.p, () => {
process();
}, {
immediate: true
});
const retry = () => {
process();
};
return {
pending,
resolved,
rejected,
result,
retry,
};
}
});
</script>
<style lang="scss" scoped>
.fade-enter-active,
.fade-leave-active {
transition: opacity 0.125s ease;
}
.fade-enter-from,
.fade-leave-to {
opacity: 0;
}
.wszdbhzo {
padding: 16px;
text-align: center;
> .retry {
margin-top: 16px;
}
}
</style>

View file

@ -18,7 +18,7 @@
</span> </span>
<span class="label"> <span class="label">
<span><slot></slot></span> <span><slot></slot></span>
<p><slot name="caption"></slot></p> <p class="caption"><slot name="caption"></slot></p>
</span> </span>
</div> </div>
</template> </template>
@ -118,10 +118,14 @@ export default defineComponent({
transition: inherit; transition: inherit;
} }
> p { > .caption {
margin: 0; margin: 8px 0 0 0;
color: var(--fgTransparentWeak); color: var(--fgTransparentWeak);
font-size: 90%; font-size: 0.85em;
&:empty {
display: none;
}
} }
} }

View file

@ -4,6 +4,7 @@
<div class="input" :class="{ disabled, focused, tall, pre }"> <div class="input" :class="{ disabled, focused, tall, pre }">
<textarea ref="inputEl" <textarea ref="inputEl"
v-model="v" v-model="v"
v-panel
:class="{ code, _monospace: code }" :class="{ code, _monospace: code }"
:disabled="disabled" :disabled="disabled"
:required="required" :required="required"
@ -20,7 +21,7 @@
</div> </div>
<div class="caption"><slot name="caption"></slot></div> <div class="caption"><slot name="caption"></slot></div>
<MkButton v-if="manualSave && changed" primary @click="updated"><i class="fas fa-save"></i> {{ $ts.save }}</MkButton> <MkButton v-if="manualSave && changed" primary class="save" @click="updated"><i class="fas fa-save"></i> {{ $ts.save }}</MkButton>
</div> </div>
</template> </template>
@ -174,7 +175,7 @@ export default defineComponent({
.adhpbeos { .adhpbeos {
> .label { > .label {
font-size: 0.85em; font-size: 0.85em;
padding: 0 0 8px 12px; padding: 0 0 8px 0;
user-select: none; user-select: none;
&:empty { &:empty {
@ -183,8 +184,8 @@ export default defineComponent({
} }
> .caption { > .caption {
font-size: 0.8em; font-size: 0.85em;
padding: 8px 0 0 12px; padding: 8px 0 0 0;
color: var(--fgTransparentWeak); color: var(--fgTransparentWeak);
&:empty { &:empty {
@ -209,8 +210,7 @@ export default defineComponent({
font-weight: normal; font-weight: normal;
font-size: 1em; font-size: 1em;
color: var(--fg); color: var(--fg);
background: var(--panel); border: solid 0.5px var(--panel);
border: solid 0.5px var(--inputBorder);
border-radius: 6px; border-radius: 6px;
outline: none; outline: none;
box-shadow: none; box-shadow: none;
@ -248,5 +248,9 @@ export default defineComponent({
} }
} }
} }
> .save {
margin: 8px 0 0 0;
}
} }
</style> </style>

View file

@ -15,19 +15,29 @@ export default defineComponent({
type: Number, type: Number,
required: false, required: false,
default: null, default: null,
} },
marginMin: {
type: Number,
required: false,
default: 12,
},
marginMax: {
type: Number,
required: false,
default: 32,
},
}, },
setup(props, context) { setup(props, context) {
let ro: ResizeObserver; let ro: ResizeObserver;
const root = ref<HTMLElement>(null); const root = ref<HTMLElement>();
const content = ref<HTMLElement>(null); const content = ref<HTMLElement>();
const margin = ref(0); const margin = ref(0);
const adjust = (rect: { width: number; height: number; }) => { const adjust = (rect: { width: number; height: number; }) => {
if (rect.width > (props.contentMax || 500)) { if (rect.width > (props.contentMax || 500)) {
margin.value = 32; margin.value = props.marginMax;
} else { } else {
margin.value = 12; margin.value = props.marginMin;
} }
}; };
@ -40,14 +50,14 @@ export default defineComponent({
}); });
*/ */
adjust({ adjust({
width: root.value.offsetWidth, width: root.value!.offsetWidth,
height: root.value.offsetHeight, height: root.value!.offsetHeight,
}); });
}); });
ro.observe(root.value); ro.observe(root.value!);
if (props.contentMax) { if (props.contentMax) {
content.value.style.maxWidth = `${props.contentMax}px`; content.value!.style.maxWidth = `${props.contentMax}px`;
} }
}); });

View file

@ -0,0 +1,48 @@
<template>
<div class="alqyeyti">
<div class="key">
<slot name="key"></slot>
</div>
<div class="value">
<slot name="value"></slot>
<button v-if="copy" v-tooltip="$ts.copy" class="_textButton" style="margin-left: 0.5em;" @click="copy_"><i class="far fa-copy"></i></button>
</div>
</div>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import copyToClipboard from '@/scripts/copy-to-clipboard';
import * as os from '@/os';
export default defineComponent({
props: {
copy: {
type: String,
required: false,
default: null,
},
},
setup(props) {
const copy_ = () => {
copyToClipboard(props.copy);
os.success();
};
return {
copy_
};
},
});
</script>
<style lang="scss" scoped>
.alqyeyti {
> .key {
font-size: 0.85em;
padding: 0 0 0.25em 0;
opacity: 0.75;
}
}
</style>

View file

@ -858,6 +858,7 @@ export default defineComponent({
.tkcbzcuz { .tkcbzcuz {
position: relative; position: relative;
transition: box-shadow 0.1s ease; transition: box-shadow 0.1s ease;
font-size: 1.05em;
overflow: clip; overflow: clip;
contain: content; contain: content;

View file

@ -142,12 +142,12 @@ export default defineComponent({
padding: 8px 14px; padding: 8px 14px;
text-align: center; text-align: center;
font-weight: normal; font-weight: normal;
font-size: 0.8em; font-size: 0.9em;
line-height: 22px; line-height: 22px;
box-shadow: none; box-shadow: none;
text-decoration: none; text-decoration: none;
background: var(--buttonBg); background: var(--buttonBg);
border-radius: 4px; border-radius: 5px;
overflow: clip; overflow: clip;
box-sizing: border-box; box-sizing: border-box;
transition: background 0.1s ease; transition: background 0.1s ease;

View file

@ -2,7 +2,7 @@
<div ref="items" v-hotkey="keymap" <div ref="items" v-hotkey="keymap"
class="rrevdjwt" class="rrevdjwt"
:class="{ center: align === 'center' }" :class="{ center: align === 'center' }"
:style="{ width: width ? width + 'px' : null }" :style="{ width: width ? width + 'px' : null, maxHeight: maxHeight ? maxHeight + 'px' : null }"
@contextmenu.self="e => e.preventDefault()" @contextmenu.self="e => e.preventDefault()"
> >
<template v-for="(item, i) in items2"> <template v-for="(item, i) in items2">
@ -64,6 +64,10 @@ export default defineComponent({
type: Number, type: Number,
required: false required: false
}, },
maxHeight: {
type: Number,
required: false
},
}, },
emits: ['close'], emits: ['close'],
data() { data() {
@ -146,8 +150,8 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
.rrevdjwt { .rrevdjwt {
padding: 8px 0; padding: 8px 0;
box-sizing: border-box;
min-width: 200px; min-width: 200px;
max-height: 90vh;
overflow: auto; overflow: auto;
&.center { &.center {

View file

@ -1,6 +1,6 @@
<template> <template>
<MkPopup ref="popup" :src="src" @closed="$emit('closed')"> <MkPopup ref="popup" v-slot="{ maxHeight, close }" :src="src" @closed="$emit('closed')">
<MkMenu :items="items" :align="align" :width="width" class="_popup _shadow" @close="$refs.popup.close()"/> <MkMenu :items="items" :align="align" :width="width" :max-height="maxHeight" class="_popup _shadow" @close="close()"/>
</MkPopup> </MkPopup>
</template> </template>

View file

@ -1,15 +1,15 @@
<template> <template>
<transition :name="$store.state.animation ? 'popup-menu' : ''" appear @after-leave="onClosed" @enter="$emit('opening')" @after-enter="childRendered"> <transition :name="$store.state.animation ? 'popup-menu' : ''" appear @after-leave="$emit('closed')" @enter="$emit('opening')">
<div v-show="manualShowing != null ? manualShowing : showing" ref="content" class="ccczpooj" :class="{ front, fixed, top: position === 'top' }" :style="{ pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }"> <div v-show="manualShowing != null ? manualShowing : showing" ref="content" class="ccczpooj" :class="{ front, fixed, top: position === 'top' }" :style="{ pointerEvents: (manualShowing != null ? manualShowing : showing) ? 'auto' : 'none', '--transformOrigin': transformOrigin }">
<slot></slot> <slot :max-height="maxHeight" :close="close"></slot>
</div> </div>
</transition> </transition>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent, PropType } from 'vue'; import { defineComponent, nextTick, onMounted, onUnmounted, PropType, ref, watch } from 'vue';
function getFixedContainer(el: Element | null): Element | null { function getFixedContainer(el: Element | null | undefined): Element | null {
if (el == null || el.tagName === 'BODY') return null; if (el == null || el.tagName === 'BODY') return null;
const position = window.getComputedStyle(el).getPropertyValue('position'); const position = window.getComputedStyle(el).getPropertyValue('position');
if (position === 'fixed') { if (position === 'fixed') {
@ -41,55 +41,40 @@ export default defineComponent({
type: Boolean, type: Boolean,
required: false, required: false,
default: false, default: false,
} },
noOverlap: {
type: Boolean,
required: false,
default: true,
},
}, },
emits: ['opening', 'click', 'esc', 'close', 'closed'], emits: ['opening', 'click', 'esc', 'close', 'closed'],
data() { setup(props, context) {
return { const maxHeight = ref<number>();
showing: true, const fixed = ref(false);
fixed: false, const transformOrigin = ref('center');
transformOrigin: 'center', const showing = ref(true);
contentClicking: false, const content = ref<HTMLElement>();
const close = () => {
// eslint-disable-next-line vue/no-mutating-props
if (props.src) props.src.style.pointerEvents = 'auto';
showing.value = false;
context.emit('close');
}; };
},
mounted() { const MARGIN = 16;
this.$watch('src', () => {
if (this.src) {
// eslint-disable-next-line vue/no-mutating-props
this.src.style.pointerEvents = 'none';
}
this.fixed = getFixedContainer(this.src) != null;
this.$nextTick(() => {
this.align();
});
}, { immediate: true });
this.$nextTick(() => { const align = () => {
const popover = this.$refs.content as any; if (props.src == null) return;
new ResizeObserver((entries, observer) => {
this.align();
}).observe(popover);
});
document.addEventListener('mousedown', this.onDocumentClick, { passive: true }); const popover = content.value!;
},
beforeUnmount() {
document.removeEventListener('mousedown', this.onDocumentClick);
},
methods: {
align() {
if (this.src == null) return;
const popover = this.$refs.content as any;
if (popover == null) return; if (popover == null) return;
const rect = this.src.getBoundingClientRect(); const rect = props.src.getBoundingClientRect();
const width = popover.offsetWidth; const width = popover.offsetWidth;
const height = popover.offsetHeight; const height = popover.offsetHeight;
@ -97,81 +82,84 @@ export default defineComponent({
let left; let left;
let top; let top;
if (this.srcCenter) { if (props.srcCenter) {
const x = rect.left + (this.fixed ? 0 : window.pageXOffset) + (this.src.offsetWidth / 2); const x = rect.left + (fixed.value ? 0 : window.pageXOffset) + (props.src.offsetWidth / 2);
const y = rect.top + (this.fixed ? 0 : window.pageYOffset) + (this.src.offsetHeight / 2); const y = rect.top + (fixed.value ? 0 : window.pageYOffset) + (props.src.offsetHeight / 2);
left = (x - (width / 2)); left = (x - (width / 2));
top = (y - (height / 2)); top = (y - (height / 2));
} else { } else {
const x = rect.left + (this.fixed ? 0 : window.pageXOffset) + (this.src.offsetWidth / 2); const x = rect.left + (fixed.value ? 0 : window.pageXOffset) + (props.src.offsetWidth / 2);
const y = rect.top + (this.fixed ? 0 : window.pageYOffset) + this.src.offsetHeight; const y = rect.top + (fixed.value ? 0 : window.pageYOffset) + props.src.offsetHeight;
left = (x - (width / 2)); left = (x - (width / 2));
top = y; top = y;
} }
if (this.fixed) { if (fixed.value) {
//
if (left + width > window.innerWidth) { if (left + width > window.innerWidth) {
left = window.innerWidth - width; left = window.innerWidth - width;
} }
if (top + height > window.innerHeight) { //
top = window.innerHeight - height; if (top + height > (window.innerHeight - MARGIN)) {
if (props.noOverlap) {
const underSpace = (window.innerHeight - MARGIN) - top;
const upperSpace = (rect.top - MARGIN);
if (underSpace >= (upperSpace / 3)) {
maxHeight.value = underSpace;
} else {
maxHeight.value = upperSpace;
top = (upperSpace + MARGIN) - height;
}
} else {
top = (window.innerHeight - MARGIN) - height;
}
} }
} else { } else {
//
if (left + width - window.pageXOffset > window.innerWidth) { if (left + width - window.pageXOffset > window.innerWidth) {
left = window.innerWidth - width + window.pageXOffset - 1; left = window.innerWidth - width + window.pageXOffset - 1;
} }
if (top + height - window.pageYOffset > window.innerHeight) { //
top = window.innerHeight - height + window.pageYOffset - 1; if (top + height - window.pageYOffset > (window.innerHeight - MARGIN)) {
if (props.noOverlap) {
const underSpace = (window.innerHeight - MARGIN) - (top - window.pageYOffset);
const upperSpace = (rect.top - MARGIN);
if (underSpace >= (upperSpace / 3)) {
maxHeight.value = underSpace;
} else {
maxHeight.value = upperSpace;
top = window.pageYOffset + ((upperSpace + MARGIN) - height);
}
} else {
top = (window.innerHeight - MARGIN) - height + window.pageYOffset - 1;
}
} }
} }
if (top < 0) { if (top < 0) {
top = 0; top = MARGIN;
} }
if (left < 0) { if (left < 0) {
left = 0; left = 0;
} }
if (top > rect.top + (this.fixed ? 0 : window.pageYOffset)) { if (top > rect.top + (fixed.value ? 0 : window.pageYOffset)) {
this.transformOrigin = 'center top'; transformOrigin.value = 'center top';
} else if ((top + height) <= rect.top + (fixed.value ? 0 : window.pageYOffset)) {
transformOrigin.value = 'center bottom';
} else { } else {
this.transformOrigin = 'center'; transformOrigin.value = 'center';
} }
popover.style.left = left + 'px'; popover.style.left = left + 'px';
popover.style.top = top + 'px'; popover.style.top = top + 'px';
}, };
childRendered() { const onDocumentClick = (ev: MouseEvent) => {
// const flyoutElement = content.value;
const content = this.$refs.content.children[0];
content.addEventListener('mousedown', e => {
this.contentClicking = true;
window.addEventListener('mouseup', e => {
// click mouseup
setTimeout(() => {
this.contentClicking = false;
}, 100);
}, { passive: true, once: true });
}, { passive: true });
},
close() {
// eslint-disable-next-line vue/no-mutating-props
if (this.src) this.src.style.pointerEvents = 'auto';
this.showing = false;
this.$emit('close');
},
onClosed() {
this.$emit('closed');
},
onDocumentClick(ev) {
const flyoutElement = this.$refs.content;
let targetElement = ev.target; let targetElement = ev.target;
do { do {
if (targetElement === flyoutElement) { if (targetElement === flyoutElement) {
@ -179,9 +167,45 @@ export default defineComponent({
} }
targetElement = targetElement.parentNode; targetElement = targetElement.parentNode;
} while (targetElement); } while (targetElement);
this.close(); close();
} };
}
onMounted(() => {
watch(() => props.src, async () => {
if (props.src) {
// eslint-disable-next-line vue/no-mutating-props
props.src.style.pointerEvents = 'none';
}
fixed.value = getFixedContainer(props.src) != null;
await nextTick()
align();
}, { immediate: true, });
nextTick(() => {
const popover = content.value;
new ResizeObserver((entries, observer) => {
align();
}).observe(popover!);
});
document.addEventListener('mousedown', onDocumentClick, { passive: true });
onUnmounted(() => {
document.removeEventListener('mousedown', onDocumentClick);
});
});
return {
showing,
fixed,
content,
transformOrigin,
maxHeight,
close,
};
},
}); });
</script> </script>

View file

@ -51,7 +51,6 @@ export default defineComponent({
} }
> .title { > .title {
font-size: 0.9em;
opacity: 0.7; opacity: 0.7;
margin: 0 0 8px 12px; margin: 0 0 8px 12px;
} }
@ -64,7 +63,6 @@ export default defineComponent({
box-sizing: border-box; box-sizing: border-box;
padding: 10px 16px 10px 8px; padding: 10px 16px 10px 8px;
border-radius: 9px; border-radius: 9px;
font-size: 0.9em;
&:hover { &:hover {
text-decoration: none; text-decoration: none;

View file

@ -1,13 +1,13 @@
<template> <template>
<transition name="tooltip" appear @after-leave="$emit('closed')"> <transition name="tooltip" appear @after-leave="$emit('closed')">
<div v-show="showing" ref="content" class="buebdbiu _acrylic _shadow" :style="{ maxWidth: maxWidth + 'px' }"> <div v-show="showing" ref="el" class="buebdbiu _acrylic _shadow" :style="{ maxWidth: maxWidth + 'px' }">
<slot>{{ text }}</slot> <slot>{{ text }}</slot>
</div> </div>
</transition> </transition>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent, nextTick, onMounted, onUnmounted, ref } from 'vue';
export default defineComponent({ export default defineComponent({
props: { props: {
@ -31,35 +31,64 @@ export default defineComponent({
emits: ['closed'], emits: ['closed'],
mounted() { setup(props, context) {
this.$nextTick(() => { const el = ref<HTMLElement>();
if (this.source == null) {
this.$emit('closed');
return;
}
const rect = this.source.getBoundingClientRect(); const setPosition = () => {
if (el.value == null) return;
const contentWidth = this.$refs.content.offsetWidth; const rect = props.source.getBoundingClientRect();
const contentHeight = this.$refs.content.offsetHeight;
let left = rect.left + window.pageXOffset + (this.source.offsetWidth / 2); const contentWidth = el.value.offsetWidth;
const contentHeight = el.value.offsetHeight;
let left = rect.left + window.pageXOffset + (props.source.offsetWidth / 2);
let top = rect.top + window.pageYOffset - contentHeight; let top = rect.top + window.pageYOffset - contentHeight;
left -= (this.$el.offsetWidth / 2); left -= (el.value.offsetWidth / 2);
if (left + contentWidth - window.pageXOffset > window.innerWidth) { if (left + contentWidth - window.pageXOffset > window.innerWidth) {
left = window.innerWidth - contentWidth + window.pageXOffset - 1; left = window.innerWidth - contentWidth + window.pageXOffset - 1;
} }
if (top - window.pageYOffset < 0) { if (top - window.pageYOffset < 0) {
top = rect.top + window.pageYOffset + this.source.offsetHeight; top = rect.top + window.pageYOffset + props.source.offsetHeight;
this.$refs.content.style.transformOrigin = 'center top'; el.value.style.transformOrigin = 'center top';
} }
this.$el.style.left = left + 'px'; el.value.style.left = left + 'px';
this.$el.style.top = top + 'px'; el.value.style.top = top + 'px';
};
onMounted(() => {
nextTick(() => {
if (props.source == null) {
context.emit('closed');
return;
}
setPosition();
let loopHandler;
const loop = () => {
loopHandler = window.requestAnimationFrame(() => {
setPosition();
loop();
});
};
loop();
onUnmounted(() => {
window.cancelAnimationFrame(loopHandler);
});
});
}); });
return {
el,
};
}, },
}) })
</script> </script>

View file

@ -10,6 +10,7 @@ import appear from './appear';
import anim from './anim'; import anim from './anim';
import stickyContainer from './sticky-container'; import stickyContainer from './sticky-container';
import clickAnime from './click-anime'; import clickAnime from './click-anime';
import panel from './panel';
export default function(app: App) { export default function(app: App) {
app.directive('userPreview', userPreview); app.directive('userPreview', userPreview);
@ -23,4 +24,5 @@ export default function(app: App) {
app.directive('anim', anim); app.directive('anim', anim);
app.directive('click-anime', clickAnime); app.directive('click-anime', clickAnime);
app.directive('sticky-container', stickyContainer); app.directive('sticky-container', stickyContainer);
app.directive('panel', panel);
} }

View file

@ -0,0 +1,24 @@
import { Directive } from 'vue';
export default {
mounted(src, binding, vn) {
const getBgColor = (el: HTMLElement) => {
const style = window.getComputedStyle(el);
if (style.backgroundColor && !['rgba(0, 0, 0, 0)', 'rgba(0,0,0,0)', 'transparent'].includes(style.backgroundColor)) {
return style.backgroundColor;
} else {
return getBgColor(el.parentElement);
}
}
const parentBg = getBgColor(src.parentElement);
const myBg = getComputedStyle(document.documentElement).getPropertyValue('--panel');
if (parentBg === myBg) {
src.style.backgroundColor = 'var(--bg)';
} else {
src.style.backgroundColor = 'var(--panel)';
}
},
} as Directive;

View file

@ -224,6 +224,10 @@ export function modalPageWindow(path: string) {
}, {}, 'closed'); }, {}, 'closed');
} }
export function toast(message: string) {
// TODO
}
export function alert(props: { export function alert(props: {
type?: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question'; type?: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
title?: string | null; title?: string | null;

View file

@ -1,64 +1,67 @@
<template> <template>
<div style="overflow: clip;"> <div style="overflow: clip;">
<FormBase class="znqjceqz"> <MkSpacer :content-max="600" :margin-min="20">
<div id="debug"></div> <div class="_formRoot znqjceqz">
<section class="_debobigegoItem about"> <div id="debug"></div>
<div ref="about" class="_debobigegoPanel panel" :class="{ playing: easterEggEngine != null }"> <div ref="about" v-panel class="_formBlock about" :class="{ playing: easterEggEngine != null }">
<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/> <img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
<div class="misskey">Misskey</div> <div class="misskey">Misskey</div>
<div class="version">v{{ version }}</div> <div class="version">v{{ version }}</div>
<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }"><MkEmoji class="emoji" :emoji="emoji.emoji" :custom-emojis="$instance.emojis" :is-reaction="false" :normal="true" :no-style="true"/></span> <span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }"><MkEmoji class="emoji" :emoji="emoji.emoji" :custom-emojis="$instance.emojis" :is-reaction="false" :normal="true" :no-style="true"/></span>
</div> </div>
</section> <div class="_formBlock" style="text-align: center;">
<section class="_debobigegoItem" style="text-align: center; padding: 0 16px;"> {{ $ts._aboutMisskey.about }}<br><a href="https://misskey-hub.net/docs/misskey.html" target="_blank" class="_link">{{ $ts.learnMore }}</a>
{{ $ts._aboutMisskey.about }}<br><a href="https://misskey-hub.net/docs/misskey.html" target="_blank" class="_link">{{ $ts.learnMore }}</a> </div>
</section> <FormSection>
<FormGroup> <div class="_formLinks">
<FormLink to="https://github.com/misskey-dev/misskey" external> <FormLink to="https://github.com/misskey-dev/misskey" external>
<template #icon><i class="fas fa-code"></i></template> <template #icon><i class="fas fa-code"></i></template>
{{ $ts._aboutMisskey.source }} {{ $ts._aboutMisskey.source }}
<template #suffix>GitHub</template> <template #suffix>GitHub</template>
</FormLink> </FormLink>
<FormLink to="https://crowdin.com/project/misskey" external> <FormLink to="https://crowdin.com/project/misskey" external>
<template #icon><i class="fas fa-language"></i></template> <template #icon><i class="fas fa-language"></i></template>
{{ $ts._aboutMisskey.translation }} {{ $ts._aboutMisskey.translation }}
<template #suffix>Crowdin</template> <template #suffix>Crowdin</template>
</FormLink> </FormLink>
<FormLink to="https://www.patreon.com/syuilo" external> <FormLink to="https://www.patreon.com/syuilo" external>
<template #icon><i class="fas fa-hand-holding-medical"></i></template> <template #icon><i class="fas fa-hand-holding-medical"></i></template>
{{ $ts._aboutMisskey.donate }} {{ $ts._aboutMisskey.donate }}
<template #suffix>Patreon</template> <template #suffix>Patreon</template>
</FormLink> </FormLink>
</FormGroup> </div>
<FormGroup> </FormSection>
<template #label>{{ $ts._aboutMisskey.contributors }}</template> <FormSection>
<FormLink to="https://github.com/syuilo" external>@syuilo</FormLink> <template #label>{{ $ts._aboutMisskey.contributors }}</template>
<FormLink to="https://github.com/AyaMorisawa" external>@AyaMorisawa</FormLink> <div class="_formLinks">
<FormLink to="https://github.com/mei23" external>@mei23</FormLink> <FormLink to="https://github.com/syuilo" external>@syuilo</FormLink>
<FormLink to="https://github.com/acid-chicken" external>@acid-chicken</FormLink> <FormLink to="https://github.com/AyaMorisawa" external>@AyaMorisawa</FormLink>
<FormLink to="https://github.com/tamaina" external>@tamaina</FormLink> <FormLink to="https://github.com/mei23" external>@mei23</FormLink>
<FormLink to="https://github.com/rinsuki" external>@rinsuki</FormLink> <FormLink to="https://github.com/acid-chicken" external>@acid-chicken</FormLink>
<FormLink to="https://github.com/Xeltica" external>@Xeltica</FormLink> <FormLink to="https://github.com/tamaina" external>@tamaina</FormLink>
<FormLink to="https://github.com/u1-liquid" external>@u1-liquid</FormLink> <FormLink to="https://github.com/rinsuki" external>@rinsuki</FormLink>
<FormLink to="https://github.com/marihachi" external>@marihachi</FormLink> <FormLink to="https://github.com/Xeltica" external>@Xeltica</FormLink>
<template #caption><MkLink url="https://github.com/misskey-dev/misskey/graphs/contributors">{{ $ts._aboutMisskey.allContributors }}</MkLink></template> <FormLink to="https://github.com/u1-liquid" external>@u1-liquid</FormLink>
</FormGroup> <FormLink to="https://github.com/marihachi" external>@marihachi</FormLink>
<FormGroup> </div>
<template #label><Mfm text="[jelly ❤]"/> {{ $ts._aboutMisskey.patrons }}</template> <template #caption><MkLink url="https://github.com/misskey-dev/misskey/graphs/contributors">{{ $ts._aboutMisskey.allContributors }}</MkLink></template>
<FormKeyValueView v-for="patron in patrons" :key="patron"><template #key>{{ patron }}</template></FormKeyValueView> </FormSection>
<template #caption>{{ $ts._aboutMisskey.morePatrons }}</template> <FormSection>
</FormGroup> <template #label><Mfm text="$[jelly ❤]"/> {{ $ts._aboutMisskey.patrons }}</template>
</FormBase> <div v-for="patron in patrons" :key="patron">{{ patron }}</div>
<template #caption>{{ $ts._aboutMisskey.morePatrons }}</template>
</FormSection>
</div>
</MkSpacer>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import { version } from '@/config'; import { version } from '@/config';
import FormLink from '@/components/debobigego/link.vue'; import FormLink from '@/components/form/link.vue';
import FormBase from '@/components/debobigego/base.vue'; import FormSection from '@/components/form/section.vue';
import FormGroup from '@/components/debobigego/group.vue'; import MkKeyValue from '@/components/key-value.vue';
import FormKeyValueView from '@/components/debobigego/key-value-view.vue';
import MkLink from '@/components/link.vue'; import MkLink from '@/components/link.vue';
import { physics } from '@/scripts/physics'; import { physics } from '@/scripts/physics';
import * as symbols from '@/symbols'; import * as symbols from '@/symbols';
@ -122,10 +125,9 @@ const patrons = [
export default defineComponent({ export default defineComponent({
components: { components: {
FormBase, FormSection,
FormGroup,
FormLink, FormLink,
FormKeyValueView, MkKeyValue,
MkLink, MkLink,
}, },
@ -178,59 +180,54 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
.znqjceqz { .znqjceqz {
max-width: 800px;
box-sizing: border-box;
margin: 0 auto;
> .about { > .about {
> .panel { position: relative;
position: relative; text-align: center;
text-align: center; padding: 16px;
padding: 16px; border-radius: var(--radius);
&.playing { &.playing {
&, * { &, * {
user-select: none; user-select: none;
}
* {
will-change: transform;
}
> .emoji {
visibility: visible;
}
} }
> .icon { * {
display: block; will-change: transform;
width: 100px;
margin: 0 auto;
border-radius: 16px;
}
> .misskey {
margin: 0.75em auto 0 auto;
width: max-content;
}
> .version {
margin: 0 auto;
width: max-content;
opacity: 0.5;
} }
> .emoji { > .emoji {
position: absolute; visibility: visible;
top: 0; }
left: 0; }
visibility: hidden;
> .emoji { > .icon {
pointer-events: none; display: block;
font-size: 24px; width: 100px;
width: 24px; margin: 0 auto;
} border-radius: 16px;
}
> .misskey {
margin: 0.75em auto 0 auto;
width: max-content;
}
> .version {
margin: 0 auto;
width: max-content;
opacity: 0.5;
}
> .emoji {
position: absolute;
top: 0;
left: 0;
visibility: hidden;
> .emoji {
pointer-events: none;
font-size: 24px;
width: 24px;
} }
} }
} }

View file

@ -1,70 +1,80 @@
<template> <template>
<FormBase> <MkSpacer :content-max="600" :margin-min="20">
<div class="_debobigegoItem"> <div class="_formRoot">
<div class="_debobigegoPanel fwhjspax"> <div class="_formBlock fwhjspax" :style="{ backgroundImage: `url(${ $instance.bannerUrl })` }">
<img :src="$instance.iconUrl || $instance.faviconUrl || '/favicon.ico'" alt="" class="icon"/> <div class="content">
<span class="name">{{ $instance.name || host }}</span> <img :src="$instance.iconUrl || $instance.faviconUrl || '/favicon.ico'" alt="" class="icon"/>
<div class="name">
<b>{{ $instance.name || host }}</b>
</div>
</div>
</div> </div>
<MkKeyValue class="_formBlock">
<template #key>{{ $ts.description }}</template>
<template #value>{{ $instance.description }}</template>
</MkKeyValue>
<FormSection>
<MkKeyValue class="_formBlock" :copy="version">
<template #key>Misskey</template>
<template #value>{{ version }}</template>
</MkKeyValue>
<FormLink to="/about-misskey">{{ $ts.aboutMisskey }}</FormLink>
</FormSection>
<FormSection>
<div class="_inputSplit">
<MkKeyValue class="_formBlock">
<template #key>{{ $ts.administrator }}</template>
<template #value>{{ $instance.maintainerName }}</template>
</MkKeyValue>
<MkKeyValue class="_formBlock">
<template #key>{{ $ts.contact }}</template>
<template #value>{{ $instance.maintainerEmail }}</template>
</MkKeyValue>
</div>
</FormSection>
<FormLink v-if="$instance.tosUrl" :to="$instance.tosUrl" external>{{ $ts.tos }}</FormLink>
<FormSuspense :p="initStats">
<FormSection>
<template #label>{{ $ts.statistics }}</template>
<div class="_inputSplit">
<MkKeyValue class="_formBlock">
<template #key>{{ $ts.users }}</template>
<template #value>{{ number(stats.originalUsersCount) }}</template>
</MkKeyValue>
<MkKeyValue class="_formBlock">
<template #key>{{ $ts.notes }}</template>
<template #value>{{ number(stats.originalNotesCount) }}</template>
</MkKeyValue>
</div>
</FormSection>
</FormSuspense>
<FormSection>
<template #label>Well-known resources</template>
<div class="_formLinks">
<FormLink :to="`/.well-known/host-meta`" external>host-meta</FormLink>
<FormLink :to="`/.well-known/host-meta.json`" external>host-meta.json</FormLink>
<FormLink :to="`/.well-known/nodeinfo`" external>nodeinfo</FormLink>
<FormLink :to="`/robots.txt`" external>robots.txt</FormLink>
<FormLink :to="`/manifest.json`" external>manifest.json</FormLink>
</div>
</FormSection>
</div> </div>
</MkSpacer>
<FormTextarea readonly :value="$instance.description">
</FormTextarea>
<FormGroup>
<FormKeyValueView>
<template #key>Misskey</template>
<template #value>v{{ version }}</template>
</FormKeyValueView>
<FormLink to="/about-misskey">{{ $ts.aboutMisskey }}</FormLink>
</FormGroup>
<FormGroup>
<FormKeyValueView>
<template #key>{{ $ts.administrator }}</template>
<template #value>{{ $instance.maintainerName }}</template>
</FormKeyValueView>
<FormKeyValueView>
<template #key>{{ $ts.contact }}</template>
<template #value>{{ $instance.maintainerEmail }}</template>
</FormKeyValueView>
</FormGroup>
<FormLink v-if="$instance.tosUrl" :to="$instance.tosUrl" external>{{ $ts.tos }}</FormLink>
<FormSuspense :p="initStats">
<FormGroup>
<template #label>{{ $ts.statistics }}</template>
<FormKeyValueView>
<template #key>{{ $ts.users }}</template>
<template #value>{{ number(stats.originalUsersCount) }}</template>
</FormKeyValueView>
<FormKeyValueView>
<template #key>{{ $ts.notes }}</template>
<template #value>{{ number(stats.originalNotesCount) }}</template>
</FormKeyValueView>
</FormGroup>
</FormSuspense>
<FormGroup>
<template #label>Well-known resources</template>
<FormLink :to="`/.well-known/host-meta`" external>host-meta</FormLink>
<FormLink :to="`/.well-known/host-meta.json`" external>host-meta.json</FormLink>
<FormLink :to="`/.well-known/nodeinfo`" external>nodeinfo</FormLink>
<FormLink :to="`/robots.txt`" external>robots.txt</FormLink>
<FormLink :to="`/manifest.json`" external>manifest.json</FormLink>
</FormGroup>
</FormBase>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import { version, instanceName } from '@/config'; import { version, instanceName } from '@/config';
import FormLink from '@/components/debobigego/link.vue'; import FormLink from '@/components/form/link.vue';
import FormBase from '@/components/debobigego/base.vue'; import FormSection from '@/components/form/section.vue';
import FormGroup from '@/components/debobigego/group.vue'; import FormSuspense from '@/components/form/suspense.vue';
import FormKeyValueView from '@/components/debobigego/key-value-view.vue'; import MkKeyValue from '@/components/key-value.vue';
import FormTextarea from '@/components/debobigego/textarea.vue';
import FormSuspense from '@/components/debobigego/suspense.vue';
import * as os from '@/os'; import * as os from '@/os';
import number from '@/filters/number'; import number from '@/filters/number';
import * as symbols from '@/symbols'; import * as symbols from '@/symbols';
@ -72,11 +82,9 @@ import { host } from '@/config';
export default defineComponent({ export default defineComponent({
components: { components: {
FormBase, MkKeyValue,
FormGroup, FormSection,
FormLink, FormLink,
FormKeyValueView,
FormTextarea,
FormSuspense, FormSuspense,
}, },
@ -105,19 +113,29 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
.fwhjspax { .fwhjspax {
padding: 16px;
text-align: center; text-align: center;
border-radius: 10px;
overflow: clip;
background-size: cover;
background-position: center center;
> .icon { > .content {
display: block; overflow: hidden;
margin: auto;
height: 64px;
border-radius: 8px;
}
> .name { > .icon {
display: block; display: block;
margin-top: 12px; margin: 16px auto 0 auto;
height: 64px;
border-radius: 8px;
}
> .name {
display: block;
padding: 16px;
color: #fff;
text-shadow: 0 0 8px #000;
background: linear-gradient(transparent, rgba(0, 0, 0, 0.7));
}
} }
} }
</style> </style>

View file

@ -1,96 +1,98 @@
<template> <template>
<div class="taeiyria"> <MkSpacer :content-max="1000">
<div class="query"> <div class="taeiyria">
<MkInput v-model="host" :debounce="true" class=""> <div class="query">
<template #prefix><i class="fas fa-search"></i></template> <MkInput v-model="host" :debounce="true" class="">
<template #label>{{ $ts.host }}</template> <template #prefix><i class="fas fa-search"></i></template>
</MkInput> <template #label>{{ $ts.host }}</template>
<div class="_inputSplit"> </MkInput>
<MkSelect v-model="state"> <div class="_inputSplit" style="margin-top: var(--margin);">
<template #label>{{ $ts.state }}</template> <MkSelect v-model="state">
<option value="all">{{ $ts.all }}</option> <template #label>{{ $ts.state }}</template>
<option value="federating">{{ $ts.federating }}</option> <option value="all">{{ $ts.all }}</option>
<option value="subscribing">{{ $ts.subscribing }}</option> <option value="federating">{{ $ts.federating }}</option>
<option value="publishing">{{ $ts.publishing }}</option> <option value="subscribing">{{ $ts.subscribing }}</option>
<option value="suspended">{{ $ts.suspended }}</option> <option value="publishing">{{ $ts.publishing }}</option>
<option value="blocked">{{ $ts.blocked }}</option> <option value="suspended">{{ $ts.suspended }}</option>
<option value="notResponding">{{ $ts.notResponding }}</option> <option value="blocked">{{ $ts.blocked }}</option>
</MkSelect> <option value="notResponding">{{ $ts.notResponding }}</option>
<MkSelect v-model="sort"> </MkSelect>
<template #label>{{ $ts.sort }}</template> <MkSelect v-model="sort">
<option value="+pubSub">{{ $ts.pubSub }} ({{ $ts.descendingOrder }})</option> <template #label>{{ $ts.sort }}</template>
<option value="-pubSub">{{ $ts.pubSub }} ({{ $ts.ascendingOrder }})</option> <option value="+pubSub">{{ $ts.pubSub }} ({{ $ts.descendingOrder }})</option>
<option value="+notes">{{ $ts.notes }} ({{ $ts.descendingOrder }})</option> <option value="-pubSub">{{ $ts.pubSub }} ({{ $ts.ascendingOrder }})</option>
<option value="-notes">{{ $ts.notes }} ({{ $ts.ascendingOrder }})</option> <option value="+notes">{{ $ts.notes }} ({{ $ts.descendingOrder }})</option>
<option value="+users">{{ $ts.users }} ({{ $ts.descendingOrder }})</option> <option value="-notes">{{ $ts.notes }} ({{ $ts.ascendingOrder }})</option>
<option value="-users">{{ $ts.users }} ({{ $ts.ascendingOrder }})</option> <option value="+users">{{ $ts.users }} ({{ $ts.descendingOrder }})</option>
<option value="+following">{{ $ts.following }} ({{ $ts.descendingOrder }})</option> <option value="-users">{{ $ts.users }} ({{ $ts.ascendingOrder }})</option>
<option value="-following">{{ $ts.following }} ({{ $ts.ascendingOrder }})</option> <option value="+following">{{ $ts.following }} ({{ $ts.descendingOrder }})</option>
<option value="+followers">{{ $ts.followers }} ({{ $ts.descendingOrder }})</option> <option value="-following">{{ $ts.following }} ({{ $ts.ascendingOrder }})</option>
<option value="-followers">{{ $ts.followers }} ({{ $ts.ascendingOrder }})</option> <option value="+followers">{{ $ts.followers }} ({{ $ts.descendingOrder }})</option>
<option value="+caughtAt">{{ $ts.registeredAt }} ({{ $ts.descendingOrder }})</option> <option value="-followers">{{ $ts.followers }} ({{ $ts.ascendingOrder }})</option>
<option value="-caughtAt">{{ $ts.registeredAt }} ({{ $ts.ascendingOrder }})</option> <option value="+caughtAt">{{ $ts.registeredAt }} ({{ $ts.descendingOrder }})</option>
<option value="+lastCommunicatedAt">{{ $ts.lastCommunication }} ({{ $ts.descendingOrder }})</option> <option value="-caughtAt">{{ $ts.registeredAt }} ({{ $ts.ascendingOrder }})</option>
<option value="-lastCommunicatedAt">{{ $ts.lastCommunication }} ({{ $ts.ascendingOrder }})</option> <option value="+lastCommunicatedAt">{{ $ts.lastCommunication }} ({{ $ts.descendingOrder }})</option>
<option value="+driveUsage">{{ $ts.driveUsage }} ({{ $ts.descendingOrder }})</option> <option value="-lastCommunicatedAt">{{ $ts.lastCommunication }} ({{ $ts.ascendingOrder }})</option>
<option value="-driveUsage">{{ $ts.driveUsage }} ({{ $ts.ascendingOrder }})</option> <option value="+driveUsage">{{ $ts.driveUsage }} ({{ $ts.descendingOrder }})</option>
<option value="+driveFiles">{{ $ts.driveFilesCount }} ({{ $ts.descendingOrder }})</option> <option value="-driveUsage">{{ $ts.driveUsage }} ({{ $ts.ascendingOrder }})</option>
<option value="-driveFiles">{{ $ts.driveFilesCount }} ({{ $ts.ascendingOrder }})</option> <option value="+driveFiles">{{ $ts.driveFilesCount }} ({{ $ts.descendingOrder }})</option>
</MkSelect> <option value="-driveFiles">{{ $ts.driveFilesCount }} ({{ $ts.ascendingOrder }})</option>
</MkSelect>
</div>
</div> </div>
</div>
<MkPagination #default="{items}" ref="instances" :key="host + state" :pagination="pagination"> <MkPagination #default="{items}" ref="instances" :key="host + state" :pagination="pagination">
<div class="dqokceoi"> <div class="dqokceoi">
<MkA v-for="instance in items" :key="instance.id" class="instance" :to="`/instance-info/${instance.host}`"> <MkA v-for="instance in items" :key="instance.id" class="instance" :to="`/instance-info/${instance.host}`">
<div class="host"><img :src="instance.faviconUrl">{{ instance.host }}</div> <div class="host"><img :src="instance.faviconUrl">{{ instance.host }}</div>
<div class="table"> <div class="table">
<div class="cell"> <div class="cell">
<div class="key">{{ $ts.registeredAt }}</div> <div class="key">{{ $ts.registeredAt }}</div>
<div class="value"><MkTime :time="instance.caughtAt"/></div> <div class="value"><MkTime :time="instance.caughtAt"/></div>
</div>
<div class="cell">
<div class="key">{{ $ts.software }}</div>
<div class="value">{{ instance.softwareName || `(${$ts.unknown})` }}</div>
</div>
<div class="cell">
<div class="key">{{ $ts.version }}</div>
<div class="value">{{ instance.softwareVersion || `(${$ts.unknown})` }}</div>
</div>
<div class="cell">
<div class="key">{{ $ts.users }}</div>
<div class="value">{{ instance.usersCount }}</div>
</div>
<div class="cell">
<div class="key">{{ $ts.notes }}</div>
<div class="value">{{ instance.notesCount }}</div>
</div>
<div class="cell">
<div class="key">{{ $ts.sent }}</div>
<div class="value"><MkTime v-if="instance.latestRequestSentAt" :time="instance.latestRequestSentAt"/><span v-else>N/A</span></div>
</div>
<div class="cell">
<div class="key">{{ $ts.received }}</div>
<div class="value"><MkTime v-if="instance.latestRequestReceivedAt" :time="instance.latestRequestReceivedAt"/><span v-else>N/A</span></div>
</div>
</div> </div>
<div class="cell"> <div class="footer">
<div class="key">{{ $ts.software }}</div> <span class="status" :class="getStatus(instance)">{{ getStatus(instance) }}</span>
<div class="value">{{ instance.softwareName || `(${$ts.unknown})` }}</div> <span class="pubSub">
<span v-if="instance.followersCount > 0" class="sub"><i class="fas fa-caret-down icon"></i>Sub</span>
<span v-else class="sub"><i class="fas fa-caret-down icon"></i>-</span>
<span v-if="instance.followingCount > 0" class="pub"><i class="fas fa-caret-up icon"></i>Pub</span>
<span v-else class="pub"><i class="fas fa-caret-up icon"></i>-</span>
</span>
<span class="right">
<span class="latestStatus">{{ instance.latestStatus || '-' }}</span>
<span class="lastCommunicatedAt"><MkTime :time="instance.lastCommunicatedAt"/></span>
</span>
</div> </div>
<div class="cell"> </MkA>
<div class="key">{{ $ts.version }}</div> </div>
<div class="value">{{ instance.softwareVersion || `(${$ts.unknown})` }}</div> </MkPagination>
</div> </div>
<div class="cell"> </MkSpacer>
<div class="key">{{ $ts.users }}</div>
<div class="value">{{ instance.usersCount }}</div>
</div>
<div class="cell">
<div class="key">{{ $ts.notes }}</div>
<div class="value">{{ instance.notesCount }}</div>
</div>
<div class="cell">
<div class="key">{{ $ts.sent }}</div>
<div class="value"><MkTime v-if="instance.latestRequestSentAt" :time="instance.latestRequestSentAt"/><span v-else>N/A</span></div>
</div>
<div class="cell">
<div class="key">{{ $ts.received }}</div>
<div class="value"><MkTime v-if="instance.latestRequestReceivedAt" :time="instance.latestRequestReceivedAt"/><span v-else>N/A</span></div>
</div>
</div>
<div class="footer">
<span class="status" :class="getStatus(instance)">{{ getStatus(instance) }}</span>
<span class="pubSub">
<span v-if="instance.followersCount > 0" class="sub"><i class="fas fa-caret-down icon"></i>Sub</span>
<span v-else class="sub"><i class="fas fa-caret-down icon"></i>-</span>
<span v-if="instance.followingCount > 0" class="pub"><i class="fas fa-caret-up icon"></i>Pub</span>
<span v-else class="pub"><i class="fas fa-caret-up icon"></i>-</span>
</span>
<span class="right">
<span class="latestStatus">{{ instance.latestStatus || '-' }}</span>
<span class="lastCommunicatedAt"><MkTime :time="instance.lastCommunicatedAt"/></span>
</span>
</div>
</MkA>
</div>
</MkPagination>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -169,7 +171,7 @@ export default defineComponent({
.taeiyria { .taeiyria {
> .query { > .query {
background: var(--bg); background: var(--bg);
padding: 16px; margin-bottom: 16px;
} }
} }
@ -177,7 +179,6 @@ export default defineComponent({
display: grid; display: grid;
grid-template-columns: repeat(auto-fill, minmax(270px, 1fr)); grid-template-columns: repeat(auto-fill, minmax(270px, 1fr));
grid-gap: 12px; grid-gap: 12px;
padding: 16px;
> .instance { > .instance {
padding: 16px; padding: 16px;

View file

@ -1,69 +1,66 @@
<template> <template>
<section class="_card"> <div>
<div class="_title"><i class="fas fa-lock"></i> {{ $ts.twoStepAuthentication }}</div> <MkButton v-if="!data && !$i.twoFactorEnabled" @click="register">{{ $ts._2fa.registerDevice }}</MkButton>
<div class="_content"> <template v-if="$i.twoFactorEnabled">
<MkButton v-if="!data && !$i.twoFactorEnabled" @click="register">{{ $ts._2fa.registerDevice }}</MkButton> <p>{{ $ts._2fa.alreadyRegistered }}</p>
<template v-if="$i.twoFactorEnabled"> <MkButton @click="unregister">{{ $ts.unregister }}</MkButton>
<p>{{ $ts._2fa.alreadyRegistered }}</p>
<MkButton @click="unregister">{{ $ts.unregister }}</MkButton>
<template v-if="supportsCredentials"> <template v-if="supportsCredentials">
<hr class="totp-method-sep"> <hr class="totp-method-sep">
<h2 class="heading">{{ $ts.securityKey }}</h2> <h2 class="heading">{{ $ts.securityKey }}</h2>
<p>{{ $ts._2fa.securityKeyInfo }}</p> <p>{{ $ts._2fa.securityKeyInfo }}</p>
<div class="key-list"> <div class="key-list">
<div v-for="key in $i.securityKeysList" class="key"> <div v-for="key in $i.securityKeysList" class="key">
<h3>{{ key.name }}</h3> <h3>{{ key.name }}</h3>
<div class="last-used">{{ $ts.lastUsed }}<MkTime :time="key.lastUsed"/></div> <div class="last-used">{{ $ts.lastUsed }}<MkTime :time="key.lastUsed"/></div>
<MkButton @click="unregisterKey(key)">{{ $ts.unregister }}</MkButton> <MkButton @click="unregisterKey(key)">{{ $ts.unregister }}</MkButton>
</div>
</div> </div>
</div>
<MkSwitch v-if="$i.securityKeysList.length > 0" v-model="usePasswordLessLogin" @update:modelValue="updatePasswordLessLogin">{{ $ts.passwordLessLogin }}</MkSwitch> <MkSwitch v-if="$i.securityKeysList.length > 0" v-model="usePasswordLessLogin" @update:modelValue="updatePasswordLessLogin">{{ $ts.passwordLessLogin }}</MkSwitch>
<MkInfo v-if="registration && registration.error" warn>{{ $ts.error }} {{ registration.error }}</MkInfo> <MkInfo v-if="registration && registration.error" warn>{{ $ts.error }} {{ registration.error }}</MkInfo>
<MkButton v-if="!registration || registration.error" @click="addSecurityKey">{{ $ts._2fa.registerKey }}</MkButton> <MkButton v-if="!registration || registration.error" @click="addSecurityKey">{{ $ts._2fa.registerKey }}</MkButton>
<ol v-if="registration && !registration.error"> <ol v-if="registration && !registration.error">
<li v-if="registration.stage >= 0"> <li v-if="registration.stage >= 0">
{{ $ts.tapSecurityKey }} {{ $ts.tapSecurityKey }}
<i v-if="registration.saving && registration.stage == 0" class="fas fa-spinner fa-pulse fa-fw"></i> <i v-if="registration.saving && registration.stage == 0" class="fas fa-spinner fa-pulse fa-fw"></i>
</li>
<li v-if="registration.stage >= 1">
<MkForm :disabled="registration.stage != 1 || registration.saving">
<MkInput v-model="keyName" :max="30">
<template #label>{{ $ts.securityKeyName }}</template>
</MkInput>
<MkButton :disabled="keyName.length == 0" @click="registerKey">{{ $ts.registerSecurityKey }}</MkButton>
<i v-if="registration.saving && registration.stage == 1" class="fas fa-spinner fa-pulse fa-fw"></i>
</MkForm>
</li>
</ol>
</template>
</template>
<div v-if="data && !$i.twoFactorEnabled">
<ol style="margin: 0; padding: 0 0 0 1em;">
<li>
<I18n :src="$ts._2fa.step1" tag="span">
<template #a>
<a href="https://authy.com/" rel="noopener" target="_blank" class="_link">Authy</a>
</template>
<template #b>
<a href="https://support.google.com/accounts/answer/1066447" rel="noopener" target="_blank" class="_link">Google Authenticator</a>
</template>
</I18n>
</li> </li>
<li>{{ $ts._2fa.step2 }}<br><img :src="data.qr"></li> <li v-if="registration.stage >= 1">
<li>{{ $ts._2fa.step3 }}<br> <MkForm :disabled="registration.stage != 1 || registration.saving">
<MkInput v-model="token" type="text" pattern="^[0-9]{6}$" autocomplete="off" spellcheck="false"><template #label>{{ $ts.token }}</template></MkInput> <MkInput v-model="keyName" :max="30">
<MkButton primary @click="submit">{{ $ts.done }}</MkButton> <template #label>{{ $ts.securityKeyName }}</template>
</MkInput>
<MkButton :disabled="keyName.length == 0" @click="registerKey">{{ $ts.registerSecurityKey }}</MkButton>
<i v-if="registration.saving && registration.stage == 1" class="fas fa-spinner fa-pulse fa-fw"></i>
</MkForm>
</li> </li>
</ol> </ol>
<MkInfo>{{ $ts._2fa.step4 }}</MkInfo> </template>
</div> </template>
<div v-if="data && !$i.twoFactorEnabled">
<ol style="margin: 0; padding: 0 0 0 1em;">
<li>
<I18n :src="$ts._2fa.step1" tag="span">
<template #a>
<a href="https://authy.com/" rel="noopener" target="_blank" class="_link">Authy</a>
</template>
<template #b>
<a href="https://support.google.com/accounts/answer/1066447" rel="noopener" target="_blank" class="_link">Google Authenticator</a>
</template>
</I18n>
</li>
<li>{{ $ts._2fa.step2 }}<br><img :src="data.qr"></li>
<li>{{ $ts._2fa.step3 }}<br>
<MkInput v-model="token" type="text" pattern="^[0-9]{6}$" autocomplete="off" spellcheck="false"><template #label>{{ $ts.token }}</template></MkInput>
<MkButton primary @click="submit">{{ $ts.done }}</MkButton>
</li>
</ol>
<MkInfo>{{ $ts._2fa.step4 }}</MkInfo>
</div> </div>
</section> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -82,18 +79,11 @@ import * as symbols from '@/symbols';
export default defineComponent({ export default defineComponent({
components: { components: {
FormBase,
MkButton, MkInfo, MkInput, MkSwitch MkButton, MkInfo, MkInput, MkSwitch
}, },
emits: ['info'],
data() { data() {
return { return {
[symbols.PAGE_INFO]: {
title: this.$ts.twoStepAuthentication,
icon: 'fas fa-lock'
},
data: null, data: null,
supportsCredentials: !!navigator.credentials, supportsCredentials: !!navigator.credentials,
usePasswordLessLogin: this.$i.usePasswordLessLogin, usePasswordLessLogin: this.$i.usePasswordLessLogin,

View file

@ -1,44 +1,43 @@
<template> <template>
<FormBase class=""> <div class="_formRoot">
<FormGroup v-if="!fetching"> <FormSection v-if="!fetching">
<template #label>{{ $ts.usageAmount }}</template> <template #label>{{ $ts.usageAmount }}</template>
<div class="_debobigegoItem uawsfosz"> <div class="_formBlock uawsfosz">
<div class="_debobigegoPanel"> <div class="meter"><div :style="meterStyle"></div></div>
<div class="meter"><div :style="meterStyle"></div></div>
</div>
</div> </div>
<FormKeyValueView> <div class="_inputSplit _formBlock">
<template #key>{{ $ts.capacity }}</template> <MkKeyValue class="_formBlock">
<template #value>{{ bytes(capacity, 1) }}</template> <template #key>{{ $ts.capacity }}</template>
</FormKeyValueView> <template #value>{{ bytes(capacity, 1) }}</template>
<FormKeyValueView> </MkKeyValue>
<template #key>{{ $ts.inUse }}</template> <MkKeyValue class="_formBlock">
<template #value>{{ bytes(usage, 1) }}</template> <template #key>{{ $ts.inUse }}</template>
</FormKeyValueView> <template #value>{{ bytes(usage, 1) }}</template>
</FormGroup> </MkKeyValue>
<div class="_debobigegoItem">
<div class="_debobigegoLabel">{{ $ts.statistics }}</div>
<div class="_debobigegoPanel">
<div ref="chart"></div>
</div> </div>
</div> </FormSection>
<FormButton :center="false" primary @click="chooseUploadFolder()"> <FormSection>
{{ $ts.uploadFolder }} <template #label>{{ $ts.statistics }}</template>
<template #suffix>{{ uploadFolder ? uploadFolder.name : '-' }}</template> <div ref="chart"></div>
<template #suffixIcon><i class="fas fa-folder-open"></i></template> </FormSection>
</FormButton>
</FormBase> <FormSection>
<FormLink @click="chooseUploadFolder()">
{{ $ts.uploadFolder }}
<template #suffix>{{ uploadFolder ? uploadFolder.name : '-' }}</template>
<template #suffixIcon><i class="fas fa-folder-open"></i></template>
</FormLink>
</FormSection>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import * as tinycolor from 'tinycolor2'; import * as tinycolor from 'tinycolor2';
import FormButton from '@/components/debobigego/button.vue'; import FormLink from '@/components/form/link.vue';
import FormGroup from '@/components/debobigego/group.vue'; import FormSection from '@/components/form/section.vue';
import FormKeyValueView from '@/components/debobigego/key-value-view.vue'; import MkKeyValue from '@/components/key-value.vue';
import FormBase from '@/components/debobigego/base.vue';
import * as os from '@/os'; import * as os from '@/os';
import bytes from '@/filters/bytes'; import bytes from '@/filters/bytes';
import * as symbols from '@/symbols'; import * as symbols from '@/symbols';
@ -47,10 +46,9 @@ import * as symbols from '@/symbols';
export default defineComponent({ export default defineComponent({
components: { components: {
FormBase, FormLink,
FormButton, FormSection,
FormGroup, MkKeyValue,
FormKeyValueView,
}, },
emits: ['info'], emits: ['info'],
@ -128,19 +126,16 @@ export default defineComponent({
@use "sass:math"; @use "sass:math";
.uawsfosz { .uawsfosz {
> div {
padding: 24px;
> .meter { > .meter {
$size: 12px; $size: 12px;
background: rgba(0, 0, 0, 0.1); background: rgba(0, 0, 0, 0.1);
border-radius: math.div($size, 2);
overflow: hidden;
> div {
height: $size;
border-radius: math.div($size, 2); border-radius: math.div($size, 2);
overflow: hidden;
> div {
height: $size;
border-radius: math.div($size, 2);
}
} }
} }
} }

View file

@ -1,68 +0,0 @@
<template>
<FormBase>
<FormGroup>
<FormInput v-model="emailAddress" type="email">
{{ $ts.emailAddress }}
<template v-if="$i.email && !$i.emailVerified" #desc>{{ $ts.verificationEmailSent }}</template>
<template v-else-if="emailAddress === $i.email && $i.emailVerified" #desc>{{ $ts.emailVerified }}</template>
</FormInput>
</FormGroup>
<FormButton primary @click="save">{{ $ts.save }}</FormButton>
</FormBase>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import FormButton from '@/components/debobigego/button.vue';
import FormInput from '@/components/form/input.vue';
import FormBase from '@/components/debobigego/base.vue';
import FormGroup from '@/components/debobigego/group.vue';
import * as os from '@/os';
import * as symbols from '@/symbols';
export default defineComponent({
components: {
FormBase,
FormInput,
FormButton,
FormGroup,
},
emits: ['info'],
data() {
return {
[symbols.PAGE_INFO]: {
title: this.$ts.emailAddress,
icon: 'fas fa-envelope',
bg: 'var(--bg)',
},
emailAddress: null,
code: null,
}
},
created() {
this.emailAddress = this.$i.email;
},
mounted() {
this.$emit('info', this[symbols.PAGE_INFO]);
},
methods: {
save() {
os.inputText({
title: this.$ts.password,
type: 'password'
}).then(({ canceled, result: password }) => {
if (canceled) return;
os.apiWithDialog('i/update-email', {
password: password,
email: this.emailAddress,
});
});
}
}
});
</script>

View file

@ -1,91 +0,0 @@
<template>
<FormBase>
<FormGroup>
<FormSwitch v-model="mention">
{{ $ts._notification._types.mention }}
</FormSwitch>
<FormSwitch v-model="reply">
{{ $ts._notification._types.reply }}
</FormSwitch>
<FormSwitch v-model="quote">
{{ $ts._notification._types.quote }}
</FormSwitch>
<FormSwitch v-model="follow">
{{ $ts._notification._types.follow }}
</FormSwitch>
<FormSwitch v-model="receiveFollowRequest">
{{ $ts._notification._types.receiveFollowRequest }}
</FormSwitch>
<FormSwitch v-model="groupInvited">
{{ $ts._notification._types.groupInvited }}
</FormSwitch>
</FormGroup>
</FormBase>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import FormButton from '@/components/debobigego/button.vue';
import FormSwitch from '@/components/form/switch.vue';
import FormBase from '@/components/debobigego/base.vue';
import FormGroup from '@/components/debobigego/group.vue';
import * as os from '@/os';
import * as symbols from '@/symbols';
import * as symbols from '@/symbols';
export default defineComponent({
components: {
FormBase,
FormSwitch,
FormButton,
FormGroup,
},
emits: ['info'],
data() {
return {
[symbols.PAGE_INFO]: {
title: this.$ts.emailNotification,
icon: 'fas fa-envelope',
bg: 'var(--bg)',
},
mention: this.$i.emailNotificationTypes.includes('mention'),
reply: this.$i.emailNotificationTypes.includes('reply'),
quote: this.$i.emailNotificationTypes.includes('quote'),
follow: this.$i.emailNotificationTypes.includes('follow'),
receiveFollowRequest: this.$i.emailNotificationTypes.includes('receiveFollowRequest'),
groupInvited: this.$i.emailNotificationTypes.includes('groupInvited'),
}
},
created() {
this.$watch('mention', this.save);
this.$watch('reply', this.save);
this.$watch('quote', this.save);
this.$watch('follow', this.save);
this.$watch('receiveFollowRequest', this.save);
this.$watch('groupInvited', this.save);
},
mounted() {
this.$emit('info', this[symbols.PAGE_INFO]);
},
methods: {
save() {
os.api('i/update', {
emailNotificationTypes: [
...[this.mention ? 'mention' : null],
...[this.reply ? 'reply' : null],
...[this.quote ? 'quote' : null],
...[this.follow ? 'follow' : null],
...[this.receiveFollowRequest ? 'receiveFollowRequest' : null],
...[this.groupInvited ? 'groupInvited' : null],
].filter(x => x != null)
});
}
}
});
</script>

View file

@ -1,66 +1,133 @@
<template> <template>
<FormBase> <div class="_formRoot">
<FormGroup> <FormSection>
<template #label>{{ $ts.emailAddress }}</template> <template #label>{{ $ts.emailAddress }}</template>
<FormLink to="/settings/email/address"> <FormInput v-model="emailAddress" type="email" manual-save>
<template v-if="$i.email && !$i.emailVerified" #icon><i class="fas fa-exclamation-triangle" style="color: var(--warn);"></i></template> <template #prefix><i class="fas fa-envelope"></i></template>
<template v-else-if="$i.email && $i.emailVerified" #icon><i class="fas fa-check" style="color: var(--success);"></i></template> <template v-if="$i.email && !$i.emailVerified" #caption>{{ $ts.verificationEmailSent }}</template>
{{ $i.email || $ts.notSet }} <template v-else-if="emailAddress === $i.email && $i.emailVerified" #caption><i class="fas fa-check" style="color: var(--success);"></i> {{ $ts.emailVerified }}</template>
</FormLink> </FormInput>
</FormGroup> </FormSection>
<FormLink to="/settings/email/notification"> <FormSection>
<template #icon><i class="fas fa-bell"></i></template> <FormSwitch :value="$i.receiveAnnouncementEmail" @update:modelValue="onChangeReceiveAnnouncementEmail">
{{ $ts.emailNotification }} {{ $ts.receiveAnnouncementFromInstance }}
</FormLink> </FormSwitch>
</FormSection>
<FormSwitch :value="$i.receiveAnnouncementEmail" @update:modelValue="onChangeReceiveAnnouncementEmail"> <FormSection>
{{ $ts.receiveAnnouncementFromInstance }} <template #label>{{ $ts.emailNotification }}</template>
</FormSwitch> <FormSwitch v-model="emailNotification_mention" class="_formBlock">
</FormBase> {{ $ts._notification._types.mention }}
</FormSwitch>
<FormSwitch v-model="emailNotification_reply" class="_formBlock">
{{ $ts._notification._types.reply }}
</FormSwitch>
<FormSwitch v-model="emailNotification_quote" class="_formBlock">
{{ $ts._notification._types.quote }}
</FormSwitch>
<FormSwitch v-model="emailNotification_follow" class="_formBlock">
{{ $ts._notification._types.follow }}
</FormSwitch>
<FormSwitch v-model="emailNotification_receiveFollowRequest" class="_formBlock">
{{ $ts._notification._types.receiveFollowRequest }}
</FormSwitch>
<FormSwitch v-model="emailNotification_groupInvited" class="_formBlock">
{{ $ts._notification._types.groupInvited }}
</FormSwitch>
</FormSection>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent, onMounted, ref, watch } from 'vue';
import FormButton from '@/components/debobigego/button.vue'; import FormButton from '@/components/debobigego/button.vue';
import FormLink from '@/components/debobigego/link.vue'; import FormLink from '@/components/debobigego/link.vue';
import FormBase from '@/components/debobigego/base.vue'; import FormSection from '@/components/form/section.vue';
import FormGroup from '@/components/debobigego/group.vue'; import FormInput from '@/components/form/input.vue';
import FormSwitch from '@/components/debobigego/switch.vue'; import FormSwitch from '@/components/form/switch.vue';
import * as os from '@/os'; import * as os from '@/os';
import * as symbols from '@/symbols'; import * as symbols from '@/symbols';
import { $i } from '@/account';
import { i18n } from '@/i18n';
export default defineComponent({ export default defineComponent({
components: { components: {
FormBase, FormSection,
FormLink, FormLink,
FormButton, FormButton,
FormSwitch, FormSwitch,
FormGroup, FormInput,
}, },
emits: ['info'], emits: ['info'],
data() {
return {
[symbols.PAGE_INFO]: {
title: this.$ts.email,
icon: 'fas fa-envelope',
bg: 'var(--bg)',
},
}
},
mounted() { setup(props, context) {
this.$emit('info', this[symbols.PAGE_INFO]); const emailAddress = ref($i.email);
},
methods: { const INFO = {
onChangeReceiveAnnouncementEmail(v) { title: i18n.locale.email,
icon: 'fas fa-envelope',
bg: 'var(--bg)',
};
const onChangeReceiveAnnouncementEmail = (v) => {
os.api('i/update', { os.api('i/update', {
receiveAnnouncementEmail: v receiveAnnouncementEmail: v
}); });
}, };
}
const saveEmailAddress = () => {
os.inputText({
title: i18n.locale.password,
type: 'password'
}).then(({ canceled, result: password }) => {
if (canceled) return;
os.apiWithDialog('i/update-email', {
password: password,
email: emailAddress.value,
});
});
};
const emailNotification_mention = ref($i.emailNotificationTypes.includes('mention'));
const emailNotification_reply = ref($i.emailNotificationTypes.includes('reply'));
const emailNotification_quote = ref($i.emailNotificationTypes.includes('quote'));
const emailNotification_follow = ref($i.emailNotificationTypes.includes('follow'));
const emailNotification_receiveFollowRequest = ref($i.emailNotificationTypes.includes('receiveFollowRequest'));
const emailNotification_groupInvited = ref($i.emailNotificationTypes.includes('groupInvited'));
const saveNotificationSettings = () => {
os.api('i/update', {
emailNotificationTypes: [
...[emailNotification_mention.value ? 'mention' : null],
...[emailNotification_reply.value ? 'reply' : null],
...[emailNotification_quote.value ? 'quote' : null],
...[emailNotification_follow.value ? 'follow' : null],
...[emailNotification_receiveFollowRequest.value ? 'receiveFollowRequest' : null],
...[emailNotification_groupInvited.value ? 'groupInvited' : null],
].filter(x => x != null)
});
};
watch([emailNotification_mention, emailNotification_reply, emailNotification_quote, emailNotification_follow, emailNotification_receiveFollowRequest, emailNotification_groupInvited], () => {
saveNotificationSettings();
});
onMounted(() => {
context.emit('info', INFO);
watch(emailAddress, () => {
saveEmailAddress();
});
});
return {
[symbols.PAGE_INFO]: INFO,
emailAddress,
onChangeReceiveAnnouncementEmail,
emailNotification_mention, emailNotification_reply, emailNotification_quote, emailNotification_follow, emailNotification_receiveFollowRequest, emailNotification_groupInvited,
};
},
}); });
</script> </script>

View file

@ -1,8 +1,6 @@
<template> <template>
<FormBase> <div class="_formRoot">
<FormSwitch v-model="showFixedPostForm">{{ $ts.showFixedPostForm }}</FormSwitch> <FormSelect v-model="lang" class="_formBlock">
<FormSelect v-model="lang">
<template #label>{{ $ts.uiLanguage }}</template> <template #label>{{ $ts.uiLanguage }}</template>
<option v-for="x in langs" :key="x[0]" :value="x[0]">{{ x[1] }}</option> <option v-for="x in langs" :key="x[0]" :value="x[0]">{{ x[1] }}</option>
<template #caption> <template #caption>
@ -14,57 +12,59 @@
</template> </template>
</FormSelect> </FormSelect>
<FormGroup> <FormSwitch v-model="showFixedPostForm" class="_formBlock">{{ $ts.showFixedPostForm }}</FormSwitch>
<FormSection>
<template #label>{{ $ts.behavior }}</template> <template #label>{{ $ts.behavior }}</template>
<FormSwitch v-model="imageNewTab">{{ $ts.openImageInNewTab }}</FormSwitch> <FormSwitch v-model="imageNewTab" class="_formBlock">{{ $ts.openImageInNewTab }}</FormSwitch>
<FormSwitch v-model="enableInfiniteScroll">{{ $ts.enableInfiniteScroll }}</FormSwitch> <FormSwitch v-model="enableInfiniteScroll" class="_formBlock">{{ $ts.enableInfiniteScroll }}</FormSwitch>
<FormSwitch v-model="useReactionPickerForContextMenu">{{ $ts.useReactionPickerForContextMenu }}</FormSwitch> <FormSwitch v-model="useReactionPickerForContextMenu" class="_formBlock">{{ $ts.useReactionPickerForContextMenu }}</FormSwitch>
<FormSwitch v-model="disablePagesScript">{{ $ts.disablePagesScript }}</FormSwitch> <FormSwitch v-model="disablePagesScript" class="_formBlock">{{ $ts.disablePagesScript }}</FormSwitch>
</FormGroup>
<FormSelect v-model="serverDisconnectedBehavior"> <FormSelect v-model="serverDisconnectedBehavior" class="_formBlock">
<template #label>{{ $ts.whenServerDisconnected }}</template> <template #label>{{ $ts.whenServerDisconnected }}</template>
<option value="reload">{{ $ts._serverDisconnectedBehavior.reload }}</option> <option value="reload">{{ $ts._serverDisconnectedBehavior.reload }}</option>
<option value="dialog">{{ $ts._serverDisconnectedBehavior.dialog }}</option> <option value="dialog">{{ $ts._serverDisconnectedBehavior.dialog }}</option>
<option value="quiet">{{ $ts._serverDisconnectedBehavior.quiet }}</option> <option value="quiet">{{ $ts._serverDisconnectedBehavior.quiet }}</option>
</FormSelect> </FormSelect>
</FormSection>
<FormGroup> <FormSection>
<template #label>{{ $ts.appearance }}</template> <template #label>{{ $ts.appearance }}</template>
<FormSwitch v-model="disableAnimatedMfm">{{ $ts.disableAnimatedMfm }}</FormSwitch> <FormSwitch v-model="disableAnimatedMfm" class="_formBlock">{{ $ts.disableAnimatedMfm }}</FormSwitch>
<FormSwitch v-model="reduceAnimation">{{ $ts.reduceUiAnimation }}</FormSwitch> <FormSwitch v-model="reduceAnimation" class="_formBlock">{{ $ts.reduceUiAnimation }}</FormSwitch>
<FormSwitch v-model="useBlurEffect">{{ $ts.useBlurEffect }}</FormSwitch> <FormSwitch v-model="useBlurEffect" class="_formBlock">{{ $ts.useBlurEffect }}</FormSwitch>
<FormSwitch v-model="useBlurEffectForModal">{{ $ts.useBlurEffectForModal }}</FormSwitch> <FormSwitch v-model="useBlurEffectForModal" class="_formBlock">{{ $ts.useBlurEffectForModal }}</FormSwitch>
<FormSwitch v-model="showGapBetweenNotesInTimeline">{{ $ts.showGapBetweenNotesInTimeline }}</FormSwitch> <FormSwitch v-model="showGapBetweenNotesInTimeline" class="_formBlock">{{ $ts.showGapBetweenNotesInTimeline }}</FormSwitch>
<FormSwitch v-model="loadRawImages">{{ $ts.loadRawImages }}</FormSwitch> <FormSwitch v-model="loadRawImages" class="_formBlock">{{ $ts.loadRawImages }}</FormSwitch>
<FormSwitch v-model="disableShowingAnimatedImages">{{ $ts.disableShowingAnimatedImages }}</FormSwitch> <FormSwitch v-model="disableShowingAnimatedImages" class="_formBlock">{{ $ts.disableShowingAnimatedImages }}</FormSwitch>
<FormSwitch v-model="squareAvatars">{{ $ts.squareAvatars }}</FormSwitch> <FormSwitch v-model="squareAvatars" class="_formBlock">{{ $ts.squareAvatars }}</FormSwitch>
<FormSwitch v-model="useSystemFont">{{ $ts.useSystemFont }}</FormSwitch> <FormSwitch v-model="useSystemFont" class="_formBlock">{{ $ts.useSystemFont }}</FormSwitch>
<FormSwitch v-model="useOsNativeEmojis">{{ $ts.useOsNativeEmojis }} <FormSwitch v-model="useOsNativeEmojis" class="_formBlock">{{ $ts.useOsNativeEmojis }}
<div><Mfm :key="useOsNativeEmojis" text="🍮🍦🍭🍩🍰🍫🍬🥞🍪"/></div> <div><Mfm :key="useOsNativeEmojis" text="🍮🍦🍭🍩🍰🍫🍬🥞🍪"/></div>
</FormSwitch> </FormSwitch>
</FormGroup>
<FormGroup> <FormRadios v-model="fontSize" class="_formBlock">
<template #label>{{ $ts.fontSize }}</template>
<option value="small"><span style="font-size: 14px;">Aa</span></option>
<option :value="null"><span style="font-size: 16px;">Aa</span></option>
<option value="large"><span style="font-size: 18px;">Aa</span></option>
<option value="veryLarge"><span style="font-size: 20px;">Aa</span></option>
</FormRadios>
</FormSection>
<FormSection>
<FormSwitch v-model="aiChanMode">{{ $ts.aiChanMode }}</FormSwitch> <FormSwitch v-model="aiChanMode">{{ $ts.aiChanMode }}</FormSwitch>
</FormGroup> </FormSection>
<FormRadios v-model="fontSize"> <FormSelect v-model="instanceTicker" class="_formBlock">
<template #desc>{{ $ts.fontSize }}</template>
<option value="small"><span style="font-size: 14px;">Aa</span></option>
<option :value="null"><span style="font-size: 16px;">Aa</span></option>
<option value="large"><span style="font-size: 18px;">Aa</span></option>
<option value="veryLarge"><span style="font-size: 20px;">Aa</span></option>
</FormRadios>
<FormSelect v-model="instanceTicker">
<template #label>{{ $ts.instanceTicker }}</template> <template #label>{{ $ts.instanceTicker }}</template>
<option value="none">{{ $ts._instanceTicker.none }}</option> <option value="none">{{ $ts._instanceTicker.none }}</option>
<option value="remote">{{ $ts._instanceTicker.remote }}</option> <option value="remote">{{ $ts._instanceTicker.remote }}</option>
<option value="always">{{ $ts._instanceTicker.always }}</option> <option value="always">{{ $ts._instanceTicker.always }}</option>
</FormSelect> </FormSelect>
<FormSelect v-model="nsfw"> <FormSelect v-model="nsfw" class="_formBlock">
<template #label>{{ $ts.nsfw }}</template> <template #label>{{ $ts.nsfw }}</template>
<option value="respect">{{ $ts._nsfw.respect }}</option> <option value="respect">{{ $ts._nsfw.respect }}</option>
<option value="ignore">{{ $ts._nsfw.ignore }}</option> <option value="ignore">{{ $ts._nsfw.ignore }}</option>
@ -76,28 +76,27 @@
<FormSwitch v-model="defaultSideView">{{ $ts.openInSideView }}</FormSwitch> <FormSwitch v-model="defaultSideView">{{ $ts.openInSideView }}</FormSwitch>
</FormGroup> </FormGroup>
<FormSelect v-model="chatOpenBehavior"> <FormSelect v-model="chatOpenBehavior" class="_formBlock">
<template #label>{{ $ts.chatOpenBehavior }}</template> <template #label>{{ $ts.chatOpenBehavior }}</template>
<option value="page">{{ $ts.showInPage }}</option> <option value="page">{{ $ts.showInPage }}</option>
<option value="window">{{ $ts.openInWindow }}</option> <option value="window">{{ $ts.openInWindow }}</option>
<option value="popout">{{ $ts.popout }}</option> <option value="popout">{{ $ts.popout }}</option>
</FormSelect> </FormSelect>
<FormLink to="/settings/deck">{{ $ts.deck }}</FormLink> <FormLink to="/settings/deck" class="_formBlock">{{ $ts.deck }}</FormLink>
<FormLink to="/settings/custom-css"><template #icon><i class="fas fa-code"></i></template>{{ $ts.customCss }}</FormLink> <FormLink to="/settings/custom-css" class="_formBlock"><template #icon><i class="fas fa-code"></i></template>{{ $ts.customCss }}</FormLink>
</FormBase> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import FormSwitch from '@/components/debobigego/switch.vue'; import FormSwitch from '@/components/form/switch.vue';
import FormSelect from '@/components/debobigego/select.vue'; import FormSelect from '@/components/form/select.vue';
import FormRadios from '@/components/debobigego/radios.vue'; import FormRadios from '@/components/form/radios.vue';
import FormBase from '@/components/debobigego/base.vue'; import FormGroup from '@/components/form/group.vue';
import FormGroup from '@/components/debobigego/group.vue'; import FormSection from '@/components/form/section.vue';
import FormLink from '@/components/debobigego/link.vue'; import FormLink from '@/components/form/link.vue';
import FormButton from '@/components/debobigego/button.vue';
import MkLink from '@/components/link.vue'; import MkLink from '@/components/link.vue';
import { langs } from '@/config'; import { langs } from '@/config';
import { defaultStore } from '@/store'; import { defaultStore } from '@/store';
@ -112,10 +111,9 @@ export default defineComponent({
FormSwitch, FormSwitch,
FormSelect, FormSelect,
FormRadios, FormRadios,
FormBase,
FormGroup, FormGroup,
FormLink, FormLink,
FormButton, FormSection,
}, },
emits: ['info'], emits: ['info'],

View file

@ -1,5 +1,5 @@
<template> <template>
<div style="margin: 16px;"> <div class="_formRoot">
<FormSection> <FormSection>
<template #label>{{ $ts._exportOrImport.allNotes }}</template> <template #label>{{ $ts._exportOrImport.allNotes }}</template>
<MkButton :class="$style.button" inline @click="doExport('notes')"><i class="fas fa-download"></i> {{ $ts.export }}</MkButton> <MkButton :class="$style.button" inline @click="doExport('notes')"><i class="fas fa-download"></i> {{ $ts.export }}</MkButton>

View file

@ -10,7 +10,12 @@
</MkSpacer> </MkSpacer>
</div> </div>
<div class="main"> <div class="main">
<component :is="component" :key="page" v-bind="pageProps"/> <MkSpacer :content-max="600" :margin-min="20">
<div class="bkzroven">
<div v-if="childInfo" class="title">{{ childInfo.title }}</div>
<component :is="component" :key="page" v-bind="pageProps" @info="onInfo"/>
</div>
</MkSpacer>
</div> </div>
</div> </div>
</template> </template>
@ -52,6 +57,7 @@ export default defineComponent({
const narrow = ref(false); const narrow = ref(false);
const view = ref(null); const view = ref(null);
const el = ref(null); const el = ref(null);
const childInfo = ref(null);
const menuDef = computed(() => [{ const menuDef = computed(() => [{
title: i18n.locale.basicSettings, title: i18n.locale.basicSettings,
items: [{ items: [{
@ -192,8 +198,6 @@ export default defineComponent({
case 'other': return defineAsyncComponent(() => import('./other.vue')); case 'other': return defineAsyncComponent(() => import('./other.vue'));
case 'general': return defineAsyncComponent(() => import('./general.vue')); case 'general': return defineAsyncComponent(() => import('./general.vue'));
case 'email': return defineAsyncComponent(() => import('./email.vue')); case 'email': return defineAsyncComponent(() => import('./email.vue'));
case 'email/address': return defineAsyncComponent(() => import('./email-address.vue'));
case 'email/notification': return defineAsyncComponent(() => import('./email-notification.vue'));
case 'theme': return defineAsyncComponent(() => import('./theme.vue')); case 'theme': return defineAsyncComponent(() => import('./theme.vue'));
case 'theme/install': return defineAsyncComponent(() => import('./theme.install.vue')); case 'theme/install': return defineAsyncComponent(() => import('./theme.install.vue'));
case 'theme/manage': return defineAsyncComponent(() => import('./theme.manage.vue')); case 'theme/manage': return defineAsyncComponent(() => import('./theme.manage.vue'));
@ -259,6 +263,10 @@ export default defineComponent({
const emailNotConfigured = computed(() => instance.enableEmail && ($i.email == null || !$i.emailVerified)); const emailNotConfigured = computed(() => instance.enableEmail && ($i.email == null || !$i.emailVerified));
const onInfo = (info) => {
childInfo.value = info;
};
return { return {
[symbols.PAGE_INFO]: INFO, [symbols.PAGE_INFO]: INFO,
page, page,
@ -269,6 +277,8 @@ export default defineComponent({
pageProps, pageProps,
component, component,
emailNotConfigured, emailNotConfigured,
onInfo,
childInfo,
}; };
}, },
}); });
@ -285,7 +295,7 @@ export default defineComponent({
} }
> .info { > .info {
margin: 0 16px; margin: 16px 0;
} }
> .accounts { > .accounts {
@ -299,6 +309,16 @@ export default defineComponent({
} }
} }
> .main {
.bkzroven {
> .title {
margin: 4px 0 20px 0;
font-size: 1.5em;
font-weight: bold;
}
}
}
&.wide { &.wide {
display: flex; display: flex;
max-width: 1000px; max-width: 1000px;
@ -321,6 +341,12 @@ export default defineComponent({
flex: 1; flex: 1;
min-width: 0; min-width: 0;
overflow: auto; overflow: auto;
.bkzroven {
> .title {
margin: 6px 0 24px 0;
}
}
} }
} }
} }

View file

@ -1,28 +1,28 @@
<template> <template>
<FormBase> <div class="_formRoot">
<FormTextarea v-model="items" tall manual-save> <FormTextarea v-model="items" tall manual-save class="_formBlock">
<span>{{ $ts.menu }}</span> <template #label>{{ $ts.menu }}</template>
<template #desc><button class="_textButton" @click="addItem">{{ $ts.addItem }}</button></template> <template #caption><button class="_textButton" @click="addItem">{{ $ts.addItem }}</button></template>
</FormTextarea> </FormTextarea>
<FormRadios v-model="menuDisplay"> <FormRadios v-model="menuDisplay" class="_formBlock">
<template #desc>{{ $ts.display }}</template> <template #label>{{ $ts.display }}</template>
<option value="sideFull">{{ $ts._menuDisplay.sideFull }}</option> <option value="sideFull">{{ $ts._menuDisplay.sideFull }}</option>
<option value="sideIcon">{{ $ts._menuDisplay.sideIcon }}</option> <option value="sideIcon">{{ $ts._menuDisplay.sideIcon }}</option>
<option value="top">{{ $ts._menuDisplay.top }}</option> <option value="top">{{ $ts._menuDisplay.top }}</option>
<!-- <MkRadio v-model="menuDisplay" value="hide" disabled>{{ $ts._menuDisplay.hide }}</MkRadio>--> <!-- TODO: サイドバーを完全に隠せるようにすると別途ハンバーガーボタンのようなものをUIに表示する必要があり面倒 --> <!-- <MkRadio v-model="menuDisplay" value="hide" disabled>{{ $ts._menuDisplay.hide }}</MkRadio>--> <!-- TODO: サイドバーを完全に隠せるようにすると別途ハンバーガーボタンのようなものをUIに表示する必要があり面倒 -->
</FormRadios> </FormRadios>
<FormButton danger @click="reset()"><i class="fas fa-redo"></i> {{ $ts.default }}</FormButton> <FormButton danger class="_formBlock" @click="reset()"><i class="fas fa-redo"></i> {{ $ts.default }}</FormButton>
</FormBase> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import FormTextarea from '@/components/debobigego/textarea.vue'; import FormTextarea from '@/components/form/textarea.vue';
import FormRadios from '@/components/debobigego/radios.vue'; import FormRadios from '@/components/form/radios.vue';
import FormBase from '@/components/debobigego/base.vue'; import FormBase from '@/components/debobigego/base.vue';
import FormButton from '@/components/debobigego/button.vue'; import FormButton from '@/components/ui/button.vue';
import * as os from '@/os'; import * as os from '@/os';
import { menuDef } from '@/menu'; import { menuDef } from '@/menu';
import { defaultStore } from '@/store'; import { defaultStore } from '@/store';

View file

@ -1,20 +1,20 @@
<template> <template>
<FormBase> <div class="_formRoot">
<FormLink @click="configure">{{ $ts.notificationSetting }}</FormLink> <FormLink class="_formBlock" @click="configure"><template #icon><i class="fas fa-cog"></i></template>{{ $ts.notificationSetting }}</FormLink>
<FormGroup> <FormSection>
<FormButton @click="readAllNotifications">{{ $ts.markAsReadAllNotifications }}</FormButton> <FormLink class="_formBlock" @click="readAllNotifications">{{ $ts.markAsReadAllNotifications }}</FormLink>
<FormButton @click="readAllUnreadNotes">{{ $ts.markAsReadAllUnreadNotes }}</FormButton> <FormLink class="_formBlock" @click="readAllUnreadNotes">{{ $ts.markAsReadAllUnreadNotes }}</FormLink>
<FormButton @click="readAllMessagingMessages">{{ $ts.markAsReadAllTalkMessages }}</FormButton> <FormLink class="_formBlock" @click="readAllMessagingMessages">{{ $ts.markAsReadAllTalkMessages }}</FormLink>
</FormGroup> </FormSection>
</FormBase> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import FormButton from '@/components/debobigego/button.vue'; import FormButton from '@/components/ui/button.vue';
import FormLink from '@/components/debobigego/link.vue'; import FormLink from '@/components/form/link.vue';
import FormBase from '@/components/debobigego/base.vue'; import FormBase from '@/components/debobigego/base.vue';
import FormGroup from '@/components/debobigego/group.vue'; import FormSection from '@/components/form/section.vue';
import { notificationTypes } from 'misskey-js'; import { notificationTypes } from 'misskey-js';
import * as os from '@/os'; import * as os from '@/os';
import * as symbols from '@/symbols'; import * as symbols from '@/symbols';
@ -24,7 +24,7 @@ export default defineComponent({
FormBase, FormBase,
FormLink, FormLink,
FormButton, FormButton,
FormGroup, FormSection,
}, },
emits: ['info'], emits: ['info'],

View file

@ -1,64 +1,66 @@
<template> <template>
<FormBase> <div class="_formRoot">
<FormGroup> <FormSwitch v-model="isLocked" class="_formBlock" @update:modelValue="save()">{{ $ts.makeFollowManuallyApprove }}<template #caption>{{ $ts.lockedAccountInfo }}</template></FormSwitch>
<FormSwitch v-model="isLocked" @update:modelValue="save()">{{ $ts.makeFollowManuallyApprove }}</FormSwitch> <FormSwitch v-if="isLocked" v-model="autoAcceptFollowed" class="_formBlock" @update:modelValue="save()">{{ $ts.autoAcceptFollowed }}</FormSwitch>
<FormSwitch v-model="autoAcceptFollowed" :disabled="!isLocked" @update:modelValue="save()">{{ $ts.autoAcceptFollowed }}</FormSwitch>
<template #caption>{{ $ts.lockedAccountInfo }}</template> <FormSwitch v-model="publicReactions" class="_formBlock" @update:modelValue="save()">
</FormGroup>
<FormSwitch v-model="publicReactions" @update:modelValue="save()">
{{ $ts.makeReactionsPublic }} {{ $ts.makeReactionsPublic }}
<template #desc>{{ $ts.makeReactionsPublicDescription }}</template> <template #caption>{{ $ts.makeReactionsPublicDescription }}</template>
</FormSwitch> </FormSwitch>
<FormGroup>
<FormSelect v-model="ffVisibility" class="_formBlock">
<template #label>{{ $ts.ffVisibility }}</template> <template #label>{{ $ts.ffVisibility }}</template>
<FormSelect v-model="ffVisibility"> <option value="public">{{ $ts._ffVisibility.public }}</option>
<option value="public">{{ $ts._ffVisibility.public }}</option> <option value="followers">{{ $ts._ffVisibility.followers }}</option>
<option value="followers">{{ $ts._ffVisibility.followers }}</option> <option value="private">{{ $ts._ffVisibility.private }}</option>
<option value="private">{{ $ts._ffVisibility.private }}</option>
</FormSelect>
<template #caption>{{ $ts.ffVisibilityDescription }}</template> <template #caption>{{ $ts.ffVisibilityDescription }}</template>
</FormGroup> </FormSelect>
<FormSwitch v-model="hideOnlineStatus" @update:modelValue="save()">
<FormSwitch v-model="hideOnlineStatus" class="_formBlock" @update:modelValue="save()">
{{ $ts.hideOnlineStatus }} {{ $ts.hideOnlineStatus }}
<template #desc>{{ $ts.hideOnlineStatusDescription }}</template> <template #caption>{{ $ts.hideOnlineStatusDescription }}</template>
</FormSwitch> </FormSwitch>
<FormSwitch v-model="noCrawle" @update:modelValue="save()"> <FormSwitch v-model="noCrawle" class="_formBlock" @update:modelValue="save()">
{{ $ts.noCrawle }} {{ $ts.noCrawle }}
<template #desc>{{ $ts.noCrawleDescription }}</template> <template #caption>{{ $ts.noCrawleDescription }}</template>
</FormSwitch> </FormSwitch>
<FormSwitch v-model="isExplorable" @update:modelValue="save()"> <FormSwitch v-model="isExplorable" class="_formBlock" @update:modelValue="save()">
{{ $ts.makeExplorable }} {{ $ts.makeExplorable }}
<template #desc>{{ $ts.makeExplorableDescription }}</template> <template #caption>{{ $ts.makeExplorableDescription }}</template>
</FormSwitch> </FormSwitch>
<FormSwitch v-model="rememberNoteVisibility" @update:modelValue="save()">{{ $ts.rememberNoteVisibility }}</FormSwitch>
<FormGroup v-if="!rememberNoteVisibility"> <FormSection>
<template #label>{{ $ts.defaultNoteVisibility }}</template> <FormSwitch v-model="rememberNoteVisibility" class="_formBlock" @update:modelValue="save()">{{ $ts.rememberNoteVisibility }}</FormSwitch>
<FormSelect v-model="defaultNoteVisibility"> <FormGroup v-if="!rememberNoteVisibility" class="_formBlock">
<option value="public">{{ $ts._visibility.public }}</option> <template #label>{{ $ts.defaultNoteVisibility }}</template>
<option value="home">{{ $ts._visibility.home }}</option> <FormSelect v-model="defaultNoteVisibility" class="_formBlock">
<option value="followers">{{ $ts._visibility.followers }}</option> <option value="public">{{ $ts._visibility.public }}</option>
<option value="specified">{{ $ts._visibility.specified }}</option> <option value="home">{{ $ts._visibility.home }}</option>
</FormSelect> <option value="followers">{{ $ts._visibility.followers }}</option>
<FormSwitch v-model="defaultNoteLocalOnly">{{ $ts._visibility.localOnly }}</FormSwitch> <option value="specified">{{ $ts._visibility.specified }}</option>
</FormGroup> </FormSelect>
<FormSwitch v-model="keepCw" @update:modelValue="save()">{{ $ts.keepCw }}</FormSwitch> <FormSwitch v-model="defaultNoteLocalOnly" class="_formBlock">{{ $ts._visibility.localOnly }}</FormSwitch>
</FormBase> </FormGroup>
</FormSection>
<FormSwitch v-model="keepCw" class="_formBlock" @update:modelValue="save()">{{ $ts.keepCw }}</FormSwitch>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import FormSwitch from '@/components/debobigego/switch.vue'; import FormSwitch from '@/components/form/switch.vue';
import FormSelect from '@/components/debobigego/select.vue'; import FormSelect from '@/components/form/select.vue';
import FormBase from '@/components/debobigego/base.vue'; import FormSection from '@/components/form/section.vue';
import FormGroup from '@/components/debobigego/group.vue'; import FormGroup from '@/components/form/group.vue';
import * as os from '@/os'; import * as os from '@/os';
import { defaultStore } from '@/store'; import { defaultStore } from '@/store';
import * as symbols from '@/symbols'; import * as symbols from '@/symbols';
export default defineComponent({ export default defineComponent({
components: { components: {
FormBase,
FormSelect, FormSelect,
FormSection,
FormGroup, FormGroup,
FormSwitch, FormSwitch,
}, },

View file

@ -1,59 +1,58 @@
<template> <template>
<FormBase> <div class="_formRoot">
<FormGroup> <div class="llvierxe" :style="{ backgroundImage: $i.bannerUrl ? `url(${ $i.bannerUrl })` : null }">
<div class="_debobigegoItem _debobigegoPanel llvierxe" :style="{ backgroundImage: $i.bannerUrl ? `url(${ $i.bannerUrl })` : null }"> <div class="avatar _acrylic">
<MkAvatar class="avatar" :user="$i"/> <MkAvatar class="avatar" :user="$i" :disable-link="true" @click="changeAvatar"/>
<MkButton primary class="avatarEdit" @click="changeAvatar">{{ $ts._profile.changeAvatar }}</MkButton>
</div> </div>
<FormButton primary @click="changeAvatar">{{ $ts._profile.changeAvatar }}</FormButton> <MkButton primary class="bannerEdit" @click="changeBanner">{{ $ts._profile.changeBanner }}</MkButton>
<FormButton primary @click="changeBanner">{{ $ts._profile.changeBanner }}</FormButton> </div>
</FormGroup>
<FormInput v-model="name" :max="30" manual-save> <FormInput v-model="name" :max="30" manual-save class="_formBlock">
<span>{{ $ts._profile.name }}</span> <template #label>{{ $ts._profile.name }}</template>
</FormInput> </FormInput>
<FormTextarea v-model="description" :max="500" tall manual-save> <FormTextarea v-model="description" :max="500" tall manual-save class="_formBlock">
<span>{{ $ts._profile.description }}</span> <template #label>{{ $ts._profile.description }}</template>
<template #desc>{{ $ts._profile.youCanIncludeHashtags }}</template> <template #caption>{{ $ts._profile.youCanIncludeHashtags }}</template>
</FormTextarea> </FormTextarea>
<FormInput v-model="location" manual-save> <FormInput v-model="location" manual-save class="_formBlock">
<span>{{ $ts.location }}</span> <template #label>{{ $ts.location }}</template>
<template #prefix><i class="fas fa-map-marker-alt"></i></template> <template #prefix><i class="fas fa-map-marker-alt"></i></template>
</FormInput> </FormInput>
<FormInput v-model="birthday" type="date" manual-save> <FormInput v-model="birthday" type="date" manual-save class="_formBlock">
<span>{{ $ts.birthday }}</span> <template #label>{{ $ts.birthday }}</template>
<template #prefix><i class="fas fa-birthday-cake"></i></template> <template #prefix><i class="fas fa-birthday-cake"></i></template>
</FormInput> </FormInput>
<FormSelect v-model="lang"> <FormSelect v-model="lang" class="_formBlock">
<template #label>{{ $ts.language }}</template> <template #label>{{ $ts.language }}</template>
<option v-for="x in langs" :key="x[0]" :value="x[0]">{{ x[1] }}</option> <option v-for="x in langs" :key="x[0]" :value="x[0]">{{ x[1] }}</option>
</FormSelect> </FormSelect>
<FormGroup> <FormSlot>
<FormButton primary @click="editMetadata">{{ $ts._profile.metadataEdit }}</FormButton> <MkButton @click="editMetadata">{{ $ts._profile.metadataEdit }}</MkButton>
<template #caption>{{ $ts._profile.metadataDescription }}</template> <template #caption>{{ $ts._profile.metadataDescription }}</template>
</FormGroup> </FormSlot>
<FormSwitch v-model="isCat">{{ $ts.flagAsCat }}<template #desc>{{ $ts.flagAsCatDescription }}</template></FormSwitch> <FormSwitch v-model="isCat" class="_formBlock">{{ $ts.flagAsCat }}<template #caption>{{ $ts.flagAsCatDescription }}</template></FormSwitch>
<FormSwitch v-model="isBot">{{ $ts.flagAsBot }}<template #desc>{{ $ts.flagAsBotDescription }}</template></FormSwitch> <FormSwitch v-model="isBot" class="_formBlock">{{ $ts.flagAsBot }}<template #caption>{{ $ts.flagAsBotDescription }}</template></FormSwitch>
<FormSwitch v-model="alwaysMarkNsfw">{{ $ts.alwaysMarkSensitive }}</FormSwitch> <FormSwitch v-model="alwaysMarkNsfw" class="_formBlock">{{ $ts.alwaysMarkSensitive }}</FormSwitch>
</FormBase> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import FormButton from '@/components/debobigego/button.vue'; import MkButton from '@/components/ui/button.vue';
import FormInput from '@/components/debobigego/input.vue'; import FormInput from '@/components/form/input.vue';
import FormTextarea from '@/components/debobigego/textarea.vue'; import FormTextarea from '@/components/form/textarea.vue';
import FormSwitch from '@/components/debobigego/switch.vue'; import FormSwitch from '@/components/form/switch.vue';
import FormSelect from '@/components/debobigego/select.vue'; import FormSelect from '@/components/form/select.vue';
import FormBase from '@/components/debobigego/base.vue'; import FormSlot from '@/components/form/slot.vue';
import FormGroup from '@/components/debobigego/group.vue';
import { host, langs } from '@/config'; import { host, langs } from '@/config';
import { selectFile } from '@/scripts/select-file'; import { selectFile } from '@/scripts/select-file';
import * as os from '@/os'; import * as os from '@/os';
@ -61,13 +60,12 @@ import * as symbols from '@/symbols';
export default defineComponent({ export default defineComponent({
components: { components: {
FormButton, MkButton,
FormInput, FormInput,
FormTextarea, FormTextarea,
FormSwitch, FormSwitch,
FormSelect, FormSelect,
FormBase, FormSlot,
FormGroup,
}, },
emits: ['info'], emits: ['info'],
@ -257,25 +255,28 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
.llvierxe { .llvierxe {
position: relative; position: relative;
height: 150px;
background-size: cover; background-size: cover;
background-position: center; background-position: center;
border-radius: 10px;
> * { overflow: clip;
pointer-events: none;
}
> .avatar { > .avatar {
display: inline-block;
text-align: center;
padding: 16px;
> .avatar {
display: inline-block;
width: 72px;
height: 72px;
margin: 0 auto 16px auto;
}
}
> .bannerEdit {
position: absolute; position: absolute;
top: 0; top: 16px;
bottom: 0; right: 16px;
left: 0;
right: 0;
display: block;
width: 72px;
height: 72px;
margin: auto;
box-shadow: 0 0 0 6px rgba(0, 0, 0, 0.5);
} }
} }
</style> </style>

View file

@ -1,8 +1,8 @@
<template> <template>
<FormBase> <div class="_formRoot">
<div class="_debobigegoItem"> <FromSlot class="_formBlock">
<div class="_debobigegoLabel">{{ $ts.reactionSettingDescription }}</div> <template #label>{{ $ts.reactionSettingDescription }}</template>
<div class="_debobigegoPanel"> <div v-panel style="border-radius: 6px;">
<XDraggable v-model="reactions" class="zoaiodol" :item-key="item => item" animation="150" delay="100" delay-on-touch-only="true"> <XDraggable v-model="reactions" class="zoaiodol" :item-key="item => item" animation="150" delay="100" delay-on-touch-only="true">
<template #item="{element}"> <template #item="{element}">
<button class="_button item" @click="remove(element, $event)"> <button class="_button item" @click="remove(element, $event)">
@ -14,33 +14,38 @@
</template> </template>
</XDraggable> </XDraggable>
</div> </div>
<div class="_debobigegoCaption">{{ $ts.reactionSettingDescription2 }} <button class="_textButton" @click="preview">{{ $ts.preview }}</button></div> <template #caption>{{ $ts.reactionSettingDescription2 }} <button class="_textButton" @click="preview">{{ $ts.preview }}</button></template>
</div> </FromSlot>
<FormRadios v-model="reactionPickerWidth"> <FormRadios v-model="reactionPickerWidth" class="_formBlock">
<template #desc>{{ $ts.width }}</template> <template #label>{{ $ts.width }}</template>
<option :value="1">{{ $ts.small }}</option> <option :value="1">{{ $ts.small }}</option>
<option :value="2">{{ $ts.medium }}</option> <option :value="2">{{ $ts.medium }}</option>
<option :value="3">{{ $ts.large }}</option> <option :value="3">{{ $ts.large }}</option>
</FormRadios> </FormRadios>
<FormRadios v-model="reactionPickerHeight"> <FormRadios v-model="reactionPickerHeight" class="_formBlock">
<template #desc>{{ $ts.height }}</template> <template #label>{{ $ts.height }}</template>
<option :value="1">{{ $ts.small }}</option> <option :value="1">{{ $ts.small }}</option>
<option :value="2">{{ $ts.medium }}</option> <option :value="2">{{ $ts.medium }}</option>
<option :value="3">{{ $ts.large }}</option> <option :value="3">{{ $ts.large }}</option>
</FormRadios> </FormRadios>
<FormButton @click="preview"><i class="fas fa-eye"></i> {{ $ts.preview }}</FormButton> <FormSection>
<FormButton danger @click="setDefault"><i class="fas fa-undo"></i> {{ $ts.default }}</FormButton> <FormButton @click="preview"><i class="fas fa-eye"></i> {{ $ts.preview }}</FormButton>
</FormBase> </FormSection>
<FormSection>
<FormButton danger @click="setDefault"><i class="fas fa-undo"></i> {{ $ts.default }}</FormButton>
</FormSection>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import XDraggable from 'vuedraggable'; import XDraggable from 'vuedraggable';
import FormInput from '@/components/debobigego/input.vue'; import FormInput from '@/components/form/input.vue';
import FormRadios from '@/components/debobigego/radios.vue'; import FormRadios from '@/components/form/radios.vue';
import FormBase from '@/components/debobigego/base.vue'; import FromSlot from '@/components/form/slot.vue';
import FormButton from '@/components/debobigego/button.vue'; import FormButton from '@/components/ui/button.vue';
import FormSection from '@/components/form/section.vue';
import * as os from '@/os'; import * as os from '@/os';
import { defaultStore } from '@/store'; import { defaultStore } from '@/store';
import * as symbols from '@/symbols'; import * as symbols from '@/symbols';
@ -49,8 +54,9 @@ export default defineComponent({
components: { components: {
FormInput, FormInput,
FormButton, FormButton,
FormBase, FromSlot,
FormRadios, FormRadios,
FormSection,
XDraggable, XDraggable,
}, },
@ -135,7 +141,8 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
.zoaiodol { .zoaiodol {
padding: 16px; padding: 12px;
font-size: 1.1em;
> .item { > .item {
display: inline-block; display: inline-block;

View file

@ -1,45 +1,61 @@
<template> <template>
<FormBase> <div class="_formRoot">
<X2fa/> <FormSection>
<FormLink to="/settings/2fa"><template #icon><i class="fas fa-mobile-alt"></i></template>{{ $ts.twoStepAuthentication }}</FormLink> <template #label>{{ $ts.password }}</template>
<FormButton primary @click="change()">{{ $ts.changePassword }}</FormButton> <FormButton primary @click="change()">{{ $ts.changePassword }}</FormButton>
<FormPagination :pagination="pagination"> </FormSection>
<FormSection>
<template #label>{{ $ts.twoStepAuthentication }}</template>
<X2fa/>
</FormSection>
<FormSection>
<template #label>{{ $ts.signinHistory }}</template> <template #label>{{ $ts.signinHistory }}</template>
<template #default="{items}"> <FormPagination :pagination="pagination">
<div v-for="item in items" :key="item.id" class="_debobigegoPanel timnmucd"> <template #default="{items}">
<header> <div>
<i v-if="item.success" class="fas fa-check icon succ"></i> <div v-for="item in items" :key="item.id" v-panel class="timnmucd">
<i v-else class="fas fa-times-circle icon fail"></i> <header>
<code class="ip _monospace">{{ item.ip }}</code> <i v-if="item.success" class="fas fa-check icon succ"></i>
<MkTime :time="item.createdAt" class="time"/> <i v-else class="fas fa-times-circle icon fail"></i>
</header> <code class="ip _monospace">{{ item.ip }}</code>
</div> <MkTime :time="item.createdAt" class="time"/>
</template> </header>
</FormPagination> </div>
<FormGroup> </div>
<FormButton danger @click="regenerateToken"><i class="fas fa-sync-alt"></i> {{ $ts.regenerateLoginToken }}</FormButton> </template>
<template #caption>{{ $ts.regenerateLoginTokenDescription }}</template> </FormPagination>
</FormGroup> </FormSection>
</FormBase>
<FormSection>
<FormSlot>
<FormButton danger @click="regenerateToken"><i class="fas fa-sync-alt"></i> {{ $ts.regenerateLoginToken }}</FormButton>
<template #caption>{{ $ts.regenerateLoginTokenDescription }}</template>
</FormSlot>
</FormSection>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import FormBase from '@/components/debobigego/base.vue'; import FormSection from '@/components/form/section.vue';
import FormLink from '@/components/debobigego/link.vue'; import FormLink from '@/components/debobigego/link.vue';
import FormGroup from '@/components/debobigego/group.vue'; import FormSlot from '@/components/form/slot.vue';
import FormButton from '@/components/debobigego/button.vue'; import FormButton from '@/components/ui/button.vue';
import FormPagination from '@/components/debobigego/pagination.vue'; import FormPagination from '@/components/form/pagination.vue';
import X2fa from './2fa.vue';
import * as os from '@/os'; import * as os from '@/os';
import * as symbols from '@/symbols'; import * as symbols from '@/symbols';
export default defineComponent({ export default defineComponent({
components: { components: {
FormBase, FormSection,
FormLink, FormLink,
FormButton, FormButton,
FormPagination, FormPagination,
FormGroup, FormSlot,
X2fa,
}, },
emits: ['info'], emits: ['info'],
@ -115,6 +131,20 @@ export default defineComponent({
.timnmucd { .timnmucd {
padding: 16px; padding: 16px;
&:first-child {
border-top-left-radius: 6px;
border-top-right-radius: 6px;
}
&:last-child {
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
}
&:not(:last-child) {
border-bottom: solid 0.5px var(--divider);
}
> header { > header {
display: flex; display: flex;
align-items: center; align-items: center;

View file

@ -1,29 +1,28 @@
<template> <template>
<FormBase> <div class="_formRoot">
<FormRange v-model="masterVolume" :min="0" :max="1" :step="0.05"> <FormRange v-model="masterVolume" :min="0" :max="1" :step="0.05" :text-converter="(v) => `${Math.floor(v * 100)}%`" class="_formBlock">
<template #label><i class="fas fa-volume-icon"></i> {{ $ts.masterVolume }}</template> <template #label>{{ $ts.masterVolume }}</template>
</FormRange> </FormRange>
<FormGroup> <FormSection>
<template #label>{{ $ts.sounds }}</template> <template #label>{{ $ts.sounds }}</template>
<FormButton v-for="type in Object.keys(sounds)" :key="type" :center="false" @click="edit(type)"> <FormLink v-for="type in Object.keys(sounds)" :key="type" style="margin-bottom: 8px;" @click="edit(type)">
{{ $t('_sfx.' + type) }} {{ $t('_sfx.' + type) }}
<template #suffix>{{ sounds[type].type || $ts.none }}</template> <template #suffix>{{ sounds[type].type || $ts.none }}</template>
<template #suffixIcon><i class="fas fa-chevron-down"></i></template> <template #suffixIcon><i class="fas fa-chevron-down"></i></template>
</FormButton> </FormLink>
</FormGroup> </FormSection>
<FormButton danger @click="reset()"><i class="fas fa-redo"></i> {{ $ts.default }}</FormButton> <FormButton danger class="_formBlock" @click="reset()"><i class="fas fa-redo"></i> {{ $ts.default }}</FormButton>
</FormBase> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import FormRange from '@/components/debobigego/range.vue'; import FormRange from '@/components/form/range.vue';
import FormSelect from '@/components/debobigego/select.vue'; import FormButton from '@/components/ui/button.vue';
import FormBase from '@/components/debobigego/base.vue'; import FormLink from '@/components/form/link.vue';
import FormButton from '@/components/debobigego/button.vue'; import FormSection from '@/components/form/section.vue';
import FormGroup from '@/components/debobigego/group.vue';
import * as os from '@/os'; import * as os from '@/os';
import { ColdDeviceStorage } from '@/store'; import { ColdDeviceStorage } from '@/store';
import { playFile } from '@/scripts/sound'; import { playFile } from '@/scripts/sound';
@ -58,11 +57,10 @@ const soundsTypes = [
export default defineComponent({ export default defineComponent({
components: { components: {
FormSelect, FormLink,
FormButton, FormButton,
FormBase,
FormRange, FormRange,
FormGroup, FormSection,
}, },
emits: ['info'], emits: ['info'],

View file

@ -1,34 +1,35 @@
<template> <template>
<FormBase> <div class="_formRoot">
<FormGroup> <div v-panel class="rfqxtzch _formBlock">
<div class="rfqxtzch _debobigegoItem _debobigegoPanel"> <div class="toggle">
<div class="darkMode"> <div class="toggleWrapper">
<div class="toggleWrapper"> <input id="dn" v-model="darkMode" type="checkbox" class="dn"/>
<input id="dn" v-model="darkMode" type="checkbox" class="dn"/> <label for="dn" class="toggle">
<label for="dn" class="toggle"> <span class="before">{{ $ts.light }}</span>
<span class="before">{{ $ts.light }}</span> <span class="after">{{ $ts.dark }}</span>
<span class="after">{{ $ts.dark }}</span> <span class="toggle__handler">
<span class="toggle__handler"> <span class="crater crater--1"></span>
<span class="crater crater--1"></span> <span class="crater crater--2"></span>
<span class="crater crater--2"></span> <span class="crater crater--3"></span>
<span class="crater crater--3"></span> </span>
</span> <span class="star star--1"></span>
<span class="star star--1"></span> <span class="star star--2"></span>
<span class="star star--2"></span> <span class="star star--3"></span>
<span class="star star--3"></span> <span class="star star--4"></span>
<span class="star star--4"></span> <span class="star star--5"></span>
<span class="star star--5"></span> <span class="star star--6"></span>
<span class="star star--6"></span> </label>
</label>
</div>
</div> </div>
</div> </div>
<FormSwitch v-model="syncDeviceDarkMode">{{ $ts.syncDeviceDarkMode }}</FormSwitch> <div class="sync">
</FormGroup> <FormSwitch v-model="syncDeviceDarkMode">{{ $ts.syncDeviceDarkMode }}</FormSwitch>
</div>
</div>
<template v-if="darkMode"> <template v-if="darkMode">
<FormSelect v-model="darkThemeId"> <FormSelect v-model="darkThemeId" class="_formBlock">
<template #label>{{ $ts.themeForDarkMode }}</template> <template #label>{{ $ts.themeForDarkMode }}</template>
<template #prefix><i class="fas fa-moon"></i></template>
<optgroup :label="$ts.darkThemes"> <optgroup :label="$ts.darkThemes">
<option v-for="x in darkThemes" :key="x.id" :value="x.id">{{ x.name }}</option> <option v-for="x in darkThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
</optgroup> </optgroup>
@ -36,8 +37,9 @@
<option v-for="x in lightThemes" :key="x.id" :value="x.id">{{ x.name }}</option> <option v-for="x in lightThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
</optgroup> </optgroup>
</FormSelect> </FormSelect>
<FormSelect v-model="lightThemeId"> <FormSelect v-model="lightThemeId" class="_formBlock">
<template #label>{{ $ts.themeForLightMode }}</template> <template #label>{{ $ts.themeForLightMode }}</template>
<template #prefix><i class="fas fa-sun"></i></template>
<optgroup :label="$ts.lightThemes"> <optgroup :label="$ts.lightThemes">
<option v-for="x in lightThemes" :key="x.id" :value="x.id">{{ x.name }}</option> <option v-for="x in lightThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
</optgroup> </optgroup>
@ -47,8 +49,9 @@
</FormSelect> </FormSelect>
</template> </template>
<template v-else> <template v-else>
<FormSelect v-model="lightThemeId"> <FormSelect v-model="lightThemeId" class="_formBlock">
<template #label>{{ $ts.themeForLightMode }}</template> <template #label>{{ $ts.themeForLightMode }}</template>
<template #prefix><i class="fas fa-sun"></i></template>
<optgroup :label="$ts.lightThemes"> <optgroup :label="$ts.lightThemes">
<option v-for="x in lightThemes" :key="x.id" :value="x.id">{{ x.name }}</option> <option v-for="x in lightThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
</optgroup> </optgroup>
@ -56,8 +59,9 @@
<option v-for="x in darkThemes" :key="x.id" :value="x.id">{{ x.name }}</option> <option v-for="x in darkThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
</optgroup> </optgroup>
</FormSelect> </FormSelect>
<FormSelect v-model="darkThemeId"> <FormSelect v-model="darkThemeId" class="_formBlock">
<template #label>{{ $ts.themeForDarkMode }}</template> <template #label>{{ $ts.themeForDarkMode }}</template>
<template #prefix><i class="fas fa-moon"></i></template>
<optgroup :label="$ts.darkThemes"> <optgroup :label="$ts.darkThemes">
<option v-for="x in darkThemes" :key="x.id" :value="x.id">{{ x.name }}</option> <option v-for="x in darkThemes" :key="x.id" :value="x.id">{{ x.name }}</option>
</optgroup> </optgroup>
@ -67,31 +71,28 @@
</FormSelect> </FormSelect>
</template> </template>
<FormButton v-if="wallpaper == null" primary @click="setWallpaper">{{ $ts.setWallpaper }}</FormButton> <FormSection>
<FormButton v-else primary @click="wallpaper = null">{{ $ts.removeWallpaper }}</FormButton> <div class="_formLinksGrid">
<FormLink to="/settings/theme/manage"><template #icon><i class="fas fa-folder-open"></i></template>{{ $ts._theme.manage }}<template #suffix>{{ themesCount }}</template></FormLink>
<FormLink to="https://assets.misskey.io/theme/list" external><template #icon><i class="fas fa-globe"></i></template>{{ $ts._theme.explore }}</FormLink>
<FormLink to="/settings/theme/install"><template #icon><i class="fas fa-download"></i></template>{{ $ts._theme.install }}</FormLink>
<FormLink to="/theme-editor"><template #icon><i class="fas fa-paint-roller"></i></template>{{ $ts._theme.make }}</FormLink>
</div>
</FormSection>
<FormGroup> <FormButton v-if="wallpaper == null" class="_formBlock" @click="setWallpaper">{{ $ts.setWallpaper }}</FormButton>
<FormLink to="https://assets.misskey.io/theme/list" external><template #icon><i class="fas fa-globe"></i></template>{{ $ts._theme.explore }}</FormLink> <FormButton v-else class="_formBlock" @click="wallpaper = null">{{ $ts.removeWallpaper }}</FormButton>
<FormLink to="/settings/theme/install"><template #icon><i class="fas fa-download"></i></template>{{ $ts._theme.install }}</FormLink> </div>
</FormGroup>
<FormGroup>
<FormLink to="/theme-editor"><template #icon><i class="fas fa-paint-roller"></i></template>{{ $ts._theme.make }}</FormLink>
<!--<FormLink to="/advanced-theme-editor"><template #icon><i class="fas fa-paint-roller"></i></template>{{ $ts._theme.make }} ({{ $ts.advanced }})</FormLink>-->
</FormGroup>
<FormLink to="/settings/theme/manage"><template #icon><i class="fas fa-folder-open"></i></template>{{ $ts._theme.manage }}<template #suffix>{{ themesCount }}</template></FormLink>
</FormBase>
</template> </template>
<script lang="ts"> <script lang="ts">
import { computed, defineComponent, onActivated, onMounted, ref, watch } from 'vue'; import { computed, defineComponent, onActivated, onMounted, ref, watch } from 'vue';
import FormSwitch from '@/components/debobigego/switch.vue'; import FormSwitch from '@/components/form/switch.vue';
import FormSelect from '@/components/debobigego/select.vue'; import FormSelect from '@/components/form/select.vue';
import FormBase from '@/components/debobigego/base.vue'; import FormGroup from '@/components/form/group.vue';
import FormGroup from '@/components/debobigego/group.vue'; import FormSection from '@/components/form/section.vue';
import FormLink from '@/components/debobigego/link.vue'; import FormLink from '@/components/form/link.vue';
import FormButton from '@/components/debobigego/button.vue'; import FormButton from '@/components/ui/button.vue';
import { builtinThemes } from '@/scripts/theme'; import { builtinThemes } from '@/scripts/theme';
import { selectFile } from '@/scripts/select-file'; import { selectFile } from '@/scripts/select-file';
import { isDeviceDarkmode } from '@/scripts/is-device-darkmode'; import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
@ -105,8 +106,8 @@ export default defineComponent({
components: { components: {
FormSwitch, FormSwitch,
FormSelect, FormSelect,
FormBase,
FormGroup, FormGroup,
FormSection,
FormLink, FormLink,
FormButton, FormButton,
}, },
@ -198,11 +199,12 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
.rfqxtzch { .rfqxtzch {
padding: 16px; border-radius: 6px;
> .darkMode { > .toggle {
position: relative; position: relative;
padding: 32px 0; padding: 26px 0;
text-align: center;
&.disabled { &.disabled {
opacity: 0.7; opacity: 0.7;
@ -212,13 +214,11 @@ export default defineComponent({
} }
} }
.toggleWrapper { > .toggleWrapper {
position: absolute; display: inline-block;
top: 50%; text-align: left;
left: 50%; overflow: clip;
overflow: hidden;
padding: 0 100px; padding: 0 100px;
transform: translate3d(-50%, -50%, 0);
input { input {
position: absolute; position: absolute;
@ -239,7 +239,6 @@ export default defineComponent({
> .before, > .after { > .before, > .after {
position: absolute; position: absolute;
top: 15px; top: 15px;
font-size: 18px;
transition: color 1s ease; transition: color 1s ease;
} }
@ -420,5 +419,10 @@ export default defineComponent({
} }
} }
} }
> .sync {
padding: 14px 16px;
border-top: solid 0.5px var(--divider);
}
} }
</style> </style>

View file

@ -1,32 +1,30 @@
<template> <template>
<div> <div class="_formRoot">
<MkTab v-model="tab"> <MkTab v-model="tab" class="_formBlock">
<option value="soft">{{ $ts._wordMute.soft }}</option> <option value="soft">{{ $ts._wordMute.soft }}</option>
<option value="hard">{{ $ts._wordMute.hard }}</option> <option value="hard">{{ $ts._wordMute.hard }}</option>
</MkTab> </MkTab>
<FormBase> <div class="_formBlock">
<div class="_debobigegoItem"> <div v-show="tab === 'soft'">
<div v-show="tab === 'soft'"> <MkInfo class="_formBlock">{{ $ts._wordMute.softDescription }}</MkInfo>
<FormInfo>{{ $ts._wordMute.softDescription }}</FormInfo> <FormTextarea v-model="softMutedWords" class="_formBlock">
<FormTextarea v-model="softMutedWords"> <span>{{ $ts._wordMute.muteWords }}</span>
<span>{{ $ts._wordMute.muteWords }}</span> <template #caption>{{ $ts._wordMute.muteWordsDescription }}<br>{{ $ts._wordMute.muteWordsDescription2 }}</template>
<template #desc>{{ $ts._wordMute.muteWordsDescription }}<br>{{ $ts._wordMute.muteWordsDescription2 }}</template> </FormTextarea>
</FormTextarea>
</div>
<div v-show="tab === 'hard'">
<FormInfo>{{ $ts._wordMute.hardDescription }}</FormInfo>
<FormTextarea v-model="hardMutedWords">
<span>{{ $ts._wordMute.muteWords }}</span>
<template #desc>{{ $ts._wordMute.muteWordsDescription }}<br>{{ $ts._wordMute.muteWordsDescription2 }}</template>
</FormTextarea>
<FormKeyValueView v-if="hardWordMutedNotesCount != null">
<template #key>{{ $ts._wordMute.mutedNotes }}</template>
<template #value>{{ number(hardWordMutedNotesCount) }}</template>
</FormKeyValueView>
</div>
</div> </div>
<FormButton primary inline :disabled="!changed" @click="save()"><i class="fas fa-save"></i> {{ $ts.save }}</FormButton> <div v-show="tab === 'hard'">
</FormBase> <MkInfo class="_formBlock">{{ $ts._wordMute.hardDescription }}</MkInfo>
<FormTextarea v-model="hardMutedWords" class="_formBlock">
<span>{{ $ts._wordMute.muteWords }}</span>
<template #caption>{{ $ts._wordMute.muteWordsDescription }}<br>{{ $ts._wordMute.muteWordsDescription2 }}</template>
</FormTextarea>
<MkKeyValue v-if="hardWordMutedNotesCount != null" class="_formBlock">
<template #key>{{ $ts._wordMute.mutedNotes }}</template>
<template #value>{{ number(hardWordMutedNotesCount) }}</template>
</MkKeyValue>
</div>
</div>
<MkButton primary inline :disabled="!changed" @click="save()"><i class="fas fa-save"></i> {{ $ts.save }}</MkButton>
</div> </div>
</template> </template>
@ -34,9 +32,9 @@
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import FormTextarea from '@/components/form/textarea.vue'; import FormTextarea from '@/components/form/textarea.vue';
import FormBase from '@/components/debobigego/base.vue'; import FormBase from '@/components/debobigego/base.vue';
import FormKeyValueView from '@/components/debobigego/key-value-view.vue'; import MkKeyValue from '@/components/key-value.vue';
import FormButton from '@/components/debobigego/button.vue'; import MkButton from '@/components/ui/button.vue';
import FormInfo from '@/components/debobigego/info.vue'; import MkInfo from '@/components/ui/info.vue';
import MkTab from '@/components/tab.vue'; import MkTab from '@/components/tab.vue';
import * as os from '@/os'; import * as os from '@/os';
import number from '@/filters/number'; import number from '@/filters/number';
@ -45,11 +43,11 @@ import * as symbols from '@/symbols';
export default defineComponent({ export default defineComponent({
components: { components: {
FormBase, FormBase,
FormButton, MkButton,
FormTextarea, FormTextarea,
FormKeyValueView, MkKeyValue,
MkTab, MkTab,
FormInfo, MkInfo,
}, },
emits: ['info'], emits: ['info'],

View file

@ -29,6 +29,7 @@ html {
overflow: auto; overflow: auto;
overflow-wrap: break-word; overflow-wrap: break-word;
font-family: "BIZ UDGothic", Roboto, HelveticaNeue, Arial, sans-serif; font-family: "BIZ UDGothic", Roboto, HelveticaNeue, Arial, sans-serif;
font-size: 15px;
line-height: 1.35; line-height: 1.35;
text-size-adjust: 100%; text-size-adjust: 100%;
tab-size: 2; tab-size: 2;
@ -387,9 +388,8 @@ hr {
._inputSplit { ._inputSplit {
display: grid; display: grid;
grid-template-columns: repeat(auto-fill, minmax(170px, 1fr)); grid-template-columns: repeat(auto-fill, minmax(210px, 1fr));
grid-gap: 8px; grid-gap: 12px;
margin: 1em 0;
> * { > * {
margin: 0 !important; margin: 0 !important;
@ -397,7 +397,7 @@ hr {
} }
._formBlock { ._formBlock {
margin: 20px 0; margin: 1.5em 0;
} }
._formRoot { ._formRoot {
@ -410,6 +410,18 @@ hr {
} }
} }
._formLinksGrid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
grid-gap: 12px;
}
._formLinks {
> *:not(:last-child) {
margin-bottom: 8px;
}
}
._table { ._table {
> ._row { > ._row {
display: flex; display: flex;