From 5a5914be8d77ab6114f8830ac736fbd586cfbd47 Mon Sep 17 00:00:00 2001
From: Leafus <leafus@pawkey.dev>
Date: Mon, 19 May 2025 16:36:41 +0000
Subject: [PATCH] fix: temp fix for approval email issue

---
 .../src/components/MkSignupDialog.form.vue    |  2 +-
 .../src/components/MkVisitorDashboard.vue     | 49 +++++++------------
 .../frontend/src/pages/welcome.entrance.a.vue |  2 -
 3 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/packages/frontend/src/components/MkSignupDialog.form.vue b/packages/frontend/src/components/MkSignupDialog.form.vue
index b96eb64c7c..4868911174 100644
--- a/packages/frontend/src/components/MkSignupDialog.form.vue
+++ b/packages/frontend/src/components/MkSignupDialog.form.vue
@@ -301,7 +301,7 @@ async function onSubmit(): Promise<void> {
 			os.alert({
 				type: 'success',
 				title: i18n.ts._signup.almostThere,
-				text: i18n.tsx._signup.emailSent({ email: email.value }),
+				text: i18n.ts._signup.approvalPending,
 			});
 			emit('signupEmailPending');
 		} else if (instance.approvalRequiredForSignup) {
diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue
index b53fadf161..f7f2c05833 100644
--- a/packages/frontend/src/components/MkVisitorDashboard.vue
+++ b/packages/frontend/src/components/MkVisitorDashboard.vue
@@ -4,38 +4,25 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
+<div v-if="instance" :class="$style.root">
 	<PwVisitorMusic/>
-	<div v-if="instance" :class="$style.root">
-		<div :class="[$style.main, $style.panel]">
-			<img :src="instance.sidebarLogoUrl || instance.iconUrl || '/apple-touch-icon.png'" alt=""
-				:class="instance.sidebarLogoUrl ? $style.wideIcon : $style.mainIcon" />
-			<button class="_button _acrylic" :class="$style.mainMenu" @click="showMenu"><i
-					class="ti ti-dots"></i></button>
-			<div :class="$style.mainFg">
-				<h1 :class="$style.mainTitle">
-					<!-- 背景色によってはロゴが見えなくなるのでとりあえず無効に -->
-					<!-- <img class="logo" v-if="instance.logoImageUrl" :src="instance.logoImageUrl"><span v-else class="text">{{ instanceName }}</span> -->
-					<span>{{ instanceName }}</span>
-				</h1>
-				<div :class="$style.mainAbout">
-					<!-- eslint-disable-next-line vue/no-v-html -->
-					<div v-html="sanitizeHtml(instance.description) || i18n.ts.headlineMisskey"></div>
-				</div>
-				<div v-if="instance.disableRegistration || instance.federation !== 'all'" :class="$style.mainWarn"
-					class="_gaps_s">
-					<MkInfo v-if="instance.disableRegistration" warn>{{ i18n.ts.invitationRequiredToRegister }}</MkInfo>
-					<MkInfo v-if="instance.federation === 'specified'" warn>{{ i18n.ts.federationSpecified }}</MkInfo>
-					<MkInfo v-else-if="instance.federation === 'none'" warn>{{ i18n.ts.federationDisabled }}</MkInfo>
-				</div>
-				<div v-if="instance.approvalRequiredForSignup" :class="$style.mainWarn">
-					<MkInfo warn>{{ i18n.ts.approvalRequiredToRegister }}</MkInfo>
-				</div>
-				<div class="_gaps_s" :class="$style.mainActions">
-					<MkButton :class="$style.mainAction" full rounded gradate data-cy-signup style="margin-right: 12px;"
-						@click="signup()">{{ i18n.ts.joinThisServer }}</MkButton>
-					<MkButton :class="$style.mainAction" full rounded data-cy-signin @click="signin()">{{ i18n.ts.login
-					}}</MkButton>
-				</div>
+	<div :class="[$style.main, $style.panel]">
+		<img
+			:src="instance.sidebarLogoUrl || instance.iconUrl || '/apple-touch-icon.png'" alt=""
+			:class="instance.sidebarLogoUrl ? $style.wideIcon : $style.mainIcon"
+		/>
+		<button class="_button _acrylic" :class="$style.mainMenu" @click="showMenu">
+			<i class="ti ti-dots"></i>
+		</button>
+		<div :class="$style.mainFg">
+			<h1 :class="$style.mainTitle">
+				<!-- 背景色によってはロゴが見えなくなるのでとりあえず無効に -->
+				<!-- <img class="logo" v-if="instance.logoImageUrl" :src="instance.logoImageUrl"><span v-else class="text">{{ instanceName }}</span> -->
+				<span>{{ instanceName }}</span>
+			</h1>
+			<div :class="$style.mainAbout">
+				<!-- eslint-disable-next-line vue/no-v-html -->
+				<div v-html="sanitizeHtml(instance.description) || i18n.ts.headlineMisskey"></div>
 			</div>
 			<div
 				v-if="instance.disableRegistration || instance.federation !== 'all'" :class="$style.mainWarn"
diff --git a/packages/frontend/src/pages/welcome.entrance.a.vue b/packages/frontend/src/pages/welcome.entrance.a.vue
index 6591d55087..7def94cdf8 100644
--- a/packages/frontend/src/pages/welcome.entrance.a.vue
+++ b/packages/frontend/src/pages/welcome.entrance.a.vue
@@ -35,8 +35,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { ref } from 'vue';
 import * as Misskey from 'misskey-js';
-import XTimeline from './welcome.timeline.vue';
-import MarqueeText from '@/components/MkMarquee.vue';
 import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
 import misskeysvg from '/client-assets/pawkey.png';
 import { misskeyApiGet } from '@/scripts/misskey-api.js';