Merge branch 'sim-dev/misete' into develop
This commit is contained in:
commit
a1c97e6700
@ -37,6 +37,7 @@
|
||||
"katex": "0.15.6",
|
||||
"matter-js": "0.18.0",
|
||||
"mfm-js": "0.23.0",
|
||||
"misetehoshii": "https://github.com/melt-adzuki/misetehoshii",
|
||||
"misskey-js": "0.0.14",
|
||||
"photoswipe": "5.3.2",
|
||||
"prismjs": "1.29.0",
|
||||
|
||||
@ -1,11 +1,14 @@
|
||||
<template>
|
||||
<MkStickyContainer>
|
||||
<template #header><XHeader v-model:tab="tab" :tabs="headerTabs" /></template>
|
||||
<MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
|
||||
<div class="cwepdizn _formRoot">
|
||||
<div v-if="tab === 'string'" class="local">
|
||||
<FormSection>
|
||||
<template #label>{{ $ts.preview }}</template>
|
||||
<p><img :src="previewUrl" class="img" :alt="emojiName" /></p>
|
||||
</FormSection>
|
||||
<FormButton primary class="_formBlock" @click="uploadEmoji">{{ $ts.emojiApproval }}</FormButton>
|
||||
<FormButton primary class="_formBlock" @click="uploadEmoji('url')">{{ $ts.emojiApproval }}</FormButton>
|
||||
<FormSection>
|
||||
<template #label>{{ $ts.settings }}</template>
|
||||
<FormInput v-model="emojiName" class="_formBlock">
|
||||
@ -70,7 +73,37 @@
|
||||
</FormFolder>
|
||||
</FormSection>
|
||||
</div>
|
||||
|
||||
<div v-else-if="tab === 'misetehoshii'" class="remote">
|
||||
<FormSection>
|
||||
<template #label>{{ $ts.preview }}</template>
|
||||
<canvas class="preview__content" ref="canvas" width="64" height="30" />
|
||||
</FormSection>
|
||||
<FormButton primary class="_formBlock" @click="uploadEmoji('')">{{ $ts.emojiApproval }}</FormButton>
|
||||
<FormSection>
|
||||
<template #label>{{ $ts.settings }}</template>
|
||||
<FormInput v-model="emojiName" class="_formBlock">
|
||||
<template #label>{{ $ts.emojiName }}</template>
|
||||
</FormInput>
|
||||
|
||||
<FormTextarea v-model="text" value="見せてほしい" class="_formBlock">
|
||||
<template #label>{{ $ts.text }}</template>
|
||||
</FormTextarea>
|
||||
|
||||
<FormRadios v-model="backColor" class="_formBlock">
|
||||
<template #label>{{ $ts._theme.color }}</template>
|
||||
<option v-for="c in backColors" v-bind:value="c">{{c}}</option>
|
||||
</FormRadios>
|
||||
</FormSection>
|
||||
<FormSection>
|
||||
<template #label>見せてほしいメーカー</template>
|
||||
<div>Powered by <MkLink url="https://github.com/melt-adzuki/misetehoshii">misetehoshii</MkLink>
|
||||
</div>
|
||||
</FormSection>
|
||||
</div>
|
||||
</div>
|
||||
</MkSpacer>
|
||||
</MkStickyContainer>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
@ -80,6 +113,10 @@ import * as os from '@/os';
|
||||
import { i18n } from '@/i18n';
|
||||
import { defaultStore } from '@/store';
|
||||
import { stream } from '@/stream';
|
||||
import { uploadFile } from '@/scripts/upload';
|
||||
import XHeader from './_header_.vue';
|
||||
import MkTab from '@/components/MkTab.vue';
|
||||
import MkLink from '@/components/MkLink.vue';
|
||||
import FormSection from '@/components/form/section.vue';
|
||||
import FormInput from '@/components/form/input.vue';
|
||||
import FormSwitch from '@/components/form/switch.vue';
|
||||
@ -88,6 +125,22 @@ import FormRadios from '@/components/form/radios.vue';
|
||||
import FormTextarea from '@/components/form/textarea.vue';
|
||||
import FormFolder from '@/components/form/folder.vue';
|
||||
import { definePageMetadata } from '@/scripts/page-metadata';
|
||||
import { buttonImages } from "misetehoshii/src/assets";
|
||||
import { draw } from "misetehoshii/src/canvas"
|
||||
|
||||
definePageMetadata(computed(() => ({
|
||||
title: i18n.ts.emojiGen,
|
||||
icon: 'fas fa-kiss-wink-heart',
|
||||
})));
|
||||
|
||||
const tab = ref('string');
|
||||
const headerTabs = $computed(() => [{
|
||||
key: 'string',
|
||||
title: 'もじもじ',
|
||||
}, {
|
||||
key: 'misetehoshii',
|
||||
title: '見せてほしい',
|
||||
}]);
|
||||
|
||||
const font = ref('rounded-x-mplus-1p-black');
|
||||
const text = ref('');
|
||||
@ -111,8 +164,27 @@ const accentColors = [
|
||||
'#8080ff',
|
||||
];
|
||||
|
||||
watch([font, text, emojiAlign, emojiSizeFixed, emojiStretch, emojiColor], () => {
|
||||
const backColor = ref('blue')
|
||||
const canvas = ref<HTMLCanvasElement>()
|
||||
const buttonImage = computed(() => buttonImages[backColor.value])
|
||||
const backColors = [
|
||||
'blue',
|
||||
'peacockGreen',
|
||||
'green',
|
||||
'yellow',
|
||||
'red',
|
||||
'pink',
|
||||
'disabled',
|
||||
];
|
||||
|
||||
const updateCanvas = (): void => {
|
||||
const context = canvas.value!.getContext("2d")!
|
||||
draw({ context, text: text.value, button: buttonImage.value })
|
||||
}
|
||||
|
||||
watch([font, text, emojiAlign, emojiSizeFixed, emojiStretch, emojiColor, backColor], () => {
|
||||
preview();
|
||||
updateCanvas();
|
||||
});
|
||||
|
||||
const colorPick = (): void => {
|
||||
@ -197,7 +269,9 @@ const getEmojiObject = emojiId => new Promise<Record<string, any> | null>(async
|
||||
resolve(id[0]);
|
||||
});
|
||||
|
||||
const uploadEmoji = async () => {
|
||||
const uploadEmoji = async (type: string) => {
|
||||
|
||||
if (type == 'url') {
|
||||
const emojiUrl = makeUrl();
|
||||
const fileId = await uploadFileFromUrlWithId(emojiUrl);
|
||||
|
||||
@ -216,14 +290,36 @@ const uploadEmoji = async () => {
|
||||
text: i18n.ts.failedToUploadEmoji,
|
||||
});
|
||||
}
|
||||
|
||||
os.popup(defineAsyncComponent(() => import('./emoji-edit-dialog.vue')), { emoji });
|
||||
} else {
|
||||
const canvasImg = new Promise<Blob>(resolve => {
|
||||
canvas.value!.toBlob(blob => resolve(blob?.slice(0, blob.size, 'image/png') as Blob));
|
||||
})
|
||||
const file = new File([await canvasImg], emojiName.value + '.png', { type: 'image/png' });
|
||||
const fileId = (await uploadFile(file, defaultStore.state.uploadFolder, undefined, true)).id
|
||||
|
||||
// ドライブにアップロードされたファイルをリネーム
|
||||
await os.api('drive/files/update', {
|
||||
fileId,
|
||||
name: emojiName.value + '.png',
|
||||
});
|
||||
|
||||
const emojiId = await os.api('admin/emoji/add', { fileId });
|
||||
const emoji = await getEmojiObject(emojiId);
|
||||
|
||||
if (!emoji) {
|
||||
os.alert({
|
||||
type: 'error',
|
||||
text: i18n.ts.failedToUploadEmoji,
|
||||
});
|
||||
}
|
||||
os.popup(defineAsyncComponent(() => import('./emoji-edit-dialog.vue')), { emoji });
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
|
||||
definePageMetadata(computed(() => ({
|
||||
title: i18n.ts.emojiGen,
|
||||
icon: 'fas fa-kiss-wink-heart',
|
||||
})));
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@ -1226,6 +1226,11 @@ delayed-stream@~1.0.0:
|
||||
resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
|
||||
integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
|
||||
|
||||
destyle.css@^3.0.2:
|
||||
version "3.0.2"
|
||||
resolved "https://registry.yarnpkg.com/destyle.css/-/destyle.css-3.0.2.tgz#80c331db91f02337040b62dc534ab4f3dc075546"
|
||||
integrity sha512-OUzuAlridP01YP0seHxx+FgwhdXF07Ls9NxnJpR8EI7ADioswoR7VKkBd/s1hNw/G4ILasLSA0k2Kw1M57r1kA==
|
||||
|
||||
detect-node@2.1.0, detect-node@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
|
||||
@ -2616,6 +2621,13 @@ minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
|
||||
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
|
||||
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
|
||||
|
||||
"misetehoshii@https://github.com/melt-adzuki/misetehoshii":
|
||||
version "0.0.0"
|
||||
resolved "https://github.com/melt-adzuki/misetehoshii#d00f51529e390808f92172000f960b4f1314f37c"
|
||||
dependencies:
|
||||
destyle.css "^3.0.2"
|
||||
vue "^3.2.37"
|
||||
|
||||
misskey-js@0.0.14:
|
||||
version "0.0.14"
|
||||
resolved "https://registry.yarnpkg.com/misskey-js/-/misskey-js-0.0.14.tgz#1a616bdfbe81c6ee6900219eaf425bb5c714dd4d"
|
||||
@ -3621,7 +3633,7 @@ vue-prism-editor@2.0.0-alpha.2:
|
||||
resolved "https://registry.yarnpkg.com/vue-prism-editor/-/vue-prism-editor-2.0.0-alpha.2.tgz#aa53a88efaaed628027cbb282c2b1d37fc7c5c69"
|
||||
integrity sha512-Gu42ba9nosrE+gJpnAEuEkDMqG9zSUysIR8SdXUw8MQKDjBnnNR9lHC18uOr/ICz7yrA/5c7jHJr9lpElODC7w==
|
||||
|
||||
vue@3.2.39:
|
||||
vue@3.2.39, vue@^3.2.37:
|
||||
version "3.2.39"
|
||||
resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.39.tgz#de071c56c4c32c41cbd54e55f11404295c0dd62d"
|
||||
integrity sha512-tRkguhRTw9NmIPXhzk21YFBqXHT2t+6C6wPOgQ50fcFVWnPdetmRqbmySRHznrYjX2E47u0cGlKGcxKZJ38R/g==
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user