From 9a00aab618509728819dd0c292f8bcb22825137a Mon Sep 17 00:00:00 2001
From: Matteo Cominetti <matteo@cominetti.org>
Date: Mon, 8 Mar 2021 12:00:09 +0000
Subject: [PATCH] feat(frontend): `/branches` page urls point to
 `branches/branch-name/commits` page

---
 packages/frontend/src/components/ListItemCommit.vue | 8 +++++---
 packages/frontend/src/components/ListItemStream.vue | 2 ++
 packages/frontend/src/views/Branches.vue            | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/ListItemCommit.vue b/packages/frontend/src/components/ListItemCommit.vue
index 76a58b380..2bbeefbaf 100644
--- a/packages/frontend/src/components/ListItemCommit.vue
+++ b/packages/frontend/src/components/ListItemCommit.vue
@@ -11,8 +11,8 @@
     <v-list-item-content>
       <v-list-item-title class="my-2 py-1">
         {{ commit.message }}
-        <span class="caption" v-if="commit.branchName">
-          <v-chip small style="top:-3px">
+        <span v-if="commit.branchName" class="caption">
+          <v-chip small style="top: -3px">
             <v-icon small class="mr-2">mdi-source-branch</v-icon>
             {{ commit.branchName }}
           </v-chip>
@@ -47,7 +47,9 @@ export default {
     },
     branchUrl() {
       if (!this.commit) return null
-      return `${window.location.origin}/streams/${this.$route.params.streamId}/branches/${this.commit.branchName}`
+      return `${window.location.origin}/streams/${
+        this.$route.params.streamId
+      }/branches/${encodeURIComponent(this.commit.branchName)}`
     }
   },
   methods: {
diff --git a/packages/frontend/src/components/ListItemStream.vue b/packages/frontend/src/components/ListItemStream.vue
index ff6d5ac19..aee456d9c 100644
--- a/packages/frontend/src/components/ListItemStream.vue
+++ b/packages/frontend/src/components/ListItemStream.vue
@@ -29,6 +29,7 @@
             text
             class="px-0 ml-3"
             small
+            :to="'/streams/' + stream.id + '/branches'"
           >
             <v-icon small class="mr-2 float-left">mdi-source-branch</v-icon>
             {{ stream.branches.totalCount }}
@@ -43,6 +44,7 @@
             text
             class="px-0"
             small
+            :to="'/streams/' + stream.id + '/branches/main/commits'"
           >
             <v-icon small class="mr-2 float-left">mdi-source-commit</v-icon>
             {{ stream.commits.totalCount }}
diff --git a/packages/frontend/src/views/Branches.vue b/packages/frontend/src/views/Branches.vue
index dac71592f..973aedd11 100644
--- a/packages/frontend/src/views/Branches.vue
+++ b/packages/frontend/src/views/Branches.vue
@@ -52,7 +52,9 @@
             <template v-for="item in branches.items">
               <v-list-item
                 :key="item.id"
-                :to="`/streams/${$route.params.streamId}/branches/${encodeURIComponent(item.name)}`"
+                :to="`/streams/${$route.params.streamId}/branches/${encodeURIComponent(
+                  item.name
+                )}/commits`"
               >
                 <v-list-item-content>
                   <v-list-item-title>