From 38ffb80222ec20378795324d89ea9fb07d94e781 Mon Sep 17 00:00:00 2001 From: Matteo Cominetti Date: Tue, 3 Aug 2021 19:37:31 +0200 Subject: [PATCH 1/3] fix: broked links & #367 --- packages/frontend/src/components/ListItemActivity.vue | 2 +- packages/frontend/src/components/ListItemStream.vue | 2 +- packages/frontend/src/views/stream/Branch.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/components/ListItemActivity.vue b/packages/frontend/src/components/ListItemActivity.vue index 802d61a14..3f2cb49f3 100644 --- a/packages/frontend/src/components/ListItemActivity.vue +++ b/packages/frontend/src/components/ListItemActivity.vue @@ -88,7 +88,7 @@ text class="px-0 ml-3" small - :to="'/streams/' + stream.id + '/branches/main/commits'" + :to="'/streams/' + stream.id + '/branches/main'" > mdi-source-commit {{ stream.commits.totalCount }} diff --git a/packages/frontend/src/components/ListItemStream.vue b/packages/frontend/src/components/ListItemStream.vue index 263eedc29..8a0c94a3d 100644 --- a/packages/frontend/src/components/ListItemStream.vue +++ b/packages/frontend/src/components/ListItemStream.vue @@ -45,7 +45,7 @@ text class="px-0" small - :to="'/streams/' + stream.id + '/branches/main/commits'" + :to="'/streams/' + stream.id + '/branches/main'" > mdi-source-commit {{ stream.commits.totalCount }} diff --git a/packages/frontend/src/views/stream/Branch.vue b/packages/frontend/src/views/stream/Branch.vue index 892bf6738..0d87e0bab 100644 --- a/packages/frontend/src/views/stream/Branch.vue +++ b/packages/frontend/src/views/stream/Branch.vue @@ -116,7 +116,7 @@ export default { //this.$router.push does not work, refresh entire window this.$router.push({ - path: `/streams/${this.streamId}/branches/${encodeURIComponent(dialog.name)}/commits` + path: `/streams/${this.streamId}/branches/${encodeURIComponent(dialog.name)}` }) } else { this.$apollo.queries.stream.refetch() From 01efcd2a7e27226f46861ff56bbf66fb6d40f535 Mon Sep 17 00:00:00 2001 From: Matteo Cominetti Date: Tue, 3 Aug 2021 21:18:49 +0200 Subject: [PATCH 2/3] feat(frontend): ticking off various items --- .../src/components/ListItemActivity.vue | 80 ++++++++++++++----- .../src/components/SourceAppAvatar.vue | 2 +- packages/frontend/src/views/Frontend.vue | 7 +- packages/frontend/src/views/ProfileUser.vue | 39 +++++++-- .../frontend/src/views/stream/Activity.vue | 4 +- .../frontend/src/views/stream/Details.vue | 43 ++++++---- 6 files changed, 127 insertions(+), 48 deletions(-) diff --git a/packages/frontend/src/components/ListItemActivity.vue b/packages/frontend/src/components/ListItemActivity.vue index 3f2cb49f3..f69000e7a 100644 --- a/packages/frontend/src/components/ListItemActivity.vue +++ b/packages/frontend/src/components/ListItemActivity.vue @@ -25,35 +25,71 @@ flat > - - - - + + + + + + - {{ targetUser.name }} - + {{ targetUser.name }} + - {{ activityInfo.actionText }} - - mdi-account-key-outline - {{ activity.info.role.split(':')[1] }} - + {{ activityInfo.actionText }} + + mdi-account-key-outline + {{ activity.info.role.split(':')[1] }} + + + + + view + + + - - mdi-compare-vertical - {{ stream.name }} - - {{ activityInfo.actionText }} + + + + mdi-compare-vertical + {{ stream.name }} + + {{ activityInfo.actionText }} + + + + + view + + + +
mdi-source-commit {{ stream.commits.totalCount }} - + mdi-account-key-outline {{ stream.role.split(':')[1] }} diff --git a/packages/frontend/src/components/SourceAppAvatar.vue b/packages/frontend/src/components/SourceAppAvatar.vue index 0799709a2..e03e55881 100644 --- a/packages/frontend/src/components/SourceAppAvatar.vue +++ b/packages/frontend/src/components/SourceAppAvatar.vue @@ -3,7 +3,7 @@ - diff --git a/packages/frontend/src/components/PreviewImage.vue b/packages/frontend/src/components/PreviewImage.vue new file mode 100644 index 000000000..3e534332e --- /dev/null +++ b/packages/frontend/src/components/PreviewImage.vue @@ -0,0 +1,66 @@ + + +