misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey/develop' into future-2024-03-14

Browse source
This commit is contained in:
dakkar 2024-03-14 16:28:56 +00:00
commit 9478fc0095
57 changed files with 1082 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

20
packages/frontend/src/pages/settings/plugin.vue
View file

@ -41,13 +41,26 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkButton inline danger @click="uninstall(plugin)"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.uninstall }}</MkButton>
</div>
<MkFolder>
<template #icon><i class="ph-terminal-window ph-bold ph-lg"></i></template>
<template #label>{{ i18n.ts._plugin.viewLog }}</template>
<div class="_gaps_s">
<div class="_buttons">
<MkButton inline @click="copy(pluginLogs.get(plugin.id)?.join('\n'))"><i class="ti ti-copy"></i> {{ i18n.ts.copy }}</MkButton>
</div>
<MkCode :code="pluginLogs.get(plugin.id)?.join('\n') ?? ''"/>
</div>
</MkFolder>
<MkFolder>
<template #icon><i class="ph-code ph-bold ph-lg"></i></template>
<template #label>{{ i18n.ts._plugin.viewSource }}</template>
<div class="_gaps_s">
<div class="_buttons">
<MkButton inline @click="copy(plugin)"><i class="ph-copy ph-bold ph-lg"></i> {{ i18n.ts.copy }}</MkButton>
<MkButton inline @click="copy(plugin.src)"><i class="ph-copy ph-bold ph-lg"></i> {{ i18n.ts.copy }}</MkButton>
</div>
<MkCode :code="plugin.src ?? ''" lang="is"/>
@ -74,6 +87,7 @@ import { ColdDeviceStorage } from '@/store.js';
import { unisonReload } from '@/scripts/unison-reload.js';
import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
import { pluginLogs } from '@/plugin.js';
const plugins = ref(ColdDeviceStorage.get('plugins'));
@ -87,8 +101,8 @@ async function uninstall(plugin) {
});
}
function copy(plugin) {
copyToClipboard(plugin.src ?? '');
function copy(text) {
copyToClipboard(text ?? '');
os.success();
}

27
packages/frontend/src/pages/welcome.entrance.a.vue
View file

@ -9,7 +9,10 @@ SPDX-License-Identifier: AGPL-3.0-only
<XTimeline class="tl"/>
<div class="shape1"></div>
<div class="shape2"></div>
<img :src="misskeysvg" class="misskey"/>
<div class="logo-wrapper">
<div class="powered-by">Powered by</div>
<img :src="misskeysvg" class="misskey"/>
</div>
<div class="emojis">
<MkEmoji :normal="true" :noStyle="true" emoji="👍"/>
<MkEmoji :normal="true" :noStyle="true" emoji="❤"/>
@ -113,14 +116,24 @@ misskeyApiGet('federation/instances', {
opacity: 0.5;
}
> .misskey {
> .logo-wrapper {
position: fixed;
top: 42px;
left: 42px;
width: 140px;
top: 36px;
left: 36px;
flex: auto;
color: #fff;
user-select: none;
pointer-events: none;
@media (max-width: 450px) {
width: 130px;
> .powered-by {
margin-bottom: 2px;
}
> .misskey {
width: 140px;
@media (max-width: 450px) {
width: 130px;
}
}
}