From ea09bbecf8b7715a1242a104b6233a7c3b5ac588 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Tue, 30 Jun 2020 17:02:38 +0300 Subject: Make use of backend reply filtering --- src/components/timeline/timeline.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/components/timeline/timeline.vue') diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 9777bd0c..bd8389b9 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -19,14 +19,14 @@ {{ errorData.statusText }}
-- cgit v1.2.3-70-g09d2 From 38d8526660df4ca664c9ea50a660868be2cb5e49 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Tue, 30 Jun 2020 17:37:36 +0300 Subject: change Show New text to Reload when flushing --- src/components/timeline/timeline.js | 6 +++--- src/components/timeline/timeline.vue | 2 +- src/i18n/en.json | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/components/timeline/timeline.vue') diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 3a244c83..d6519f4a 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -49,11 +49,11 @@ const Timeline = { if (this.timelineError || this.errorData) return false return this.timeline.newStatusCount > 0 || this.timeline.flushMarker !== 0 }, - newStatusCountStr () { + loadButtonString () { if (this.timeline.flushMarker !== 0) { - return '' + return this.$t('timeline.reload') } else { - return ` (${this.newStatusCount})` + return `${this.$t('timeline.show_new')} (${this.newStatusCount})` } }, classes () { diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index bd8389b9..111c0976 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -23,7 +23,7 @@ class="loadmore-button" @click.prevent="showNewStatuses" > - {{ $t('timeline.show_new') }}{{ newStatusCountStr }} + {{ loadButtonString }}
Date: Thu, 2 Jul 2020 18:03:02 +0300 Subject: basic version done, needs cleanup from nav panel styles --- src/components/nav_panel/nav_panel.vue | 20 +++------ src/components/timeline/timeline.js | 10 +++-- src/components/timeline/timeline.vue | 4 +- src/components/timeline_menu/timeline_menu.js | 30 +++++++++++++ src/components/timeline_menu/timeline_menu.vue | 62 ++++++++++++++++++++++++++ 5 files changed, 104 insertions(+), 22 deletions(-) create mode 100644 src/components/timeline_menu/timeline_menu.js create mode 100644 src/components/timeline_menu/timeline_menu.vue (limited to 'src/components/timeline/timeline.vue') diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue index 8cd04dc7..ed70f019 100644 --- a/src/components/nav_panel/nav_panel.vue +++ b/src/components/nav_panel/nav_panel.vue @@ -7,14 +7,14 @@ {{ $t("nav.timeline") }} -
  • - - {{ $t("nav.interactions") }} +
  • + + {{ $t("nav.public_tl") }}
  • - - {{ $t("nav.dms") }} + + {{ $t("nav.interactions") }}
  • @@ -28,16 +28,6 @@
  • -
  • - - {{ $t("nav.public_tl") }} - -
  • -
  • - - {{ $t("nav.twkn") }} - -
  • {{ $t("nav.about") }} diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index d6519f4a..3a7a4268 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -1,6 +1,7 @@ import Status from '../status/status.vue' import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js' import Conversation from '../conversation/conversation.vue' +import TimelineMenu from '../timeline_menu/timeline_menu.vue' import { throttle, keyBy } from 'lodash' export const getExcludedStatusIdsByPinning = (statuses, pinnedStatusIds) => { @@ -35,6 +36,11 @@ const Timeline = { bottomedOut: false } }, + components: { + Status, + Conversation, + TimelineMenu + }, computed: { timelineError () { return this.$store.state.statuses.error @@ -74,10 +80,6 @@ const Timeline = { return keyBy(this.pinnedStatusIds) } }, - components: { - Status, - Conversation - }, created () { const store = this.$store const credentials = store.state.users.currentUser.credentials diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 111c0976..f8baaf19 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -1,9 +1,7 @@