diff --git a/src/App.scss b/src/App.scss index e085d76..6f6ae17 100644 --- a/src/App.scss +++ b/src/App.scss @@ -39,3 +39,8 @@ transform: translateX(1600px); } } + + +.my-notif-class{ + font-weight: bold; +} diff --git a/src/App.vue b/src/App.vue index c5327a0..5ccd927 100644 --- a/src/App.vue +++ b/src/App.vue @@ -17,6 +17,6 @@ - diff --git a/src/classes/routinestd.ts b/src/classes/routinestd.ts index 050c871..7e38386 100644 --- a/src/classes/routinestd.ts +++ b/src/classes/routinestd.ts @@ -12,10 +12,8 @@ export async function askConfirm($q: any, mytitle, mytext, ok, cancel) { title: mytitle }).then((ris) => { return true - // this.$q.notify('Agreed!') }).catch(() => { return false - // this.$q.notify('Disagreed...') }) } catch (e) { return false diff --git a/src/components/Header/Header.ts b/src/components/Header/Header.ts index 54d74b2..3040a58 100644 --- a/src/components/Header/Header.ts +++ b/src/components/Header/Header.ts @@ -99,7 +99,7 @@ export default class Header extends Vue { set lang(lang) { console.log('set lang(' + this.$i18n.locale) this.$i18n.locale = this.snakeToCamel(lang) - // this.$q.notify('IMPOSTA LANG= ' + this.$i18n.locale) + // tools.showNotif(this.$q, 'IMPOSTA LANG= ' + this.$i18n.locale) // console.log('IMPOSTA LANG= ' + this.$i18n.locale) UserStore.mutations.setlang(this.$i18n.locale) @@ -123,13 +123,6 @@ export default class Header extends Vue { public changeconn(value: string, oldValue: string) { this.strConn = value - - // this.$q.notify({ - // color : 'primary', - // icon: 'wifi', - // message: "CAMBIATOO! " + value - // }) - } @Watch('conndata_changed', { immediate: true, deep: true }) @@ -162,10 +155,9 @@ export default class Header extends Vue { const color = (value === 'online') ? 'positive' : 'warning' if (oldValue !== undefined) { - this.$q.notify({ + tools.showNotif(this.$q, this.$t('connection') + ` ${value}`, { color, - icon: 'wifi', - message: this.$t('connection') + ` ${value}` + icon: 'wifi' }) } @@ -235,7 +227,7 @@ export default class Header extends Vue { console.log('this.$q.i18n=', this.$q.i18n, 'this.$q.getLocale()=', this.$q.lang.isoName) const my = this.getLangAtt() - this.$q.notify('prima: ' + String(my)) + tools.showNotif(this.$q, 'prima: ' + String(my)) let mylang = tools.getItemLS(tools.localStorage.lang) if (mylang === '') { @@ -266,7 +258,6 @@ export default class Header extends Vue { this.setLangAtt(mylang) this.setshortlang(mylang) - // this.$q.notify('Dopo: ' + String(this.getLangAtt())) } diff --git a/src/components/categories/category/category.ts b/src/components/categories/category/category.ts index 5278fcd..5a48fba 100644 --- a/src/components/categories/category/category.ts +++ b/src/components/categories/category/category.ts @@ -3,6 +3,7 @@ import { Component, Watch } from 'vue-property-decorator' import { SingleCat } from '../SingleCat' import { ICategory } from '@src/model' +import { tools } from "@src/store/Modules/tools" @Component({ @@ -176,13 +177,10 @@ export default class Category extends Vue { const seldel = [...this.selectedSecond] if (this.deleteCategory(this.selectedSecond)) { - this.$q.notify({ + tools.showNotif(this.$q, `Deleted ` + (seldel.length.toString()) + ' item', { color: 'primary', icon: 'delete', - message: `Deleted ` + (seldel.length.toString()) + ' item' }) - - } } diff --git a/src/components/categories/tabledata/tabledata.ts b/src/components/categories/tabledata/tabledata.ts index b04297c..245d5a7 100644 --- a/src/components/categories/tabledata/tabledata.ts +++ b/src/components/categories/tabledata/tabledata.ts @@ -3,6 +3,7 @@ import { Component, Watch } from 'vue-property-decorator' import { ICategory } from '@src/model' import globalroutines from "@src/globalroutines" +import { tools } from "@src/store/Modules/tools" @Component({ }) @@ -172,10 +173,9 @@ export default class Tabledata extends Vue { const seldel = [...this.selectedSecond] if (this.deleteCategory(this.selectedSecond)) { - this.$q.notify({ + tools.showNotif(this.$q, `Deleted ` + (seldel.length.toString()) + ' item', { color: 'primary', - icon: 'delete', - message: `Deleted ` + (seldel.length.toString()) + ' item' + icon: 'delete' }) diff --git a/src/components/todos/SingleTodo/SingleTodo.ts b/src/components/todos/SingleTodo/SingleTodo.ts index e719dc9..7608192 100644 --- a/src/components/todos/SingleTodo/SingleTodo.ts +++ b/src/components/todos/SingleTodo/SingleTodo.ts @@ -450,7 +450,6 @@ export default class SingleTodo extends Vue { this.updateicon() } - // this.$q.notify('setPriority: ' + elem) } public async askConfirmDelete() { diff --git a/src/components/todos/todo/todo.ts b/src/components/todos/todo/todo.ts index bbb77bf..3a87cd0 100644 --- a/src/components/todos/todo/todo.ts +++ b/src/components/todos/todo/todo.ts @@ -321,13 +321,13 @@ export default class Todo extends Vue { } if (UserStore.state.userId === undefined) { - this.$q.notify(this.$t('todo.usernotdefined')) + tools.showNotif(this.$q, this.$t('todo.usernotdefined')) return } if (!this.isRegistered()) { // Not logged - this.$q.notify(this.$t('user.notregistered')) + tools.showNotif(this.$q, this.$t('user.notregistered')) return } @@ -341,7 +341,7 @@ export default class Todo extends Vue { console.log('data', data) if (data !== null) { - this.$q.notify(data) + tools.showNotif(this.$q, data) } // empty the field diff --git a/src/layouts/drawer/drawer.ts b/src/layouts/drawer/drawer.ts index 1b2a9f1..c0e5867 100644 --- a/src/layouts/drawer/drawer.ts +++ b/src/layouts/drawer/drawer.ts @@ -4,6 +4,7 @@ import { UserStore } from '@modules' import { GlobalStore } from '@modules' import Vue from 'vue' import { Component, Prop } from 'vue-property-decorator' +import { tools } from "@src/store/Modules/tools" const namespace: string = 'GlobalModule' @@ -46,7 +47,7 @@ export default class Drawer extends Vue { this.$router.replace('/') }, 1000) - this.$q.notify(this.$t('logout.uscito')) + tools.showNotif(this.$q, this.$t('logout.uscito'), {icon: 'exit_to_app'}) }) } } diff --git a/src/layouts/menuone/menuOne.vue b/src/layouts/menuone/menuOne.vue index 404be9d..a49328c 100644 --- a/src/layouts/menuone/menuOne.vue +++ b/src/layouts/menuone/menuOne.vue @@ -8,15 +8,15 @@