feat: Integrate new svg icons set + config wiz UI improvements
This commit is contained in:
@@ -13,6 +13,7 @@ import { ApolloClient } from 'apollo-client'
|
||||
import { HttpLink } from 'apollo-link-http'
|
||||
import { InMemoryCache } from 'apollo-cache-inmemory'
|
||||
import store from './store'
|
||||
import icons from '../svg/nc-icons.svg'
|
||||
|
||||
// ====================================
|
||||
// Load Modules
|
||||
@@ -165,4 +166,10 @@ document.addEventListener('DOMContentLoaded', ev => {
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
// ====================================
|
||||
// Load Icons
|
||||
// ====================================
|
||||
|
||||
document.body.insertAdjacentHTML('beforeend', icons)
|
||||
})
|
||||
|
@@ -46,6 +46,7 @@ export default {
|
||||
gitAuthSSL: true,
|
||||
gitShowUserEmail: true,
|
||||
gitServerEmail: '',
|
||||
mongo: 'mongodb://',
|
||||
adminEmail: '',
|
||||
adminPassword: '',
|
||||
adminPasswordConfirm: ''
|
||||
@@ -82,6 +83,9 @@ export default {
|
||||
case 'admin':
|
||||
perc = '75%'
|
||||
break
|
||||
case 'upgrade':
|
||||
perc = '85%'
|
||||
break
|
||||
}
|
||||
return perc
|
||||
}
|
||||
@@ -195,6 +199,17 @@ export default {
|
||||
self.$validator.validateAll('admin')
|
||||
})
|
||||
},
|
||||
proceedToUpgrade: function (ev) {
|
||||
if (this.conf.upgrade) {
|
||||
this.state = 'upgrade'
|
||||
this.loading = false
|
||||
this.$nextTick(() => {
|
||||
this.$validator.validateAll('upgrade')
|
||||
})
|
||||
} else {
|
||||
this.proceedToFinal()
|
||||
}
|
||||
},
|
||||
proceedToFinal: function (ev) {
|
||||
let self = this
|
||||
self.state = 'final'
|
||||
|
Reference in New Issue
Block a user