profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

🎨

Browse source
This commit is contained in:
syuilo 2021-08-06 22:29:19 +09:00
parent 48113f3afd
commit 46d5711071
62 changed files with 732 additions and 755 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/client/components/abuse-report-window.vue
View file

@ -10,9 +10,9 @@
</template> </template>
<div class="dpvffvvy _monolithic_"> <div class="dpvffvvy _monolithic_">
<div class="_section"> <div class="_section">
<MkTextarea v-model:value="comment"> <MkTextarea v-model="comment">
<span>{{ $ts.details }}</span> <template #label>{{ $ts.details }}</template>
<template #desc>{{ $ts.fillAbuseReportDescription }}</template> <template #caption>{{ $ts.fillAbuseReportDescription }}</template>
</MkTextarea> </MkTextarea>
</div> </div>
<div class="_section"> <div class="_section">

4
src/client/components/dialog.vue
View file

@ -14,8 +14,8 @@
</div> </div>
<header v-if="title"><Mfm :text="title"/></header> <header v-if="title"><Mfm :text="title"/></header>
<div class="body" v-if="text"><Mfm :text="text"/></div> <div class="body" v-if="text"><Mfm :text="text"/></div>
<MkInput v-if="input" v-model:value="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"></MkInput>
<MkSelect v-if="select" v-model:value="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>
</template> </template>

10
src/client/components/forgot-password.vue
View file

@ -9,14 +9,14 @@
<form class="_monolithic_" @submit.prevent="onSubmit" v-if="$instance.enableEmail"> <form class="_monolithic_" @submit.prevent="onSubmit" v-if="$instance.enableEmail">
<div class="_section"> <div class="_section">
<MkInput v-model:value="username" type="text" pattern="^[a-zA-Z0-9_]+$" spellcheck="false" autofocus required> <MkInput v-model="username" type="text" pattern="^[a-zA-Z0-9_]+$" spellcheck="false" autofocus required>
<span>{{ $ts.username }}</span> <template #label>{{ $ts.username }}</template>
<template #prefix>@</template> <template #prefix>@</template>
</MkInput> </MkInput>
<MkInput v-model:value="email" type="email" spellcheck="false" required> <MkInput v-model="email" type="email" spellcheck="false" required>
<span>{{ $ts.emailAddress }}</span> <template #label>{{ $ts.emailAddress }}</template>
<template #desc>{{ $ts._forgotPassword.enterEmail }}</template> <template #caption>{{ $ts._forgotPassword.enterEmail }}</template>
</MkInput> </MkInput>
<MkButton type="submit" :disabled="processing" primary style="margin: 0 auto;">{{ $ts.send }}</MkButton> <MkButton type="submit" :disabled="processing" primary style="margin: 0 auto;">{{ $ts.send }}</MkButton>

4
src/client/components/instance-stats.vue
View file

@ -1,7 +1,7 @@
<template> <template>
<div class="zbcjwnqg" style="margin-top: -8px;"> <div class="zbcjwnqg" style="margin-top: -8px;">
<div class="selects" style="display: flex;"> <div class="selects" style="display: flex;">
<MkSelect v-model:value="chartSrc" style="margin: 0; flex: 1;"> <MkSelect v-model="chartSrc" style="margin: 0; flex: 1;">
<optgroup :label="$ts.federation"> <optgroup :label="$ts.federation">
<option value="federation-instances">{{ $ts._charts.federationInstancesIncDec }}</option> <option value="federation-instances">{{ $ts._charts.federationInstancesIncDec }}</option>
<option value="federation-instances-total">{{ $ts._charts.federationInstancesTotal }}</option> <option value="federation-instances-total">{{ $ts._charts.federationInstancesTotal }}</option>
@ -24,7 +24,7 @@
<option value="drive-total">{{ $ts._charts.storageUsageTotal }}</option> <option value="drive-total">{{ $ts._charts.storageUsageTotal }}</option>
</optgroup> </optgroup>
</MkSelect> </MkSelect>
<MkSelect v-model:value="chartSpan" style="margin: 0;"> <MkSelect v-model="chartSpan" style="margin: 0;">
<option value="hour">{{ $ts.perHour }}</option> <option value="hour">{{ $ts.perHour }}</option>
<option value="day">{{ $ts.perDay }}</option> <option value="day">{{ $ts.perDay }}</option>
</MkSelect> </MkSelect>

6
src/client/components/notification-setting-window.vue
View file

@ -11,16 +11,16 @@
<template #header>{{ $ts.notificationSetting }}</template> <template #header>{{ $ts.notificationSetting }}</template>
<div class="_monolithic_"> <div class="_monolithic_">
<div v-if="showGlobalToggle" class="_section"> <div v-if="showGlobalToggle" class="_section">
<MkSwitch v-model:value="useGlobalSetting"> <MkSwitch v-model="useGlobalSetting">
{{ $ts.useGlobalSetting }} {{ $ts.useGlobalSetting }}
<template #desc>{{ $ts.useGlobalSettingDesc }}</template> <template #caption>{{ $ts.useGlobalSettingDesc }}</template>
</MkSwitch> </MkSwitch>
</div> </div>
<div v-if="!useGlobalSetting" class="_section"> <div v-if="!useGlobalSetting" class="_section">
<MkInfo>{{ $ts.notificationSettingDesc }}</MkInfo> <MkInfo>{{ $ts.notificationSettingDesc }}</MkInfo>
<MkButton inline @click="disableAll">{{ $ts.disableAll }}</MkButton> <MkButton inline @click="disableAll">{{ $ts.disableAll }}</MkButton>
<MkButton inline @click="enableAll">{{ $ts.enableAll }}</MkButton> <MkButton inline @click="enableAll">{{ $ts.enableAll }}</MkButton>
<MkSwitch v-for="type in notificationTypes" :key="type" v-model:value="typesMap[type]">{{ $t(`_notification._types.${type}`) }}</MkSwitch> <MkSwitch v-for="type in notificationTypes" :key="type" v-model="typesMap[type]">{{ $t(`_notification._types.${type}`) }}</MkSwitch>
</div> </div>
</div> </div>
</XModalWindow> </XModalWindow>

4
src/client/components/page/page.number-input.vue
View file

@ -1,6 +1,8 @@
<template> <template>
<div> <div>
<MkInput class="kudkigyw" :value="value" @update:value="updateValue($event)" type="number">{{ hpml.interpolate(block.text) }}</MkInput> <MkInput class="kudkigyw" :model-value="value" @update:modelValue="updateValue($event)" type="number">
<template #label>{{ hpml.interpolate(block.text) }}</template>
</MkInput>
</div> </div>
</template> </template>

2
src/client/components/page/page.post.vue
View file

@ -1,6 +1,6 @@
<template> <template>
<div class="ngbfujlo"> <div class="ngbfujlo">
<MkTextarea :value="text" readonly style="margin: 0;"></MkTextarea> <MkTextarea :model-value="text" readonly style="margin: 0;"></MkTextarea>
<MkButton class="button" primary @click="post()" :disabled="posting || posted"> <MkButton class="button" primary @click="post()" :disabled="posting || posted">
<i v-if="posted" class="fas fa-check"></i> <i v-if="posted" class="fas fa-check"></i>
<i v-else class="fas fa-paper-plane"></i> <i v-else class="fas fa-paper-plane"></i>

2
src/client/components/page/page.switch.vue
View file

@ -1,6 +1,6 @@
<template> <template>
<div class="hkcxmtwj"> <div class="hkcxmtwj">
<MkSwitch :value="value" @update:value="updateValue($event)">{{ hpml.interpolate(block.text) }}</MkSwitch> <MkSwitch :model-value="value" @update:modelValue="updateValue($event)">{{ hpml.interpolate(block.text) }}</MkSwitch>
</div> </div>
</template> </template>

4
src/client/components/page/page.text-input.vue
View file

@ -1,6 +1,8 @@
<template> <template>
<div> <div>
<MkInput class="kudkigyw" :value="value" @update:value="updateValue($event)" type="text">{{ hpml.interpolate(block.text) }}</MkInput> <MkInput class="kudkigyw" :model-value="value" @update:modelValue="updateValue($event)" type="text">
<template #label>{{ hpml.interpolate(block.text) }}</template>
</MkInput>
</div> </div>
</template> </template>

4
src/client/components/page/page.textarea-input.vue
View file

@ -1,6 +1,8 @@
<template> <template>
<div> <div>
<MkTextarea :value="value" @update:value="updateValue($event)">{{ hpml.interpolate(block.text) }}</MkTextarea> <MkTextarea :model-value="value" @update:modelValue="updateValue($event)">
<template #label>{{ hpml.interpolate(block.text) }}</template>
</MkTextarea>
</div> </div>
</template> </template>

2
src/client/components/page/page.textarea.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<MkTextarea :value="text" readonly></MkTextarea> <MkTextarea :model-value="text" readonly></MkTextarea>
</template> </template>
<script lang="ts"> <script lang="ts">

22
src/client/components/poll-editor.vue
View file

@ -5,8 +5,8 @@
</p> </p>
<ul ref="choices"> <ul ref="choices">
<li v-for="(choice, i) in choices" :key="i"> <li v-for="(choice, i) in choices" :key="i">
<MkInput class="input" :value="choice" @update:value="onInput(i, $event)"> <MkInput class="input" :model-value="choice" @update:modelValue="onInput(i, $event)">
<span>{{ $t('_poll.choiceN', { n: i + 1 }) }}</span> <template #label>{{ $t('_poll.choiceN', { n: i + 1 }) }}</template>
</MkInput> </MkInput>
<button @click="remove(i)" class="_button"> <button @click="remove(i)" class="_button">
<i class="fas fa-times"></i> <i class="fas fa-times"></i>
@ -16,27 +16,27 @@
<MkButton class="add" v-if="choices.length < 10" @click="add">{{ $ts.add }}</MkButton> <MkButton class="add" v-if="choices.length < 10" @click="add">{{ $ts.add }}</MkButton>
<MkButton class="add" v-else disabled>{{ $ts._poll.noMore }}</MkButton> <MkButton class="add" v-else disabled>{{ $ts._poll.noMore }}</MkButton>
<section> <section>
<MkSwitch v-model:value="multiple">{{ $ts._poll.canMultipleVote }}</MkSwitch> <MkSwitch v-model="multiple">{{ $ts._poll.canMultipleVote }}</MkSwitch>
<div> <div>
<MkSelect v-model:value="expiration"> <MkSelect v-model="expiration">
<template #label>{{ $ts._poll.expiration }}</template> <template #label>{{ $ts._poll.expiration }}</template>
<option value="infinite">{{ $ts._poll.infinite }}</option> <option value="infinite">{{ $ts._poll.infinite }}</option>
<option value="at">{{ $ts._poll.at }}</option> <option value="at">{{ $ts._poll.at }}</option>
<option value="after">{{ $ts._poll.after }}</option> <option value="after">{{ $ts._poll.after }}</option>
</MkSelect> </MkSelect>
<section v-if="expiration === 'at'"> <section v-if="expiration === 'at'">
<MkInput v-model:value="atDate" type="date" class="input"> <MkInput v-model="atDate" type="date" class="input">
<span>{{ $ts._poll.deadlineDate }}</span> <template #label>{{ $ts._poll.deadlineDate }}</template>
</MkInput> </MkInput>
<MkInput v-model:value="atTime" type="time" class="input"> <MkInput v-model="atTime" type="time" class="input">
<span>{{ $ts._poll.deadlineTime }}</span> <template #label>{{ $ts._poll.deadlineTime }}</template>
</MkInput> </MkInput>
</section> </section>
<section v-if="expiration === 'after'"> <section v-if="expiration === 'after'">
<MkInput v-model:value="after" type="number" class="input"> <MkInput v-model="after" type="number" class="input">
<span>{{ $ts._poll.duration }}</span> <template #label>{{ $ts._poll.duration }}</template>
</MkInput> </MkInput>
<MkSelect v-model:value="unit"> <MkSelect v-model="unit">
<option value="second">{{ $ts._time.second }}</option> <option value="second">{{ $ts._time.second }}</option>
<option value="minute">{{ $ts._time.minute }}</option> <option value="minute">{{ $ts._time.minute }}</option>
<option value="hour">{{ $ts._time.hour }}</option> <option value="hour">{{ $ts._time.hour }}</option>

6
src/client/components/sample.vue
View file

@ -1,10 +1,10 @@
<template> <template>
<div class="_card"> <div class="_card">
<div class="_content"> <div class="_content">
<MkInput v-model:value="text"> <MkInput v-model="text">
<span>Text</span> <template #label>Text</template>
</MkInput> </MkInput>
<MkSwitch v-model:value="flag"> <MkSwitch v-model="flag">
<span>Switch is now {{ flag ? 'on' : 'off' }}</span> <span>Switch is now {{ flag ? 'on' : 'off' }}</span>
</MkSwitch> </MkSwitch>
<div style="margin: 32px 0;"> <div style="margin: 32px 0;">

18
src/client/components/signin.vue
View file

@ -3,15 +3,15 @@
<div class="auth _section"> <div class="auth _section">
<div class="avatar" :style="{ backgroundImage: user ? `url('${ user.avatarUrl }')` : null }" v-show="withAvatar"></div> <div class="avatar" :style="{ backgroundImage: user ? `url('${ user.avatarUrl }')` : null }" v-show="withAvatar"></div>
<div class="normal-signin" v-if="!totpLogin"> <div class="normal-signin" v-if="!totpLogin">
<MkInput v-model:value="username" type="text" pattern="^[a-zA-Z0-9_]+$" spellcheck="false" autofocus required @update:value="onUsernameChange"> <MkInput v-model="username" type="text" pattern="^[a-zA-Z0-9_]+$" spellcheck="false" autofocus required @update:modelValue="onUsernameChange">
<span>{{ $ts.username }}</span> <template #label>{{ $ts.username }}</template>
<template #prefix>@</template> <template #prefix>@</template>
<template #suffix>@{{ host }}</template> <template #suffix>@{{ host }}</template>
</MkInput> </MkInput>
<MkInput v-model:value="password" type="password" :with-password-toggle="true" v-if="!user || user && !user.usePasswordLessLogin" required> <MkInput v-model="password" type="password" :with-password-toggle="true" v-if="!user || user && !user.usePasswordLessLogin" required>
<span>{{ $ts.password }}</span> <template #label>{{ $ts.password }}</template>
<template #prefix><i class="fas fa-lock"></i></template> <template #prefix><i class="fas fa-lock"></i></template>
<template #desc><button class="_textButton" @click="resetPassword">{{ $ts.forgotPassword }}</button></template> <template #caption><button class="_textButton" @click="resetPassword" type="button">{{ $ts.forgotPassword }}</button></template>
</MkInput> </MkInput>
<MkButton type="submit" primary :disabled="signing" style="margin: 0 auto;">{{ signing ? $ts.loggingIn : $ts.login }}</MkButton> <MkButton type="submit" primary :disabled="signing" style="margin: 0 auto;">{{ signing ? $ts.loggingIn : $ts.login }}</MkButton>
</div> </div>
@ -27,12 +27,12 @@
</div> </div>
<div class="twofa-group totp-group"> <div class="twofa-group totp-group">
<p style="margin-bottom:0;">{{ $ts.twoStepAuthentication }}</p> <p style="margin-bottom:0;">{{ $ts.twoStepAuthentication }}</p>
<MkInput v-model:value="password" type="password" :with-password-toggle="true" v-if="user && user.usePasswordLessLogin" required> <MkInput v-model="password" type="password" :with-password-toggle="true" v-if="user && user.usePasswordLessLogin" required>
<span>{{ $ts.password }}</span> <template #label>{{ $ts.password }}</template>
<template #prefix><i class="fas fa-lock"></i></template> <template #prefix><i class="fas fa-lock"></i></template>
</MkInput> </MkInput>
<MkInput v-model:value="token" type="text" pattern="^[0-9]{6}$" autocomplete="off" spellcheck="false" required> <MkInput v-model="token" type="text" pattern="^[0-9]{6}$" autocomplete="off" spellcheck="false" required>
<span>{{ $ts.token }}</span> <template #label>{{ $ts.token }}</template>
<template #prefix><i class="fas fa-gavel"></i></template> <template #prefix><i class="fas fa-gavel"></i></template>
</MkInput> </MkInput>
<MkButton type="submit" :disabled="signing" primary style="margin: 0 auto;">{{ signing ? $ts.loggingIn : $ts.login }}</MkButton> <MkButton type="submit" :disabled="signing" primary style="margin: 0 auto;">{{ signing ? $ts.loggingIn : $ts.login }}</MkButton>

44
src/client/components/signup.vue
View file

@ -1,39 +1,39 @@
<template> <template>
<form class="mk-signup" @submit.prevent="onSubmit" :autocomplete="Math.random()"> <form class="mk-signup" @submit.prevent="onSubmit" :autocomplete="Math.random()">
<template v-if="meta"> <template v-if="meta">
<MkInput v-if="meta.disableRegistration" v-model:value="invitationCode" type="text" :autocomplete="Math.random()" spellcheck="false" required> <MkInput v-if="meta.disableRegistration" v-model="invitationCode" type="text" :autocomplete="Math.random()" spellcheck="false" required>
<span>{{ $ts.invitationCode }}</span> <template #label>{{ $ts.invitationCode }}</template>
<template #prefix><i class="fas fa-key"></i></template> <template #prefix><i class="fas fa-key"></i></template>
</MkInput> </MkInput>
<MkInput v-model:value="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" spellcheck="false" required @update:value="onChangeUsername"> <MkInput v-model="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" spellcheck="false" required @update:modelValue="onChangeUsername">
<span>{{ $ts.username }}</span> <template #label>{{ $ts.username }}</template>
<template #prefix>@</template> <template #prefix>@</template>
<template #suffix>@{{ host }}</template> <template #suffix>@{{ host }}</template>
<template #desc> <template #caption>
<span v-if="usernameState == 'wait'" style="color:#999"><i class="fas fa-spinner fa-pulse fa-fw"></i> {{ $ts.checking }}</span> <span v-if="usernameState == 'wait'" style="color:#999"><i class="fas fa-spinner fa-pulse fa-fw"></i> {{ $ts.checking }}</span>
<span v-if="usernameState == 'ok'" style="color:#3CB7B5"><i class="fas fa-check fa-fw"></i> {{ $ts.available }}</span> <span v-if="usernameState == 'ok'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ $ts.available }}</span>
<span v-if="usernameState == 'unavailable'" style="color:#FF1161"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.unavailable }}</span> <span v-if="usernameState == 'unavailable'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.unavailable }}</span>
<span v-if="usernameState == 'error'" style="color:#FF1161"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.error }}</span> <span v-if="usernameState == 'error'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.error }}</span>
<span v-if="usernameState == 'invalid-format'" style="color:#FF1161"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.usernameInvalidFormat }}</span> <span v-if="usernameState == 'invalid-format'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.usernameInvalidFormat }}</span>
<span v-if="usernameState == 'min-range'" style="color:#FF1161"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.tooShort }}</span> <span v-if="usernameState == 'min-range'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.tooShort }}</span>
<span v-if="usernameState == 'max-range'" style="color:#FF1161"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.tooLong }}</span> <span v-if="usernameState == 'max-range'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.tooLong }}</span>
</template> </template>
</MkInput> </MkInput>
<MkInput v-model:value="password" type="password" :autocomplete="Math.random()" required @update:value="onChangePassword"> <MkInput v-model="password" type="password" :autocomplete="Math.random()" required @update:modelValue="onChangePassword">
<span>{{ $ts.password }}</span> <template #label>{{ $ts.password }}</template>
<template #prefix><i class="fas fa-lock"></i></template> <template #prefix><i class="fas fa-lock"></i></template>
<template #desc> <template #caption>
<p v-if="passwordStrength == 'low'" style="color:#FF1161"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.weakPassword }}</p> <span v-if="passwordStrength == 'low'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.weakPassword }}</span>
<p v-if="passwordStrength == 'medium'" style="color:#3CB7B5"><i class="fas fa-check fa-fw"></i> {{ $ts.normalPassword }}</p> <span v-if="passwordStrength == 'medium'" style="color: var(--warn)"><i class="fas fa-check fa-fw"></i> {{ $ts.normalPassword }}</span>
<p v-if="passwordStrength == 'high'" style="color:#3CB7B5"><i class="fas fa-check fa-fw"></i> {{ $ts.strongPassword }}</p> <span v-if="passwordStrength == 'high'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ $ts.strongPassword }}</span>
</template> </template>
</MkInput> </MkInput>
<MkInput v-model:value="retypedPassword" type="password" :autocomplete="Math.random()" required @update:value="onChangePasswordRetype"> <MkInput v-model="retypedPassword" type="password" :autocomplete="Math.random()" required @update:modelValue="onChangePasswordRetype">
<span>{{ $ts.password }} ({{ $ts.retype }})</span> <template #label>{{ $ts.password }} ({{ $ts.retype }})</template>
<template #prefix><i class="fas fa-lock"></i></template> <template #prefix><i class="fas fa-lock"></i></template>
<template #desc> <template #caption>
<p v-if="passwordRetypeState == 'match'" style="color:#3CB7B5"><i class="fas fa-check fa-fw"></i> {{ $ts.passwordMatched }}</p> <span v-if="passwordRetypeState == 'match'" style="color: var(--success)"><i class="fas fa-check fa-fw"></i> {{ $ts.passwordMatched }}</span>
<p v-if="passwordRetypeState == 'not-match'" style="color:#FF1161"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.passwordNotMatched }}</p> <span v-if="passwordRetypeState == 'not-match'" style="color: var(--error)"><i class="fas fa-exclamation-triangle fa-fw"></i> {{ $ts.passwordNotMatched }}</span>
</template> </template>
</MkInput> </MkInput>
<label v-if="meta.tosUrl" class="tou"> <label v-if="meta.tosUrl" class="tou">

6
src/client/components/token-generate-window.vue
View file

@ -14,13 +14,15 @@
<MkInfo warn>{{ information }}</MkInfo> <MkInfo warn>{{ information }}</MkInfo>
</div> </div>
<div class="_section"> <div class="_section">
<MkInput v-model:value="name">{{ $ts.name }}</MkInput> <MkInput v-model="name">
<template #label>{{ $ts.name }}</template>
</MkInput>
</div> </div>
<div class="_section"> <div class="_section">
<div style="margin-bottom: 16px;"><b>{{ $ts.permission }}</b></div> <div style="margin-bottom: 16px;"><b>{{ $ts.permission }}</b></div>
<MkButton inline @click="disableAll">{{ $ts.disableAll }}</MkButton> <MkButton inline @click="disableAll">{{ $ts.disableAll }}</MkButton>
<MkButton inline @click="enableAll">{{ $ts.enableAll }}</MkButton> <MkButton inline @click="enableAll">{{ $ts.enableAll }}</MkButton>
<MkSwitch v-for="kind in (initialPermissions || kinds)" :key="kind" v-model:value="permissions[kind]">{{ $t(`_permissions.${kind}`) }}</MkSwitch> <MkSwitch v-for="kind in (initialPermissions || kinds)" :key="kind" v-model="permissions[kind]">{{ $t(`_permissions.${kind}`) }}</MkSwitch>
</div> </div>
</XModalWindow> </XModalWindow>
</template> </template>

285
src/client/components/ui/input.vue
View file

@ -1,32 +1,9 @@
<template> <template>
<div class="juejbjww" :class="{ focused, filled, inline, disabled }"> <div class="matxzzsk">
<div class="icon" ref="icon"><slot name="icon"></slot></div> <div class="label" @click="focus"><slot name="label"></slot></div>
<div class="input"> <div class="input" :class="{ inline, disabled, focused }">
<span class="label" ref="labelEl"><slot></slot></span>
<span class="title" ref="title">
<slot name="title"></slot>
<span class="warning" v-if="invalid"><i class="fas fa-exclamation-circle"></i>{{ $refs.input.validationMessage }}</span>
</span>
<div class="prefix" ref="prefixEl"><slot name="prefix"></slot></div> <div class="prefix" ref="prefixEl"><slot name="prefix"></slot></div>
<input v-if="debounce" ref="inputEl" <input ref="inputEl"
v-debounce="500"
:type="type"
v-model.lazy="v"
:disabled="disabled"
:required="required"
:readonly="readonly"
:placeholder="placeholder"
:pattern="pattern"
:autocomplete="autocomplete"
:spellcheck="spellcheck"
:step="step"
@focus="focused = true"
@blur="focused = false"
@keydown="onKeydown($event)"
@input="onInput"
:list="id"
>
<input v-else ref="inputEl"
:type="type" :type="type"
v-model="v" v-model="v"
:disabled="disabled" :disabled="disabled"
@ -48,23 +25,25 @@
</datalist> </datalist>
<div class="suffix" ref="suffixEl"><slot name="suffix"></slot></div> <div class="suffix" ref="suffixEl"><slot name="suffix"></slot></div>
</div> </div>
<button class="save _textButton" v-if="save && changed" @click="() => { changed = false; save(); }">{{ $ts.save }}</button> <div class="caption"><slot name="caption"></slot></div>
<div class="desc _caption"><slot name="desc"></slot></div>
<MkButton v-if="manualSave && changed" @click="updated" primary><i class="fas fa-save"></i> {{ $ts.save }}</MkButton>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue'; import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
import debounce from 'v-debounce'; import MkButton from './button.vue';
import * as os from '@client/os'; import { debounce } from 'throttle-debounce';
export default defineComponent({ export default defineComponent({
directives: { components: {
debounce MkButton,
}, },
props: { props: {
value: { modelValue: {
required: false required: true
}, },
type: { type: {
type: String, type: String,
@ -104,9 +83,6 @@ export default defineComponent({
step: { step: {
required: false required: false
}, },
debounce: {
required: false
},
datalist: { datalist: {
type: Array, type: Array,
required: false, required: false,
@ -116,15 +92,23 @@ export default defineComponent({
required: false, required: false,
default: false default: false
}, },
save: { debounce: {
type: Function, type: Boolean,
required: false, required: false,
default: false
},
manualSave: {
type: Boolean,
required: false,
default: false
}, },
}, },
emits: ['change', 'keydown', 'enter'],
emits: ['change', 'keydown', 'enter', 'update:modelValue'],
setup(props, context) { setup(props, context) {
const { value, type, autofocus } = toRefs(props); const { modelValue, type, autofocus } = toRefs(props);
const v = ref(value.value); const v = ref(modelValue.value);
const id = Math.random().toString(); // TODO: uuid? const id = Math.random().toString(); // TODO: uuid?
const focused = ref(false); const focused = ref(false);
const changed = ref(false); const changed = ref(false);
@ -133,7 +117,6 @@ export default defineComponent({
const inputEl = ref(null); const inputEl = ref(null);
const prefixEl = ref(null); const prefixEl = ref(null);
const suffixEl = ref(null); const suffixEl = ref(null);
const labelEl = ref(null);
const focus = () => inputEl.value.focus(); const focus = () => inputEl.value.focus();
const onInput = (ev) => { const onInput = (ev) => {
@ -148,15 +131,28 @@ export default defineComponent({
} }
}; };
watch(value, newValue => { const updated = () => {
changed.value = false;
if (type?.value === 'number') {
context.emit('update:modelValue', parseFloat(v.value));
} else {
context.emit('update:modelValue', v.value);
}
};
const debouncedUpdated = debounce(1000, updated);
watch(modelValue, newValue => {
v.value = newValue; v.value = newValue;
}); });
watch(v, newValue => { watch(v, newValue => {
if (type?.value === 'number') { if (!props.manualSave) {
context.emit('update:value', parseFloat(newValue)); if (props.debounce) {
} else { debouncedUpdated();
context.emit('update:value', newValue); } else {
updated();
}
} }
invalid.value = inputEl.value.validity.badInput; invalid.value = inputEl.value.validity.badInput;
@ -172,7 +168,6 @@ export default defineComponent({
// 非表示状態だと要素の幅などは0になってしまうので、定期的に計算する // 非表示状態だと要素の幅などは0になってしまうので、定期的に計算する
const clock = setInterval(() => { const clock = setInterval(() => {
if (prefixEl.value) { if (prefixEl.value) {
labelEl.value.style.left = (prefixEl.value.offsetLeft + prefixEl.value.offsetWidth) + 'px';
if (prefixEl.value.offsetWidth) { if (prefixEl.value.offsetWidth) {
inputEl.value.style.paddingLeft = prefixEl.value.offsetWidth + 'px'; inputEl.value.style.paddingLeft = prefixEl.value.offsetWidth + 'px';
} }
@ -200,148 +195,70 @@ export default defineComponent({
inputEl, inputEl,
prefixEl, prefixEl,
suffixEl, suffixEl,
labelEl,
focus, focus,
onInput, onInput,
onKeydown, onKeydown,
updated,
}; };
}, },
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.juejbjww { .matxzzsk {
position: relative; margin: 1em 0;
margin: 32px 0;
&:not(.inline):first-child { > .label {
margin-top: 8px; font-size: 0.85em;
padding: 0 0 6px 6px;
font-weight: bold;
user-select: none;
} }
&:not(.inline):last-child { > .caption {
margin-bottom: 8px; font-size: 0.8em;
} padding: 6px 0 0 6px;
color: var(--fgTransparentWeak);
> .icon {
position: absolute;
top: 0;
left: 0;
width: 24px;
text-align: center;
line-height: 32px;
&:not(:empty) + .input {
margin-left: 28px;
}
} }
> .input { > .input {
$height: 42px;
position: relative; position: relative;
&:before {
content: '';
display: block;
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 1px;
background: var(--inputBorder);
}
&:after {
content: '';
display: block;
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 2px;
background: var(--accent);
opacity: 0;
transform: scaleX(0.12);
transition: border 0.3s cubic-bezier(0.4, 0, 0.2, 1), opacity 0.3s cubic-bezier(0.4, 0, 0.2, 1), transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
will-change: border opacity transform;
}
> .label {
position: absolute;
z-index: 1;
top: 0;
left: 0;
pointer-events: none;
transition: 0.4s cubic-bezier(0.25, 0.8, 0.25, 1);
transition-duration: 0.3s;
font-size: 1em;
line-height: 32px;
color: var(--inputLabel);
pointer-events: none;
//will-change transform
transform-origin: top left;
transform: scale(1);
}
> .title {
position: absolute;
z-index: 1;
top: -17px;
left: 0 !important;
pointer-events: none;
font-size: 1em;
line-height: 32px;
color: var(--inputLabel);
pointer-events: none;
//will-change transform
transform-origin: top left;
transform: scale(.75);
white-space: nowrap;
width: 133%;
overflow: hidden;
text-overflow: ellipsis;
> .warning {
margin-left: 0.5em;
color: var(--infoWarnFg);
> svg {
margin-right: 0.1em;
}
}
}
> input { > input {
$height: 32px; appearance: none;
-webkit-appearance: none;
display: block; display: block;
height: $height; height: $height;
width: 100%; width: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0 12px;
font: inherit; font: inherit;
font-weight: normal; font-weight: normal;
font-size: 1em; font-size: 1em;
line-height: $height; color: var(--fg);
color: var(--inputText); background: var(--panel);
background: transparent; border: solid 1px var(--inputBorder);
border: none; border-radius: 6px;
border-radius: 0;
outline: none; outline: none;
box-shadow: none; box-shadow: none;
box-sizing: border-box; box-sizing: border-box;
&[type='file'] { &:hover {
display: none; border-color: var(--inputBorderHover);
} }
} }
> .prefix, > .prefix,
> .suffix { > .suffix {
display: block; display: flex;
align-items: center;
position: absolute; position: absolute;
z-index: 1; z-index: 1;
top: 0; top: 0;
padding: 0 12px;
font-size: 1em; font-size: 1em;
line-height: 32px; height: $height;
color: var(--inputLabel);
pointer-events: none; pointer-events: none;
&:empty { &:empty {
@ -360,67 +277,33 @@ export default defineComponent({
> .prefix { > .prefix {
left: 0; left: 0;
padding-right: 4px; padding-right: 6px;
} }
> .suffix { > .suffix {
right: 0; right: 0;
padding-left: 4px; padding-left: 6px;
}
}
> .save {
margin: 6px 0 0 0;
font-size: 0.8em;
}
> .desc {
margin: 6px 0 0 0;
&:empty {
display: none;
} }
* { &.inline {
display: inline-block;
margin: 0; margin: 0;
} }
}
&.focused { &.focused {
> .input { > input {
&:after { border-color: var(--accent);
opacity: 1; //box-shadow: 0 0 0 4px var(--focus);
transform: scaleX(1);
}
> .label {
color: var(--accent);
} }
} }
}
&.focused, &.disabled {
&.filled { opacity: 0.7;
> .input {
> .label { &, * {
top: -17px; cursor: not-allowed !important;
left: 0 !important;
transform: scale(0.75);
} }
} }
} }
&.inline {
display: inline-block;
margin: 0;
}
&.disabled {
opacity: 0.7;
&, * {
cursor: not-allowed !important;
}
}
} }
</style> </style>

317
src/client/components/ui/select.vue
View file

@ -1,185 +1,210 @@
<template> <template>
<div class="eiipwacr" :class="{ focused, disabled, filled, inline }"> <div class="vblkjoeq">
<div class="icon" ref="icon"><slot name="icon"></slot></div> <div class="label" @click="focus"><slot name="label"></slot></div>
<div class="input" @click="focus"> <div class="input" :class="{ inline, disabled, focused }">
<span class="label" ref="label"><slot name="label"></slot></span> <div class="prefix" ref="prefixEl"><slot name="prefix"></slot></div>
<div class="prefix" ref="prefix"><slot name="prefix"></slot></div> <select ref="inputEl"
<select ref="input"
v-model="v" v-model="v"
:required="required"
:disabled="disabled" :disabled="disabled"
:required="required"
:readonly="readonly"
:placeholder="placeholder"
@focus="focused = true" @focus="focused = true"
@blur="focused = false" @blur="focused = false"
@input="onInput"
> >
<slot></slot> <slot></slot>
</select> </select>
<div class="suffix"> <div class="suffix" ref="suffixEl"><i class="fas fa-chevron-down"></i></div>
<slot name="suffix">
<i class="fas fa-chevron-down"></i>
</slot>
</div>
</div> </div>
<div class="text"><slot name="text"></slot></div> <div class="caption"><slot name="caption"></slot></div>
<MkButton v-if="manualSave && changed" @click="updated" primary><i class="fas fa-save"></i> {{ $ts.save }}</MkButton>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
import MkButton from './button.vue';
export default defineComponent({ export default defineComponent({
components: {
MkButton,
},
props: { props: {
value: { modelValue: {
required: false required: true
}, },
required: { required: {
type: Boolean, type: Boolean,
required: false required: false
}, },
readonly: {
type: Boolean,
required: false
},
disabled: { disabled: {
type: Boolean, type: Boolean,
required: false required: false
}, },
placeholder: {
type: String,
required: false
},
autofocus: {
type: Boolean,
required: false,
default: false
},
inline: { inline: {
type: Boolean, type: Boolean,
required: false, required: false,
default: false default: false
}, },
manualSave: {
type: Boolean,
required: false,
default: false
},
}, },
data() {
emits: ['change', 'update:modelValue'],
setup(props, context) {
const { modelValue, autofocus } = toRefs(props);
const v = ref(modelValue.value);
const focused = ref(false);
const changed = ref(false);
const invalid = ref(false);
const filled = computed(() => v.value !== '' && v.value != null);
const inputEl = ref(null);
const prefixEl = ref(null);
const suffixEl = ref(null);
const focus = () => inputEl.value.focus();
const onInput = (ev) => {
changed.value = true;
context.emit('change', ev);
};
const updated = () => {
changed.value = false;
context.emit('update:modelValue', v.value);
};
watch(modelValue, newValue => {
v.value = newValue;
});
watch(v, newValue => {
if (!props.manualSave) {
updated();
}
invalid.value = inputEl.value.validity.badInput;
});
onMounted(() => {
nextTick(() => {
if (autofocus.value) {
focus();
}
// このコンポーネントが作成された時、非表示状態である場合がある
// 非表示状態だと要素の幅などは0になってしまうので、定期的に計算する
const clock = setInterval(() => {
if (prefixEl.value) {
if (prefixEl.value.offsetWidth) {
inputEl.value.style.paddingLeft = prefixEl.value.offsetWidth + 'px';
}
}
if (suffixEl.value) {
if (suffixEl.value.offsetWidth) {
inputEl.value.style.paddingRight = suffixEl.value.offsetWidth + 'px';
}
}
}, 100);
onUnmounted(() => {
clearInterval(clock);
});
});
});
return { return {
focused: false, v,
focused,
invalid,
changed,
filled,
inputEl,
prefixEl,
suffixEl,
focus,
onInput,
updated,
}; };
}, },
computed: {
v: {
get() {
return this.value;
},
set(v) {
this.$emit('update:value', v);
}
},
filled(): boolean {
return true;
}
},
mounted() {
if (this.$refs.prefix) {
this.$refs.label.style.left = (this.$refs.prefix.offsetLeft + this.$refs.prefix.offsetWidth) + 'px';
}
},
methods: {
focus() {
this.$refs.input.focus();
}
}
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.eiipwacr { .vblkjoeq {
position: relative; margin: 1em 0;
margin: 32px 0;
&:not(.inline):first-child { > .label {
margin-top: 8px; font-size: 0.85em;
padding: 0 0 6px 6px;
font-weight: bold;
user-select: none;
} }
&:not(.inline):last-child { > .caption {
margin-bottom: 8px; font-size: 0.8em;
} padding: 6px 0 0 6px;
color: var(--fgTransparentWeak);
> .icon {
position: absolute;
top: 0;
left: 0;
width: 24px;
text-align: center;
line-height: 32px;
&:not(:empty) + .input {
margin-left: 28px;
}
} }
> .input { > .input {
display: flex; $height: 42px;
position: relative; position: relative;
&:before {
content: '';
display: block;
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 1px;
background: var(--inputBorder);
}
&:after {
content: '';
display: block;
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 2px;
background: var(--accent);
opacity: 0;
transform: scaleX(0.12);
transition: border 0.3s cubic-bezier(0.4, 0, 0.2, 1), opacity 0.3s cubic-bezier(0.4, 0, 0.2, 1), transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
will-change: border opacity transform;
}
> .label {
position: absolute;
top: 0;
left: 0;
pointer-events: none;
transition: 0.4s cubic-bezier(0.25, 0.8, 0.25, 1);
transition-duration: 0.3s;
font-size: 1em;
line-height: 32px;
pointer-events: none;
//will-change transform
transform-origin: top left;
transform: scale(1);
}
> select { > select {
appearance: none;
-webkit-appearance: none;
display: block; display: block;
flex: 1; height: $height;
width: 100%; width: 100%;
padding: 0; margin: 0;
padding: 0 8px;
font: inherit; font: inherit;
font-weight: normal; font-weight: normal;
font-size: 1em; font-size: 1em;
height: 32px; color: var(--fg);
background: none; background: var(--panel);
border: none; border: solid 1px var(--inputBorder);
border-radius: 0; border-radius: 6px;
outline: none; outline: none;
box-shadow: none; box-shadow: none;
appearance: none; box-sizing: border-box;
-webkit-appearance: none; cursor: pointer;
color: var(--fg);
option, &:hover {
optgroup { border-color: var(--inputBorderHover);
color: var(--fg);
background: var(--bg);
} }
} }
> .prefix, > .prefix,
> .suffix { > .suffix {
display: block; display: flex;
align-self: center; align-items: center;
justify-self: center; position: absolute;
z-index: 1;
top: 0;
padding: 0 12px;
font-size: 1em; font-size: 1em;
line-height: 32px; height: $height;
color: var(--inputLabel);
pointer-events: none; pointer-events: none;
&:empty { &:empty {
@ -187,53 +212,41 @@ export default defineComponent({
} }
> * { > * {
display: block; display: inline-block;
min-width: 16px; min-width: 16px;
max-width: 150px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
} }
> .prefix { > .prefix {
padding-right: 4px; left: 0;
padding-right: 6px;
} }
> .suffix { > .suffix {
padding-left: 4px; right: 0;
} padding-left: 6px;
}
> .text {
margin: 6px 0;
font-size: 0.8em;
&:empty {
display: none;
} }
* { &.inline {
display: inline-block;
margin: 0; margin: 0;
} }
}
&.focused { &.focused {
> .input { > select {
&:after { border-color: var(--accent);
opacity: 1;
transform: scaleX(1);
}
> .label {
color: var(--accent);
} }
} }
}
&.focused, &.disabled {
&.filled { opacity: 0.7;
> .input {
> .label { &, * {
top: -17px; cursor: not-allowed !important;
left: 0 !important;
transform: scale(0.75);
} }
} }
} }

10
src/client/components/ui/switch.vue
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="desc"></slot></p> <p><slot name="caption"></slot></p>
</span> </span>
</div> </div>
</template> </template>
@ -28,7 +28,7 @@ import { defineComponent } from 'vue';
export default defineComponent({ export default defineComponent({
props: { props: {
value: { modelValue: {
type: Boolean, type: Boolean,
default: false default: false
}, },
@ -39,13 +39,13 @@ export default defineComponent({
}, },
computed: { computed: {
checked(): boolean { checked(): boolean {
return this.value; return this.modelValue;
} }
}, },
methods: { methods: {
toggle() { toggle() {
if (this.disabled) return; if (this.disabled) return;
this.$emit('update:value', !this.checked); this.$emit('update:modelValue', !this.checked);
} }
} }
}); });
@ -136,7 +136,7 @@ export default defineComponent({
> p { > p {
margin: 0; margin: 0;
opacity: 0.7; color: var(--fgTransparentWeak);
font-size: 90%; font-size: 90%;
} }
} }

277
src/client/components/ui/textarea.vue
View file

@ -1,30 +1,45 @@
<template> <template>
<div class="adhpbeos" :class="{ focused, filled, tall, pre }"> <div class="adhpbeos">
<div class="input"> <div class="label" @click="focus"><slot name="label"></slot></div>
<span class="label" ref="label"><slot></slot></span> <div class="input" :class="{ disabled, focused, tall, pre }">
<textarea ref="input" :class="{ code, _monospace: code }" <textarea ref="inputEl"
:value="value" :class="{ code, _monospace: code }"
v-model="v"
:disabled="disabled"
:required="required" :required="required"
:readonly="readonly" :readonly="readonly"
:placeholder="placeholder"
:pattern="pattern" :pattern="pattern"
:autocomplete="autocomplete" :autocomplete="autocomplete"
:spellcheck="!code" :spellcheck="spellcheck"
@input="onInput"
@focus="focused = true" @focus="focused = true"
@blur="focused = false" @blur="focused = false"
@keydown="onKeydown($event)"
@input="onInput"
></textarea> ></textarea>
</div> </div>
<button class="save _textButton" v-if="save && changed" @click="() => { changed = false; save(); }">{{ $ts.save }}</button> <div class="caption"><slot name="caption"></slot></div>
<div class="desc _caption"><slot name="desc"></slot></div>
<MkButton v-if="manualSave && changed" @click="updated" primary><i class="fas fa-save"></i> {{ $ts.save }}</MkButton>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
import MkButton from './button.vue';
import { debounce } from 'throttle-debounce';
export default defineComponent({ export default defineComponent({
components: {
MkButton,
},
props: { props: {
value: { modelValue: {
required: true
},
type: {
type: String,
required: false required: false
}, },
required: { required: {
@ -35,14 +50,29 @@ export default defineComponent({
type: Boolean, type: Boolean,
required: false required: false
}, },
disabled: {
type: Boolean,
required: false
},
pattern: { pattern: {
type: String, type: String,
required: false required: false
}, },
autocomplete: { placeholder: {
type: String, type: String,
required: false required: false
}, },
autofocus: {
type: Boolean,
required: false,
default: false
},
autocomplete: {
required: false
},
spellcheck: {
required: false
},
code: { code: {
type: Boolean, type: Boolean,
required: false required: false
@ -57,169 +87,156 @@ export default defineComponent({
required: false, required: false,
default: false default: false
}, },
save: { debounce: {
type: Function, type: Boolean,
required: false, required: false,
default: false
},
manualSave: {
type: Boolean,
required: false,
default: false
}, },
}, },
data() {
emits: ['change', 'keydown', 'enter', 'update:modelValue'],
setup(props, context) {
const { modelValue, autofocus } = toRefs(props);
const v = ref(modelValue.value);
const focused = ref(false);
const changed = ref(false);
const invalid = ref(false);
const filled = computed(() => v.value !== '' && v.value != null);
const inputEl = ref(null);
const focus = () => inputEl.value.focus();
const onInput = (ev) => {
changed.value = true;
context.emit('change', ev);
};
const onKeydown = (ev: KeyboardEvent) => {
context.emit('keydown', ev);
if (ev.code === 'Enter') {
context.emit('enter');
}
};
const updated = () => {
changed.value = false;
context.emit('update:modelValue', v.value);
};
const debouncedUpdated = debounce(1000, updated);
watch(modelValue, newValue => {
v.value = newValue;
});
watch(v, newValue => {
if (!props.manualSave) {
if (props.debounce) {
debouncedUpdated();
} else {
updated();
}
}
invalid.value = inputEl.value.validity.badInput;
});
onMounted(() => {
nextTick(() => {
if (autofocus.value) {
focus();
}
});
});
return { return {
focused: false, v,
changed: false, focused,
} invalid,
changed,
filled,
inputEl,
focus,
onInput,
onKeydown,
updated,
};
}, },
computed: {
filled(): boolean {
return this.value != '' && this.value != null;
}
},
methods: {
focus() {
this.$refs.input.focus();
},
onInput(ev) {
this.changed = true;
this.$emit('update:value', ev.target.value);
}
}
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.adhpbeos { .adhpbeos {
margin: 42px 0 32px 0; margin: 1em 0;
position: relative;
&:first-child { > .label {
margin-top: 16px; font-size: 0.85em;
padding: 0 0 6px 6px;
font-weight: bold;
user-select: none;
} }
&:last-child { > .caption {
margin-bottom: 0; font-size: 0.8em;
padding: 6px 0 0 6px;
color: var(--fgTransparentWeak);
} }
> .input { > .input {
position: relative; position: relative;
&:before {
content: '';
display: block;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: none;
border: solid 1px var(--inputBorder);
border-radius: 3px;
pointer-events: none;
}
&:after {
content: '';
display: block;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: none;
border: solid 2px var(--accent);
border-radius: 3px;
opacity: 0;
transition: opacity 0.3s cubic-bezier(0.4, 0, 0.2, 1);
pointer-events: none;
}
> .label {
position: absolute;
top: 6px;
left: 12px;
pointer-events: none;
transition: 0.4s cubic-bezier(0.25, 0.8, 0.25, 1);
transition-duration: 0.3s;
font-size: 1em;
line-height: 32px;
pointer-events: none;
//will-change transform
transform-origin: top left;
transform: scale(1);
}
> textarea { > textarea {
appearance: none;
-webkit-appearance: none;
display: block; display: block;
width: 100%; width: 100%;
min-width: 100%; min-width: 100%;
max-width: 100%; max-width: 100%;
min-height: 130px; min-height: 130px;
margin: 0;
padding: 12px; padding: 12px;
box-sizing: border-box;
font: inherit; font: inherit;
font-weight: normal; font-weight: normal;
font-size: 1em; font-size: 1em;
background: transparent; color: var(--fg);
border: none; background: var(--panel);
border-radius: 0; border: solid 1px var(--inputBorder);
border-radius: 6px;
outline: none; outline: none;
box-shadow: none; box-shadow: none;
color: var(--fg); box-sizing: border-box;
&.code { &:hover {
tab-size: 2; border-color: var(--inputBorderHover);
} }
} }
}
> .save { &.focused {
margin: 6px 0 0 0; > textarea {
font-size: 0.8em; border-color: var(--accent);
}
> .desc {
margin: 6px 0 0 0;
&:empty {
display: none;
}
* {
margin: 0;
}
}
&.focused {
> .input {
&:after {
opacity: 1;
}
> .label {
color: var(--accent);
} }
} }
}
&.focused, &.disabled {
&.filled { opacity: 0.7;
> .input {
> .label { &, * {
top: -24px; cursor: not-allowed !important;
left: 0 !important;
transform: scale(0.75);
} }
} }
}
&.tall { &.tall {
> .input {
> textarea { > textarea {
min-height: 200px; min-height: 200px;
} }
} }
}
&.pre { &.pre {
> .input {
> textarea { > textarea {
white-space: pre; white-space: pre;
} }

10
src/client/components/user-select-dialog.vue
View file

@ -11,8 +11,14 @@
<div class="tbhwbxda _monolithic_"> <div class="tbhwbxda _monolithic_">
<div class="_section"> <div class="_section">
<div class="inputs"> <div class="inputs">
<MkInput v-model:value="username" class="input" @update:value="search" ref="username"><span>{{ $ts.username }}</span><template #prefix>@</template></MkInput> <MkInput v-model="username" class="input" @update:modelValue="search" ref="username">
<MkInput v-model:value="host" class="input" @update:value="search"><span>{{ $ts.host }}</span><template #prefix>@</template></MkInput> <template #label>{{ $ts.username }}</template>
<template #prefix>@</template>
</MkInput>
<MkInput v-model="host" class="input" @update:modelValue="search">
<template #label>{{ $ts.host }}</template>
<template #prefix>@</template>
</MkInput>
</div> </div>
</div> </div>
<div class="_section result" v-if="username != '' || host != ''" :class="{ hit: users.length > 0 }"> <div class="_section result" v-if="username != '' || host != ''" :class="{ hit: users.length > 0 }">

2
src/client/components/widgets.vue
View file

@ -2,7 +2,7 @@
<div class="vjoppmmu"> <div class="vjoppmmu">
<template v-if="edit"> <template v-if="edit">
<header> <header>
<MkSelect v-model:value="widgetAdderSelected" style="margin-bottom: var(--margin)"> <MkSelect v-model="widgetAdderSelected" style="margin-bottom: var(--margin)">
<template #label>{{ $ts.selectWidget }}</template> <template #label>{{ $ts.selectWidget }}</template>
<option v-for="widget in widgetDefs" :value="widget" :key="widget">{{ $t(`_widgets.${widget}`) }}</option> <option v-for="widget in widgetDefs" :value="widget" :key="widget">{{ $t(`_widgets.${widget}`) }}</option>
</MkSelect> </MkSelect>

14
src/client/pages/api-console.vue
View file

@ -1,13 +1,13 @@
<template> <template>
<div class="_root"> <div class="_root">
<div class="_block" style="padding: 24px;"> <div class="_block" style="padding: 24px;">
<MkInput v-model:value="endpoint" :datalist="endpoints" @update:value="onEndpointChange()"> <MkInput v-model="endpoint" :datalist="endpoints" @update:modelValue="onEndpointChange()">
<span>Endpoint</span> <template #label>Endpoint</template>
</MkInput> </MkInput>
<MkTextarea v-model:value="body" code> <MkTextarea v-model="body" code>
<span>Params (JSON or JSON5)</span> <template #label>Params (JSON or JSON5)</template>
</MkTextarea> </MkTextarea>
<MkSwitch v-model:value="withCredential"> <MkSwitch v-model="withCredential">
With credential With credential
</MkSwitch> </MkSwitch>
<MkButton primary full @click="send" :disabled="sending"> <MkButton primary full @click="send" :disabled="sending">
@ -16,8 +16,8 @@
</MkButton> </MkButton>
</div> </div>
<div v-if="res" class="_block" style="padding: 24px;"> <div v-if="res" class="_block" style="padding: 24px;">
<MkTextarea v-model:value="res" code readonly tall> <MkTextarea v-model="res" code readonly tall>
<span>Response</span> <template #label>Response</template>
</MkTextarea> </MkTextarea>
</div> </div>
</div> </div>

8
src/client/pages/channel-editor.vue
View file

@ -2,9 +2,13 @@
<div> <div>
<div class="_section"> <div class="_section">
<div class="_content"> <div class="_content">
<MkInput v-model:value="name">{{ $ts.name }}</MkInput> <MkInput v-model="name">
<template #label>{{ $ts.name }}</template>
</MkInput>
<MkTextarea v-model:value="description">{{ $ts.description }}</MkTextarea> <MkTextarea v-model="description">
<template #label>{{ $ts.description }}</template>
</MkTextarea>
<div class="banner"> <div class="banner">
<MkButton v-if="bannerId == null" @click="setBannerImage"><i class="fas fa-plus"></i> {{ $ts._channel.setBanner }}</MkButton> <MkButton v-if="bannerId == null" @click="setBannerImage"><i class="fas fa-plus"></i> {{ $ts._channel.setBanner }}</MkButton>

5
src/client/pages/docs.vue
View file

@ -1,7 +1,10 @@
<template> <template>
<div class="vtaihdtm"> <div class="vtaihdtm">
<div class="search"> <div class="search">
<MkInput v-model:value="query" :debounce="true" type="search"><template #icon><i class="fas fa-search"></i></template><span>{{ $ts.search }}</span></MkInput> <MkInput v-model="query" :debounce="true" type="search">
<template #prefix><i class="fas fa-search"></i></template>
<template #label>{{ $ts.search }}</template>
</MkInput>
</div> </div>
<MkFolder> <MkFolder>
<template #header>{{ $ts._docs.generalTopics }}</template> <template #header>{{ $ts._docs.generalTopics }}</template>

5
src/client/pages/explore.vue
View file

@ -2,7 +2,10 @@
<div class="lznhrdub _root"> <div class="lznhrdub _root">
<div> <div>
<div class="_isolated"> <div class="_isolated">
<MkInput v-model:value="query" :debounce="true" type="search"><template #icon><i class="fas fa-search"></i></template><span>{{ $ts.searchUser }}</span></MkInput> <MkInput v-model="query" :debounce="true" type="search">
<template #prefix><i class="fas fa-search"></i></template>
<template #label>{{ $ts.searchUser }}</template>
</MkInput>
</div> </div>
<XUserList v-if="query" class="_gap" :pagination="searchPagination" ref="search"/> <XUserList v-if="query" class="_gap" :pagination="searchPagination" ref="search"/>

4
src/client/pages/instance-info.vue
View file

@ -62,7 +62,7 @@
<div class="_formLabel">{{ $ts.statistics }}</div> <div class="_formLabel">{{ $ts.statistics }}</div>
<div class="_formPanel cmhjzshl"> <div class="_formPanel cmhjzshl">
<div class="selects"> <div class="selects">
<MkSelect v-model:value="chartSrc" style="margin: 0; flex: 1;"> <MkSelect v-model="chartSrc" style="margin: 0; flex: 1;">
<option value="requests">{{ $ts._instanceCharts.requests }}</option> <option value="requests">{{ $ts._instanceCharts.requests }}</option>
<option value="users">{{ $ts._instanceCharts.users }}</option> <option value="users">{{ $ts._instanceCharts.users }}</option>
<option value="users-total">{{ $ts._instanceCharts.usersTotal }}</option> <option value="users-total">{{ $ts._instanceCharts.usersTotal }}</option>
@ -75,7 +75,7 @@
<option value="drive-files">{{ $ts._instanceCharts.files }}</option> <option value="drive-files">{{ $ts._instanceCharts.files }}</option>
<option value="drive-files-total">{{ $ts._instanceCharts.filesTotal }}</option> <option value="drive-files-total">{{ $ts._instanceCharts.filesTotal }}</option>
</MkSelect> </MkSelect>
<MkSelect v-model:value="chartSpan" style="margin: 0;"> <MkSelect v-model="chartSpan" style="margin: 0;">
<option value="hour">{{ $ts.perHour }}</option> <option value="hour">{{ $ts.perHour }}</option>
<option value="day">{{ $ts.perDay }}</option> <option value="day">{{ $ts.perDay }}</option>
</MkSelect> </MkSelect>

6
src/client/pages/instance/abuses.vue
View file

@ -3,19 +3,19 @@
<div class="_section reports"> <div class="_section reports">
<div class="_content"> <div class="_content">
<div class="inputs" style="display: flex;"> <div class="inputs" style="display: flex;">
<MkSelect v-model:value="state" style="margin: 0; flex: 1;"> <MkSelect v-model="state" style="margin: 0; flex: 1;">
<template #label>{{ $ts.state }}</template> <template #label>{{ $ts.state }}</template>
<option value="all">{{ $ts.all }}</option> <option value="all">{{ $ts.all }}</option>
<option value="unresolved">{{ $ts.unresolved }}</option> <option value="unresolved">{{ $ts.unresolved }}</option>
<option value="resolved">{{ $ts.resolved }}</option> <option value="resolved">{{ $ts.resolved }}</option>
</MkSelect> </MkSelect>
<MkSelect v-model:value="targetUserOrigin" style="margin: 0; flex: 1;"> <MkSelect v-model="targetUserOrigin" style="margin: 0; flex: 1;">
<template #label>{{ $ts.targetUserOrigin }}</template> <template #label>{{ $ts.targetUserOrigin }}</template>
<option value="combined">{{ $ts.all }}</option> <option value="combined">{{ $ts.all }}</option>
<option value="local">{{ $ts.local }}</option> <option value="local">{{ $ts.local }}</option>
<option value="remote">{{ $ts.remote }}</option> <option value="remote">{{ $ts.remote }}</option>
</MkSelect> </MkSelect>
<MkSelect v-model:value="reporterOrigin" style="margin: 0; flex: 1;"> <MkSelect v-model="reporterOrigin" style="margin: 0; flex: 1;">
<template #label>{{ $ts.reporterOrigin }}</template> <template #label>{{ $ts.reporterOrigin }}</template>
<option value="combined">{{ $ts.all }}</option> <option value="combined">{{ $ts.all }}</option>
<option value="local">{{ $ts.local }}</option> <option value="local">{{ $ts.local }}</option>

20
src/client/pages/instance/ads.vue
View file

@ -4,11 +4,11 @@
<section class="_card _gap ads" v-for="ad in ads"> <section class="_card _gap ads" v-for="ad in ads">
<div class="_content ad"> <div class="_content ad">
<MkAd v-if="ad.url" :specify="ad"/> <MkAd v-if="ad.url" :specify="ad"/>
<MkInput v-model:value="ad.url" type="url"> <MkInput v-model="ad.url" type="url">
<span>URL</span> <template #label>URL</template>
</MkInput> </MkInput>
<MkInput v-model:value="ad.imageUrl"> <MkInput v-model="ad.imageUrl">
<span>{{ $ts.imageUrl }}</span> <template #label>{{ $ts.imageUrl }}</template>
</MkInput> </MkInput>
<div style="margin: 32px 0;"> <div style="margin: 32px 0;">
<MkRadio v-model="ad.place" value="square">square</MkRadio> <MkRadio v-model="ad.place" value="square">square</MkRadio>
@ -23,14 +23,14 @@
<MkRadio v-model="ad.priority" value="low">{{ $ts.low }}</MkRadio> <MkRadio v-model="ad.priority" value="low">{{ $ts.low }}</MkRadio>
</div> </div>
--> -->
<MkInput v-model:value="ad.ratio" type="number"> <MkInput v-model="ad.ratio" type="number">
<span>{{ $ts.ratio }}</span> <template #label>{{ $ts.ratio }}</template>
</MkInput> </MkInput>
<MkInput v-model:value="ad.expiresAt" type="date"> <MkInput v-model="ad.expiresAt" type="date">
<span>{{ $ts.expiration }}</span> <template #label>{{ $ts.expiration }}</template>
</MkInput> </MkInput>
<MkTextarea v-model:value="ad.memo"> <MkTextarea v-model="ad.memo">
<span>{{ $ts.memo }}</span> <template #label>{{ $ts.memo }}</template>
</MkTextarea> </MkTextarea>
<div class="buttons"> <div class="buttons">
<MkButton class="button" inline @click="save(ad)" primary><i class="fas fa-save"></i> {{ $ts.save }}</MkButton> <MkButton class="button" inline @click="save(ad)" primary><i class="fas fa-save"></i> {{ $ts.save }}</MkButton>

12
src/client/pages/instance/announcements.vue
View file

@ -3,14 +3,14 @@
<MkButton @click="add()" primary style="margin: 0 auto 16px auto;"><i class="fas fa-plus"></i> {{ $ts.add }}</MkButton> <MkButton @click="add()" primary style="margin: 0 auto 16px auto;"><i class="fas fa-plus"></i> {{ $ts.add }}</MkButton>
<section class="_card _gap announcements" v-for="announcement in announcements"> <section class="_card _gap announcements" v-for="announcement in announcements">
<div class="_content announcement"> <div class="_content announcement">
<MkInput v-model:value="announcement.title"> <MkInput v-model="announcement.title">
<span>{{ $ts.title }}</span> <template #label>{{ $ts.title }}</template>
</MkInput> </MkInput>
<MkTextarea v-model:value="announcement.text"> <MkTextarea v-model="announcement.text">
<span>{{ $ts.text }}</span> <template #label>{{ $ts.text }}</template>
</MkTextarea> </MkTextarea>
<MkInput v-model:value="announcement.imageUrl"> <MkInput v-model="announcement.imageUrl">
<span>{{ $ts.imageUrl }}</span> <template #label>{{ $ts.imageUrl }}</template>
</MkInput> </MkInput>
<p v-if="announcement.reads">{{ $t('nUsersRead', { n: announcement.reads }) }}</p> <p v-if="announcement.reads">{{ $t('nUsersRead', { n: announcement.reads }) }}</p>
<div class="buttons"> <div class="buttons">

14
src/client/pages/instance/emoji-edit-dialog.vue
View file

@ -11,11 +11,15 @@
<div class="_monolithic_"> <div class="_monolithic_">
<div class="yigymqpb _section"> <div class="yigymqpb _section">
<img :src="emoji.url" class="img"/> <img :src="emoji.url" class="img"/>
<MkInput v-model:value="name"><span>{{ $ts.name }}</span></MkInput> <MkInput v-model="name">
<MkInput v-model:value="category" :datalist="categories"><span>{{ $ts.category }}</span></MkInput> <template #label>{{ $ts.name }}</template>
<MkInput v-model:value="aliases"> </MkInput>
<span>{{ $ts.tags }}</span> <MkInput v-model="category" :datalist="categories">
<template #desc>{{ $ts.setMultipleBySeparatingWithSpace }}</template> <template #label>{{ $ts.category }}</template>
</MkInput>
<MkInput v-model="aliases">
<template #label>{{ $ts.tags }}</template>
<template #caption>{{ $ts.setMultipleBySeparatingWithSpace }}</template>
</MkInput> </MkInput>
<MkButton danger @click="del()"><i class="fas fa-trash-alt"></i> {{ $ts.delete }}</MkButton> <MkButton danger @click="del()"><i class="fas fa-trash-alt"></i> {{ $ts.delete }}</MkButton>
</div> </div>

14
src/client/pages/instance/emojis.vue
View file

@ -7,7 +7,10 @@
<div class="local" v-if="tab === 'local'"> <div class="local" v-if="tab === 'local'">
<MkButton primary @click="add" style="margin: var(--margin) auto;"><i class="fas fa-plus"></i> {{ $ts.addEmoji }}</MkButton> <MkButton primary @click="add" style="margin: var(--margin) auto;"><i class="fas fa-plus"></i> {{ $ts.addEmoji }}</MkButton>
<MkInput v-model:value="query" :debounce="true" type="search" style="margin: var(--margin);"><template #icon><i class="fas fa-search"></i></template><span>{{ $ts.search }}</span></MkInput> <MkInput v-model="query" :debounce="true" type="search" style="margin: var(--margin);">
<template #prefix><i class="fas fa-search"></i></template>
<template #label>{{ $ts.search }}</template>
</MkInput>
<MkPagination :pagination="pagination" ref="emojis"> <MkPagination :pagination="pagination" ref="emojis">
<template #empty><span>{{ $ts.noCustomEmojis }}</span></template> <template #empty><span>{{ $ts.noCustomEmojis }}</span></template>
<template #default="{items}"> <template #default="{items}">
@ -25,8 +28,13 @@
</div> </div>
<div class="remote" v-else-if="tab === 'remote'"> <div class="remote" v-else-if="tab === 'remote'">
<MkInput v-model:value="queryRemote" :debounce="true" type="search" style="margin: var(--margin);"><template #icon><i class="fas fa-search"></i></template><span>{{ $ts.search }}</span></MkInput> <MkInput v-model="queryRemote" :debounce="true" type="search" style="margin: var(--margin);">
<MkInput v-model:value="host" :debounce="true" style="margin: var(--margin);"><span>{{ $ts.host }}</span></MkInput> <template #prefix><i class="fas fa-search"></i></template>
<template #label>{{ $ts.search }}</template>
</MkInput>
<MkInput v-model="host" :debounce="true" style="margin: var(--margin);">
<template #label>{{ $ts.host }}</template>
</MkInput>
<MkPagination :pagination="remotePagination" ref="remoteEmojis"> <MkPagination :pagination="remotePagination" ref="remoteEmojis">
<template #empty><span>{{ $ts.noCustomEmojis }}</span></template> <template #empty><span>{{ $ts.noCustomEmojis }}</span></template>
<template #default="{items}"> <template #default="{items}">

2
src/client/pages/instance/file-dialog.vue
View file

@ -16,7 +16,7 @@
</div> </div>
<div class="_section"> <div class="_section">
<div class="_content"> <div class="_content">
<MkSwitch @update:value="toggleIsSensitive" v-model:value="isSensitive">NSFW</MkSwitch> <MkSwitch @update:modelValue="toggleIsSensitive" v-model="isSensitive">NSFW</MkSwitch>
</div> </div>
</div> </div>
<div class="_section"> <div class="_section">

14
src/client/pages/instance/files.vue
View file

@ -9,8 +9,8 @@
<div class="_section lookup"> <div class="_section lookup">
<div class="_title"><i class="fas fa-search"></i> {{ $ts.lookup }}</div> <div class="_title"><i class="fas fa-search"></i> {{ $ts.lookup }}</div>
<div class="_content"> <div class="_content">
<MkInput class="target" v-model:value="q" type="text" @enter="find()"> <MkInput class="target" v-model="q" type="text" @enter="find()">
<span>{{ $ts.fileIdOrUrl }}</span> <template #label>{{ $ts.fileIdOrUrl }}</template>
</MkInput> </MkInput>
<MkButton @click="find()" primary><i class="fas fa-search"></i> {{ $ts.lookup }}</MkButton> <MkButton @click="find()" primary><i class="fas fa-search"></i> {{ $ts.lookup }}</MkButton>
</div> </div>
@ -19,19 +19,19 @@
<div class="_section"> <div class="_section">
<div class="_content"> <div class="_content">
<div class="inputs" style="display: flex;"> <div class="inputs" style="display: flex;">
<MkSelect v-model:value="origin" style="margin: 0; flex: 1;"> <MkSelect v-model="origin" style="margin: 0; flex: 1;">
<template #label>{{ $ts.instance }}</template> <template #label>{{ $ts.instance }}</template>
<option value="combined">{{ $ts.all }}</option> <option value="combined">{{ $ts.all }}</option>
<option value="local">{{ $ts.local }}</option> <option value="local">{{ $ts.local }}</option>
<option value="remote">{{ $ts.remote }}</option> <option value="remote">{{ $ts.remote }}</option>
</MkSelect> </MkSelect>
<MkInput v-model:value="searchHost" :debounce="true" type="search" style="margin: 0; flex: 1;" :disabled="pagination.params().origin === 'local'"> <MkInput v-model="searchHost" :debounce="true" type="search" style="margin: 0; flex: 1;" :disabled="pagination.params().origin === 'local'">
<span>{{ $ts.host }}</span> <template #label>{{ $ts.host }}</template>
</MkInput> </MkInput>
</div> </div>
<div class="inputs" style="display: flex; padding-top: 1.2em;"> <div class="inputs" style="display: flex; padding-top: 1.2em;">
<MkInput v-model:value="type" :debounce="true" type="search" style="margin: 0; flex: 1;"> <MkInput v-model="type" :debounce="true" type="search" style="margin: 0; flex: 1;">
<span>{{ $ts.type }}</span> <template #label>{{ $ts.type }}</template>
</MkInput> </MkInput>
</div> </div>
<MkPagination :pagination="pagination" #default="{items}" class="urempief" ref="files"> <MkPagination :pagination="pagination" #default="{items}" class="urempief" ref="files">

8
src/client/pages/instance/instance.vue
View file

@ -77,7 +77,7 @@
<div class="header"> <div class="header">
<span class="label">{{ $ts.charts }}</span> <span class="label">{{ $ts.charts }}</span>
<div class="selects"> <div class="selects">
<MkSelect v-model:value="chartSrc" style="margin: 0; flex: 1;"> <MkSelect v-model="chartSrc" style="margin: 0; flex: 1;">
<option value="requests">{{ $ts._instanceCharts.requests }}</option> <option value="requests">{{ $ts._instanceCharts.requests }}</option>
<option value="users">{{ $ts._instanceCharts.users }}</option> <option value="users">{{ $ts._instanceCharts.users }}</option>
<option value="users-total">{{ $ts._instanceCharts.usersTotal }}</option> <option value="users-total">{{ $ts._instanceCharts.usersTotal }}</option>
@ -90,7 +90,7 @@
<option value="drive-files">{{ $ts._instanceCharts.files }}</option> <option value="drive-files">{{ $ts._instanceCharts.files }}</option>
<option value="drive-files-total">{{ $ts._instanceCharts.filesTotal }}</option> <option value="drive-files-total">{{ $ts._instanceCharts.filesTotal }}</option>
</MkSelect> </MkSelect>
<MkSelect v-model:value="chartSpan" style="margin: 0;"> <MkSelect v-model="chartSpan" style="margin: 0;">
<option value="hour">{{ $ts.perHour }}</option> <option value="hour">{{ $ts.perHour }}</option>
<option value="day">{{ $ts.perDay }}</option> <option value="day">{{ $ts.perDay }}</option>
</MkSelect> </MkSelect>
@ -102,8 +102,8 @@
</div> </div>
<div class="operations section"> <div class="operations section">
<span class="label">{{ $ts.operations }}</span> <span class="label">{{ $ts.operations }}</span>
<MkSwitch v-model:value="isSuspended" class="switch">{{ $ts.stopActivityDelivery }}</MkSwitch> <MkSwitch v-model="isSuspended" class="switch">{{ $ts.stopActivityDelivery }}</MkSwitch>
<MkSwitch :value="isBlocked" class="switch" @update:value="changeBlock">{{ $ts.blockThisInstance }}</MkSwitch> <MkSwitch :model-value="isBlocked" class="switch" @update:modelValue="changeBlock">{{ $ts.blockThisInstance }}</MkSwitch>
<details> <details>
<summary>{{ $ts.deleteAllFiles }}</summary> <summary>{{ $ts.deleteAllFiles }}</summary>
<MkButton @click="deleteAllFiles()" style="margin: 0.5em 0 0.5em 0;"><i class="fas fa-trash-alt"></i> {{ $ts.deleteAllFiles }}</MkButton> <MkButton @click="deleteAllFiles()" style="margin: 0.5em 0 0.5em 0;"><i class="fas fa-trash-alt"></i> {{ $ts.deleteAllFiles }}</MkButton>

6
src/client/pages/instance/logs.vue
View file

@ -1,10 +1,10 @@
<template> <template>
<div class="_section"> <div class="_section">
<div class="_inputs"> <div class="_inputs">
<MkInput v-model:value="logDomain" :debounce="true"> <MkInput v-model="logDomain" :debounce="true">
<span>{{ $ts.domain }}</span> <template #label>{{ $ts.domain }}</template>
</MkInput> </MkInput>
<MkSelect v-model:value="logLevel"> <MkSelect v-model="logLevel">
<template #label>Level</template> <template #label>Level</template>
<option value="all">All</option> <option value="all">All</option>
<option value="info">Info</option> <option value="info">Info</option>

14
src/client/pages/instance/users.vue
View file

@ -7,14 +7,14 @@
<div class="users"> <div class="users">
<div class="inputs" style="display: flex;"> <div class="inputs" style="display: flex;">
<MkSelect v-model:value="sort" style="margin: 0; flex: 1;"> <MkSelect v-model="sort" style="margin: 0; flex: 1;">
<template #label>{{ $ts.sort }}</template> <template #label>{{ $ts.sort }}</template>
<option value="-createdAt">{{ $ts.registeredDate }} ({{ $ts.ascendingOrder }})</option> <option value="-createdAt">{{ $ts.registeredDate }} ({{ $ts.ascendingOrder }})</option>
<option value="+createdAt">{{ $ts.registeredDate }} ({{ $ts.descendingOrder }})</option> <option value="+createdAt">{{ $ts.registeredDate }} ({{ $ts.descendingOrder }})</option>
<option value="-updatedAt">{{ $ts.lastUsed }} ({{ $ts.ascendingOrder }})</option> <option value="-updatedAt">{{ $ts.lastUsed }} ({{ $ts.ascendingOrder }})</option>
<option value="+updatedAt">{{ $ts.lastUsed }} ({{ $ts.descendingOrder }})</option> <option value="+updatedAt">{{ $ts.lastUsed }} ({{ $ts.descendingOrder }})</option>
</MkSelect> </MkSelect>
<MkSelect v-model:value="state" style="margin: 0; flex: 1;"> <MkSelect v-model="state" style="margin: 0; flex: 1;">
<template #label>{{ $ts.state }}</template> <template #label>{{ $ts.state }}</template>
<option value="all">{{ $ts.all }}</option> <option value="all">{{ $ts.all }}</option>
<option value="available">{{ $ts.normal }}</option> <option value="available">{{ $ts.normal }}</option>
@ -23,7 +23,7 @@
<option value="silenced">{{ $ts.silence }}</option> <option value="silenced">{{ $ts.silence }}</option>
<option value="suspended">{{ $ts.suspend }}</option> <option value="suspended">{{ $ts.suspend }}</option>
</MkSelect> </MkSelect>
<MkSelect v-model:value="origin" style="margin: 0; flex: 1;"> <MkSelect v-model="origin" style="margin: 0; flex: 1;">
<template #label>{{ $ts.instance }}</template> <template #label>{{ $ts.instance }}</template>
<option value="combined">{{ $ts.all }}</option> <option value="combined">{{ $ts.all }}</option>
<option value="local">{{ $ts.local }}</option> <option value="local">{{ $ts.local }}</option>
@ -31,11 +31,11 @@
</MkSelect> </MkSelect>
</div> </div>
<div class="inputs" style="display: flex; padding-top: 1.2em;"> <div class="inputs" style="display: flex; padding-top: 1.2em;">
<MkInput v-model:value="searchUsername" style="margin: 0; flex: 1;" type="text" spellcheck="false" @update:value="$refs.users.reload()"> <MkInput v-model="searchUsername" style="margin: 0; flex: 1;" type="text" spellcheck="false" @update:modelValue="$refs.users.reload()">
<span>{{ $ts.username }}</span> <template #label>{{ $ts.username }}</template>
</MkInput> </MkInput>
<MkInput v-model:value="searchHost" style="margin: 0; flex: 1;" type="text" spellcheck="false" @update:value="$refs.users.reload()" :disabled="pagination.params().origin === 'local'"> <MkInput v-model="searchHost" style="margin: 0; flex: 1;" type="text" spellcheck="false" @update:modelValue="$refs.users.reload()" :disabled="pagination.params().origin === 'local'">
<span>{{ $ts.host }}</span> <template #label>{{ $ts.host }}</template>
</MkInput> </MkInput>
</div> </div>

54
src/client/pages/mfm-cheat-sheet.vue
View file

@ -7,7 +7,7 @@
<p>{{ $ts._mfm.mentionDescription }}</p> <p>{{ $ts._mfm.mentionDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_mention"/> <Mfm :text="preview_mention"/>
<MkTextarea v-model:value="preview_mention"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_mention"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -17,7 +17,7 @@
<p>{{ $ts._mfm.hashtagDescription }}</p> <p>{{ $ts._mfm.hashtagDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_hashtag"/> <Mfm :text="preview_hashtag"/>
<MkTextarea v-model:value="preview_hashtag"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_hashtag"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -27,7 +27,7 @@
<p>{{ $ts._mfm.urlDescription }}</p> <p>{{ $ts._mfm.urlDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_url"/> <Mfm :text="preview_url"/>
<MkTextarea v-model:value="preview_url"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_url"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -37,7 +37,7 @@
<p>{{ $ts._mfm.linkDescription }}</p> <p>{{ $ts._mfm.linkDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_link"/> <Mfm :text="preview_link"/>
<MkTextarea v-model:value="preview_link"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_link"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -47,7 +47,7 @@
<p>{{ $ts._mfm.emojiDescription }}</p> <p>{{ $ts._mfm.emojiDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_emoji"/> <Mfm :text="preview_emoji"/>
<MkTextarea v-model:value="preview_emoji"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_emoji"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -57,7 +57,7 @@
<p>{{ $ts._mfm.boldDescription }}</p> <p>{{ $ts._mfm.boldDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_bold"/> <Mfm :text="preview_bold"/>
<MkTextarea v-model:value="preview_bold"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_bold"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -67,7 +67,7 @@
<p>{{ $ts._mfm.smallDescription }}</p> <p>{{ $ts._mfm.smallDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_small"/> <Mfm :text="preview_small"/>
<MkTextarea v-model:value="preview_small"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_small"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -77,7 +77,7 @@
<p>{{ $ts._mfm.quoteDescription }}</p> <p>{{ $ts._mfm.quoteDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_quote"/> <Mfm :text="preview_quote"/>
<MkTextarea v-model:value="preview_quote"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_quote"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -87,7 +87,7 @@
<p>{{ $ts._mfm.centerDescription }}</p> <p>{{ $ts._mfm.centerDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_center"/> <Mfm :text="preview_center"/>
<MkTextarea v-model:value="preview_center"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_center"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -97,7 +97,7 @@
<p>{{ $ts._mfm.inlineCodeDescription }}</p> <p>{{ $ts._mfm.inlineCodeDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_inlineCode"/> <Mfm :text="preview_inlineCode"/>
<MkTextarea v-model:value="preview_inlineCode"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_inlineCode"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -107,7 +107,7 @@
<p>{{ $ts._mfm.blockCodeDescription }}</p> <p>{{ $ts._mfm.blockCodeDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_blockCode"/> <Mfm :text="preview_blockCode"/>
<MkTextarea v-model:value="preview_blockCode"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_blockCode"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -117,7 +117,7 @@
<p>{{ $ts._mfm.inlineMathDescription }}</p> <p>{{ $ts._mfm.inlineMathDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_inlineMath"/> <Mfm :text="preview_inlineMath"/>
<MkTextarea v-model:value="preview_inlineMath"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_inlineMath"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -127,7 +127,7 @@
<p>{{ $ts._mfm.searchDescription }}</p> <p>{{ $ts._mfm.searchDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_search"/> <Mfm :text="preview_search"/>
<MkTextarea v-model:value="preview_search"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_search"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -137,7 +137,7 @@
<p>{{ $ts._mfm.flipDescription }}</p> <p>{{ $ts._mfm.flipDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_flip"/> <Mfm :text="preview_flip"/>
<MkTextarea v-model:value="preview_flip"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_flip"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -147,7 +147,7 @@
<p>{{ $ts._mfm.fontDescription }}</p> <p>{{ $ts._mfm.fontDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_font"/> <Mfm :text="preview_font"/>
<MkTextarea v-model:value="preview_font"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_font"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -157,7 +157,7 @@
<p>{{ $ts._mfm.x2Description }}</p> <p>{{ $ts._mfm.x2Description }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_x2"/> <Mfm :text="preview_x2"/>
<MkTextarea v-model:value="preview_x2"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_x2"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -167,7 +167,7 @@
<p>{{ $ts._mfm.x3Description }}</p> <p>{{ $ts._mfm.x3Description }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_x3"/> <Mfm :text="preview_x3"/>
<MkTextarea v-model:value="preview_x3"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_x3"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -177,7 +177,7 @@
<p>{{ $ts._mfm.x4Description }}</p> <p>{{ $ts._mfm.x4Description }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_x4"/> <Mfm :text="preview_x4"/>
<MkTextarea v-model:value="preview_x4"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_x4"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -187,7 +187,7 @@
<p>{{ $ts._mfm.blurDescription }}</p> <p>{{ $ts._mfm.blurDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_blur"/> <Mfm :text="preview_blur"/>
<MkTextarea v-model:value="preview_blur"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_blur"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -197,7 +197,7 @@
<p>{{ $ts._mfm.jellyDescription }}</p> <p>{{ $ts._mfm.jellyDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_jelly"/> <Mfm :text="preview_jelly"/>
<MkTextarea v-model:value="preview_jelly"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_jelly"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -207,7 +207,7 @@
<p>{{ $ts._mfm.tadaDescription }}</p> <p>{{ $ts._mfm.tadaDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_tada"/> <Mfm :text="preview_tada"/>
<MkTextarea v-model:value="preview_tada"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_tada"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -217,7 +217,7 @@
<p>{{ $ts._mfm.jumpDescription }}</p> <p>{{ $ts._mfm.jumpDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_jump"/> <Mfm :text="preview_jump"/>
<MkTextarea v-model:value="preview_jump"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_jump"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -227,7 +227,7 @@
<p>{{ $ts._mfm.bounceDescription }}</p> <p>{{ $ts._mfm.bounceDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_bounce"/> <Mfm :text="preview_bounce"/>
<MkTextarea v-model:value="preview_bounce"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_bounce"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -237,7 +237,7 @@
<p>{{ $ts._mfm.spinDescription }}</p> <p>{{ $ts._mfm.spinDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_spin"/> <Mfm :text="preview_spin"/>
<MkTextarea v-model:value="preview_spin"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_spin"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -247,7 +247,7 @@
<p>{{ $ts._mfm.shakeDescription }}</p> <p>{{ $ts._mfm.shakeDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_shake"/> <Mfm :text="preview_shake"/>
<MkTextarea v-model:value="preview_shake"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_shake"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -257,7 +257,7 @@
<p>{{ $ts._mfm.twitchDescription }}</p> <p>{{ $ts._mfm.twitchDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_twitch"/> <Mfm :text="preview_twitch"/>
<MkTextarea v-model:value="preview_twitch"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_twitch"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>
@ -267,7 +267,7 @@
<p>{{ $ts._mfm.rainbowDescription }}</p> <p>{{ $ts._mfm.rainbowDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_rainbow"/> <Mfm :text="preview_rainbow"/>
<MkTextarea v-model:value="preview_rainbow"><span>MFM</span></MkTextarea> <MkTextarea v-model="preview_rainbow"><template #label>MFM</template></MkTextarea>
</div> </div>
</div> </div>
</div> </div>

36
src/client/pages/my-antennas/index.antenna.vue
View file

@ -2,10 +2,10 @@
<div class="shaynizk _card"> <div class="shaynizk _card">
<div class="_title" v-if="antenna.name">{{ antenna.name }}</div> <div class="_title" v-if="antenna.name">{{ antenna.name }}</div>
<div class="_content body"> <div class="_content body">
<MkInput v-model:value="name"> <MkInput v-model="name">
<span>{{ $ts.name }}</span> <template #label>{{ $ts.name }}</template>
</MkInput> </MkInput>
<MkSelect v-model:value="src"> <MkSelect v-model="src">
<template #label>{{ $ts.antennaSource }}</template> <template #label>{{ $ts.antennaSource }}</template>
<option value="all">{{ $ts._antennaSources.all }}</option> <option value="all">{{ $ts._antennaSources.all }}</option>
<option value="home">{{ $ts._antennaSources.homeTimeline }}</option> <option value="home">{{ $ts._antennaSources.homeTimeline }}</option>
@ -13,30 +13,30 @@
<option value="list">{{ $ts._antennaSources.userList }}</option> <option value="list">{{ $ts._antennaSources.userList }}</option>
<option value="group">{{ $ts._antennaSources.userGroup }}</option> <option value="group">{{ $ts._antennaSources.userGroup }}</option>
</MkSelect> </MkSelect>
<MkSelect v-model:value="userListId" v-if="src === 'list'"> <MkSelect v-model="userListId" v-if="src === 'list'">
<template #label>{{ $ts.userList }}</template> <template #label>{{ $ts.userList }}</template>
<option v-for="list in userLists" :value="list.id" :key="list.id">{{ list.name }}</option> <option v-for="list in userLists" :value="list.id" :key="list.id">{{ list.name }}</option>
</MkSelect> </MkSelect>
<MkSelect v-model:value="userGroupId" v-else-if="src === 'group'"> <MkSelect v-model="userGroupId" v-else-if="src === 'group'">
<template #label>{{ $ts.userGroup }}</template> <template #label>{{ $ts.userGroup }}</template>
<option v-for="group in userGroups" :value="group.id" :key="group.id">{{ group.name }}</option> <option v-for="group in userGroups" :value="group.id" :key="group.id">{{ group.name }}</option>
</MkSelect> </MkSelect>
<MkTextarea v-model:value="users" v-else-if="src === 'users'"> <MkTextarea v-model="users" v-else-if="src === 'users'">
<span>{{ $ts.users }}</span> <template #label>{{ $ts.users }}</template>
<template #desc>{{ $ts.antennaUsersDescription }} <button class="_textButton" @click="addUser">{{ $ts.addUser }}</button></template> <template #caption>{{ $ts.antennaUsersDescription }} <button class="_textButton" @click="addUser">{{ $ts.addUser }}</button></template>
</MkTextarea> </MkTextarea>
<MkSwitch v-model:value="withReplies">{{ $ts.withReplies }}</MkSwitch> <MkSwitch v-model="withReplies">{{ $ts.withReplies }}</MkSwitch>
<MkTextarea v-model:value="keywords"> <MkTextarea v-model="keywords">
<span>{{ $ts.antennaKeywords }}</span> <template #label>{{ $ts.antennaKeywords }}</template>
<template #desc>{{ $ts.antennaKeywordsDescription }}</template> <template #caption>{{ $ts.antennaKeywordsDescription }}</template>
</MkTextarea> </MkTextarea>
<MkTextarea v-model:value="excludeKeywords"> <MkTextarea v-model="excludeKeywords">
<span>{{ $ts.antennaExcludeKeywords }}</span> <template #label>{{ $ts.antennaExcludeKeywords }}</template>
<template #desc>{{ $ts.antennaKeywordsDescription }}</template> <template #caption>{{ $ts.antennaKeywordsDescription }}</template>
</MkTextarea> </MkTextarea>
<MkSwitch v-model:value="caseSensitive">{{ $ts.caseSensitive }}</MkSwitch> <MkSwitch v-model="caseSensitive">{{ $ts.caseSensitive }}</MkSwitch>
<MkSwitch v-model:value="withFile">{{ $ts.withFileAntenna }}</MkSwitch> <MkSwitch v-model="withFile">{{ $ts.withFileAntenna }}</MkSwitch>
<MkSwitch v-model:value="notify">{{ $ts.notifyAntenna }}</MkSwitch> <MkSwitch v-model="notify">{{ $ts.notifyAntenna }}</MkSwitch>
</div> </div>
<div class="_footer"> <div class="_footer">
<MkButton inline @click="saveAntenna()" primary><i class="fas fa-save"></i> {{ $ts.save }}</MkButton> <MkButton inline @click="saveAntenna()" primary><i class="fas fa-save"></i> {{ $ts.save }}</MkButton>

16
src/client/pages/page-editor/els/page-editor.el.button.vue
View file

@ -3,9 +3,9 @@
<template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.button }}</template> <template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.button }}</template>
<section class="xfhsjczc"> <section class="xfhsjczc">
<MkInput v-model:value="value.text"><span>{{ $ts._pages.blocks._button.text }}</span></MkInput> <MkInput v-model="value.text"><template #label>{{ $ts._pages.blocks._button.text }}</template></MkInput>
<MkSwitch v-model:value="value.primary"><span>{{ $ts._pages.blocks._button.colored }}</span></MkSwitch> <MkSwitch v-model="value.primary"><span>{{ $ts._pages.blocks._button.colored }}</span></MkSwitch>
<MkSelect v-model:value="value.action"> <MkSelect v-model="value.action">
<template #label>{{ $ts._pages.blocks._button.action }}</template> <template #label>{{ $ts._pages.blocks._button.action }}</template>
<option value="dialog">{{ $ts._pages.blocks._button._action.dialog }}</option> <option value="dialog">{{ $ts._pages.blocks._button._action.dialog }}</option>
<option value="resetRandom">{{ $ts._pages.blocks._button._action.resetRandom }}</option> <option value="resetRandom">{{ $ts._pages.blocks._button._action.resetRandom }}</option>
@ -13,12 +13,12 @@
<option value="callAiScript">{{ $ts._pages.blocks._button._action.callAiScript }}</option> <option value="callAiScript">{{ $ts._pages.blocks._button._action.callAiScript }}</option>
</MkSelect> </MkSelect>
<template v-if="value.action === 'dialog'"> <template v-if="value.action === 'dialog'">
<MkInput v-model:value="value.content"><span>{{ $ts._pages.blocks._button._action._dialog.content }}</span></MkInput> <MkInput v-model="value.content"><template #label>{{ $ts._pages.blocks._button._action._dialog.content }}</template></MkInput>
</template> </template>
<template v-else-if="value.action === 'pushEvent'"> <template v-else-if="value.action === 'pushEvent'">
<MkInput v-model:value="value.event"><span>{{ $ts._pages.blocks._button._action._pushEvent.event }}</span></MkInput> <MkInput v-model="value.event"><template #label>{{ $ts._pages.blocks._button._action._pushEvent.event }}</template></MkInput>
<MkInput v-model:value="value.message"><span>{{ $ts._pages.blocks._button._action._pushEvent.message }}</span></MkInput> <MkInput v-model="value.message"><template #label>{{ $ts._pages.blocks._button._action._pushEvent.message }}</template></MkInput>
<MkSelect v-model:value="value.var"> <MkSelect v-model="value.var">
<template #label>{{ $ts._pages.blocks._button._action._pushEvent.variable }}</template> <template #label>{{ $ts._pages.blocks._button._action._pushEvent.variable }}</template>
<option :value="null">{{ $t('_pages.blocks._button._action._pushEvent.no-variable') }}</option> <option :value="null">{{ $t('_pages.blocks._button._action._pushEvent.no-variable') }}</option>
<option v-for="v in hpml.getVarsByType()" :value="v.name">{{ v.name }}</option> <option v-for="v in hpml.getVarsByType()" :value="v.name">{{ v.name }}</option>
@ -31,7 +31,7 @@
</MkSelect> </MkSelect>
</template> </template>
<template v-else-if="value.action === 'callAiScript'"> <template v-else-if="value.action === 'callAiScript'">
<MkInput v-model:value="value.fn"><span>{{ $ts._pages.blocks._button._action._callAiScript.functionName }}</span></MkInput> <MkInput v-model="value.fn"><template #label>{{ $ts._pages.blocks._button._action._callAiScript.functionName }}</template></MkInput>
</template> </template>
</section> </section>
</XContainer> </XContainer>

15
src/client/pages/page-editor/els/page-editor.el.canvas.vue
View file

@ -3,9 +3,18 @@
<template #header><i class="fas fa-paint-brush"></i> {{ $ts._pages.blocks.canvas }}</template> <template #header><i class="fas fa-paint-brush"></i> {{ $ts._pages.blocks.canvas }}</template>
<section style="padding: 0 16px 0 16px;"> <section style="padding: 0 16px 0 16px;">
<MkInput v-model:value="value.name"><template #prefix><i class="fas fa-magic"></i></template><span>{{ $ts._pages.blocks._canvas.id }}</span></MkInput> <MkInput v-model="value.name">
<MkInput v-model:value="value.width" type="number"><span>{{ $ts._pages.blocks._canvas.width }}</span><template #suffix>px</template></MkInput> <template #prefix><i class="fas fa-magic"></i></template>
<MkInput v-model:value="value.height" type="number"><span>{{ $ts._pages.blocks._canvas.height }}</span><template #suffix>px</template></MkInput> <template #label>{{ $ts._pages.blocks._canvas.id }}</template>
</MkInput>
<MkInput v-model="value.width" type="number">
<template #label>{{ $ts._pages.blocks._canvas.width }}</template>
<template #suffix>px</template>
</MkInput>
<MkInput v-model="value.height" type="number">
<template #label>{{ $ts._pages.blocks._canvas.height }}</template>
<template #suffix>px</template>
</MkInput>
</section> </section>
</XContainer> </XContainer>
</template> </template>

13
src/client/pages/page-editor/els/page-editor.el.counter.vue
View file

@ -3,9 +3,16 @@
<template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.counter }}</template> <template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.counter }}</template>
<section style="padding: 0 16px 0 16px;"> <section style="padding: 0 16px 0 16px;">
<MkInput v-model:value="value.name"><template #prefix><i class="fas fa-magic"></i></template><span>{{ $ts._pages.blocks._counter.name }}</span></MkInput> <MkInput v-model="value.name">
<MkInput v-model:value="value.text"><span>{{ $ts._pages.blocks._counter.text }}</span></MkInput> <template #prefix><i class="fas fa-magic"></i></template>
<MkInput v-model:value="value.inc" type="number"><span>{{ $ts._pages.blocks._counter.inc }}</span></MkInput> <template #label>{{ $ts._pages.blocks._counter.name }}</template>
</MkInput>
<MkInput v-model="value.text">
<template #label>{{ $ts._pages.blocks._counter.text }}</template>
</MkInput>
<MkInput v-model="value.inc" type="number">
<template #label>{{ $ts._pages.blocks._counter.inc }}</template>
</MkInput>
</section> </section>
</XContainer> </XContainer>
</template> </template>

2
src/client/pages/page-editor/els/page-editor.el.if.vue
View file

@ -8,7 +8,7 @@
</template> </template>
<section class="romcojzs"> <section class="romcojzs">
<MkSelect v-model:value="value.var"> <MkSelect v-model="value.var">
<template #label>{{ $ts._pages.blocks._if.variable }}</template> <template #label>{{ $ts._pages.blocks._if.variable }}</template>
<option v-for="v in hpml.getVarsByType('boolean')" :value="v.name">{{ v.name }}</option> <option v-for="v in hpml.getVarsByType('boolean')" :value="v.name">{{ v.name }}</option>
<optgroup :label="$ts._pages.script.pageVariables"> <optgroup :label="$ts._pages.script.pageVariables">

8
src/client/pages/page-editor/els/page-editor.el.note.vue
View file

@ -3,11 +3,11 @@
<template #header><i class="fas fa-sticky-note"></i> {{ $ts._pages.blocks.note }}</template> <template #header><i class="fas fa-sticky-note"></i> {{ $ts._pages.blocks.note }}</template>
<section style="padding: 0 16px 0 16px;"> <section style="padding: 0 16px 0 16px;">
<MkInput v-model:value="id"> <MkInput v-model="id">
<span>{{ $ts._pages.blocks._note.id }}</span> <template #label>{{ $ts._pages.blocks._note.id }}</template>
<template #desc>{{ $ts._pages.blocks._note.idDescription }}</template> <template #caption>{{ $ts._pages.blocks._note.idDescription }}</template>
</MkInput> </MkInput>
<MkSwitch v-model:value="value.detailed"><span>{{ $ts._pages.blocks._note.detailed }}</span></MkSwitch> <MkSwitch v-model="value.detailed"><span>{{ $ts._pages.blocks._note.detailed }}</span></MkSwitch>
<XNote v-if="note && !value.detailed" v-model:note="note" :key="note.id + ':normal'" style="margin-bottom: 16px;"/> <XNote v-if="note && !value.detailed" v-model:note="note" :key="note.id + ':normal'" style="margin-bottom: 16px;"/>
<XNoteDetailed v-if="note && value.detailed" v-model:note="note" :key="note.id + ':detail'" style="margin-bottom: 16px;"/> <XNoteDetailed v-if="note && value.detailed" v-model:note="note" :key="note.id + ':detail'" style="margin-bottom: 16px;"/>

13
src/client/pages/page-editor/els/page-editor.el.number-input.vue
View file

@ -3,9 +3,16 @@
<template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.numberInput }}</template> <template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.numberInput }}</template>
<section style="padding: 0 16px 0 16px;"> <section style="padding: 0 16px 0 16px;">
<MkInput v-model:value="value.name"><template #prefix><i class="fas fa-magic"></i></template><span>{{ $ts._pages.blocks._numberInput.name }}</span></MkInput> <MkInput v-model="value.name">
<MkInput v-model:value="value.text"><span>{{ $ts._pages.blocks._numberInput.text }}</span></MkInput> <template #prefix><i class="fas fa-magic"></i></template>
<MkInput v-model:value="value.default" type="number"><span>{{ $ts._pages.blocks._numberInput.default }}</span></MkInput> <template #label>{{ $ts._pages.blocks._numberInput.name }}</template>
</MkInput>
<MkInput v-model="value.text">
<template #label>{{ $ts._pages.blocks._numberInput.text }}</template>
</MkInput>
<MkInput v-model="value.default" type="number">
<template #label>{{ $ts._pages.blocks._numberInput.default }}</template>
</MkInput>
</section> </section>
</XContainer> </XContainer>
</template> </template>

6
src/client/pages/page-editor/els/page-editor.el.post.vue
View file

@ -3,9 +3,9 @@
<template #header><i class="fas fa-paper-plane"></i> {{ $ts._pages.blocks.post }}</template> <template #header><i class="fas fa-paper-plane"></i> {{ $ts._pages.blocks.post }}</template>
<section style="padding: 16px;"> <section style="padding: 16px;">
<MkTextarea v-model:value="value.text">{{ $ts._pages.blocks._post.text }}</MkTextarea> <MkTextarea v-model="value.text"><template #label>{{ $ts._pages.blocks._post.text }}</template></MkTextarea>
<MkSwitch v-model:value="value.attachCanvasImage"><span>{{ $ts._pages.blocks._post.attachCanvasImage }}</span></MkSwitch> <MkSwitch v-model="value.attachCanvasImage"><span>{{ $ts._pages.blocks._post.attachCanvasImage }}</span></MkSwitch>
<MkInput v-if="value.attachCanvasImage" v-model:value="value.canvasId"><span>{{ $ts._pages.blocks._post.canvasId }}</span></MkInput> <MkInput v-if="value.attachCanvasImage" v-model="value.canvasId"><template #label>{{ $ts._pages.blocks._post.canvasId }}</template></MkInput>
</section> </section>
</XContainer> </XContainer>
</template> </template>

8
src/client/pages/page-editor/els/page-editor.el.radio-button.vue
View file

@ -3,10 +3,10 @@
<template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.radioButton }}</template> <template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.radioButton }}</template>
<section style="padding: 0 16px 16px 16px;"> <section style="padding: 0 16px 16px 16px;">
<MkInput v-model:value="value.name"><template #prefix><i class="fas fa-magic"></i></template><span>{{ $ts._pages.blocks._radioButton.name }}</span></MkInput> <MkInput v-model="value.name"><template #prefix><i class="fas fa-magic"></i></template><template #label>{{ $ts._pages.blocks._radioButton.name }}</template></MkInput>
<MkInput v-model:value="value.title"><span>{{ $ts._pages.blocks._radioButton.title }}</span></MkInput> <MkInput v-model="value.title"><template #label>{{ $ts._pages.blocks._radioButton.title }}</template></MkInput>
<MkTextarea v-model:value="values"><span>{{ $ts._pages.blocks._radioButton.values }}</span></MkTextarea> <MkTextarea v-model="values"><template #label>{{ $ts._pages.blocks._radioButton.values }}</template></MkTextarea>
<MkInput v-model:value="value.default"><span>{{ $ts._pages.blocks._radioButton.default }}</span></MkInput> <MkInput v-model="value.default"><template #label>{{ $ts._pages.blocks._radioButton.default }}</template></MkInput>
</section> </section>
</XContainer> </XContainer>
</template> </template>

6
src/client/pages/page-editor/els/page-editor.el.switch.vue
View file

@ -3,9 +3,9 @@
<template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.switch }}</template> <template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.switch }}</template>
<section class="kjuadyyj"> <section class="kjuadyyj">
<MkInput v-model:value="value.name"><template #prefix><i class="fas fa-magic"></i></template><span>{{ $ts._pages.blocks._switch.name }}</span></MkInput> <MkInput v-model="value.name"><template #prefix><i class="fas fa-magic"></i></template><template #label>{{ $ts._pages.blocks._switch.name }}</template></MkInput>
<MkInput v-model:value="value.text"><span>{{ $ts._pages.blocks._switch.text }}</span></MkInput> <MkInput v-model="value.text"><template #label>{{ $ts._pages.blocks._switch.text }}</template></MkInput>
<MkSwitch v-model:value="value.default"><span>{{ $ts._pages.blocks._switch.default }}</span></MkSwitch> <MkSwitch v-model="value.default"><span>{{ $ts._pages.blocks._switch.default }}</span></MkSwitch>
</section> </section>
</XContainer> </XContainer>
</template> </template>

6
src/client/pages/page-editor/els/page-editor.el.text-input.vue
View file

@ -3,9 +3,9 @@
<template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.textInput }}</template> <template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.textInput }}</template>
<section style="padding: 0 16px 0 16px;"> <section style="padding: 0 16px 0 16px;">
<MkInput v-model:value="value.name"><template #prefix><i class="fas fa-magic"></i></template><span>{{ $ts._pages.blocks._textInput.name }}</span></MkInput> <MkInput v-model="value.name"><template #prefix><i class="fas fa-magic"></i></template><template #label>{{ $ts._pages.blocks._textInput.name }}</template></MkInput>
<MkInput v-model:value="value.text"><span>{{ $ts._pages.blocks._textInput.text }}</span></MkInput> <MkInput v-model="value.text"><template #label>{{ $ts._pages.blocks._textInput.text }}</template></MkInput>
<MkInput v-model:value="value.default" type="text"><span>{{ $ts._pages.blocks._textInput.default }}</span></MkInput> <MkInput v-model="value.default" type="text"><template #label>{{ $ts._pages.blocks._textInput.default }}</template></MkInput>
</section> </section>
</XContainer> </XContainer>
</template> </template>

6
src/client/pages/page-editor/els/page-editor.el.textarea-input.vue
View file

@ -3,9 +3,9 @@
<template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.textareaInput }}</template> <template #header><i class="fas fa-bolt"></i> {{ $ts._pages.blocks.textareaInput }}</template>
<section style="padding: 0 16px 16px 16px;"> <section style="padding: 0 16px 16px 16px;">
<MkInput v-model:value="value.name"><template #prefix><i class="fas fa-magic"></i></template><span>{{ $ts._pages.blocks._textareaInput.name }}</span></MkInput> <MkInput v-model="value.name"><template #prefix><i class="fas fa-magic"></i></template><template #label>{{ $ts._pages.blocks._textareaInput.name }}</template></MkInput>
<MkInput v-model:value="value.text"><span>{{ $ts._pages.blocks._textareaInput.text }}</span></MkInput> <MkInput v-model="value.text"><template #label>{{ $ts._pages.blocks._textareaInput.text }}</template></MkInput>
<MkTextarea v-model:value="value.default"><span>{{ $ts._pages.blocks._textareaInput.default }}</span></MkTextarea> <MkTextarea v-model="value.default"><template #label>{{ $ts._pages.blocks._textareaInput.default }}</template></MkTextarea>
</section> </section>
</XContainer> </XContainer>
</template> </template>

6
src/client/pages/page-editor/page-editor.script-block.vue
View file

@ -40,9 +40,9 @@
<input v-model="value.value"/> <input v-model="value.value"/>
</section> </section>
<section v-else-if="value.type === 'fn'" class="" style="padding:0 16px 16px 16px;"> <section v-else-if="value.type === 'fn'" class="" style="padding:0 16px 16px 16px;">
<MkTextarea v-model:value="slots"> <MkTextarea v-model="slots">
<span>{{ $ts._pages.script.blocks._fn.slots }}</span> <template #label>{{ $ts._pages.script.blocks._fn.slots }}</template>
<template #desc>{{ $t('_pages.script.blocks._fn.slots-info') }}</template> <template #caption>{{ $t('_pages.script.blocks._fn.slots-info') }}</template>
</MkTextarea> </MkTextarea>
<XV v-if="value.value.expression" v-model:value="value.value.expression" :title="$t(`_pages.script.blocks._fn.arg1`)" :get-expected-type="() => null" :hpml="hpml" :fn-slots="value.value.slots" :name="name"/> <XV v-if="value.value.expression" v-model:value="value.value.expression" :title="$t(`_pages.script.blocks._fn.arg1`)" :get-expected-type="() => null" :hpml="hpml" :fn-slots="value.value.slots" :name="name"/>
</section> </section>

20
src/client/pages/page-editor/page-editor.vue
View file

@ -11,28 +11,28 @@
<MkContainer :foldable="true" :expanded="true" class="_gap"> <MkContainer :foldable="true" :expanded="true" class="_gap">
<template #header><i class="fas fa-cog"></i> {{ $ts._pages.pageSetting }}</template> <template #header><i class="fas fa-cog"></i> {{ $ts._pages.pageSetting }}</template>
<div style="padding: 16px;"> <div style="padding: 16px;">
<MkInput v-model:value="title"> <MkInput v-model="title">
<span>{{ $ts._pages.title }}</span> <template #label>{{ $ts._pages.title }}</template>
</MkInput> </MkInput>
<MkInput v-model:value="summary"> <MkInput v-model="summary">
<span>{{ $ts._pages.summary }}</span> <template #label>{{ $ts._pages.summary }}</template>
</MkInput> </MkInput>
<MkInput v-model:value="name"> <MkInput v-model="name">
<template #prefix>{{ url }}/@{{ author.username }}/pages/</template> <template #prefix>{{ url }}/@{{ author.username }}/pages/</template>
<span>{{ $ts._pages.url }}</span> <template #label>{{ $ts._pages.url }}</template>
</MkInput> </MkInput>
<MkSwitch v-model:value="alignCenter">{{ $ts._pages.alignCenter }}</MkSwitch> <MkSwitch v-model="alignCenter">{{ $ts._pages.alignCenter }}</MkSwitch>
<MkSelect v-model:value="font"> <MkSelect v-model="font">
<template #label>{{ $ts._pages.font }}</template> <template #label>{{ $ts._pages.font }}</template>
<option value="serif">{{ $ts._pages.fontSerif }}</option> <option value="serif">{{ $ts._pages.fontSerif }}</option>
<option value="sans-serif">{{ $ts._pages.fontSansSerif }}</option> <option value="sans-serif">{{ $ts._pages.fontSansSerif }}</option>
</MkSelect> </MkSelect>
<MkSwitch v-model:value="hideTitleWhenPinned">{{ $ts._pages.hideTitleWhenPinned }}</MkSwitch> <MkSwitch v-model="hideTitleWhenPinned">{{ $ts._pages.hideTitleWhenPinned }}</MkSwitch>
<div class="eyeCatch"> <div class="eyeCatch">
<MkButton v-if="eyeCatchingImageId == null && !readonly" @click="setEyeCatchingImage"><i class="fas fa-plus"></i> {{ $ts._pages.eyeCatchingImageSet }}</MkButton> <MkButton v-if="eyeCatchingImageId == null && !readonly" @click="setEyeCatchingImage"><i class="fas fa-plus"></i> {{ $ts._pages.eyeCatchingImageSet }}</MkButton>
@ -77,7 +77,7 @@
<MkContainer :foldable="true" :expanded="true" class="_gap"> <MkContainer :foldable="true" :expanded="true" class="_gap">
<template #header><i class="fas fa-code"></i> {{ $ts.script }}</template> <template #header><i class="fas fa-code"></i> {{ $ts.script }}</template>
<div> <div>
<MkTextarea class="_code" v-model:value="script"/> <MkTextarea class="_code" v-model="script"/>
</div> </div>
</MkContainer> </MkContainer>
</div> </div>

8
src/client/pages/reversi/game.setting.vue
View file

@ -57,9 +57,9 @@
</header> </header>
<div> <div>
<MkSwitch v-model:value="game.isLlotheo" @update:value="updateSettings('isLlotheo')">{{ $ts._reversi.isLlotheo }}</MkSwitch> <MkSwitch v-model="game.isLlotheo" @update:modelValue="updateSettings('isLlotheo')">{{ $ts._reversi.isLlotheo }}</MkSwitch>
<MkSwitch v-model:value="game.loopedBoard" @update:value="updateSettings('loopedBoard')">{{ $ts._reversi.loopedMap }}</MkSwitch> <MkSwitch v-model="game.loopedBoard" @update:modelValue="updateSettings('loopedBoard')">{{ $ts._reversi.loopedMap }}</MkSwitch>
<MkSwitch v-model:value="game.canPutEverywhere" @update:value="updateSettings('canPutEverywhere')">{{ $ts._reversi.canPutEverywhere }}</MkSwitch> <MkSwitch v-model="game.canPutEverywhere" @update:modelValue="updateSettings('canPutEverywhere')">{{ $ts._reversi.canPutEverywhere }}</MkSwitch>
</div> </div>
</div> </div>
@ -70,7 +70,7 @@
<div> <div>
<template v-for="item in form"> <template v-for="item in form">
<MkSwitch v-if="item.type == 'switch'" v-model:value="item.value" :key="item.id" @change="onChangeForm(item)">{{ item.label || item.desc || '' }}</MkSwitch> <MkSwitch v-if="item.type == 'switch'" v-model="item.value" :key="item.id" @change="onChangeForm(item)">{{ item.label || item.desc || '' }}</MkSwitch>
<div class="card" v-if="item.type == 'radio'" :key="item.id"> <div class="card" v-if="item.type == 'radio'" :key="item.id">
<header> <header>

2
src/client/pages/room/room.vue
View file

@ -31,7 +31,7 @@
<MkButton @click="add()"><i class="fas fa-box-open"></i> {{ $ts._rooms.addFurniture }}</MkButton> <MkButton @click="add()"><i class="fas fa-box-open"></i> {{ $ts._rooms.addFurniture }}</MkButton>
</div> </div>
<div class="_content"> <div class="_content">
<MkSelect :value="roomType" @update:value="updateRoomType($event)"> <MkSelect :model-value="roomType" @update:modelValue="updateRoomType($event)">
<template #label>{{ $ts._rooms.roomType }}</template> <template #label>{{ $ts._rooms.roomType }}</template>
<option value="default">{{ $ts._rooms._roomType.default }}</option> <option value="default">{{ $ts._rooms._roomType.default }}</option>
<option value="washitsu">{{ $ts._rooms._roomType.washitsu }}</option> <option value="washitsu">{{ $ts._rooms._roomType.washitsu }}</option>

8
src/client/pages/settings/2fa.vue
View file

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
<MkSwitch v-model:value="usePasswordLessLogin" @update:value="updatePasswordLessLogin" v-if="$i.securityKeysList.length > 0">{{ $ts.passwordLessLogin }}</MkSwitch> <MkSwitch v-model="usePasswordLessLogin" @update:modelValue="updatePasswordLessLogin" v-if="$i.securityKeysList.length > 0">{{ $ts.passwordLessLogin }}</MkSwitch>
<MkInfo warn v-if="registration && registration.error">{{ $ts.error }} {{ registration.error }}</MkInfo> <MkInfo warn v-if="registration && registration.error">{{ $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>
@ -32,8 +32,8 @@
</li> </li>
<li v-if="registration.stage >= 1"> <li v-if="registration.stage >= 1">
<MkForm :disabled="registration.stage != 1 || registration.saving"> <MkForm :disabled="registration.stage != 1 || registration.saving">
<MkInput v-model:value="keyName" :max="30"> <MkInput v-model="keyName" :max="30">
<span>{{ $ts.securityKeyName }}</span> <template #label>{{ $ts.securityKeyName }}</template>
</MkInput> </MkInput>
<MkButton @click="registerKey" :disabled="keyName.length == 0">{{ $ts.registerSecurityKey }}</MkButton> <MkButton @click="registerKey" :disabled="keyName.length == 0">{{ $ts.registerSecurityKey }}</MkButton>
<i v-if="registration.saving && registration.stage == 1" class="fas fa-spinner fa-pulse fa-fw"></i> <i v-if="registration.saving && registration.stage == 1" class="fas fa-spinner fa-pulse fa-fw"></i>
@ -56,7 +56,7 @@
</li> </li>
<li>{{ $ts._2fa.step2 }}<br><img :src="data.qr"></li> <li>{{ $ts._2fa.step2 }}<br><img :src="data.qr"></li>
<li>{{ $ts._2fa.step3 }}<br> <li>{{ $ts._2fa.step3 }}<br>
<MkInput v-model:value="token" type="text" pattern="^[0-9]{6}$" autocomplete="off" spellcheck="false">{{ $ts.token }}</MkInput> <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> <MkButton primary @click="submit">{{ $ts.done }}</MkButton>
</li> </li>
</ol> </ol>

42
src/client/pages/test.vue
View file

@ -4,23 +4,23 @@
<div class="_card _gap"> <div class="_card _gap">
<div class="_title">Dialog</div> <div class="_title">Dialog</div>
<div class="_content"> <div class="_content">
<MkInput v-model:value="dialogTitle"> <MkInput v-model="dialogTitle">
<span>Title</span> <template #label>Title</template>
</MkInput> </MkInput>
<MkInput v-model:value="dialogBody"> <MkInput v-model="dialogBody">
<span>Body</span> <template #label>Body</template>
</MkInput> </MkInput>
<MkRadio v-model="dialogType" value="info">Info</MkRadio> <MkRadio v-model="dialogType" value="info">Info</MkRadio>
<MkRadio v-model="dialogType" value="success">Success</MkRadio> <MkRadio v-model="dialogType" value="success">Success</MkRadio>
<MkRadio v-model="dialogType" value="warning">Warn</MkRadio> <MkRadio v-model="dialogType" value="warning">Warn</MkRadio>
<MkRadio v-model="dialogType" value="error">Error</MkRadio> <MkRadio v-model="dialogType" value="error">Error</MkRadio>
<MkSwitch v-model:value="dialogCancel"> <MkSwitch v-model="dialogCancel">
<span>With cancel button</span> <span>With cancel button</span>
</MkSwitch> </MkSwitch>
<MkSwitch v-model:value="dialogCancelByBgClick"> <MkSwitch v-model="dialogCancelByBgClick">
<span>Can cancel by modal bg click</span> <span>Can cancel by modal bg click</span>
</MkSwitch> </MkSwitch>
<MkSwitch v-model:value="dialogInput"> <MkSwitch v-model="dialogInput">
<span>With input field</span> <span>With input field</span>
</MkSwitch> </MkSwitch>
<MkButton @click="showDialog()">Show</MkButton> <MkButton @click="showDialog()">Show</MkButton>
@ -33,11 +33,11 @@
<div class="_card _gap"> <div class="_card _gap">
<div class="_title">Form</div> <div class="_title">Form</div>
<div class="_content"> <div class="_content">
<MkInput v-model:value="formTitle"> <MkInput v-model="formTitle">
<span>Title</span> <template #label>Title</template>
</MkInput> </MkInput>
<MkTextarea v-model:value="formForm"> <MkTextarea v-model="formForm">
<span>Form</span> <template #label>Form</template>
</MkTextarea> </MkTextarea>
<MkButton @click="form()">Show</MkButton> <MkButton @click="form()">Show</MkButton>
</div> </div>
@ -49,8 +49,8 @@
<div class="_card _gap"> <div class="_card _gap">
<div class="_title">MFM</div> <div class="_title">MFM</div>
<div class="_content"> <div class="_content">
<MkTextarea v-model:value="mfm"> <MkTextarea v-model="mfm">
<span>MFM</span> <template #label>MFM</template>
</MkTextarea> </MkTextarea>
</div> </div>
<div class="_content"> <div class="_content">
@ -61,7 +61,7 @@
<div class="_card _gap"> <div class="_card _gap">
<div class="_title">selectDriveFile</div> <div class="_title">selectDriveFile</div>
<div class="_content"> <div class="_content">
<MkSwitch v-model:value="selectDriveFileMultiple"> <MkSwitch v-model="selectDriveFileMultiple">
<span>Multiple</span> <span>Multiple</span>
</MkSwitch> </MkSwitch>
<MkButton @click="selectDriveFile()">selectDriveFile</MkButton> <MkButton @click="selectDriveFile()">selectDriveFile</MkButton>
@ -74,7 +74,7 @@
<div class="_card _gap"> <div class="_card _gap">
<div class="_title">selectDriveFolder</div> <div class="_title">selectDriveFolder</div>
<div class="_content"> <div class="_content">
<MkSwitch v-model:value="selectDriveFolderMultiple"> <MkSwitch v-model="selectDriveFolderMultiple">
<span>Multiple</span> <span>Multiple</span>
</MkSwitch> </MkSwitch>
<MkButton @click="selectDriveFolder()">selectDriveFolder</MkButton> <MkButton @click="selectDriveFolder()">selectDriveFolder</MkButton>
@ -97,14 +97,14 @@
<div class="_card _gap"> <div class="_card _gap">
<div class="_title">Notification</div> <div class="_title">Notification</div>
<div class="_content"> <div class="_content">
<MkInput v-model:value="notificationIconUrl"> <MkInput v-model="notificationIconUrl">
<span>Icon URL</span> <template #label>Icon URL</template>
</MkInput> </MkInput>
<MkInput v-model:value="notificationHeader"> <MkInput v-model="notificationHeader">
<span>Header</span> <template #label>Header</template>
</MkInput> </MkInput>
<MkTextarea v-model:value="notificationBody"> <MkTextarea v-model="notificationBody">
<span>Body</span> <template #label>Body</template>
</MkTextarea> </MkTextarea>
<MkButton @click="createNotification()">createNotification</MkButton> <MkButton @click="createNotification()">createNotification</MkButton>
</div> </div>

8
src/client/pages/welcome.setup.vue
View file

@ -3,13 +3,13 @@
<h1>Welcome to Misskey!</h1> <h1>Welcome to Misskey!</h1>
<div> <div>
<p>{{ $ts.intro }}</p> <p>{{ $ts.intro }}</p>
<MkInput v-model:value="username" pattern="^[a-zA-Z0-9_]{1,20}$" spellcheck="false" required> <MkInput v-model="username" pattern="^[a-zA-Z0-9_]{1,20}$" spellcheck="false" required>
<span>{{ $ts.username }}</span> <template #label>{{ $ts.username }}</template>
<template #prefix>@</template> <template #prefix>@</template>
<template #suffix>@{{ host }}</template> <template #suffix>@{{ host }}</template>
</MkInput> </MkInput>
<MkInput v-model:value="password" type="password"> <MkInput v-model="password" type="password">
<span>{{ $ts.password }}</span> <template #label>{{ $ts.password }}</template>
<template #prefix><i class="fas fa-lock"></i></template> <template #prefix><i class="fas fa-lock"></i></template>
</MkInput> </MkInput>
<footer> <footer>

3
src/client/themes/_dark.json5
View file

@ -53,7 +53,8 @@
cwHoverBg: '#707b97', cwHoverBg: '#707b97',
buttonBg: 'rgba(255, 255, 255, 0.05)', buttonBg: 'rgba(255, 255, 255, 0.05)',
buttonHoverBg: 'rgba(255, 255, 255, 0.1)', buttonHoverBg: 'rgba(255, 255, 255, 0.1)',
inputBorder: '#959da2', inputBorder: 'rgba(255, 255, 255, 0.1)',
inputBorderHover: 'rgba(255, 255, 255, 0.2)',
listItemHoverBg: 'rgba(255, 255, 255, 0.03)', listItemHoverBg: 'rgba(255, 255, 255, 0.03)',
driveFolderBg: ':alpha<0.3<@accent', driveFolderBg: ':alpha<0.3<@accent',
wallpaperOverlay: 'rgba(0, 0, 0, 0.5)', wallpaperOverlay: 'rgba(0, 0, 0, 0.5)',

3
src/client/themes/_light.json5
View file

@ -53,7 +53,8 @@
cwHoverBg: '#bbc4ce', cwHoverBg: '#bbc4ce',
buttonBg: 'rgba(0, 0, 0, 0.05)', buttonBg: 'rgba(0, 0, 0, 0.05)',
buttonHoverBg: 'rgba(0, 0, 0, 0.1)', buttonHoverBg: 'rgba(0, 0, 0, 0.1)',
inputBorder: '#dae0e4', inputBorder: 'rgba(0, 0, 0, 0.1)',
inputBorderHover: 'rgba(0, 0, 0, 0.2)',
listItemHoverBg: 'rgba(0, 0, 0, 0.03)', listItemHoverBg: 'rgba(0, 0, 0, 0.03)',
driveFolderBg: ':alpha<0.3<@accent', driveFolderBg: ':alpha<0.3<@accent',
wallpaperOverlay: 'rgba(255, 255, 255, 0.5)', wallpaperOverlay: 'rgba(255, 255, 255, 0.5)',

3
src/client/themes/d-astro.json5
View file

@ -38,7 +38,8 @@
infoWarnFg: '#ffbd3e', infoWarnFg: '#ffbd3e',
navHoverFg: ':lighten<17<@fg', navHoverFg: ':lighten<17<@fg',
dateLabelFg: '@fg', dateLabelFg: '@fg',
inputBorder: '#959da2', inputBorder: 'rgba(255, 255, 255, 0.1)',
inputBorderHover: 'rgba(255, 255, 255, 0.2)',
panelBorder: '" solid 1px var(--divider)', panelBorder: '" solid 1px var(--divider)',
accentDarken: ':darken<10<@accent', accentDarken: ':darken<10<@accent',
acrylicPanel: ':alpha<0.5<@panel', acrylicPanel: ':alpha<0.5<@panel',

1
src/client/themes/l-apricot.json5
View file

@ -16,6 +16,7 @@
mention: '@accent', mention: '@accent',
hashtag: '@accent', hashtag: '@accent',
inputBorder: 'rgba(0, 0, 0, 0.1)', inputBorder: 'rgba(0, 0, 0, 0.1)',
inputBorderHover: 'rgba(0, 0, 0, 0.2)',
infoBg: 'rgb(226, 235, 241)', infoBg: 'rgb(226, 235, 241)',
}, },
} }

3
src/client/themes/l-vivid.json5
View file

@ -41,7 +41,8 @@
infoWarnFg: '#573c08', infoWarnFg: '#573c08',
navHoverFg: ':darken<17<@fg', navHoverFg: ':darken<17<@fg',
dateLabelFg: '@fg', dateLabelFg: '@fg',
inputBorder: '#dae0e4', inputBorder: 'rgba(0, 0, 0, 0.1)',
inputBorderHover: 'rgba(0, 0, 0, 0.2)',
panelBorder: '" solid 1px var(--divider)', panelBorder: '" solid 1px var(--divider)',
accentDarken: ':darken<10<@accent', accentDarken: ':darken<10<@accent',
acrylicPanel: ':alpha<0.5<@panel', acrylicPanel: ':alpha<0.5<@panel',