feat: Integrate new svg icons set + config wiz UI improvements

This commit is contained in:
NGPixel
2017-10-29 01:30:46 -04:00
parent 51cd37fd05
commit 72e3bacc2e
14 changed files with 233 additions and 137 deletions

View File

@@ -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)
})

View File

@@ -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'