From 04a9ce2232a0f4f5bd0d4b2e7931a0fe1be765cf Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Thu, 2 Sep 2021 03:22:13 +0200 Subject: [PATCH] continua upgrade Vue 3 --- .eslintrc.js | 4 +- package.json | 34 +- src/boot/i18n.ts | 7 +- src/components/CMyAvatar/CMyAvatar.scss | 4 + src/components/CMyAvatar/CMyAvatar.ts | 62 + src/components/CMyAvatar/CMyAvatar.vue | 17 + src/components/CMyAvatar/index.ts | 1 + src/components/CMyCart/CMyCart.scss | 18 + src/components/CMyCart/CMyCart.ts.old | 55 + src/components/CMyCart/CMyCart.vue.old | 46 + src/components/CMyCart/index.ts | 1 + src/components/Header/Header.ts | 62 +- src/components/Header/Header.vue | 38 +- src/components/index.ts | 1 + src/db/lang/ws_it.js | 96 +- src/globalroutines/index.ts | 2 +- .../toolbar/messagePopover/messagePopover.ts | 2 - src/mixins/mixin-users.ts | 256 +- src/model/Products.ts | 6 +- src/model/Todos.ts | 2 +- src/root/home/home.vue | 16 +- src/store/Api/Instance.ts | 3 +- src/store/MessageStore.ts | 173 + src/store/Modules/tools.ts | 2949 ++++++++++++++++- src/store/Products.ts | 382 +++ src/store/Projects.ts | 558 ++++ src/store/Todos.ts | 501 +++ src/store/UserStore.ts | 22 +- src/store/globalStore.ts | 18 +- src/store/testStore.ts | 10 +- yarn.lock | 990 +++--- 31 files changed, 5615 insertions(+), 721 deletions(-) create mode 100755 src/components/CMyAvatar/CMyAvatar.scss create mode 100755 src/components/CMyAvatar/CMyAvatar.ts create mode 100755 src/components/CMyAvatar/CMyAvatar.vue create mode 100755 src/components/CMyAvatar/index.ts create mode 100755 src/components/CMyCart/CMyCart.scss create mode 100755 src/components/CMyCart/CMyCart.ts.old create mode 100755 src/components/CMyCart/CMyCart.vue.old create mode 100755 src/components/CMyCart/index.ts create mode 100755 src/store/MessageStore.ts create mode 100755 src/store/Products.ts create mode 100755 src/store/Projects.ts create mode 100755 src/store/Todos.ts diff --git a/.eslintrc.js b/.eslintrc.js index 4691c4d1..8d8e506b 100755 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -32,9 +32,9 @@ module.exports = { // https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin#usage // ESLint typescript rules - // 'plugin:@typescript-eslint/recommended', + 'plugin:@typescript-eslint/recommended', // consider disabling this class of rules if linting takes too long - // 'plugin:@typescript-eslint/recommended-requiring-type-checking', + 'plugin:@typescript-eslint/recommended-requiring-type-checking', // Uncomment any of the lines below to choose desired strictness, // but leave only one uncommented! diff --git a/package.json b/package.json index 07b3d61c..bfec1b97 100755 --- a/package.json +++ b/package.json @@ -17,38 +17,38 @@ "generate-sw": "workbox generateSW workbox-config.js" }, "dependencies": { - "@quasar/extras": "^1.10.11", + "@quasar/extras": "^1.10.12", "@types/googlemaps": "^3.43.3", "@types/vuelidate": "^0.7.15", - "@vue/compat": "^3.2.6", - "@vue/compiler-sfc": "^3.2.6", + "@vue/compat": "^3.2.7", + "@vue/compiler-sfc": "^3.2.7", "@vue/eslint-config-standard": "^6.1.0", "acorn": "^8.4.1", - "autoprefixer": "^10.3.2", + "autoprefixer": "^10.3.3", "axios": "^0.21.1", "bcrypt-nodejs": "0.0.3", "bcryptjs": "^2.4.3", - "core-js": "^3.16.2", + "core-js": "^3.17.1", "date-fns": "^2.23.0", "dotenv": "^10.0.0", "element-ui": "^2.15.5", "eslint-plugin-quasar": "^1.0.0", - "graphql": "^15.5.1", + "graphql": "^15.5.2", "graphql-tag": "^2.12.5", "gsap": "^3.7.1", "jquery": "^3.6.0", - "js-cookie": "^3.0.0", + "js-cookie": "^3.0.1", "localforage": "^1.10.0", "lodash": "^4.17.21", "normalize.css": "^8.0.1", - "npm": "^7.21.0", + "npm": "^7.21.1", "nprogress": "^0.2.0", - "pinia": "^2.0.0-beta.5", + "pinia": "^2.0.0-rc.6", "prerender-spa-plugin": "^3.4.0", "quasar": "^2.0.4", "quasar-extras": "^2.0.9", "register-service-worker": "^1.7.2", - "vee-validate": "^3.4.11", + "vee-validate": "^3.4.12", "vue": "^3.1.0", "vue-class-component": "^8.0.0-rc.1", "vue-i18n": "^9.1.7", @@ -72,20 +72,20 @@ "@types/dotenv": "^8.2.0", "@types/jest": "^27.0.1", "@types/js-cookie": "^2.2.7", - "@types/node": "^16.7.1", + "@types/node": "^16.7.10", "@types/nprogress": "^0.2.0", - "@typescript-eslint/eslint-plugin": "^4.29.3", - "@typescript-eslint/parser": "^4.29.3", + "@typescript-eslint/eslint-plugin": "^4.30.0", + "@typescript-eslint/parser": "^4.30.0", "eslint": "^7.32.0", "eslint-config-airbnb-base": "^14.2.1", "eslint-config-airbnb-typescript": "^14.0.0", - "eslint-plugin-import": "^2.24.1", - "eslint-plugin-vue": "^7.16.0", + "eslint-plugin-import": "^2.24.2", + "eslint-plugin-vue": "^7.17.0", "eslint-webpack-plugin": "^3.0.1", "file-loader": "^6.2.0", "html-webpack-plugin": "^5.3.2", "http-proxy-middleware": "^2.0.1", - "jest": "^27.0.6", + "jest": "^27.1.0", "json-loader": "^0.5.7", "node-sass": "^6.0.1", "npm-check-updates": "^11.8.3", @@ -98,7 +98,7 @@ "tslint": "^6.1.3", "tslint-config-standard": "^9.0.0", "tslint-loader": "^3.5.4", - "typescript": "^4.3.5", + "typescript": "^4.4.2", "vue-cli-plugin-element-ui": "^1.1.4", "vueify": "^9.4.1", "workbox-cli": "^6.2.4", diff --git a/src/boot/i18n.ts b/src/boot/i18n.ts index 219b12e5..37064aa3 100755 --- a/src/boot/i18n.ts +++ b/src/boot/i18n.ts @@ -1,4 +1,5 @@ -import { createI18n } from 'vue-i18n' +// @ts-ignore +import { createI18n } from 'vue-i18n/dist/vue-i18n.esm-bundler' import messages from '../statics/i18n' import { boot } from 'quasar/wrappers' // you'll need to create the src/i18n/index.js file too @@ -15,9 +16,7 @@ export default ({ app }: { app: any }) => { export function useI18n() { // eslint-disable-next-line @typescript-eslint/unbound-method - const { - t, te, tm, rt, d, n, ...globalApi - } = i18n.global; + const { t, te, tm, rt, d, n, ...globalApi } = i18n.global; return { t: t.bind(i18n), diff --git a/src/components/CMyAvatar/CMyAvatar.scss b/src/components/CMyAvatar/CMyAvatar.scss new file mode 100755 index 00000000..b892863a --- /dev/null +++ b/src/components/CMyAvatar/CMyAvatar.scss @@ -0,0 +1,4 @@ +.myflex{ + display: flex; + flex: 1; +} diff --git a/src/components/CMyAvatar/CMyAvatar.ts b/src/components/CMyAvatar/CMyAvatar.ts new file mode 100755 index 00000000..a1fb6afd --- /dev/null +++ b/src/components/CMyAvatar/CMyAvatar.ts @@ -0,0 +1,62 @@ +import { defineComponent, onMounted, ref, watch } from 'vue' +import { useUserStore } from '@store/UserStore' + +export default defineComponent({ + name: 'CMyAvatar', + props: { + myimg: { + type: String, + required: false, + default: '', + }, + size: { + type: String, + required: false, + default: '40px', + }, + }, + + setup(props) { + + let myicon = ref('') + let myimgint = ref('') + + const userStore = useUserStore() + const imgprofile = ref(userStore.my.profile.img) + + function refresh() { + if (!props.myimg) { + myicon.value = 'fas fa-user-circle' + } else { + myimgint.value = props.myimg + } + // console.log('myimgint', this.myimgint) + } + + watch( + imgprofile, + // @ts-ignore + (value: string, oldValue: string) => { + userStore.my.profile.img = value + refresh() + }, + ) + + + watch( + // @ts-ignore + props.myimg, + // @ts-ignore + (value: string, oldValue: string) => { + myimgint.value = '' + refresh() + }, + ) + + onMounted(refresh) + + return { + myimgint, + } + }, +}) diff --git a/src/components/CMyAvatar/CMyAvatar.vue b/src/components/CMyAvatar/CMyAvatar.vue new file mode 100755 index 00000000..c2056b9c --- /dev/null +++ b/src/components/CMyAvatar/CMyAvatar.vue @@ -0,0 +1,17 @@ + + + + + diff --git a/src/components/CMyAvatar/index.ts b/src/components/CMyAvatar/index.ts new file mode 100755 index 00000000..5acf57dc --- /dev/null +++ b/src/components/CMyAvatar/index.ts @@ -0,0 +1 @@ +export { default as CMyAvatar } from './CMyAvatar.vue' diff --git a/src/components/CMyCart/CMyCart.scss b/src/components/CMyCart/CMyCart.scss new file mode 100755 index 00000000..240850ac --- /dev/null +++ b/src/components/CMyCart/CMyCart.scss @@ -0,0 +1,18 @@ +.card .product-image { + height: 300px; +} + +html, body { + margin:0; + padding:0; + height:100%; +} + +.text-title { + font-size: 0.9rem; +} + +.centeritems{ + place-content: center; +} + diff --git a/src/components/CMyCart/CMyCart.ts.old b/src/components/CMyCart/CMyCart.ts.old new file mode 100755 index 00000000..c43377e4 --- /dev/null +++ b/src/components/CMyCart/CMyCart.ts.old @@ -0,0 +1,55 @@ +import { Component, Prop, Watch } from 'vue-property-decorator' +import { tools } from '../../store/Modules/tools' +import MixinBase from '@src/mixins/mixin-base' +import { CTitleBanner } from '@components' +import { CCardState } from '../CCardState' +import { CCopyBtn } from '../CCopyBtn' + +import { IOrder, IProduct } from '@src/model' +import { CSingleCart } from '../../components/CSingleCart' +import MixinUsers from '@src/mixins/mixin-users' +import { computed, defineComponent, ref } from "vue" +import { useGlobalStore } from "@store/globalStore" + +@Component({ + name: 'CMyCart', + components: { CTitleBanner, CCardState, CCopyBtn, CSingleCart } +}) + +export default defineComponent({ + name: 'CMyCart', + props: {}, + + setup() { + const globalStore = useGlobalStore() + + const myCart = computed(() => Products.cart) + const myTotalPrice = computed(() => { + if (Products.cart) { + return Products.cart.totalPrice + } else { + return 0 + } + }) + + const ordersCart = computed(() => { + if (!!Products.cart) { + return Products.cart.items + } else { + return null + } + }) + + const numOrders = computed(() => { + if (!!Products.cart) { + return Products.cart.items.length + } else { + return 0 + } + }) + + + function closecart() { + globalStore.rightCartOpen = false + } +} diff --git a/src/components/CMyCart/CMyCart.vue.old b/src/components/CMyCart/CMyCart.vue.old new file mode 100755 index 00000000..517c7983 --- /dev/null +++ b/src/components/CMyCart/CMyCart.vue.old @@ -0,0 +1,46 @@ + + + + + diff --git a/src/components/CMyCart/index.ts b/src/components/CMyCart/index.ts new file mode 100755 index 00000000..e2236d14 --- /dev/null +++ b/src/components/CMyCart/index.ts @@ -0,0 +1 @@ +export { default as CMyCart } from './CMyCart.vue' diff --git a/src/components/Header/Header.ts b/src/components/Header/Header.ts index 26ac4b53..5570805f 100755 --- a/src/components/Header/Header.ts +++ b/src/components/Header/Header.ts @@ -9,20 +9,22 @@ import { shared_consts } from '@src/common/shared_vuejs' import { useI18n } from '@src/boot/i18n' import { boot } from 'quasar/wrappers' import { useRouter } from 'vue-router' -import MixinUsers from '../../mixins/mixin-users' import { static_data } from '../../db/static_data' import messagePopover from '../../layouts/toolbar/messagePopover/messagePopover.vue' import drawer from '../../layouts/drawer/drawer.vue' +import CMyAvatar from '../../components/CMyAvatar/CMyAvatar' import { toolsext } from '@store/Modules/toolsext' import { useGlobalStore } from '@store/globalStore' import { useTestStore } from '@store/testStore' import { useUserStore } from '@store/UserStore' +import MixinUsers from '../../mixins/mixin-users' + + export default defineComponent({ name: 'Header', - mixins: [MixinUsers], components: { - drawer, messagePopover, // CSigninNoreg, CMyAvatar, CMyCart + drawer, messagePopover, CMyAvatar, // CSigninNoreg, CMyCart }, props: { extraContent: { @@ -36,7 +38,6 @@ export default defineComponent({ }, setup() { - const store = inject('store') const $q = useQuasar() const { t } = useI18n() @@ -59,6 +60,27 @@ export default defineComponent({ const stateconn = ref(globalStore.stateConnection) + const { + getUsernameChatByMsg, + getMyUsername, + Username, + myName, + mySurname, + myCell, + Verificato, + MadeGift, + Email, + getMyImg, + getMyImgforIcon, + getImgByMsg, + getUserByUsername, + getImgByUsername, + isValidUsername, + getNumMsg, + getNumMsgUnread, + getMsgText, + paotest } = MixinUsers(); + function isonline() { return globalStore.stateConnection === 'online' } @@ -82,8 +104,7 @@ export default defineComponent({ } function getcolormenu() { - // @ts-ignore - return this.isSocio ? 'green-7' : 'white' + return isSocio.value ? 'green-7' : 'white' } function isTutor() { @@ -267,7 +288,7 @@ export default defineComponent({ registration.unregister() } }) - window.location.reload(true) + window.location.reload() } function changeIconConn() { @@ -432,13 +453,13 @@ export default defineComponent({ onMounted(mounted) return { - store, static_data, globalStore, leftDrawerOpen, rightDrawerOpen, rightCartOpen, lang, + langshort, isLogged, isEmailVerified, getnumOrdersCart, @@ -453,6 +474,31 @@ export default defineComponent({ imglogo, getappname, toggleanimation, + getClassColorHeader, + getcart, + getnumItemsCart, + isTutor, + isZoomeri, + isTratuttrici, + getUsernameChatByMsg, + getMyUsername, + Username, + myName, + mySurname, + myCell, + Verificato, + MadeGift, + Email, + getMyImg, + getMyImgforIcon, + getImgByMsg, + getUserByUsername, + getImgByUsername, + isValidUsername, + getNumMsg, + getNumMsgUnread, + getMsgText, + paotest, } }, diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue index e3212a09..a44a5da5 100755 --- a/src/components/Header/Header.vue +++ b/src/components/Header/Header.vue @@ -104,13 +104,13 @@ @@ -123,14 +123,14 @@ round dense flat to="/orderinfo" icon="fas fa-list-ol"> - - {{ getnumOrdersCart }} + + {{ getnumOrdersCart() }} + class="q-mx-xs" v-if="static_data.functionality.SHOW_USER_MENU && isLogged()" round dense flat + @click="rightDrawerOpen = !rightDrawerOpen" :icon="getMyImgforIcon()" :color="getcolormenu()"> @@ -159,7 +159,7 @@ class="absolute-top-right" style="margin-right: 10px; color: white;" dense flat round icon="close" @click="rightCartOpen = !rightCartOpen"> -
Carrello +
Carrello
@@ -180,22 +180,22 @@ dense flat round icon="close" @click="rightDrawerOpen = !rightDrawerOpen"> -
{{ Username }} - {{ myName }} +
{{ Username() }} - {{ myName() }}
-
Admin
+
Admin
Socio
-
Residente
-
Consiglio
-
Segreteria
-
Tutor
-
Editor
+
Residente
+
Consiglio
+
Segreteria
+
Tutor
+
Editor
-
+
{{ t('user.loggati') }}
-
{{ +
{{ t('components.authentication.email_verification.verify_email') }}
@@ -203,7 +203,7 @@ -
+
{{ t('pages.profile') }} {{ t('login.esci') }} @@ -211,7 +211,7 @@
-
+
@@ -221,7 +221,7 @@
-
+
diff --git a/src/components/index.ts b/src/components/index.ts index 3b72a8ee..5fa22770 100755 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -1,5 +1,6 @@ export * from './logo' export * from './CMyPage' +export * from './CMyAvatar' export * from './CTitle' export * from './CImgTitle' export * from './BannerCookies' diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js index 834701e9..92ce554e 100755 --- a/src/db/lang/ws_it.js +++ b/src/db/lang/ws_it.js @@ -95,13 +95,14 @@ const msg_website_it = { hours: 'Ore', }, msg: { - myAppDescription: '', - keywords_base: '', + myAppName: 'FreePlanet', + myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito e senza Pubblicità', + underconstruction: 'App in costruzione...', myDescriz: '', sottoTitoloApp: 'Il primo Vero Social', - sottoTitoloApp2: '', - sottoTitoloApp3: '', - sottoTitoloApp4: '', + sottoTitoloApp2: 'Libero, Equo e Solidale', + sottoTitoloApp3: 'dove Vive Consapevolezza e Aiuto Comunitario', + sottoTitoloApp4: 'Gratuito e senza Pubblicità', }, homepage: { descrapp_title1: 'Uniti per Evolvere e Sperimentare', @@ -111,11 +112,86 @@ const msg_website_it = { descrapp_pag2: 'E\' giunta l\'ora di utilizzare i nuovi strumenti Tecnologici a nostro favore, per Liberarci ' + 'così piano piano dalla schiavitù del "Lavoro per generare Denaro" e trasformando le nostre Capacitá in ' + 'Risorse Umane per poterci sostenere e vivere in Armonia con gli altri.', - nostra_missione: 'Nostra Missione', - associazione: '', - tit_come_associarsi: 'Come Associarsi', - testo_come_associarsi: '', - titlecontatti: 'CONTATTI', + freesocial: { + title: 'Free Social', + descr: 'Una Community organizzata per Categorie, dove potrai unirti a Gruppi Tematici, ' + + 'Condividere Esperienze e unire Competenze per organizzare e sostenere Progetti Innovativi per il Popolo.

' + + 'Verranno evidenziati sviluppi Etici come l\'Auto-Produzione, la Sostenibilitá, ' + + 'la Buona Salute Naturale e il Rispetto per l\'Ambiente e per tutti gli Esseri Viventi di questo ' + + 'Pianeta. Chiunque potrá esprimere il proprio Consenso o Dissenso partecipando a Sondaggi Interattivi' + + ' e realizzare insieme i Cambiamenti necessari alla nostra Società.', + }, + freetalent: { + title: 'Free Talent', + descr: 'Condividi i tuoi Talenti e Abilità, ' + + 'al posto del denaro guadagnagnerai Tempo.
' + + '"1 ora" diventa moneta di scambio, uguale per tutti.
' + + 'Potrai utilizzare questi tuoi "Crediti Tempo" per soddisfare le tue necessità, cercando nelle Competenze Disponibili.
' + + 'Nel Dare e Ricevere, si creeranno così legami di Amicizia, Solidarietà, Cooperazione e Divertimento

' + + 'Questo progetto vuole diffondere, ora in maniera informatizzata, questa realtà che gia esiste da tanti anni, e viene chiamata "Banca del Tempo". ' + + 'Le segreterie sparse in tutto il mondo, serviranno a dare maggiore affidabilità e fiducia negli scambi di talenti tra persone sconosciute. ' + + 'Creeremo così una rete di fiducia nel vicinato, come giá viene praticato in numerosi Ecovillaggi e Comunità del mondo.', + }, + freegas: { + title: 'Free G.A.S.', + descr: 'Ti piacerebbe utilizzare una App che ti permetta facilmente di acquistare Prodotti Locali direttamente dal Produttore?
' + + 'Con i Gruppi di Acquisto Solidale si evitano intermediazioni inutili, ottenendo parecchi benefici tra cui:
' + + '
  • Qualitá Superiore del prodotto
    • ' + + '
  • Le Recensioni dei consumatori favoriranno i Produttori con Sani Intenti
    • ' + + '
  • Possiblità d\'interagire con il Produttore
    • ' + + '
  • Apertura alle Relazioni tra persone, condividendo Ricette e Consigli preziosi
    • ' + + '
  • Risparmio di soldi (prezzi all\'Ingrosso)
    • ' + + '
  • Valorizzare il Territorio e l\'Economia Locale
    • ' + + '
  • Condizioni Eque per i Lavoratori
    • ' + + '
  • Ridotto Impatto Ambientale
', + }, + freeliving: { + title: 'Free Co-Living', + descr: 'Unire più realtà, condividendo l\'esperienza di abitare insieme, per un periodo definito:
' + + '1) C\'è chi Vive solo ed ha una casa.
' + + '2) Chi ha bisogno di un alloggio temporaneo.

' + + 'Oggi sempre più persone abitano da sole e vorrebbero continuare a vivere nella propria abitazione.
' + + 'Altre persone invece hanno bisogno di una stanza, per scelta o per necessita, ed in cambio sono disponibili a ' + + 'contribuire alle spese per le utenze domestiche o magari aiutare la persona a fare la spesa, cucinare, pulire casa oppure offrendogli semplicemente compagnia.

' + + 'Tramite questo strumento, le persone potranno trovarsi, mettersi in contatto e decidere in che forma co-abitare e per quanto tempo. Le recensioni rilasciate ed il dettaglio dei profili utenti, ' + + 'aiuterà nella scelta della persona più in sintonia.', + + }, + freecollabora: { + title: 'Chi può Collaborare?', + descr: 'Tutti coloro che sono in linea con Princìpi Etici e ricerca del Benessere Globale del Pianeta
' + + 'Pertanto sono i benvenuti:' + + '
    ' + + '
  • Associazioni no-profit, Ecovillaggi, Comunità
    • ' + + '
  • Gruppi che intendono promuovere Progetti Sociali Innovativi per una Decrescita Felice
    • ' + + '
  • Chi gestisce un Gruppo di Acquisto Solidale (G.A.S.)
    • ' + + '
  • Produttori Locali Etici
    • ' + + '
  • Chi gestisce una Banca del Tempo
    • ' + + '
  • Chiunque voglia partecipare, nella forma che ritiene più opportuna.
    • ' + + '
', + }, + freesostieni: { + title: 'Come Sostenere il progetto?', + descr: '
    ' + + '
  • Condividendolo a tutti coloro che vogliono far parte insieme della crescita e sviluppo di una Nuova Era
    • ' + + '
  • Rispondendo ai Sondaggi Popolari e lasciando Feedback
    • ' + + '
  • Tramite una donazione (anche 1€ ) per le spese.
    ' + + '
' + + 'Vedo un futuro dove non si utilizzerà più denaro. Dove le persone si aiuteranno a vicenda e non avranno bisogno di "possedere" cose, ma le condivideranno con gli altri.
', + }, + multiplatform: { + title: 'Multi-piattaforma', + descr: 'E\' compatibile con Google Chrome, Firefox, Safari, iOS, Android e PC. L\'Applicazione s\'installa facilmente, senza passare dallo store. ' + + 'basta condividere il nome del sito www.freeplanet.app.
' + + 'Dopo la registrazione chiederà di aggiungerlo alla lista delle applicazioni e sullo sfondo', + }, + free: { + title: 'Gratuita, Open Source e Niente Pubblicità', + descr: 'Questa App non è in vendita, non ha scopi commerciali, non ha prezzo ed appartiene al Popolo del Nuovo Mondo.
Chiunque potrá utilizzarla e beneficiarne.
A me il compito di gestirla e proteggerla. ' + + 'Verranno accettate solo donazioni Libere di privati ed Associazioni no-profit, in linea con i Principi, che serviranno per coprire le spese.
' + + 'Grazie a Tutti per il sostegno. ', + }, + contacts: 'Contatti', }, }; diff --git a/src/globalroutines/index.ts b/src/globalroutines/index.ts index 41dea926..75a74ca7 100755 --- a/src/globalroutines/index.ts +++ b/src/globalroutines/index.ts @@ -3,7 +3,7 @@ import { idbKeyval as storage } from '@src/js/storage' -export default async (context: any, cmd: string, table: string, data: any = null, id = '') => { +export default async (cmd: string, table: string, data: any = null, id = '') => { // const globalStore = useGlobalStore() // const descr = data !== null ? data.descr : '' diff --git a/src/layouts/toolbar/messagePopover/messagePopover.ts b/src/layouts/toolbar/messagePopover/messagePopover.ts index 1afcaa7d..3c14cffc 100755 --- a/src/layouts/toolbar/messagePopover/messagePopover.ts +++ b/src/layouts/toolbar/messagePopover/messagePopover.ts @@ -15,8 +15,6 @@ const namespace = 'MessageModule' export default defineComponent({ name: 'MessagePopover', - mixins: [MixinUsers], - setup(props) { const $router = useRouter() // function lasts_messages (state: IUserState) => IMessage[] { diff --git a/src/mixins/mixin-users.ts b/src/mixins/mixin-users.ts index 665a41fa..2e28a4b2 100755 --- a/src/mixins/mixin-users.ts +++ b/src/mixins/mixin-users.ts @@ -1,153 +1,167 @@ -import { Vue, Options } from 'vue-class-component' -import { defineComponent, ref } from 'vue' - import { IMessage } from '@src/model' import { useUserStore } from '@store/UserStore' import { useGlobalStore } from '@store/globalStore' -import { tools } from '../store/Modules/tools' -import { func_tools } from '../store/Modules/toolsext' // You can declare a mixin as the same style as components. -export default defineComponent({ - name: 'MixinUsers', - setup(props) { - function getUserByUsername(username: string) { - const userStore = useUserStore() - return userStore.getNameSurnameByUsername(username) - } +export default function () { + function getUserByUsername(username: string) { + const userStore = useUserStore() + return userStore.getNameSurnameByUsername(username) + } - function getImgByUsername(username: string) { - const userStore = useUserStore() - return `public/${userStore.getImgByUsername(username)}` - } + function getImgByUsername(username: string) { + const userStore = useUserStore() + return `public/${userStore.getImgByUsername(username)}` + } - function isValidUsername(username: string) { - return username && username !== 'nessuno' && username !== 'none' - } + function isValidUsername(username: string) { + return username && username !== 'nessuno' && username !== 'none' + } - function getMyUsername() { - const userStore = useUserStore() - return userStore.my.username - } + function getMyUsername() { + const userStore = useUserStore() + return userStore.my.username + } - function getUsernameChatByMsg(msg: IMessage) { - if (msg) { - if (msg.dest) { - if (msg.dest.username !== getMyUsername()) return msg.dest.username - return msg.origin ? msg.origin.username : {} - } - } else { - return '' + function getUsernameChatByMsg(msg: IMessage) { + if (msg) { + if (msg.dest) { + if (msg.dest.username !== getMyUsername()) return msg.dest.username + return msg.origin ? msg.origin.username : {} } + } else { return '' } + return '' + } - function getnumItemsCart(): any { - // ++Todo: conv - /* const arrcart = Products.cart - if (!!arrcart) { - if (!!arrcart.items) { - // @ts-ignore - const total = arrcart.items.reduce((sum, item) => sum + item.order.quantity, 0) - return total - } - } */ - return 0 - } + function getnumItemsCart(): any { + // ++Todo: conv + /* const arrcart = Products.cart + if (!!arrcart) { + if (!!arrcart.items) { + // @ts-ignore + const total = arrcart.items.reduce((sum, item) => sum + item.order.quantity, 0) + return total + } + } */ + return 0 + } - function getImgByMsg(msg: IMessage) { - const userStore = useUserStore() - // @ts-ignore - return `public/${userStore.getImgByUsername(this.getUsernameChatByMsg(msg))}` - } + function getImgByMsg(msg: IMessage) { + const userStore = useUserStore() + // @ts-ignore + return `public/${userStore.getImgByUsername(this.getUsernameChatByMsg(msg))}` + } - function getMyImg() { - const userStore = useUserStore() - const ris = userStore.getImgByUsername(userStore.my.username) - return (ris !== '') ? `public/${ris}` : '' - } + function getMyImg() { + const userStore = useUserStore() + const ris = userStore.getImgByUsername(userStore.my.username) + return (ris !== '') ? `public/${ris}` : '' + } - function getMyImgforIcon() { - const userStore = useUserStore() - const ris = userStore.getImgByUsername(userStore.my.username) - return (ris !== '') ? `img:public/${ris}` : 'fas fa-user' - } + function getMyImgforIcon() { + const userStore = useUserStore() + const ris = userStore.getImgByUsername(userStore.my.username) + return (ris !== '') ? `img:public/${ris}` : 'fas fa-user' + } - function getIconCart() { - const iconcart = 'fas fa-shopping-cart' + function getIconCart() { + const iconcart = 'fas fa-shopping-cart' - return iconcart - } + return iconcart + } - function MenuCollapse() { - const globalStore = useGlobalStore() - return globalStore.menuCollapse - // return true - } + function MenuCollapse() { + const globalStore = useGlobalStore() + return globalStore.menuCollapse + // return true + } - function Username() { - const userStore = useUserStore() - return userStore.my.username - } + function Username() { + const userStore = useUserStore() + return userStore.my.username + } - function myName() { - const userStore = useUserStore() - return userStore.my.name - } + function myName() { + const userStore = useUserStore() + return userStore.my.name + } - function mySurname() { - const userStore = useUserStore() - return userStore.my.surname - } + function mySurname() { + const userStore = useUserStore() + return userStore.my.surname + } - function myCell() { - const userStore = useUserStore() - return userStore.my.profile.cell - } + function myCell() { + const userStore = useUserStore() + return userStore.my.profile.cell + } - function Verificato() { - const userStore = useUserStore() - return userStore.my.verified_email - } + function Verificato() { + const userStore = useUserStore() + return userStore.my.verified_email + } - function MadeGift() { - const userStore = useUserStore() - return userStore.my.made_gift - } + function paotest() { + return 'Ciaoooooooooooooooo!' + } - function Email() { - const userStore = useUserStore() - return userStore.my.email - } + function MadeGift() { + const userStore = useUserStore() + return userStore.my.made_gift + } - function getNumMsg() { - // ++Todo: conv - /* - return MessageStore.getlasts_messages().length - */ + function Email() { + const userStore = useUserStore() + return userStore.my.email + } - return 0 - } + function getNumMsg() { + // ++Todo: conv + /* + return MessageStore.getlasts_messages().length + */ - function getNumMsgUnread() { - // return userStore.getlasts_messages().length - // ++Todo: conv - // return MessageStore.getnumMsgUnread() - return 0 - } + return 0 + } - function getMsgText(msg: IMessage, inarray: boolean) { - let add = '' - if (msg.origin && msg.origin.username === getMyUsername()) add = 'Tu: ' + function getNumMsgUnread() { + // return userStore.getlasts_messages().length + // ++Todo: conv + // return MessageStore.getnumMsgUnread() + return 0 + } - const ris = add + msg.message - if (inarray) return [ris] - return ris - } + function getMsgText(msg: IMessage, inarray: boolean) { + let add = '' + if (msg.origin && msg.origin.username === getMyUsername()) add = 'Tu: ' - return { - getUsernameChatByMsg, - getMyUsername, - } - }, -}) + const ris = add + msg.message + if (inarray) return [ris] + return ris + } + + return { + getUsernameChatByMsg, + getMyUsername, + Username, + myName, + mySurname, + myCell, + Verificato, + MadeGift, + Email, + getMyImg, + getMyImgforIcon, + getImgByMsg, + getnumItemsCart, + getUserByUsername, + getImgByUsername, + isValidUsername, + getNumMsg, + getNumMsgUnread, + getMsgText, + paotest, + } +} diff --git a/src/model/Products.ts b/src/model/Products.ts index 4488d157..fa71d49a 100755 --- a/src/model/Products.ts +++ b/src/model/Products.ts @@ -3,8 +3,8 @@ export interface IProduct { active?: boolean idProducer?: string, idStorehouses?: string[], - producer?: IProducer, - storehouses?: IStorehouse[], + producer: IProducer, + storehouses: IStorehouse[], code?: string, name?: string, description?: string, @@ -25,7 +25,7 @@ export interface IProduct { } export interface IBaseOrder { - order?: IOrder + order: IOrder } export interface IOrder { diff --git a/src/model/Todos.ts b/src/model/Todos.ts index ba75d094..d99b7812 100755 --- a/src/model/Todos.ts +++ b/src/model/Todos.ts @@ -50,7 +50,7 @@ export interface IDrag { export interface ITodosState { showtype: number - todos: {} + todos: any categories: string[] // todos_changed: number reload_fromServer: number diff --git a/src/root/home/home.vue b/src/root/home/home.vue index 3c166863..2676fab6 100755 --- a/src/root/home/home.vue +++ b/src/root/home/home.vue @@ -50,7 +50,7 @@
-
+
@@ -64,7 +64,7 @@
-
+
@@ -141,7 +141,7 @@
-
+
@@ -155,7 +155,7 @@
-
+
@@ -236,7 +236,7 @@
-
+
@@ -250,7 +250,7 @@
-
+
@@ -392,10 +392,10 @@
- + - + diff --git a/src/store/Api/Instance.ts b/src/store/Api/Instance.ts index 6d2615a5..07fde841 100755 --- a/src/store/Api/Instance.ts +++ b/src/store/Api/Instance.ts @@ -1,6 +1,5 @@ import axios, { AxiosInstance, AxiosResponse } from 'axios' // import LoginModule from '../Modules/Auth/LoginStore' -import router from '@router' import { tools } from '@src/store/Modules/tools' import { toolsext } from '@src/store/Modules/toolsext' import { serv_constants } from '@src/store/Modules/serv_constants' @@ -122,7 +121,7 @@ async function Request(type: string, path: string, payload: any): Promise { globalStore.connData.uploading_server = (globalStore.connData.uploading_server === 1) ? -1 : globalStore.connData.uploading_server globalStore.connData.downloading_server = (globalStore.connData.downloading_server === 1) ? -1 : globalStore.connData.downloading_server diff --git a/src/store/MessageStore.ts b/src/store/MessageStore.ts new file mode 100755 index 00000000..4925ae9c --- /dev/null +++ b/src/store/MessageStore.ts @@ -0,0 +1,173 @@ +import Api from '@api' +import { storeBuilder } from './Store/Store' + +import { serv_constants } from '../Modules/serv_constants' +import { toolsext } from '@src/store/Modules/toolsext' +import { GlobalStore, UserStore, Todos, Projects, CalendarStore } from '@store' + +import { IMessage, IMessageState, StatusMessage } from '../../model' +import { tools } from '@src/store/Modules/tools' +import { MsgDefault } from '@src/model' +import { shared_consts } from '@src/common/shared_vuejs' + +// State +const state: IMessageState = { + last_msgs: [], + users_msg: [] + // last_update: [] +} + +const b = storeBuilder.module('MessageModule', state) + +namespace Getters { + + const getlasts_messages = b.read((mystate: IMessageState) => (): IMessage[] => { + const ctrec = (mystate.last_msgs) ? mystate.last_msgs.slice(0, 5) : [] + // const ctrec = (mystate.msgs) ? mystate.msgs.slice().reverse().slice(0, 5) : [] + return (ctrec) + + }, 'getlasts_messages') + + const getnumMsgUnread = b.read((mystate: IMessageState) => () => { + return mystate.last_msgs.filter((msg) => !msg.read).length + }, 'getnumMsgUnread') + + export const getters = { + get getlasts_messages() { + return getlasts_messages() + }, + get getnumMsgUnread() { + return getnumMsgUnread() + } + } + +} + +namespace Mutations { + export const mutations = { + } +} + +function setMsg(arrmsg: IMessage[], username) { + // console.log('arrmsg', arrmsg) + if (arrmsg.length > 0) { + let users_msg = state.users_msg.find((rec) => rec.username === username) + if (!users_msg) { + state.users_msg.push({ username, msgs: [] }) + users_msg = state.users_msg.find((rec) => rec.username === username) + } + users_msg.msgs.push(...arrmsg) + // console.table(users_msg.msgs) + + // users_msg.msgs = tools.getUnique(users_msg.msgs, '_id') + // console.table(users_msg.msgs) + + if (users_msg.msgs) { + let userother = users_msg.msgs.slice(-1)[0].dest.username + if (userother === UserStore.state.my.username) + userother = users_msg.msgs.slice(-1)[0].origin.username + + let index = state.last_msgs.findIndex((rec) => (rec.dest.username === userother) || (rec.origin.username === userother)) + if (index >= 0) { + // Update last message + state.last_msgs[index] = users_msg.msgs.slice(-1)[0] + } else { + state.last_msgs.push(users_msg.msgs.slice(-1)[0]) + index = state.last_msgs.findIndex((rec) => (rec.dest.username === userother) || (rec.origin.username === userother)) + } + if (state.last_msgs[index]) + users_msg.lastdataread = state.last_msgs[index].datemsg + else + users_msg.lastdataread = tools.getLastDateReadReset() + + } else { + users_msg.lastdataread = tools.getLastDateReadReset() + } + + // console.log('RICeVUTO', arrmsg, 'lastdataread', users_msg.lastdataread) + // console.log('state.users_msg', users_msg) + } +} + +namespace Actions { + + async function updateMsgDataFromServer(context, { username, lastdataread } ) { + // console.log('updateMsgDataFromServer', username, lastdataread) + + return await Api.SendReq(`/sendmsg/${username}/${lastdataread}/${process.env.APP_ID}`, 'GET', null) + .then((res) => { + // console.log('res', res) + if (res.status === 200) { + setMsg(res.data.arrmsg, username) + return true + } + return false + }) + .catch((error) => { + console.error(error) + return false + }) + + } + + async function SendMsgEvent(context, msg: IMessage) { + console.log('SendMsgEvent', msg) + + const data: IMessage = { ...MsgDefault, ...msg} + + data.source.page = '' + data.idapp = process.env.APP_ID + data.origin.idapp = process.env.APP_ID + data.origin.username = UserStore.state.my.username + data.datemsg = tools.getDateNow() + data.status = StatusMessage.WaitingToSend + // Options + data.options = tools.SetBit(data.options, shared_consts.MessageOptions.Notify_ByEmail) + data.options = tools.SetBit(data.options, shared_consts.MessageOptions.Notify_ByPushNotification) + + // console.log('DOPO:') + // console.table(data) + + return await Api.SendReq('/sendmsg', 'POST', data) + .then((res) => { + // console.log('res', res) + if (res.status === 200) { + if (res.data.code === serv_constants.RIS_CODE_OK) { + data._id = res.data.id + + const myarr = [] + myarr.push(data) + + setMsg(myarr, data.dest.username) + return true + } + } + return false + }) + .catch((error) => { + console.error(error) + return false + }) + + } + + export const actions = { + updateMsgDataFromServer: b.dispatch(updateMsgDataFromServer), + SendMsgEvent: b.dispatch(SendMsgEvent) + } + +} + +const stateGetter = b.state() + +// Module +const MessageModule = { + get state() { + return stateGetter() + }, + actions: Actions.actions, + getters: Getters.getters, + mutations: Mutations.mutations +} + +export default MessageModule diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index e55ea6cb..1956eef7 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -1,11 +1,22 @@ import { translation } from '@store/Modules/translation' import { - IEvents, IPathFile, Privacy, TipoVisu, + IColl, + ICollaborations, + IEvents, + IListRoutes, + IParamDialog, + IPathFile, + IProject, ITimeLineEntry, + ITimeLineMain, + ITodo, + IUserFields, + Privacy, + TipoVisu, } from '@model' import { lists } from '@store/Modules/lists' import { costanti } from '@store/Modules/costanti' -import { date, Screen, useQuasar } from 'quasar' +import { date, Screen } from 'quasar' import { toolsext } from '@store/Modules/toolsext' import { preloadedimages, static_data } from '@src/db/static_data' @@ -13,6 +24,14 @@ import { useGlobalStore } from '@store/globalStore' import globalroutines from '@src/boot/globalroutines' import { useI18n } from '@src/boot/i18n' import { RouteNames } from '@src/router/route-names' +import messages from '@src/statics/i18n' +import { shared_consts } from '@src/common/shared_vuejs' +import * as ApiTables from '@store/Modules/ApiTables' +import translate from '@src/globalroutines/util' +import { serv_constants } from "@store/Modules/serv_constants" +import { useProjectstore } from "@store/projects" +import { useTodoStore } from "@store/Todos" +import { useUserStore } from "@store/UserStore" export interface INotify { color?: string | 'primary' @@ -1176,6 +1195,85 @@ export const tools = { return `${cl} titlePriority` }, + getStatusListByInd(index: number) { + try { + const arr: any = this.selectStatus[toolsext.getLocale() || 'it'] + for (const rec of arr) { + if (rec.value === index) { + return rec.label + } + } + } catch (e) { + console.log('Error: ', e) + } + return '' + }, + + getPriorityByInd(index: number) { + // console.log('LANG in PRIOR', toolsext.getLocale()) + try { + const arr: any = lists.selectPriority[toolsext.getLocale() || 'it'] + for (const rec of arr) { + if (rec.value === index) { + return rec.label + } + } + } catch (e) { + console.log('Error: ', e) + } + return '' + }, + + logelem(mystr: string, elem: any) { + console.log(mystr, 'elem [', elem._id, '] ', elem.descr, 'pos', elem.pos, ' Pr(', this.getPriorityByInd(elem.priority), ') modif=', elem.modified) + }, + + getelemprojstr(elem: any) { + return elem.descr + ' [id= ' + elem._id + '] ' + 'pos: ' + elem.pos + ']\n' + }, + + logga_arrproj(myarr: IProject[]) { + let mystr = '\n' + myarr.forEach((item) => { + mystr += this.getelemprojstr(item) + ' ' + }) + + return mystr + }, + + logelemprj(mystr: string, elem: any) { + console.log(mystr, this.getelemprojstr(elem)) + }, + + getstrelem(elem: any) { + return 'elem [' + elem._id + '] ' + elem.descr + ' Pr(' + this.getPriorityByInd(elem.priority) + ') modif=' + elem.modified + ' ' + }, + + logga_arr(myarr: ITodo[]) { + let mystr = '\n' + myarr.forEach((item) => { + mystr += '[' + item.pos + '] ' + item.descr + ' Pr(' + this.getPriorityByInd(item.priority || 0) + ')' + ' modif=' + item.modified + '\n' + // mystr += '[' + item.pos + '] ' + item.descr + '\n' + }) + + return mystr + }, + + touchmove(scrollable: any) { + if (window) { + window.addEventListener('touchmove', (e) => { + // console.log('touchmove') + if (!scrollable) { + e.preventDefault() + } + }, { passive: false }) + } + }, + + jsonCopy(src: any) { + return JSON.parse(JSON.stringify(src)) + }, + getItemLS(item: any): any { let ris = localStorage.getItem(item) if ((ris == null) || (ris === '') || (ris === 'null') || !ris) { @@ -1185,26 +1283,162 @@ export const tools = { return ris }, + notifyarraychanged(array: any) { + if (array.length > 0) { + array.splice(array.length - 1, 1, array[array.length - 1]) + } + }, + + isOkIndex(myarr: any, index: number) { + return (index >= 0 && index < myarr.length) + }, + + async swapGeneralElem(nametable: string, myarr: any, itemdragend: any, listFieldsToChange: any) { + + const arrprec = [...myarr] + + if (itemdragend.field === 'priority') { + // get last elem priority + console.log('get last elem priority') + itemdragend.newIndex = this.getLastFirstElemPriority(myarr, itemdragend.prioritychosen, itemdragend.atfirst, itemdragend.idelemtochange) + itemdragend.oldIndex = this.getIndexById(myarr, itemdragend.idelemtochange) + + console.log('swapElems PRIORITY', itemdragend) + } + + if (itemdragend.newIndex === itemdragend.oldIndex) { + return + } + + console.log('swapGeneralElem', 'new =', itemdragend.newIndex, 'Old =', itemdragend.oldIndex, itemdragend) + + if (this.isOkIndex(myarr, itemdragend.newIndex) && this.isOkIndex(myarr, itemdragend.oldIndex)) { + + console.log('*** SPLICE!') + console.log(' PRIMA!', this.logga_arrproj(myarr)) + myarr.splice(itemdragend.newIndex, 0, myarr.splice(itemdragend.oldIndex, 1)[0]) + console.log(' DOPO!', this.logga_arrproj(myarr)) + + // Ora inverti gli indici + const indold = itemdragend.oldIndex + itemdragend.oldIndex = itemdragend.newIndex + itemdragend.newIndex = indold + + /* + if (nametable === 'todos') { + if (itemdragend.field !== 'priority') { + const precind = itemdragend.newIndex - 1 + const nextind = itemdragend.newIndex + 1 + + if (this.isOkIndex(myarr, precind) && this.isOkIndex(myarr, nextind)) { + if ((myarr[precind].priority === myarr[nextind].priority) && (myarr[precind].priority !== myarr[itemdragend.newIndex].priority)) { + console.log(' 1)') + myarr[itemdragend.newIndex].priority = myarr[precind].priority + this.notifyarraychanged(myarr) + } + } else { + if (!this.isOkIndex(myarr, precind)) { + if ((myarr[nextind].priority !== myarr[itemdragend.newIndex].priority)) { + console.log(' 2)') + myarr[itemdragend.newIndex].priority = myarr[nextind].priority + this.notifyarraychanged(myarr) + } + + } else { + if ((myarr[precind].priority !== myarr[itemdragend.newIndex].priority)) { + console.log(' 3)') + myarr[itemdragend.newIndex].priority = myarr[precind].priority + this.notifyarraychanged(myarr) + } + } + + } + } + } */ + + let status = 0 + + // const arr = lists.selectPriority[toolsext.getLocale()] + // for (const priority of arr) { + for (let i = 0; i < myarr.length; ++i) { + if (nametable === 'todos') { + status = myarr[i].statustodo + } else if (nametable === 'projects') { + status = myarr[i].statusproj + } + if (status !== this.Status.COMPLETED) { + myarr[i].pos = i + + const findelem = arrprec.find((rec) => rec._id === myarr[i]._id) + + if (findelem !== myarr[i].pos) { + myarr[i].modified = true + await ApiTables.table_ModifyRecord(nametable, myarr[i], listFieldsToChange, 'pos') + } + } + + } + for (let i = 0; i < myarr.length; ++i) { + if (nametable === 'todos') { + status = myarr[i].statustodo + } else if (nametable === 'projects') { + status = myarr[i].statusproj + } + // (myarr[i].priority === priority.value) + if ((status === this.Status.COMPLETED)) { + myarr[i].pos = 1000 + i + + const findelem = arrprec.find((rec) => rec._id === myarr[i]._id) + + if (findelem !== myarr[i].pos) { + myarr[i].modified = true + await ApiTables.table_ModifyRecord(nametable, myarr[i], listFieldsToChange, 'pos') + } + } + + } + // } + + /* + + console.table(myarr) + + // Update the id_prev property + const elem1 = this.update_idprev(myarr, itemdragend.newIndex, itemdragend.newIndex - 1) // 0, -1 + const elem2 = this.update_idprev(myarr, itemdragend.newIndex + 1, itemdragend.newIndex) // 1, 0 + const elem3 = this.update_idprev(myarr, itemdragend.oldIndex, itemdragend.oldIndex - 1) // 1, 0 + const elem4 = this.update_idprev(myarr, itemdragend.oldIndex + 1, itemdragend.oldIndex) // 2, 1 + + await + ApiTables.table_ModifyRecord(nametable, elem1, listFieldsToChange, 'id_prev') + await + ApiTables.table_ModifyRecord(nametable, elem2, listFieldsToChange, 'id_prev') + await + ApiTables.table_ModifyRecord(nametable, elem3, listFieldsToChange, 'id_prev') + await + ApiTables.table_ModifyRecord(nametable, elem4, listFieldsToChange, 'id_prev') + + + */ + + this.notifyarraychanged(myarr) + + // console.log('arr FINALE', this.logga_arrproj(myarr)) + + // Update the records: + } + } + , + + isLoggedToSystem(): boolean { const tok = this.getItemLS(toolsext.localStorage.token) return !!tok }, - addDays(mydate: Date, days: number) { - return date.addToDate(mydate, { days }) - }, - - addMinutes(mydate: Date, minutes: number) { - return date.addToDate(mydate, { minutes }) - }, - - jsonCopy(src: any): any { - return JSON.parse(JSON.stringify(src)) - }, - askfornotification($q: any) { - const { t } = useI18n(); + const { t } = useI18n() console.log('askfornotification', $q) this.showNotif($q, t('notification.waitingconfirm'), { color: 'positive', icon: 'notifications' }) @@ -1256,73 +1490,6 @@ export const tools = { return { path: '', file: fileimg } }, - showPositiveNotif(q: any, msg: string) { - this.showNotif(q, msg, { color: 'positive', icon: 'notifications' }) - }, - - showNegativeNotif(q: any, msg: string) { - this.showNotif(q, msg, { color: 'negative', icon: 'notifications' }, 10000) - }, - - showNeutralNotif(q: any, msg: string) { - this.showNotif(q, msg, { color: 'info', icon: 'notifications' }, 10000) - }, - - showNotif(q: any, msg: string, data ?: INotify | null, time?: number) { - let myicon = data ? data.icon : 'ion-add' - if (!myicon) { - myicon = 'ion-add' - } - let mycolor = data ? data.color : 'primary' - if (!mycolor) { - mycolor = 'primary' - } - q.notify({ - // group: '', - message: msg, - icon: myicon, - classes: 'my-notif-class', - color: mycolor, - timeout: time || 4000, - }) - }, - - isBitActive(bit: any, whattofind: any) { - if (whattofind > 0) { - return ((bit & whattofind) === whattofind) - } - return false - }, - - SetBit(myval: any, bit: any) { - // tslint:disable-next-line:no-bitwise - let myvalout = myval - myvalout |= bit - return myvalout - }, - - UnSetBit(myval: any, bit: any) { - // tslint:disable-next-line:no-bitwise - let myvalout = myval - myvalout &= ~bit - return myvalout - }, - - getUnique(arr: any, comp: any) { - const unique = arr - // @ts-ignore - .map(e => e[comp]) - - // store the keys of the unique objects - // @ts-ignore - .map((e, i, final) => final.indexOf(e) === i && i) - - // eliminate the dead keys & store unique objects - // @ts-ignore - .filter(e => arr[e]).map(e => arr[e]) - - return unique - }, async createNewRecord($q: any, table: string, data: any, withnotif = true) { const mydata = { @@ -1371,6 +1538,822 @@ export const tools = { return mypay }, + + + + getIndexById(myarr: any, id: any) { + if (myarr === undefined) + return -1 + return myarr.indexOf(this.getElemById(myarr, id)) + } + , + + getElemById(myarr: any, id: any) { + if (myarr === undefined) + return null + // console.log('getElemById', myarr, id) + return myarr.find((elem: any) => elem._id === id) + } + , + + getElemPrevById(myarr: any, id: any) { + if (myarr === undefined) + return null + return myarr.find((elem: any) => elem.id_prev === id) + }, + + + getLastFirstElemPriority(myarr: any, priority: number, atfirst: boolean, escludiId: string) { + if (myarr === null) { + return -1 + } + + let trovato: boolean = false + + console.log('priority', priority) + + for (let indrec = 0; indrec < myarr.length; indrec++) { + if ((myarr[indrec].priority === priority) && (myarr[indrec]._id !== escludiId)) { + trovato = true + if (atfirst) { + return indrec - 1 + } + } else { + if (trovato) { + return indrec + } + } + } + + console.log('trovato?', trovato, 'indrec') + + if (trovato) { + return myarr.length - 1 + } else { + if (priority === this.Priority.PRIORITY_LOW) { + return myarr.length - 1 + } else if (priority === this.Priority.PRIORITY_HIGH) { + return 0 + } + } + } + , + + getFirstList(myarr: any) { + return myarr.find((elem: any) => elem.id_prev === ApiTables.LIST_START) + } + , + + getModulesByTable(nametable: string) { + const projects = useProjectstore() + const todos = useTodoStore() + if (nametable === 'todos') { + return todos + } else if (nametable === 'projects') { + return projects + } + } + , + + setArrayMainByTable(nametable: string, myarr: any) { + if (nametable === 'todos') { + const todos = useTodoStore() + todos.todos = this.jsonCopy(myarr) + return todos.todos + } else if (nametable === 'projects') { + const projects = useProjectstore() + projects.projects = this.jsonCopy(myarr) + return projects.projects + } + }, + + getmyid(id: string) { + return 'row' + id + } + , + + getLastListNotCompleted(nametable: string, cat: string, tipoproj: string) { + // console.log('getLastListNotCompleted') + // const module = this.getModulesByTable(nametable) + let arr = [] + const projects = useProjectstore() + if (nametable === 'projects') + arr = projects.getters.projs_dacompletare(cat, tipoproj) + else if (nametable === 'todos') + arr = Todos.getters.items_dacompletare(cat) + + if (!!arr) + return (arr.length > 0) ? arr[arr.length - 1] : null + else + return null + }, + + getElemByIndex(myarr: any, index: number) { + if (index >= 0 && index < myarr.length) { + return myarr[index] + } else { + return null + } + } + , + + existArr(x: any) { + return x = (typeof x !== 'undefined' && x instanceof Array) ? x : [] + } + , + + json2array(json: any) { + const result = [] + const keys = Object.keys(json) + keys.forEach((key) => { + result.push(json[key]) + }) + return result + }, + + visumenu(elem: IListRoutes) { // : IListRoutes + + + const userStore = useUserStore() + let visu = ((elem.onlyAdmin && userStore.isAdmin) || (elem.onlyManager && userStore.isManager) + || (elem.onlySocioResidente && userStore.my.profile.socioresidente) + || (elem.onlyConsiglio && userStore.my.profile.consiglio) + || (elem.onlyNotSoci && !userStore.my.profile.socio) + || (elem.onlyTutor && userStore.isTutor) + || (elem.onlyEditor && userStore.isEditor) + || (elem.onlyDepartment && userStore.isDepartment) + || ((!elem.onlyAdmin) && (!elem.onlyManager) && (!elem.onlyTutor) && (!elem.onlyEditor) && (!elem.onlyDepartment) + && (!elem.onlySocioResidente) && (!elem.onlyConsiglio) && (!elem.onlyNotSoci))) && elem.active + + if (!this.isLoggedToSystem()) { + if (elem.onlyif_logged) + visu = false + } + + if (elem.meta && elem.meta.requiresAuth) { + visu = visu && this.isLoggedToSystem() + } + return visu + }, + + executefunc(myself: any, table: string, func: number, par: IParamDialog) { + const globalStore = useGlobalStore() + if (func === lists.MenuAction.DELETE) { + // console.log('param1', par.param1) + CalendarStore.CancelBookingEvent({ + ideventbook: par.param1, + notify: par.param2 === true ? '1' : '0' + }).then((ris) => { + if (ris) { + this.showPositiveNotif(myself.$q, myself.$t('cal.canceledbooking') + ' "' + par.param3 + '"') + if (myself.bookEventpage) + myself.bookEventpage.show = false + } else + this.showNegativeNotif(myself.$q, myself.$t('cal.cancelederrorbooking')) + }) + } else if (func === lists.MenuAction.DELETE_EVENT) { + // console.log('param1', par.param1, 'id', par.param1._id) + CalendarStore.CancelEvent({ id: par.param1._id }).then((ris) => { + if (ris) { + // Remove this record from my list + CalendarStore.state.eventlist = CalendarStore.state.eventlist.filter((event) => (event._id !== par.param1._id)) + this.showPositiveNotif(myself.$q, myself.$t('cal.canceledevent') + ' "' + par.param1.title + '"') + } else + this.showNegativeNotif(myself.$q, myself.$t('cal.cancelederrorevent')) + }) + } else if (func === lists.MenuAction.DELETE_EXTRALIST) { + // console.log('param1', par.param1, 'id', par.param1._id) + globalStore.DeleteRec({ table: this.TABEXTRALIST, id: par.param1._id }).then((ris) => { + if (ris) { + myself.update_username() + this.showPositiveNotif(myself.$q, myself.$t('reg.cancella_invitato') + ' "' + par.param1.name + ' ' + par.param1.surname + '"') + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) + }) + } else if (func === lists.MenuAction.DELETE_USERLIST) { + // console.log('param1', par.param1, 'id', par.param1._id) + globalStore.DeleteRec({ table: this.TABUSER, id: par.param1._id }).then((ris) => { + if (ris) { + myself.update_username() + this.showPositiveNotif(myself.$q, myself.$t('reg.cancella_invitato') + ' "' + par.param1.name + ' ' + par.param1.surname + '"') + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) + }) + } else if (func === lists.MenuAction.ZOOM_GIA_PARTECIPATO) { + // console.log('param1', par.param1, 'id', par.param1._id) + const mydatatosave = { + id: par.param1._id, + ind_order: par.param1.ind_order, + myfunc: func, + data: par.param2, + username: par.param2.username, + notifBot: null + } + + // if (par.param2.notifBot) + // mydatatosave.notifBot = { un: par.param2.notifBot, txt: par.param3 } + + // myself.EseguiCallServer() + + globalStore.callFunz({ mydata: mydatatosave }).then((ris) => { + if (ris) { + myself.Callback(func) + this.showPositiveNotif(myself.$q, par.param3) + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) + }) + } else if (func === lists.MenuAction.REGALA_INVITATO) { + // console.log('param1', par.param1, 'id', par.param1._id) + let mydatatosave = { + id: null, + username: '', + table: '', + fieldsvalue: {}, + notifBot: {} + } + + if (!!par.param1.invitante_username) { + mydatatosave = { + id: par.param1._id, + username: par.param1.username, + table: this.TABLISTAINGRESSO, + fieldsvalue: { invitante_username: par.param2.aportador_solidario }, + notifBot: null + } + } else { + mydatatosave = { + id: par.param1._id, + username: '', + table: this.TABUSER, + fieldsvalue: { aportador_solidario: par.param2.aportador_solidario }, + notifBot: null + } + } + + console.log('** par.param1', par.param1) + console.log('** id', par.param1._id) + + if (par.param3) { + mydatatosave.notifBot = { un: par.param2.aportador_solidario, txt: par.param3 } + } + + globalStore.saveFieldValue(mydatatosave).then((ris) => { + console.log('ris saveFieldValue', ris) + if (ris) { + this.showPositiveNotif(myself.$q, myself.$t('reg.invitato_regalato') + ' "' + par.param1.name + ' ' + par.param1.surname + '"') + myself.update_username() + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) + }) + } else if (func === lists.MenuAction.REGALA_INVITANTE) { + // console.log('param1', par.param1, 'id', par.param1._id) + const mydatatosave = { + id: par.param1, + table: this.TABLISTAINGRESSO, + fieldsvalue: { invitante_username: par.param2.invitante_username, ind_order_ingr: par.param2.ind_order_ingr }, + notifBot: null + } + + if (par.param3) { + mydatatosave.notifBot = { un: par.param2.invitante_username, txt: par.param3 } + } + + globalStore.saveFieldValue(mydatatosave).then((ris) => { + console.log('ris saveFieldValue', ris) + if (ris) { + this.showPositiveNotif(myself.$q, myself.$t('reg.invitante_regalato') + ' "' + par.param2.name + ' ' + par.param2.surname + '"') + myself.update_username() + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) + }) + } else if ((func === lists.MenuAction.AGGIUNGI_NUOVO_IMBARCO) || (func === lists.MenuAction.CANCELLA_IMBARCO)) { + const mydatatosave = { + username: par.param1.username, + invitante_username: '', + ind_order: -1, + num_tess: 0, + myfunc: func, + data: par.param2, + notifBot: null + } + + if (func === lists.MenuAction.CANCELLA_IMBARCO) { + mydatatosave.ind_order = par.param1.ind_order + mydatatosave.num_tess = par.param1.num_tess + mydatatosave.data.id = par.param2.rec._id + } + if (func === lists.MenuAction.AGGIUNGI_NUOVO_IMBARCO) { + mydatatosave.invitante_username = par.param1.invitante_username + } + + myself.loading = true + + mydatatosave.notifBot = { un: par.param2, txt: par.param3 } + + globalStore.callFunz({ mydata: mydatatosave }).then((ris) => { + myself.loading = false + if (ris) { + myself.update_username() + if (func === lists.MenuAction.AGGIUNGI_NUOVO_IMBARCO) + this.showPositiveNotif(myself.$q, myself.$t('steps.sei_stato_aggiunto')) + else if (func === lists.MenuAction.CANCELLA_IMBARCO) + this.showPositiveNotif(myself.$q, myself.$t('event.deleted')) + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) + }) + } else if (func === lists.MenuAction.SOSTITUISCI) { + // console.log('param1', par.param1, 'id', par.param1._id) + const mydatatosave = { + id: par.param1._id, + ind_order: par.param1.ind_order, + myfunc: func, + data: par.param2, + username: par.param2.username, + notifBot: null, + inviaemail: par.param2.inviaemail, + } + + if (par.param2.notifBot) + mydatatosave.notifBot = { un: par.param2.notifBot, txt: par.param3 } + + myself.EseguiCallServer() + + globalStore.callFunz({ mydata: mydatatosave }).then((ris) => { + if (ris) { + myself.update_nave() + myself.Callback() + this.showPositiveNotif(myself.$q, par.param3 + '\n' + ' e inviato messaggio per aprire la Gift Chat!') + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) + }) + } else if (func === lists.MenuAction.DELETE_RECTABLE) { + // console.log('param1', par.param1) + globalStore.DeleteRec({ table, id: par.param1 }).then((ris) => { + if (ris) { + myself.ActionAfterYes(func, par.param2, null) + this.showPositiveNotif(myself.$q, myself.$t('db.deletedrecord')) + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recdelfailed')) + }) + } else if (func === lists.MenuAction.DUPLICATE_RECTABLE) { + // console.log('param1', par.param1) + globalStore.DuplicateRec({ table, id: par.param1 }).then((ris) => { + if (ris) { + myself.ActionAfterYes(func, par.param2, ris.data) + this.showPositiveNotif(myself.$q, myself.$t('db.duplicatedrecord')) + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recdupfailed')) + }) + } else if (func === lists.MenuAction.INVIA_MSG_A_DONATORI) { + // console.log('param1', par.param1) + globalStore.InviaMsgADonatori({ + msgobj: par.param1, + navemediatore: par.param2, + tipomsg: par.param1.tipomsg + }).then((ris) => { + if (ris) { + if (par.param1.inviareale) + this.showPositiveNotif(myself.$q, myself.$t('dashboard.msg_donatori_ok')) + this.askConfirm(myself.$q, '', ris.strout, translate('dialog.yes'), translate('dialog.no'), this, '', 0, 0, {}) + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) + }) + } else if (func === lists.MenuAction.INVIA_MSG_A_FLOTTA) { + // console.log('param1', par.param1) + myself.loading = true + globalStore.InviaMsgAFlotta({ + flotta: par.param1, + inviareale: par.param2.inviareale, + inviaemail: par.param2.inviaemail, + tipomsg: par.param3 + }).then((ris) => { + myself.loading = false + if (ris) { + if (par.param1.inviareale) + this.showPositiveNotif(myself.$q, myself.$t('dashboard.msg_donatori_ok')) + this.askConfirm(myself.$q, '', ris.strout, translate('dialog.yes'), translate('dialog.no'), this, '', 0, 0, {}) + myself.Callback() + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) + }) + } else if (func === lists.MenuAction.INVIA_MSG_A_SINGOLO) { + // console.log('param1', par.param1) + globalStore.InviaMsgADonatori({ + msgobj: par.param1, + navemediatore: par.param2, + tipomsg: par.param1.tipomsg + }) + .then((ris) => { + if (ris) { + this.showPositiveNotif(myself.$q, myself.$t('cal.sendmsg_sent')) + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) + }) + } else if (func === lists.MenuAction.DONO_INVIATO) { + const mydatatosave = { + id: par.param1._id, + table: this.TABNAVI, + fieldsvalue: { + date_made_gift: par.param1.date_made_gift, + riga: par.param1.riga, + col: par.param1.col, + commento_al_sognatore: par.param1.commento_al_sognatore + }, + notifBot: null + } + + if (par.param3) { + mydatatosave.notifBot = { un: par.param2, txt: par.param3 } + } + + globalStore.saveFieldValue(mydatatosave).then((ris) => { + if (ris) { + myself.ActionAfterYes(func, par.param1, par.param2) + this.showPositiveNotif(myself.$q, myself.$t('dashboard.fatto_dono')) + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) + }) + } else if (func === lists.MenuAction.DONO_RICEVUTO) { + let mydatatosave = { + id: par.param1._id, + table: this.TABNAVI, + fieldsvalue: {}, + unset: null, + notifBot: null, + tipomsg: this.TipoMsg.SEND_MSG_DONO_RICEVUTO_CORRETTAMENTE + } + + if (!!par.param1.date_made_gift) { + mydatatosave.fieldsvalue = { + made_gift: par.param1.made_gift, + riga: par.param1.riga, + col: par.param1.col, + date_made_gift: par.param1.date_made_gift + } + } else { + mydatatosave.fieldsvalue = { made_gift: par.param1.made_gift, riga: par.param1.riga, col: par.param1.col } + } + + if (!!par.param1.annulla) { + if (par.param1.annulla) { + mydatatosave.fieldsvalue = { made_gift: false, riga: par.param1.riga, col: par.param1.col } + mydatatosave.unset = { date_made_gift: 1, received_gift: 1 } + } + } + + if (par.param3) { + mydatatosave.notifBot = { un: par.param2, txt: par.param3 } + } + + globalStore.saveFieldValue(mydatatosave).then((ris) => { + if (ris) { + myself.ActionAfterYes(func, par.param1, par.param2) + let msg = myself.$t('dashboard.ricevuto_dono_ok') + if (!!par.param1.annulla) { + if (par.param1.annulla) + msg = 'Dono Annullato' + } + this.showPositiveNotif(myself.$q, msg) + } else + this.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) + }) + } + }, + + async saveFieldToServer(myself: any, table: string, id: any, mydata: any, notif = true) { + const mydatatosave = { + id, + table, + fieldsvalue: mydata, + notifBot: null + } + + const globalStore = useGlobalStore() + + globalStore.saveFieldValue(mydatatosave).then((ris) => { + if (ris) { + if (notif) + this.showPositiveNotif(myself.$q, myself.$t('db.recupdated')) + } else { + this.showNegativeNotif(myself.$q, myself.$t('db.recfailed')) + } + }) + + }, + + async askConfirm($q: any, mytitle, mytext, ok, cancel, myself: any, table, funcok: number, funccancel: number, par: IParamDialog) { + return $q.dialog({ + message: mytext, + html: true, + ok: { + label: ok, + push: true + }, + title: mytitle, + cancel: true, + persistent: false + }).onOk(() => { + // console.log('OK') + this.executefunc(myself, table, funcok, par) + return true + }).onCancel(() => { + // console.log('CANCEL') + this.executefunc(myself, table, funccancel, par) + return false + }) + }, + + showPositiveNotif(q: any, msg: string) { + this.showNotif(q, msg, { color: 'positive', icon: 'notifications' }) + }, + + showNegativeNotif(q: any, msg: string) { + this.showNotif(q, msg, { color: 'negative', icon: 'notifications' }, 10000) + }, + + showNeutralNotif(q: any, msg: string) { + this.showNotif(q, msg, { color: 'info', icon: 'notifications' }, 10000) + }, + + showNotif(q: any, msg: string, data ?: INotify | null, time?: number) { + let myicon = data ? data.icon : 'ion-add' + if (!myicon) { + myicon = 'ion-add' + } + let mycolor = data ? data.color : 'primary' + if (!mycolor) { + mycolor = 'primary' + } + q.notify({ + // group: '', + message: msg, + icon: myicon, + classes: 'my-notif-class', + color: mycolor, + timeout: time || 4000, + }) + }, + + isRegistered() { + return localStorage.getItem(this.localStorage.userId) !== '' + } + , + + checkIfUserExist(mythis) { + + if (userStore.getters.isUserInvalid) { + this.showNotif(mythis.$q, mythis.$t('todo.usernotdefined')) + return false + } + + if (!this.isRegistered()) { + // Not logged + this.showNotif(mythis.$q, mythis.$t('user.notregistered')) + return false + } + + return true + } + , + + checkLangPassed(mylang) { + // console.log('checkLangPassed ', mylang) + + const mybrowserLang = Quasar.lang.isoName + + if (mylang !== '') { + if ((mylang.toLowerCase() === 'enus') || (mylang.toLowerCase() === 'en-us') || (mylang.toLowerCase() === 'uk') + || (mylang.toLowerCase() === 'uk-uk') || (mylang.toLowerCase() === 'en-uk') || (mylang.toLowerCase() === 'en-gb') + || (mylang.toLowerCase() === 'gb-gb')) { + mylang = 'enUs' + } + if ((mylang.toLowerCase() === 'es') || (mylang.toLowerCase() === 'es-es') || (mylang.toLowerCase() === 'eses')) { + mylang = 'es' + } + if ((mylang.toLowerCase() === 'pt') || (mylang.toLowerCase() === 'pt-pt') || (mylang.toLowerCase() === 'ptpt')) { + mylang = 'pt' + } + if ((mylang.toLowerCase() === 'fr') || (mylang.toLowerCase() === 'fr-fr') || (mylang.toLowerCase() === 'frfr')) { + mylang = 'fr' + } + if ((mylang.toLowerCase() === 'it') || (mylang.toLowerCase() === 'it-it') || (mylang.toLowerCase() === 'itit')) { + mylang = 'it' + } + if ((mylang.toLowerCase() === 'si') || (mylang.toLowerCase() === 'si-si') || (mylang.toLowerCase() === 'sisi')) { + mylang = 'si' + } + + if (!(static_data.arrLangUsed.includes(mylang))) { + // console.log('non incluso ', mylang) + // mylang = static_data.arrLangUsed[0] + mylang = 'it' + + // Metti come default + userStore.mutations.setlang(mylang) + } + } + + if (!mylang) { + mylang = process.env.LANG_DEFAULT + console.log('LANG DEFAULT: ', mylang) + } + + if (toolsext.getLocale(true) === '') { + userStore.mutations.setlang(mylang) + } + + // console.log('mylang calc : ', mylang) + + return mylang + }, + + getlang() { + return toolsext.getLocale() + }, + + getimglogo() { + return `images/${process.env.LOGO_REG}` + }, + + consolelogpao(strlog: string, strlog2: any = '', strlog3: any = '') { + // @ts-ignore + globalroutines(null, 'log', `${strlog} ${strlog2} ${strlog3}`, null) + }, + + aspettansec(numsec) { + return new Promise((resolve, reject) => { + setTimeout(() => { + resolve('anything') + }, numsec) + }) + } + , + + dragula_option($service, dragname) { + $service.options(dragname, + { + moves(el, source, handle, sibling) { + return !el.classList.contains('donotdrag') // elements are always draggable by default + }, + accepts(el, target, source, sibling) { + return true // elements can be dropped in any of the `containers` by default + }, + invalid(el, handle) { + return el.classList.contains('donotdrag') // don't prevent any drags from initiating by default + }, + direction: 'vertical' + }) + } + , + +// _.cloneDeep( Per clonare un oggetto + + isLoggedToSystem() { + const tok = this.getItemLS(this.localStorage.token) + return !!tok + } + , + + mapSort(linkedList) { + console.log('mapSort') + let sortedList = [] + const map = new Map() + let currentId = null + + // console.log('linkedList', linkedList) + + // index the linked list by previous_item_id + for (let i = 0; i < linkedList.length; i++) { + const item = linkedList[i] + // this.logelemprj(i, item) + if (item.id_prev === ApiTables.LIST_START) { + // first item + currentId = String(item._id) + // console.log('currentId', currentId); + sortedList.push(item) + } else { + map.set(item.id_prev, i) + } + } + + // let i2 = 0 + while (sortedList.length < linkedList.length) { + // get the item with a previous item ID referencing the current item + const nextItem = linkedList[map.get(currentId)] + if (nextItem === undefined) { + break + } + sortedList.push(nextItem) + // this.logelemprj('FATTO:' + i, nextItem) + currentId = String(nextItem._id) + // i2++ + } + + if (sortedList.length < linkedList.length) { + console.log('!!!!! NON CI SONO TUTTI !!!!!', sortedList.length, linkedList.length) + // Forget something not in a List ! + for (const itemlinked of linkedList) { + const elemtrov = sortedList.find((item) => item._id === itemlinked._id) + if (elemtrov === undefined) { + sortedList.push(itemlinked) + } + } + } + + // Now Order by Priority + if (!!sortedList) { + if (sortedList.length > 0) { + if (sortedList[0].priority !== undefined) { + const sortednew = [] + let myarr = [] + for (const priorelem of lists.selectPriority.it) { + const myprior = priorelem.value + myarr = sortedList.filter((item) => item.priority === myprior) + if (myarr !== undefined) + sortednew.push(...myarr) + } + + sortedList = sortednew + } + } + } + + // console.log('DOPO sortedList', sortedList) + + return sortedList + }, + + getProgressClassColor(progress) { + if (progress > 66) { + return 'highperc' + } else if (progress > 33) { + return 'medperc' + } else { + return 'lowperc' + } + } + , + + getProgressColor(progress) { + if (progress > 66) { + return 'green' + } else if (progress > 33) { + return 'blue' + } else { + return 'red' + } + }, + hasManyDays(mydatestart, mydateend) { + if (mydateend) + return this.getstrDate(mydatestart) !== this.getstrDate(mydateend) + else + return false + }, + + isManager() { + return userStore.isManager + }, + + isSocioResidente() { + return !!userStore.my.profile ? userStore.my.profile.socioresidente : false + }, + + isConsiglio() { + return !!userStore.my.profile ? userStore.my.profile.consiglio : false + }, + + isSocio() { + return !!userStore.my.profile ? userStore.my.profile.socio : false + }, + + isResp() { + return userStore.my.profile.resplist + }, + + isWorkers() { + return userStore.my.profile.workerslist + }, + + isDepartment() { + return userStore.isDepartment + }, + + isAdmin() { + return userStore.isAdmin + }, + + isTutor() { + return userStore.isTutor + }, + + isZoomeri() { + return userStore.isZoomeri + }, + + isEditor() { + return userStore.isEditor + }, + getstrDate(mytimestamp: Date | number | string | undefined) { // console.log('getstrDate', mytimestamp) if (mytimestamp) return date.formatDate(mytimestamp, 'DD/MM/YYYY') @@ -1463,6 +2446,51 @@ export const tools = { } }, + getstrDateTimeEvent(mythis, myevent, withhtml) { + let mystr = '' + // is same day? + if (this.getstrDate(myevent.dateTimeStart) === this.getstrDate(myevent.dateTimeEnd)) { + if (withhtml) { + mystr += `${this.getstrDateLong(myevent.dateTimeStart)} + ${mythis.$t('cal.starttime')} ${this.getstrTime(myevent.dateTimeStart)} + ${mythis.$t('cal.endtime')} ${this.getstrTime(myevent.dateTimeEnd)}` + } else { + mystr = `${this.getstrDateLong(myevent.dateTimeStart)} + ${mythis.$t('cal.starttime')} ${this.getstrTime(myevent.dateTimeStart)} + ${mythis.$t('cal.endtime')} ${this.getstrTime(myevent.dateTimeEnd)}` + } + } else { + mystr = `${this.getstrDateLong(myevent.dateTimeStart)} + ${mythis.$t('cal.starttime')} ${this.getstrTime(myevent.dateTimeStart)} + ${mythis.$t('cal.enddate')} ${this.getstrDateLong(myevent.dateTimeEnd)} + ${mythis.$t('cal.endtime')} ${this.getstrTime(myevent.dateTimeEnd)} ` + } + + if (myevent.infoextra) { + mystr += ` + ${mythis.$t('cal.hours')}: + ${myevent.infoextra} + + ` + } + return mystr + }, + + getstrDateTimeEventSimple(myevent: IEvents) { + let mystr = '' + // is same day? + if (this.getstrShortDate(myevent.dateTimeStart) === this.getstrShortDate(myevent.dateTimeEnd)) { + mystr = `${this.getstrShortDate(myevent.dateTimeStart)} + - ${this.getstrTime(myevent.dateTimeStart)}` + } else { + mystr = `${this.getstrVeryVeryShortDate(myevent.dateTimeStart)} - ${this.getstrShortDate(myevent.dateTimeEnd)}` + + } + + return mystr + }, + + getstrDateTimeEventShort(myevent: IEvents) { let mystr = '' // is same day? @@ -1583,6 +2611,20 @@ export const tools = { } }, + firstchars_onedot(value, numchars = 200) { + if (!value) { + return '' + } + try { + let mycar = value.substring(0, numchars) + if (value.length > numchars) + mycar += '.' + return mycar + } catch (e) { + return value + } + }, + getDateNow() { const mydate = new Date() return mydate @@ -1659,26 +2701,460 @@ export const tools = { return Privacy.inherited }, - notifyarraychanged(array: any) { - if (array.length > 0) { - array.splice(array.length - 1, 1, array[array.length - 1]) + addRoute(myarr: any, values: any) { + myarr.push(values) + }, + + displayConfirmNotification() { + let options = null + if ('serviceWorker' in navigator) { + options = { + body: 'You successfully subscribed to our Notification service!', + icon: '/statics/icons/app-icon-96x96.png', + image: '/statics/images/sf-boat.jpg', + dir: 'ltr', + lang: 'enUs', // BCP 47, + vibrate: [100, 50, 200], + badge: '/statics/icons/app-icon-96x96.png', + tag: 'confirm-notification', + renotify: true, // if it's already sent, will Vibrate anyway + actions: [ + { action: 'confirm', title: 'Okay', icon: '/statics/icons/app-icon-96x96.png' }, + { action: 'cancel', title: 'Cancel', icon: '/statics/icons/app-icon-96x96.png' } + ] + } + + if ('serviceWorker' in navigator) { + navigator.serviceWorker.ready + .then((swreg) => { + swreg.showNotification('Successfully subscribed!', options) + }) + } + } + } + , + + dataURItoBlob(dataURI) { + const byteString = atob(dataURI.split(',')[1]) + const mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0] + const ab = new ArrayBuffer(byteString.length) + const ia = new Uint8Array(ab) + for (let i = 0; i < byteString.length; i++) { + ia[i] = byteString.charCodeAt(i) + } + const blob = new Blob([ab], { type: mimeString }) + return blob + } + , + + showNotificationExample() { + let options = null + const mythis = this + if ('serviceWorker' in navigator) { + options = { + body: mythis.$t('notification.subscribed'), + icon: '/statics/icons/android-chrome-192x192.png', + image: '/statics/images/imglogonotif.png', + dir: 'ltr', + lang: 'enUs', // BCP 47, + vibrate: [100, 50, 200], + badge: '/statics/icons/android-chrome-192x192.png', + tag: 'confirm-notification', + renotify: true, // if it's already sent, will Vibrate anyway + actions: [ + { action: 'confirm', title: mythis.$t('dialog.ok'), icon: '/statics/icons/android-chrome-192x192.png' } + // { action: 'cancel', title: 'Cancel', icon: '/statics/icons/android-chrome-192x192.png', } + ] + } + + navigator.serviceWorker.ready + .then((swreg) => { + swreg.showNotification('aaa', options) + }) + } + } + , + + getemailto(text) { + return 'mailto:' + text + } + , + + askfornotification(mythis) { + console.log('askfornotification') + this.showNotif(mythis.$q, mythis.$t('notification.waitingconfirm'), { color: 'positive', icon: 'notifications' }) + + Notification.requestPermission((result) => { + console.log('User Choice', result) + if (result === 'granted') { + this.showNotif(mythis.$q, mythis.$t('notification.confirmed'), { color: 'positive', icon: 'notifications' }) + } else { + this.showNotif(mythis.$q, mythis.$t('notification.denied'), { color: 'negative', icon: 'notifications' }) + + // displayConfirmNotification(); + } + }) + + } + , + + heightgallery(coeff) { + // console.log('heightgallery') + return this.heightGallVal(coeff).toString() + 'px' + }, + + heightGallVal(coeff = 1.33) { + let maxh2 = 0 + + let myw = Screen.width + if (!this.isMobile()) + if (GlobalStore.state.leftDrawerOpen) + myw -= 300 + if (!this.isMobile()) + if (GlobalStore.state.rightDrawerOpen) + myw -= 300 + + maxh2 = (myw / coeff) + 20 + if (maxh2 > 500) + maxh2 = 500 + + return maxh2 + } + , + + myheight_imgtitle(myheight ?, myheightmobile ?) { + let maxheight = 0 + if (!!myheight) { + maxheight = myheight + if (myheight > 0) { + if (myheight > 1000) { + maxheight = 1000 + } else { + maxheight = parseInt(myheight, 10) + } + } + } else { + maxheight = 500 + } + + const maxh2 = this.heightGallVal() + + // console.log('maxh2', maxh2) + // console.log('maxheight', maxheight) + + let ris = 0 + + if (maxh2 < maxheight) + ris = maxh2 + else + ris = maxheight + + if (!!myheightmobile) { + if (this.isMobile() && maxh2 > myheightmobile) + ris = parseInt(myheightmobile, 10) + } + + // console.log('ris', ris) + return ris + } + , + + myheight_dialog() { + if (Screen.width < 410) { + return '337' + } else if (Screen.width < 600) { + return '450' + } else if (Screen.width < 800) { + return '550' + } else if (Screen.width < 900) { + return '700' + } else if (Screen.width < 1000) { + return '800' + } else if (Screen.width < 1100) { + return '900' + } else { + return Screen.width - 200 } }, - getModulesByTable(nametable: string) { - if (nametable === 'todos') { - // return Todos - } else if (nametable === 'projects') { - // return Projects + styles_imgtitle(sized ?: string) { + if (!!sized) { + return sized + } else { + if (Screen.width < 410) { + return 'max-height: 250px' + } else { + return 'max-height: 350px' + } + } + } + , + + /* + +
+ With srcset & sizes +
+ + */ + + getsizes() { + return '(max-width: 400px) 400w, ' + + '(min-width: 400px) and (max-width: 800px) 800w, ' + + '(min-width: 800px) and (max-width: 1200px) 1200w, ' + + '(min-width: 1200px) 1600w' + } + , + + maxwidth_imgtitle() { + if (Screen.width < 410) { + return 'max-width: 250px' + } else { + return 'max-width: 350px' + } + } + , + + isMobile() { + return (Screen.width < 450) + } + , + + mywidth_imgtitle() { + if (Screen.width < 450) { + return '250' + } else if (Screen.width < 600) { + return '350' + } else { + return '350' + } + } + , + + mymargin_imgtitle() { + return 'auto' + } + , + + showthumbnails() { + if (Screen.width < 410) { + return false + } else if (Screen.width < 600) { + return true + } else { + return true + } + } + , + + padTime(val) { + val = Math.floor(val) + if (val < 10) { + return '0' + val + } + return val + '' + } + , + + getLocale(vero ?: boolean) { + if (UserStore) { + if (userStore.state) { + return userStore.lang + } + } + if (!vero) + return process.env.LANG_DEFAULT + else + return '' + }, + + addDays(mydate: Date, days: number) { + return date.addToDate(mydate, { days }) + }, + + addMinutes(mydate: Date, minutes: number) { + return date.addToDate(mydate, { minutes }) + }, + + gettitlemain(datamain: ITimeLineMain) { + if (datamain.titlemain[toolsext.getLocale()]) + return datamain.titlemain[toolsext.getLocale()] + else { + return datamain.titlemain[static_data.arrLangUsed[0]] + } + + } + , + getwwithwhocoll(datamain: ICollaborations) { + if (datamain.withwhom_title[toolsext.getLocale()]) + return datamain.withwhom_title[toolsext.getLocale()] + else { + return datamain.withwhom_title[static_data.arrLangUsed[0]] + } + + } + , + gettextcoll(data: IColl) { + if (data.subtitle[toolsext.getLocale()]) + return data.subtitle[toolsext.getLocale()] + else { + return data.subtitle[static_data.arrLangUsed[0]] + } + }, + gettitlecoll(data: IColl) { + if (data.title[toolsext.getLocale()]) + return data.title[toolsext.getLocale()] + else { + return data.title[static_data.arrLangUsed[0]] + } + } + , + gettextdescr(data: ITimeLineEntry, numdescr = 'description' + ) { + if (!!data[numdescr]) { + if (data[numdescr][toolsext.getLocale()]) + return data[numdescr][toolsext.getLocale()] + else { + return data[numdescr][static_data.arrLangUsed[0]] + } + } else { + return '' + } + } + , + + getlink(data: ITimeLineEntry) { + if (data.link_text[toolsext.getLocale()]) + return data.link_text[toolsext.getLocale()] + else { + return data.link_text[static_data.arrLangUsed[0]] } - return null }, - getlang() { - return toolsext.getLocale() + getlinkurl(data: ITimeLineEntry) { + if (data.link_url_lang) { + if (data.link_url_lang[toolsext.getLocale()]) { + return data.link_url_lang[toolsext.getLocale()] + } else { + return data.link_url + } + } else { + return data.link_url + } + }, + appid() { + return process.env.APP_ID + }, + + getLabelByItem(item, mythis) { + if (!!item.name) + return mythis.$t(item.name) + else + return item.text + + }, + + getimgev(ev) { + if (!!ev.img_small) + return `statics/` + ev.img_small + else if (!!ev.img) + return `statics/` + ev.img + else + return '' + }, + + getimgbysize(dir: string, file: string) { + const myimage = dir + file + // console.log('includes = ', static_data.preLoadImages.map((a) => a.imgname).includes(myimage), myimage) + let ris = '' + if (this.isMobile() && (preloadedimages().map((a) => a.imgname).includes(myimage))) { + ris = dir + 'mobile/' + file + } else { + ris = myimage + } + + // console.log('getimgbysize', ris) + + return ris + }, + + getaltimg(dir: string, file: string, alt?: string) { + const myimage = dir + file + const myrec = static_data.preLoadImages.find((rec) => rec.imgname === myimage) + if (myrec) + return (myrec) ? myrec.alt : 'my image' + else + return alt + }, + + getimgFullpathbysize(fileimg: string) { + if (!fileimg) + return { path: '', file: fileimg } + const ind = fileimg.lastIndexOf('/') + if (ind > 0) { + return { path: fileimg.substring(0, ind + 1), file: fileimg.substring(ind + 1) } + } else { + return { path: '', file: fileimg } + } + + } + , + + convertHTMLtoText(myhtml) { + let msg = myhtml + msg = msg.replace('"', '"') + msg = msg.replace('>', '>') + msg = msg.replace('<', '<') + msg = msg.replace('&', '&') + msg = msg.replace('
', '\n') + + return msg + } + , + gettextevent(mythis, myevent: IEvents) { + // return '"' + myevent.title + '" (' + func_this.getDateStr(myevent.date) + ') - ' + myevent.time + return '"' + myevent.title + '" (' + this.getstrDateEmailTime(mythis, myevent.dateTimeStart) + ')' + }, + + getlangforQuasar(mylang) { + if (mylang === 'enUs') + return 'en-us' + else + return mylang + }, + + setLangAtt(mylang) { + console.log('setLangAtt =', mylang) + // console.log('PRIMA this.$q.lang.isoName', this.$q.lang.isoName) + + // dynamic import, so loading on demand only + import(`quasar/lang/${this.getlangforQuasar(mylang)}`).then((lang) => { + console.log(' Import dinamically lang =', lang) + Quasar.lang.set(this.getlangforQuasar(lang.default)) + import(`../../statics/i18n`).then(() => { + console.log(' *** MY LANG DOPO=', Quasar.lang.isoName) + }) + }) + + GlobalStore.actions.addDynamicPages() + + // this.$q.lang.set(mylang) + + }, getappname(short: boolean) { const { t } = useI18n() if (short) { @@ -1687,21 +3163,374 @@ export const tools = { return t('ws.sitename') }, - getimglogo() { - return `images/${process.env.LOGO_REG}` - }, - getproc() { return 'Testo: ' + process.env.LOGO_REG }, - consolelogpao(strlog: string, strlog2: any = '', strlog3: any = '') { - // @ts-ignore - globalroutines(null, 'log', `${strlog} ${strlog2} ${strlog3}`, null) + loginOk(mythis, ispageLogin: boolean) { + // console.log('loginOk') + + if (toolsext.getLocale() !== '') { + mythis.$i18n.locale = toolsext.getLocale() + } // Set Lang + else { + userStore.mutations.setlang(mythis.$i18n.locale) + } // Set Lang + + if (process.env.DEBUG) { + console.log('LANG ORA=', toolsext.getLocale()) + } + + globalroutines(mythis, 'loadapp', '') + + this.SignIncheckErrors(mythis, this.OK, ispageLogin) + } + , + + loginInCorso(mythis) { + // console.log('loginInCorso') + + let msg = mythis.$t('login.incorso') + // if (process.env.DEBUG) { + // msg += ' ' + process.env.MONGODB_HOST + // } + mythis.$q.loading.show({ message: msg }) + } + , + + getUrlSite() { + const url = window.location.href + const arr = url.split('/') + return arr[0] + '//' + arr[2] }, - addRoute(myarr: any, values: any) { - myarr.push(values) + SignIncheckErrors(mythis, riscode, ispageLogin ?: boolean) { + // console.log('SignIncheckErrors: ', riscode) + try { + if (riscode === this.OK) { + this.showNotif(mythis.$q, mythis.$t('login.completato'), { color: 'positive', icon: 'check' }) + console.log('mythis.$router.name', mythis.$router.name) + if (ispageLogin) { + if (mythis.$router.name !== '/') + mythis.$router.push('/') + } + } else if (riscode === serv_constants.RIS_CODE_LOGIN_ERR) { + + // Wait N seconds to avoid calling many times... + return new Promise((resolve, reject) => { + setTimeout(() => { + resolve('anything') + }, 3000) + }).then(() => { + setTimeout(() => { + // console.log('HIDE...') + mythis.$q.loading.hide() + }, 500) + this.showNotif(mythis.$q, mythis.$t('login.errato'), { color: 'negative', icon: 'notifications' }) + mythis.iswaitingforRes = false + if (ispageLogin) { + GlobalStore.state.rightDrawerOpen = true + // mythis.$router.push('/signin') + } + }) + + } else if (riscode === serv_constants.RIS_CODE_LOGIN_ERR_SUBACCOUNT) { + + // Wait N seconds to avoid calling many times... + return new Promise((resolve, reject) => { + setTimeout(() => { + resolve('anything') + }, 1000) + }).then(() => { + setTimeout(() => { + // console.log('HIDE...') + mythis.$q.loading.hide() + }, 500) + this.showNotif(mythis.$q, mythis.$t('login.subaccount'), { color: 'negative', icon: 'notifications' }) + mythis.iswaitingforRes = false + if (ispageLogin) { + GlobalStore.state.rightDrawerOpen = true + // mythis.$router.push('/signin') + } + }) + + } else if (riscode === this.ERR_SERVERFETCH) { + this.showNotif(mythis.$q, mythis.$t('fetch.errore_server'), { color: 'negative', icon: 'notifications' }) + } else if (riscode === this.ERR_GENERICO) { + const msg = mythis.$t('fetch.errore_generico') + userStore.mutations.getMsgError(riscode) + this.showNotif(mythis.$q, msg, { color: 'negative', icon: 'notifications' }) + } else { + this.showNotif(mythis.$q, 'Errore num ' + riscode, { color: 'negative', icon: 'notifications' }) + } + + if (riscode !== serv_constants.RIS_CODE_LOGIN_ERR) { + mythis.iswaitingforRes = false + setTimeout(() => { + mythis.$q.loading.hide() + }, 200) + } + + } finally { + // ... + } + }, + + SignUpcheckErrors(mythis, riscode: number, msg: string) { + console.log('SignUpcheckErrors', riscode) + let endload = true + + if (riscode === serv_constants.RIS_CODE_EMAIL_ALREADY_EXIST) { + this.showNotif(mythis.$q, mythis.$t('reg.err.duplicate_email')) + } else if (riscode === serv_constants.RIS_CODE_USER_ALREADY_EXIST) { + this.showNegativeNotif(mythis.$q, mythis.$t('reg.err.user_already_exist')) + } else if (riscode === serv_constants.RIS_CODE_USER_EXTRALIST_NOTFOUND) { + + this.showNegativeNotif(mythis.$q, mythis.$t('reg.err.user_extralist_not_found') + ' ' + msg) + } else if (riscode === serv_constants.RIS_CODE_USER_NOT_THIS_APORTADOR) { + + this.showNegativeNotif(mythis.$q, mythis.$t('reg.err.user_not_this_aportador') + ' ' + msg) + + } else if (riscode === serv_constants.RIS_CODE_USERNAME_NOT_VALID) { + this.showNotif(mythis.$q, mythis.$t('reg.err.username_not_valid')) + } else if (riscode === serv_constants.RIS_CODE_USERNAME_ALREADY_EXIST) { + this.showNotif(mythis.$q, mythis.$t('reg.err.duplicate_username')) + } else if (riscode === this.ERR_SERVERFETCH) { + this.showNotif(mythis.$q, mythis.$t('fetch.errore_server')) + } else if (riscode === this.ERR_GENERICO) { + const msg = mythis.$t('fetch.errore_generico') + userStore.mutations.getMsgError(riscode) + this.showNotif(mythis.$q, msg) + } else if (riscode === this.OK) { + mythis.$router.push('/regok') + this.showNotif(mythis.$q, mythis.$t('components.authentication.email_verification.link_sent', { botname: mythis.$t('ws.botname') }), { + color: 'green', + textColor: 'black' + }) + } else if (riscode === serv_constants.RIS_ISCRIZIONE_OK) { + mythis.$router.push('/') + this.showNotif(mythis.$q, mythis.$t('components.authentication.iscrizione_ok', { botname: mythis.$t('ws.botname') }), { + color: 'green', + textColor: 'black' + }) + } else { + this.showNotif(mythis.$q, 'Errore num ' + riscode) + } + + return endload + }, + isCssColor(color) { + return !!color && !!color.match(/^(#|(rgb|hsl)a?\()/) + }, + displayClasses(eventparam) { + return { + // [`bg-${eventparam.bgcolor}`]: !this.isCssColor(eventparam.bgcolor), + 'text-white': !this.isCssColor(eventparam.bgcolor) + } + }, + displayStyles(eventparam) { + const s = { color: '' } + + let mycol = eventparam.bgcolor + if (!this.isCssColor(eventparam.bgcolor)) { + mycol = this.colourNameToHex(mycol) + } + + if (this.isCssColor(mycol)) { + // s['background-color'] = eventparam.bgcolor + s.color = colors.luminosity(mycol) > 0.5 ? 'black' : 'white' + } + return s + }, + CancelBookingEvent(mythis, eventparam: IEvents, bookeventid: string, notify: boolean) { + console.log('CancelBookingEvent ', eventparam) + this.askConfirm(mythis.$q, translate('cal.titlebooking'), translate('cal.cancelbooking') + ' ' + this.gettextevent(mythis, eventparam) + '?', translate('dialog.yes'), translate('dialog.no'), mythis, '', lists.MenuAction.DELETE, 0, { + param1: bookeventid, + param2: notify, + param3: eventparam.title + }) + }, + CancelEvent(mythis, eventparam: IEvents) { + console.log('CancelEvent ', eventparam) + this.askConfirm(mythis.$q, translate('cal.event'), translate('cal.cancelevent') + ' ' + this.gettextevent(mythis, eventparam) + '?', translate('dialog.yes'), translate('dialog.no'), mythis, '', lists.MenuAction.DELETE_EVENT, 0, { + param1: eventparam, + param2: true + }) + }, + AskGiaPartecipatoZoom(mythis, user) { + console.log('AskGiaPartecipatoZoom', user.username) + this.askConfirm(mythis.$q, translate('steps.zoom_gia_partecipato'), translate('steps.zoom_gia_partecipato'), translate('dialog.yes'), translate('dialog.no'), mythis, '', lists.MenuAction.ZOOM_GIA_PARTECIPATO, 0, { + param1: user, + param2: user, + param3: 'Confermato', + }) + }, + ActionRecTable(mythis, action, table, id, item, askaction) { + // console.log('ActionRecTable', id) + return this.askConfirm(mythis.$q, 'Action', translate(askaction) + '?', translate('dialog.yes'), translate('dialog.no'), mythis, table, action, 0, { + param1: id, + param2: item + }) + }, + + async createNewRecord(mythis, table, data, withnotif = true) { + + const mydata = { + table, + data + } + + return await + GlobalStore.actions.saveTable(mydata) + .then((record) => { + if (withnotif) { + if (record) { + this.showPositiveNotif(mythis.$q, mythis.$t('db.recupdated')) + } else { + this.showNegativeNotif(mythis.$q, mythis.$t('db.recfailed')) + } + } + return record + }) + }, + getheight(mythis: any) { + // return height() + return mythis.$q.screen.height + }, + getwidth(mythis: any, withright = false, withleft = true) { + // return height() + let myw = mythis.$q.screen.width + if (withleft) { + if (GlobalStore.state.leftDrawerOpen) + myw -= 300 + } + + if (withright) + if (GlobalStore.state.rightDrawerOpen) + myw -= 300 + return myw + + }, + + getwidthscale(mythis, mywidth, maxwidth) { + if (this.isMobile()) { + // if (mywidth > this.getwidth(mythis) - 20) + mywidth = this.getwidth(mythis, false, false) - 32 + + // console.log('mywidth', mywidth) + return mywidth + } else { + // console.log('this.getwidth(mythis) = ', this.getwidth(mythis)) + let myw = mywidth + ((this.getwidth(mythis, true) - mywidth) * 0.6) + // console.log('myw1 = ', myw) + if (myw > maxwidth) + myw = maxwidth + if (myw > this.getwidth(mythis) - 24) + myw = this.getwidth(mythis) - 24 + + // console.log('myw = ', myw) + return myw + } + }, + + getheightbywidth(mythis, mywidth, myheight, maxwidth) { + // console.log('getheightbywidth') + const myw = this.getwidthscale(mythis, mywidth, maxwidth) + return myw * (myheight / mywidth) + }, + + isIsoDate(str) { + if (!/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/.test(str)) return false + const d = new Date(str) + return d.toISOString() === str + }, + + getLastDateReadReset() { + return new Date(1999, 1, 1, 0, 0, 0) + }, + + isBitActive(bit: any, whattofind: any) { + if (whattofind > 0) { + return ((bit & whattofind) === whattofind) + } + return false + }, + + + SetBit(myval: any, bit: any) { + // tslint:disable-next-line:no-bitwise + let myvalout = myval + myvalout |= bit + return myvalout + }, + + UnSetBit(myval: any, bit: any) { + // tslint:disable-next-line:no-bitwise + let myvalout = myval + myvalout &= ~bit + return myvalout + }, + + getUnique(arr: any, comp: any) { + return arr + // @ts-ignore + .map(e => e[comp]) + + // store the keys of the unique objects + // @ts-ignore + .map((e, i, final) => final.indexOf(e) === i && i) + + // eliminate the dead keys & store unique objects + // @ts-ignore + .filter(e => arr[e]).map(e => arr[e]) + }, + + getColorByIndexBest(index) { + if (index < this.listBestColor.length - 1) + return this.listBestColor[index] + else + return 'primary' + }, + getCookie(mytok, def?) { + const ris = Cookies.get(mytok) + // console.log('getCookie', ris) + if (!!ris) { + return ris + } else { + return def + } + }, + + setCookie(mytok, value: string) { + return Cookies.set(mytok, value) + }, + + removeCookie(mytok) { + return Cookies.remove(mytok) + }, + notshowPwd(payload) { + const mypay = { ...payload } + try { + if (!!mypay.password) { + mypay.password = '**********' + } + } catch (e) { + console.log('error', e) + } + return mypay + }, + scrollToTop() { + const element = document.getElementById('mypage') + this.scrollToElement(element) + }, + scrollToElementId(myid) { + const element = document.getElementById(myid) + this.scrollToElement(element) + }, + scrollToElement(el) { + const target = getScrollTarget(el) + const offset = el.offsetTop + const duration = 500 + console.log('target', target, 'offset', offset, 'duration', duration) + setScrollPosition(target, offset, duration) }, getCellForWhatsapp(numbercell: string) { @@ -1731,4 +3560,920 @@ export const tools = { return '' }, + metafunc(mythis: any) { + return { + title: mythis.t('ws.sitename'), + titleTemplate: (title) => `${this.getsuffisso()} ${mythis.mymeta.title} - ${mythis.t('ws.sitename')}`, + meta: { + keywords: { + name: 'keywords', + content: mythis.mymeta.keywords + }, + description: { + name: 'description', + content: mythis.mymeta.description + }, + equiv: { 'http-equiv': 'Content-Type', 'content': 'text/html; charset=UTF-8' } + } + } + }, + isObject(anything: any) { + // Object.create(null) instanceof Object → false + return Object(anything) === anything + }, + isDebug() { + return process.env.DEV + }, + + isTest() { + return process.env.ISTEST === '1' + }, + + geturlupload() { + return process.env.MONGODB_HOST + '/upload' + }, + getheaders() { + return [{ name: 'x-auth', value: userStore.x_auth_token }] + }, + + getextfile(filename: string) { + return filename.split('.').pop().toLowerCase() + }, + + getelembylang(arr: any) { + const mylang = toolsext.getLocale() + for (const elem in arr) { + if (arr[elem][mylang]) + return arr[elem][mylang] + } + }, + isChristmasHoliday() { + const now = new Date() + return ((now.getMonth() === 11 && now.getDate() > 20) || (now.getMonth() === 0 && now.getDate() < 8)) + }, + + CapitalizeAllWords(str: string) { + const splitStr = str.toLowerCase().split(' ') + for (let i = 0; i < splitStr.length; i++) { + // You do not need to check if i is larger than splitStr length, as your for does that for you + // Assign it back to the array + splitStr[i] = splitStr[i].charAt(0).toUpperCase() + splitStr[i].substring(1) + } + // Directly return the joined string + return splitStr.join(' ') + }, + + + getValDb(keystr: string, serv: boolean, def?: any, table?: string, subkey?: any, id?: any, idmain?: any) { + const globalStore = useGlobalStore() + if (table === 'users') { + if (keystr === 'profile') { + return userStore.my.profile[subkey] + } else { + return userStore.my[keystr] + } + } else if (table === 'todos') { + // console.log('id', id, 'idmain', idmain) + const indcat = Todos.state.categories.indexOf(idmain) + console.log('indcat', indcat) + if (indcat >= 0) { + const myrec = Todos.state.todos[indcat].find((rec) => rec._id === id) + console.log('myrec', myrec) + let ris = null + if (myrec) { + ris = myrec[keystr] + } + console.log('ris', ris) + return ris + } + + return '' + } else { + const ris = globalStore.getters.getValueSettingsByKey(keystr, serv) + + if (ris === '') + if (def !== undefined) + return def + else + return '' + else + return ris + } + + }, + + getkey(youtube: boolean, title: string, isnum: boolean) { + let mykey = 'MP4' + if (youtube) + mykey = 'YT' + + if (isnum) { + mykey += '_NUM' + } else { + if (title) + mykey += '_TITLE_' + else + mykey += '_VIDEO_' + } + + return mykey + }, + + heightgallvideo() { + const h = this.heightgallery(this.getValDb('YT_W', false) / this.getValDb('YT_H', false)) + return h + }, + + getvideourl(index: number, youtube: boolean) { + const myvideo = this.getValDb(this.getkey(youtube, false, false) + index, false) + if (myvideo) + if (youtube) + return myvideo + else + return this.getpath(myvideo) + else + return '' + }, + + getvideonum(youtube: boolean) { + return this.getValDb(this.getkey(youtube, false, true), false) + }, + + getvideomp4yt(index: number) { + return [{ src: 'https://www.youtube.com/embed/' + this.getvideourl(index, true), type: 'video/mp4' } + ] + }, + getvideomp4src(index: number) { + return [{ src: this.getvideourl(index, false), type: 'video/mp4' } + ] + }, + + getvideoyt(index: number) { + return 'https://www.youtube.com/embed/' + this.getvideourl(index, true) + }, + + getvideobyidyoutube(key: string) { + return 'https://www.youtube.com/embed/' + key + }, + + getpath(myvideo: string) { + return 'statics/video/' + func_this.getLocale() + '/' + myvideo + }, + mygetarrValDb(keystr: string, serv: boolean) { + const globalStore = useGlobalStore() + const myval = globalStore.getters.getValueSettingsByKey(keystr, serv) + // console.log('AA: myval', myval) + try { + if (myval) { + // console.log(' Entro') + const myrec = JSON.parse(myval) + // console.log('*************** getarrValDb') + // console.table(myrec) + return myrec + } else { + // console.log('NO MYVAL') + return [] + } + } catch (e) { + console.log('Errore: ', e) + return [] + } + }, + + getvideotitle(index: number, youtube: boolean) { + + const mykey = this.getkey(youtube, true, false) + index + const ris = this.mygetarrValDb(mykey, false) + + return this.getelembylang(ris) + }, + + getvideoposter(index) { + return '' + }, + clone(obj: any) { + if (null === obj || 'object' !== typeof obj) return obj + const copy = obj.constructor() + for (const attr in obj) { + if (obj.hasOwnProperty(attr)) copy[attr] = obj[attr] + } + return copy + }, + + geticon(langin) { + if (langin === '') + return '' + try { + const lang = langin.toUpperCase() + + const arrlang = ['IT', 'ES', 'PT', 'BR', 'US', 'GB', 'UK', 'DE', 'FR', 'SI', 'MD', 'IE', 'KE', 'AU', 'ML', 'DO', + 'NG', 'SK', 'CH', 'CM', 'CO', 'CG', 'PE', 'MS', 'SM', 'HR', 'RO', 'VE', 'CL', 'PL', 'EG', 'AR', 'MX', 'SN', 'PK', 'AT', 'NP', + 'CU', 'MA', 'PH', 'BA', 'UA', 'BE', 'NL', 'CI', 'BF'] + + const flag = arrlang.find((mylang) => mylang === lang) + if (!!flag) { + return 'fa-flag-' + flag.toLowerCase() + } + + return '' + + } catch (e) { + return '' + } + }, + + removespaces(mystr: string) { + return mystr.replace(/\s+/g, '') + }, + + copyStringToClipboard(mythis: any, mystr: string, show: boolean) { + copyToClipboard(mystr).then(() => { + let msg = mythis.t('dialog.copyclipboard') + if (show) + msg += ' \'' + mystr + '\'' + + this.showNotif(mythis.$q, msg) + }) + + }, + + getlinkhref(mylink: string, text: string) { + return '' + text + '' + }, + + getNationsByNationality(nat: string) { + if (!nat) + return '' + + nat = nat.toUpperCase() + + if (nat === 'IT') { + return 'Italy' + } else if (nat === 'SI') { + return 'Slovenia' + } else if (nat === 'SK') { + return 'Slovakia' + } else if (nat === 'NG') { + return 'Nigeria' + } else if (nat === 'MD') { + return 'Moldova' + } else if (nat === 'ES') { + return 'Spain' + } else if (nat === 'DE') { + return 'Germany' + } else if (nat === 'FR') { + return 'France' + } else if (nat === 'US') { + return 'United States' + } else if (nat === 'CA') { + return 'Canada' + } else if (nat === 'MA') { + return 'Morocco' + } else if (nat === 'LT') { + return 'Lithuania' + } else if (nat === 'HR') { + return 'Croatia' + } else if (nat === 'HU') { + return 'Hungary' + } else if (nat === 'CH') { + return 'Switzerland' + } else if (nat === 'CM') { + return 'Cameroon' + } else if (nat === 'CO') { + return 'Colombia' + } else if (nat === 'PE') { + return 'Peru' + } else if (nat === 'PL') { + return 'Poland' + } else if (nat === 'SM') { + return 'San Marino' + } else if (nat === 'PT') { + return 'Portugal' + } else if ((nat === 'UK') || (nat === 'GB')) { + return 'United Kingdom' + } else if (nat === 'UA') { + return 'Ukraine' + } else if (nat === 'RO') { + return 'Romania' + } else if (nat === 'VE') { + return 'Venezuela' + } else if (nat === 'CL') { + return 'Chile' + } else if (nat === 'PL') { + return 'Poland' + } else if (nat === 'EG') { + return 'Egypt' + } else if (nat === 'BR') { + return 'Brazil' + } else if (nat === 'CG') { + return 'Congo' + } else if (nat === 'AR') { + return 'Argentina' + } else if (nat === 'MX') { + return 'Mexico' + } else if (nat === 'SN') { + return 'Senegal' + } else if (nat === 'PK') { + return 'Pakistan' + } else if (nat === 'AT') { + return 'Austria' + } else if (nat === 'NP') { + return 'Nepal' + } else if (nat === 'CU') { + return 'Cuba' + } else if (nat === 'MA') { + return 'Morocco' + } else if (nat === 'PH') { + return 'Philippines' + } else if (nat === 'BA') { + return 'Bosnia and Herzegovina' + } else if (nat === 'BE') { + return 'Belgium' + } else if (nat === 'NL') { + return 'Netherlands' + } else if (nat === 'MS') { + return 'Montserrat' + } else if (nat === 'CI') { + return 'Cote d\'Ivoire' + } else if (nat === 'BF') { + return 'Burkina Faso' + } else if (nat === 'IE') { + return 'Ireland' + } else if (nat === 'KE') { + return 'Kenya' + } else if (nat === 'AU') { + return 'Australia' + } else if (nat === 'ML') { + return 'Mali' + } else if (nat === 'DO') { + return 'Dominican Republic' + } + }, + + getGroupById(myid: string) { + const globalStore = useGlobalStore() + const group = globalStore.groups.find((rec) => rec._id === myid) + if (group) { + return group.descr + } + return '' + }, + + getLinkZoom() { + let id = '' + const globalStore = useGlobalStore() + if (globalStore.calzoom.length > 0) { + id = globalStore.calzoom.slice(-1)[0].id_conf_zoom.toString() + } else { + id = '6668882000' + } + return 'https://zoom.us/j/' + id + }, + + myprintf(val: string, params: any[]) { + + params.forEach((par) => { + val = val.replace('{' + par.strin + '}', par.strout) + }) + return val + }, + + translate(params: string, options?: any) { + const msg = params.split('.') + const lang = toolsext.getLocale() + + const stringa = messages[lang] + + let ris = stringa + if (!!ris) { + msg.forEach((param) => { + ris = ris[param] + }) + + if (!!options) { + ris = this.myprintf(ris, options) + } + + } else { + console.log('ERRORE IN TRANSLATE! ', params, ' NON ESISTE!') + return params + } + + return ris + }, + + isSel2Metodi(user: IUserFields) { + if (user.profile.paymenttypes) { + return user.profile.paymenttypes.length > 1 + } + return false + + }, + + getnumrequisiti(user: IUserFields) { + let req = 0 + + req += user.verified_email ? 1 : 0 + req += user.profile.teleg_id > 0 ? 1 : 0 + req += this.isBitActive(user.profile.saw_and_accepted, shared_consts.Accepted.CHECK_READ_GUIDELINES.value) ? 1 : 0 + req += this.isBitActive(user.profile.saw_and_accepted, shared_consts.Accepted.CHECK_SEE_VIDEO_PRINCIPI.value) ? 1 : 0 + // req += user.profile.saw_zoom_presentation ? 1 : 0 + // if (!!user.profile.my_dream) + // req += user.profile.my_dream.length >= 10 ? 1 : 0 + req += this.isSel2Metodi(user) ? 1 : 0 + + return req + }, + + Is7ReqOk(user: IUserFields) { + return this.getnumrequisiti(user) === 7 + }, + + getRiganave(riga: number) { + let ris = riga - 3 + if (ris <= 1) + ris = 1 + + return ris + }, + + getColnave(col: number) { + let ris = Math.ceil(col / (2 * 4)) + if (ris <= 1) + ris = 1 + return ris + }, + + getrigacolstr(mianave: any) { + return this.getRiganave(mianave.riga) + '.' + this.getColnave(mianave.col) + }, + + getlastnavestr(lastnave: any) { + return lastnave.riga + '.' + lastnave.col + }, + + getmaxcol(riga: number) { + + return Math.pow(2, riga - 1) + }, + + getrigaNaveByPosiz(riga: number) { + let ris = riga + 3 + if (ris <= 1) + ris = 1 + return ris + + }, + + getcolNaveByPosiz(col: number) { + let ris = Math.ceil(col * Math.pow(2, 3)) + if (ris <= 1) + ris = 1 + return ris + }, + + getfirstnaveSognatore(riga: number, col: number) { + const myriga = this.getrigaNaveByPosiz(riga) + const mycol = this.getcolNaveByPosiz(col) + + // console.log(`${riga}.${col} => ${myriga}.${mycol}`) + return { riga: myriga, col: mycol } + }, + + getnumnavi_finoa(naveorig: any, navedest: any, lastnave: any) { + let contaattuale = 0 + let contatot = 0 + + const indrigaattuale = lastnave.riga + const indcolattuale = lastnave.col + + if (navedest.riga < indrigaattuale) { + return { perc: 100, totale: 0, contaattuale: 0 } + } + + for (let indriga = naveorig.riga; indriga <= navedest.riga; indriga++) { + + let startcol = 0 + if (indriga === naveorig.riga) { + startcol = naveorig.col + } + let endcol = this.getmaxcol(indriga) + if (indriga === navedest.riga) { + endcol = navedest.col + } + + if (indriga <= navedest.riga) { + contatot += (endcol - startcol) + } + + if (indriga < indrigaattuale) { + contaattuale += (endcol - startcol) + } else if (indriga === indrigaattuale) { + contaattuale += indcolattuale + } + } + + let perc = 0 + if (contatot > 0) + perc = (contaattuale / contatot) * 100 + + if (perc > 100) + perc = 100 + + // console.log('naveorig', naveorig.riga, '.', naveorig.col, 'dest', navedest.riga, ',', navedest.col) + // console.log('lastnave', lastnave.riga, '.', lastnave.col) + // console.log('contaattuale', contaattuale, 'contatot', contatot, 'perc', perc) + + return { perc, totale: contatot, contaattuale } + }, + + sito_online(pertutti: boolean) { + + let ris = true + const online = this.getValDb('SITO_ONLINE', false, true) + ris = userStore.isAdmin && !pertutti ? true : online + // console.log('isadmin', userStore.isAdmin) + return ris + }, + + getsize() { + if (this.isMobile()) { + return '0.85rem' + } else { + return '1rem' + } + }, + + getsizesmall() { + if (this.isMobile()) { + return '0.75rem' + } else { + return '0.85rem' + } + }, + + convertiTagHTMLPerBOT(msg: string) { + + msg = msg.replace(//g, '') + msg = msg.replace(/<\/strong>/g, '') + + return msg + }, + + getlinkstd(link: string) { + let mylink = link + if (!!link) { + if (!link.startsWith('http')) { + mylink = 'https://' + link + } + } + + return mylink + }, + + isselectPaypal() { + if (userStore.my.profile) { + if (userStore.my.profile.paymenttypes) { + if (userStore.my.profile.paymenttypes.includes('paypal')) { + return true + } + } + + return false + } + }, + + isselectPayeer() { + if (userStore.my.profile) { + if (userStore.my.profile.paymenttypes) { + if (userStore.my.profile.paymenttypes.includes('payeer')) { + return true + } + } + + return false + } + }, + + isselectRevolut() { + if (userStore.my.profile) { + if (userStore.my.profile.paymenttypes) { + if (userStore.my.profile.paymenttypes.includes('revolut')) { + return true + } + } + + return false + } + }, + + isselectAdvCash() { + if (userStore.my.profile) { + if (userStore.my.profile.paymenttypes) { + if (userStore.my.profile.paymenttypes.includes('advcash')) { + return true + } + } + + return false + } + }, + + getGroupList() { + const globalStore = useGlobalStore() + + // console.log('globalStore.groups', globalStore.groups) + const mylist = { + it: [], + es: [], + enUs: [] + } + + let myrec = {} + + for (const mygroup of globalStore.groups) { + myrec = { + id: mygroup._id, + label: mygroup.descr, + value: mygroup._id + } + mylist.it.push(myrec) + + } + + return mylist + }, + + getRespList() { + + // console.log('globalStore.groups', globalStore.groups) + const mylist = { + it: [], + es: [], + enUs: [] + } + + let myrec = {} + + const globalStore = useGlobalStore() + + for (const myresp of globalStore.resps) { + myrec = { + id: myresp._id, + label: myresp.name + ' ' + myresp.surname, + value: myresp.username + } + mylist.it.push(myrec) + + } + + return mylist + }, + + getWorkersList() { + + // console.log('globalStore.groups', globalStore.groups) + const mylist = { + it: [], + es: [], + enUs: [] + } + + let myrec = {} + + const globalStore = useGlobalStore() + + for (const myresp of globalStore.workers) { + myrec = { + id: myresp._id, + label: myresp.name + ' ' + myresp.surname, + value: myresp.username + } + mylist.it.push(myrec) + + } + + return mylist + }, + + IsLogged() { + if (!!UserStore) + return userStore.isLogged + else + return false + }, + + formatDate(mydate: any) { + let d = void 0 + + if (mydate !== void 0) { + d = new Date(mydate) + } else { + d = new Date() + } + const month = '' + (d.getMonth() + 1) + const day = '' + d.getDate() + const year = d.getFullYear() + + return [year, this.padTime(month), this.padTime(day)].join('-') + }, + + firstDayOfDate(mydate: any) { + let d = void 0 + + if (mydate !== void 0) { + d = new Date(mydate) + } else { + d = new Date() + } + const month = d.getMonth() + const day = 1 + const year = d.getFullYear() + + return new Date(year, month, day) + }, + + LastDayOfDate(mydate: any) { + let d = void 0 + + if (mydate !== void 0) { + d = new Date(mydate) + } else { + d = new Date() + } + let month = d.getMonth() + if (month === 11) + month = 0 + else + month++ + const year = d.getFullYear() + + return new Date(year, month, 0) + }, + + formatTime(mydate: any) { + const d = mydate !== void 0 ? new Date(mydate) : new Date(), + hours = '' + d.getHours(), + minutes = '' + d.getMinutes() + + return [this.padTime(hours), this.padTime(minutes)].join(':') + }, + colourNameToHex(colour: string) { + const colours = { + 'aliceblue': '#f0f8ff', + 'antiquewhite': '#faebd7', + 'aqua': '#00ffff', + 'aquamarine': '#7fffd4', + 'azure': '#f0ffff', + 'beige': '#f5f5dc', + 'bisque': '#ffe4c4', + 'black': '#000000', + 'blanchedalmond': '#ffebcd', + 'blue': '#0000ff', + 'blueviolet': '#8a2be2', + 'brown': '#a52a2a', + 'burlywood': '#deb887', + 'cadetblue': '#5f9ea0', + 'chartreuse': '#7fff00', + 'chocolate': '#d2691e', + 'coral': '#ff7f50', + 'cornflowerblue': '#6495ed', + 'cornsilk': '#fff8dc', + 'crimson': '#dc143c', + 'cyan': '#00ffff', + 'darkblue': '#00008b', + 'darkcyan': '#008b8b', + 'darkgoldenrod': '#b8860b', + 'darkgray': '#a9a9a9', + 'darkgreen': '#006400', + 'darkkhaki': '#bdb76b', + 'darkmagenta': '#8b008b', + 'darkolivegreen': '#556b2f', + 'darkorange': '#ff8c00', + 'darkorchid': '#9932cc', + 'darkred': '#8b0000', + 'darksalmon': '#e9967a', + 'darkseagreen': '#8fbc8f', + 'darkslateblue': '#483d8b', + 'darkslategray': '#2f4f4f', + 'darkturquoise': '#00ced1', + 'darkviolet': '#9400d3', + 'deeppink': '#ff1493', + 'deepskyblue': '#00bfff', + 'dimgray': '#696969', + 'dodgerblue': '#1e90ff', + 'firebrick': '#b22222', + 'floralwhite': '#fffaf0', + 'forestgreen': '#228b22', + 'fuchsia': '#ff00ff', + 'gainsboro': '#dcdcdc', + 'ghostwhite': '#f8f8ff', + 'gold': '#ffd700', + 'goldenrod': '#daa520', + 'gray': '#808080', + 'green': '#008000', + 'greenyellow': '#adff2f', + 'honeydew': '#f0fff0', + 'hotpink': '#ff69b4', + 'indianred ': '#cd5c5c', + 'indigo': '#4b0082', + 'ivory': '#fffff0', + 'khaki': '#f0e68c', + 'lavender': '#e6e6fa', + 'lavenderblush': '#fff0f5', + 'lawngreen': '#7cfc00', + 'lemonchiffon': '#fffacd', + 'lightblue': '#add8e6', + 'lightcoral': '#f08080', + 'lightcyan': '#e0ffff', + 'lightgoldenrodyellow': '#fafad2', + 'lightgrey': '#d3d3d3', + 'lightgreen': '#90ee90', + 'lightpink': '#ffb6c1', + 'lightsalmon': '#ffa07a', + 'lightseagreen': '#20b2aa', + 'lightskyblue': '#87cefa', + 'lightslategray': '#778899', + 'lightsteelblue': '#b0c4de', + 'lightyellow': '#ffffe0', + 'lime': '#00ff00', + 'limegreen': '#32cd32', + 'linen': '#faf0e6', + 'magenta': '#ff00ff', + 'maroon': '#800000', + 'mediumaquamarine': '#66cdaa', + 'mediumblue': '#0000cd', + 'mediumorchid': '#ba55d3', + 'mediumpurple': '#9370d8', + 'mediumseagreen': '#3cb371', + 'mediumslateblue': '#7b68ee', + 'mediumspringgreen': '#00fa9a', + 'mediumturquoise': '#48d1cc', + 'mediumvioletred': '#c71585', + 'midnightblue': '#191970', + 'mintcream': '#f5fffa', + 'mistyrose': '#ffe4e1', + 'moccasin': '#ffe4b5', + 'navajowhite': '#ffdead', + 'navy': '#000080', + 'oldlace': '#fdf5e6', + 'olive': '#808000', + 'olivedrab': '#6b8e23', + 'orange': '#ffa500', + 'orangered': '#ff4500', + 'orchid': '#da70d6', + 'palegoldenrod': '#eee8aa', + 'palegreen': '#98fb98', + 'paleturquoise': '#afeeee', + 'palevioletred': '#d87093', + 'papayawhip': '#ffefd5', + 'peachpuff': '#ffdab9', + 'peru': '#cd853f', + 'pink': '#ffc0cb', + 'plum': '#dda0dd', + 'powderblue': '#b0e0e6', + 'purple': '#800080', + 'rebeccapurple': '#663399', + 'red': '#ff0000', + 'rosybrown': '#bc8f8f', + 'royalblue': '#4169e1', + 'saddlebrown': '#8b4513', + 'salmon': '#fa8072', + 'sandybrown': '#f4a460', + 'seagreen': '#2e8b57', + 'seashell': '#fff5ee', + 'sienna': '#a0522d', + 'silver': '#c0c0c0', + 'skyblue': '#87ceeb', + 'slateblue': '#6a5acd', + 'slategray': '#708090', + 'snow': '#fffafa', + 'springgreen': '#00ff7f', + 'steelblue': '#4682b4', + 'tan': '#d2b48c', + 'teal': '#008080', + 'thistle': '#d8bfd8', + 'tomato': '#ff6347', + 'turquoise': '#40e0d0', + 'violet': '#ee82ee', + 'wheat': '#f5deb3', + 'white': '#ffffff', + 'whitesmoke': '#f5f5f5', + 'yellow': '#ffff00', + 'yellowgreen': '#9acd32' + } + + if (typeof colours[colour.toLowerCase()] != 'undefined') + return colours[colour.toLowerCase()] + + return false + } + +// getLocale() { + // if (navigator.languages && navigator.languages.length > 0) { + // return navigator.languages[0] + // } else { + // return navigator.userLanguages || navigator.language || navigator.browserLanguages || 'it-IT' + // } + // } } diff --git a/src/store/Products.ts b/src/store/Products.ts new file mode 100755 index 00000000..f1da89c8 --- /dev/null +++ b/src/store/Products.ts @@ -0,0 +1,382 @@ +import { IBaseOrder, ICart, IOrder, IOrderCart, IProduct, IProductsState } from 'model' + +import Api from '@api' +import { serv_constants } from '@src/store/Modules/serv_constants' +import * as Types from '@src/store/Api/ApiTypes' +import { static_data } from '@src/db/static_data' +import { shared_consts } from '@src/common/shared_vuejs' +import { tools } from "@store/Modules/tools" +import { defineStore } from "pinia" +import { useUserStore } from '@store/UserStore' +import { toolsext } from "@store/Modules/toolsext" + +export const useProducts = defineStore('Products', { + state: (): IProductsState => ({ + products: [], + cart: { items: [], totalPrice: 0, totalQty: 0, userId: '' }, + orders: [] + }), + + getters: { + getProducts: (state: IProductsState) => (): IProduct[] => { + return state.products + }, + + getCart: (state: IProductsState) => (): ICart => { + return state.cart + }, + + getOrdersAllCart: (state: IProductsState) => (): IOrderCart[] => { + return state.orders + }, + + getOrdersCart: (state: IProductsState) => (tipoord: string): IOrderCart[] | undefined => { + console.log('state.orders', state.orders) + if (tipoord === 'incorso') + return state.orders.filter((rec: IOrderCart) => (rec.status ? rec.status : 0) <= shared_consts.OrderStatus.CHECKOUT_SENT) + else if (tipoord === 'confermati') + return state.orders.filter((rec: IOrderCart) => rec.status === shared_consts.OrderStatus.ORDER_CONFIRMED) + else if (tipoord === 'pagati') + return state.orders.filter((rec: IOrderCart) => rec.status === shared_consts.OrderStatus.PAYED) + else if (tipoord === 'completati') + return state.orders.filter((rec: IOrderCart) => rec.status === shared_consts.OrderStatus.RECEIVED) + else if (tipoord === 'cancellati') + return state.orders.filter((rec: IOrderCart) => rec.status === shared_consts.OrderStatus.CANCELED) + }, + + existProductInCart: (state: IProductsState) => (idproduct: string): boolean => { + // console.log('.cart.items', this.cart.items) + if (state.cart.items) { + const ris = state.cart.items.filter((item: IBaseOrder) => item.order.idProduct === idproduct).reduce((sum, rec) => sum + 1, 0) + return ris > 0 + } + return false + }, + + getRecordEmpty: (state: IProductsState) => (): IProduct => { + + const tomorrow = tools.getDateNow() + tomorrow.setDate(tomorrow.getDate() + 1) + + return { + // _id: tools.getDateNow().toISOString(), // Create NEW + active: false, + idProducer: '', + idStorehouses: [], + producer: {}, + storehouses: [], + code: '', + name: '', + description: '', + department: '', + category: '', + price: 0.0, + color: '', + size: '', + quantityAvailable: 0, + canBeShipped: false, + canBeBuyOnline: false, + weight: 0, + stars: 0, + date: tools.getDateNow(), + icon: '', + img: '' + } + } + + }, + + actions: { + getProductsByCategory(category: string): any[] { + return this.products.filter((rec) => rec.category === category) + }, + + createOrderByProduct(product: IProduct, order: IOrder): IOrder { + const userStore = useUserStore() + const myorder: IOrder = { + userId: userStore.my._id, + idapp: process.env.APP_ID, + idProduct: product._id, + idProducer: product.idProducer, + status: shared_consts.OrderStatus.IN_CART, + price: product.price, + after_price: product.after_price, + color: product.color, + size: product.size, + weight: product.weight, + + quantity: order.quantity, + idStorehouse: order.idStorehouse + } + + if (product.storehouses.length === 1) { + order.idStorehouse = product.storehouses[0]._id + } + + return myorder + }, + + initcat() { + + // rec.userId = userStore.my._id + + return this.getRecordEmpty() + + }, + + async loadProducts() { + + const userStore = useUserStore() + console.log('loadProducts') + + if (!static_data.functionality.ENABLE_ECOMMERCE) + return null + + console.log('getProducts', 'userid=', userStore.my._id) + + // if (userStore.my._id === '') { + // return new Types.AxiosError(0, null, 0, '') + // } + + let ris = null + + ris = await Api.SendReq('/products', 'POST', null) + .then((res) => { + if (res.data.products) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories) + this.products = res.data.products + } else { + this.products = [] + } + + // console.log('ARRAY PRODUCTS = ', this.products) + if (process.env.DEBUG === '1') { + // console.log('dbLoad', 'this.products', this.products) + } + + return res + }) + .catch((error) => { + console.log('error getProducts', error) + userStore.setErrorCatch(error) + return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, error) + }) + + // ApiTables.aftercalling(ris, checkPending, 'categories') + + return ris + }, + + async loadProduct({ code }: {code: any}) { + + console.log('loadProduct', code) + const userStore = useUserStore() + + if (!static_data.functionality.ENABLE_ECOMMERCE) + return null + + console.log('getProduct', 'code', code) + + // if (userStore.my._id === '') { + // return new Types.AxiosError(0, null, 0, '') + // } + + let ris = null + + ris = await Api.SendReq('/products/' + code, 'POST', { code }) + .then((res) => { + console.log('product', res.data.product) + if (res.data.product) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories) + return res.data.product + } else { + return null + } + }) + .catch((error) => { + console.log('error getProduct', error) + userStore.setErrorCatch(error) + return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, error) + }) + + return ris + }, + + async loadOrders() { + + console.log('loadOrders') + const userStore = useUserStore() + + if (!static_data.functionality.ENABLE_ECOMMERCE) + return null + + console.log('loadOrders', 'userid=', userStore.my._id) + + // if (userStore.my._id === '') { + // return new Types.AxiosError(0, null, 0, '') + // } + + let ris = null + + ris = await Api.SendReq('/cart/' + userStore.my._id, 'GET', null) + .then((res) => { + if (res.data.cart) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories) + this.cart = res.data.cart + } else { + this.cart = { items: [], totalPrice: 0, totalQty: 0, userId: '' } + } + + return res + }) + .catch((error) => { + console.log('error loadOrders', error) + userStore.setErrorCatch(error) + return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, error) + }) + + // ApiTables.aftercalling(ris, checkPending, 'categories') + + return ris + }, + + async removeFromCart({ order }: {order: IOrder}) { + + const userStore = useUserStore() + + return await Api.SendReq('/cart/' + userStore.my._id, 'DELETE', { orderId: order._id }) + .then((res) => { + if (res.data.cart) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories) + this.cart = res.data.cart + } else { + this.cart = { items: [], totalPrice: 0, totalQty: 0, userId: '' } + } + + return res + }) + }, + + async addToCart({ product, order }: {product: IProduct, order: IOrder}) { + + const userStore = useUserStore() + + if (!static_data.functionality.ENABLE_ECOMMERCE) + return null + + const neworder = this.createOrderByProduct(product, order) + + if (!neworder.idStorehouse) + return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, 'Nessuno Store') + + console.log('addToCart', 'userid=', userStore.my._id, neworder) + + let ris = null + + ris = await Api.SendReq('/cart/' + userStore.my._id, 'POST', { order: neworder }) + .then((res) => { + if (res.data.cart) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories) + this.cart = res.data.cart + } else { + this.cart = { items: [], totalPrice: 0, totalQty: 0, userId: '' } + } + + return res + }) + .catch((error) => { + console.log('error addToCart', error) + userStore.setErrorCatch(error) + return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, error) + }) + + // ApiTables.aftercalling(ris, checkPending, 'categories') + + return ris + }, + + async addSubQtyToItem({ addqty, subqty, order } : { addqty: number, subqty: number, order: IOrder}) { + + const userStore = useUserStore() + if (!static_data.functionality.ENABLE_ECOMMERCE) + return null + + // console.log('addSubQtyToItem', 'userid=', userStore.my._id, order) + + let ris = null + + ris = await Api.SendReq('/cart/' + userStore.my._id, 'POST', { addqty, subqty, order }) + .then((res) => { + this.cart = res.data.cart + if (!!res.data.qty) { + // const ind = this.cart.items.findIndex((rec) => rec.order._id === order._id) + // this.cart.items[ind].order.quantity = res.data.qty + + return res.data.qty + } + + return 0 + }) + .catch((error) => { + console.log('error addSubQtyToItem', error) + userStore.setErrorCatch(error) + return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, error) + }) + + // ApiTables.aftercalling(ris, checkPending, 'categories') + + return ris + }, + + async UpdateStatusCart({ cart_id, status }: { cart_id:string, status: number }) { + + const userStore = useUserStore() + + if (!static_data.functionality.ENABLE_ECOMMERCE) + return null + + // console.log('addSubQtyToItem', 'userid=', userStore.my._id, order) + + let ris = null + + ris = await Api.SendReq('/cart/' + userStore.my._id + '/cartstatus', 'POST', { cart_id, status }) + .then((res) => { + + if (res.data.status === shared_consts.OrderStatus.CHECKOUT_SENT) { + this.cart = {} + if (res.data.orders) + this.orders = res.data.orders + } + return res.data.status + }) + .catch((error) => { + console.log('error UpdateStatusCart', error) + userStore.setErrorCatch(error) + return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, error) + }) + + return ris + }, + + async UpdateOrderStatus({ order_id, status }: { order_id: string, status: number }) { + + const userStore = useUserStore() + + if (!static_data.functionality.ENABLE_ECOMMERCE) + return null + + // console.log('addSubQtyToItem', 'userid=', userStore.my._id, order) + + let ris = null + + ris = await Api.SendReq('/cart/' + userStore.my._id + '/orderstatus', 'POST', { order_id, status }) + .then((res) => { + return res.data.status + }) + .catch((error) => { + console.log('error UpdateOrderStatus', error) + userStore.setErrorCatch(error) + return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, error) + }) + + return ris + }, + } + +}) + diff --git a/src/store/Projects.ts b/src/store/Projects.ts new file mode 100755 index 00000000..65c7a258 --- /dev/null +++ b/src/store/Projects.ts @@ -0,0 +1,558 @@ +import { IProject, IProjectsState, IDrag, IMenuList, IAction } from 'model' +import { Privacy, TipoVisu } from '@src/model' + +import Api from '@api' +import { tools } from './Modules/tools' +import { toolsext } from '@src/store/Modules/toolsext' +import { lists } from './Modules/lists' +import * as ApiTables from './Modules/ApiTables' +import globalroutines from './../globalroutines/index' +import objectId from '@src/js/objectId' +import { costanti } from '@src/store/Modules/costanti' +import { RouteNames } from '@src/router/route-names' +import * as Types from '@src/store/Api/ApiTypes' +import { serv_constants } from '@src/store/Modules/serv_constants' +import { static_data } from '@src/db/static_data' +import { defineStore } from "pinia" +import { useUserStore } from "@store/UserStore" +import { useGlobalStore } from "@store/globalStore" + +const nametable = 'projects' + +// import _ from 'lodash' + + +const listFieldsToChange: string [] = ['descr', 'respUsername', 'viceRespUsername', 'vice2RespUsername', 'longdescr', 'hoursplanned', 'hoursleft', 'hoursworked', 'id_parent', 'statusproj', + 'category', 'expiring_at', 'priority', 'pos', 'groupId', 'enableExpiring', 'progressCalc', 'live_url', 'test_url', + 'begin_development', 'begin_test', 'actualphase', 'totalphases', 'hoursweeky_plannedtowork', 'endwork_estimate', + 'privacyread', 'privacywrite', 'tipovisu', 'id_main_project', 'typeproj', 'favourite', 'themecolor', 'themebgcolor', 'view'] + +const listFieldsUpdateCalculation: string [] = ['hoursplanned', 'hoursleft', 'hoursworked', 'progressCalc', 'endwork_estimate'] + +export const useProjectStore = defineStore('Projects', { + state: (): IProjectsState => ({ + showtype: costanti.ShowTypeTask.SHOW_LAST_N_COMPLETED, + projects: [], + insidePending: false, + visuLastCompleted: 10 + }), + + getters: { + + getRecordEmpty: (state: IProjectsState) => (): IProject => { + // const tomorrow = tools.getDateNow() + // tomorrow.setDate(tomorrow.getDate() + 1) + + const obj: IProject = { + _id: objectId(), + descr: '', + longdescr: '', + typeproj: 0, + id_parent: '', + id_main_project: '', + priority: tools.Priority.PRIORITY_NORMAL, + statusproj: tools.Status.OPENED, + created_at: tools.getDateNow(), + modify_at: tools.getDateNow(), + completed_at: tools.getDateNull(), + category: '', + // expiring_at: tomorrow, + enableExpiring: false, + pos: 0, + modified: false, + live_url: '', + test_url: '', + totalphases: 1, + actualphase: 1, + hoursworked: 0, + hoursplanned: 0, + hoursleft: 0, + progressCalc: 0, + privacyread: 'inherited', + privacywrite: 'inherited', + begin_development: tools.getDateNull(), + begin_test: tools.getDateNull(), + hoursweeky_plannedtowork: 0, + endwork_estimate: tools.getDateNull(), + themecolor: '', + themebgcolor: '', + groupId: '', + respUsername: '', + viceRespUsername: '', + vice2RespUsername: '', + tipovisu: 0 + } + + return obj + }, + + projs_dacompletare: (state: IProjectsState) => (id_parent: string, tipoproj: string): IProject[] => { + // console.log('projs_dacompletare') + if (state.projects) { + // console.log('projs_dacompletare', state.projects) + // @ts-ignore + return this.getproj(state.projects, id_parent, tipoproj) + } else { + return [] + } + }, + + listaprojects: (state: IProjectsState) => (tipoproj: string): IMenuList[] => { + if (state.projects) { + console.log('listaprojects') + // @ts-ignore + const listaproj = this.getproj(state.projects, process.env.PROJECT_ID_MAIN, tipoproj) + const myarr: IMenuList[] = [] + for (const proj of listaproj) { + myarr.push({ nametranslate: '', description: proj.descr, idelem: proj._id }) + } + console.log(' myarr', myarr, listaproj) + return myarr + + } else { + return [] + } + }, + + listagerarchia: (state: IProjectsState) => (tipoproj: string, idparent: string): IMenuList[] => { + if (state.projects) { + // console.log('listagerarchia', idparent) + const myarrgerarchia: IMenuList[] = [] + let myidparent = idparent + let precmyparent = '-1' + + while (state.projects && myidparent) { + const proj = state.projects.find((rec) => rec._id === myidparent) + if (proj) { + myarrgerarchia.push({ nametranslate: '', description: proj.descr, idelem: proj._id }) + } else { + break + } + if (myidparent === proj.id_parent || (!proj.id_parent && (precmyparent === myidparent))) + break + precmyparent = myidparent + myidparent = proj.id_parent! + } + // console.log(' myarrgerarchia', myarrgerarchia) + return myarrgerarchia.reverse() + + } else { + return [] + } + }, + + getDescrById: (state: IProjectsState) => (id: string): string => { + if (id === process.env.PROJECT_ID_MAIN) + return 'Projects' + if (state.projects) { + const itemtrov = state.projects.find((item) => item._id === id) + if (!!itemtrov) + return itemtrov.descr! + } + + return '' + }, + + getRecordById: (state: IProjectsState) => (id: string): IProject | null => { + // console.log('state.projects', state.projects) + // console.log('find', state.projects.find((item) => item._id === id)) + if (state.projects) { + return state.projects.find((item) => item._id === id)! + } + return null + }, + + getifCanISeeProj: (state: IProjectsState) => (proj: IProject): boolean => { + if ((proj === undefined) || (proj === null)) + return false + + const userStore = useUserStore() + + if (!!userStore.my) { + + if (userStore.my._id === proj.userId) // If it's the owner + return true + + let myprojtocheck = proj + if (proj.privacyread === Privacy.inherited) { + // @ts-ignore + myprojtocheck = this.getFirstInherited(proj, proj.id_parent, state) + if (!myprojtocheck) + return true + } + + console.log('privacyread', myprojtocheck.privacyread) + + return (userStore.my._id === myprojtocheck.userId) || (myprojtocheck.privacyread === Privacy.all) || + (myprojtocheck.privacyread === Privacy.friends) && (userStore.IsMyFriend(myprojtocheck.userId!)) + || ((myprojtocheck.privacyread === Privacy.mygroup) && (userStore.IsMyGroup(myprojtocheck.userId!))) + + } else { + return false + } + + }, + + getTipoVisuProj: (state: IProjectsState) => (proj: IProject): number => { + if ((proj === undefined) || (proj === null)) + return TipoVisu.simplelist + + const userStore = useUserStore() + + if (!!userStore) { + + let tipovisuproj = proj + if (tipovisuproj.tipovisu === TipoVisu.inherited) { + // @ts-ignore + tipovisuproj = this.getFirstInheritedTipoVisu(proj, proj.id_parent, state) + if (!tipovisuproj) + return TipoVisu.simplelist + } + + return tipovisuproj.tipovisu! + + } else { + return TipoVisu.simplelist + } + + }, + + CanIModifyPanelPrivacy: (state: IProjectsState) => (proj: IProject): boolean => { + if ((proj === undefined) || (proj === null)) + return false + + const userStore = useUserStore() + + if (!!userStore) { + + let myprojtocheck = proj + if (proj.privacywrite === Privacy.inherited) { + // @ts-ignore + myprojtocheck = this.getFirstInherited(proj, proj.id_parent, state) + if (!myprojtocheck) + return true + } + + if (!!userStore) + return (userStore.my._id === myprojtocheck.userId) || (myprojtocheck.privacywrite === Privacy.all) || + (myprojtocheck.privacywrite === Privacy.friends) && (userStore.IsMyFriend(myprojtocheck.userId!)) + || ((myprojtocheck.privacywrite === Privacy.mygroup) && (userStore.IsMyGroup(myprojtocheck.userId!))) + else + return false + } + return false + }, + }, + + + actions: { + + getFirstInherited(proj: IProject, idparent: string) { + let myprojtocheck = null + while (proj.privacyread === Privacy.inherited) { + myprojtocheck = this.projects.find((rec) => rec._id === idparent) + if (!myprojtocheck) + return null + + idparent = myprojtocheck.id_parent! + proj = myprojtocheck + } + return myprojtocheck + }, + + getFirstInheritedTipoVisu(proj: IProject, idparent: string) { + let tipovisuproj = null + while (!proj.tipovisu || proj.tipovisu <= 0) { + tipovisuproj = this.projects.find((rec) => rec._id === idparent) + if (!tipovisuproj) + return null + + idparent = tipovisuproj.id_parent! + proj = tipovisuproj + } + return tipovisuproj!.tipovisu + }, + + getarrByCategory(category: string) { + if (!this.projects) { + return [] + } + return this.projects + }, + + initcat() { + const userStore = useUserStore() + const rec = this.getRecordEmpty() + rec.userId = userStore.my._id + + return rec + }, + + updateDataCalculated(projout: any, projin: any) { + listFieldsUpdateCalculation.forEach((field) => { + projout[field] = projin[field] + }) + }, + + getproj(projects: any, idproj: any, tipoproj: string) { + + let ris = null + + const userStore = useUserStore() + + if (tipoproj === RouteNames.myprojects) + ris = projects.filter((proj: IProject) => (proj.id_parent === idproj) && (proj.userId === userStore.my._id)) + else if (tipoproj === RouteNames.projectsshared) + ris = projects.filter((proj: IProject) => (proj.id_parent === idproj) && (proj.userId === userStore.my._id) && (proj.privacyread !== Privacy.onlyme)) + else if (tipoproj === RouteNames.projectsall) + ris = projects.filter((proj: IProject) => (proj.id_parent === idproj) && (proj.userId !== userStore.my._id)) + else + ris = projects.filter((proj: IProject) => (proj.id_parent === idproj)) + + if (ris) + { // @ts-ignore + ris = ris.sort((a: IProject, b: IProject) => a.pos - b.pos) + } + // console.log('idproj', idproj, 'projects', projects, 'getproj', tipoproj, 'ris=', ris) + + return ris + }, + + createNewItem({ objproj, atfirst, categorySel }: { objproj: IProject, atfirst: boolean, categorySel: string }) { + // console.log('createNewItem', objproj, 'cat=', categorySel, 'this.projects', this.projects) + if (this.projects === undefined) { + this.projects = [] + this.projects.push(objproj) + console.log('push this.projects', this.projects) + return + } + if (atfirst) { + this.projects.unshift(objproj) + } else { + this.projects.push(objproj) + } + }, + + updateProject({ objproj }: { objproj: IProject }) { + if (!!objproj) { + // console.log('updateProject', objproj) + const index = tools.getIndexById(this.projects, objproj._id) + // console.log('index', index) + if (index >= 0) { + this.updateDataCalculated(this.projects[index], objproj) + + // this.projects.splice(index, 1, objproj) + // tools.notifyarraychanged(this.projects) + } + } + }, + + deletemyitem(myitem: IProject) { + // Find record + const ind = tools.getIndexById(this.projects, myitem._id) + + ApiTables.removeitemfromarray(this.projects, ind) + }, + + async movemyitem({ myitemorig, myitemdest }: { myitemorig: IProject, myitemdest: IProject }) { + const indorig = tools.getIndexById(this.projects, myitemorig._id) + + this.projects.splice(indorig, 1) + this.projects.push(myitemdest) + + await this.modify({ myitem: myitemdest, field: 'id_parent' }) + }, + + async dbLoad({ checkPending, onlyiffirsttime }: { checkPending: boolean, onlyiffirsttime: boolean }) { + + if (!static_data.functionality.ENABLE_PROJECTS_LOADING) + return null + + if (onlyiffirsttime) { + if (this.projects.length > 0) { + // if already set, then exit. + return new Types.AxiosError(0, null, 0, '') + } + } + + // if (userStore.my._id === '') { + // return false // Login not made + // } + + // console.log('userStore.my', userStore.my) + + // console.log('dbLoad', nametable, checkPending, 'userid=', userStore.my._id) + + const userStore = useUserStore() + const globalStore = useGlobalStore() + + const ris = await Api.SendReq('/projects/' + userStore.my._id, 'GET', null) + .then((res) => { + if (res.data.projects) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories) + this.projects = res.data.projects + } else { + this.projects = [] + } + + this.showtype = parseInt(globalStore.getConfigStringbyId({ + id: costanti.CONFIG_ID_SHOW_TYPE_TODOS, + default: costanti.ShowTypeTask.SHOW_LAST_N_COMPLETED + }), 10) + + if (process.env.DEBUG === '1') { + console.log('dbLoad', 'this.projects', this.projects) + } + + return res + }) + .catch((error) => { + console.log('error dbLoad', error) + userStore.setErrorCatch(error) + return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, error) + }) + + ApiTables.aftercalling(ris, checkPending, nametable) + }, + + async calculateHoursProjects({ projId, actualphase }: { projId: string, actualphase: string }) { + + let ris = null + + ris = await Api.SendReq('/projects/calc/' + projId + '/' + actualphase, 'GET', null) + .then((res) => { + if (res.data.rec) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories) + return res.data.rec + } + return null + }) + .catch((error) => { + console.log('error calculateHoursProjects', error) + }) + + return ris + }, + + async deleteItem({ idobj }: { idobj: any }) { + console.log('deleteItem: KEY = ', idobj) + + const myarr = this.getarrByCategory('') + + const myobjtrov = tools.getElemById(myarr, idobj) + + console.log('myobjtrov', myobjtrov.descr) + + if (!!myobjtrov) { + /* + const myobjnext = tools.getElemPrevById(myarr, myobjtrov._id) + + if (!!myobjnext) { + myobjnext.pos = myobjtrov.pos + 1 + myobjnext.modified = true + await modify( { myitem: myobjnext, field: 'pos' }) + } + + */ + + // ApiTables.table_DeleteRecord(nametable, myobjtrov, idobj) + ApiTables.table_HideRecord(nametable, myobjtrov, idobj) + } + }, + + async dbInsert({ myobj, atfirst }: { myobj: IProject, atfirst: boolean}) { + + const objproj = this.initcat() + + objproj.descr = myobj.descr + objproj.category = myobj.category + objproj.id_parent = myobj.id_parent + objproj.id_main_project = myobj.id_main_project + objproj.typeproj = myobj.typeproj + objproj.privacyread = myobj.privacyread + objproj.privacywrite = myobj.privacywrite + objproj.actualphase = myobj.actualphase + objproj.tipovisu = myobj.tipovisu + + let elemtochange: IProject = { } + + const myarr = this.getarrByCategory(objproj.category!) + + const tipoProj = '' + + if (atfirst) { + console.log('INSERT AT THE TOP') + elemtochange = tools.getFirstList(myarr) + objproj.pos = 10 + } else { + console.log('INSERT AT THE BOTTOM') + // INSERT AT THE BOTTOM , so GET LAST ITEM + const lastelem = tools.getLastListNotCompleted(nametable, objproj.id_parent!, tipoProj) + + objproj.pos = (!!lastelem) ? lastelem.pos + 10 : 10 + } + objproj.modified = false + + this.createNewItem({ objproj, atfirst, categorySel: objproj.category! }) // 1) Create record in Memory + + const id = await globalroutines('write', nametable, objproj) // 2) Insert into the IndexedDb + + let field = '' + if (atfirst) { // update also the last elem + if (!!elemtochange) { + elemtochange.pos = objproj.pos + console.log('elemtochange', elemtochange) + field = 'pos' + + // Modify the other record + await this.modify({ myitem: elemtochange, field }) + } + } + + // 3) send to the Server + await ApiTables.Sync_SaveItem(nametable, 'POST', objproj) + + return id + }, + + async modify({ myitem, field }: { myitem: any, field: any } ) { + return ApiTables.table_ModifyRecord(nametable, myitem, listFieldsToChange, field) + }, + + async swapElems(itemdragend: IDrag) { + console.log('PROJECT swapElems', itemdragend, this.projects) + + const myarr = this.projs_dacompletare(itemdragend.id_proj!, itemdragend.tipoproj!) + + tools.swapGeneralElem(nametable, myarr, itemdragend, listFieldsToChange) + + }, + + async ActionCutPaste(action: IAction) { + const globalStore = useGlobalStore() + + if (action.type === lists.MenuAction.CUT) { + globalStore.lastaction = action + } else if (action.type === lists.MenuAction.PASTE) { + if (globalStore.lastaction.type === lists.MenuAction.CUT) { + + // Change id_parent + const orig_obj = this.getRecordById(globalStore.lastaction._id) + const dest = this.getRecordById(action._id) + + // console.log('dest', dest) + + const dest_obj = tools.jsonCopy(orig_obj) + + if (!!dest_obj) { + dest_obj.id_parent = dest!._id + dest_obj.id_main_project = dest!.id_main_project + dest_obj.modified = true + + globalStore.lastaction.type = 0 + + return this.movemyitem({ myitemorig: orig_obj!, myitemdest: dest_obj }) + } + } + } + }, + }, +}) diff --git a/src/store/Todos.ts b/src/store/Todos.ts new file mode 100755 index 00000000..e03b4eb9 --- /dev/null +++ b/src/store/Todos.ts @@ -0,0 +1,501 @@ +import { + ITodo, + ITodosState, + IParamTodo, + IDrag, + IAction +} from 'model' + +import Api from '@api' +import { tools } from '@store/Modules/tools' +import { lists } from './Modules/lists' +import * as ApiTables from './Modules/ApiTables' +import globalroutines from './../globalroutines/index' +import { serv_constants } from '@src/store/Modules/serv_constants' +import objectId from '@src/js/objectId' +import { costanti } from '@src/store/Modules/costanti' +import * as Types from '@src/store/Api/ApiTypes' +import { static_data } from '@src/db/static_data' +import { defineStore } from "pinia" +import { useUserStore } from '@store/UserStore' +import { useGlobalStore } from "@store/globalStore" +import { toolsext } from "@store/Modules/toolsext" + +const nametable = 'todos' + +// import _ from 'lodash' + +const state: ITodosState = { + showtype: costanti.ShowTypeTask.SHOW_LAST_N_COMPLETED, + todos: {}, + categories: [], + // todos_changed: 1, + reload_fromServer: 0, + testpao: 'Test', + insidePending: false, + visuLastCompleted: 10 +} + +const listFieldsToChange: string [] = ['descr', 'statustodo', 'category', 'expiring_at', 'priority', 'pos', 'enableExpiring', 'progress', 'phase', 'assigned_to_userId', 'hoursplanned', 'hoursworked', 'start_date', 'completed_at', 'themecolor', 'themebgcolor', 'assignedToUsers'] + + +export const useTodoStore = defineStore('Todos', { + state: (): ITodosState => ( + { + showtype: costanti.ShowTypeTask.SHOW_LAST_N_COMPLETED, + todos: {}, + categories: [], + // todos_changed: 1, + reload_fromServer: 0, + testpao: 'Test', + insidePending: false, + visuLastCompleted: 10, + }), + + getters: { + getindexbycategory: (state: ITodosState) => (category: string): number => { + if (state.categories) { + return state.categories.indexOf(category) + } + return -1 + }, + + getRecordEmpty: (state: ITodosState) => (): ITodo => { + + const userStore = useUserStore() + + const tomorrow = tools.getDateNow() + tomorrow.setDate(tomorrow.getDate() + 1) + + const objtodo: ITodo = { + // _id: tools.getDateNow().toISOString(), // Create NEW + _id: objectId(), + userId: userStore.my._id, + descr: '', + note: '', + priority: tools.Priority.PRIORITY_NORMAL, + statustodo: tools.Status.OPENED, + created_at: tools.getDateNow(), + modify_at: tools.getDateNow(), + completed_at: tools.getDateNull(), + category: '', + expiring_at: tomorrow, + enableExpiring: false, + pos: 0, + modified: false, + progress: 0, + progressCalc: 0, + phase: 0, + assigned_to_userId: '', + hoursplanned: 0, + hoursworked: 0, + start_date: tools.getDateNull(), + themecolor: 'blue', + themebgcolor: 'white', + assignedToUsers: [] + } + // return this.copy(objtodo) + return objtodo + }, + + items_dacompletare: (state: ITodosState) => (cat: string): ITodo[] => { + // console.log('items_dacompletare') + // @ts-ignore + const indcat: number = this.getindexbycategory(cat) + let arrout = [] + // console.log('items_dacompletare', 'indcat', indcat, state.todos[indcat]) + if (indcat >= 0 && state.todos) { + // @ts-ignore + if (state.todos[indcat] ) { + // @ts-ignore + arrout = state.todos[indcat].filter((todo: ITodo) => todo.statustodo !== tools.Status.COMPLETED) + } + } + + if (arrout) + { // @ts-ignore + arrout = arrout.sort((a: ITodo, b: ITodo) => a.pos - b.pos) + } + + // return tools.mapSort(arrout) + return arrout + }, + + todos_completati: (state: ITodosState) => (cat: string): ITodo[] => { + // @ts-ignore + let indcat = this.getindexbycategory(cat) + // console.log('todos_completati', cat, 'indcat=', indcat, 'this.categories=', this.categories) + // @ts-ignore + if (state.todos[indcat]) { + let arrout = [] + if (state.showtype === costanti.ShowTypeTask.SHOW_LAST_N_COMPLETED) { // Show only the first N completed + // @ts-ignore + arrout = state.todos[indcat].filter((todo: ITodo) => todo.statustodo === tools.Status.COMPLETED).slice(0, state.visuLastCompleted) + } else if (state.showtype === costanti.ShowTypeTask.SHOW_ONLY_TOCOMPLETE) { + arrout = [] + } else if (state.showtype === costanti.ShowTypeTask.SHOW_ALL) { + // @ts-ignore + arrout = state.todos[indcat].filter((todo: ITodo) => todo.statustodo === tools.Status.COMPLETED) + } else { + arrout = [] + } + + if (arrout) + { // @ts-ignore + arrout = arrout.sort((a: ITodo, b: ITodo) => a.pos - b.pos) + } + + // console.log('arrout', arrout) + + return arrout + // return tools.mapSort(arrout) + + } else { + return [] + } + }, + + doneTodosCount: (state: ITodosState) => (cat: string): number => { + // @ts-ignore + return this.todos_completati(cat).length + }, + + TodosCount: (state: ITodosState) => (cat: string): number => { + // @ts-ignore + const indcat = this.getindexbycategory(cat) + // @ts-ignore + if (state.todos[indcat]) { + // @ts-ignore + return state.todos[indcat].length + } else { + return 0 + } + }, + + getRecordById: (state: ITodosState) => (id: string, cat: string): ITodo => { + // @ts-ignore + const indcat = this.getindexbycategory(cat) + if (state.todos) { + // @ts-ignore + return state.todos[indcat].find((item) => item._id === id) + } + return {} + }, + + + }, + + actions: { + gettodosByCategory(category: string): any[] { + const indcat = this.categories.indexOf(category) + // @ts-ignore + if (!this.todos[indcat]) { + return [] + } + // @ts-ignore + return this.todos[indcat] + }, + + initcat(): any { + + const userStore = useUserStore() + const rec = this.getRecordEmpty() + rec.userId = userStore.my._id + + return rec + + }, + + findIndTodoById(data: IParamTodo) { + const indcat = this.categories.indexOf(data.categorySel!) + if (indcat >= 0) { + // @ts-ignore + return tools.getIndexById(this.todos[indcat], data.id) + } + return -1 + }, + + createNewItem({ objtodo, atfirst, categorySel }: { objtodo: ITodo, atfirst: boolean, categorySel: string }) { + let indcat = state.categories.indexOf(categorySel) + if (indcat === -1) { + this.categories.push(categorySel) + indcat = this.categories.indexOf(categorySel) + } + console.log('createNewItem', objtodo, 'cat=', categorySel, 'this.todos[indcat]', this.todos[indcat]) + if (this.todos[indcat] === undefined) { + this.todos[indcat] = [] + this.todos[indcat].push(objtodo) + console.log('push this.todos[indcat]', this.todos) + return + } + if (atfirst) { + this.todos[indcat].unshift(objtodo) + } else { + this.todos[indcat].push(objtodo) + } + + console.log('this.todos[indcat]', this.todos[indcat]) + + }, + + deletemyitem(myitem: ITodo) { + // Find record + const indcat = this.categories.indexOf(myitem.category!) + const ind = this.findIndTodoById({ id: myitem._id, categorySel: myitem.category }) + + ApiTables.removeitemfromarray(this.todos[indcat], ind) + }, + + async movemyitem({ myitemorig, myitemdest }: { myitemorig: ITodo, myitemdest: ITodo }) { + + const indcat = this.categories.indexOf(myitemorig.category!) + const indorig = tools.getIndexById(this.todos[indcat], myitemorig._id) + let indcatdest = this.categories.indexOf(myitemdest.category!) + + console.log('this.categories', this.categories) + console.log('myitemdest', myitemdest) + // console.log('indcat', indcat, 'indcatdest', indcatdest, 'indorig', indorig) + + if (indcatdest === -1) { + this.categories.push(myitemdest.category!) + const newindcat = this.categories.indexOf(myitemdest.category!) + this.todos[newindcat] = [] + indcatdest = newindcat + } + + this.todos[indcat].splice(indorig, 1) + this.todos[indcatdest].push(myitemdest) + + await this.modify({ myitem: myitemdest, field: 'category' }) + }, + + async dbLoad({ checkPending }: { checkPending: boolean }) { + const globalStore = useGlobalStore() + const userStore = useUserStore() + + if (!static_data.functionality.ENABLE_PROJECTS_LOADING) + return null + + // console.log('dbLoad', nametable, checkPending, 'userid=', userStore.my._id) + + // if (userStore.my._id === '') { + // return new Types.AxiosError(0, null, 0, '') + // } + + let ris = null + + ris = await Api.SendReq('/todos/' + userStore.my._id, 'GET', null) + .then((res) => { + if (res.data.todos) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories) + this.todos = res.data.todos + this.categories = res.data.categories + } else { + this.todos = [[]] + } + + this.showtype = parseInt(globalStore.getConfigStringbyId({ + id: costanti.CONFIG_ID_SHOW_TYPE_TODOS, + default: costanti.ShowTypeTask.SHOW_LAST_N_COMPLETED + }), 10) + + // console.log('ARRAY TODOS = ', this.todos) + if (process.env.DEBUG === '1') { + // console.log('dbLoad', 'this.todos', this.todos, 'this.categories', this.categories) + } + + return res + }) + .catch((error) => { + console.log('error dbLoad', error) + userStore.setErrorCatch(error) + return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, toolsext.ERR_GENERICO, error) + }) + + ApiTables.aftercalling(ris, checkPending, 'categories') + + return ris + }, + + async calculateHoursTodo({ todoId }: { todoId: string }) { + + let ris = null + + ris = await Api.SendReq('/todos/calc/' + todoId, 'GET', null) + .then((res) => { + if (res.data.rec) { // console.log('RISULTANTE CATEGORIES DAL SERVER = ', res.data.categories) + return res.data.rec + } + return null + }) + .catch((error) => { + console.log('error calculateHoursTodo', error) + }) + + return ris + }, + + async deleteItemtodo({ cat, idobj }: { cat: string, idobj: string }) { + console.log('deleteItemtodo: KEY = ', idobj) + + const myarr = this.gettodosByCategory(cat) + + const myobjtrov = tools.getElemById(myarr, idobj) + if (!!myobjtrov) { + + console.log('myobjtrov', myobjtrov.descr) + + if (!!myobjtrov) { + /* + const myobjnext = tools.getElemPrevById(myarr, myobjtrov._id) + + if (!!myobjnext) { + myobjnext.pos = myobjtrov.pos + 1 + myobjnext.modified = true + await modify( { myitem: myobjnext, field: 'pos' }) + } + + */ + + ApiTables.table_HideRecord(nametable, myobjtrov, idobj) + } + } + }, + + async dbInsert({ myobj, atfirst }: { myobj: ITodo, atfirst: boolean }) { + + const objtodo = this.initcat() + + objtodo.descr = myobj.descr + objtodo.category = myobj.category + + const tipoProj = '' //++Todo: ?? nuovo tipoProj ? + + let elemtochange: ITodo = {} + + const myarr = this.gettodosByCategory(objtodo.category) + + if (atfirst) { + console.log('INSERT AT THE TOP') + elemtochange = tools.getFirstList(myarr) + objtodo.pos = 10 + } else { + console.log('INSERT AT THE BOTTOM') + // INSERT AT THE BOTTOM , so GET LAST ITEM + const lastelem = tools.getLastListNotCompleted(nametable, objtodo.category, tipoProj) + + objtodo.pos = (!!lastelem) ? lastelem.pos + 10 : 10 + } + objtodo.modified = false + + this.createNewItem({ objtodo, atfirst, categorySel: objtodo.category }) // 1) Create record in Memory + + const id = await globalroutines('write', nametable, objtodo) // 2) Insert into the IndexedDb + + let field = '' + if (atfirst) { // update also the last elem + if (!!elemtochange) { + elemtochange.pos = objtodo.pos + console.log('elemtochange', elemtochange) + field = 'pos' + + // Modify the other record + await this.modify({ myitem: elemtochange, field }) + } + } + + // 3) send to the Server + return ApiTables.Sync_SaveItem(nametable, 'POST', objtodo) + .then((ris) => { + // *** Check if need to be moved because of the --- Priority Ordering --- ... + + const indelem = tools.getIndexById(myarr, objtodo._id) + let itemdragend + if (atfirst) { + // Check the second item, if it's different priority, then move to the first position of the priority + const secondindelem = indelem + 1 + if (tools.isOkIndex(myarr, secondindelem)) { + const secondelem = tools.getElemByIndex(myarr, secondindelem) + if (secondelem.priority !== objtodo.priority) { + itemdragend = { + field: 'priority', + idelemtochange: objtodo._id, + prioritychosen: objtodo.priority, + category: objtodo.category, + atfirst + } + } + } + + } else { + // get previous of the last + const prevlastindelem = indelem - 1 + if (tools.isOkIndex(myarr, prevlastindelem)) { + const prevlastelem = tools.getElemByIndex(myarr, prevlastindelem) + if (prevlastelem.priority !== objtodo.priority) { + itemdragend = { + field: 'priority', + idelemtochange: objtodo._id, + prioritychosen: objtodo.priority, + category: objtodo.category, + atfirst + } + } + } + } + + if (itemdragend) { + this.swapElems(itemdragend) + } + return ris + }) + + }, + + async modify({ myitem, field }: { myitem: any, field: any }) { + return ApiTables.table_ModifyRecord(nametable, myitem, listFieldsToChange, field) + }, + + async swapElems(itemdragend: IDrag) { + // console.log('TODOS swapElems', itemdragend, this.todos, this.categories) + + const cat = itemdragend.category + const indcat = this.categories.indexOf(cat!) + // @ts-ignore + const myarr = this.todos[indcat] + + tools.swapGeneralElem(nametable, myarr, itemdragend, listFieldsToChange) + + }, + + async ActionCutPaste(action: IAction) { + console.log('ActionCutPaste', action) + const globalStore = useGlobalStore() + + if (action.type === lists.MenuAction.CUT) { + globalStore.lastaction = action + } else if (action.type === lists.MenuAction.PASTE) { + if (globalStore.lastaction.type === lists.MenuAction.CUT) { + + // Change id_parent + const orig_obj = this.getRecordById(globalStore.lastaction._id, globalStore.lastaction.cat!) + // const dest = this.getRecordById(action._id, action.cat) + + console.log('action', action, 'orig_obj', orig_obj) + + const dest_obj = tools.jsonCopy(orig_obj) + + if (!!dest_obj) { + dest_obj.category = action._id + dest_obj.modified = true + dest_obj.pos = 1 + + globalStore.lastaction.type = 0 + + return await this.movemyitem({ myitemorig: orig_obj, myitemdest: dest_obj }) + } + } + } + }, + + } +}) diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts index 2380c57d..99932189 100755 --- a/src/store/UserStore.ts +++ b/src/store/UserStore.ts @@ -130,6 +130,9 @@ export const useUserStore = defineStore('UserStore', { getServerCode: (state: IUserState): number => (state.servercode ? state.servercode : 0), getNameSurnameByUserId: (state: IUserState) => (userId: string): string => { + // @ts-ignore + const prova: number = this.getServerCode(state) + // @ts-ignore const user = this.getUserByUserId(state, userId) if (user) return `${user.name} ${user.surname}` @@ -143,6 +146,23 @@ export const useUserStore = defineStore('UserStore', { return `(${username})` }, + getUsersList: (mystate: IUserState) => { + return mystate.usersList + }, + + IsMyFriend: (mystate: IUserState) => (userIdOwner: string): boolean => { + // ++TODO Check if userIdOwner is my friend + // userIdOwner is my friend ? + return true + }, + + IsMyGroup: (mystate: IUserState) => (userIdOwner: string): boolean => { + // ++TODO Check if userIdOwner is on my groups + // userIdOwner is on my groups ? + return true + }, + + getUserByUserId: (state: IUserState) => (userId: string): IUserFields | null => { // Check if is this User! if (state.my._id === userId) return state.my @@ -500,7 +520,7 @@ export const useUserStore = defineStore('UserStore', { // console.log('autologin _id STATE ', this._id) // return true - } catch (e) { + } catch (e: any) { console.error('ERR autologin ', e.message) return false } diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts index df9e6f56..56d2b22f 100644 --- a/src/store/globalStore.ts +++ b/src/store/globalStore.ts @@ -20,7 +20,6 @@ import { shared_consts } from '@src/common/shared_vuejs' const stateConnDefault = 'online' export const useGlobalStore = defineStore('GlobalStore', { - // @ts-ignore state: (): IGlobalState => ({ finishLoading: false, conta: 0, @@ -86,8 +85,23 @@ export const useGlobalStore = defineStore('GlobalStore', { }), getters: { + // conta: (state: IGlobalState) => { state.conta }, + // listatodo: (state: IGlobalState) => { state.listatodo }, + // category: (state: IGlobalState) => { state.category }, - isNewVersionAvailable(state: IGlobalState) { + testpao1_getter_contatore: (state: IGlobalState) => (param1: number) => state.testp1.contatore + 100 + param1, + testpao1_getter_array: (state: IGlobalState) => (param1: number) => state.testp1.mioarray.filter((item) => item).map((item) => item.valore), + + getConfigbyId: (state: IGlobalState) => (id: string) => state.arrConfig.find((item) => item._id === id), + getConfigStringbyId: (state: IGlobalState) => (params: any) => { + const config = state.arrConfig.find((item) => item._id === params.id) + if (config) { + return config.value + } else { + return params.default + } + }, + isNewVersionAvailable: (state: IGlobalState) => { // console.log('cfgServer', cfgServer) const serversrec = state.cfgServer.find((x) => (x.chiave === toolsext.SERVKEY_VERS) && (x.idapp === process.env.APP_ID)) // console.log('Record ', serversrec) diff --git a/src/store/testStore.ts b/src/store/testStore.ts index 45d526f9..c09433ba 100644 --- a/src/store/testStore.ts +++ b/src/store/testStore.ts @@ -20,9 +20,15 @@ export const useTestStore = defineStore({ return (rec.lang === toolsext.getLocale(false) || toolsext.getLocale() === '') }, - prova2(): boolean { - return this.finishLoading + prova1: (state: ITest) => (myval: number): boolean => { + return (myval > 1) }, + + prova2: (): boolean => { + // @ts-ignore + return this.prova1(2) + }, + }, actions: { diff --git a/yarn.lock b/yarn.lock index 05f76f74..9af93d49 100755 --- a/yarn.lock +++ b/yarn.lock @@ -1009,6 +1009,11 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@gar/promisify@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" + integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== + "@humanwhocodes/config-array@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" @@ -1095,94 +1100,94 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/console@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.0.6.tgz#3eb72ea80897495c3d73dd97aab7f26770e2260f" - integrity sha512-fMlIBocSHPZ3JxgWiDNW/KPj6s+YRd0hicb33IrmelCcjXo/pXPwvuiKFmZz+XuqI/1u7nbUK10zSsWL/1aegg== +"@jest/console@^27.1.0": + version "27.1.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.1.0.tgz#de13b603cb1d389b50c0dc6296e86e112381e43c" + integrity sha512-+Vl+xmLwAXLNlqT61gmHEixeRbS4L8MUzAjtpBCOPWH+izNI/dR16IeXjkXJdRtIVWVSf9DO1gdp67B1XorZhQ== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.1.0" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^27.0.6" - jest-util "^27.0.6" + jest-message-util "^27.1.0" + jest-util "^27.1.0" slash "^3.0.0" -"@jest/core@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.6.tgz#c5f642727a0b3bf0f37c4b46c675372d0978d4a1" - integrity sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow== +"@jest/core@^27.1.0": + version "27.1.0" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.1.0.tgz#622220f18032f5869e579cecbe744527238648bf" + integrity sha512-3l9qmoknrlCFKfGdrmiQiPne+pUR4ALhKwFTYyOeKw6egfDwJkO21RJ1xf41rN8ZNFLg5W+w6+P4fUqq4EMRWA== dependencies: - "@jest/console" "^27.0.6" - "@jest/reporters" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/transform" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/console" "^27.1.0" + "@jest/reporters" "^27.1.0" + "@jest/test-result" "^27.1.0" + "@jest/transform" "^27.1.0" + "@jest/types" "^27.1.0" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-changed-files "^27.0.6" - jest-config "^27.0.6" - jest-haste-map "^27.0.6" - jest-message-util "^27.0.6" + jest-changed-files "^27.1.0" + jest-config "^27.1.0" + jest-haste-map "^27.1.0" + jest-message-util "^27.1.0" jest-regex-util "^27.0.6" - jest-resolve "^27.0.6" - jest-resolve-dependencies "^27.0.6" - jest-runner "^27.0.6" - jest-runtime "^27.0.6" - jest-snapshot "^27.0.6" - jest-util "^27.0.6" - jest-validate "^27.0.6" - jest-watcher "^27.0.6" + jest-resolve "^27.1.0" + jest-resolve-dependencies "^27.1.0" + jest-runner "^27.1.0" + jest-runtime "^27.1.0" + jest-snapshot "^27.1.0" + jest-util "^27.1.0" + jest-validate "^27.1.0" + jest-watcher "^27.1.0" micromatch "^4.0.4" p-each-series "^2.1.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.6.tgz#ee293fe996db01d7d663b8108fa0e1ff436219d2" - integrity sha512-4XywtdhwZwCpPJ/qfAkqExRsERW+UaoSRStSHCCiQTUpoYdLukj+YJbQSFrZjhlUDRZeNiU9SFH0u7iNimdiIg== +"@jest/environment@^27.1.0": + version "27.1.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.1.0.tgz#c7224a67004759ec203d8fa44e8bc0db93f66c44" + integrity sha512-wRp50aAMY2w1U2jP1G32d6FUVBNYqmk8WaGkiIEisU48qyDV0WPtw3IBLnl7orBeggveommAkuijY+RzVnNDOQ== dependencies: - "@jest/fake-timers" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/fake-timers" "^27.1.0" + "@jest/types" "^27.1.0" "@types/node" "*" - jest-mock "^27.0.6" + jest-mock "^27.1.0" -"@jest/fake-timers@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.6.tgz#cbad52f3fe6abe30e7acb8cd5fa3466b9588e3df" - integrity sha512-sqd+xTWtZ94l3yWDKnRTdvTeZ+A/V7SSKrxsrOKSqdyddb9CeNRF8fbhAU0D7ZJBpTTW2nbp6MftmKJDZfW2LQ== +"@jest/fake-timers@^27.1.0": + version "27.1.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.1.0.tgz#c0b343d8a16af17eab2cb6862e319947c0ea2abe" + integrity sha512-22Zyn8il8DzpS+30jJNVbTlm7vAtnfy1aYvNeOEHloMlGy1PCYLHa4PWlSws0hvNsMM5bON6GISjkLoQUV3oMA== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.1.0" "@sinonjs/fake-timers" "^7.0.2" "@types/node" "*" - jest-message-util "^27.0.6" - jest-mock "^27.0.6" - jest-util "^27.0.6" + jest-message-util "^27.1.0" + jest-mock "^27.1.0" + jest-util "^27.1.0" -"@jest/globals@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.6.tgz#48e3903f99a4650673d8657334d13c9caf0e8f82" - integrity sha512-DdTGCP606rh9bjkdQ7VvChV18iS7q0IMJVP1piwTWyWskol4iqcVwthZmoJEf7obE1nc34OpIyoVGPeqLC+ryw== +"@jest/globals@^27.1.0": + version "27.1.0" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.1.0.tgz#e093a49c718dd678a782c197757775534c88d3f2" + integrity sha512-73vLV4aNHAlAgjk0/QcSIzzCZSqVIPbmFROJJv9D3QUR7BI4f517gVdJpSrCHxuRH3VZFhe0yGG/tmttlMll9g== dependencies: - "@jest/environment" "^27.0.6" - "@jest/types" "^27.0.6" - expect "^27.0.6" + "@jest/environment" "^27.1.0" + "@jest/types" "^27.1.0" + expect "^27.1.0" -"@jest/reporters@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.6.tgz#91e7f2d98c002ad5df94d5b5167c1eb0b9fd5b00" - integrity sha512-TIkBt09Cb2gptji3yJXb3EE+eVltW6BjO7frO7NEfjI9vSIYoISi5R3aI3KpEDXlB1xwB+97NXIqz84qYeYsfA== +"@jest/reporters@^27.1.0": + version "27.1.0" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.1.0.tgz#02ed1e6601552c2f6447378533f77aad002781d4" + integrity sha512-5T/zlPkN2HnK3Sboeg64L5eC8iiaZueLpttdktWTJsvALEtP2YMkC5BQxwjRWQACG9SwDmz+XjjkoxXUDMDgdw== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/transform" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/console" "^27.1.0" + "@jest/test-result" "^27.1.0" + "@jest/transform" "^27.1.0" + "@jest/types" "^27.1.0" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -1193,10 +1198,10 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^27.0.6" - jest-resolve "^27.0.6" - jest-util "^27.0.6" - jest-worker "^27.0.6" + jest-haste-map "^27.1.0" + jest-resolve "^27.1.0" + jest-util "^27.1.0" + jest-worker "^27.1.0" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" @@ -1212,41 +1217,41 @@ graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.6.tgz#3fa42015a14e4fdede6acd042ce98c7f36627051" - integrity sha512-ja/pBOMTufjX4JLEauLxE3LQBPaI2YjGFtXexRAjt1I/MbfNlMx0sytSX3tn5hSLzQsR3Qy2rd0hc1BWojtj9w== +"@jest/test-result@^27.1.0": + version "27.1.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.1.0.tgz#9345ae5f97f6a5287af9ebd54716cd84331d42e8" + integrity sha512-Aoz00gpDL528ODLghat3QSy6UBTD5EmmpjrhZZMK/v1Q2/rRRqTGnFxHuEkrD4z/Py96ZdOHxIWkkCKRpmnE1A== dependencies: - "@jest/console" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/console" "^27.1.0" + "@jest/types" "^27.1.0" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz#80a913ed7a1130545b1cd777ff2735dd3af5d34b" - integrity sha512-bISzNIApazYOlTHDum9PwW22NOyDa6VI31n6JucpjTVM0jD6JDgqEZ9+yn575nDdPF0+4csYDxNNW13NvFQGZA== +"@jest/test-sequencer@^27.1.0": + version "27.1.0" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.1.0.tgz#04e8b3bd735570d3d48865e74977a14dc99bff2d" + integrity sha512-lnCWawDr6Z1DAAK9l25o3AjmKGgcutq1iIbp+hC10s/HxnB8ZkUsYq1FzjOoxxZ5hW+1+AthBtvS4x9yno3V1A== dependencies: - "@jest/test-result" "^27.0.6" + "@jest/test-result" "^27.1.0" graceful-fs "^4.2.4" - jest-haste-map "^27.0.6" - jest-runtime "^27.0.6" + jest-haste-map "^27.1.0" + jest-runtime "^27.1.0" -"@jest/transform@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.6.tgz#189ad7107413208f7600f4719f81dd2f7278cc95" - integrity sha512-rj5Dw+mtIcntAUnMlW/Vju5mr73u8yg+irnHwzgtgoeI6cCPOvUwQ0D1uQtc/APmWgvRweEb1g05pkUpxH3iCA== +"@jest/transform@^27.1.0": + version "27.1.0" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.1.0.tgz#962e385517e3d1f62827fa39c305edcc3ca8544b" + integrity sha512-ZRGCA2ZEVJ00ubrhkTG87kyLbN6n55g1Ilq0X9nJb5bX3MhMp3O6M7KG+LvYu+nZRqG5cXsQnJEdZbdpTAV8pQ== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^27.0.6" + "@jest/types" "^27.1.0" babel-plugin-istanbul "^6.0.0" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^27.0.6" + jest-haste-map "^27.1.0" jest-regex-util "^27.0.6" - jest-util "^27.0.6" + jest-util "^27.1.0" micromatch "^4.0.4" pirates "^4.0.1" slash "^3.0.0" @@ -1264,6 +1269,17 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" +"@jest/types@^27.1.0": + version "27.1.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.1.0.tgz#674a40325eab23c857ebc0689e7e191a3c5b10cc" + integrity sha512-pRP5cLIzN7I7Vp6mHKRSaZD7YpBTK7hawx5si8trMKqk4+WOdK8NEKOTO2G8PKWD1HbKMVckVB6/XHh/olhf2g== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^16.0.0" + chalk "^4.0.0" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1328,9 +1344,9 @@ integrity sha512-oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q== "@npmcli/config@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-2.2.0.tgz#c3f6cb76e74691d1ae746cda482b7df751ed2124" - integrity sha512-y0V3F7RCWXy8kBOvKvKSRUNKRobLB6vL/UNchy/6+IUNIqu+UyrY3Z7jvj1ZA/AkYc/0WkCUtppCo+bPhMU8Aw== + version "2.3.0" + resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-2.3.0.tgz#364fbe942037e562a832a113206e14ccb651f7bc" + integrity sha512-yjiC1xv7KTmUTqfRwN2ZL7BHV160ctGF0fLXmKkkMXj40UOvBe45Apwvt5JsFRtXSoHkUYy1ouzscziuWNzklg== dependencies: ini "^2.0.0" mkdirp-infer-owner "^2.0.0" @@ -1345,6 +1361,14 @@ dependencies: ansi-styles "^4.3.0" +"@npmcli/fs@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz#589612cfad3a6ea0feafcb901d29c63fd52db09f" + integrity sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ== + dependencies: + "@gar/promisify" "^1.0.1" + semver "^7.3.5" + "@npmcli/git@^2.0.7", "@npmcli/git@^2.1.0": version "2.1.0" resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6" @@ -1558,10 +1582,10 @@ core-js "^3.6.5" core-js-compat "^3.6.5" -"@quasar/extras@^1.10.11": - version "1.10.11" - resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.10.11.tgz#19c4f197453c44140400443312f9e50355c252db" - integrity sha512-/zJiT8iExl0j2k1zA21Eho8SPMtG5ehcYayszunrq/z7zDp728oWSteI9AfQFnF8/+M06f5HUzy+Vssf6IKH/g== +"@quasar/extras@^1.10.12": + version "1.10.12" + resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.10.12.tgz#a0724bce058de6cea44519be45ab2af35496a88b" + integrity sha512-CVSxLw/Z6kaEYrooJX7mpby6YDm0eSa8D9/1+KEfiTYfLrPE4wTRuNGKN5liuLtVhFMdGrEkj6T6DInKpQWW9A== "@quasar/fastclick@1.1.4": version "1.1.4" @@ -1855,6 +1879,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= + "@types/mime@^1": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" @@ -1865,11 +1894,16 @@ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== -"@types/node@*", "@types/node@^16.7.1": +"@types/node@*": version "16.7.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.1.tgz#c6b9198178da504dfca1fd0be9b2e1002f1586f0" integrity sha512-ncRdc45SoYJ2H4eWU9ReDfp3vtFqDYhjOsKlFFUDEn8V1Bgr2RjYal8YT5byfadWIRluhPFU6JiDOl0H6Sl87A== +"@types/node@^16.7.10": + version "16.7.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.10.tgz#7aa732cc47341c12a16b7d562f519c2383b6d4fc" + integrity sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA== + "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -2020,79 +2054,79 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz#95cb8029a8bd8bd9c7f4ab95074a7cb2115adefa" - integrity sha512-tBgfA3K/3TsZY46ROGvoRxQr1wBkclbVqRQep97MjVHJzcRBURRY3sNFqLk0/Xr//BY5hM9H2p/kp+6qim85SA== +"@typescript-eslint/eslint-plugin@^4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz#4a0c1ae96b953f4e67435e20248d812bfa55e4fb" + integrity sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g== dependencies: - "@typescript-eslint/experimental-utils" "4.29.3" - "@typescript-eslint/scope-manager" "4.29.3" + "@typescript-eslint/experimental-utils" "4.30.0" + "@typescript-eslint/scope-manager" "4.30.0" debug "^4.3.1" functional-red-black-tree "^1.0.1" regexpp "^3.1.0" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz#52e437a689ccdef73e83c5106b34240a706f15e1" - integrity sha512-ffIvbytTVWz+3keg+Sy94FG1QeOvmV9dP2YSdLFHw/ieLXWCa3U1TYu8IRCOpMv2/SPS8XqhM1+ou1YHsdzKrg== +"@typescript-eslint/experimental-utils@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz#9e49704fef568432ae16fc0d6685c13d67db0fd5" + integrity sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw== dependencies: "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.29.3" - "@typescript-eslint/types" "4.29.3" - "@typescript-eslint/typescript-estree" "4.29.3" + "@typescript-eslint/scope-manager" "4.30.0" + "@typescript-eslint/types" "4.30.0" + "@typescript-eslint/typescript-estree" "4.30.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/parser@^4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.3.tgz#2ac25535f34c0e98f50c0e6b28c679c2357d45f2" - integrity sha512-jrHOV5g2u8ROghmspKoW7pN8T/qUzk0+DITun0MELptvngtMrwUJ1tv5zMI04CYVEUsSrN4jV7AKSv+I0y0EfQ== +"@typescript-eslint/parser@^4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.30.0.tgz#6abd720f66bd790f3e0e80c3be77180c8fcb192d" + integrity sha512-HJ0XuluSZSxeboLU7Q2VQ6eLlCwXPBOGnA7CqgBnz2Db3JRQYyBDJgQnop6TZ+rsbSx5gEdWhw4rE4mDa1FnZg== dependencies: - "@typescript-eslint/scope-manager" "4.29.3" - "@typescript-eslint/types" "4.29.3" - "@typescript-eslint/typescript-estree" "4.29.3" + "@typescript-eslint/scope-manager" "4.30.0" + "@typescript-eslint/types" "4.30.0" + "@typescript-eslint/typescript-estree" "4.30.0" debug "^4.3.1" -"@typescript-eslint/scope-manager@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.3.tgz#497dec66f3a22e459f6e306cf14021e40ec86e19" - integrity sha512-x+w8BLXO7iWPkG5mEy9bA1iFRnk36p/goVlYobVWHyDw69YmaH9q6eA+Fgl7kYHmFvWlebUTUfhtIg4zbbl8PA== +"@typescript-eslint/scope-manager@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz#1a3ffbb385b1a06be85cd5165a22324f069a85ee" + integrity sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A== dependencies: - "@typescript-eslint/types" "4.29.3" - "@typescript-eslint/visitor-keys" "4.29.3" + "@typescript-eslint/types" "4.30.0" + "@typescript-eslint/visitor-keys" "4.30.0" -"@typescript-eslint/types@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.3.tgz#d7980c49aef643d0af8954c9f14f656b7fd16017" - integrity sha512-s1eV1lKNgoIYLAl1JUba8NhULmf+jOmmeFO1G5MN/RBCyyzg4TIOfIOICVNC06lor+Xmy4FypIIhFiJXOknhIg== +"@typescript-eslint/types@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.30.0.tgz#fb9d9b0358426f18687fba82eb0b0f869780204f" + integrity sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw== -"@typescript-eslint/typescript-estree@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz#1bafad610015c4ded35c85a70b6222faad598b40" - integrity sha512-45oQJA0bxna4O5TMwz55/TpgjX1YrAPOI/rb6kPgmdnemRZx/dB0rsx+Ku8jpDvqTxcE1C/qEbVHbS3h0hflag== +"@typescript-eslint/typescript-estree@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz#ae57833da72a753f4846cd3053758c771670c2ac" + integrity sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg== dependencies: - "@typescript-eslint/types" "4.29.3" - "@typescript-eslint/visitor-keys" "4.29.3" + "@typescript-eslint/types" "4.30.0" + "@typescript-eslint/visitor-keys" "4.30.0" debug "^4.3.1" globby "^11.0.3" is-glob "^4.0.1" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/visitor-keys@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz#c691760a00bd86bf8320d2a90a93d86d322f1abf" - integrity sha512-MGGfJvXT4asUTeVs0Q2m+sY63UsfnA+C/FDgBKV3itLBmM9H0u+URcneePtkd0at1YELmZK6HSolCqM4Fzs6yA== +"@typescript-eslint/visitor-keys@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz#a47c6272fc71b0c627d1691f68eaecf4ad71445e" + integrity sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw== dependencies: - "@typescript-eslint/types" "4.29.3" + "@typescript-eslint/types" "4.30.0" eslint-visitor-keys "^2.0.0" -"@vue/compat@^3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@vue/compat/-/compat-3.2.6.tgz#d08b5ea8879c6d2a6871c89fe1ac167981543b8a" - integrity sha512-jEgO8GQel2m1wFPc1G5S3ztJsWy0ebA6akbCOTPeMlPRQtuYvp0Gj4eS6wuFeOfAjXF14B3hr7VhwningtURZQ== +"@vue/compat@^3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/compat/-/compat-3.2.7.tgz#a8c16bb563f7a151c1feea41ebac79cc429651e5" + integrity sha512-VjtAp4oqOYyj/La+wET1CKV4oaEovAIsUSdSLPPoR/RM2Ugiij8pw3uM3MG9kDO9nFW+odBUdsh97v0YrC78ag== "@vue/compiler-core@3.2.4": version "3.2.4" @@ -2116,6 +2150,17 @@ estree-walker "^2.0.2" source-map "^0.6.1" +"@vue/compiler-core@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.7.tgz#a7f1f87d4fae8c78d95a3d3df81bde663427deb8" + integrity sha512-OcWy72QNTkcNYtZIb927pRx2cRujrlDWsAx7ejWDnRzwo83gIyF8NeTrMv/7wbnHoeA+Gga9AK4Wo9PlCzhuLg== + dependencies: + "@babel/parser" "^7.15.0" + "@babel/types" "^7.15.0" + "@vue/shared" "3.2.7" + estree-walker "^2.0.2" + source-map "^0.6.1" + "@vue/compiler-dom@3.2.4": version "3.2.4" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.4.tgz#3a43de243eba127abbe57e796a0b969d2df78c08" @@ -2132,6 +2177,14 @@ "@vue/compiler-core" "3.2.6" "@vue/shared" "3.2.6" +"@vue/compiler-dom@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.7.tgz#33abaeef89ec653e1a733143d4f7b6392def3de8" + integrity sha512-YZyZNoZlTbTMqyY8QMC8IhwmcDVOiE1DdVwjnXbyihg+XVqpGQkDjNcG5nyMTbtZDKXREsYkcjaZntEfKyWK5g== + dependencies: + "@vue/compiler-core" "3.2.7" + "@vue/shared" "3.2.7" + "@vue/compiler-sfc@3.2.4": version "3.2.4" resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.4.tgz#9807868cc950291f163c3930a81bb16e870df097" @@ -2155,19 +2208,19 @@ postcss-selector-parser "^6.0.4" source-map "^0.6.1" -"@vue/compiler-sfc@^3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.6.tgz#d6ab7410cff57081ab627b15a1ea51a1072c7cf1" - integrity sha512-Ariz1eDsf+2fw6oWXVwnBNtfKHav72RjlWXpEgozYBLnfRPzP+7jhJRw4Nq0OjSsLx2HqjF3QX7HutTjYB0/eA== +"@vue/compiler-sfc@^3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.7.tgz#6ee803b7d5d375138fe86124b9c161eebbbc0f0d" + integrity sha512-qjfvRw7/9Q2Qm4cDmrJwTNqnFTXSSI3z/mmS9BSJTYZqh4FC4w+IIYYLWUpS3ef6UTTYY9STC5IUZqfpIod9Uw== dependencies: "@babel/parser" "^7.15.0" "@babel/types" "^7.15.0" "@types/estree" "^0.0.48" - "@vue/compiler-core" "3.2.6" - "@vue/compiler-dom" "3.2.6" - "@vue/compiler-ssr" "3.2.6" - "@vue/ref-transform" "3.2.6" - "@vue/shared" "3.2.6" + "@vue/compiler-core" "3.2.7" + "@vue/compiler-dom" "3.2.7" + "@vue/compiler-ssr" "3.2.7" + "@vue/ref-transform" "3.2.7" + "@vue/shared" "3.2.7" consolidate "^0.16.0" estree-walker "^2.0.2" hash-sum "^2.0.0" @@ -2187,13 +2240,13 @@ "@vue/compiler-dom" "3.2.4" "@vue/shared" "3.2.4" -"@vue/compiler-ssr@3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.6.tgz#cadcf199859fa00739f4275b4c85970e4b0abe7d" - integrity sha512-A7IKRKHSyPnTC4w1FxHkjzoyjXInsXkcs/oX22nBQ+6AWlXj2Tt1le96CWPOXy5vYlsTYkF1IgfBaKIdeN/39g== +"@vue/compiler-ssr@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.7.tgz#30a4cb128eb7b67be551b22889c58f1288586673" + integrity sha512-4moQTeMujIk+fG8NaMxU5aPhMCnWE+O3xNEK6+kd9GjNoN+n3y3YZ6CkVy+aOP2HpqWenZbS/20TBzOSdon5Cw== dependencies: - "@vue/compiler-dom" "3.2.6" - "@vue/shared" "3.2.6" + "@vue/compiler-dom" "3.2.7" + "@vue/shared" "3.2.7" "@vue/devtools-api@^6.0.0-beta.11", "@vue/devtools-api@^6.0.0-beta.14", "@vue/devtools-api@^6.0.0-beta.15", "@vue/devtools-api@^6.0.0-beta.7": version "6.0.0-beta.15" @@ -2223,14 +2276,14 @@ dependencies: "@vue/shared" "3.2.6" -"@vue/ref-transform@3.2.6": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@vue/ref-transform/-/ref-transform-3.2.6.tgz#30b5f1fa77daf9894bc23e6a5a0e3586a4a796b8" - integrity sha512-ie39+Y4nbirDLvH+WEq6Eo/l3n3mFATayqR+kEMSphrtMW6Uh/eEMx1Gk2Jnf82zmj3VLRq7dnmPx72JLcBYkQ== +"@vue/ref-transform@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/ref-transform/-/ref-transform-3.2.7.tgz#1028708a44e1926f05e2967719a3481911c03c2f" + integrity sha512-5I7IeUqoDEhPmkPHBhw7YlsFCFO/ZXHWwgdrokQATyVRkEkqeAd8erthuZ9a4sZAo5JBYmxjYw8WD9Kx9mabmg== dependencies: "@babel/parser" "^7.15.0" - "@vue/compiler-core" "3.2.6" - "@vue/shared" "3.2.6" + "@vue/compiler-core" "3.2.7" + "@vue/shared" "3.2.7" estree-walker "^2.0.2" magic-string "^0.25.7" @@ -2286,6 +2339,11 @@ resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.6.tgz#2c22bae88fe2b7b59fa68a9c9c4cd60bae2c1794" integrity sha512-uwX0Qs2e6kdF+WmxwuxJxOnKs/wEkMArtYpHSm7W+VY/23Tl8syMRyjnzEeXrNCAP0/8HZxEGkHJsjPEDNRuHw== +"@vue/shared@3.2.7": + version "3.2.7" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.7.tgz#c792bf92d19025e7940358536d468218a11eeedb" + integrity sha512-YwGOcNZjOY/MmadpzFBXWyHEwZSf0lVU4XF5zpD7tXC9dmqjdo38Jkk06wATu4LYHDPW4emXKMB5YLFPWPkwFA== + "@webassemblyjs/ast@1.11.1": version "1.11.1" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" @@ -2885,13 +2943,13 @@ autoprefixer@10.3.1: normalize-range "^0.1.2" postcss-value-parser "^4.1.0" -autoprefixer@^10.3.2: - version "10.3.2" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.3.2.tgz#836e4b4f59eb6876c41012c1c937be74035f3ec8" - integrity sha512-RHKq0YCvhxAn9987n0Gl6lkzLd39UKwCkUPMFE0cHhxU0SvcTjBxWG/CtkZ4/HvbqK9U5V8j03nAcGBlX3er/Q== +autoprefixer@^10.3.3: + version "10.3.3" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.3.3.tgz#4bac89c74ef98e6a40fe1c5b76c0d1c91db153ce" + integrity sha512-yRzjxfnggrP/+qVHlUuZz5FZzEbkT+Yt0/Df6ScEMnbbZBLzYB2W0KLxoQCW+THm1SpOsM1ZPcTHAwuvmibIsQ== dependencies: browserslist "^4.16.8" - caniuse-lite "^1.0.30001251" + caniuse-lite "^1.0.30001252" colorette "^1.3.0" fraction.js "^4.1.1" normalize-range "^0.1.2" @@ -2931,13 +2989,13 @@ babel-helper-vue-jsx-merge-props@^2.0.0: resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6" integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg== -babel-jest@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.6.tgz#e99c6e0577da2655118e3608b68761a5a69bd0d8" - integrity sha512-iTJyYLNc4wRofASmofpOc5NK9QunwMk+TLFgGXsTFS8uEqmd8wdI7sga0FPe2oVH3b5Agt/EAK1QjPEuKL8VfA== +babel-jest@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.1.0.tgz#e96ca04554fd32274439869e2b6d24de9d91bc4e" + integrity sha512-6NrdqzaYemALGCuR97QkC/FkFIEBWP5pw5TMJoUHZTVXyOgocujp6A0JE2V6gE0HtqAAv6VKU/nI+OCR1Z4gHA== dependencies: - "@jest/transform" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/transform" "^27.1.0" + "@jest/types" "^27.1.0" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.0.0" babel-preset-jest "^27.0.6" @@ -3374,6 +3432,30 @@ cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0: tar "^6.0.2" unique-filename "^1.1.1" +cacache@^15.3.0: + version "15.3.0" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" + integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== + dependencies: + "@npmcli/fs" "^1.0.0" + "@npmcli/move-file" "^1.0.1" + chownr "^2.0.0" + fs-minipass "^2.0.0" + glob "^7.1.4" + infer-owner "^1.0.4" + lru-cache "^6.0.0" + minipass "^3.1.1" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.2" + mkdirp "^1.0.3" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^8.0.1" + tar "^6.0.2" + unique-filename "^1.1.1" + cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -3480,6 +3562,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001243, caniuse-lite@^1.0.30001251: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz#6853a606ec50893115db660f82c094d18f096d85" integrity sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A== +caniuse-lite@^1.0.30001252: + version "1.0.30001252" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz#cb16e4e3dafe948fc4a9bb3307aea054b912019a" + integrity sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw== + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -4084,7 +4171,12 @@ core-js@^2.4.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-js@^3.16.2, core-js@^3.6.5: +core-js@^3.17.1: + version "3.17.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.17.1.tgz#b39e086f413789cf2ca4680c4ecd1b36a50ba277" + integrity sha512-C8i/FNpVN2Ti89QIJcFn9ZQmnM+HaAQr2OpE+ja3TRM9Q34FigsGlAVuwPGkIgydSVClo/1l1D1grP8LVt9IYA== + +core-js@^3.6.5: version "3.16.2" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.2.tgz#3f485822889c7fc48ef463e35be5cc2a4a01a1f4" integrity sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ== @@ -5123,10 +5215,10 @@ eslint-module-utils@^2.6.2: debug "^3.2.7" pkg-dir "^2.0.0" -eslint-plugin-import@^2.24.1: - version "2.24.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.1.tgz#64aba8b567a1ba9921d5465586e86c491b8e2135" - integrity sha512-KSFWhNxPH8OGJwpRJJs+Z7I0a13E2iFQZJIvSnCu6KUs4qmgAm3xN9GYBCSoiGWmwA7gERZPXqYQjcoCROnYhQ== +eslint-plugin-import@^2.24.2: + version "2.24.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da" + integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q== dependencies: array-includes "^3.1.3" array.prototype.flat "^1.2.4" @@ -5142,7 +5234,7 @@ eslint-plugin-import@^2.24.1: pkg-up "^2.0.0" read-pkg-up "^3.0.0" resolve "^1.20.0" - tsconfig-paths "^3.10.1" + tsconfig-paths "^3.11.0" eslint-plugin-quasar@^1.0.0: version "1.0.0" @@ -5152,10 +5244,10 @@ eslint-plugin-quasar@^1.0.0: requireindex "~1.2.0" semver-compare "^1.0.0" -eslint-plugin-vue@^7.16.0: - version "7.16.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.16.0.tgz#7fe9fea039a190b108319c1380adf543ef57707d" - integrity sha512-0E2dVvVC7I2Xm1HXyx+ZwPj9CNX4NJjs4K4r+GVsHWyt5Pew3JLD4fI7A91b2jeL0TXE7LlszrwLSTJU9eqehw== +eslint-plugin-vue@^7.17.0: + version "7.17.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.17.0.tgz#41e0bdb5effca5ee26f087f924be987eb41ef573" + integrity sha512-Rq5R2QetDCgC+kBFQw1+aJ5B93tQ4xqZvoCUxuIzwTonngNArsdP8ChM8PowIzsJvRtWl4ltGh/bZcN3xhFWSw== dependencies: eslint-utils "^2.1.0" natural-compare "^1.4.0" @@ -5389,16 +5481,16 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expect@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.0.6.tgz#a4d74fbe27222c718fff68ef49d78e26a8fd4c05" - integrity sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw== +expect@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-27.1.0.tgz#380de0abb3a8f2299c4c6c66bbe930483b5dba9b" + integrity sha512-9kJngV5hOJgkFil4F/uXm3hVBubUK2nERVfvqNNwxxuW8ZOUwSTTSysgfzckYtv/LBzj/LJXbiAF7okHCXgdug== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.1.0" ansi-styles "^5.0.0" jest-get-type "^27.0.6" - jest-matcher-utils "^27.0.6" - jest-message-util "^27.0.6" + jest-matcher-utils "^27.1.0" + jest-message-util "^27.1.0" jest-regex-util "^27.0.6" express@4.17.1, express@^4.16.2, express@^4.17.1: @@ -6140,10 +6232,10 @@ graphql-tag@^2.12.5: dependencies: tslib "^2.1.0" -graphql@^15.5.1: - version "15.5.1" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.1.tgz#f2f84415d8985e7b84731e7f3536f8bb9d383aad" - integrity sha512-FeTRX67T3LoE3LWAxxOlW2K3Bz+rMYAC18rRguK4wgXaTZMiJwSUwDmPFo3UadAKbzirKIg5Qy+sNJXbpPRnQw== +graphql@^15.5.2: + version "15.5.2" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.2.tgz#efa19f8f2bf1a48eb7d5c85bf17e144ba8bb0480" + integrity sha512-dZjLPWNQqYv0dqV2RNbiFed0LtSp6yd4jchsDGnuhDKa9OQHJYCfovaOEvY91w9gqbYO7Se9LKDTl3xxYva/3w== gsap@^3.7.1: version "3.7.1" @@ -7250,86 +7342,86 @@ javascript-stringify@^2.0.1: resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz#27c76539be14d8bd128219a2d731b09337904e79" integrity sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg== -jest-changed-files@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.6.tgz#bed6183fcdea8a285482e3b50a9a7712d49a7a8b" - integrity sha512-BuL/ZDauaq5dumYh5y20sn4IISnf1P9A0TDswTxUi84ORGtVa86ApuBHqICL0vepqAnZiY6a7xeSPWv2/yy4eA== +jest-changed-files@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.1.0.tgz#42da6ea00f06274172745729d55f42b60a9dffe0" + integrity sha512-eRcb13TfQw0xiV2E98EmiEgs9a5uaBIqJChyl0G7jR9fCIvGjXovnDS6Zbku3joij4tXYcSK4SE1AXqOlUxjWg== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.1.0" execa "^5.0.0" throat "^6.0.1" -jest-circus@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.6.tgz#dd4df17c4697db6a2c232aaad4e9cec666926668" - integrity sha512-OJlsz6BBeX9qR+7O9lXefWoc2m9ZqcZ5Ohlzz0pTEAG4xMiZUJoacY8f4YDHxgk0oKYxj277AfOk9w6hZYvi1Q== +jest-circus@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.1.0.tgz#24c280c90a625ea57da20ee231d25b1621979a57" + integrity sha512-6FWtHs3nZyZlMBhRf1wvAC5CirnflbGJAY1xssSAnERLiiXQRH+wY2ptBVtXjX4gz4AA2EwRV57b038LmifRbA== dependencies: - "@jest/environment" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/environment" "^27.1.0" + "@jest/test-result" "^27.1.0" + "@jest/types" "^27.1.0" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^27.0.6" + expect "^27.1.0" is-generator-fn "^2.0.0" - jest-each "^27.0.6" - jest-matcher-utils "^27.0.6" - jest-message-util "^27.0.6" - jest-runtime "^27.0.6" - jest-snapshot "^27.0.6" - jest-util "^27.0.6" - pretty-format "^27.0.6" + jest-each "^27.1.0" + jest-matcher-utils "^27.1.0" + jest-message-util "^27.1.0" + jest-runtime "^27.1.0" + jest-snapshot "^27.1.0" + jest-util "^27.1.0" + pretty-format "^27.1.0" slash "^3.0.0" stack-utils "^2.0.3" throat "^6.0.1" -jest-cli@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.6.tgz#d021e5f4d86d6a212450d4c7b86cb219f1e6864f" - integrity sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg== +jest-cli@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.1.0.tgz#118438e4d11cf6fb66cb2b2eb5778817eab3daeb" + integrity sha512-h6zPUOUu+6oLDrXz0yOWY2YXvBLk8gQinx4HbZ7SF4V3HzasQf+ncoIbKENUMwXyf54/6dBkYXvXJos+gOHYZw== dependencies: - "@jest/core" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/core" "^27.1.0" + "@jest/test-result" "^27.1.0" + "@jest/types" "^27.1.0" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" - jest-config "^27.0.6" - jest-util "^27.0.6" - jest-validate "^27.0.6" + jest-config "^27.1.0" + jest-util "^27.1.0" + jest-validate "^27.1.0" prompts "^2.0.1" yargs "^16.0.3" -jest-config@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.6.tgz#119fb10f149ba63d9c50621baa4f1f179500277f" - integrity sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w== +jest-config@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.1.0.tgz#e6826e2baaa34c07c3839af86466870e339d9ada" + integrity sha512-GMo7f76vMYUA3b3xOdlcKeKQhKcBIgurjERO2hojo0eLkKPGcw7fyIoanH+m6KOP2bLad+fGnF8aWOJYxzNPeg== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^27.0.6" - "@jest/types" "^27.0.6" - babel-jest "^27.0.6" + "@jest/test-sequencer" "^27.1.0" + "@jest/types" "^27.1.0" + babel-jest "^27.1.0" chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" is-ci "^3.0.0" - jest-circus "^27.0.6" - jest-environment-jsdom "^27.0.6" - jest-environment-node "^27.0.6" + jest-circus "^27.1.0" + jest-environment-jsdom "^27.1.0" + jest-environment-node "^27.1.0" jest-get-type "^27.0.6" - jest-jasmine2 "^27.0.6" + jest-jasmine2 "^27.1.0" jest-regex-util "^27.0.6" - jest-resolve "^27.0.6" - jest-runner "^27.0.6" - jest-util "^27.0.6" - jest-validate "^27.0.6" + jest-resolve "^27.1.0" + jest-runner "^27.1.0" + jest-util "^27.1.0" + jest-validate "^27.1.0" micromatch "^4.0.4" - pretty-format "^27.0.6" + pretty-format "^27.1.0" -jest-diff@^27.0.0, jest-diff@^27.0.6: +jest-diff@^27.0.0: version "27.0.6" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.6.tgz#4a7a19ee6f04ad70e0e3388f35829394a44c7b5e" integrity sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg== @@ -7339,6 +7431,16 @@ jest-diff@^27.0.0, jest-diff@^27.0.6: jest-get-type "^27.0.6" pretty-format "^27.0.6" +jest-diff@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.1.0.tgz#c7033f25add95e2218f3c7f4c3d7b634ab6b3cd2" + integrity sha512-rjfopEYl58g/SZTsQFmspBODvMSytL16I+cirnScWTLkQVXYVZfxm78DFfdIIXc05RCYuGjxJqrdyG4PIFzcJg== + dependencies: + chalk "^4.0.0" + diff-sequences "^27.0.6" + jest-get-type "^27.0.6" + pretty-format "^27.1.0" + jest-docblock@^27.0.6: version "27.0.6" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz#cc78266acf7fe693ca462cbbda0ea4e639e4e5f3" @@ -7346,53 +7448,53 @@ jest-docblock@^27.0.6: dependencies: detect-newline "^3.0.0" -jest-each@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.6.tgz#cee117071b04060158dc8d9a66dc50ad40ef453b" - integrity sha512-m6yKcV3bkSWrUIjxkE9OC0mhBZZdhovIW5ergBYirqnkLXkyEn3oUUF/QZgyecA1cF1QFyTE8bRRl8Tfg1pfLA== +jest-each@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.1.0.tgz#36ac75f7aeecb3b8da2a8e617ccb30a446df408c" + integrity sha512-K/cNvQlmDqQMRHF8CaQ0XPzCfjP5HMJc2bIJglrIqI9fjwpNqITle63IWE+wq4p+3v+iBgh7Wq0IdGpLx5xjDg== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.1.0" chalk "^4.0.0" jest-get-type "^27.0.6" - jest-util "^27.0.6" - pretty-format "^27.0.6" + jest-util "^27.1.0" + pretty-format "^27.1.0" -jest-environment-jsdom@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz#f66426c4c9950807d0a9f209c590ce544f73291f" - integrity sha512-FvetXg7lnXL9+78H+xUAsra3IeZRTiegA3An01cWeXBspKXUhAwMM9ycIJ4yBaR0L7HkoMPaZsozCLHh4T8fuw== +jest-environment-jsdom@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.1.0.tgz#5fb3eb8a67e02e6cc623640388d5f90e33075f18" + integrity sha512-JbwOcOxh/HOtsj56ljeXQCUJr3ivnaIlM45F5NBezFLVYdT91N5UofB1ux2B1CATsQiudcHdgTaeuqGXJqjJYQ== dependencies: - "@jest/environment" "^27.0.6" - "@jest/fake-timers" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/environment" "^27.1.0" + "@jest/fake-timers" "^27.1.0" + "@jest/types" "^27.1.0" "@types/node" "*" - jest-mock "^27.0.6" - jest-util "^27.0.6" + jest-mock "^27.1.0" + jest-util "^27.1.0" jsdom "^16.6.0" -jest-environment-node@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.6.tgz#a6699b7ceb52e8d68138b9808b0c404e505f3e07" - integrity sha512-+Vi6yLrPg/qC81jfXx3IBlVnDTI6kmRr08iVa2hFCWmJt4zha0XW7ucQltCAPhSR0FEKEoJ3i+W4E6T0s9is0w== +jest-environment-node@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.1.0.tgz#feea6b765f1fd4582284d4f1007df2b0a8d15b7f" + integrity sha512-JIyJ8H3wVyM4YCXp7njbjs0dIT87yhGlrXCXhDKNIg1OjurXr6X38yocnnbXvvNyqVTqSI4M9l+YfPKueqL1lw== dependencies: - "@jest/environment" "^27.0.6" - "@jest/fake-timers" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/environment" "^27.1.0" + "@jest/fake-timers" "^27.1.0" + "@jest/types" "^27.1.0" "@types/node" "*" - jest-mock "^27.0.6" - jest-util "^27.0.6" + jest-mock "^27.1.0" + jest-util "^27.1.0" jest-get-type@^27.0.6: version "27.0.6" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz#0eb5c7f755854279ce9b68a9f1a4122f69047cfe" integrity sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg== -jest-haste-map@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.6.tgz#4683a4e68f6ecaa74231679dca237279562c8dc7" - integrity sha512-4ldjPXX9h8doB2JlRzg9oAZ2p6/GpQUNAeiYXqcpmrKbP0Qev0wdZlxSMOmz8mPOEnt4h6qIzXFLDi8RScX/1w== +jest-haste-map@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.1.0.tgz#a39f456823bd6a74e3c86ad25f6fa870428326bf" + integrity sha512-7mz6LopSe+eA6cTFMf10OfLLqRoIPvmMyz5/OnSXnHO7hB0aDP1iIeLWCXzAcYU5eIJVpHr12Bk9yyq2fTW9vg== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.1.0" "@types/graceful-fs" "^4.1.2" "@types/node" "*" anymatch "^3.0.3" @@ -7400,76 +7502,76 @@ jest-haste-map@^27.0.6: graceful-fs "^4.2.4" jest-regex-util "^27.0.6" jest-serializer "^27.0.6" - jest-util "^27.0.6" - jest-worker "^27.0.6" + jest-util "^27.1.0" + jest-worker "^27.1.0" micromatch "^4.0.4" walker "^1.0.7" optionalDependencies: fsevents "^2.3.2" -jest-jasmine2@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz#fd509a9ed3d92bd6edb68a779f4738b100655b37" - integrity sha512-cjpH2sBy+t6dvCeKBsHpW41mjHzXgsavaFMp+VWRf0eR4EW8xASk1acqmljFtK2DgyIECMv2yCdY41r2l1+4iA== +jest-jasmine2@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.1.0.tgz#324a3de0b2ee20d238b2b5b844acc4571331a206" + integrity sha512-Z/NIt0wBDg3przOW2FCWtYjMn3Ip68t0SL60agD/e67jlhTyV3PIF8IzT9ecwqFbeuUSO2OT8WeJgHcalDGFzQ== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^27.0.6" + "@jest/environment" "^27.1.0" "@jest/source-map" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/test-result" "^27.1.0" + "@jest/types" "^27.1.0" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^27.0.6" + expect "^27.1.0" is-generator-fn "^2.0.0" - jest-each "^27.0.6" - jest-matcher-utils "^27.0.6" - jest-message-util "^27.0.6" - jest-runtime "^27.0.6" - jest-snapshot "^27.0.6" - jest-util "^27.0.6" - pretty-format "^27.0.6" + jest-each "^27.1.0" + jest-matcher-utils "^27.1.0" + jest-message-util "^27.1.0" + jest-runtime "^27.1.0" + jest-snapshot "^27.1.0" + jest-util "^27.1.0" + pretty-format "^27.1.0" throat "^6.0.1" -jest-leak-detector@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz#545854275f85450d4ef4b8fe305ca2a26450450f" - integrity sha512-2/d6n2wlH5zEcdctX4zdbgX8oM61tb67PQt4Xh8JFAIy6LRKUnX528HulkaG6nD5qDl5vRV1NXejCe1XRCH5gQ== +jest-leak-detector@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.1.0.tgz#fe7eb633c851e06280ec4dd248067fe232c00a79" + integrity sha512-oHvSkz1E80VyeTKBvZNnw576qU+cVqRXUD3/wKXh1zpaki47Qty2xeHg2HKie9Hqcd2l4XwircgNOWb/NiGqdA== dependencies: jest-get-type "^27.0.6" - pretty-format "^27.0.6" + pretty-format "^27.1.0" -jest-matcher-utils@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz#2a8da1e86c620b39459f4352eaa255f0d43e39a9" - integrity sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA== +jest-matcher-utils@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.1.0.tgz#68afda0885db1f0b9472ce98dc4c535080785301" + integrity sha512-VmAudus2P6Yt/JVBRdTPFhUzlIN8DYJd+et5Rd9QDsO/Z82Z4iwGjo43U8Z+PTiz8CBvKvlb6Fh3oKy39hykkQ== dependencies: chalk "^4.0.0" - jest-diff "^27.0.6" + jest-diff "^27.1.0" jest-get-type "^27.0.6" - pretty-format "^27.0.6" + pretty-format "^27.1.0" -jest-message-util@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.6.tgz#158bcdf4785706492d164a39abca6a14da5ab8b5" - integrity sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw== +jest-message-util@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.1.0.tgz#e77692c84945d1d10ef00afdfd3d2c20bd8fb468" + integrity sha512-Eck8NFnJ5Sg36R9XguD65cf2D5+McC+NF5GIdEninoabcuoOfWrID5qJhufq5FB0DRKoiyxB61hS7MKoMD0trQ== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.0.6" + "@jest/types" "^27.1.0" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.4" micromatch "^4.0.4" - pretty-format "^27.0.6" + pretty-format "^27.1.0" slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.6.tgz#0efdd40851398307ba16778728f6d34d583e3467" - integrity sha512-lzBETUoK8cSxts2NYXSBWT+EJNzmUVtVVwS1sU9GwE1DLCfGsngg+ZVSIe0yd0ZSm+y791esiuo+WSwpXJQ5Bw== +jest-mock@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.1.0.tgz#7ca6e4d09375c071661642d1c14c4711f3ab4b4f" + integrity sha512-iT3/Yhu7DwAg/0HvvLCqLvrTKTRMyJlrrfJYWzuLSf9RCAxBoIXN3HoymZxMnYsC3eD8ewGbUa9jUknwBenx2w== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.1.0" "@types/node" "*" jest-pnp-resolver@^1.2.2: @@ -7482,86 +7584,88 @@ jest-regex-util@^27.0.6: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz#02e112082935ae949ce5d13b2675db3d8c87d9c5" integrity sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ== -jest-resolve-dependencies@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz#3e619e0ef391c3ecfcf6ef4056207a3d2be3269f" - integrity sha512-mg9x9DS3BPAREWKCAoyg3QucCr0n6S8HEEsqRCKSPjPcu9HzRILzhdzY3imsLoZWeosEbJZz6TKasveczzpJZA== +jest-resolve-dependencies@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.1.0.tgz#d32ea4a2c82f76410f6157d0ec6cde24fbff2317" + integrity sha512-Kq5XuDAELuBnrERrjFYEzu/A+i2W7l9HnPWqZEeKGEQ7m1R+6ndMbdXCVCx29Se1qwLZLgvoXwinB3SPIaitMQ== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.1.0" jest-regex-util "^27.0.6" - jest-snapshot "^27.0.6" + jest-snapshot "^27.1.0" -jest-resolve@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.6.tgz#e90f436dd4f8fbf53f58a91c42344864f8e55bff" - integrity sha512-yKmIgw2LgTh7uAJtzv8UFHGF7Dm7XfvOe/LQ3Txv101fLM8cx2h1QVwtSJ51Q/SCxpIiKfVn6G2jYYMDNHZteA== +jest-resolve@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.1.0.tgz#bb22303c9e240cccdda28562e3c6fbcc6a23ac86" + integrity sha512-TXvzrLyPg0vLOwcWX38ZGYeEztSEmW+cQQKqc4HKDUwun31wsBXwotRlUz4/AYU/Fq4GhbMd/ileIWZEtcdmIA== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.1.0" chalk "^4.0.0" escalade "^3.1.1" graceful-fs "^4.2.4" + jest-haste-map "^27.1.0" jest-pnp-resolver "^1.2.2" - jest-util "^27.0.6" - jest-validate "^27.0.6" + jest-util "^27.1.0" + jest-validate "^27.1.0" resolve "^1.20.0" slash "^3.0.0" -jest-runner@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.6.tgz#1325f45055539222bbc7256a6976e993ad2f9520" - integrity sha512-W3Bz5qAgaSChuivLn+nKOgjqNxM7O/9JOJoKDCqThPIg2sH/d4A/lzyiaFgnb9V1/w29Le11NpzTJSzga1vyYQ== +jest-runner@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.1.0.tgz#1b28d114fb3b67407b8354c9385d47395e8ff83f" + integrity sha512-ZWPKr9M5w5gDplz1KsJ6iRmQaDT/yyAFLf18fKbb/+BLWsR1sCNC2wMT0H7pP3gDcBz0qZ6aJraSYUNAGSJGaw== dependencies: - "@jest/console" "^27.0.6" - "@jest/environment" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/transform" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/console" "^27.1.0" + "@jest/environment" "^27.1.0" + "@jest/test-result" "^27.1.0" + "@jest/transform" "^27.1.0" + "@jest/types" "^27.1.0" "@types/node" "*" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.4" jest-docblock "^27.0.6" - jest-environment-jsdom "^27.0.6" - jest-environment-node "^27.0.6" - jest-haste-map "^27.0.6" - jest-leak-detector "^27.0.6" - jest-message-util "^27.0.6" - jest-resolve "^27.0.6" - jest-runtime "^27.0.6" - jest-util "^27.0.6" - jest-worker "^27.0.6" + jest-environment-jsdom "^27.1.0" + jest-environment-node "^27.1.0" + jest-haste-map "^27.1.0" + jest-leak-detector "^27.1.0" + jest-message-util "^27.1.0" + jest-resolve "^27.1.0" + jest-runtime "^27.1.0" + jest-util "^27.1.0" + jest-worker "^27.1.0" source-map-support "^0.5.6" throat "^6.0.1" -jest-runtime@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.6.tgz#45877cfcd386afdd4f317def551fc369794c27c9" - integrity sha512-BhvHLRVfKibYyqqEFkybsznKwhrsu7AWx2F3y9G9L95VSIN3/ZZ9vBpm/XCS2bS+BWz3sSeNGLzI3TVQ0uL85Q== +jest-runtime@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.1.0.tgz#1a98d984ffebc16a0b4f9eaad8ab47c00a750cf5" + integrity sha512-okiR2cpGjY0RkWmUGGado6ETpFOi9oG3yV0CioYdoktkVxy5Hv0WRLWnJFuArSYS8cHMCNcceUUMGiIfgxCO9A== dependencies: - "@jest/console" "^27.0.6" - "@jest/environment" "^27.0.6" - "@jest/fake-timers" "^27.0.6" - "@jest/globals" "^27.0.6" + "@jest/console" "^27.1.0" + "@jest/environment" "^27.1.0" + "@jest/fake-timers" "^27.1.0" + "@jest/globals" "^27.1.0" "@jest/source-map" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/transform" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/test-result" "^27.1.0" + "@jest/transform" "^27.1.0" + "@jest/types" "^27.1.0" "@types/yargs" "^16.0.0" chalk "^4.0.0" cjs-module-lexer "^1.0.0" collect-v8-coverage "^1.0.0" + execa "^5.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-haste-map "^27.0.6" - jest-message-util "^27.0.6" - jest-mock "^27.0.6" + jest-haste-map "^27.1.0" + jest-message-util "^27.1.0" + jest-mock "^27.1.0" jest-regex-util "^27.0.6" - jest-resolve "^27.0.6" - jest-snapshot "^27.0.6" - jest-util "^27.0.6" - jest-validate "^27.0.6" + jest-resolve "^27.1.0" + jest-snapshot "^27.1.0" + jest-util "^27.1.0" + jest-validate "^27.1.0" slash "^3.0.0" strip-bom "^4.0.0" yargs "^16.0.3" @@ -7574,10 +7678,10 @@ jest-serializer@^27.0.6: "@types/node" "*" graceful-fs "^4.2.4" -jest-snapshot@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.6.tgz#f4e6b208bd2e92e888344d78f0f650bcff05a4bf" - integrity sha512-NTHaz8He+ATUagUgE7C/UtFcRoHqR2Gc+KDfhQIyx+VFgwbeEMjeP+ILpUTLosZn/ZtbNdCF5LkVnN/l+V751A== +jest-snapshot@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.1.0.tgz#2a063ab90064017a7e9302528be7eaea6da12d17" + integrity sha512-eaeUBoEjuuRwmiRI51oTldUsKOohB1F6fPqWKKILuDi/CStxzp2IWekVUXbuHHoz5ik33ioJhshiHpgPFbYgcA== dependencies: "@babel/core" "^7.7.2" "@babel/generator" "^7.7.2" @@ -7585,26 +7689,26 @@ jest-snapshot@^27.0.6: "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" "@babel/types" "^7.0.0" - "@jest/transform" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/transform" "^27.1.0" + "@jest/types" "^27.1.0" "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^27.0.6" + expect "^27.1.0" graceful-fs "^4.2.4" - jest-diff "^27.0.6" + jest-diff "^27.1.0" jest-get-type "^27.0.6" - jest-haste-map "^27.0.6" - jest-matcher-utils "^27.0.6" - jest-message-util "^27.0.6" - jest-resolve "^27.0.6" - jest-util "^27.0.6" + jest-haste-map "^27.1.0" + jest-matcher-utils "^27.1.0" + jest-message-util "^27.1.0" + jest-resolve "^27.1.0" + jest-util "^27.1.0" natural-compare "^1.4.0" - pretty-format "^27.0.6" + pretty-format "^27.1.0" semver "^7.3.2" -jest-util@^27.0.0, jest-util@^27.0.6: +jest-util@^27.0.0: version "27.0.6" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.6.tgz#e8e04eec159de2f4d5f57f795df9cdc091e50297" integrity sha512-1JjlaIh+C65H/F7D11GNkGDDZtDfMEM8EBXsvd+l/cxtgQ6QhxuloOaiayt89DxUvDarbVhqI98HhgrM1yliFQ== @@ -7616,29 +7720,41 @@ jest-util@^27.0.0, jest-util@^27.0.6: is-ci "^3.0.0" picomatch "^2.2.3" -jest-validate@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.6.tgz#930a527c7a951927df269f43b2dc23262457e2a6" - integrity sha512-yhZZOaMH3Zg6DC83n60pLmdU1DQE46DW+KLozPiPbSbPhlXXaiUTDlhHQhHFpaqIFRrInko1FHXjTRpjWRuWfA== +jest-util@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.1.0.tgz#06a53777a8cb7e4940ca8e20bf9c67dd65d9bd68" + integrity sha512-edSLD2OneYDKC6gZM1yc+wY/877s/fuJNoM1k3sOEpzFyeptSmke3SLnk1dDHk9CgTA+58mnfx3ew3J11Kes/w== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.1.0" + "@types/node" "*" + chalk "^4.0.0" + graceful-fs "^4.2.4" + is-ci "^3.0.0" + picomatch "^2.2.3" + +jest-validate@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.1.0.tgz#d9e82024c5e3f5cef52a600cfc456793a84c0998" + integrity sha512-QiJ+4XuSuMsfPi9zvdO//IrSRSlG6ybJhOpuqYSsuuaABaNT84h0IoD6vvQhThBOKT+DIKvl5sTM0l6is9+SRA== + dependencies: + "@jest/types" "^27.1.0" camelcase "^6.2.0" chalk "^4.0.0" jest-get-type "^27.0.6" leven "^3.1.0" - pretty-format "^27.0.6" + pretty-format "^27.1.0" -jest-watcher@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.6.tgz#89526f7f9edf1eac4e4be989bcb6dec6b8878d9c" - integrity sha512-/jIoKBhAP00/iMGnTwUBLgvxkn7vsOweDrOTSPzc7X9uOyUtJIDthQBTI1EXz90bdkrxorUZVhJwiB69gcHtYQ== +jest-watcher@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.1.0.tgz#2511fcddb0e969a400f3d1daa74265f93f13ce93" + integrity sha512-ivaWTrA46aHWdgPDgPypSHiNQjyKnLBpUIHeBaGg11U+pDzZpkffGlcB1l1a014phmG0mHgkOHtOgiqJQM6yKQ== dependencies: - "@jest/test-result" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/test-result" "^27.1.0" + "@jest/types" "^27.1.0" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^27.0.6" + jest-util "^27.1.0" string-length "^4.0.1" jest-worker@^26.2.1: @@ -7659,14 +7775,23 @@ jest-worker@^27.0.2, jest-worker@^27.0.6: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.6.tgz#10517b2a628f0409087fbf473db44777d7a04505" - integrity sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA== +jest-worker@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.1.0.tgz#65f4a88e37148ed984ba8ca8492d6b376938c0aa" + integrity sha512-mO4PHb2QWLn9yRXGp7rkvXLAYuxwhq1ZYUo0LoDhg8wqvv4QizP1ZWEJOeolgbEgAWZLIEU0wsku8J+lGWfBhg== dependencies: - "@jest/core" "^27.0.6" + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +jest@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-27.1.0.tgz#eaab62dfdc02d8b7c814cd27b8d2d92bc46d3d69" + integrity sha512-pSQDVwRSwb109Ss13lcMtdfS9r8/w2Zz8+mTUA9VORD66GflCdl8nUFCqM96geOD2EBwWCNURrNAfQsLIDNBdg== + dependencies: + "@jest/core" "^27.1.0" import-local "^3.0.2" - jest-cli "^27.0.6" + jest-cli "^27.1.0" jju@^1.1.0: version "1.4.0" @@ -7683,10 +7808,10 @@ js-base64@^2.1.8, js-base64@^2.1.9: resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== -js-cookie@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.0.tgz#db1661d5459920ec95aaf186ccf74ceb4a495164" - integrity sha512-oUbbplKuH07/XX2YD2+Q+GMiPpnVXaRz8npE7suhBH9QEkJe2W7mQ6rwuMXHue3fpfcftQwzgyvGzIHyfCSngQ== +js-cookie@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414" + integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw== js-tokens@^4.0.0: version "4.0.0" @@ -7826,7 +7951,7 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json5@2.x, json5@^2.1.2, json5@^2.2.0: +json5@2.x, json5@^2.1.2: version "2.2.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== @@ -8389,7 +8514,7 @@ make-error@1.x: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -make-fetch-happen@^9.0.1, make-fetch-happen@^9.0.5: +make-fetch-happen@^9.0.1, make-fetch-happen@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg== @@ -9145,10 +9270,10 @@ npm-user-validate@^1.0.1: resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561" integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw== -npm@^7.21.0: - version "7.21.0" - resolved "https://registry.yarnpkg.com/npm/-/npm-7.21.0.tgz#12af61f27ab6ece10af2b20ffb355fb2ae227fb6" - integrity sha512-OYSQykXItCDXYGb9U8o85Snhmbe0k/nwVK6CmUNmgtOcfPevVB5ZXwA44eWOCvM+WdWYQsJAJoA7eCHKImQt8g== +npm@^7.21.1: + version "7.21.1" + resolved "https://registry.yarnpkg.com/npm/-/npm-7.21.1.tgz#2ab886fc8b5eb044ca5b4e2f7570340fad9934eb" + integrity sha512-k7XQNHGHAp0VowMMUMRMtntxWatNad9hhYrelUKDPvZ++DBxvofA8QTNPiuMKtx8CBOFA8iJ4aizhbx6ZYVfzQ== dependencies: "@npmcli/arborist" "^2.8.2" "@npmcli/ci-detect" "^1.2.0" @@ -9160,7 +9285,7 @@ npm@^7.21.0: ansicolors "~0.3.2" ansistyles "~0.1.3" archy "~1.0.0" - cacache "^15.2.0" + cacache "^15.3.0" chalk "^4.1.2" chownr "^2.0.0" cli-columns "^3.1.2" @@ -9185,7 +9310,7 @@ npm@^7.21.0: libnpmsearch "^3.1.1" libnpmteam "^2.0.3" libnpmversion "^1.2.1" - make-fetch-happen "^9.0.5" + make-fetch-happen "^9.1.0" minipass "^3.1.3" minipass-pipeline "^1.2.4" mkdirp "^1.0.4" @@ -9205,13 +9330,13 @@ npm@^7.21.0: parse-conflict-json "^1.1.1" qrcode-terminal "^0.12.0" read "~1.0.7" - read-package-json "^4.0.0" + read-package-json "^4.0.1" read-package-json-fast "^2.0.3" readdir-scoped-modules "^1.1.0" rimraf "^3.0.2" semver "^7.3.5" ssri "^8.0.1" - tar "^6.1.10" + tar "^6.1.11" text-table "~0.2.0" tiny-relative-date "^1.3.0" treeverse "^1.0.4" @@ -9801,7 +9926,7 @@ pify@^3.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= -pinia@^2.0.0-beta.5: +pinia@^2.0.0-rc.6: version "2.0.0-rc.6" resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.0.0-rc.6.tgz#f83b7f2a62710715487574d6f442aa879961122b" integrity sha512-IqArmLmWJB5wZzELZfFF42bMaulo6cjMvL1wgUjWfmzaGCt1HYOAXN86s6HrdAueeEWj9Ov6lNNOHB1DFQxthw== @@ -10446,6 +10571,16 @@ pretty-format@^27.0.0, pretty-format@^27.0.6: ansi-styles "^5.0.0" react-is "^17.0.1" +pretty-format@^27.1.0: + version "27.1.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.1.0.tgz#022f3fdb19121e0a2612f3cff8d724431461b9ca" + integrity sha512-4aGaud3w3rxAO6OXmK3fwBFQ0bctIOG3/if+jYEFGNGIs0EvuidQm3bZ9mlP2/t9epLNC/12czabfy7TZNSwVA== + dependencies: + "@jest/types" "^27.1.0" + ansi-regex "^5.0.0" + ansi-styles "^5.0.0" + react-is "^17.0.1" + printj@~1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" @@ -10704,6 +10839,16 @@ read-package-json@^4.0.0: normalize-package-data "^3.0.0" npm-normalize-package-bin "^1.0.0" +read-package-json@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-4.0.1.tgz#da88a38c410344fecb7d840d35f27635e848ea54" + integrity sha512-czqCcYfkEl6sIFJVOND/5/Goseu7cVw1rcDUATq6ED0jLGjMm9/HOPmFmEZMvRu9yl272YERaMUcOlvcNU9InQ== + dependencies: + glob "^7.1.1" + json-parse-even-better-errors "^2.3.0" + normalize-package-data "^3.0.0" + npm-normalize-package-bin "^1.0.0" + read-pkg-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" @@ -12092,7 +12237,7 @@ tar-stream@^2.2.0: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^6.0.2, tar@^6.1.0, tar@^6.1.10: +tar@^6.0.2, tar@^6.1.0: version "6.1.10" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.10.tgz#8a320a74475fba54398fa136cd9883aa8ad11175" integrity sha512-kvvfiVvjGMxeUNB6MyYv5z7vhfFRwbwCXJAeL0/lnbrttBVqcMOnpHUf0X42LrPMR8mMpgapkJMchFH4FSHzNA== @@ -12104,6 +12249,18 @@ tar@^6.0.2, tar@^6.1.0, tar@^6.1.10: mkdirp "^1.0.3" yallist "^4.0.0" +tar@^6.1.11: + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + tealight@0.3.6: version "0.3.6" resolved "https://registry.yarnpkg.com/tealight/-/tealight-0.3.6.tgz#14c8071ce3c188972a5cb7d8a5668ca2820b4292" @@ -12366,12 +12523,13 @@ ts-loader@^9.2.5: micromatch "^4.0.0" semver "^7.3.4" -tsconfig-paths@^3.10.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7" - integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q== +tsconfig-paths@^3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36" + integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA== dependencies: - json5 "^2.2.0" + "@types/json5" "^0.0.29" + json5 "^1.0.1" minimist "^1.2.0" strip-bom "^3.0.0" @@ -12551,10 +12709,10 @@ typescript@4.2.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.2.tgz#1450f020618f872db0ea17317d16d8da8ddb8c4c" integrity sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ== -typescript@^4.3.5: - version "4.3.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" - integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== +typescript@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.2.tgz#6d618640d430e3569a1dfb44f7d7e600ced3ee86" + integrity sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ== uglify-js@3.4.x: version "3.4.10" @@ -12837,10 +12995,10 @@ vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= -vee-validate@^3.4.11: - version "3.4.11" - resolved "https://registry.yarnpkg.com/vee-validate/-/vee-validate-3.4.11.tgz#2015f75a4aa33c615418e6aa6b03bd778ed173d1" - integrity sha512-508zDZkxqzlXgOo3Rb+djjA1HxQjkUJzM2FKzxWIiwlarzYPb3J9seMifJZ+AfaWXraErZ+L0/6ncUBP7MYx2A== +vee-validate@^3.4.12: + version "3.4.12" + resolved "https://registry.yarnpkg.com/vee-validate/-/vee-validate-3.4.12.tgz#a268f34b712ac8a2f951544ff4cc14d9808212f0" + integrity sha512-mKYlbLmnKVj6zQ4pWBpOEQhc4rcee+wYy2IuMJEuH4Omx31g62YRVnjO3DMeWz7kAQN8z11UwHTY5s75gAGzRw== vendors@^1.0.0, vendors@^1.0.3: version "1.0.4"