From 522e1481466a7f4b2ef4ee8fede24b237109fb64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= <kokt@sim1222.com>
Date: Fri, 6 May 2022 04:19:23 +0900
Subject: [PATCH] emojigen wip25

---
 packages/client/src/pages/admin/emojigen.vue | 131 +++++++++----------
 1 file changed, 59 insertions(+), 72 deletions(-)

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