From 7cc797062d970ebe298b9f8d73370fca8d218b6d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 20 Apr 2023 10:11:48 +0900
Subject: [PATCH] tweak MkSignupDialog.rules.vue

---
 locales/ja-JP.yml                                      |  1 +
 .../frontend/src/components/MkSignupDialog.rules.vue   | 10 ++++++++--
 packages/frontend/src/components/MkSignupDialog.vue    |  2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index cd9521a9f..8c1334c6a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1013,6 +1013,7 @@ horizontal: "横"
 position: "位置"
 serverRules: "サーバールール"
 pleaseConfirmBelowBeforeSignup: "このサーバーに登録する前に、以下を確認してください。"
+pleaseAgreeAllToContinue: "続けるには、全ての「同意する」にチェックが入っている必要があります。"
 continue: "続ける"
 
 _serverRules:
diff --git a/packages/frontend/src/components/MkSignupDialog.rules.vue b/packages/frontend/src/components/MkSignupDialog.rules.vue
index 3b39b72d3..ed179ffde 100644
--- a/packages/frontend/src/components/MkSignupDialog.rules.vue
+++ b/packages/frontend/src/components/MkSignupDialog.rules.vue
@@ -36,7 +36,12 @@
 				<MkSwitch v-model="agreeNote" style="margin-top: 16px;" data-cy-signup-rules-notes-agree>{{ i18n.ts.agree }}</MkSwitch>
 			</MkFolder>
 
-			<MkButton primary rounded gradate style="margin: 0 auto;" :disabled="!agreed" data-cy-signup-rules-continue @click="emit('accept')">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
+			<div v-if="!agreed" style="text-align: center;">{{ i18n.ts.pleaseAgreeAllToContinue }}</div>
+
+			<div class="_buttonsCenter">
+				<MkButton inline rounded @click="emit('cancel')">{{ i18n.ts.cancel }}</MkButton>
+				<MkButton inline primary rounded gradate :disabled="!agreed" data-cy-signup-rules-continue @click="emit('done')">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
+			</div>
 		</div>
 	</MkSpacer>
 </div>
@@ -62,7 +67,8 @@ const agreed = computed(() => {
 });
 
 const emit = defineEmits<{
-	(ev: 'accept'): void;
+	(ev: 'cancel'): void;
+	(ev: 'done'): void;
 }>();
 </script>
 
diff --git a/packages/frontend/src/components/MkSignupDialog.vue b/packages/frontend/src/components/MkSignupDialog.vue
index b4fc564d3..17f8b8642 100644
--- a/packages/frontend/src/components/MkSignupDialog.vue
+++ b/packages/frontend/src/components/MkSignupDialog.vue
@@ -17,7 +17,7 @@
 			:leave-to-class="$style.transition_x_leaveTo"
 		>
 			<template v-if="!isAcceptedServerRule">
-				<XServerRules @accept="isAcceptedServerRule = true"/>
+				<XServerRules @done="isAcceptedServerRule = true" @cancel="dialog.close()"/>
 			</template>
 			<template v-else>
 				<XSignup :auto-set="autoSet" @signup="onSignup" @signup-email-pending="onSignupEmailPending"/>