From 5a7a1d0be9a28afa446c403a39c4649a583de757 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 22 Apr 2023 10:50:54 +0900 Subject: [PATCH] :art: --- .../src/components/MkVisitorDashboard.vue | 224 ++++++++++++++ .../frontend/src/pages/welcome.entrance.a.vue | 156 +--------- .../header.vue => visitor.header.vue} | 0 packages/frontend/src/ui/visitor.vue | 286 +++++++++++++++++- packages/frontend/src/ui/visitor/a.vue | 263 ---------------- packages/frontend/src/ui/visitor/b.vue | 266 ---------------- packages/frontend/src/ui/visitor/kanban.vue | 261 ---------------- 7 files changed, 504 insertions(+), 952 deletions(-) create mode 100644 packages/frontend/src/components/MkVisitorDashboard.vue rename packages/frontend/src/ui/{visitor/header.vue => visitor.header.vue} (100%) delete mode 100644 packages/frontend/src/ui/visitor/a.vue delete mode 100644 packages/frontend/src/ui/visitor/b.vue delete mode 100644 packages/frontend/src/ui/visitor/kanban.vue diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue new file mode 100644 index 0000000000..a32de01d96 --- /dev/null +++ b/packages/frontend/src/components/MkVisitorDashboard.vue @@ -0,0 +1,224 @@ + + + + + diff --git a/packages/frontend/src/pages/welcome.entrance.a.vue b/packages/frontend/src/pages/welcome.entrance.a.vue index 4e716b9b37..929152bd5a 100644 --- a/packages/frontend/src/pages/welcome.entrance.a.vue +++ b/packages/frontend/src/pages/welcome.entrance.a.vue @@ -13,35 +13,7 @@
-
- - -
-

- - - {{ instanceName }} -

-
- -
-
-
- {{ i18n.ts.invitationRequiredToRegister }} -
-
- {{ i18n.ts.joinThisServer }} - {{ i18n.ts.exploreOtherServers }} - {{ i18n.ts.login }} -
-
-
-
-
{{ i18n.ts.letsLookAtTimeline }}
-
- -
-
+
@@ -60,16 +32,15 @@ import { } from 'vue'; import { Instance } from 'misskey-js/built/entities'; import XTimeline from './welcome.timeline.vue'; import MarqueeText from '@/components/MkMarquee.vue'; -import XSigninDialog from '@/components/MkSigninDialog.vue'; -import XSignupDialog from '@/components/MkSignupDialog.vue'; -import MkButton from '@/components/MkButton.vue'; import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue'; -import MkTimeline from '@/components/MkTimeline.vue'; import MkInfo from '@/components/MkInfo.vue'; import { instanceName } from '@/config'; import * as os from '@/os'; import { i18n } from '@/i18n'; import { instance } from '@/instance'; +import number from '@/filters/number'; +import MkNumber from '@/components/MkNumber.vue'; +import MkVisitorDashboard from '@/components/MkVisitorDashboard.vue'; let meta = $ref(); let instances = $ref(); @@ -84,45 +55,6 @@ os.apiGet('federation/instances', { }).then(_instances => { instances = _instances; }); - -function signin() { - os.popup(XSigninDialog, { - autoSet: true, - }, {}, 'closed'); -} - -function signup() { - os.popup(XSignupDialog, { - autoSet: true, - }, {}, 'closed'); -} - -function showMenu(ev) { - os.popupMenu([{ - text: i18n.ts.instanceInfo, - icon: 'ti ti-info-circle', - action: () => { - os.pageWindow('/about'); - }, - }, { - text: i18n.ts.aboutMisskey, - icon: 'ti ti-info-circle', - action: () => { - os.pageWindow('/about-misskey'); - }, - }, null, { - text: i18n.ts.help, - icon: 'ti ti-help-circle', - action: () => { - window.open('https://misskey-hub.net/help.md', '_blank'); - }, - }], ev.currentTarget ?? ev.target); -} - -function exploreOtherServers() { - // TODO: 言語をよしなに - window.open('https://join.misskey.page/ja-JP/instances', '_blank'); -} + + diff --git a/packages/frontend/src/ui/visitor/a.vue b/packages/frontend/src/ui/visitor/a.vue deleted file mode 100644 index 4761036075..0000000000 --- a/packages/frontend/src/ui/visitor/a.vue +++ /dev/null @@ -1,263 +0,0 @@ - - - - - - - diff --git a/packages/frontend/src/ui/visitor/b.vue b/packages/frontend/src/ui/visitor/b.vue deleted file mode 100644 index 5287a670c5..0000000000 --- a/packages/frontend/src/ui/visitor/b.vue +++ /dev/null @@ -1,266 +0,0 @@ - - - - - - - diff --git a/packages/frontend/src/ui/visitor/kanban.vue b/packages/frontend/src/ui/visitor/kanban.vue deleted file mode 100644 index ce7fcfe944..0000000000 --- a/packages/frontend/src/ui/visitor/kanban.vue +++ /dev/null @@ -1,261 +0,0 @@ - - - - - -