| Instance Id | Current Status | -Process State | Action |
|---|---|---|---|
| {{item.id}} | -
- |
|
+
-
|
-
+
| Instance Id | @@ -65,13 +59,14 @@ - - diff --git a/client/src/components/Schema.vue b/client/src/components/Schema.vue deleted file mode 100644 index 2843306..0000000 --- a/client/src/components/Schema.vue +++ /dev/null @@ -1,916 +0,0 @@ - - -
|---|
+
+ Create Template
+
+
+ View Template
+
-
-
-
-
-
-
diff --git a/client/src/components/erow_mappinglist.vue b/client/src/components/erow_mappinglist.vue
deleted file mode 100644
index 7acc902..0000000
--- a/client/src/components/erow_mappinglist.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/client/src/components/expand-process.vue b/client/src/components/expand-process.vue
deleted file mode 100644
index 7a31e73..0000000
--- a/client/src/components/expand-process.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/client/src/components/gridmanager.vue b/client/src/components/gridmanager.vue
deleted file mode 100644
index d5548e9..0000000
--- a/client/src/components/gridmanager.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client/src/components/mycustom.vue b/client/src/components/mycustom.vue
deleted file mode 100644
index 563d418..0000000
--- a/client/src/components/mycustom.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- My ALSKAJS
-
-
-
-
-
-
-
diff --git a/client/src/components/subscription.vue b/client/src/components/subscription.vue
index e99a622..6da42d9 100644
--- a/client/src/components/subscription.vue
+++ b/client/src/components/subscription.vue
@@ -6,8 +6,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client/src/layout/SideBar.vue b/client/src/layout/SideBar.vue
deleted file mode 100644
index 1772393..0000000
--- a/client/src/layout/SideBar.vue
+++ /dev/null
@@ -1,812 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/client/src/layout/user/Common.vue b/client/src/layout/user/Common.vue
deleted file mode 100644
index e2febc6..0000000
--- a/client/src/layout/user/Common.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client/src/layout/user/CommonHeader.vue b/client/src/layout/user/CommonHeader.vue
deleted file mode 100644
index fe6320f..0000000
--- a/client/src/layout/user/CommonHeader.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
diff --git a/client/src/layout/user/Footer.vue b/client/src/layout/user/Footer.vue
deleted file mode 100644
index 710a73b..0000000
--- a/client/src/layout/user/Footer.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
-
- 2011-2018 © Flowz
-
-
\ No newline at end of file
diff --git a/client/src/layout/user/Header.vue b/client/src/layout/user/Header.vue
deleted file mode 100644
index 4e93ec1..0000000
--- a/client/src/layout/user/Header.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
diff --git a/client/src/layout/user/Master.vue b/client/src/layout/user/Master.vue
deleted file mode 100644
index a794b00..0000000
--- a/client/src/layout/user/Master.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/client/src/layout/user/SideBar.vue b/client/src/layout/user/SideBar.vue
deleted file mode 100644
index b1ba40d..0000000
--- a/client/src/layout/user/SideBar.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-
-
-
-
-
-
-
diff --git a/client/src/main.js b/client/src/main.js
index 0692319..57058f8 100644
--- a/client/src/main.js
+++ b/client/src/main.js
@@ -10,10 +10,10 @@ import routes from './router'
import store from './store'
import config from '@/config'
-import BootstrapVue from 'bootstrap-vue'
-import 'bootstrap/dist/css/bootstrap.css'
-import 'bootstrap-vue/dist/bootstrap-vue.css'
-Vue.use(BootstrapVue)
+// import BootstrapVue from 'bootstrap-vue'
+// import 'bootstrap/dist/css/bootstrap.css'
+// import 'bootstrap-vue/dist/bootstrap-vue.css'
+// Vue.use(BootstrapVue)
// import CellRender from '@/components/cellRender'
// Vue.use(CellRender)
@@ -43,11 +43,6 @@ const vueFeathers = require('vue-feathers')
// And plug it in]
Vue.use(vueFeathers, feathers)
-import ElementUI from 'element-ui'
-import element from 'element-ui/src/locale/lang/en'
-import 'element-ui/lib/theme-default/index.css'
-Vue.use(ElementUI, { element })
-
/* vueTinymce */
import vueTinymce from '@deveodk/vue-tinymce'
// You need a specific loader for CSS files like https://github.com/webpack/css-loader
@@ -103,10 +98,6 @@ var router = new VueRouter({
}
})
-// iView.LoadingBar.config({
-// color: '#5cb85c',
-// height: 5
-// })
iView.LoadingBar.config({
color: '#5cb85c',
failedColor: '#f0ad4e',
@@ -119,17 +110,11 @@ import psl from 'psl'
router.beforeEach((to, from, next) => {
iView.LoadingBar.start()
iView.LoadingBar.config({ color: '#0e406d' })
- // window.console.log('Transition', transition)
- // router.app.$store.state.token
- let obId = false
+ // window.console.log('Transition', transition)
+ // router.app.$store.state.token
let location = psl.parse(window.location.hostname) // get parent domain
location = location.domain === null ? location.input : location.domain
- if (to.query.ob_id) {
- // let location = psl.parse(window.location.hostname) // get parent domain
- // location = location.domain === null ? location.input : location.domain
- // router.app.$cookie.set('auth_token', to.query.ob_id, { expires: 1, domain: location })
- obId = to.query.ob_id
- }
+
if (to.query.token) {
router.app.$cookie.set('auth_token', to.query.token, { expires: 1, domain: location })
}
@@ -141,164 +126,36 @@ router.beforeEach((to, from, next) => {
} else {
delete axios.defaults.headers.common['authorization']
}
- if (to.matched.some(record => record.meta.requiresAuth) && obId) {
- next({
- path: '/email-verification',
- query: { ob_id: obId }
- })
- } else if (to.matched.some(record => record.meta.requiresAuth) && (!token || token === 'null')) {
+
+ if (to.matched.some(record => record.meta.requiresAuth) && (!token || token === 'null' || store.state.token === undefined)) {
next({
path: '/login'
// query: { redirect: to.fullPath }
})
} else {
if (to.matched.some(record => record.meta.requiresAuth) || (to.path === '/login')) {
- // console.log('Hereeeeeeee', to.path)
- // to.matched.some(record => {
- // console.log(record.meta.role)
- // })
- store.dispatch('authenticate', token).then(response => {
- // console.log('authenticate', response)
- // if (store.state.subscription !== '' && store.state.subscription !== null) {
- if (response.hasOwnProperty('package')) {
- // if (response.package[store.state.subscription] === undefined) {
- if (store.state.subscription !== '' && store.state.subscription !== undefined) {
- if (response.package[store.state.subscription].role === 'admin') {
- store.commit('SET_ROLE', 1)
- // next({
- // path: '/admin/dashboard'
- // })
- } else {
- store.commit('SET_ROLE', 2)
- // next({
- // path: '/'
- // })
- }
+ store.dispatch('authenticateToken', token).then(response => {
+ // get user role
+ if (to.path !== '/') {
+ if (to.matched.find(record => record.meta.role).meta.role.indexOf(parseInt(store.state.role)) === -1) {
+ next({
+ path: '/'
+ })
} else {
- if (response.hasOwnProperty('defaultSubscriptionId')) {
- store.state.subscription = response.defaultSubscriptionId
- if (response.package[store.state.subscription].role === 'admin') {
- store.commit('SET_ROLE', 1)
- // next({
- // path: '/admin/dashboard'
- // })
- } else {
- store.commit('SET_ROLE', 2)
- // next({
- // path: '/'
- // })
- }
- }
+ next()
}
- // }
} else {
- store.commit('SET_ROLE', 2)
- }
- // }
-
- store.commit('SET_USER', response)
- // get user role
- if (to.matched.some(record => record.meta.role)) {
- // console.log('1')
- // if (store.state.subscription !== '' && store.state.subscription !== null) {
- // console.log('2')
- // if (response.hasOwnProperty('package')) {
- // console.log('3')
- // if (response.package[store.state.subscription].role === 'admin') {
- // console.log('4')
- // store.commit('SET_ROLE', 1)
- // // next({
- // // path: '/admin/dashboard'
- // // })
- // } else {
- // console.log('5')
- // store.commit('SET_ROLE', 2)
- // // next({
- // // path: '/'
- // // })
- // }
- // } else {
- // console.log('6')
- // store.commit('SET_ROLE', 2)
- // // next({
- // // path: '/'
- // // })
- // }
- // } else {
- // // console.log('7')
- // store.commit('SET_ROLE', 2)
- // // next({
- // // path: '/'
- // // })
- // }
- // store.dispatch('getUser', response.email).then(user => {
- // if (user) {
- // console.log('8')
- if (store.state.role !== null) {
- // store.commit('SET_ROLE', 2)
- // console.log('9')
- // if (to.matched.find(record => record.meta.role).meta.role.indexOf(parseInt(store.state.role)) === -1) {
- // console.log('10')
- // next({
- // path: '/login'
- // // query: { redirect: to.fullPath }
- // })
- // // next()
- // } else {
- // console.log('11')
- // next()
- // }
- // next({
- // path: parseInt(store.state.role) === 1 ? '/admin/dashboard' : '/'
- // })
- // console.log('.........', to.path, store.state.role)
- if (to.path === '/') {
- if (store.state.role === 1) {
- next({
- path: '/admin/dashboard'
- })
- } else {
- next({
- path: '/dashboard'
- })
- }
- } else {
- if (to.matched.find(record => record.meta.role).meta.role.indexOf(parseInt(store.state.role)) === -1) {
- next({
- path: '/'
- })
- } else {
- next()
- }
- }
+ if (store.state.role === 1) {
+ next({
+ path: '/admin/dashboard'
+ })
} else {
- // console.log('12')
- store.commit('SET_ROLE', 2)
next({
- path: '/'
+ path: '/dashboard'
})
}
- // } else {
- // next()
- // }
- // }).catch(error => {
- // console.log(error)
- // // window.console.log('Not authenticated')
- // next({
- // path: '/login'
- // // query: { redirect: to.fullPath }
- // })
- // })
- } else {
- // console.log('13')
- next({
- path: (to.path === '/login') ? (parseInt(store.state.role) === 1 ? '/admin/dashboard' : '/') : to.path
- })
- // next()
}
- }).catch(error => {
- console.log(error.message)
- // window.console.log('Not authenticated')
+ }).catch(() => {
router.app.$cookie.delete('auth_token', { domain: location })
store.commit('SET_TOKEN', null)
store.commit('SET_USER', null)
@@ -306,23 +163,12 @@ router.beforeEach((to, from, next) => {
if (to.path !== '/login') {
next({
path: '/login'
- // query: { redirect: to.fullPath }
})
} else {
next()
}
})
} else {
- // console.log('16')
- // let path = token ? ((to.path === '/login') ? (parseInt(store.state.role) === 1 ? '/admin/dashboard' : '/') : to.path) : '/login'
- // console.log(path)
- // path: (token ? ((to.path === '/login') ? (parseInt(store.state.role) === 1 ? '/admin/dashboard' : '/') : to.path) : '/login')
-
- // console.log('login ===> ')
- // next({
- // path: '/login'
- // })
-
next()
}
}
@@ -334,6 +180,7 @@ router.afterEach(route => {
sync(store, router)
// console.log('process.env.accesskey', process.env.accesskey)
+
new Vue({
el: '#app',
router,
diff --git a/client/src/masterLayout/Header.vue b/client/src/masterLayout/Header.vue
index d9e7c2b..ffd8e46 100644
--- a/client/src/masterLayout/Header.vue
+++ b/client/src/masterLayout/Header.vue
@@ -23,6 +23,12 @@
Home
-->
+
-
-
-
-
-
{{subItem.name}}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client/src/pages/approval/MailReply.vue b/client/src/pages/approval/MailReply.vue
deleted file mode 100644
index 5f8bbcb..0000000
--- a/client/src/pages/approval/MailReply.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/client/src/pages/approval/New.vue b/client/src/pages/approval/New.vue
deleted file mode 100644
index 85619ee..0000000
--- a/client/src/pages/approval/New.vue
+++ /dev/null
@@ -1,332 +0,0 @@
-
- Confirm Approval
-Notes : {{notes}}
- --
-
- {{item}} -
-
-
-
-
-
-
diff --git a/client/src/pages/approval/PropertyManage.vue b/client/src/pages/approval/PropertyManage.vue
deleted file mode 100644
index 34afd21..0000000
--- a/client/src/pages/approval/PropertyManage.vue
+++ /dev/null
@@ -1,549 +0,0 @@
-
-
-
- Approver
-
-
-
-
-
-
-
- Sunday
-
-
-
- Monday
-
-
-
- Tuesday
-
-
-
- Wednesday
-
-
-
- Thursday
-
-
-
- Friday
-
-
-
- Saturday
-
-
-
- Days
-
- In-Time
-
- Out-Time
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client/src/pages/approval/expand-FormReply.vue b/client/src/pages/approval/expand-FormReply.vue
deleted file mode 100644
index 32267c3..0000000
--- a/client/src/pages/approval/expand-FormReply.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-
- | Role/Title | -Emails | -
|---|---|
| {{item.role}} | -{{item.email}} |
-
-
-
- Tracking
-
-
-
-
-
-
-
- To : {{row.tracking.to}}
-
-
- CC : {{row.tracking.cc}}
-
-
- BCC : {{row.tracking.bcc}}
-
-
-
-
- Final Notification
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client/src/pages/dbSettings/List.vue b/client/src/pages/dbSettings/List.vue
deleted file mode 100644
index 2507e34..0000000
--- a/client/src/pages/dbSettings/List.vue
+++ /dev/null
@@ -1,672 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/client/src/pages/dbSettings/New.vue b/client/src/pages/dbSettings/New.vue
deleted file mode 100644
index 415ba46..0000000
--- a/client/src/pages/dbSettings/New.vue
+++ /dev/null
@@ -1,317 +0,0 @@
-
-
-
-
-
-
-
diff --git a/client/src/pages/flow/FlowOverview.vue b/client/src/pages/flow/FlowOverview.vue
deleted file mode 100644
index 9011ce4..0000000
--- a/client/src/pages/flow/FlowOverview.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-
- Add New Connection
- -
- Flowz Overview
-
-
-
-
-
-
-
diff --git a/client/src/pages/flow/List.vue b/client/src/pages/flow/List.vue
index fb14ee6..82b558e 100644
--- a/client/src/pages/flow/List.vue
+++ b/client/src/pages/flow/List.vue
@@ -11,8 +11,7 @@
-
-
@@ -23,8 +22,7 @@
-
-
{{titleCase(selectedFlowName)}}
+{{titleCase(selectedFlowName)}}
| {{ getTitle(field) }} @@ -32,10 +30,14 @@ | ||||||||||||
| - {{ item.serviceName }} + {{selectedFlowObject.processList[titleCase(item.service)].name}} + |
-
-
-
-
-
-
-
-
diff --git a/client/src/pages/flow/permissions.vue b/client/src/pages/flow/permissions.vue
index 4cfe333..aceb65e 100644
--- a/client/src/pages/flow/permissions.vue
+++ b/client/src/pages/flow/permissions.vue
@@ -34,7 +34,7 @@
- {{ getName(item.service) }}
+
|
| |
