From 21d1f557f64cceda54755e2817d4799f1dbbea4f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
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/side_drawer.vue')

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"
         >
-          <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }">
-            <i class="button-icon icon-mail-alt" /> {{ $t("nav.dms") }}
+          <router-link :to="{ name: 'friends' }">
+            <i class="button-icon icon-home-2" /> {{ $t("nav.timeline") }}
           </router-link>
         </li>
         <li
-          v-if="currentUser"
+          v-else
           @click="toggleDrawer"
         >
-          <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
-            <i class="button-icon icon-bell-alt" /> {{ $t("nav.interactions") }}
+          <router-link :to="{ name: 'public-timeline' }">
+            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
           </router-link>
         </li>
       </ul>
-      <ul>
-        <li
-          v-if="currentUser"
-          @click="toggleDrawer"
-        >
-          <router-link :to="{ name: 'friends' }">
-            <i class="button-icon icon-home-2" /> {{ $t("nav.timeline") }}
+      <ul v-if="currentUser">
+        <li @click="toggleDrawer">
+          <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
+            <i class="button-icon icon-bell-alt" /> {{ $t("nav.interactions") }}
           </router-link>
         </li>
         <li
-          v-if="currentUser && currentUser.locked"
+          v-if="currentUser.locked"
           @click="toggleDrawer"
         >
           <router-link to="/friend-requests">
@@ -80,23 +77,7 @@
           </router-link>
         </li>
         <li
-          v-if="currentUser || !privateMode"
-          @click="toggleDrawer"
-        >
-          <router-link to="/main/public">
-            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
-          </router-link>
-        </li>
-        <li
-          v-if="federating && (currentUser || !privateMode)"
-          @click="toggleDrawer"
-        >
-          <router-link to="/main/all">
-            <i class="button-icon icon-globe" /> {{ $t("nav.twkn") }}
-          </router-link>
-        </li>
-        <li
-          v-if="currentUser && chat"
+          v-if="chat"
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'chat' }">
-- 
cgit v1.2.3-70-g09d2


From cde6acdbbd3a363832cfaf192b211c2576e5cc10 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
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/side_drawer.vue')

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 @@
   <div class="nav-panel">
     <div class="panel panel-default">
       <ul>
-        <li v-if="currentUser">
+        <li v-if="currentUser || !privateMode">
           <router-link
-            :to="{ name: 'friends' }"
+            :to="{ name: timelinesRoute }"
             :class="onTimelineRoute && 'router-link-active'"
           >
             <i class="button-icon icon-home-2" /> {{ $t("nav.timelines") }}
           </router-link>
         </li>
-        <li v-else-if="!privateMode">
-          <router-link :to="{ name: 'public-timeline' }">
-            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
-          </router-link>
-        </li>
         <li v-if="currentUser">
           <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
             <i class="button-icon icon-bell-alt" /> {{ $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 @@
           </router-link>
         </li>
         <li
-          v-if="currentUser"
-          @click="toggleDrawer"
-        >
-          <router-link :to="{ name: 'friends' }">
-            <i class="button-icon icon-home-2" /> {{ $t("nav.timeline") }}
-          </router-link>
-        </li>
-        <li
-          v-else
+          v-if="currentUser || !privateMode"
           @click="toggleDrawer"
         >
-          <router-link :to="{ name: 'public-timeline' }">
-            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
+          <router-link :to="{ name: timelinesRoute }">
+            <i class="button-icon icon-home-2" /> {{ $t("nav.timelines") }}
           </router-link>
         </li>
       </ul>
@@ -62,11 +54,6 @@
             <i class="button-icon icon-bell-alt" /> {{ $t("nav.interactions") }}
           </router-link>
         </li>
-        <li @click="toggleDrawer">
-          <router-link :to="{ name: 'bookmarks'}">
-            <i class="button-icon icon-bookmark" /> {{ $t("nav.bookmarks") }}
-          </router-link>
-        </li>
         <li
           v-if="currentUser.locked"
           @click="toggleDrawer"
-- 
cgit v1.2.3-70-g09d2


From 3598360ce55bf7701716a9974599f901ddb66bf7 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
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/side_drawer.vue')

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 @@
           </router-link>
         </li>
         <li
-<<<<<<< HEAD
           v-if="chat"
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'chat' }">
             <i class="button-icon icon-chat" /> {{ $t("nav.chat") }}
-=======
-          v-if="currentUser || !privateMode"
-          @click="toggleDrawer"
-        >
-          <router-link to="/main/public">
-            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
-          </router-link>
-        </li>
-        <li
-          v-if="federating && (currentUser || !privateMode)"
-          @click="toggleDrawer"
-        >
-          <router-link to="/main/all">
-            <i class="button-icon icon-globe" /> {{ $t("nav.twkn") }}
->>>>>>> develop
           </router-link>
         </li>
       </ul>
-- 
cgit v1.2.3-70-g09d2