diff --git a/src/components/Icons/Android.vue b/src/components/Icons/Android.vue new file mode 100644 index 00000000..d52514b3 --- /dev/null +++ b/src/components/Icons/Android.vue @@ -0,0 +1,21 @@ + + + + + \ No newline at end of file diff --git a/src/components/Icons/DotnetCore.vue b/src/components/Icons/DotnetCore.vue new file mode 100644 index 00000000..8da31e36 --- /dev/null +++ b/src/components/Icons/DotnetCore.vue @@ -0,0 +1,45 @@ + + + + + \ No newline at end of file diff --git a/src/components/Icons/Golang.vue b/src/components/Icons/Golang.vue new file mode 100644 index 00000000..8803e812 --- /dev/null +++ b/src/components/Icons/Golang.vue @@ -0,0 +1,47 @@ + + + + + \ No newline at end of file diff --git a/src/components/Icons/ImgIcon.vue b/src/components/Icons/ImgIcon.vue new file mode 100644 index 00000000..a118dc76 --- /dev/null +++ b/src/components/Icons/ImgIcon.vue @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/src/components/Icons/Maven.vue b/src/components/Icons/Maven.vue new file mode 100644 index 00000000..c5646235 --- /dev/null +++ b/src/components/Icons/Maven.vue @@ -0,0 +1,148 @@ + + + + + \ No newline at end of file diff --git a/src/components/Icons/Npm.vue b/src/components/Icons/Npm.vue new file mode 100644 index 00000000..65318a86 --- /dev/null +++ b/src/components/Icons/Npm.vue @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/src/components/Icons/Php.vue b/src/components/Icons/Php.vue new file mode 100644 index 00000000..834b1895 --- /dev/null +++ b/src/components/Icons/Php.vue @@ -0,0 +1,130 @@ + + + + + \ No newline at end of file diff --git a/src/components/Icons/Python.vue b/src/components/Icons/Python.vue new file mode 100644 index 00000000..45ce7182 --- /dev/null +++ b/src/components/Icons/Python.vue @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/src/components/Icons/Ruby.vue b/src/components/Icons/Ruby.vue new file mode 100644 index 00000000..bc6d11b0 --- /dev/null +++ b/src/components/Icons/Ruby.vue @@ -0,0 +1,166 @@ + + + + + \ No newline at end of file diff --git a/src/i18n/cn.js b/src/i18n/cn.js index 9768ab35..92aa5af4 100644 --- a/src/i18n/cn.js +++ b/src/i18n/cn.js @@ -42,7 +42,7 @@ export default { flow: { name: '工作流', - create: '创建工作流', + create: '创建一个工作流', search: '输入关键词搜索', settings: '设置', statistic: '统计', @@ -60,7 +60,8 @@ export default { create_title_yml: '配置 YML', create_btn_finish: '完成创建', create_git_hint: '提示: Git 仓库可已在创建完成后配置', - create_blank_template: '不选择 (可稍后在 工作流 -> 设置 中配置)', + create_blank_template_title: '不使用模版', + create_blank_template_desc: '只创建一个 Flow， YAML 配置可稍后在 "工作流 -> 设置" 中配置', delete_btn: '删除当前 Flow', delete_desc: '删除当前 Flow 后无法恢复，请谨慎操作', diff --git a/src/i18n/en.js b/src/i18n/en.js index c52e231e..8b606e9a 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -42,7 +42,7 @@ export default { flow: { name: 'flow', - create: 'Create Flow', + create: 'Create a Flow', search: 'Search by key words', settings: 'Settings', statistic: 'Statistic', @@ -60,7 +60,8 @@ export default { create_title_yml: 'Config YML', create_btn_finish: 'Finish', create_git_hint: 'hint: Git repo url and webhook can be configured afterward', - create_blank_template: 'blank (updated at Flows -> Settings later)', + create_blank_template_title: 'Do not use template', + create_blank_template_desc: 'Create a flow only, the YAML configuration could be defined from "flow -> settings" later', delete_btn: 'Delete This Flow', delete_desc: 'Once you delete a repository, there is no going back. Please be certain.', diff --git a/src/main.js b/src/main.js index fd3ac9d9..7ddf0f9f 100644 --- a/src/main.js +++ b/src/main.js @@ -21,6 +21,15 @@ import './assets/styles/style.scss' import 'xterm/css/xterm.css' import G6 from "@antv/g6" +import AndroidIcon from '@/components/Icons/Android' +import DotnetCoreIcon from '@/components/Icons/DotnetCore' +import GolangIcon from '@/components/Icons/Golang' +import MavenIcon from '@/components/Icons/Maven' +import NpmIcon from '@/components/Icons/Npm' +import PhpIcon from '@/components/Icons/Php' +import RubyIcon from '@/components/Icons/Ruby' +import PythonIcon from '@/components/Icons/Python' + Vue.config.productionTip = false VueClipboard.config.autoSetContainer = true @@ -163,6 +172,32 @@ new Vue({ vuetify: new Vuetify({ icons: { iconfont: 'mdi', + values: { + android: { + component: AndroidIcon + }, + dotnetcore: { + component: DotnetCoreIcon + }, + golang: { + component: GolangIcon + }, + maven: { + component: MavenIcon + }, + npm: { + component: NpmIcon + }, + php: { + component: PhpIcon + }, + ruby: { + component: RubyIcon + }, + python: { + component: PythonIcon + } + } }, }), router, diff --git a/src/store/module/flows.js b/src/store/module/flows.js index e23be7e1..0c6a38b6 100644 --- a/src/store/module/flows.js +++ b/src/store/module/flows.js @@ -190,7 +190,7 @@ const actions = { }) }, - async confirm ({commit}, {wrapper, desc}) { + async confirm ({commit}, {wrapper, title}) { let gitSettings = { gitUrl: wrapper.gitUrl, secret: wrapper.secret @@ -203,7 +203,7 @@ const actions = { console.log('[DONE]: confirmed') commit('add', new FlowWrapper(flow)) }, - {desc} + {title} ) } diff --git a/src/view/Flow/CreateDialog.vue b/src/view/Flow/CreateDialog.vue index 64c75593..2ec708d7 100644 --- a/src/view/Flow/CreateDialog.vue +++ b/src/view/Flow/CreateDialog.vue @@ -114,10 +114,10 @@ }, // step 2 - 2: (desc) => { + 2: (title) => { // send confirm this.loading = true - let payload = {wrapper: this.flow, desc} + let payload = {wrapper: this.flow, title} this.$store.dispatch(actions.flows.confirm, payload) .then(() => { this.onCancelClick() diff --git a/src/view/Flow/CreateSelectTemplate.vue b/src/view/Flow/CreateSelectTemplate.vue index 4b5fe100..bd49ea65 100644 --- a/src/view/Flow/CreateSelectTemplate.vue +++ b/src/view/Flow/CreateSelectTemplate.vue @@ -4,11 +4,44 @@ {{ $t('flow.create_git_hint') }} - - - - - + + + + + + + + + + + {{ getIcon() }} + + + + + + + + + + + + 0) { + title = this.templates[this.selected - 1].title } - this.onNextClick(desc) + this.onNextClick(title) } } } diff --git a/src/view/Job/DetailTabContext.vue b/src/view/Job/DetailTabContext.vue index 4cdc87a6..eb610420 100644 --- a/src/view/Job/DetailTabContext.vue +++ b/src/view/Job/DetailTabContext.vue @@ -34,7 +34,7 @@
{{ item.value }} - {{ item.value }} + {{ item.value }}