Merge branch 'develop' into feature/hash-routed

1 files changed, 19 insertions, 4 deletions

diff --git a/src/main.js b/src/main.js
index 830aa02c..17aeb863 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,10 +12,11 @@ import UserProfile from './components/user_profile/user_profile.vue'
 import statusesModule from './modules/statuses.js'
 import usersModule from './modules/users.js'
 import apiModule from './modules/api.js'
+import configModule from './modules/config.js'
 
 import VueTimeago from 'vue-timeago'
 
-import StyleSetter from './services/style_setter/style_setter.js'
+import createPersistedState from 'vuex-persistedstate'
 
 Vue.use(Vuex)
 Vue.use(VueRouter)
@@ -26,12 +27,19 @@ Vue.use(VueTimeago, {
   }
 })
 
+const persistedStateOptions = {
+  paths: ['users.users']
+}
+
 const store = new Vuex.Store({
   modules: {
     statuses: statusesModule,
     users: usersModule,
-    api: apiModule
-  }
+    api: apiModule,
+    config: configModule
+  },
+  plugins: [createPersistedState(persistedStateOptions)],
+  strict: process.env.NODE_ENV !== 'production'
 })
 
 const routes = [
@@ -60,4 +68,11 @@ new Vue({
   components: { App }
 })
 
-StyleSetter.setStyle('/static/css/base16-solarized-light.css')
+window.fetch('/static/config.json')
+  .then((res) => res.json())
+  .then(({name, theme, background, logo}) => {
+    store.dispatch('setOption', { name: 'name', value: name })
+    store.dispatch('setOption', { name: 'theme', value: theme })
+    store.dispatch('setOption', { name: 'background', value: background })
+    store.dispatch('setOption', { name: 'logo', value: logo })
+  })