diff --git a/src/components/RepoItemLabel.vue b/src/components/RepoItemLabel.vue index 3fd18622..f7e9a0c2 100644 --- a/src/components/RepoItemLabel.vue +++ b/src/components/RepoItemLabel.vue @@ -45,20 +45,16 @@ export default { } }, hrefPR() { - return this.build && this.repo && - `/link/${this.repo.slug}/tree/${this.build.ref}`; + return this.build && this.repo && `/link/${this.repo.slug}/tree/${this.build.ref}`; }, hrefTag() { - return this.build && this.repo && - `/link/${this.repo.slug}/tree/${this.build.ref}`; + return this.build && this.repo && `/link/${this.repo.slug}/tree/${this.build.ref}`; }, hrefBranch() { - return this.build && this.repo && - `/link/${this.repo.slug}/tree/refs/heads/${this.build.target}`; + return this.build && this.repo && `/link/${this.repo.slug}/tree/refs/heads/${this.build.target}`; }, hrefCommit() { - return this.build && this.repo && - `/link/${this.repo.slug}/commit/${this.build.after}`; + return this.build && this.repo && `/link/${this.repo.slug}/commit/${this.build.after}`; }, branch() { return this.build.target; diff --git a/src/components/SystemAlert.vue b/src/components/SystemAlert.vue index a88e4243..633378f5 100644 --- a/src/components/SystemAlert.vue +++ b/src/components/SystemAlert.vue @@ -26,7 +26,7 @@ footer { } footer a { - background: rgba(255,255,255,0.15); + background: rgba(255, 255, 255, 0.15); border-radius: 3px; color: #ffffff; margin-left: 20px; diff --git a/src/components/forms/BaseInput.vue b/src/components/forms/BaseInput.vue index 0b11ade8..5299ec3b 100644 --- a/src/components/forms/BaseInput.vue +++ b/src/components/forms/BaseInput.vue @@ -26,7 +26,8 @@ input { background: #fff; } -input[type="search"], input[type=text] { +input[type="search"], +input[type="text"] { appearance: none; } diff --git a/src/router/router.js b/src/router/router.js index d6b8a281..7c19d30f 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -12,6 +12,8 @@ import Repo from "../views/Repo.vue"; import Settings from "../views/Settings.vue"; import Search from "../views/Search.vue"; import BuildsFeed from "../views/BuildsFeed.vue"; +import Pulls from "../views/Pulls.vue"; +import Pushes from "../views/Pushes.vue"; export default new Router({ mode: "history", @@ -69,6 +71,16 @@ export default new Router({ name: "builds", component: Builds }, + { + path: "pushes", + name: "pushes", + component: Pushes + }, + { + path: "pulls", + name: "pulls", + component: Pulls + }, { path: "settings", name: "settings", diff --git a/src/store.js b/src/store.js index 1daf70dc..7ef7cf6c 100644 --- a/src/store.js +++ b/src/store.js @@ -492,7 +492,7 @@ export default new Vuex.Store({ insertBuildCollection(state.builds[slug].data, slug, build); } - updateBuildsFeedByBuild(state, build) + updateBuildsFeedByBuild(state, build); }, BUILDS_FEED_LOADING(state) { diff --git a/src/views/Build.vue b/src/views/Build.vue index 6947bebd..eb7105c0 100644 --- a/src/views/Build.vue +++ b/src/views/Build.vue @@ -259,8 +259,7 @@ export default { return this.buildCollection.data; }, link() { - return this.build && this.repo && - `/link/${this.repo.slug}/tree/${this.build.ref}?sha=${this.build.after}` + return this.build && this.repo && `/link/${this.repo.slug}/tree/${this.build.ref}?sha=${this.build.after}`; }, buildShowState() { if (this.buildCollection.lStatus === "error") return "loadingError"; diff --git a/src/views/Builds.vue b/src/views/Builds.vue index 64703cae..40985e8f 100644 --- a/src/views/Builds.vue +++ b/src/views/Builds.vue @@ -64,6 +64,7 @@ export default { for (let i = 0; i < buildCollections.length; ++i) { const data = buildCollections[i].data; + if (data) builds.push(data); } diff --git a/src/views/Pulls.vue b/src/views/Pulls.vue new file mode 100644 index 00000000..13dcd688 --- /dev/null +++ b/src/views/Pulls.vue @@ -0,0 +1,155 @@ + + + + + + + diff --git a/src/views/Pushes.vue b/src/views/Pushes.vue new file mode 100644 index 00000000..b28780f3 --- /dev/null +++ b/src/views/Pushes.vue @@ -0,0 +1,156 @@ + + + + + + + diff --git a/src/views/Repo.vue b/src/views/Repo.vue index c179ae66..da90fc4e 100644 --- a/src/views/Repo.vue +++ b/src/views/Repo.vue @@ -34,9 +34,11 @@ Activity Feed - + @@ -133,7 +135,7 @@ export default { return (this.repo && this.repo.permissions && this.repo.permissions.write) || (this.user && this.user.admin); }, isAdmin() { - return (this.repo && this.repo.permissions && this.repo.permissions.admin); + return this.repo && this.repo.permissions && this.repo.permissions.admin; }, build() { const collection = this.$store.state.builds[this.slug];