From eeb4a41d6c70b06847fcf1ee12fa0ed467befdda Mon Sep 17 00:00:00 2001 From: Freeplay Date: Sun, 28 May 2023 20:31:00 -0400 Subject: [PATCH 1/6] add channel federation warn --- locales/en-US.yml | 1 + packages/client/src/pages/channels.vue | 2 ++ packages/client/src/style.scss | 3 +++ 3 files changed, 6 insertions(+) diff --git a/locales/en-US.yml b/locales/en-US.yml index 84e68ea6bc..89bf10c9f1 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -685,6 +685,7 @@ logs: "Logs" delayed: "Delayed" database: "Database" channel: "Channels" +channelFederationWarn: "Channels do not yet federate to other servers" create: "Create" notificationSetting: "Notification settings" notificationSettingDesc: "Select the types of notification to display." diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue index d03fb61d5a..c1e34ea444 100644 --- a/packages/client/src/pages/channels.vue +++ b/packages/client/src/pages/channels.vue @@ -7,6 +7,7 @@ :tabs="headerTabs" /> + {{ i18n.ts.channelFederationWarn }} Date: Mon, 29 May 2023 09:11:42 -0400 Subject: [PATCH 2/6] Add clips, antennas hint --- locales/en-US.yml | 2 + packages/client/src/components/MkInfo.vue | 30 ++++++- .../client/src/components/MkPagination.vue | 6 +- .../client/src/pages/my-antennas/create.vue | 8 +- .../client/src/pages/my-antennas/index.vue | 80 +++++++++++-------- packages/client/src/pages/my-clips/index.vue | 43 +++++----- 6 files changed, 108 insertions(+), 61 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 89bf10c9f1..98d4d7703b 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -404,6 +404,7 @@ avoidMultiCaptchaConfirm: "Using multiple Captcha systems may cause interference \ them. Would you like to disable the other Captcha systems currently active? If\ \ you would like them to stay enabled, press cancel." antennas: "Antennas" +antennasDesc: "Antennas display new posts matching the criteria you set!\n They can be accessed from the timelines page." manageAntennas: "Manage Antennas" name: "Name" antennaSource: "Antenna source" @@ -771,6 +772,7 @@ pageLikedCount: "Number of received Page likes" contact: "Contact" useSystemFont: "Use the system's default font" clips: "Clips" +clipsDesc: "Clips are like share-able categorized bookmarks. You can create clips from the menu of individual posts." experimentalFeatures: "Experimental features" developer: "Developer" makeExplorable: "Make account visible in \"Explore\"" diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue index 43f2de29e0..e59b5d56ea 100644 --- a/packages/client/src/components/MkInfo.vue +++ b/packages/client/src/components/MkInfo.vue @@ -1,7 +1,7 @@ @@ -10,12 +10,14 @@ import {} from "vue"; defineProps<{ + icon?: string; warn?: boolean; + card?: boolean; }>(); diff --git a/packages/client/src/pages/my-antennas/create.vue b/packages/client/src/pages/my-antennas/create.vue index c0d838629e..040a6b052d 100644 --- a/packages/client/src/pages/my-antennas/create.vue +++ b/packages/client/src/pages/my-antennas/create.vue @@ -1,7 +1,9 @@ diff --git a/packages/client/src/components/MkTimeline.vue b/packages/client/src/components/MkTimeline.vue index 317e556cfb..01885beecc 100644 --- a/packages/client/src/components/MkTimeline.vue +++ b/packages/client/src/components/MkTimeline.vue @@ -1,4 +1,11 @@