From 961099d34a3852d1019a00d390ad638fe45118e4 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Thu, 2 Jul 2020 18:03:02 +0300 Subject: [PATCH 01/29] 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 +++++++++ .../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 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 @@