Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
384ea58f
Commit
384ea58f
authored
Oct 30, 2016
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change to more component like structure for reusable components
parent
ae90118e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
54 additions
and
70 deletions
+54
-70
app/assets/javascripts/vue_pipelines_index/index.js.es6
app/assets/javascripts/vue_pipelines_index/index.js.es6
+2
-1
app/assets/javascripts/vue_pipelines_index/pipelines.vue.js.es6
...sets/javascripts/vue_pipelines_index/pipelines.vue.js.es6
+14
-17
app/assets/javascripts/vue_pipelines_index/running.vue.js.es6
...assets/javascripts/vue_pipelines_index/running.vue.js.es6
+25
-0
app/assets/javascripts/vue_pipelines_index/running_icon.vue.js.es6
...s/javascripts/vue_pipelines_index/running_icon.vue.js.es6
+13
-0
app/assets/javascripts/vue_pipelines_index/store.js.es6
app/assets/javascripts/vue_pipelines_index/store.js.es6
+0
-1
app/assets/javascripts/vue_pipelines_index/vue_commit_link.vue.js.es6
...avascripts/vue_pipelines_index/vue_commit_link.vue.js.es6
+0
-50
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+0
-1
No files found.
app/assets/javascripts/vue_pipelines_index/index.js.es6
View file @
384ea58f
...
...
@@ -2,6 +2,7 @@
//= require vue-resource
//= require ./store.js.es6
//= require ./running_icon.vue.js.es6
//= require ./running.vue.js.es6
//= require ./status_data_icons.js.es6
//= require ./vue_commit_link.vue.js.es6
//= require ./pipelines.vue.js.es6
app/assets/javascripts/vue_pipelines_index/pipelines.vue.js.es6
View file @
384ea58f
...
...
@@ -3,13 +3,19 @@
((gl) => {
gl.VuePipeLines = Vue.extend({
components: {
'vue-running-pipeline': gl.VueRunningPipeline,
},
data() {
return {
pipelines: [],
runnerStats: new gl.RunnerStats(),
};
},
props: ['scope', 'store'],
props: [
'scope',
'store',
],
created() {
this.store.fetchDataLoop.call(this, Vue);
},
...
...
@@ -31,24 +37,15 @@
</thead>
<tbody v-for='pipeline in pipelines'>
<tr class="commit">
<td class="commit-link">
<a href="pipelines/{{pipeline.id}}">
<div v-if="pipeline.status === 'running'">
<span class="ci-status ci-{{pipeline.status}}">
running
</span>
</div>
<div v-if="pipeline.status === 'passed'">
<span class="ci-status ci-{{pipeline.status}}">
passed
</span>
</div>
</a>
<td class="commit-link" v-if="pipeline.status === 'running'">
<vue-running-pipeline :pipe='pipeline'></vue-running-pipeline>
</td>
<td>
<a href="pipelines/{{pipeline.id}}"><span class="pipeline-id">#{{pipeline.id}}</span>
</a><span>by</span>
<span class="api monospace">{{pipeline.user}}</span>
<a href="pipelines/{{pipeline.id}}">
<span class="pipeline-id">#{{pipeline.id}}</span>
</a>
<span>by</span>
<span class="api monospace">{{pipeline.user}}</span>
</td>
<td class="branch-commit">
<div class="icon-container">
...
...
app/assets/javascripts/vue_pipelines_index/running.vue.js.es6
0 → 100644
View file @
384ea58f
/* global Vue, gl */
/* eslint-disable no-param-reassign */
((gl) => {
gl.VueRunningPipeline = Vue.extend({
components: {
'vue-running-icon': gl.VueRunningIcon,
},
props: [
'pipe',
],
template: `
<td class="commit-link">
<a href="pipelines/{{pipe.id}}">
<span class="ci-status ci-running">
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
<vue-running-icon></vue-running-icon>
</svg>
running
</span>
</a>
</td>
`,
});
})(window.gl || (window.gl = {}));
app/assets/javascripts/vue_pipelines_index/running_icon.vue.js.es6
0 → 100644
View file @
384ea58f
/* global Vue, gl */
/* eslint-disable no-param-reassign */
((gl) => {
gl.VueRunningIcon = Vue.extend({
template: `
<g fill="#2D9FD8" fill-rule="evenodd">
<path d="M12.5,7 C12.5,3.96243388 10.0375661,1.5 7,1.5 C3.96243388,1.5 1.5,3.96243388 1.5,7 C1.5,10.0375661 3.96243388,12.5 7,12.5 C10.0375661,12.5 12.5,10.0375661 12.5,7 Z M0,7 C0,3.13400675 3.13400675,0 7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 Z"></path>
<path d="M7,3 C9.209139,3 11,4.790861 11,7 C11,9.209139 9.209139,11 7,11 C5.65802855,11 4.47040669,10.3391508 3.74481446,9.32513253 L7,7 L7,3 L7,3 Z"></path>
</g>
`,
});
})(window.gl || (window.gl = {}));
app/assets/javascripts/vue_pipelines_index/store.js.es6
View file @
384ea58f
...
...
@@ -13,7 +13,6 @@
});
goFetch(Vue);
setInterval(() => {
console.log('DID IT');
goFetch(Vue);
...
...
app/assets/javascripts/vue_pipelines_index/vue_commit_link.vue.js.es6
deleted
100644 → 0
View file @
ae90118e
/* global Vue, gl */
/* eslint-disable no-param-reassign */
((gl) => {
gl.VueCommitLink = Vue.extend({
props: ['pipeline'],
template: `
<td class="commit-link">
<a href="pipelines/{{pipeline.id}}">
<div v-if="pipeline.status === 'running'">
<span class="ci-status ci-{{pipeline.status}}">
<vue-runner-running></vue-runner-running>
</span>
</div>
<div v-if="pipeline.status === 'passed'">
<span class="ci-status ci-{{pipeline.status}}">
<vue-runner-running></vue-runner-running>
</span>
</div>
<div v-if="pipeline.status === 'created'">
<span class="ci-status ci-{{pipeline.status}}">
<vue-runner-running></vue-runner-running>
</span>
</div>
<div v-if="pipeline.status === ''">
<span class="ci-status ci-{{pipeline.status}}">
<vue-runner-running></vue-runner-running>
</span>
</div>
<div v-if="pipeline.status === 'r'">
<span class="ci-status ci-{{pipeline.status}}">
<vue-runner-running></vue-runner-running>
</span>
</div>
<div v-if="pipeline.status === 'ru'">
<span class="ci-status ci-{{pipeline.status}}">
<vue-runner-running></vue-runner-running>
</span>
</div>
<div v-if="pipeline.status === 'run'">
<span class="ci-status ci-{{pipeline.status}}">
<vue-runner-running></vue-runner-running>
</span>
</div>
</a>
</td>
`,
});
})(window.gl || (window.gl = {}));
app/views/projects/pipelines/index.html.haml
View file @
384ea58f
...
...
@@ -56,7 +56,6 @@
store
:
new
gl
.
PipelineStore
(),
},
components
:
{
'
vue-commit-link
'
:
gl
.
VueCommitLink
,
'
vue-pipelines
'
:
gl
.
VuePipeLines
,
},
template
:
""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment