@@ -60,6 +60,12 @@ export default {
handleClickOutside() {
this.$store.dispatch('app/closeSideBar', { withoutAnimation: false });
},
+ hideSidebar() {
+ if (this.$route.path === '/project' || this.$route.path.startsWith('/scmapp') ) {
+ return true
+ }
+ return false
+ }
},
};
diff --git a/web/src/router/index.js b/web/src/router/index.js
index 281ced69..62eedc35 100644
--- a/web/src/router/index.js
+++ b/web/src/router/index.js
@@ -4,6 +4,7 @@ import backend from '../api/backend';
import store from '@/store';
import Layout from '@/layout'
import projectRouter from './modules/projectRouter'
+import scmAppRouter from './modules/scmAppRouter'
import { projectDetailRouter } from './modules/projectDetailRouter'
import { getToken } from '@/utils/auth' // get token from cookie
@@ -33,6 +34,7 @@ let constantRoutes = [
component: () => import('../views/Logout.vue')
},
projectRouter,
+ scmAppRouter
];
constantRoutes = constantRoutes.concat(projectDetailRouter())
@@ -80,6 +82,12 @@ export const asyncRoutes = [
name: 'serviceIntegrate',
meta: { title: '服务集成', noCache: true }
},
+ {
+ path: '/settings/smcintegrate',
+ component: () => import('@/views/setting/ScmIntegrate.vue'),
+ name: 'scmIntegrate',
+ meta: { title: '代码源集成', noCache: true }
+ },
{
path: '/settings/task',
component: () => import('@/views/setting/Node.vue'),
@@ -200,11 +208,9 @@ router.beforeEach((to, from, next) => {
if (data && data.user) {
store.dispatch('user/setUserInfo', data);
- // TODO: dynamically add accessible routes
// generate accessible routes map based on roles
const accessRoutes = generateRoutes(data.admin)
-
// dynamically add accessible routes
router.addRoutes(accessRoutes)
@@ -260,6 +266,8 @@ export function getUserSibeBarRoutes(routerPath) {
routers = projectDetailRouter()
} else if (routerPath === '/' || routerPath === '/project') {
routers = [projectRouter]
+ } else if (routerPath === '/scmapp') {
+ routers = [scmAppRouter]
} else {
console.log(routerPath)
}
diff --git a/web/src/router/modules/projectDetailRouter.js b/web/src/router/modules/projectDetailRouter.js
index 7b8a107d..125ffc6d 100644
--- a/web/src/router/modules/projectDetailRouter.js
+++ b/web/src/router/modules/projectDetailRouter.js
@@ -28,20 +28,6 @@ export function projectDetailRouter() {
meta: { title: '应用代码', noCache: true},
component: () => import('@/views/project/ProjectApp.vue'),
},
- {
- path: '/project/addApp/:projectID',
- name: 'addApp',
- meta: { title: '新增应用', noCache: true },
- component: () => import('@/views/project/detail/ProjectAppAdd.vue'),
- hidden: true
- },
- {
- path: '/project/projectAppDetail/:projectID/:appId/:tabs',
- name: 'projectAppDetail',
- meta: { title: '代码仓库详情', noCache: true },
- component: () => import('@/views/project/detail/ProjectAppDetail.vue'),
- hidden: true
- },
]
},
{
@@ -63,13 +49,6 @@ export function projectDetailRouter() {
component: () => import('@/views/project/detail/ProjectCIDetail.vue'),
hidden: true
},
- {
- path: '/project/projectPubDetail/:projectID/:jobName/:runId/:stageId',
- name: 'projectPubDetail',
- meta: { title: '日志详情', noCache: true },
- component: () => import('@/views/project/detail/ProjectPubDetail.vue'),
- hidden: true
- },
]
},
{
diff --git a/web/src/router/modules/scmAppRouter.js b/web/src/router/modules/scmAppRouter.js
new file mode 100644
index 00000000..6e5f0d58
--- /dev/null
+++ b/web/src/router/modules/scmAppRouter.js
@@ -0,0 +1,29 @@
+import Layout from '@/layout'
+
+const scmAppRouter = {
+ path: '/scmapps',
+ component: Layout,
+ redirect: '/scmapp',
+ name: 'scmapp',
+ meta: {
+ title: '我的应用',
+ icon: 'chart'
+ },
+ children: [
+ {
+ path: '/scmapp',
+ name: 'scmappIndex',
+ component: () => import('@/views/scmapp/Scmapp.vue'),
+ meta: { title: '我的应用', noCache: true }
+ },
+ {
+ path: '/scmapp/:appId',
+ name: 'scmAppDetail',
+ meta: { title: '应用详情', noCache: true },
+ component: () => import('@/views/scmapp/detail/AppDetail.vue'),
+ hidden: true
+ },
+ ],
+}
+
+export default scmAppRouter
diff --git a/web/src/views/Login.vue b/web/src/views/Login.vue
index ce03a810..e820cff1 100644
--- a/web/src/views/Login.vue
+++ b/web/src/views/Login.vue
@@ -141,7 +141,6 @@ export default {
// console.log('go catch ...')
// })
backend.login(this.loginForm, (response) => {
- // TODO: set token
setToken(response.token)
// backend.setCookie("Authorization", response.token, 1800)
console.log(this.redirect)
diff --git a/web/src/views/project/ProjectApp.vue b/web/src/views/project/ProjectApp.vue
index f855d386..208004f3 100644
--- a/web/src/views/project/ProjectApp.vue
+++ b/web/src/views/project/ProjectApp.vue
@@ -51,21 +51,16 @@
- +{{$t('bm.deployCenter.addRepository')}}
+ +{{$t('bm.deployCenter.addRepository')}}
-
-
- {{scope.row.name}}
-
-
-
+
+
-
-
+
{{scope.row.path}}
@@ -73,43 +68,50 @@
-
- {{$t('bm.deployCenter.appOrchestration')}}
-
-
- {{$t('bm.deployCenter.branchManage')}}
+
+ {{$t('bm.deployCenter.appOrchestration')}}
+
+
+ {{$t('bm.deployCenter.edit')}}
+
+
+ {{$t('bm.deployCenter.delete')}}
+
+
+ {{$t('bm.deployCenter.details')}}
+
+
