From d9fd0ea7141056a7a0255c9e8e7b8fbac9e95667 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 12 Jul 2023 00:23:54 -0700
Subject: [PATCH] fix: :lipstick: locales, transition for MkDonation

---
 locales/en-US.yml                             |   2 +
 locales/ja-JP.yml                             |   2 +
 packages/client/src/components/MkDonation.vue | 107 ++++++++++++------
 3 files changed, 74 insertions(+), 37 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index d8a26b1f2..c61b573ba 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1119,6 +1119,8 @@ showPopup: "Notify users with popup"
 showWithSparkles: "Show with sparkles"
 youHaveUnreadAnnouncements: "You have unread announcements"
 donationLink: "Link to donation page"
+neverShow: "Don't show again"
+remindMeLater: "Maybe later"
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 95fb7bcf8..fe03d1f41 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -983,6 +983,8 @@ enableIdenticonGeneration: "ユーザーごとのIdenticon生成を有効にす
 showPopup: "ポップアップを表示してユーザーに知らせる"
 showWithSparkles: "タイトルをキラキラさせる"
 youHaveUnreadAnnouncements: "未読のお知らせがあります"
+neverShow: "今後表示しない"
+remindMeLater: "また後で"
 
 _sensitiveMediaDetection:
   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てられます。サーバーの負荷が少し増えます。"
diff --git a/packages/client/src/components/MkDonation.vue b/packages/client/src/components/MkDonation.vue
index 367ec7b58..9ec99a6ec 100644
--- a/packages/client/src/components/MkDonation.vue
+++ b/packages/client/src/components/MkDonation.vue
@@ -1,50 +1,68 @@
 <template>
-	<div class="_panel _shadow" :class="$style.root">
-		<div :class="$style.icon">
-			<i class="ph-hand-heart ph-bold ph-6x" />
+	<transition name="slide-fade">
+		<div v-if="show" class="_panel _shadow" :class="$style.root">
+			<div :class="$style.icon">
+				<i class="ph-hand-heart ph-bold ph-5x" />
+			</div>
+			<div :class="$style.main">
+				<div :class="$style.title">
+					{{ i18n.ts._aboutMisskey.donateTitle }}
+				</div>
+				<div :class="$style.text">
+					{{ i18n.ts._aboutMisskey.pleaseDonateToCalckey }}
+					<p v-if="instance.donationLink">
+						{{
+							i18n.t("_aboutMisskey.pleaseDonateToHost", {
+								host: hostname,
+							})
+						}}
+					</p>
+				</div>
+				<div class="_flexList">
+					<MkButton
+						primary
+						@click="
+							openExternal('https://opencollective.com/calckey')
+						"
+						>{{ i18n.ts._aboutMisskey.donate }}</MkButton
+					>
+					<MkButton
+						v-if="instance.donationLink"
+						primary
+						@click="openExternal(instance.donationLink)"
+						>{{
+							i18n.t("_aboutMisskey.donateHost", {
+								host: hostname,
+							})
+						}}</MkButton
+					>
+				</div>
+				<div class="_flexList" style="margin-top: 0.6rem">
+					<MkButton @click="close">{{
+						i18n.ts.remindMeLater
+					}}</MkButton>
+					<MkButton @click="neverShow">{{
+						i18n.ts.neverShow
+					}}</MkButton>
+				</div>
+			</div>
+			<button class="_button" :class="$style.close" @click="close">
+				<i class="ph-x ph-bold ph-lg"></i>
+			</button>
 		</div>
-		<div :class="$style.main">
-			<div :class="$style.title">
-				{{ i18n.ts._aboutMisskey.donateTitle }}
-			</div>
-			<div :class="$style.text">
-				{{ i18n.ts._aboutMisskey.pleaseDonateToCalckey }}
-				<p v-if="instance.donationLink">
-					{{
-						i18n.t("_aboutMisskey.pleaseDonateToHost", {
-							host: hostname,
-						})
-					}}
-				</p>
-			</div>
-			<div class="_flexList">
-				<MkButton primary @click="openExternal('https://opencollective.com/calckey')">{{
-					i18n.ts._aboutMisskey.donate
-				}}</MkButton>
-				<MkButton v-if="instance.donationLink" primary @click="openExternal(instance.donationLink)">{{
-					i18n.t("_aboutMisskey.donateHost", {
-						host: hostname,
-					})
-				}}</MkButton>
-			</div>
-			<div class="_flexList">
-				<MkButton @click="close">{{ i18n.ts.remindMeLater }}</MkButton>
-				<MkButton @click="neverShow">{{ i18n.ts.neverShow }}</MkButton>
-			</div>
-		</div>
-		<button class="_button" :class="$style.close" @click="close">
-			<i class="ph-x ph-bold ph-lg"></i>
-		</button>
-	</div>
+	</transition>
 </template>
 
 <script lang="ts" setup>
+import { ref } from "vue";
 import MkButton from "@/components/MkButton.vue";
 import { host } from "@/config";
 import { i18n } from "@/i18n";
 import * as os from "@/os";
 import { instance } from "@/instance";
 
+let show = ref(true);
+
 const emit = defineEmits<{
 	(ev: "closed"): void;
 }>();
@@ -56,6 +74,7 @@ const zIndex = os.claimZIndex("low");
 function close() {
 	localStorage.setItem("latestDonationInfoShownAt", Date.now().toString());
 	emit("closed");
+	show.value = false;
 }
 
 function neverShow() {
@@ -116,8 +135,22 @@ function openExternal(link) {
 .title {
 	font-weight: bold;
 }
-
 .text {
 	margin: 0.7em 0 1em 0;
 }
+
+.slide-fade-enter {
+    opacity: 1;
+    transform: translateY(0);
+}
+.slide-fade-enter-active {
+    transition: opacity 0.5s, transform 0.5s;
+}
+.slide-fade-leave-to {
+    opacity: 0;
+    transform: translateY(100%);
+}
+.slide-fade-leave-active {
+    transition: opacity 0.5s, transform 0.5s;
+}
 </style>