-
-
-
+
+
+
-
+
+
+
+
-
-
-
+
@@ -38,7 +39,7 @@
-
+
@@ -63,7 +64,7 @@ import SshRsaEditor from '@/components/Common/SshRsaEditor'
import AuthEditor from '@/components/Common/AuthEditor'
import TokenEditor from '@/components/Common/TokenEditor'
import AndroidSignEditor from '@/components/Settings/AndroidSignEditor'
-import KubeConfigEditor from '@/components/Settings/KubeConfigEditor'
+import DataEditor from '@/components/Settings/DataEditor'
import SaveBtn from '@/components/Settings/SaveBtn'
import BackBtn from '@/components/Settings/BackBtn'
import TextBox from '@/components/Common/TextBox'
@@ -73,11 +74,11 @@ import {
CategoriesSelection,
CATEGORY_ANDROID_SIGN,
CATEGORY_AUTH,
+ CATEGORY_KUBE_CONFIG,
CATEGORY_SSH_RSA,
- CATEGORY_TOKEN,
- CATEGORY_KUBE_CONFIG
+ CATEGORY_TOKEN
} from '@/util/secrets'
-import { secretAndConfigNameRules } from '@/util/rules'
+import {secretAndConfigNameRules} from '@/util/rules'
export default {
name: 'SettingsSecretNew',
@@ -90,7 +91,7 @@ export default {
SaveBtn,
BackBtn,
AndroidSignEditor,
- KubeConfigEditor
+ DataEditor
},
data() {
return {
@@ -186,30 +187,23 @@ export default {
name: this.name
}
+ let action = ''
+
if (this.isSshRsa) {
payload.publicKey = this.instance.pair.publicKey
payload.privateKey = this.instance.pair.privateKey
- this.$store.dispatch(actions.secrets.createRsa, payload).then(() => {
- this.onBackClick()
- })
- return
+ action = actions.secrets.createRsa
}
if (this.isAuth) {
payload.username = this.instance.pair.username
payload.password = this.instance.pair.password
- this.$store.dispatch(actions.secrets.createAuth, payload).then(() => {
- this.onBackClick()
- })
- return
+ action = actions.secrets.createAuth
}
if (this.isToken) {
payload.token = this.instance.token.data
- this.$store.dispatch(actions.secrets.createToken, payload).then(() => {
- this.onBackClick()
- })
- return
+ action = actions.secrets.createToken
}
if (this.isAndroidSign) {
@@ -221,22 +215,19 @@ export default {
payload.keyStore = this.instance.keyStore
payload.option = option
-
- this.$store.dispatch(actions.secrets.createAndroidSign, payload).then(() => {
- this.onBackClick()
- })
-
- return
+ action = actions.secrets.createAndroidSign
}
if (this.isKubeconfig) {
payload.content = this.instance.content.data
- this.$store.dispatch(actions.secrets.createKubeConfig, payload).then(() => {
- this.onBackClick()
- }).catch((e) => {
- this.error = e.message
- })
+ action = actions.secrets.createKubeConfig
}
+
+ this.$store.dispatch(action, payload).then(() => {
+ this.onBackClick()
+ }).catch((e) => {
+ this.error = e.message
+ })
}
}
}
diff --git a/src/view/Settings/System/Index.vue b/src/view/Settings/System/Index.vue
index 5cdb8f4c..09a02fcf 100644
--- a/src/view/Settings/System/Index.vue
+++ b/src/view/Settings/System/Index.vue
@@ -1,23 +1,30 @@
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
@@ -25,8 +32,8 @@
import SaveBtn from '@/components/Settings/SaveBtn'
import TextBox from '@/components/Common/TextBox'
import actions from '@/store/actions'
-import { mapState } from 'vuex'
-import { httpUrl, required } from '@/util/rules'
+import {mapState} from 'vuex'
+import {httpUrl, required} from '@/util/rules'
export default {
name: "SystemSettingsHome",
@@ -60,7 +67,7 @@ export default {
}
this.$store.dispatch(actions.settings.save, this.settings).then(() => {
- this.showSnackBar("Saved")
+ this.showSnackBar("Saved")
})
}
}
diff --git a/src/view/Settings/Trigger/DeliveryTable.vue b/src/view/Settings/Trigger/DeliveryTable.vue
new file mode 100644
index 00000000..4efff87c
--- /dev/null
+++ b/src/view/Settings/Trigger/DeliveryTable.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+ | {{ timeFormat(item.timestamp) }} |
+
+ mdi-check-circle
+ mdi-close-circle-outline
+ |
+
+
+ mdi-dots-horizontal
+
+ |
+
+
+
+
+
+
+
+ {{ dialogText }}
+
+
+
+
+ {{ $t('close') }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/view/Settings/Trigger/Edit.vue b/src/view/Settings/Trigger/Edit.vue
new file mode 100644
index 00000000..223431c4
--- /dev/null
+++ b/src/view/Settings/Trigger/Edit.vue
@@ -0,0 +1,213 @@
+
+
+
+ Settings
+ Recent Deliveries
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Error: {{ error }}
+
+
+
+
+
+
+
+
+
+
+ Delete the trigger {{ obj.name }}?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/view/Settings/Trigger/EmailSettings.vue b/src/view/Settings/Trigger/EmailSettings.vue
new file mode 100644
index 00000000..82886ac0
--- /dev/null
+++ b/src/view/Settings/Trigger/EmailSettings.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/view/Settings/Trigger/Index.vue b/src/view/Settings/Trigger/Index.vue
new file mode 100644
index 00000000..d4564576
--- /dev/null
+++ b/src/view/Settings/Trigger/Index.vue
@@ -0,0 +1,99 @@
+
+
+
+
+ | {{ item.name }} |
+
+ {{ item.event }}
+ |
+
+ {{ getCategory(item).icon }}
+ {{ getCategory(item).name }}
+ |
+ {{ timeFormatInMins(item.createdAt) }} |
+ {{ item.createdBy }} |
+
+
+ mdi-pencil
+
+ |
+
+
+
+
+
+
+ mdi-alert-outline
+ Click '+' to create a trigger
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/view/Settings/Trigger/KeyValueTable.vue b/src/view/Settings/Trigger/KeyValueTable.vue
new file mode 100644
index 00000000..b2d2712c
--- /dev/null
+++ b/src/view/Settings/Trigger/KeyValueTable.vue
@@ -0,0 +1,123 @@
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+ mdi-plus
+
+
+ mdi-minus
+
+ |
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/view/Settings/Trigger/New.vue b/src/view/Settings/Trigger/New.vue
new file mode 100644
index 00000000..6a9fe333
--- /dev/null
+++ b/src/view/Settings/Trigger/New.vue
@@ -0,0 +1,163 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Error: {{ error }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/view/Settings/Trigger/WebhookSettings.vue b/src/view/Settings/Trigger/WebhookSettings.vue
new file mode 100644
index 00000000..7d6c419f
--- /dev/null
+++ b/src/view/Settings/Trigger/WebhookSettings.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Params
+ Headers
+ Body
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file