From eee1e741747d4a9fff59b613d304341ccfb6fd10 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 26 May 2023 05:18:01 +0000
Subject: [PATCH] =?UTF-8?q?share=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AB"Missk?=
=?UTF-8?q?ey=E3=81=B8"=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E8=A8=AD?=
=?UTF-8?q?=E7=BD=AE=20Resolve=20#10898?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
locales/index.d.ts | 1 +
locales/ja-JP.yml | 1 +
packages/frontend/src/pages/share.vue | 17 +++++++++--------
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 6e3edefabb..e4bf6628cc 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -1060,6 +1060,7 @@ export interface Locale {
"rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn": string;
"cancelReactionConfirm": string;
"changeReactionConfirm": string;
+ "goToMisskey": string;
"_initialAccountSetting": {
"accountCreated": string;
"letsStartAccountSetup": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 374eeba390..4f400ab60a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1057,6 +1057,7 @@ rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "ロールの指定が一
rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "ロールは公開ロールである必要があります。"
cancelReactionConfirm: "リアクションを取り消しますか？"
changeReactionConfirm: "リアクションを変更しますか？"
+goToMisskey: "Misskeyへ"
_initialAccountSetting:
accountCreated: "アカウントの作成が完了しました！"
diff --git a/packages/frontend/src/pages/share.vue b/packages/frontend/src/pages/share.vue
index 5c10198f7a..e0ac899230 100644
--- a/packages/frontend/src/pages/share.vue
+++ b/packages/frontend/src/pages/share.vue
@@ -16,7 +16,10 @@
class="_panel"
@posted="state = 'posted'"
/>
- <MkButton v-else-if="state === 'posted'" primary :class="$style.close" @click="close()">{{ i18n.ts.close }}</MkButton>
+ <div v-else-if="state === 'posted'" class="_buttonsCenter">
+ <MkButton primary @click="close">{{ i18n.ts.close }}</MkButton>
+ <MkButton @click="goToMisskey">{{ i18n.ts.goToMisskey }}</MkButton>
+ </div>
</MkSpacer>
</MkStickyContainer>
</template>
@@ -148,10 +151,14 @@ function close(): void {
// 閉じなければ100ms後タイムラインに
window.setTimeout(() => {
- mainRouter.push('/');
+ location.href = '/';
}, 100);
}
+function goToMisskey(): void {
+ location.href = '/';
+}
+
const headerActions = $computed(() => []);
const headerTabs = $computed(() => []);
@@ -161,9 +168,3 @@ definePageMetadata({
icon: 'ti ti-share',
});
</script>
-
-<style lang="scss" module>
-.close {
- margin: 16px auto;
-}
-</style>