Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
384ea58f
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
384ea58f
编写于
10月 30, 2016
作者:
R
Regis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
change to more component like structure for reusable components
上级
ae90118e
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
54 addition
and
70 deletion
+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
未找到文件。
app/assets/javascripts/vue_pipelines_index/index.js.es6
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
已删除
100644 → 0
浏览文件 @
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
浏览文件 @
384ea58f
...
...
@@ -56,7 +56,6 @@
store
:
new
gl
.
PipelineStore
(),
},
components
:
{
'
vue-commit-link
'
:
gl
.
VueCommitLink
,
'
vue-pipelines
'
:
gl
.
VuePipeLines
,
},
template
:
""
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录