Merge branch 'settings-refactor' into shigusegubu
* settings-refactor: removed unused thing Replaced most trivial checkboxes with Checkbox component replace checkboxes in user-settings with Checkbox component Fix tests, more replacing with mergedConfig fixed default values for multi-choice configurations, should also fix warnings Removed all whole mess of manual watch/data declaration, now fully automatic created mergedConfig getter to avoid obnoxious checks for undefined everywhere
This commit is contained in:
commit
8e1fa16925
36 changed files with 402 additions and 650 deletions
|
|
@ -12,8 +12,8 @@ const generateInput = (value, padEmoji = true) => {
|
|||
},
|
||||
mocks: {
|
||||
$store: {
|
||||
state: {
|
||||
config: {
|
||||
getters: {
|
||||
mergedConfig: {
|
||||
padEmoji
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,14 @@ const actions = {
|
|||
}
|
||||
|
||||
const testGetters = {
|
||||
findUser: state => getters.findUser(state.users)
|
||||
findUser: state => getters.findUser(state.users),
|
||||
mergedConfig: state => ({
|
||||
colors: '',
|
||||
highlight: {},
|
||||
customTheme: {
|
||||
colors: []
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
const localUser = {
|
||||
|
|
@ -45,13 +52,6 @@ const externalProfileStore = new Vuex.Store({
|
|||
interface: {
|
||||
browserSupport: ''
|
||||
},
|
||||
config: {
|
||||
colors: '',
|
||||
highlight: {},
|
||||
customTheme: {
|
||||
colors: []
|
||||
}
|
||||
},
|
||||
instance: {
|
||||
hideUserStats: true
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue