From 7b721c21247fdbec17d6a75daf503cf7b9ec8792 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 22 Apr 2023 07:51:15 +0900 Subject: [PATCH 1/6] Update about-misskey.vue --- packages/frontend/src/pages/about-misskey.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue index 972044a5e1..ee0f57969f 100644 --- a/packages/frontend/src/pages/about-misskey.vue +++ b/packages/frontend/src/pages/about-misskey.vue @@ -223,6 +223,7 @@ const patrons = [ 'すー。', '秋雨/Slime-hatena.jp', 'けそ', + 'ずも', ]; let thereIsTreasure = $ref($i && !claimedAchievements.includes('foundTreasure')); From ca49ac28b8bb7e2f387e18cc643dd1b25c8a0db0 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 22 Apr 2023 07:53:46 +0900 Subject: [PATCH 2/6] chore: remove unused files --- .../frontend/src/pages/welcome.entrance.b.vue | 239 -------------- .../frontend/src/pages/welcome.entrance.c.vue | 308 ------------------ 2 files changed, 547 deletions(-) delete mode 100644 packages/frontend/src/pages/welcome.entrance.b.vue delete mode 100644 packages/frontend/src/pages/welcome.entrance.c.vue diff --git a/packages/frontend/src/pages/welcome.entrance.b.vue b/packages/frontend/src/pages/welcome.entrance.b.vue deleted file mode 100644 index 03bf174710..0000000000 --- a/packages/frontend/src/pages/welcome.entrance.b.vue +++ /dev/null @@ -1,239 +0,0 @@ - - - - - diff --git a/packages/frontend/src/pages/welcome.entrance.c.vue b/packages/frontend/src/pages/welcome.entrance.c.vue deleted file mode 100644 index eca4e5764d..0000000000 --- a/packages/frontend/src/pages/welcome.entrance.c.vue +++ /dev/null @@ -1,308 +0,0 @@ - - - - - From 9145302b3a85bf319e18d75799e2a446a706eea7 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 22 Apr 2023 08:00:37 +0900 Subject: [PATCH 3/6] fix(frontend): fix wrong icon name --- packages/frontend/src/components/MkDialog.vue | 2 +- packages/frontend/src/pages/welcome.entrance.a.vue | 2 +- packages/frontend/src/ui/_common_/common.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue index 93c1f89199..155f7f6d28 100644 --- a/packages/frontend/src/components/MkDialog.vue +++ b/packages/frontend/src/components/MkDialog.vue @@ -9,7 +9,7 @@ - +
diff --git a/packages/frontend/src/pages/welcome.entrance.a.vue b/packages/frontend/src/pages/welcome.entrance.a.vue index 4d8d76db18..4e716b9b37 100644 --- a/packages/frontend/src/pages/welcome.entrance.a.vue +++ b/packages/frontend/src/pages/welcome.entrance.a.vue @@ -112,7 +112,7 @@ function showMenu(ev) { }, }, null, { text: i18n.ts.help, - icon: 'ti ti-question-circle', + icon: 'ti ti-help-circle', action: () => { window.open('https://misskey-hub.net/help.md', '_blank'); }, diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts index eae4f0091c..53042a4ce7 100644 --- a/packages/frontend/src/ui/_common_/common.ts +++ b/packages/frontend/src/ui/_common_/common.ts @@ -76,7 +76,7 @@ export function openInstanceMenu(ev: MouseEvent) { } : undefined], }, null, { text: i18n.ts.help, - icon: 'ti ti-question-circle', + icon: 'ti ti-help-circle', action: () => { window.open('https://misskey-hub.net/help.html', '_blank'); }, From 5a7a1d0be9a28afa446c403a39c4649a583de757 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 22 Apr 2023 10:50:54 +0900 Subject: [PATCH 4/6] :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 @@ - - - - - - From eacdc0136ff5cbc8061cd5e94d704ead7606ef9d Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 22 Apr 2023 12:19:49 +0900 Subject: [PATCH 5/6] :art: --- .../src/components/MkVisitorDashboard.vue | 2 +- packages/frontend/src/ui/visitor.header.vue | 211 ------------------ packages/frontend/src/ui/visitor.vue | 47 ++-- 3 files changed, 26 insertions(+), 234 deletions(-) delete mode 100644 packages/frontend/src/ui/visitor.header.vue diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue index a32de01d96..80717a2618 100644 --- a/packages/frontend/src/components/MkVisitorDashboard.vue +++ b/packages/frontend/src/components/MkVisitorDashboard.vue @@ -190,7 +190,7 @@ function exploreOtherServers() { border-radius: var(--radius); overflow: clip; box-shadow: 0 12px 32px rgb(0 0 0 / 25%); - padding: 16px; + padding: 16px 20px; } .statsItemLabel { diff --git a/packages/frontend/src/ui/visitor.header.vue b/packages/frontend/src/ui/visitor.header.vue deleted file mode 100644 index 7de81f6431..0000000000 --- a/packages/frontend/src/ui/visitor.header.vue +++ /dev/null @@ -1,211 +0,0 @@ - - - - - diff --git a/packages/frontend/src/ui/visitor.vue b/packages/frontend/src/ui/visitor.vue index 46520353ac..1b95387967 100644 --- a/packages/frontend/src/ui/visitor.vue +++ b/packages/frontend/src/ui/visitor.vue @@ -10,20 +10,26 @@
-
@@ -60,7 +66,6 @@ + + diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue index 80717a2618..9de5200ef0 100644 --- a/packages/frontend/src/components/MkVisitorDashboard.vue +++ b/packages/frontend/src/components/MkVisitorDashboard.vue @@ -1,6 +1,6 @@ @@ -57,6 +60,7 @@ import { i18n } from '@/i18n'; import { instance } from '@/instance'; import number from '@/filters/number'; import MkNumber from '@/components/MkNumber.vue'; +import XActiveUsersChart from '@/components/MkVisitorDashboard.ActiveUsersChart.vue'; let meta = $ref(); let stats = $ref(null); @@ -119,11 +123,14 @@ function exploreOtherServers() { padding: 32px 0 0 0; } -.main { +.panel { position: relative; background: var(--panel); border-radius: var(--radius); box-shadow: 0 12px 32px rgb(0 0 0 / 25%); +} + +.main { text-align: center; } @@ -185,11 +192,7 @@ function exploreOtherServers() { } .statsItem { - position: relative; - background: var(--panel); - border-radius: var(--radius); overflow: clip; - box-shadow: 0 12px 32px rgb(0 0 0 / 25%); padding: 16px 20px; } @@ -205,11 +208,7 @@ function exploreOtherServers() { } .tl { - position: relative; - background: var(--panel); - border-radius: var(--radius); overflow: clip; - box-shadow: 0 12px 32px rgb(0 0 0 / 25%); } .tlHeader { @@ -221,4 +220,8 @@ function exploreOtherServers() { height: 350px; overflow: auto; } + +.activeUsersChart { + +} diff --git a/packages/frontend/src/ui/visitor.vue b/packages/frontend/src/ui/visitor.vue index 1b95387967..623abbda39 100644 --- a/packages/frontend/src/ui/visitor.vue +++ b/packages/frontend/src/ui/visitor.vue @@ -10,7 +10,7 @@
-
+
{{ i18n.ts.home }} {{ i18n.ts.timeline }}