From 21d1f557f64cceda54755e2817d4799f1dbbea4f Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Fri, 3 Jul 2020 12:56:31 +0300 Subject: change styles for the dropdown, make things work nicely on mobile --- src/components/side_drawer/side_drawer.vue | 41 ++++++++---------------------- 1 file changed, 11 insertions(+), 30 deletions(-) (limited to 'src/components/side_drawer') diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue index f253742d..a941143c 100644 --- a/src/components/side_drawer/side_drawer.vue +++ b/src/components/side_drawer/side_drawer.vue @@ -43,30 +43,27 @@ v-if="currentUser" @click="toggleDrawer" > - - {{ $t("nav.dms") }} + + {{ $t("nav.timeline") }}
  • - - {{ $t("nav.interactions") }} + + {{ $t("nav.public_tl") }}
    • -
      -
    • - - {{ $t("nav.timeline") }} +
        +
      • + + {{ $t("nav.interactions") }}
      • @@ -80,23 +77,7 @@
      • - - {{ $t("nav.public_tl") }} - -
        • -
      • - - {{ $t("nav.twkn") }} - -
        • -
      • -- cgit v1.2.3-70-g09d2 From cde6acdbbd3a363832cfaf192b211c2576e5cc10 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Tue, 7 Jul 2020 18:20:37 +0300 Subject: update navigation, rename timeline link in nav panel to timelines --- src/components/nav_panel/nav_panel.js | 3 +++ src/components/nav_panel/nav_panel.vue | 9 ++------- src/components/side_drawer/side_drawer.js | 3 +++ src/components/side_drawer/side_drawer.vue | 19 +++---------------- 4 files changed, 11 insertions(+), 23 deletions(-) (limited to 'src/components/side_drawer') diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js index 42637a82..d9e87a1b 100644 --- a/src/components/nav_panel/nav_panel.js +++ b/src/components/nav_panel/nav_panel.js @@ -11,6 +11,9 @@ const NavPanel = { onTimelineRoute () { return !!timelineNames()[this.$route.name] }, + timelinesRoute () { + return this.currentUser ? 'friends' : 'public-timeline' + }, ...mapState({ currentUser: state => state.users.currentUser, followRequestCount: state => state.api.followRequests.length, diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue index d0e626e6..dd6a433b 100644 --- a/src/components/nav_panel/nav_panel.vue +++ b/src/components/nav_panel/nav_panel.vue @@ -2,19 +2,14 @@
          -
        • +
        • {{ $t("nav.timelines") }}
          • -
        • - - {{ $t("nav.public_tl") }} - -
        • {{ $t("nav.interactions") }} diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js index d1f044f6..b955729c 100644 --- a/src/components/side_drawer/side_drawer.js +++ b/src/components/side_drawer/side_drawer.js @@ -47,6 +47,9 @@ const SideDrawer = { }, federating () { return this.$store.state.instance.federating + }, + timelinesRoute () { + return this.currentUser ? 'friends' : 'public-timeline' } }, methods: { diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue index 6a0a86b4..5541b2cf 100644 --- a/src/components/side_drawer/side_drawer.vue +++ b/src/components/side_drawer/side_drawer.vue @@ -40,19 +40,11 @@
        • - - {{ $t("nav.timeline") }} - -
          • -
        • - - {{ $t("nav.public_tl") }} + + {{ $t("nav.timelines") }}
        @@ -62,11 +54,6 @@ {{ $t("nav.interactions") }}
        • -
      • - - {{ $t("nav.bookmarks") }} - -
      • Date: Tue, 14 Jul 2020 11:54:03 +0300 Subject: fix missed conflict --- src/components/side_drawer/side_drawer.vue | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'src/components/side_drawer') diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue index 4a4e7610..0587ee02 100644 --- a/src/components/side_drawer/side_drawer.vue +++ b/src/components/side_drawer/side_drawer.vue @@ -86,27 +86,11 @@
      • {{ $t("nav.chat") }} -======= - v-if="currentUser || !privateMode" - @click="toggleDrawer" - > - - {{ $t("nav.public_tl") }} - -
        • -
      • - - {{ $t("nav.twkn") }} ->>>>>>> develop
      -- cgit v1.2.3-70-g09d2 From fdbacba36a99b1f2ef200b8194a1964d9b87f9e1 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Thu, 23 Jul 2020 15:09:32 +0300 Subject: resume last lasttime instead of always friends/public --- src/components/nav_panel/nav_panel.js | 3 +++ src/components/side_drawer/side_drawer.js | 3 +++ src/components/timeline_menu/timeline_menu.js | 1 + src/modules/interface.js | 9 ++++++++- src/modules/users.js | 1 + 5 files changed, 16 insertions(+), 1 deletion(-) (limited to 'src/components/side_drawer') diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js index 6ed7fc33..623dfaec 100644 --- a/src/components/nav_panel/nav_panel.js +++ b/src/components/nav_panel/nav_panel.js @@ -12,6 +12,9 @@ const NavPanel = { return !!timelineNames()[this.$route.name] }, timelinesRoute () { + if (this.$store.state.interface.lastTimeline) { + return this.$store.state.interface.lastTimeline + } return this.currentUser ? 'friends' : 'public-timeline' }, ...mapState({ diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js index e13c66db..281052e5 100644 --- a/src/components/side_drawer/side_drawer.js +++ b/src/components/side_drawer/side_drawer.js @@ -50,6 +50,9 @@ const SideDrawer = { return this.$store.state.instance.federating }, timelinesRoute () { + if (this.$store.state.interface.lastTimeline) { + return this.$store.state.interface.lastTimeline + } return this.currentUser ? 'friends' : 'public-timeline' }, ...mapState({ diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js index 02c1318d..0afeb8b4 100644 --- a/src/components/timeline_menu/timeline_menu.js +++ b/src/components/timeline_menu/timeline_menu.js @@ -26,6 +26,7 @@ const TimelineMenu = { if (this.currentUser && this.currentUser.locked) { this.$store.dispatch('startFetchingFollowRequests') } + this.$store.dispatch('setLastTimeline', this.$route.name) }, methods: { openMenu () { diff --git a/src/modules/interface.js b/src/modules/interface.js index ec08ac0a..748d3025 100644 --- a/src/modules/interface.js +++ b/src/modules/interface.js @@ -16,7 +16,8 @@ const defaultState = { }, mobileLayout: false, globalNotices: [], - layoutHeight: 0 + layoutHeight: 0, + lastTimeline: null } const interfaceMod = { @@ -69,6 +70,9 @@ const interfaceMod = { }, setLayoutHeight (state, value) { state.layoutHeight = value + }, + setLastTimeline (state, value) { + state.lastTimeline = value } }, actions: { @@ -117,6 +121,9 @@ const interfaceMod = { }, setLayoutHeight ({ commit }, value) { commit('setLayoutHeight', value) + }, + setLastTimeline ({ commit }, value) { + commit('setLastTimeline', value) } } } diff --git a/src/modules/users.js b/src/modules/users.js index 16c1e566..9245db5c 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -499,6 +499,7 @@ const users = { store.commit('clearNotifications') store.commit('resetStatuses') store.dispatch('resetChats') + store.dispatch('setLastTimeline', 'public-timeline') }) }, loginUser (store, accessToken) { -- cgit v1.2.3-70-g09d2