sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

emojigen wip25

Browse Source
This commit is contained in:
こけっち 2022-05-06 04:19:23 +09:00
parent 04c7dcd201
commit 522e148146
No known key found for this signature in database
GPG Key ID: 21460619C5FC4DD1
1 changed files with 59 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
packages/client/src/pages/admin/emojigen.vue
View File

@ -1,73 +1,70 @@
<template> <template>
<MkSpacer :content-max="700" :margin-min="16" :margin-max="32"> <MkSpacer :content-max="700" :margin-min="16" :margin-max="32">
<FormSuspense :p="init"> <div class="_formRoot">
<div class="_formRoot"> <FormInput v-model="emojiName" class="_formBlock">
<FormInput v-model="emojiName" class="_formBlock"> <template #label>{{ $ts.emojiName }}</template>
<template #label>{{ $ts.emojiName }}</template> </FormInput>
</FormInput>
<FormTextarea v-model="text" class="_formBlock"> <FormTextarea v-model="text" class="_formBlock">
<template #label>{{ $ts.text }}</template> <template #label>{{ $ts.text }}</template>
</FormTextarea> </FormTextarea>
<FormRadios v-model="emojiAlign" class="_formBlock"> <FormRadios v-model="emojiAlign" class="_formBlock">
<template #label>{{ $ts.emojiAlign }}</template> <template #label>{{ $ts.emojiAlign }}</template>
<option value="left"><i class="fa-solid fa-align-left"/></option> <option value="left"><i class="fa-solid fa-align-left"/></option>
<option value="center"><i class="fa-solid fa-align-center"></i></option> <option value="center"><i class="fa-solid fa-align-center"></i></option>
<option value="right"><i class="fa-solid fa-align-right"/></option> <option value="right"><i class="fa-solid fa-align-right"/></option>
</FormRadios> </FormRadios>
<FormSection> <FormSection>
<template #label>{{ $ts.emojiSizeSetting }}</template> <template #label>{{ $ts.emojiSizeSetting }}</template>
<FormSwitch v-model="emojiSizeFixed" class="_formBlock"> <FormSwitch v-model="emojiSizeFixed" class="_formBlock">
<template #label>{{ $ts.emojiSizeFixed }}</template> <template #label>{{ $ts.emojiSizeFixed }}</template>
</FormSwitch> </FormSwitch>
<FormSwitch v-model="emojiStretch" class="_formBlock"> <FormSwitch v-model="emojiStretch" class="_formBlock">
<template #label>{{ $ts.emojiStretch }}</template> <template #label>{{ $ts.emojiStretch }}</template>
</FormSwitch> </FormSwitch>
</FormSection> </FormSection>
<FormRadios v-model="font" class="_formBlock"> <FormRadios v-model="font" class="_formBlock">
<template #label>{{ $ts.font }}</template> <template #label>{{ $ts.font }}</template>
<option value="notosans-mono-bold">Noto Sans Mono CJK JP Bold</option> <option value="notosans-mono-bold">Noto Sans Mono CJK JP Bold</option>
<option value="mplus-1p-black">M+ 1p black</option> <option value="mplus-1p-black">M+ 1p black</option>
<option value="rounded-x-mplus-1p-black">Rounded M+ 1p black</option> <option value="rounded-x-mplus-1p-black">Rounded M+ 1p black</option>
<option value="ipamjm">IPAmj明朝</option> <option value="ipamjm">IPAmj明朝</option>
<option value="aoyagireisyoshimo">青柳隷書しも</option> <option value="aoyagireisyoshimo">青柳隷書しも</option>
<option value="LinLibertine_RBah">LinLibertine Bold</option> <option value="LinLibertine_RBah">LinLibertine Bold</option>
</FormRadios> </FormRadios>
<FormFolder :default-open="true" class="_formBlock"> <FormFolder :default-open="true" class="_formBlock">
<template #label>{{ i18n.ts.accentColor }}</template> <template #label>{{ $ts.accentColor }}</template>
<div class="cwepdizn-colors"> <div class="cwepdizn-colors">
<div class="row"> <div class="row">
<button v-for="color in accentColors" :key="color" class="color rounded _button" @click="setAccentColor(color)"> <button v-for="color in accentColors" :key="color" class="color rounded _button" @click="setAccentColor(color)">
<div class="preview" :style="{ background: color }"></div> <div class="preview" :style="{ background: color }"></div>
</button> </button>
</div>
</div> </div>
</FormFolder> </div>
</FormFolder>
<FormInput v-model="emojiColor" class="_formBlock"> <FormInput v-model="emojiColor" class="_formBlock">
<template #prefix><i class="fas fa-palette"></i></template> <template #prefix><i class="fas fa-palette"></i></template>
<template #label>{{ $ts.emojiColor }}</template> <template #label>{{ $ts.emojiColor }}</template>
<template #caption>#RRGGBB</template> <!--FFを最後に足すこと--> <template #caption>#RRGGBB</template> <!--FFを最後に足すこと-->
</FormInput> </FormInput>
<!-- このあとプレビュー＋絵文字登録 --> <!-- このあとプレビュー＋絵文字登録 -->
<FormButton primary class="_formBlock" @click="emojiGenerate">{{ $ts.emojiGenerate }}</FormButton> <FormButton primary class="_formBlock" @click="emojiGenerate">{{ $ts.emojiGenerate }}</FormButton>
<FormSection> <FormSection>
<template #label>{{ $ts.preview }}</template> <template #label>{{ $ts.preview }}</template>
<img :src="emojiUrl" class="img" :alt="emojiName"/> <img :src="emojiUrl" class="img" :alt="emojiName"/>
<p>{{ emojiUrl }}</p> <p>{{ emojiUrl }}</p>
</FormSection> </FormSection>
<FormButton primary class="_formBlock" @click="emojiApproval">{{ $ts.emojiApproval }}</FormButton> <FormButton primary class="_formBlock" @click="emojiApproval">{{ $ts.emojiApproval }}</FormButton>
</div>
</div>
</FormSuspense>
</MkSpacer> </MkSpacer>
</template> </template>
@ -79,6 +76,7 @@ import FormTextarea from '@/components/form/textarea.vue';
import FormRadios from '@/components/form/radios.vue'; import FormRadios from '@/components/form/radios.vue';
import FormSection from '@/components/form/section.vue'; import FormSection from '@/components/form/section.vue';
import FormButton from '@/components/ui/button.vue'; import FormButton from '@/components/ui/button.vue';
import FormFolder from '@/components/form/folder.vue';
import * as os from '@/os'; import * as os from '@/os';
import * as symbols from '@/symbols'; import * as symbols from '@/symbols';
import {defaultStore} from "@/store"; import {defaultStore} from "@/store";
@ -92,7 +90,8 @@ export default defineComponent({
FormRadios, FormRadios,
FormSection, FormSection,
FormSwitch, FormSwitch,
FormButton FormButton,
FormFolder
}, },
emits: ['info'], emits: ['info'],
@ -134,15 +133,6 @@ export default defineComponent({
emojiApproval: function () { emojiApproval: function () {
// const returnKoke = () => new Promise(resolve => {
// setTimeout(() => {
// resolve("Koke")
// }, 5000)
// })
//const strKoke = await returnKoke()
//emojiUploadでは、絵文字をdrive/files/upload-from-urlでアップロードしたあと、emojiAddでリネーム、登録をして、emojiAddの戻り値(絵文字のid)を返す //emojiUploadでは、絵文字をdrive/files/upload-from-urlでアップロードしたあと、emojiAddでリネーム、登録をして、emojiAddの戻り値(絵文字のid)を返す
const emojiUpload = () => new Promise(async resolve => { const emojiUpload = () => new Promise(async resolve => {
const marker = Math.random().toString(); // TODO: UUIDとか使う const marker = Math.random().toString(); // TODO: UUIDとか使う
@ -176,11 +166,10 @@ export default defineComponent({
resolve(response); resolve(response);
}) })
}); });
//emoji関数 admin/emoji/listでは、idによる検索ができないため、自分のidをuntilIdに入れて1つ前のidを取得してからそれをsinceIdに指定して、絵文字情報をlist→objectで取得する //emoji関数 admin/emoji/listでは、idによる検索ができないため、自分のidをuntilIdに入れて1つ前のidを取得してからそれをsinceIdに指定して、絵文字情報をlist→objectで取得する
const emoji = (emojiId) => new Promise(async resolve => { const emoji = (emojiId) => new Promise<Record<string, any> | null>(async resolve => {
const sinceId = await os.api('admin/emoji/list', { const sinceId = await os.api('admin/emoji/list', {
limit: 1, limit: 1,
untilId: emojiId.id untilId: emojiId.id
@ -215,9 +204,7 @@ export default defineComponent({
(async () => { (async () => {
await this.emojiGenerate() await this.emojiGenerate()
const emojiId = await emojiUpload();//emojiIdはファイルID emojiUploadはファイルIDを返す const emojiId = await emojiUpload();//emojiIdはファイルID emojiUploadはファイルIDを返す
//console.log(emojiId.id); const emojiObj = await emoji(emojiId);//emojiObjはemojiオブジェクト emoji関数はemojiIdを引数に受け取りemojiオブジェクトを返す
const emojiObj = emoji(emojiId);//emojiObjはemojiオブジェクト emoji関数はemojiIdを引数に受け取りemojiオブジェクトを返す
console.log(emojiObj);
edit(emojiObj); edit(emojiObj);
})(); })();
}, },