From 46acb27dca58dee73769d1eaa04c1503ea44ae45 Mon Sep 17 00:00:00 2001 From: Matteo Cominetti Date: Thu, 8 Oct 2020 10:42:08 +0100 Subject: [PATCH] feat(ui): adds new stream dialog --- frontend/src/components/SidebarStream.vue | 2 +- frontend/src/components/dialogs/NewBranch.vue | 2 + frontend/src/components/dialogs/NewStream.vue | 85 +++++++++++++++++++ frontend/src/views/Stream.vue | 39 ++++++++- frontend/src/views/Streams.vue | 53 +++++++++++- 5 files changed, 174 insertions(+), 7 deletions(-) create mode 100644 frontend/src/components/dialogs/NewStream.vue diff --git a/frontend/src/components/SidebarStream.vue b/frontend/src/components/SidebarStream.vue index ccec83682..dfed77e9b 100644 --- a/frontend/src/components/SidebarStream.vue +++ b/frontend/src/components/SidebarStream.vue @@ -49,7 +49,7 @@ - + Collaborators diff --git a/frontend/src/components/dialogs/NewBranch.vue b/frontend/src/components/dialogs/NewBranch.vue index e8353e615..4f2e053b8 100644 --- a/frontend/src/components/dialogs/NewBranch.vue +++ b/frontend/src/components/dialogs/NewBranch.vue @@ -59,6 +59,8 @@ export default { methods: { open() { this.dialog = true + this.name = "" + this.description = "" return new Promise((resolve, reject) => { this.resolve = resolve this.reject = reject diff --git a/frontend/src/components/dialogs/NewStream.vue b/frontend/src/components/dialogs/NewStream.vue new file mode 100644 index 000000000..586a34717 --- /dev/null +++ b/frontend/src/components/dialogs/NewStream.vue @@ -0,0 +1,85 @@ + + diff --git a/frontend/src/views/Stream.vue b/frontend/src/views/Stream.vue index 7ff970789..351a62d10 100644 --- a/frontend/src/views/Stream.vue +++ b/frontend/src/views/Stream.vue @@ -11,12 +11,13 @@ Branches:
+ +

+ {{ branches[selectedBranch].description }} +

@@ -44,6 +52,25 @@ Commits: + + +

+ There are no commits in this branch just yet, try sending + something... +

+
+
+ {{ commit.message }} +
+ +
+
@@ -72,9 +99,15 @@ export default { } } }, - data: () => ({}), + data: () => ({ selectedBranch: 0 }), + computed: { + branches() { + //reverse without changing original array + return this.stream.branches.items.slice().reverse() + } + }, watch: { - stream(val) { + selectedBranch(val) { console.log(val) } }, diff --git a/frontend/src/views/Streams.vue b/frontend/src/views/Streams.vue index 13d9f4439..4e4ccd106 100644 --- a/frontend/src/views/Streams.vue +++ b/frontend/src/views/Streams.vue @@ -4,9 +4,22 @@ - + Your Streams + + mdi-plus-box-outline + new stream + + + +
@@ -19,20 +32,54 @@