Merge pull request #1230 from Bnyro/master

make trending accessible although feed is the default tab

src/components/NavBar.vue

@@ -28,6 +28,9 @@
         </div>
         <div class="flex-1 flex justify-end">
             <ul class="flex text-1xl children:pl-3">
+                <li v-if="shouldShowTrending">
+                    <router-link v-t="'titles.trending'" to="/trending" />
+                </li>
                 <li>
                     <router-link v-t="'titles.preferences'" to="/preferences" />
                 </li>
@@ -96,6 +99,9 @@ export default {
         shouldShowHistory(_this) {
             return _this.getPreferenceBoolean("watchHistory", false);
         },
+        shouldShowTrending(_this) {
+            return _this.getPreferenceString("homepage", "trending") != "trending";
+        },
     },
     methods: {
         // focus on search bar when Ctrl+k is pressed

src/components/TrendingPage.vue

@@ -31,14 +31,16 @@ export default {
     activated() {
         document.title = this.$t("titles.trending") + " - Piped";
         if (this.videos.length > 0) this.updateWatched(this.videos);
-        switch (this.getPreferenceString("homepage", "trending")) {
-            case "trending":
-                break;
-            case "feed":
-                this.$router.push("/feed");
-                return;
-            default:
-                break;
+        if (this.$route.path == "/") {
+            switch (this.getPreferenceString("homepage", "trending")) {
+                case "trending":
+                    break;
+                case "feed":
+                    this.$router.push("/feed");
+                    return;
+                default:
+                    break;
+            }
         }
     },
     methods: {

src/router/router.js

@@ -3,6 +3,11 @@ import { createRouter, createWebHistory } from "vue-router";
 const routes = [
     {
         path: "/",
+        name: "Home",
+        component: () => import("../components/TrendingPage.vue"),
+    },
+    {
+        path: "/trending",
         name: "Trending",
         component: () => import("../components/TrendingPage.vue"),
     },