area17#1307: Config store.

haringsrob · Jan 14, 2022 · 7c11343 · 7c11343
1 parent 684bbd0
commit 7c11343
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/frontend/js/store/modules/attributes.js b/frontend/js/store/modules/attributes.js
@@ -8,10 +8,7 @@ import Vue from 'vue'
 import { ATTRIBUTES } from '../mutations'
 
 const state = {
-  options: {
-    publishDate24Hr: window[process.env.VUE_APP_NAME].STORE.options.publishDate24Hr,
-    publishDateDisplayFormat: window[process.env.VUE_APP_NAME].STORE.options.publishDateDisplayFormat
-  }
+  options: {}
 }
 
 // getters

diff --git a/frontend/js/store/modules/config.js b/frontend/js/store/modules/config.js
@@ -0,0 +1,17 @@
+const state = {
+  publishDate24Hr: window[process.env.VUE_APP_NAME].STORE.config.publishDate24Hr,
+  publishDateDisplayFormat: window[process.env.VUE_APP_NAME].STORE.config.publishDateDisplayFormat
+}
+
+const getters = {}
+
+const mutations = {}
+
+const actions = {}
+
+export default {
+  state,
+  getters,
+  mutations,
+  actions
+}
diff --git a/frontend/js/utils/filters.js b/frontend/js/utils/filters.js
@@ -1,4 +1,4 @@
-import attributes from '@/store/modules/attributes'
+import config from '@/store/modules/config'
 import dateFormat from 'date-fns/format'
 
 import { locales, getCurrentLocale, getTimeFormatForCurrentLocale } from '@/utils/locale'
@@ -52,7 +52,7 @@ const filters = {
     return dateFormatLocale(value, format)
   },
   formatDatatableDate: function (value) {
-    const datepickerFormat = attributes.state.options.publishDateDisplayFormat
+    const datepickerFormat = config.state.publishDateDisplayFormat
     if (!value) value = new Date()
     return dateFormatLocale(value, datepickerFormat)
   },

diff --git a/views/layouts/main.blade.php b/views/layouts/main.blade.php
@@ -82,7 +82,7 @@
             window['{{ config('twill.js_namespace') }}'].twillLocalization = {!! json_encode($twillLocalization) !!};
             window['{{ config('twill.js_namespace') }}'].STORE = {};
             window['{{ config('twill.js_namespace') }}'].STORE.form = {};
-            window['{{ config('twill.js_namespace') }}'].STORE.options = {
+            window['{{ config('twill.js_namespace') }}'].STORE.config = {
                 publishDate24Hr: {{config('twill.publish_date_24h') ? 'true' : 'false'}},
                 publishDateDisplayFormat: '{{config('twill.publish_date_display_format')}}',
             };