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

🎨

Browse source
This commit is contained in:
syuilo 2023-01-06 09:59:17 +09:00
parent aefc8fb7b5
commit d25f214a09
5 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

30
packages/frontend/src/components/MkAbuseReportWindow.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<XWindow ref="uiWindow" :initial-width="400" :initial-height="500" :can-resize="true" @closed="emit('closed')"> <MkWindow ref="uiWindow" :initial-width="400" :initial-height="500" :can-resize="true" @closed="emit('closed')">
<template #header> <template #header>
<i class="ti ti-exclamation-circle" style="margin-right: 0.5em;"></i> <i class="ti ti-exclamation-circle" style="margin-right: 0.5em;"></i>
<I18n :src="i18n.ts.reportAbuseOf" tag="span"> <I18n :src="i18n.ts.reportAbuseOf" tag="span">
@ -8,24 +8,26 @@
</template> </template>
</I18n> </I18n>
</template> </template>
<div class="dpvffvvy _autoGap"> <MkSpacer :margin-min="20" :margin-max="28">
<div class=""> <div class="dpvffvvy _autoGap">
<MkTextarea v-model="comment"> <div class="">
<template #label>{{ i18n.ts.details }}</template> <MkTextarea v-model="comment">
<template #caption>{{ i18n.ts.fillAbuseReportDescription }}</template> <template #label>{{ i18n.ts.details }}</template>
</MkTextarea> <template #caption>{{ i18n.ts.fillAbuseReportDescription }}</template>
</MkTextarea>
</div>
<div class="">
<MkButton primary full :disabled="comment.length === 0" @click="send">{{ i18n.ts.send }}</MkButton>
</div>
</div> </div>
<div class=""> </MkSpacer>
<MkButton primary full :disabled="comment.length === 0" @click="send">{{ i18n.ts.send }}</MkButton> </MkWindow>
</div>
</div>
</XWindow>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, shallowRef } from 'vue'; import { ref, shallowRef } from 'vue';
import * as Misskey from 'misskey-js'; import * as Misskey from 'misskey-js';
import XWindow from '@/components/MkWindow.vue'; import MkWindow from '@/components/MkWindow.vue';
import MkTextarea from '@/components/form/textarea.vue'; import MkTextarea from '@/components/form/textarea.vue';
import MkButton from '@/components/MkButton.vue'; import MkButton from '@/components/MkButton.vue';
import * as os from '@/os'; import * as os from '@/os';
@ -40,7 +42,7 @@ const emit = defineEmits<{
(ev: 'closed'): void; (ev: 'closed'): void;
}>(); }>();
const uiWindow = shallowRef<InstanceType<typeof XWindow>>(); const uiWindow = shallowRef<InstanceType<typeof MkWindow>>();
const comment = ref(props.initialComment || ''); const comment = ref(props.initialComment || '');
function send() { function send() {

6
packages/frontend/src/components/MkDriveWindow.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<XWindow <MkWindow
ref="window" ref="window"
:initial-width="800" :initial-width="800"
:initial-height="500" :initial-height="500"
@ -10,14 +10,14 @@
{{ i18n.ts.drive }} {{ i18n.ts.drive }}
</template> </template>
<XDrive :initial-folder="initialFolder"/> <XDrive :initial-folder="initialFolder"/>
</XWindow> </MkWindow>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { } from 'vue'; import { } from 'vue';
import * as Misskey from 'misskey-js'; import * as Misskey from 'misskey-js';
import XDrive from '@/components/MkDrive.vue'; import XDrive from '@/components/MkDrive.vue';
import XWindow from '@/components/MkWindow.vue'; import MkWindow from '@/components/MkWindow.vue';
import { i18n } from '@/i18n'; import { i18n } from '@/i18n';
defineProps<{ defineProps<{

8
packages/frontend/src/components/MkPageWindow.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<XWindow <MkWindow
ref="windowEl" ref="windowEl"
:initial-width="500" :initial-width="500"
:initial-height="500" :initial-height="500"
@ -20,13 +20,13 @@
<div class="yrolvcoq" :style="{ background: pageMetadata?.value?.bg }" style="container-type: inline-size;"> <div class="yrolvcoq" :style="{ background: pageMetadata?.value?.bg }" style="container-type: inline-size;">
<RouterView :router="router"/> <RouterView :router="router"/>
</div> </div>
</XWindow> </MkWindow>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ComputedRef, inject, provide } from 'vue'; import { ComputedRef, inject, provide } from 'vue';
import RouterView from '@/components/global/RouterView.vue'; import RouterView from '@/components/global/RouterView.vue';
import XWindow from '@/components/MkWindow.vue'; import MkWindow from '@/components/MkWindow.vue';
import { popout as _popout } from '@/scripts/popout'; import { popout as _popout } from '@/scripts/popout';
import copyToClipboard from '@/scripts/copy-to-clipboard'; import copyToClipboard from '@/scripts/copy-to-clipboard';
import { url } from '@/config'; import { url } from '@/config';
@ -47,7 +47,7 @@ defineEmits<{
const router = new Router(routes, props.initialPath); const router = new Router(routes, props.initialPath);
let pageMetadata = $ref<null | ComputedRef<PageMetadata>>(); let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
let windowEl = $shallowRef<InstanceType<typeof XWindow>>(); let windowEl = $shallowRef<InstanceType<typeof MkWindow>>();
const history = $ref<{ path: string; key: any; }[]>([{ const history = $ref<{ path: string; key: any; }[]>([{
path: router.getCurrentPath(), path: router.getCurrentPath(),
key: router.getCurrentKey(), key: router.getCurrentKey(),

1
packages/frontend/src/components/MkWindow.vue
View file

@ -489,6 +489,7 @@ defineExpose({
flex: 1; flex: 1;
overflow: auto; overflow: auto;
background: var(--panel); background: var(--panel);
container-type: inline-size;
} }
} }

6
packages/frontend/src/components/MkYoutubePlayer.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<XWindow :initial-width="640" :initial-height="402" :can-resize="true" :close-button="true"> <MkWindow :initial-width="640" :initial-height="402" :can-resize="true" :close-button="true">
<template #header> <template #header>
<i class="icon ti ti-brand-youtube" style="margin-right: 0.5em;"></i> <i class="icon ti ti-brand-youtube" style="margin-right: 0.5em;"></i>
<span>{{ title ?? 'YouTube' }}</span> <span>{{ title ?? 'YouTube' }}</span>
@ -14,11 +14,11 @@
<MkLoading v-if="fetching"/> <MkLoading v-if="fetching"/>
<MkError v-else-if="!player.url" @retry="ytFetch()"/> <MkError v-else-if="!player.url" @retry="ytFetch()"/>
</div> </div>
</XWindow> </MkWindow>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import XWindow from '@/components/MkWindow.vue'; import MkWindow from '@/components/MkWindow.vue';
import { versatileLang } from '@/scripts/intl-const'; import { versatileLang } from '@/scripts/intl-const';
const props = defineProps<{ const props = defineProps<{