From 49beee532b82972333e49da3647b6451f1a138a0 Mon Sep 17 00:00:00 2001 From: futchitwo <74236683+futchitwo@users.noreply.github.com> Date: Sat, 2 Jul 2022 20:08:31 +0900 Subject: [PATCH 1/6] feature(client): Timeline page for non-login users --- packages/client/src/components/global/page-header.vue | 3 +++ packages/client/src/pages/timeline.vue | 11 +++++++++-- packages/client/src/router.ts | 3 +++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/global/page-header.vue b/packages/client/src/components/global/page-header.vue index 5395a8796..9109436bd 100644 --- a/packages/client/src/components/global/page-header.vue +++ b/packages/client/src/components/global/page-header.vue @@ -39,6 +39,7 @@ import tinycolor from 'tinycolor2'; import { popupMenu } from '@/os'; import { scrollToTop } from '@/scripts/scroll'; import { i18n } from '@/i18n'; +import { $i } from '@/account'; import { globalEvents } from '@/events'; import { injectPageMetadata } from '@/scripts/page-metadata'; @@ -47,6 +48,7 @@ type Tab = { title: string; icon?: string; iconOnly?: boolean; + loginRequired?: boolean; onClick?: (ev: MouseEvent) => void; }; @@ -71,6 +73,7 @@ const hideTitle = inject('shouldOmitHeaderTitle', false); const thin_ = props.thin || inject('shouldHeaderThin', false); const el = $ref(null); +const tabs = $i ? props.tabs : props.tabs?.filter(tab => !tab.loginRequired); const tabRefs = {}; const tabHighlightEl = $ref(null); const bg = ref(null); diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index 40eb85ff4..09de90199 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -3,7 +3,7 @@
- +
@@ -45,7 +45,8 @@ const tlComponent = $ref>(); const rootEl = $ref(); let queue = $ref(0); -const src = $computed({ get: () => defaultStore.reactiveState.tl.value.src, set: (x) => saveSrc(x) }); +const src = $computed({ get: () => ($i ? defaultStore.reactiveState.tl.value.src : logoutSrc), set: (x) => saveSrc(x) }); +let logoutSrc = $ref(isLocalTimelineAvailable ? 'local' : 'global'); watch ($$(src), () => queue = 0); @@ -94,6 +95,7 @@ function saveSrc(newSrc: 'home' | 'local' | 'social' | 'global'): void { ...defaultStore.state.tl, src: newSrc, }); + logoutSrc = newSrc ; } async function timetravel(): Promise { @@ -116,6 +118,7 @@ const headerTabs = $computed(() => [{ title: i18n.ts._timelines.home, icon: 'fas fa-home', iconOnly: true, + loginRequired: true, }, ...(isLocalTimelineAvailable ? [{ key: 'local', title: i18n.ts._timelines.local, @@ -126,6 +129,7 @@ const headerTabs = $computed(() => [{ title: i18n.ts._timelines.social, icon: 'fas fa-share-alt', iconOnly: true, + loginRequired: true, }] : []), ...(isGlobalTimelineAvailable ? [{ key: 'global', title: i18n.ts._timelines.global, @@ -135,16 +139,19 @@ const headerTabs = $computed(() => [{ icon: 'fas fa-list-ul', title: i18n.ts.lists, iconOnly: true, + loginRequired: true, onClick: chooseList, }, { icon: 'fas fa-satellite', title: i18n.ts.antennas, iconOnly: true, + loginRequired: true, onClick: chooseAntenna, }, { icon: 'fas fa-satellite-dish', title: i18n.ts.channel, iconOnly: true, + loginRequired: true, onClick: chooseChannel, }]); diff --git a/packages/client/src/router.ts b/packages/client/src/router.ts index b3baad188..f5c433264 100644 --- a/packages/client/src/router.ts +++ b/packages/client/src/router.ts @@ -224,6 +224,9 @@ export const routes = [{ path: '/timeline/antenna/:antennaId', component: page(() => import('./pages/antenna-timeline.vue')), loginRequired: true, +}, { + path: '/timeline', + component: page(() => import('./pages/timeline.vue')), }, { name: 'index', path: '/', From 0a6e4c5893365edf756b43ef64ccdbcdda4879d1 Mon Sep 17 00:00:00 2001 From: futchitwo <74236683+futchitwo@users.noreply.github.com> Date: Sat, 2 Jul 2022 20:33:03 +0900 Subject: [PATCH 2/6] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ddc12399..5b2e672db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ You should also include the user name that made the change. - Client: Add rss-marquee widget @syuilo - Client: Removing entries from a clip @futchitwo - Client: Poll highlights in explore page @syuilo +- Client: Add timeline page that can be viewed when not logged in @futchitwo - Make possible to delete an account by admin @syuilo - Improve player detection in URL preview @mei23 - Add Badge Image to Push Notification #8012 @tamaina From c11cef09fce3a8382a2b62bd6815bf8efda8d4b5 Mon Sep 17 00:00:00 2001 From: futchitwo <74236683+futchitwo@users.noreply.github.com> Date: Sat, 2 Jul 2022 20:55:20 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=E5=B0=8E=E7=B7=9A=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/client/src/ui/visitor/b.vue | 4 +++- packages/client/src/ui/visitor/header.vue | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/client/src/ui/visitor/b.vue b/packages/client/src/ui/visitor/b.vue index 09be12d68..8fa00cbf9 100644 --- a/packages/client/src/ui/visitor/b.vue +++ b/packages/client/src/ui/visitor/b.vue @@ -33,9 +33,11 @@
{{ $ts.home }} + {{ $ts.timeline }} {{ $ts.explore }} - {{ $ts.featured }} {{ $ts.channel }} + {{ $ts.pages }} + {{ $ts.gallery }}
diff --git a/packages/client/src/ui/visitor/header.vue b/packages/client/src/ui/visitor/header.vue index c39dc6577..002c7565e 100644 --- a/packages/client/src/ui/visitor/header.vue +++ b/packages/client/src/ui/visitor/header.vue @@ -3,9 +3,11 @@
{{ $ts.home }} + {{ $ts.timeline }} {{ $ts.explore }} - {{ $ts.featured }} {{ $ts.channel }} + {{ $ts.pages }} + {{ $ts.gallery }}
From e9c6d312a4dc81e2ac93098f81e3fc82b12ff0d0 Mon Sep 17 00:00:00 2001 From: futchitwo <74236683+futchitwo@users.noreply.github.com> Date: Sun, 3 Jul 2022 19:32:34 +0900 Subject: [PATCH 4/6] better variable name --- packages/client/src/pages/timeline.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index 09de90199..0e88c288c 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -45,8 +45,8 @@ const tlComponent = $ref>(); const rootEl = $ref(); let queue = $ref(0); -const src = $computed({ get: () => ($i ? defaultStore.reactiveState.tl.value.src : logoutSrc), set: (x) => saveSrc(x) }); -let logoutSrc = $ref(isLocalTimelineAvailable ? 'local' : 'global'); +let srcWhenNotSignin = $ref(isLocalTimelineAvailable ? 'local' : 'global'); +const src = $computed({ get: () => ($i ? defaultStore.reactiveState.tl.value.src : srcWhenNotSignin), set: (x) => saveSrc(x) }); watch ($$(src), () => queue = 0); @@ -95,7 +95,7 @@ function saveSrc(newSrc: 'home' | 'local' | 'social' | 'global'): void { ...defaultStore.state.tl, src: newSrc, }); - logoutSrc = newSrc ; + srcWhenNotSignin = newSrc ; } async function timetravel(): Promise { From 1f51b2aba79abd5c8a1585a40473abbd21849f14 Mon Sep 17 00:00:00 2001 From: futchitwo <74236683+futchitwo@users.noreply.github.com> Date: Sun, 3 Jul 2022 20:03:57 +0900 Subject: [PATCH 5/6] hide timeline link if timeline is disabled --- packages/client/src/ui/visitor/b.vue | 4 +++- packages/client/src/ui/visitor/header.vue | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/client/src/ui/visitor/b.vue b/packages/client/src/ui/visitor/b.vue index 8fa00cbf9..0396b9271 100644 --- a/packages/client/src/ui/visitor/b.vue +++ b/packages/client/src/ui/visitor/b.vue @@ -33,7 +33,7 @@
{{ $ts.home }} - {{ $ts.timeline }} + {{ $ts.timeline }} {{ $ts.explore }} {{ $ts.channel }} {{ $ts.pages }} @@ -54,6 +54,7 @@ import XKanban from './kanban.vue'; import { host, instanceName } from '@/config'; import { search } from '@/scripts/search'; import * as os from '@/os'; +import { instance } from '@/instance'; import MkPagination from '@/components/ui/pagination.vue'; import XSigninDialog from '@/components/signin-dialog.vue'; import XSignupDialog from '@/components/signup-dialog.vue'; @@ -78,6 +79,7 @@ const announcements = { endpoint: 'announcements', limit: 10, }; +const isTimelineAvailable = !instance.disableLocalTimeline || !instance.disableGlobalTimeline; let showMenu = $ref(false); let isDesktop = $ref(window.innerWidth >= DESKTOP_THRESHOLD); let narrow = $ref(window.innerWidth < 1280); diff --git a/packages/client/src/ui/visitor/header.vue b/packages/client/src/ui/visitor/header.vue index 002c7565e..ef073887f 100644 --- a/packages/client/src/ui/visitor/header.vue +++ b/packages/client/src/ui/visitor/header.vue @@ -3,7 +3,7 @@
{{ $ts.home }} - {{ $ts.timeline }} + {{ $ts.timeline }} {{ $ts.explore }} {{ $ts.channel }} {{ $ts.pages }} @@ -46,6 +46,7 @@ import { defineComponent } from 'vue'; import XSigninDialog from '@/components/signin-dialog.vue'; import XSignupDialog from '@/components/signup-dialog.vue'; import * as os from '@/os'; +import { instance } from '@/instance'; import { search } from '@/scripts/search'; export default defineComponent({ @@ -59,6 +60,7 @@ export default defineComponent({ return { narrow: null, showMenu: false, + isTimelineAvailable = !instance.disableLocalTimeline || !instance.disableGlobalTimeline, }; }, From b55b37634a4b6dad06b5d5d22cea338b241d0d98 Mon Sep 17 00:00:00 2001 From: futchitwo <74236683+futchitwo@users.noreply.github.com> Date: Sun, 17 Jul 2022 00:42:02 +0900 Subject: [PATCH 6/6] =?UTF-8?q?loginRequired=20=E3=83=97=E3=83=AD=E3=83=91?= =?UTF-8?q?=E3=83=86=E3=82=A3=E3=82=92=E4=BD=BF=E3=82=8F=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/global/page-header.vue | 3 --- packages/client/src/pages/timeline.vue | 22 ++++++++++++++----- packages/client/src/ui/visitor/header.vue | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/packages/client/src/components/global/page-header.vue b/packages/client/src/components/global/page-header.vue index 9109436bd..5395a8796 100644 --- a/packages/client/src/components/global/page-header.vue +++ b/packages/client/src/components/global/page-header.vue @@ -39,7 +39,6 @@ import tinycolor from 'tinycolor2'; import { popupMenu } from '@/os'; import { scrollToTop } from '@/scripts/scroll'; import { i18n } from '@/i18n'; -import { $i } from '@/account'; import { globalEvents } from '@/events'; import { injectPageMetadata } from '@/scripts/page-metadata'; @@ -48,7 +47,6 @@ type Tab = { title: string; icon?: string; iconOnly?: boolean; - loginRequired?: boolean; onClick?: (ev: MouseEvent) => void; }; @@ -73,7 +71,6 @@ const hideTitle = inject('shouldOmitHeaderTitle', false); const thin_ = props.thin || inject('shouldHeaderThin', false); const el = $ref(null); -const tabs = $i ? props.tabs : props.tabs?.filter(tab => !tab.loginRequired); const tabRefs = {}; const tabHighlightEl = $ref(null); const bg = ref(null); diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index 0e88c288c..af5f4f651 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -1,6 +1,6 @@