diff --git a/package.json b/package.json index 038f69c..71eaf06 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "graphql": "^0.13.2", "graphql-tag": "^2.8.0", "gsap": "^2.0.2", - "immortal-db": "^1.0.2", "jquery": "^3.3.1", "js-cookie": "^2.2.0", "localforage": "^1.7.3", @@ -56,7 +55,6 @@ "vue-router": "^3.0.1", "vue-svgicon": "^3.1.0", "vue2-dragula": "^2.5.4", - "vuedraggable": "^2.17.0", "vuelidate": "^0.7.4", "vuex": "^3.0.1", "vuex-class": "^0.3.1", diff --git a/quasar.conf.js b/quasar.conf.js index 825fde4..01179fd 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -59,7 +59,7 @@ module.exports = function (ctx) { store: 'src/store/index.ts' }, // app plugins (/src/plugins) - plugins: ['i18n', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'vue-idb', 'vue2-dragula'], + plugins: ['i18n', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'vue-idb', 'dragula'], css: [ 'app.styl' ], diff --git a/src/App.ts b/src/App.ts index c74c846..c94a032 100644 --- a/src/App.ts +++ b/src/App.ts @@ -53,9 +53,11 @@ export default class App extends Vue { .then((loadstorage) => { if (loadstorage) { - if (UserStore.state.lang !== null) { + if (UserStore.state.lang !== '') { console.log('SETLOCALE :', this.$i18n.locale) this.$i18n.locale = UserStore.state.lang // Set Lang + } else { + UserStore.mutations.setlang(this.$i18n.locale) } console.log('lang CARICATO:', this.$i18n.locale) diff --git a/src/components/Header.vue b/src/components/Header.vue index 52b5ec4..9e51742 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -240,8 +240,8 @@ let my = this.getLangAtt() // this.$q.notify('prima: ' + String(my)) - let mylang = localStorage.getItem(rescodes.localStorage.lang) - if (mylang === null) + let mylang = rescodes.getItemLS(rescodes.localStorage.lang) + if (mylang === '') { if (navigator) { mylang = navigator.language @@ -252,7 +252,7 @@ console.log('IMPOSTA LANGMY', mylang) } - if (mylang !== null) { + if (mylang !== '') { if (mylang.toLowerCase() === 'enus') mylang = 'enUs' if ((mylang.toLowerCase() === 'eses') || (mylang.toLowerCase() === 'es-es')) diff --git a/src/components/todos/SingleTodo/SingleTodo.ts b/src/components/todos/SingleTodo/SingleTodo.ts index c07ee16..0ba02e8 100644 --- a/src/components/todos/SingleTodo/SingleTodo.ts +++ b/src/components/todos/SingleTodo/SingleTodo.ts @@ -151,6 +151,7 @@ export default class SingleTodo extends Vue { // console.log('classDescrEdit = ', this.classDescrEdit) // console.log('classDescr', this.classDescr) + // console.log('UserStore.state.lang', UserStore.state.lang) if (this.isTodo()) this.menuPopupTodo = rescodes.menuPopupTodo[UserStore.state.lang] else { diff --git a/src/components/todos/SingleTodo/SingleTodo.vue b/src/components/todos/SingleTodo/SingleTodo.vue index 2324d3d..62b2f6c 100644 --- a/src/components/todos/SingleTodo/SingleTodo.vue +++ b/src/components/todos/SingleTodo/SingleTodo.vue @@ -1,6 +1,6 @@