Riattivato il Calendario (ma ancora non lo rendo visibile)

aggiunto campi: DateTimeStart e DateTimeEnd negli Eventi Aggiunto Filtro Data
2022-02-24 19:13:06 +01:00
parent 7b3a5a2ba8
commit 430408f7bf
64 changed files with 1061 additions and 473 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.2.8"
+APP_VERSION="0.2.9"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
--- a/_ALL_SITES/freeplanet.app/.env.development
+++ b/_ALL_SITES/freeplanet.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.2.8"
+APP_VERSION="0.2.9"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="1"
 DIRECTORY_LOCAL="newfreeplanet"
--- a/_ALL_SITES/freeplanet.app/db/static_data.ts
+++ b/_ALL_SITES/freeplanet.app/db/static_data.ts
@@ -382,10 +382,10 @@ const baseroutes: IListRoutes[] = [
  {
    active: true,
    order: 10,
-    path: '/bacheca',
+    path: '/events',
    materialIcon: 'fas fa-bullhorn',
-    name: 'mypages.bacheca',
-    component: () => import('@/root/bacheca/bacheca.vue'),
+    name: 'mypages.events',
+    component: () => import('@/root/eventi/eventi.vue'),
    meta: { requiresAuth: true },
    inmenu: true,
    infooter: true,
--- a/_ALL_SITES/freeplanet.app/package.json
+++ b/_ALL_SITES/freeplanet.app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "freeplanet",
-  "version": "0.0.7",
+  "version": "0.0.8",
  "description": "FreePlanet",
  "productName": "FreePlanet",
  "author": "Paolo Arena",
@@ -21,89 +21,89 @@
    "generate-sw": "workbox generateSW workbox-config.js"
  },
  "dependencies": {
-    "axios": "0.21.4",
+    "axios": "0.26.0",
    "@vue/eslint-config-standard": "5.1.2",
-    "@quasar/extras": "^1.12.2",
+    "@quasar/extras": "^1.12.5",
    "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.11",
-    "@vue/compat": "^3.2.26",
-    "@vue/compiler-sfc": "^3.2.26",
-    "@vuelidate/core": "^2.0.0-alpha.32",
-    "@vuelidate/validators": "^2.0.0-alpha.25",
-    "acorn": "^8.6.0",
-    "autoprefixer": "^10.4.0",
+    "@vue/compat": "^3.2.31",
+    "@vue/compiler-sfc": "^3.2.31",
+    "@vuelidate/core": "^2.0.0-alpha.34",
+    "@vuelidate/validators": "^2.0.0-alpha.26",
+    "acorn": "^8.7.0",
+    "autoprefixer": "^10.4.2",
    "bcryptjs": "^2.4.3",
-    "core-js": "^3.20.0",
+    "core-js": "^3.21.0",
    "crypto": "^1.0.1",
-    "date-fns": "^2.27.0",
+    "date-fns": "^2.28.0",
    "dotenv": "^10.0.0",
-    "echarts": "^5.2.2",
-    "eslint-plugin-quasar": "^1.0.0",
+    "echarts": "^5.3.0",
+    "eslint-plugin-quasar": "^1.1.0",
    "eslint-plugin-standard": "^5.0.0",
-    "graphql": "^16.1.0",
+    "graphql": "^16.3.0",
    "graphql-tag": "^2.12.6",
-    "gsap": "^3.9.0",
+    "gsap": "^3.9.1",
    "jquery": "^3.6.0",
    "js-cookie": "^3.0.1",
    "localforage": "^1.10.0",
    "lodash": "^4.17.21",
    "normalize.css": "^8.0.1",
-    "npm": "^8.3.0",
+    "npm": "^8.5.1",
    "nprogress": "^0.2.0",
-    "pinia": "^2.0.6",
+    "pinia": "^2.0.11",
    "prerender-spa-plugin": "^3.4.0",
-    "quasar": "^2.3.4",
+    "quasar": "^2.5.5",
    "quasar-extras": "^2.0.9",
    "register-service-worker": "^1.7.2",
-    "vee-validate": "^4.4.10",
-    "vue": "^3.2.26",
+    "vee-validate": "^4.5.8",
+    "vue": "^3.2.31",
    "vue-class-component": "^8.0.0-rc.1",
-    "vue-country-code": "^1.1.2",
-    "vue-echarts": "^6.0.0",
+    "vue-country-code": "^1.1.3",
+    "vue-echarts": "^6.0.2",
    "vue-i18n": "^9.2.0-beta.26",
    "vue-idb": "^0.2.0",
-    "vue-loader": "^16.5.0",
+    "vue-loader": "^17.0.0",
    "vue-property-decorator": "^10.0.0-rc.3",
-    "vue-router": "^4.0.11",
+    "vue-router": "^4.0.12",
    "vue-scroll-reveal": "^1.0.11",
    "vue-svgicon": "^4.0.0-alpha.3",
    "vue2-dragula": "^2.5.5",
-    "vuex": "^4.0.1",
+    "vuex": "^4.0.2",
    "vuex-router-sync": "^6.0.0-rc.1"
  },
  "devDependencies": {
    "node-sass": "6.0.1",
    "webpack": "^5.0.0",
-    "@quasar/app": "^3.2.5",
+    "@quasar/app": "^3.3.3",
    "@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.11",
    "@types/bcryptjs": "^2.4.2",
    "@types/dotenv": "^8.2.0",
    "@types/googlemaps": "^3.43.3",
-    "@types/jest": "^27.0.3",
+    "@types/jest": "^27.4.0",
    "@types/js-cookie": "^3.0.1",
-    "@types/node": "17.0.0",
+    "@types/node": "17.0.19",
    "@types/nprogress": "^0.2.0",
    "@types/vue-tel-input": "^2.1.2",
    "@types/vuelidate": "^0.7.15",
-    "@typescript-eslint/eslint-plugin": "^5.7.0",
-    "@typescript-eslint/parser": "^5.7.0",
-    "eslint": "^8.4.1",
+    "@typescript-eslint/eslint-plugin": "^5.12.0",
+    "@typescript-eslint/parser": "^5.12.0",
+    "eslint": "^8.9.0",
    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-import": "^2.25.4",
    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.2.0",
-    "eslint-plugin-vue": "^8.2.0",
+    "eslint-plugin-promise": "^6.0.0",
+    "eslint-plugin-vue": "^8.4.1",
    "file-loader": "^6.2.0",
    "html-webpack-plugin": "^5.5.0",
-    "http-proxy-middleware": "^2.0.1",
-    "jest": "^27.4.5",
+    "http-proxy-middleware": "^2.0.3",
+    "jest": "^27.5.1",
    "json-loader": "^0.5.7",
-    "npm-check-updates": "^12.0.5",
+    "npm-check-updates": "^12.4.0",
    "optimize-css-assets-webpack-plugin": "^6.0.1",
-    "postcss": "^8.4.5",
+    "postcss": "^8.4.6",
    "postcss-loader": "^6.2.1",
-    "sass-loader": "^12.4.0",
+    "sass-loader": "^12.6.0",
    "strip-ansi": "=7.0.1",
-    "ts-jest": "^27.1.1",
+    "ts-jest": "^27.1.3",
    "ts-loader": "^9.2.6",
    "tslint": "^6.1.3",
    "tslint-config-standard": "^9.0.0",
@@ -117,18 +117,18 @@
    "crypto": false
  },
  "browserslist": [
-    "last 10 Chrome versions",
-    "last 10 Firefox versions",
+    "last 13 Chrome versions",
+    "last 13 Firefox versions",
    "last 4 Edge versions",
-    "last 7 Safari versions",
-    "last 8 Android versions",
-    "last 8 ChromeAndroid versions",
-    "last 8 FirefoxAndroid versions",
+    "last 13 Safari versions",
+    "last 14 Android versions",
+    "last 14 ChromeAndroid versions",
+    "last 14 FirefoxAndroid versions",
    "last 10 iOS versions",
    "last 5 Opera versions"
  ],
  "engines": {
-    "node": ">= 14.17.0",
+    "node": ">= 16.14.0",
    "npm": ">= 6.14.8",
    "yarn": ">= 1.21.1"
  }
--- a/_ALL_SITES/insiemesipuo.app/.env.development
+++ b/_ALL_SITES/insiemesipuo.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.2.8"
+APP_VERSION="0.2.9"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
--- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_enUs.js
+++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_enUs.js
@@ -1,7 +1,7 @@
 const msg_website_enUs = {
  ws: {
    sitename: 'InsiemeSiPuò',
-    siteshortname: 'InsiemeSiPuò',
+    siteshortname: 'ISP',
    botname: 'InsiemeSiPuò BOT',
  },
  pages: {
--- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_es.js
+++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_es.js
@@ -1,7 +1,7 @@
 const msg_website_es = {
  ws: {
    sitename: 'InsiemeSiPuò',
-    siteshortname: 'InsiemeSiPuò',
+    siteshortname: 'ISP',
    botname: 'InsiemeSiPuò BOT',
  },
  pages: {
--- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_fr.js
+++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_fr.js
@@ -1,7 +1,7 @@
 const msg_website_fr = {
  ws: {
    sitename: 'InsiemeSiPuò',
-    siteshortname: 'InsiemeSiPuò',
+    siteshortname: 'ISP',
    botname: 'InsiemeSiPuò BOT',
  },
  homepage: {
--- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js
+++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js
@@ -1,7 +1,7 @@
 const msg_website_it = {
  ws: {
    sitename: 'InsiemeSiPuò',
-    siteshortname: 'InsiemeSiPuò',
+    siteshortname: 'ISP',
    botname: 'il Bot di InsiemeSiPuò',
  },
  products: {
--- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_pt.js
+++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_pt.js
@@ -1,7 +1,7 @@
 const msg_website_pt = {
  ws: {
    sitename: 'InsiemeSiPuò',
-    siteshortname: 'InsiemeSiPuò',
+    siteshortname: 'ISP',
    botname: 'InsiemeSiPuò BOT',
  },
  pages: {
--- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_si.js
+++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_si.js
@@ -1,7 +1,7 @@
 const msg_website_si = {
  ws: {
    sitename: 'InsiemeSiPuò',
-    siteshortname: 'InsiemeSiPuò',
+    siteshortname: 'ISP',
    botname: 'InsiemeSiPuò BOT',
  },
  pages: {
--- a/_ALL_SITES/insiemesipuo.app/db/static_data.ts
+++ b/_ALL_SITES/insiemesipuo.app/db/static_data.ts
@@ -382,10 +382,10 @@ const baseroutes: IListRoutes[] = [
  {
    active: false,
    order: 100,
-    path: '/bacheca',
+    path: '/events',
    materialIcon: 'fas fa-bullhorn',
-    name: 'mypages.bacheca',
-    component: () => import('@/root/bacheca/bacheca.vue'),
+    name: 'mypages.events',
+    component: () => import('@/root/eventi/eventi.vue'),
    meta: { requiresAuth: true },
    inmenu: false,
    infooter: false,
--- a/_ALL_SITES/popolodelnuovomondo.app/.env.development
+++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.2.8"
+APP_VERSION="0.2.9"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="12"
 DIRECTORY_LOCAL="newfreeplanet"
--- a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts
+++ b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts
@@ -382,10 +382,10 @@ const baseroutes: IListRoutes[] = [
  {
    active: true,
    order: 10,
-    path: '/bacheca',
+    path: '/events',
    materialIcon: 'fas fa-bullhorn',
-    name: 'mypages.bacheca',
-    component: () => import('@/root/bacheca/bacheca.vue'),
+    name: 'mypages.events',
+    component: () => import('@/root/eventi/eventi.vue'),
    meta: { requiresAuth: true },
    inmenu: true,
    infooter: true,
--- a/package.json
+++ b/package.json
@@ -5,32 +5,33 @@
  "productName": "Insieme Si Puo",
  "author": "Paolo Arena",
  "private": true,
-  "keywords": [
-  ],
+  "keywords": [],
  "license": "MIT",
  "scripts": {
    "dev": "quasar dev",
    "build": "quasar build",
    "buildpwa": "quasar build -m pwa",
+    "buildspa": "quasar build -m spa",
    "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./",
    "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt",
    "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt",
    "fix": "eslint --ext .ts,.vue --ignore-path .gitignore ./ --fix > file.out.txt",
    "pwa": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m pwa",
+    "spa": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m spa",
    "test": "echo \"No test specified\" && exit 0",
    "generate-sw": "workbox generateSW workbox-config.js"
  },
  "dependencies": {
-    "axios": "0.21.4",
-    "@vue/eslint-config-standard": "5.1.2",
    "@quasar/extras": "^1.12.5",
-    "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.11",
+    "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.13",
    "@vue/compat": "^3.2.31",
    "@vue/compiler-sfc": "^3.2.31",
+    "@vue/eslint-config-standard": "5.1.2",
    "@vuelidate/core": "^2.0.0-alpha.34",
    "@vuelidate/validators": "^2.0.0-alpha.26",
    "acorn": "^8.7.0",
    "autoprefixer": "^10.4.2",
+    "axios": "^0.26.0",
    "bcryptjs": "^2.4.3",
    "core-js": "^3.21.0",
    "crypto": "^1.0.1",
@@ -71,10 +72,7 @@
    "vuex-router-sync": "^6.0.0-rc.1"
  },
  "devDependencies": {
-    "node-sass": "6.0.1",
-    "webpack": "^5.0.0",
-    "@quasar/app": "^3.2.5",
-    "@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.11",
+    "@quasar/app": "^3.3.3",
    "@types/bcryptjs": "^2.4.2",
    "@types/dotenv": "^8.2.0",
    "@types/googlemaps": "^3.43.3",
@@ -97,6 +95,7 @@
    "http-proxy-middleware": "^2.0.3",
    "jest": "^27.5.1",
    "json-loader": "^0.5.7",
+    "node-sass": "6.0.1",
    "npm-check-updates": "^12.4.0",
    "optimize-css-assets-webpack-plugin": "^6.0.1",
    "postcss": "^8.4.6",
@@ -111,24 +110,25 @@
    "typescript": "^4.5.4",
    "vue-cli-plugin-element-ui": "^1.1.4",
    "vueify": "^9.4.1",
+    "webpack": "^5.0.0",
    "workbox-webpack-plugin": "^6.4.2"
  },
  "browser": {
    "crypto": false
  },
  "browserslist": [
-    "last 10 Chrome versions",
-    "last 10 Firefox versions",
+    "last 13 Chrome versions",
+    "last 13 Firefox versions",
    "last 4 Edge versions",
-    "last 7 Safari versions",
-    "last 8 Android versions",
-    "last 8 ChromeAndroid versions",
-    "last 8 FirefoxAndroid versions",
+    "last 13 Safari versions",
+    "last 14 Android versions",
+    "last 14 ChromeAndroid versions",
+    "last 14 FirefoxAndroid versions",
    "last 10 iOS versions",
    "last 5 Opera versions"
  ],
  "engines": {
-    "node": ">= 14.17.0",
+    "node": ">= 16.14.0",
    "npm": ">= 6.14.8",
    "yarn": ">= 1.21.1"
  }
--- a/public/upload/none/bozza.jpg
+++ b/public/upload/none/bozza.jpg
--- a/public/upload/none/citta.png
+++ b/public/upload/none/citta.png
--- a/public/upload/none/matrimonio.jpeg
+++ b/public/upload/none/matrimonio.jpeg
--- a/public/upload/none/posizioni.png
+++ b/public/upload/none/posizioni.png
--- a/public/upload/none/serenita_interiore.jpg
+++ b/public/upload/none/serenita_interiore.jpg
--- a/public/upload/none/temperare.png
+++ b/public/upload/none/temperare.png
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -37,7 +37,7 @@ module.exports = configure((ctx) => ({
  // --> boot files are part of "main.js"
  // https://v2.quasar.dev/quasar-cli/boot-files
  // boot: ['vue-i18n', 'vue-meta', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'vue-idb', 'dragula', 'guard'],
-  boot: ['i18n', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines'],
+  boot: ['i18n', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'calendar'],

  // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css
  css: [
--- a/quasar.extensions.json
+++ b/quasar.extensions.json
@@ -1,3 +1 @@
-{
-  "@quasar/qcalendar": {}
-}
+{}
--- a/src/App.ts
+++ b/src/App.ts
@@ -75,7 +75,7 @@ export default {
            .then((loadstorage: any) => {
              if (loadstorage) {

-                if ($q.screen.gt.xs) {
+                if ($q.screen.gt.sm) {
                  globalStore.setleftDrawerOpen(true)
                }

--- a/src/boot/axios.ts
+++ b/src/boot/axios.ts
@@ -1,7 +1,7 @@
 import axios from 'axios'
 import { boot } from 'quasar/wrappers'

-// const api = axios.create({ baseURL: 'https://api.example.com' })
+const api = axios.create({ baseURL: process.env.MONGODB_HOST })

 export default boot(({ app }) => {
 // for use inside Vue files (Options API) through this.$axios and this.$api
@@ -10,7 +10,7 @@ export default boot(({ app }) => {
  // ^ ^ ^ this will allow you to use this.$axios (for Vue Options API form)
  //       so you won't necessarily have to import axios in each vue file

-  // app.config.globalProperties.$api = api
+  app.config.globalProperties.$api = api
 // ^ ^ ^ this will allow you to use this.$api (for Vue Options API form)
 //       so you can easily perform requests against your app's API
 //
--- a/src/boot/calendar.ts
+++ b/src/boot/calendar.ts
@@ -1,7 +1,7 @@
 import { boot } from 'quasar/wrappers'
 // @ts-ignore
-import Plugin from '@quasar/quasar-ui-qcalendar/src/QCalendarDay.js'
-// import '@quasar/quasar-ui-qcalendar/src/css/calendar-day.sass'
+import Plugin from '@quasar/quasar-ui-qcalendar/src/QCalendarMonth'
+import '@quasar/quasar-ui-qcalendar/dist/index.css'

 export default boot(({ app }) => {
  app.use(Plugin)
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -91,6 +91,9 @@ export const shared_consts = {

  TABLES_USER_INCLUDE_MY: ['mygroups'],
  TABLES_GETCOMPLETEREC: ['myskills', 'mybachecas', 'mygoods'],
+  TABLES_WITH_FILTER_FIELD: ['caldate'],
+  TABLES_WITH_DATE: ['mybachecas'],
+  TABLES_WITH_SORTING: ['mybachecas'],
  TABLES_PERM_NEWREC: ['skills', 'goods', 'subskills', 'mygroups'],
  TABLES_REC_ID: ['skills', 'goods', 'subskills'],

--- a/src/components/CBigBtn/CBigBtn.scss
+++ b/src/components/CBigBtn/CBigBtn.scss
@@ -1,3 +1,7 @@
+.text-cls{
+  font-weight: bold;
+}
+
 .my-text {
  font-size: 1rem;
  font-weight: bold;
@@ -26,8 +30,8 @@
 }

 .mybox {
-  min-width: 125px;
-  min-height: 137px;
+  min-width: 112px;
+  min-height: 112px;

  width: 100%;
 }
--- a/src/components/CBigBtn/CBigBtn.vue
+++ b/src/components/CBigBtn/CBigBtn.vue
@@ -1,25 +1,25 @@
 <template>
  <div v-if="numcol === 3" class="col-xs-4 col-sm-4 col-md-3 col-lg-2">
-    <div class="q-ma-xs">
+    <div class="q-ma-sm">
      <q-btn v-if="!small" class="mybox_3" :color="color" rounded push :to="to" v-bind="$attrs">
        <q-icon class="q-ma-sm" :name="icon"/>
-        <div class="q-ma-sm my-text_3 no-wrap"><span v-html="label"></span></div>
+        <div class="q-ma-sm my-text_3 text-cls no-wrap"><span v-html="label"></span></div>
      </q-btn>
      <q-btn v-if="small" class="mybox_small" :color="color" rounded push :to="to" v-bind="$attrs">
-        <q-icon class="q-ma-xs" :name="icon" size="sm"/>
-        <div class="q-ma-xs my-text-small no-wrap"><span v-html="label"></span></div>
+        <q-icon class="q-ma-sm" :name="icon" size="sm"/>
+        <div class="q-ma-xs my-text-small text-cls no-wrap"><span v-html="label"></span></div>
      </q-btn>
    </div>
  </div>
  <div v-else class="col-xs-6 col-sm-6 col-md-4 col-lg-3">
    <div class="q-ma-sm">
      <q-btn v-if="!small" class="mybox" :color="color" rounded push :to="to" v-bind="$attrs">
-        <q-icon class="q-ma-sm" size="4.5rem" :name="icon"/>
-        <div class="q-ma-sm text-h5 no-wrap"><span v-html="label"></span></div>
+        <q-icon class="q-ma-sm" size="3rem" :name="icon"/>
+        <div class="q-ma-sm text-h5 text-cls no-wrap"><span v-html="label"></span></div>
      </q-btn>
      <q-btn v-if="small" class="mybox_small" :color="color" rounded push :to="to" v-bind="$attrs">
-        <q-icon class="q-ma-xs" :name="icon" size="sm"/>
-        <div class="q-ma-xs my-text-small no-wrap"><span v-html="label"></span></div>
+        <q-icon class="q-ma-sm" :name="icon" size="sm"/>
+        <div class="q-ma-xs my-text-small text-cls no-wrap"><span v-html="label"></span></div>
      </q-btn>
    </div>
  </div>
--- a/src/components/CFinder/CFinder.ts
+++ b/src/components/CFinder/CFinder.ts
@@ -44,6 +44,7 @@ export default defineComponent({
    const searchList_Servizi = ref(<ISearchList[]>[])
    const searchList_Beni = ref(<ISearchList[]>[])
    const searchList_MyGroups = ref(<ISearchList[]>[])
+    const searchList_Events = ref(<ISearchList[]>[])

    const search = ref('')
    const myrecfiltertoggle = ref(tools.FILTER_ALL)
@@ -53,7 +54,6 @@ export default defineComponent({
    const col_footer = ref('idCity')
    const col_tabfooter = ref('mycities')

-    const mypagination = ref({ sortBy: 'date_created', descending: true, page: 1, rowsNumber: 20, rowsPerPage: 20 })

    const col = ref(<IColGridTable>{})

@@ -81,6 +81,13 @@ export default defineComponent({
      },
    )

+    const mypagination = computed(() => {
+      if (props.table === toolsext.TABMYBACHECAS)
+        return { sortBy: 'dateStart', descending: false, page: 1, rowsNumber: 20, rowsPerPage: 20 }
+
+      return { sortBy: 'date_created', descending: true, page: 1, rowsNumber: 20, rowsPerPage: 20 }
+    })
+
    const searchList = computed(() => {
      if (props.table === toolsext.TABMYGOODS)
        return searchList_Beni.value
@@ -88,6 +95,8 @@ export default defineComponent({
        return searchList_Servizi.value
      else if (props.table === toolsext.TABMYGROUPS)
        return searchList_MyGroups.value
+      else if (props.table === toolsext.TABMYBACHECAS)
+        return searchList_Events.value

      return searchList_Servizi.value
    })
@@ -107,11 +116,13 @@ export default defineComponent({
      if (props.table === toolsext.TABMYGOODS)
        return 'nome del Bene o settore da cercare'
      else if (props.table === toolsext.TABMYSKILLS)
-        return 'nome del servizio o settore da cercare'
+        return 'nome del Servizio o settore da cercare'
      else if (props.table === toolsext.TABMYGROUPS)
-        return 'nome del gruppo da cercare'
+        return 'nome del Gruppo da cercare'
+      else if (props.table === toolsext.TABMYBACHECAS)
+        return 'nome dell\'Evento da cercare'

-      return 'nome del gruppo da cercare'
+      return 'nome da cercare'
    })

    const visuType = computed(() => {
@@ -121,6 +132,8 @@ export default defineComponent({
        return $q.screen.gt.xs
      else if (props.table === toolsext.TABMYGROUPS)
        return $q.screen.gt.xs
+      else if (props.table === toolsext.TABMYBACHECAS)
+        return $q.screen.gt.xs

      return $q.screen.gt.xs
    })
@@ -132,6 +145,8 @@ export default defineComponent({
        return 'Nessun Servizio trovato con i filtri selezionati'
      else if (props.table === toolsext.TABMYGROUPS)
        return 'Nessun Gruppo trovato con i filtri selezionati'
+      else if (props.table === toolsext.TABMYBACHECAS)
+        return 'Nessun Evento trovato con i filtri selezionati'

      return 'Nessun dato trovato con i filtri selezionati'
    })
@@ -341,6 +356,118 @@ export default defineComponent({

      ]

+      searchList_Events.value = [
+        {
+          label: 'Stato',
+          table: 'statusSkills',
+          key: 'idStatusSkill',
+          value: 0,
+          // arrvalue: tools.getCookie(tools.COOK_SEARCH + 'statusSkills', []),
+          arrvalue: [],
+          type: costanti.FieldType.multiselect,
+          filter: null,
+          useinput: false,
+          icon: 'mood',
+          filteradv: true,
+        },
+        /*{
+          label: 'Regione',
+          table: 'regions',
+          key: 'idReg',
+          value: 0,
+          type: costanti.FieldType.select,
+          arrvalue: tools.getCookie(tools.COOK_SEARCH + 'regions', [costanti.FILTER_TUTTI]),
+          filter: null,
+          useinput: true,
+        },*/
+        {
+          label: 'Provincia',
+          table: 'provinces',
+          key: 'idProvince',
+          type: costanti.FieldType.select,
+          value: tools.getCookie(tools.COOK_SEARCH + 'provinces', costanti.FILTER_TUTTI),
+          addall: true,
+          arrvalue: [],
+          filter: null,
+          useinput: true,
+          icon: 'flag',
+        },
+        {
+          label: 'Comune',
+          table: 'cities',
+          key: 'idCity',
+          type: costanti.FieldType.select_by_server,
+          value: tools.getCookie(tools.COOK_SEARCH + 'cities', costanti.FILTER_TUTTI),
+          addall: true,
+          arrvalue: [],
+          useinput: true,
+          filter: null,
+          // filter: getFilterCitiesByProvince,
+          // param1: shared_consts.PARAM_SHOW_PROVINCE,
+          tablesel: 'cities',
+        },
+        {
+          label: 'Offro/Cerco',
+          table: 'adtypes',
+          key: 'adType',
+          value: tools.getCookie(tools.COOK_SEARCH + 'adtypes', costanti.FILTER_TUTTI),
+          arrvalue: [],
+          addall: true,
+          type: costanti.FieldType.select,
+          filter: null,
+          useinput: false,
+        },
+        {
+          label: 'Data Inizio',
+          table: 'caldate',
+          key: 'dateTimeStart',
+          value: tools.getCookie(tools.COOK_SEARCH + 'datetimestart', costanti.FILTER_TUTTI),
+          arrvalue: [],
+          type: costanti.FieldType.select,
+          addall: true,
+          filter: null,
+          useinput: false,
+        },
+        {
+          label: 'Settore',
+          table: 'sectors',
+          key: 'idSector',
+          value: tools.getCookie(tools.COOK_SEARCH + 'sectors', 0),
+          arrvalue: [],
+          type: costanti.FieldType.select,
+          filter: null,
+          addall: true,
+          notinsearch: true,
+          useinput: false,
+        },
+        {
+          label: 'Categoria',
+          table: 'skills',
+          key: 'idSkill',
+          value: tools.getCookie(tools.COOK_SEARCH + 'skills' + '_' + tools.getCookie(tools.COOK_SEARCH + 'sectors', costanti.FILTER_TUTTI), costanti.FILTER_TUTTI),
+          arrvalue: [],
+          type: costanti.FieldType.select,
+          addall: true,
+          filter: getFilterSkills,
+          showcount: true,
+          useinput: false,
+        },
+        {
+          label: 'In cambio di',
+          table: 'contribtypes',
+          key: 'idContribType',
+          value: 0,
+          arrvalue: tools.getCookie(tools.COOK_SEARCH + 'contribtypes', []),
+          type: costanti.FieldType.multiselect,
+          filter: null,
+          useinput: false,
+          icon: 'fas fa-hand-holding',
+          filteradv: true,
+          //icon: 'swap_horizontal_circle',
+        },
+
+      ]
+
      searchList_Beni.value = [
        /*{
          label: 'Regione',
@@ -649,8 +776,72 @@ export default defineComponent({
            af_objId_tab: '',
          },
        }
+      } else if (props.table === toolsext.TABMYBACHECAS) {
+        return {
+          // Servizi
+          lookup1: {
+            lk_tab: 'users',
+            lk_LF: 'userId',
+            lk_FF: '_id',
+            lk_as: 'user',
+            af_objId_tab: 'myId',
+          },
+          lookup2: {
+            lk_tab: 'skills',
+            lk_LF: 'idSkill',
+            lk_FF: '_id',
+            lk_as: 'recSkill',
+            af_objId_tab: '',
+            lk_proj: {
+              recSkill: 1,
+              sector: 1,
+              idSector: 1,
+              idSkill: 1,
+              // idSubSkill: 1,
+              myskill: 1,
+              idStatusSkill: 1,
+              idContribType: 1,
+              idCity: 1,
+              dateTimeStart: 1,
+              dateTimeEnd: 1,
+              numLevel: 1,
+              adType: 1,
+              photos: 1,
+              note: 1,
+              website: 1,
+              //**ADDFIELD_MYSKILL
+              descr: 1,
+              date_created: 1,
+              date_updated: 1,
+              userId: 1,
+              username: 1,
+              name: 1,
+              surname: 1,
+              comune: 1,
+              mycities: 1,
+              'profile.img': 1,
+              'profile.qualifica': 1,
+            }
+          },
+          lookup3: {
+            lk_tab: 'sectors',
+            lk_LF: 'recSkill.idSector',
+            lk_FF: '_id',
+            lk_as: 'sector',
+            af_objId_tab: '',
+          },
+          lookup5: {
+            lk_tab: 'cities',
+            lk_LF: 'idCity',
+            lk_FF: '_id',
+            lk_as: 'mycities',
+            af_objId_tab: '',
+          },
+        }
+
      } else {
        return {
+          // Servizi
          lookup1: {
            lk_tab: 'users',
            lk_LF: 'userId',
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -245,8 +245,10 @@ export default defineComponent({
    const spinner_visible = ref(false)
    const searchList = toRef(props, 'prop_searchList')

+    let actual = ''
+
    let idsel = ''
-    let colsel = ref(<IColGridTable | null>{ name: '', field: '' })
+    let colsel = ref(<IColGridTable | null>{ name: '', field: '', sortable: false })
    let valPrec = ''

    let separator: 'horizontal'
@@ -261,6 +263,7 @@ export default defineComponent({
    const colVisib: any = ref([])
    const colNotVisib: any = ref([])
    const colExtra: any = ref([])
+    const actualDate: any = ref(<any>null)

    const rowclicksel = ref(<any>null)
    const colclicksel = ref(null)
@@ -402,6 +405,7 @@ export default defineComponent({
      let filtersearch: any[] = []
      let filtersearch2: any[] = []
      let filtersearch3or: any[] = []
+      let filtercustom: any[] = [...props.filtercustom]

      let recSector = null
      let recSectorGood = null
@@ -463,6 +467,18 @@ export default defineComponent({
                  filtersearch3or.push(obj)
                }
              }
+            } else if (shared_consts.TABLES_WITH_FILTER_FIELD.includes(item.table)) {
+
+              if (item.value) {
+                if (item.value && item.value !== '' && item.value._id !== costanti.FILTER_TUTTI) {
+                  const myr: any = globalStore.getRecordByTableSingle(item.table, item.value)
+
+                  if (myr) {
+                    filtercustom.push(myr.filter)
+                  }
+
+                }
+              }
            } else if (item.value > 0) {
              objitem[item.key] = item.value
                filtersearch.push(objitem)
@@ -564,7 +580,7 @@ export default defineComponent({
        filtersearch2: filtersearch2,
        filtersearch3or: filtersearch3or,
        // @ts-ignore
-        filtercustom: props.filtercustom,
+        filtercustom: filtercustom,
        sortBy: myobj,
        descending,
        userId: userStore.my._id,
@@ -765,7 +781,7 @@ export default defineComponent({
      colsel.value = colclicksel.value
      // console.log('colsel', colsel)
      SaveValue(newVal, valinitial)
-      colsel.value = { name: '', field: '' }
+      colsel.value = { name: '', field: '', sortable: false }
    }


@@ -889,8 +905,12 @@ export default defineComponent({

      // console.log('DATA=', mydata.data)

+
+      // @ts-ignore
+      if (props.defaultnewrec) {
        // @ts-ignore
        newRecord.value = props.defaultnewrec()
+      }
      newRecord.value['userId'] = userStore.my._id
      newRecord.value['idapp'] = process.env.APP_ID
      // globalStore.saveTable(mydata).then(ris => console.log('RISULT', ris))
@@ -914,6 +934,10 @@ export default defineComponent({
    function saveFieldValue(mydata: any) {
      // console.log('saveFieldValue', mydata)

+      if (newRecordBool.value){
+        return false
+      }
+
      // Save on Server
      globalStore.saveFieldValue(mydata).then((esito) => {
        if (esito) {
@@ -1091,7 +1115,7 @@ export default defineComponent({
      // console.log('changecol', mytable.value)
      if (!!mytable.value) {
        let arrcol = []
-        let col: IColGridTable = {name: ''}
+        let col: IColGridTable = {name: '', sortable: false}
        for (col of mycolumns.value) {
          if (col.field !== costanti.NOFIELD) {
            let obj = {
@@ -1483,6 +1507,18 @@ export default defineComponent({
      }
    }

+    function showDate(mydate: any) {
+      console.log('showDate', mydate)
+      const datestr = tools.getstrVeryShortDate(mydate)
+      if (actualDate.value !== datestr) {
+        return true
+      }
+      return false
+    }
+    function getActualDate(mydate: any) {
+      return actualDate.value
+    }
+
    // onMounted(mounted)

    created()
@@ -1568,6 +1604,10 @@ export default defineComponent({
      cmdExt,
      visupagedialog,
      myrecdialog,
+      showDate,
+      getActualDate,
+      actualDate,
+      actual,
    }
  }
 })
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -36,7 +36,7 @@
    </q-inner-loading>
    <q-table
      :grid="(myvertical === costanti.VISUTABLE_SCHEDA_USER || myvertical === 2 || myvertical === costanti.VISUTABLE_SCHEDA_GROUP)"
-      :grid-header="false"
+      :grid-header="(myvertical === costanti.VISUTABLE_SCHEDA_USER || myvertical === 2 || myvertical === costanti.VISUTABLE_SCHEDA_GROUP) && shared_consts.TABLES_WITH_SORTING.includes(mytable)"
      flat
      bordered
      class="my-sticky-header-table"
@@ -57,7 +57,9 @@
      v-model:selected="selected">


-      <template v-slot:header="props">
+      <template
+        v-if="!(myvertical === costanti.VISUTABLE_SCHEDA_USER || myvertical === 2 || myvertical === costanti.VISUTABLE_SCHEDA_GROUP)"
+        v-slot:header="props">
        <q-tr :props="props">
          <q-th>
          </q-th>
@@ -74,8 +76,31 @@
          </q-th>
        </q-tr>
      </template>
+      <template v-else
+                v-slot:header="props">
+        <q-tr :props="props">
+          <q-th>
+          </q-th>
+
+          <span v-for="col in props.cols" :key="col.name">
+            <q-th
+              v-if="col.sortable"
+              :key="col.name"
+              :props="props"
+              class="text-italic text-weight-bold"
+            >
+              <span>
+                {{ col.label }}
+              </span>
+
+            </q-th>
+          </span>
+        </q-tr>
+      </template>

      <template v-slot:top-right v-if="tablesList || arrfilters">
+        <span style="display: none">{{actual = null}}</span>
+
        <q-select
          v-if="tablesList"
          v-model="tablesel"
@@ -99,6 +124,14 @@

          </q-toggle>
        </div>
+
+
+        <!--<q-input borderless dense debounce="300" v-model="filter" placeholder="Search">
+          <template v-slot:append>
+            <q-icon name="search" />
+          </template>
+        </q-input>-->
+
      </template>

      <template v-slot:top-left>
@@ -184,12 +217,13 @@
            >

              <template v-if="item.icon" v-slot:prepend>
-                <q-icon :name="item.icon" />
+                <q-icon :name="item.icon"/>
              </template>
              <template
                v-if="item.arrvalue.length >= 1"
                v-slot:selected-item="scope">
-                <div v-if="scope.opt[fieldsTable.getLabelByTable(item.table)] || (scope.opt && checkIfShowRec(scope.opt)) ">
+                <div
+                  v-if="scope.opt[fieldsTable.getLabelByTable(item.table)] || (scope.opt && checkIfShowRec(scope.opt)) ">
                  <q-chip
                    removable
                    dense
@@ -262,9 +296,11 @@
        <div v-if="choose_visutype" class="">
          <q-radio v-model="myvertical" :val="2" label="Lista"
                   @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/>
-          <q-radio v-if="mytable === toolsext.TAB" v-model="myvertical" :val="costanti.VISUTABLE_SCHEDA_GROUP" label="Scheda"
+          <q-radio v-if="mytable === toolsext.TAB" v-model="myvertical" :val="costanti.VISUTABLE_SCHEDA_GROUP"
+                   label="Scheda"
                   @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/>
-          <q-radio v-else-if="mytable !== toolsext.TABMYGROUPS && !finder" v-model="myvertical" :val="costanti.VISUTABLE_SCHEDA_USER" label="Scheda"
+          <q-radio v-else-if="mytable !== toolsext.TABMYGROUPS && !finder" v-model="myvertical"
+                   :val="costanti.VISUTABLE_SCHEDA_USER" label="Scheda"
                   @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/>
          <q-radio v-if="$q.screen.gt.xs" v-model="myvertical" :val="0" label="Tabella"
                   @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/>
@@ -317,17 +353,28 @@
      </template>

      <template v-slot:item="props">
-        <div v-if="showType === costanti.SHOW_MYCARD || (myvertical === costanti.VISUTABLE_LISTA && shared_consts.TABLES_VISU_CMYSRECCARD.includes(tablesel)) ">
+        <div
+          v-if="showType === costanti.SHOW_MYCARD || (myvertical === costanti.VISUTABLE_LISTA && shared_consts.TABLES_VISU_CMYSRECCARD.includes(tablesel)) ">
+
+          <div v-if="props.row && shared_consts.TABLES_WITH_DATE.includes(tablesel)">
+
+            <div v-if="props.row.dateTimeStart && (tools.getstrVeryShortDate(props.row.dateTimeStart) !== actual)" class="actualdate">
+              <span style="display: none">{{actual = tools.getstrVeryShortDate(props.row.dateTimeStart)}}</span>
+              <q-chip class="text-center shadow-5 glossy bg-orange" icon="fas fa-calendar-day">{{tools.getstrDateLong(props.row.dateTimeStart) }}</q-chip>
+            </div>
+          </div>
+
          <CMyRecCard
            :table="tablesel"
            :prop_myrec="props.row"
            @cmdext="cmdExt"
-            :visu="visufind"
          >
          </CMyRecCard>

        </div>
-        <div v-else-if="((showType === costanti.SHOW_USERINFO) && myvertical !== costanti.VISUTABLE_SCHEDA_USER) || ((myvertical === 2) && (shared_consts.TABLES_VISU_LISTA_USER.includes(tablesel)))" class="fill-all-width">
+        <div
+          v-else-if="((showType === costanti.SHOW_USERINFO) && myvertical !== costanti.VISUTABLE_SCHEDA_USER) || ((myvertical === 2) && (shared_consts.TABLES_VISU_LISTA_USER.includes(tablesel)))"
+          class="fill-all-width">
          <div>
            <CMyUser
              :mycontact="props.row"
@@ -352,7 +399,9 @@
          </div>

        </div>
-        <div v-else-if="((showType === costanti.SHOW_GROUPINFO) && myvertical !== costanti.VISUTABLE_SCHEDA_GROUP) || ((myvertical === 2) && (tablesel === 'mygroups'))" class="fill-all-width">
+        <div
+          v-else-if="((showType === costanti.SHOW_GROUPINFO) && myvertical !== costanti.VISUTABLE_SCHEDA_GROUP) || ((myvertical === 2) && (tablesel === 'mygroups'))"
+          class="fill-all-width">
          <div>

            <CMyGroups
@@ -374,7 +423,8 @@
                  style="background: radial-gradient(circle, #ffffff 0%, #bbddff 100%)">
            <q-bar v-if="!visuinpage && canModifyThisRec(props.row)" dense class="bg-primary text-white full-height">
              <q-badge v-if="props.row['adType']" :color="fieldsTable.getColByAdType(props.row['adType'])">
-                {{ fieldsTable.getValByTabAndId(tablesel, 'adType', props.row['adType']) }}<q-icon :name="fieldsTable.getIconByAdType(props.row['adType'])" color="white" class="q-ml-xs" />
+                {{ fieldsTable.getValByTabAndId(tablesel, 'adType', props.row['adType']) }}
+                <q-icon :name="fieldsTable.getIconByAdType(props.row['adType'])" color="white" class="q-ml-xs"/>
              </q-badge>

              <q-space/>
@@ -397,10 +447,13 @@
            <q-card-section class="">
              <q-list dense>
                <div v-for="col in mycolumns" :key="col.name">
-                  <q-item v-if="showColCheck(col, tools.TIPOVIS_SHOW_RECORD, false, tools.getValue(props.row,col.field, col.subfield))"
+                  <q-item
+                    v-if="showColCheck(col, tools.TIPOVIS_SHOW_RECORD, false, tools.getValue(props.row,col.field, col.subfield))"
                    :class="clByCol(col)" class="riduci_pad">
                    <q-item-section avatar v-if="col.icon">
-                      <q-item-label class="q-table__col"><q-icon :name="col.icon"></q-icon></q-item-label>
+                      <q-item-label class="q-table__col">
+                        <q-icon :name="col.icon"></q-icon>
+                      </q-item-label>
                    </q-item-section>

                    <q-item-section avatar v-if="visuIntestazCol(col)">
@@ -501,7 +554,8 @@
            v-for="col in mycolumns" :key="col.name" class="newrec_fields">

            <div class="text-center q-my-xs" v-if="(col.fieldtype === costanti.FieldType.separator)">
-              <q-btn color="primary" size="md" dense :icon="!showfilteradv ? 'fas fa-arrow-down' : 'fas fa-arrow-up'" label="Campi Avanzati" @click="showfilteradv = !showfilteradv"></q-btn>
+              <q-btn color="primary" size="md" dense :icon="!showfilteradv ? 'fas fa-arrow-down' : 'fas fa-arrow-up'"
+                     label="Campi Avanzati" @click="showfilteradv = !showfilteradv"></q-btn>
            </div>
            <div
              v-if="showColCheck(col, tools.TIPOVIS_NEW_RECORD, true, 0, newRecord) && col.foredit ">
@@ -546,7 +600,8 @@
          <div
            v-for="col in mycolumns" :key="col.name">
            <div class="text-center q-my-xs" v-if="(col.fieldtype === costanti.FieldType.separator)">
-              <q-btn color="primary" size="md" dense :icon="!showfilteradv ? 'fas fa-arrow-down' : 'fas fa-arrow-up'" label="Campi Avanzati" @click="showfilteradv = !showfilteradv"></q-btn>
+              <q-btn color="primary" size="md" dense :icon="!showfilteradv ? 'fas fa-arrow-down' : 'fas fa-arrow-up'"
+                     label="Campi Avanzati" @click="showfilteradv = !showfilteradv"></q-btn>
            </div>
            <div
              v-else-if="showColCheck(col, tools.TIPOVIS_EDIT_RECORD, false) && col.foredit">
--- a/src/components/CMainView/CMainView.vue
+++ b/src/components/CMainView/CMainView.vue
@@ -1,6 +1,6 @@
 <template>
  <div>
-    <div class="row q-ma-xs shadow justify-center" style="border-radius: 4px;border: 1px solid rgba(0, 0, 0, 0.12);">
+    <div class="row q-ma-sm shadow justify-center" style="border-radius: 4px;border: 1px solid rgba(0, 0, 0, 0.12);">
        <CBigBtn
          v-for="(card, ind) of cardsbig" :key="ind"
          :label="card.title" :to="card.to" :icon="card.icon" :color="card.color" :text-color="!!card.textcolor ? card.textcolor : ''"
--- a/src/components/CMyCardPopup/CMyCardPopup.scss
+++ b/src/components/CMyCardPopup/CMyCardPopup.scss
@@ -44,3 +44,84 @@
    max-width: 400px;
  }
 }
+
+$graytext: #555;
+.cal {
+  color: black;
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.25rem;
+  letter-spacing: 0.03333em;
+
+  &__title {
+    color: white;
+    font-weight: 700;
+    font-size: 1rem;
+    padding-bottom: 10px;
+  }
+
+  &__details {
+    color: black;
+  }
+
+  &__hours {
+    color: blue;
+    &-title {
+      color: $graytext;
+    }
+    &-content {
+      font-weight: 400;
+    }
+  }
+
+  &__where {
+    margin-top: 5px;
+    color: blue;
+
+    &-title {
+      color: $graytext;
+    }
+    &-content {
+      color: darkblue !important;
+    }
+  }
+
+  &__when {
+    margin-top: 5px;
+    color: blue;
+
+    &-title {
+      color: $graytext;
+    }
+    &-content {
+      color: darkblue !important;;
+    }
+  }
+
+  &__teacher {
+    margin-top: 5px;
+    &-title {
+      color: $graytext;
+    }
+    &-content {
+      color: darkblue !important;;
+    }
+  }
+
+  &__quota {
+    margin-top: 5px;
+    &-title {
+      color: $graytext;
+    }
+    &-content {
+
+    }
+  }
+
+  &__img {
+    width: 100px;
+    height: 100px;
+    padding: 10px;
+  }
+
+}
--- a/src/components/CMyCardPopup/CMyCardPopup.vue
+++ b/src/components/CMyCardPopup/CMyCardPopup.vue
@@ -18,7 +18,8 @@

        <q-img
          v-if="tools.getValue(myrec, 'photos', '')"
-        :src="tools.getFullFileName(tools.getValue(myrec, 'photos', ''), table, myrec.username)" class="img" alt="immagine bene"></q-img>
+          :src="tools.getFullFileName(tools.getValue(myrec, 'photos', ''), table, myrec.username)" class="img"
+          alt="immagine bene"></q-img>
      </div>

      <div class="text-center">
@@ -46,6 +47,23 @@
              {{ tools.getValue(myrec, mycol.field, mycol.subfield) }}
            </div>
          </div>
+          <div v-else-if="mycol.name === 'dateTimeStart'" class="text-center cal">
+
+            <div v-if="myrec.dateTimeStart" class="cal__when">
+              <span class="cal__where-title">{{ $t('cal.when') }}:</span>
+              <span v-html="tools.getstrDateTimeEvent(t, myrec, true)"></span>
+            </div>
+            <!--
+            <span class="dateevent" v-if="myrec.dateTimeStart">dal <span class="datainizio">{{
+                tools.getstrVeryShortDate(myrec.dateTimeStart)
+              }}</span> al <span class="datafine">{{ tools.getstrVeryShortDate(myrec.dateTimeEnd) }}</span>
+            </span>--->
+          </div>
+          <div v-else-if="mycol.name === 'dateTimeEnd'">
+
+          </div>
+
+
          <CMyFieldRec
            v-else
            :table="table"
--- a/src/components/CMyPopupEdit/CMyPopupEdit.ts
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts
@@ -433,9 +433,11 @@ export default defineComponent({
    }

    function savefield(value: any, initialval: any, myq: any) {
+      if (!props.insertMode) {
        myvalue.value = value
        setValDb(myq, props.field, myvalue.value, props.type, props.serv, props.table, props.subfield, props.id, props.indrec, props.mysubsubkey)
      }
+    }


    function annulla(val: any) {
--- a/src/components/CMyRecCard/CMyRecCard.scss
+++ b/src/components/CMyRecCard/CMyRecCard.scss
@@ -2,3 +2,25 @@
  display: flex;
  flex: 1;
 }
+
+.text_user_city{
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  font-size: 0.85rem;
+  color: grey;
+}
+
+
+.actualdate{
+
+}
+
+
+.cardrec{
+  @media (min-width: 500px) {
+    margin: 1px;
+    padding: 4px;
+  }
+
+}
--- a/src/components/CMyRecCard/CMyRecCard.vue
+++ b/src/components/CMyRecCard/CMyRecCard.vue
@@ -1,10 +1,13 @@
 <template>
-  <div class="q-py-xs centermydiv" :style="`min-width: `+ (tools.getwidth($q) - 20) +`px;`">
+  <div class="q-py-xs centermydiv cardrec" :style="`max-width: `+ (tools.getwidth($q) - 20) +`px; ` + ($q.screen.lt.sm ? (`min-width: `+ (tools.getwidth($q) - 20) +`px;`) : ``)">

    <q-item v-if="myrec" clickable v-ripple class="shadow-2 q-btn--rounded bg-teal-1">
-      <q-item-section v-if="(table === toolsext.TABMYGOODS) && (myrec.photos.length > 0)" avatar @click="cmdExt(costanti.CMD_SHOW_PAGE, myrec)">
+
+      <q-item-section v-if="(table === toolsext.TABMYGOODS) && (myrec.photos.length > 0)" avatar
+                      @click="cmdExt(costanti.CMD_SHOW_PAGE, myrec)">
        <q-avatar size="60px">
-          <q-img :src="tools.getFullFileName(myrec.photos, table, myrec.username)" :alt="myrec.descr" img-class="imgprofile" height="60px"/>
+          <q-img :src="tools.getFullFileName(myrec.photos, table, myrec.username)" :alt="myrec.descr"
+                 img-class="imgprofile" height="60px"/>
        </q-avatar>
      </q-item-section>
      <q-item-section v-else avatar @click="naviga(`/my/` + myrec.username)">
@@ -27,11 +30,12 @@
            dense
            class="text-center shadow-5 glossy bg-green chipmodif">{{ rec.descr }}</q-chip></span>

-          <!--<span> - {{ myrec.profile.qualifica }}</span>-->
+          <!--<span class="dateevent" v-if="myrec.dateTimeStart">dal <span class="datainizio">{{tools.getstrVeryShortDate(myrec.dateStart) }}</span> al <span class="datafine">{{ tools.getstrVeryShortDate(myrec.dateEnd) }}</span>
+          </span>-->
        </q-item-label>
        <q-item-label lines="3" v-if="myrec.descr">{{ myrec.descr }}<br>
        </q-item-label>
-        <q-item-label overline lines="1" style="text-align: right">
+        <q-item-label lines="1" style="text-align: right" class="text_user_city">
          <span class="text-weight-bold">{{ myrec.username }}</span> -
          <span v-for="(rec, ind) of myrec.mycities" :key="ind"><span v-if="ind > 0">, </span>{{ rec.comune }}</span>
        </q-item-label>
@@ -39,16 +43,22 @@
      </q-item-section>
      <q-item-section side v-if="myrec.userId === userStore.my._id">
        <q-item-label>
-          <q-btn rounded icon="fas fa-ellipsis-h">
+          <q-btn rounded icon="fas fa-pencil-alt">
            <q-menu>
              <q-list style="min-width: 150px">
-                <q-item clickable icon="fas fa-pencil-alt" v-close-popup
+                <q-item clickable v-close-popup
                        @click="cmdExt(costanti.CMD_MODIFY, myrec._id)">
+                  <q-item-section side>
+                    <q-icon name="fas fa-pencil-alt"/>
+                  </q-item-section>
                  <q-item-section>{{ $t('reg.edit') }}</q-item-section>
                </q-item>
              </q-list>
              <q-list style="min-width: 150px">
-                <q-item clickable icon="fas fa-trash-alt" v-close-popup @click="cmdExt(costanti.CMD_DELETE, myrec._id)">
+                <q-item clickable v-close-popup @click="cmdExt(costanti.CMD_DELETE, myrec._id)">
+                  <q-item-section side>
+                    <q-icon name="fas fa-trash-alt"/>
+                  </q-item-section>
                  <q-item-section>{{ $t('reg.elimina') }}</q-item-section>
                </q-item>
              </q-list>
--- a/src/components/CTestServer/CTestServer.ts
+++ b/src/components/CTestServer/CTestServer.ts
@@ -52,6 +52,8 @@ export default defineComponent({

    function mounted() {
      ricarica()
+
+      globalStore.getStatSite()
    }

    async function ricarica() {
--- a/src/components/Header/Header.ts
+++ b/src/components/Header/Header.ts
@@ -345,21 +345,7 @@ export default defineComponent({
    }

    function getappname() {
-      let mystr = ''
-      if (tools.isTest()){
-        mystr = getAppVersion()
-      } else {
-        let mystr = tools.getsuffisso() + tools.getappname(tools.isMobile())
-        if (!tools.isMobile()) {
-          //if (!tools.isMobile()) {
-          mystr += ' ' + getAppVersion()
-          //}
-        } else {
-          mystr = ''
-        }
-      }
-
-      return mystr
+      return tools.getappname(tools.isMobile()) + ' ' + getAppVersion()

    }

--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -953,3 +953,19 @@ $heightBtn: 100%;
  border: 1px solid #bbb;
  border-radius: $generic-border-radius
 }
+.dateevent{
+  border-radius: 16px;
+  border: red solid 2px;
+  padding: 3px;
+  text-align: right;
+  font-style: italic;
+  margin-left: 5px;
+  font-size: 0.85rem;
+  color: darkblue;
+
+}
+
+.datainizio, .datafine{
+  font-weight: bold;
+}
+
--- a/src/db/lang/ws_enUs.js
+++ b/src/db/lang/ws_enUs.js
@@ -1,7 +1,7 @@
 const msg_website_enUs = {
  ws: {
    sitename: 'InsiemeSiPuò',
-    siteshortname: 'InsiemeSiPuò',
+    siteshortname: 'ISP',
    botname: 'InsiemeSiPuò BOT',
  },
  pages: {
--- a/src/db/lang/ws_es.js
+++ b/src/db/lang/ws_es.js
@@ -1,7 +1,7 @@
 const msg_website_es = {
  ws: {
    sitename: 'InsiemeSiPuò',
-    siteshortname: 'InsiemeSiPuò',
+    siteshortname: 'ISP',
    botname: 'InsiemeSiPuò BOT',
  },
  pages: {
--- a/src/db/lang/ws_fr.js
+++ b/src/db/lang/ws_fr.js
@@ -1,7 +1,7 @@
 const msg_website_fr = {
  ws: {
    sitename: 'InsiemeSiPuò',
-    siteshortname: 'InsiemeSiPuò',
+    siteshortname: 'ISP',
    botname: 'InsiemeSiPuò BOT',
  },
  homepage: {
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -1,7 +1,7 @@
 const msg_website_it = {
  ws: {
    sitename: 'InsiemeSiPuò',
-    siteshortname: 'InsiemeSiPuò',
+    siteshortname: 'ISP',
    botname: 'il Bot di InsiemeSiPuò',
  },
  products: {
--- a/src/db/lang/ws_pt.js
+++ b/src/db/lang/ws_pt.js
@@ -1,7 +1,7 @@
 const msg_website_pt = {
  ws: {
    sitename: 'InsiemeSiPuò',
-    siteshortname: 'InsiemeSiPuò',
+    siteshortname: 'ISP',
    botname: 'InsiemeSiPuò BOT',
  },
  pages: {
--- a/src/db/lang/ws_si.js
+++ b/src/db/lang/ws_si.js
@@ -1,7 +1,7 @@
 const msg_website_si = {
  ws: {
    sitename: 'InsiemeSiPuò',
-    siteshortname: 'InsiemeSiPuò',
+    siteshortname: 'ISP',
    botname: 'InsiemeSiPuò BOT',
  },
  pages: {
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -379,17 +379,6 @@ const baseroutes: IListRoutes[] = [
    inmenu: true,
    infooter: true,
  },
-  {
-    active: false,
-    order: 100,
-    path: '/bacheca',
-    materialIcon: 'fas fa-bullhorn',
-    name: 'mypages.bacheca',
-    component: () => import('@/root/bacheca/bacheca.vue'),
-    meta: { requiresAuth: true },
-    inmenu: false,
-    infooter: false,
-  },
  {
    active: true,
    order: 12,
@@ -412,6 +401,17 @@ const baseroutes: IListRoutes[] = [
    inmenu: true,
    infooter: true,
  },
+  {
+    active: true,
+    order: 20,
+    path: '/events',
+    materialIcon: 'fas fa-bullhorn',
+    name: 'mypages.events',
+    component: () => import('@/root/eventi/eventi.vue'),
+    meta: { requiresAuth: true },
+    inmenu: true,
+    infooter: false,
+  },
  /*{
    active: true,
    order: 100,
@@ -648,7 +648,7 @@ const baseroutes: IListRoutes[] = [
    inmenu: true,
  },
  {
-    active: false,
+    active: true,
    order: 80,
    path: '/calendario-eventi',
    materialIcon: 'event',
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -4,10 +4,40 @@ import {
  IDepartment, IProducer, IShareWithUs, IStorehouse,
 } from '@src/model/Products'

+import { IUserFields, IUserProfile } from '@src/model/UserStore'
+
 export interface IPost {
  title: string
 }

+export interface ICheckUser {
+  verified_email?: boolean
+  teleg_id?: number
+  profile?: IUserProfile
+}
+
+
+export interface INotData {
+  num_reg?: number
+  num_passeggeri?: number
+  num_imbarcati?: number
+  email_non_verif?: number
+  num_teleg_attivo?: number
+  num_teleg_pending?: number
+  num_part_zoom?: number
+  num_part_accepted?: number
+  num_modalita_pagamento?: number
+  arr_nations?: string
+  lastsreg?: IUserFields[]
+  checkuser?: ICheckUser | any
+  numreg_untilday?: number
+  reg_daily?: string
+  imbarcati_daily?: string
+  imbarcati_weekly?: string
+  reg_weekly?: string
+}
+
+
 export interface IConnData {
  downloading_server: number
  downloading_indexeddb: number
@@ -270,6 +300,7 @@ export interface IGlobalState {
  sectorgoods: ISectorGood[],
  catgrps: ICatGrp[],
  cities: ICity[],
+  datastat?: INotData
 }

 export interface IMenuList {
@@ -509,6 +540,7 @@ export interface IColGridTable {
  askaction?: string
  foredit?: boolean
  fieldtype?: number
+  fieldtype_real?: number
  field_outtype?: number
  noshowlabel?: boolean
  tipovisu?: number
@@ -751,6 +783,8 @@ export interface IMyBacheca {
  // idSubSkill: number[]
  idStatusSkill: number[]
  idContribType: string[]
+  dateTimeStart: Date
+  dateTimeEnd: Date
  idCity: number[]
  photos: IGallery[]
  NumLevel: number
@@ -763,3 +797,4 @@ export interface IMyBacheca {
  date_updated?: Date,
 }

+
--- a/src/model/NotevoleStore.ts
+++ b/src/model/NotevoleStore.ts
@@ -1,32 +0,0 @@
-import { IUserFields, IUserProfile } from '@src/model/UserStore'
-
-export interface ICheckUser {
-  verified_email?: boolean
-  verified_by_aportador?: boolean
-  teleg_id?: number
-  profile?: IUserProfile
-}
-
-export interface INotData {
-  num_reg?: number
-  num_passeggeri?: number
-  num_imbarcati?: number
-  email_non_verif?: number
-  num_teleg_attivo?: number
-  num_teleg_pending?: number
-  num_part_zoom?: number
-  num_part_accepted?: number
-  num_modalita_pagamento?: number
-  arr_nations?: string
-  lastsreg?: IUserFields[]
-  checkuser?: ICheckUser | any
-  numreg_untilday?: number
-  reg_daily?: string
-  imbarcati_daily?: string
-  imbarcati_weekly?: string
-  reg_weekly?: string
-}
-
-export interface INotevoleState {
-  datastat: INotData
-}
--- a/src/model/index.ts
+++ b/src/model/index.ts
@@ -1,5 +1,4 @@
 export * from './UserStore'
-export * from './NotevoleStore'
 export * from './MessageStore'
 export * from './GlobalStore'
 export * from './signin-option'
--- a/src/root/bacheca/bacheca.scss
+++ b/src/root/bacheca/bacheca.scss
--- a/src/root/bacheca/bacheca.ts
+++ b/src/root/bacheca/bacheca.ts
@@ -22,7 +22,7 @@ import MixinUsers from '@/mixins/mixin-users'
 import { colmyBachecas } from '@store/Modules/fieldsTable'

 export default defineComponent({
-  name: 'bacheca',
+  name: 'eventi',
  components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram, CDashboard, CUserNonVerif, CTitlePage },
  setup() {
    const globalStore = useGlobalStore()
--- a/src/root/bacheca/bacheca.vue
+++ b/src/root/bacheca/bacheca.vue
@@ -4,7 +4,7 @@
    <div v-if="isLogged()">

      <div v-if="isUserOk()">
-        <CTitlePage :ind="0" />
+        <CTitlePage :ind="4" />

        <CFinder
          :table="toolsext.TABMYBACHECAS">
@@ -23,8 +23,8 @@
  </q-page>

 </template>
-<script lang="ts" src="./bacheca.ts">
+<script lang="ts" src="./eventi.ts">
 </script>
 <style lang="scss" scoped>
-@import './bacheca.scss';
+@import './eventi.scss';
 </style>
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -512,6 +512,7 @@ const msg_it = {
      photo: 'Foto',
      images: 'Immagini',
      image: 'Immagine',
+      date: 'Data',
      date_created: 'Creato il',
      err: {
        required: 'è richiesto',
@@ -622,8 +623,8 @@ const msg_it = {
      newproj: 'Titolo Progetto',
      newsubproj: 'Titolo Sotto-Progetto',
      insertbottom: 'Inserisci Nuovo Project',
-      shortdescr: 'Breve Descrizione',
-      longdescr: 'Descrizione',
+      shortdescr: 'Descrizione',
+      longdescr: 'Testo',
      note: 'Note',
      hoursplanned: 'Ore Preventivate',
      hoursadded: 'Ore Aggiuntive',
@@ -720,6 +721,7 @@ const msg_it = {
      title: 'Titolo',
      details: 'Dettagli',
      bodytext: 'Testo Evento',
+      dateCreated: 'Data Inserimento',
      dateTimeStart: 'Data Inizio',
      dateTimeEnd: 'Data Fine',
      bgcolor: 'Colore Sfondo',
@@ -881,6 +883,7 @@ const msg_it = {
      friends: 'Amici',
      bacheca: 'Bacheca',
      services: 'Servizi',
+      events: 'Eventi',
      goods: 'Beni',
      test: 'Test',
      groups: 'Gruppi',
--- a/src/store/Api/Instance.ts
+++ b/src/store/Api/Instance.ts
@@ -43,15 +43,17 @@ export const addAuthHeaders = () => {
  // axiosInstance.defaults.headers.Authorization = `Bearer ${LoginModule.userInfos.userToken}`
 }

-export const removeAuthHeaders = () => {
-  delete axiosInstance.defaults.headers.Authorization
-}
+//export const removeAuthHeaders = () => {
+//  delete axiosInstance.defaults.headers.Authorization
+//}

 async function Request(type: string, path: string, payload: any): Promise<Types.AxiosSuccess | Types.AxiosError | undefined> {

  let ricevuto = false
  const userStore = useUserStore()
  const globalStore = useGlobalStore()
+
+
  try {
    if (tools.isDebug()) console.log('Axios Request', path, type, tools.notshowPwd(payload))
    let response: AxiosResponse
@@ -102,7 +104,7 @@ async function Request(type: string, path: string, payload: any): Promise<Types.
      }

      return new Types.AxiosSuccess(response.data, response.status)
-    } if (type === 'get' || type === 'delete') {
+    } else if (type === 'get' || type === 'delete') {
      // @ts-ignore
      response = await axiosInstance[type](path, {
        baseURL: globalStore.getServerHost(),
@@ -114,7 +116,7 @@ async function Request(type: string, path: string, payload: any): Promise<Types.
      })
      ricevuto = true
      return new Types.AxiosSuccess(response.data, response.status)
-    } if (type === 'postFormData') {
+    } else if (type === 'postFormData') {
      response = await axiosInstance.post(path, payload, {
        baseURL: globalStore.getServerHost(),
        headers: {
--- a/src/store/Api/index.ts
+++ b/src/store/Api/index.ts
@@ -4,7 +4,7 @@ import { useUserStore } from '@store/UserStore'
 export * from './ApiTypes'
 import axios from 'axios'

-export { addAuthHeaders, removeAuthHeaders, API_URL } from './Instance'
+export { addAuthHeaders, API_URL } from './Instance'
 // import {AlgoliaSearch} from './AlgoliaController'
 import Paths from '@paths'
 import { tools } from '@src/store/Modules/tools'
--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -45,12 +45,12 @@ export const costanti = {
      disable: true,
    },
    {
-      title: 'Alimenti',
-      to: '/foods',
-      icon: 'fas fa-utensils',
-      color: 'green-5',
-      hint: '',
-      disable: true,
+      title: 'Eventi',
+      to: '/events',
+      icon: 'event',
+      color: 'green',
+      hint: 'eventi, last minute, offerte di lavoro',
+      disable: false,
    },
    {
      title: 'Luoghi',
@@ -71,11 +71,11 @@ export const costanti = {
      small: true,
    },
    {
-      title: 'Eventi',
-      to: '/bacheca',
-      icon: 'event',
+      title: 'Help',
+      to: '/help',
+      icon: 'fas fa-users',
      color: 'green-7',
-      hint: 'eventi, last minute, offerte di lavoro',
+      hint: '',
      disable: true,
      small: true,
    },
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -69,6 +69,7 @@ function AddCol(params: IColGridTable) {
    action: (params.action === undefined) ? '' : params.action,
    foredit: (params.foredit === undefined) ? true : params.foredit,
    fieldtype: (params.fieldtype === undefined) ? costanti.FieldType.string : params.fieldtype,
+    fieldtype_real: (params.fieldtype_real === undefined) ? ((params.fieldtype === undefined) ? costanti.FieldType.string : params.fieldtype) : params.fieldtype_real,
    field_outtype: (params.field_outtype === undefined) ? costanti.FieldType.string : params.field_outtype,
    tipovisu: (params.tipovisu === undefined) ? costanti.TipoVisu.TESTO : params.tipovisu,
    link: (params.link === undefined) ? '' : params.link,
@@ -557,6 +558,11 @@ export const colmyUserGroup = [
    jointable: 'friendsandme',
    field_outtype: costanti.FieldType.object,
  }),
+  AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
+    required: false,
+    visible: false,
+    sortable: true,
+    showWhen: 0}),
  AddCol({
    name: 'photos',
    label_trans: 'skill.photos',
@@ -579,7 +585,9 @@ export const colmyUserGroup = [
  }),
  AddCol({
    name: 'date_created', label_trans: 'reg.date_created', fieldtype: costanti.FieldType.onlydate,
-    showWhen: costanti.showWhen.InPage + costanti.showWhen.InView_OnlyifExist
+    showWhen: costanti.showWhen.InPage + costanti.showWhen.InView_OnlyifExist,
+    visible: false,
+    required: false,
  }),
  AddCol({
    name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html,
@@ -630,8 +638,9 @@ export const colmyGoods = [
    fieldtype: costanti.FieldType.string,
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
    noshowlabel: true,
-    maxlength: 200,
+    maxlength: 90,
    required: true,
+    sortable: false,
  }),
  AddCol({
    name: 'idSectorGood',
@@ -678,6 +687,11 @@ export const colmyGoods = [
    //icon: 'fas fa-hands-helping',
    // isadvanced_field: true,
  }),
+  AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
+    required: false,
+    visible: false,
+    sortable: true,
+    showWhen: 0}),
  AddCol({
    name: 'photos',
    label_trans: 'skill.photos',
@@ -778,8 +792,9 @@ export const colmySkills = [
    fieldtype: costanti.FieldType.string,
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
    noshowlabel: true,
-    maxlength: 200,
+    maxlength: 90,
    required: true,
+    sortable: false,
  }),
  AddCol({
    name: 'idSector',
@@ -822,6 +837,8 @@ export const colmySkills = [
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
    visible: false,
  }),
+
+
  /*AddCol({
    name: 'idSubSkill',
    label_trans: 'skill.subskill',
@@ -850,6 +867,11 @@ export const colmySkills = [
    icon: 'grading',
    isadvanced_field: true,
  }),
+  AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
+    required: false,
+    visible: false,
+    sortable: true,
+    showWhen: 0}),
  AddCol({
    name: 'photos',
    label_trans: 'skill.photos',
@@ -885,6 +907,7 @@ export const colmyBachecas = [
    noshowlabel: true,
    icon: 'mood',
    isadvanced_field: true,
+    sortable: false,
  }),

  AddCol({
@@ -896,6 +919,7 @@ export const colmyBachecas = [
    link: '/my/username',
    noshowlabel: true,
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
+    sortable: false,
  }),
  AddCol({
    name: 'idCity',
@@ -909,6 +933,7 @@ export const colmyBachecas = [
    remote_table: 'mycities',
    remote_key: '_id',
    remote_field: 'comune',
+    sortable: false,
  }),
  AddCol({
    name: 'adType',
@@ -919,6 +944,29 @@ export const colmyBachecas = [
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
    icon: 'fas fa-bullhorn',
    noshowlabel: true,
+    sortable: false,
+  }),
+  AddCol(
+    {
+      name: 'dateTimeStart',
+      label_trans: 'event.dateTimeStart',
+      // jointable: toolsext.TABCALALLDATE,
+      fieldtype: costanti.FieldType.date,
+      // fieldtype: costanti.FieldType.select,
+      // fieldtype_real: costanti.FieldType.onlydate,
+      // fieldtype: costanti.FieldType.onlydate,
+      icon: 'fas fa-calendar-day',
+    }),
+  AddCol(
+    {
+      name: 'dateTimeEnd',
+      label_trans: 'event.dateTimeEnd',
+      fieldtype: costanti.FieldType.date,
+      // jointable: toolsext.TABCALALLDATE,
+      // fieldtype: costanti.FieldType.select,
+      // fieldtype_real: costanti.FieldType.onlydate,
+      icon: 'fas fa-calendar-day',
+      sortable: false,
    }),
  AddCol({
    name: 'descr',
@@ -926,8 +974,9 @@ export const colmyBachecas = [
    fieldtype: costanti.FieldType.string,
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
    noshowlabel: true,
-    maxlength: 200,
+    maxlength: 90,
    required: true,
+    sortable: false,
  }),
  AddCol({
    name: 'idSector',
@@ -938,6 +987,7 @@ export const colmyBachecas = [
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
    visible: true,
    icon: 'category',
+    sortable: false,
  }),
  AddCol({
    name: 'idSkill',
@@ -951,6 +1001,7 @@ export const colmyBachecas = [
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
    allowNewValue: false,
    required: false,
+    sortable: false,
  }),
  AddCol({
    name: 'idContribType',
@@ -962,15 +1013,21 @@ export const colmyBachecas = [
    icon: 'fas fa-hand-holding',
    //icon: 'fas fa-hands-helping',
    isadvanced_field: false,
+    sortable: false,
  }),
-  AddCol({
+  /*AddCol({
    name: '',
    fieldtype: costanti.FieldType.separator,
    required: false,
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
    visible: false,
-  }),
-
+    sortable: false,
+  }),*/
+  AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
+    required: false,
+    visible: false,
+    sortable: true,
+    showWhen: 0}),
  AddCol({
    name: 'photos',
    label_trans: 'skill.photos',
@@ -979,17 +1036,20 @@ export const colmyBachecas = [
    showpicprofile_ifnotset: true,
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
    isadvanced_field: true,
+    sortable: false,
  }),
  AddCol({
    name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html,
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
    titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '',
    isadvanced_field: true,
+    sortable: false,
  }),
  //**ADDFIELD_MYBACHECAS
  AddCol({
    name: 'website', label_trans: 'reg.website', isadvanced_field: true, fieldtype: costanti.FieldType.link,
-    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist
+    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+    sortable: false,
  }),
  AddCol(DuplicateRec),
  AddCol(ModifRec),
@@ -1291,6 +1351,12 @@ const colTablePermission = [
  AddCol(DuplicateRec),
 ]

+const colCalDate = [
+  AddCol({ name: '_id', label_trans: 'rec.date', fieldtype: costanti.FieldType.number }),
+  AddCol({ name: 'datestr', label_trans: 'reg.date', fieldtype: costanti.FieldType.string }),
+  AddCol({ name: 'filter', label_trans: 'reg.filter', fieldtype: costanti.FieldType.object }),
+]
+
 const colTableGeneric = [
  AddCol({ name: 'value', label_trans: 'others.value' }),
  AddCol({ name: 'label', label_trans: 'proj.longdescr' }),
@@ -1445,7 +1511,7 @@ export const colTableUsersBase = [
  AddCol(DuplicateRec),
 ]

-  // IColGridTable
+// IColGridTable
 export const colTableUsers = [
  // AddCol({ name: '_id', label_trans: 'reg.id' }),
  AddCol({ name: 'index', label_trans: 'reg.index', fieldtype: costanti.FieldType.number }),
@@ -1973,6 +2039,7 @@ export const colTableUsersISP = [
  }),
  AddCol({ name: 'date_reg', label_trans: 'reg.date_reg', fieldtype: costanti.FieldType.date }),
  AddCol({ name: 'lasttimeonline', label_trans: 'reg.lasttimeonline', fieldtype: costanti.FieldType.date }),
+  AddCol({ name: 'useragent', label_trans: 'reg.useragent', fieldtype: costanti.FieldType.string }),
  AddCol({
    name: 'perm',
    label_trans: 'reg.perm',
@@ -2434,6 +2501,22 @@ export const fieldsTable = {
      colkey: '_id',
      collabel: 'descr',
    },
+    {
+      value: toolsext.TABCALDATE,
+      label: 'Date',
+      columns: colCalDate,
+      colkey: '_id',
+      collabel: 'datestr',
+      noshow: true,
+    },
+    {
+      value: toolsext.TABCALALLDATE,
+      label: 'Date',
+      columns: colCalDate,
+      colkey: '_id',
+      collabel: 'datestr',
+      noshow: true,
+    },
    /*{
      value: 'subskills',
      label: 'Specializzazione',
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -15,6 +15,8 @@ import {
  TipoVisu, IGroup, IMySkill, IMyBacheca, IImgGallery,
 } from '@model'

+import { addToDate } from '@quasar/quasar-ui-qcalendar'
+
 import { lists } from '@store/Modules/lists'
 import { costanti } from '@store/Modules/costanti'
 import { copyToClipboard, date, Screen, useQuasar, colors, Cookies, scroll } from 'quasar'
@@ -2842,6 +2844,7 @@ export const tools = {
  },

  addDays(mydate: Date, days: number) {
+    //++ addToDate ?
    return date.addToDate(mydate, { days })
  },

@@ -4944,7 +4947,6 @@ export const tools = {
      _id: 0,
      idSector: 0,
      idSkill: 0,
-      // idSubSkill: [],
      idStatusSkill: [],
      idContribType: [],
      idCity: [],
@@ -4997,9 +4999,10 @@ export const tools = {
      _id: 0,
      idSector: 0,
      idSkill: 0,
-      // idSubSkill: [],
      idStatusSkill: [],
      idContribType: [],
+      dateTimeStart: new Date(),
+      dateTimeEnd: new Date(),
      idCity: [],
      NumLevel: 0,
      adType: 0,
--- a/src/store/Modules/toolsext.ts
+++ b/src/store/Modules/toolsext.ts
@@ -63,6 +63,8 @@ export const toolsext = {
  TABMYSKILLS: 'myskills',
  TABMYGOODS: 'mygoods',
  TABMYBACHECAS: 'mybachecas',
+  TABCALDATE: 'caldate',
+  TABCALALLDATE: 'calalldate',
  TABNAVI: 'navi',
  TABLISTAINGRESSO: 'listaingressos',
  TABGRADUATORIA: 'graduatorias',
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -799,7 +799,7 @@ export const useUserStore = defineStore('UserStore', {
        if (isLogged) {
          // console.log('this.isLogged', this.isLogged)

-          globalStore.setleftDrawerOpen(localStorage.getItem(toolsext.localStorage.leftDrawerOpen) === 'true')
+          // globalStore.setleftDrawerOpen(localStorage.getItem(toolsext.localStorage.leftDrawerOpen) === 'true')
          globalStore.setCategorySel(localStorage.getItem(toolsext.localStorage.categorySel))

          globalStore.checkUpdates()
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -1351,11 +1351,20 @@ export const useGlobalStore = defineStore('GlobalStore', {
      return []
    },

-    getValueByTable(col: IColGridTable, val: any) {
-      if (col.jointable) {
-        const mylist = this.getTableJoinByName(col.jointable)
-        const key = fieldsTable.getKeyByTable(col.jointable)
-        const collab = fieldsTable.getLabelByTable(col.jointable)
+    getRecordByTableSingle(table: string, val: any) {
+      if (table) {
+        const mylist = this.getTableJoinByName(table)
+        const key = fieldsTable.getKeyByTable(table)
+
+        return mylist.find((myrec: any) => myrec[key] === val)
+      }
+    },
+
+    getValueByTableSingle(table: string, val: any) {
+      if (table) {
+        const mylist = this.getTableJoinByName(table)
+        const key = fieldsTable.getKeyByTable(table)
+        const collab = fieldsTable.getLabelByTable(table)

        // console.table(mylist)
        let risultato = ''
@@ -1378,6 +1387,11 @@ export const useGlobalStore = defineStore('GlobalStore', {
      return ''
    },

+
+    getValueByTable(col: IColGridTable, val: any) {
+      return this.getValueByTableSingle(col.jointable!, val)
+    },
+
    getMultiValueByTable(col: IColGridTable, arrval: any) {
      // console.log('getMultiValueByTable')
      if (col.jointable) {
@@ -1400,18 +1414,81 @@ export const useGlobalStore = defineStore('GlobalStore', {
      return ''
    },

+    async getStatSite() {
+
+      const userStore = useUserStore()
+
+      const paramquery = {
+        locale: tools.getLocale(),
+        username: userStore.my.username
+      }
+
+      return Api.SendReq('/site/load', 'POST', paramquery)
+        .then((res) => {
+          console.log('res', res)
+          this.datastat = res.data.datastat
+          return this.datastat
+        }).catch((error) => {
+          return null
+        })
+
+    },
+
+    getItemDate(num: number, day: number, mystr: string) {
+      let mydate = tools.addDays(tools.getDateNow(),  day);
+      let mydateend = tools.addDays(mydate,  7);
+      mydate = tools.getstrYYMMDDDate(mydate)
+      mydateend = tools.getstrYYMMDDDate(mydateend)
+      let filter = { dateTimeStart: {$gte: mydate, $lte: mydateend } }
+      let obj = {_id: num, datestr: mystr, filter }
+
+      return obj
+    },
+
+    getArrDateEvent() {
+      const arr = []
+
+      let obj = {}
+
+      arr.push(this.getItemDate(1, -7, 'Settimana Scorsa'))
+      arr.push(this.getItemDate(2, 0, 'Da Oggi a 7 gg.'))
+      arr.push(this.getItemDate(3, 7, 'La settimana prossima'))
+
+      // console.log('Days', arr)
+
+      return arr
+    },
+
+    getArrAllDateEvent() {
+      const arr = []
+
+      let obj = {}
+
+      for (let i = 0; i < 120; i++) {
+        let mydate = tools.addDays(tools.getDateNow(), i - 30);
+        obj ={_id: mydate, datestr: tools.getstrVeryShortDate(mydate) }
+        arr.push(obj)
+      }
+
+      // console.log('Days', arr)
+
+      return arr
+    },
+
    getTableJoinByName(table: string, addall?: boolean, filter?: any) {
      if (table === 'permissions') return [shared_consts.Permissions.Admin, shared_consts.Permissions.Manager, shared_consts.Permissions.Teacher, shared_consts.Permissions.Tutor, shared_consts.Permissions.Editor, shared_consts.Permissions.Zoomeri, shared_consts.Permissions.Department]
-      if (table === 'accepted') return [shared_consts.Accepted.CHECK_READ_GUIDELINES, shared_consts.Accepted.CHECK_SEE_VIDEO_PRINCIPI]
-      if (table === 'fieldstype') return costanti.FieldTypeArr
-      if (table === 'metodo_pagamento') return tools.SelectMetodiPagamento
-      if (table === 'bottype') return shared_consts.BotType
-      if (table === 'visibility') return shared_consts.Visibility
-      if (table === 'visibilGroup') return shared_consts.VisibilGroup
-      if (table === 'lang') return shared_consts.Lang
-      if (table === 'regions') return shared_consts.Regions
-      if (table === 'provinces') return shared_consts.Provinces
-      if (table === 'shippings') return shared_consts.Shippings
+      else if (table === 'accepted') return [shared_consts.Accepted.CHECK_READ_GUIDELINES, shared_consts.Accepted.CHECK_SEE_VIDEO_PRINCIPI]
+      else if (table === 'fieldstype') return costanti.FieldTypeArr
+      else if (table === 'metodo_pagamento') return tools.SelectMetodiPagamento
+      else if (table === 'bottype') return shared_consts.BotType
+      else if (table === 'visibility') return shared_consts.Visibility
+      else if (table === 'visibilGroup') return shared_consts.VisibilGroup
+      else if (table === 'lang') return shared_consts.Lang
+      else if (table === 'regions') return shared_consts.Regions
+      else if (table === 'provinces') return shared_consts.Provinces
+      else if (table === 'shippings') return shared_consts.Shippings
+      else if (table === toolsext.TABCALDATE) return this.getArrDateEvent()
+      else if (table === toolsext.TABCALALLDATE) return this.getArrAllDateEvent()

      let myarr = this.getListByTable(table)

--- a/yarn.lock
+++ b/yarn.lock
@@ -1063,7 +1063,7 @@
    "@intlify/core-base" "9.2.0-beta.30"
    "@intlify/shared" "9.2.0-beta.30"

-"@isaacs/string-locale-compare@*", "@isaacs/string-locale-compare@^1.1.0":
+"@isaacs/string-locale-compare@^1.1.0":
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
  integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
@@ -1292,7 +1292,7 @@
    "@nodelib/fs.scandir" "2.1.5"
    fastq "^1.6.0"

-"@npmcli/arborist@*", "@npmcli/arborist@^4.0.0":
+"@npmcli/arborist@^4.0.0", "@npmcli/arborist@^4.3.1":
  version "4.3.1"
  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-4.3.1.tgz#a08cddce3339882f688c1dea1651f6971e781c44"
  integrity sha512-yMRgZVDpwWjplorzt9SFSaakWx6QIK248Nw4ZFgkrAy/GvJaFRaSZzE6nD7JBK5r8g/+PTxFq5Wj/sfciE7x+A==
@@ -1330,20 +1330,20 @@
    treeverse "^1.0.4"
    walk-up-path "^1.0.0"

-"@npmcli/ci-detect@*":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-2.0.0.tgz#e63c91bcd4185ac1e85720a34fc48e164ece5b89"
-  integrity sha512-8yQtQ9ArHh/TzdUDKQwEvwCgpDuhSWTDAbiKMl3854PcT+Dk4UmWaiawuFTLy9n5twzXOBXVflWe+90/ffXQrA==
-
 "@npmcli/ci-detect@^1.3.0":
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1"
  integrity sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q==

-"@npmcli/config@*":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-4.0.0.tgz#1d12f2d9cc2f1da75b56ade60daacab560d98ab5"
-  integrity sha512-iywEsUhkA6GSgTS3vHLxHttU6lovSYt7wCGD0MOsjfd1YAUlz8243TXUKhcJiPfWvQYB4FnZkn30m3KmZS8GuA==
+"@npmcli/ci-detect@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-2.0.0.tgz#e63c91bcd4185ac1e85720a34fc48e164ece5b89"
+  integrity sha512-8yQtQ9ArHh/TzdUDKQwEvwCgpDuhSWTDAbiKMl3854PcT+Dk4UmWaiawuFTLy9n5twzXOBXVflWe+90/ffXQrA==
+
+"@npmcli/config@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-3.0.1.tgz#0149aa9daa84bb8dad56813b52582e43bcea1e36"
+  integrity sha512-kNnS/JOLdj9JgUhNn0UjDYhfRdcX8HTeYcsQ/wFdM29V2H8KXDAjcQnvJas6gsZRD5HPU6YBnWVUUJDkXQzdlA==
  dependencies:
    "@npmcli/map-workspaces" "^2.0.0"
    ini "^2.0.0"
@@ -1406,7 +1406,7 @@
    npm-bundled "^1.1.1"
    npm-normalize-package-bin "^1.0.1"

-"@npmcli/map-workspaces@*", "@npmcli/map-workspaces@^2.0.0":
+"@npmcli/map-workspaces@^2.0.0":
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.1.tgz#da8b4d2e1f4cef30efcc81e425bd11a9bf5489f2"
  integrity sha512-awwkB/tSWWaCD8F0IbawBdmoPFlbXMaEPN9LyTuJcyJz404/QhB4B/vhQntpk6uxOAkM+bxR7qWMJghYg0tcYQ==
@@ -1444,7 +1444,7 @@
  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
  integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==

-"@npmcli/package-json@*", "@npmcli/package-json@^1.0.1":
+"@npmcli/package-json@^1.0.1":
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-1.0.1.tgz#1ed42f00febe5293c3502fd0ef785647355f6e89"
  integrity sha512-y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg==
@@ -1458,7 +1458,7 @@
  dependencies:
    infer-owner "^1.0.4"

-"@npmcli/run-script@*", "@npmcli/run-script@^2.0.0":
+"@npmcli/run-script@^2.0.0":
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-2.0.0.tgz#9949c0cab415b17aaac279646db4f027d6f1e743"
  integrity sha512-fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig==
@@ -1495,7 +1495,7 @@
    promise-limit "^2.5.0"
    puppeteer "^1.7.0"

-"@quasar/app@^3.2.5":
+"@quasar/app@^3.3.3":
  version "3.3.3"
  resolved "https://registry.yarnpkg.com/@quasar/app/-/app-3.3.3.tgz#f4771abd7d0806845aa72ca4e0baff9a8fdc03e5"
  integrity sha512-REWlQpGxo0oNDEyeqP1eoKofSYjt7g0QFesz6ZTJH1OBC79VajlHLrYpiFljlgjzwlabqX2cCF0ncYDv9WPxsA==
@@ -1601,14 +1601,7 @@
  resolved "https://registry.yarnpkg.com/@quasar/fastclick/-/fastclick-1.1.4.tgz#21ed3e9a4387dcb43022a08af4ef08a5f1abf159"
  integrity sha512-i9wbyV4iT+v4KhtHJynUFhH5LiEPvAEgSnwMqPN4hf/8uRe82nDl5qP5agrp2el1h0HzyBpbvHaW7NB0BPrtvA==

-"@quasar/quasar-app-extension-qcalendar@^4.0.0-beta.11":
-  version "4.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@quasar/quasar-app-extension-qcalendar/-/quasar-app-extension-qcalendar-4.0.0-beta.12.tgz#c31c8037043c780ff9b6e6a14f409b3d058680ad"
-  integrity sha512-YRnKdlXWZSdEmiVMiukknTZrDVpcpm3NJT5SSpfe/NUfVrAPBCEOWwV89p8GguKxRIFVoU8RVOXNp6XahZ2OZg==
-  dependencies:
-    "@quasar/quasar-ui-qcalendar" "^4.0.0-beta.12"
-
-"@quasar/quasar-ui-qcalendar@^4.0.0-beta.11", "@quasar/quasar-ui-qcalendar@^4.0.0-beta.12":
+"@quasar/quasar-ui-qcalendar@^4.0.0-beta.13":
  version "4.0.0-beta.13"
  resolved "https://registry.yarnpkg.com/@quasar/quasar-ui-qcalendar/-/quasar-ui-qcalendar-4.0.0-beta.13.tgz#250e512fc98c2e9f83145cf711cc3b66e8a18d5d"
  integrity sha512-qnvvx5xftAd98pnn6JZcT0/uiZH2d9FV1fuFIbAmNyosxxfoNBLA82pXW+OyLwB4Cfpha7lm5zMiuQeFJ6ZRRg==
@@ -2369,7 +2362,7 @@ abab@^2.0.3, abab@^2.0.5:
  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==

-abbrev@*, abbrev@1:
+abbrev@1, abbrev@~1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -2563,12 +2556,12 @@ ansi-styles@^5.0.0:
  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==

-ansicolors@*:
+ansicolors@~0.3.2:
  version "0.3.2"
  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
  integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=

-ansistyles@*:
+ansistyles@~0.1.3:
  version "0.1.3"
  resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
  integrity sha1-XeYEFb2gcbs3EnhUyGT0GyMlRTk=
@@ -2620,7 +2613,7 @@ archiver@5.3.0:
    tar-stream "^2.2.0"
    zip-stream "^4.1.0"

-archy@*:
+archy@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
@@ -2849,12 +2842,12 @@ aws4@^1.8.0:
  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==

-axios@0.21.4:
-  version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
-  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
+axios@^0.26.0:
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.0.tgz#9a318f1c69ec108f8cd5f3c3d390366635e13928"
+  integrity sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==
  dependencies:
-    follow-redirects "^1.14.0"
+    follow-redirects "^1.14.8"

 babel-jest@^27.5.1:
  version "27.5.1"
@@ -3332,7 +3325,7 @@ bytes@3.1.2:
  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==

-cacache@*, cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0, cacache@^15.3.0:
+cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0, cacache@^15.3.0:
  version "15.3.0"
  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
@@ -3467,11 +3460,6 @@ caseless@~0.12.0:
  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=

-chalk@*:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.0.0.tgz#bd96c6bb8e02b96e08c0c3ee2a9d90e050c7b832"
-  integrity sha512-/duVOqst+luxCQRKEo4bNxinsOQtMP80ZYm7mMqzuh5PociNL0PvmHFvREJ9ueYL2TxlHjBcmLCdmocx9Vg+IQ==
-
 chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
  version "4.1.2"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
@@ -3530,7 +3518,7 @@ chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.2, chokidar@^3.5.3:
  optionalDependencies:
    fsevents "~2.3.2"

-chownr@*, chownr@^2.0.0:
+chownr@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
@@ -3616,7 +3604,7 @@ cli-boxes@^2.2.1:
  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
  integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==

-cli-columns@*:
+cli-columns@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
  integrity sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==
@@ -3636,7 +3624,7 @@ cli-spinners@^2.5.0:
  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
  integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==

-cli-table3@*:
+cli-table3@^0.6.1:
  version "0.6.1"
  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8"
  integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==
@@ -3812,12 +3800,12 @@ colors@~1.1.2:
  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=

-columnify@*:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
-  integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
+columnify@~1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  integrity sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=
  dependencies:
-    strip-ansi "^6.0.1"
+    strip-ansi "^3.0.0"
    wcwidth "^1.0.0"

 combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
@@ -5507,7 +5495,7 @@ fast-memoize@^2.5.2:
  resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e"
  integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==

-fastest-levenshtein@*:
+fastest-levenshtein@^1.0.12:
  version "1.0.12"
  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
  integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
@@ -5674,7 +5662,7 @@ flatten@^1.0.2:
  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
  integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==

-follow-redirects@^1.0.0, follow-redirects@^1.14.0:
+follow-redirects@^1.0.0, follow-redirects@^1.14.8:
  version "1.14.9"
  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
  integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
@@ -5942,7 +5930,7 @@ glob-to-regexp@^0.4.1:
  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==

-glob@*, glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
+glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
  version "7.2.0"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -6035,7 +6023,7 @@ got@^9.6.0:
    to-readable-stream "^1.0.0"
    url-parse-lax "^3.0.0"

-graceful-fs@*, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
  version "4.2.9"
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
@@ -6215,18 +6203,18 @@ hmac-drbg@^1.0.1:
    minimalistic-assert "^1.0.0"
    minimalistic-crypto-utils "^1.0.1"

-hosted-git-info@*, hosted-git-info@^4.0.1, hosted-git-info@^4.1.0:
+hosted-git-info@^2.1.4:
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
+
+hosted-git-info@^4.0.1, hosted-git-info@^4.1.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
  dependencies:
    lru-cache "^6.0.0"

-hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
 hpack.js@^2.1.6:
  version "2.1.6"
  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -6560,7 +6548,7 @@ inherits@2.0.3:
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=

-ini@*, ini@2.0.0, ini@^2.0.0:
+ini@2.0.0, ini@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
@@ -6570,14 +6558,14 @@ ini@^1.3.5, ini@~1.3.0:
  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==

-init-package-json@*:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.0.tgz#9ccc1143426a52224cdbfa5485b1cb8a03ac34be"
-  integrity sha512-b0PZaZ3lF0mKsk7QcP03LhxXttVR0kb4XIafD1HXV4JIvLhifdvFgNyXr3qSA/3DZmiskFveLP1eXfXGFybG6g==
+init-package-json@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-2.0.5.tgz#78b85f3c36014db42d8f32117252504f68022646"
+  integrity sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==
  dependencies:
-    npm-package-arg "^9.0.0"
+    npm-package-arg "^8.1.5"
    promzard "^0.3.0"
-    read "^1.0.7"
+    read "~1.0.1"
    read-package-json "^4.1.1"
    semver "^7.3.5"
    validate-npm-package-license "^3.0.4"
@@ -6708,7 +6696,7 @@ is-ci@^2.0.0:
  dependencies:
    ci-info "^2.0.0"

-is-cidr@*:
+is-cidr@^4.0.2:
  version "4.0.2"
  resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-4.0.2.tgz#94c7585e4c6c77ceabf920f8cde51b8c0fda8814"
  integrity sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA==
@@ -7615,7 +7603,7 @@ json-parse-better-errors@^1.0.2:
  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==

-json-parse-even-better-errors@*, json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
  version "2.3.1"
  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -7819,7 +7807,7 @@ levn@~0.3.0:
    prelude-ls "~1.1.2"
    type-check "~0.3.2"

-libnpmaccess@*:
+libnpmaccess@^5.0.1:
  version "5.0.1"
  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-5.0.1.tgz#c0309abe73839dd37c52986b7abb89e46c4cf42d"
  integrity sha512-luyxx6eKhjcOfDH8JQFNyuXEi1vQ/4GOtGAAk3U+G42mPNraQXXrYVUgcSdQjDK/4AGI7nrIbfUpqKttJAgY8g==
@@ -7838,7 +7826,7 @@ libnpmconfig@^1.2.1:
    find-up "^3.0.0"
    ini "^1.3.5"

-libnpmdiff@*:
+libnpmdiff@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-3.0.0.tgz#4beb36cf9a8b91a99c373589e99822c18a798c0e"
  integrity sha512-pnwUs96QpM7KzD4vOyxTZvrjxi61y/5u/nBUKih8+eKQ9H8DiIBcV1OGaj7OKhoxJk4D5s8Aw746rE49FARavQ==
@@ -7852,7 +7840,7 @@ libnpmdiff@*:
    pacote "^12.0.0"
    tar "^6.1.0"

-libnpmexec@*:
+libnpmexec@^3.0.3:
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-3.0.3.tgz#f43ddb9c713298efa9f852399a2c26cbf31ab5c4"
  integrity sha512-X5ni061keRcGMOQlwJS58x1QhdMpFW2PZzj1Lls7S2Dkyo3SdGBHTg++BfDjWBgpWS3sRy4+drWSfeeaLovoRw==
@@ -7869,14 +7857,14 @@ libnpmexec@*:
    read-package-json-fast "^2.0.2"
    walk-up-path "^1.0.0"

-libnpmfund@*:
+libnpmfund@^2.0.2:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-2.0.2.tgz#90a7aa26c8b9b4739a06e314f83decd198b3f9c6"
  integrity sha512-7gznxLV71t9KsC9jyV6ILbLjfebettTzn13TVl29hwzDpiG+NkA7xZ7yT0L9e7DI8CVUVIxvvHKUl3Ny+TNQ8Q==
  dependencies:
    "@npmcli/arborist" "^4.0.0"

-libnpmhook@*:
+libnpmhook@^7.0.1:
  version "7.0.1"
  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-7.0.1.tgz#f633a7cc647e8dbc689654e3734f055db13a8be9"
  integrity sha512-b7UwPmuW47/vdEhVGVKV8DqO26lWvYwU+qJB18xeN0KgWzGT4hpQNRTdAZ3LR0zdvWm3VYpHix2gb9pyuMrs5Q==
@@ -7884,7 +7872,7 @@ libnpmhook@*:
    aproba "^2.0.0"
    npm-registry-fetch "^12.0.1"

-libnpmorg@*:
+libnpmorg@^3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-3.0.1.tgz#0820a0411d544328b3fa413a88fc73ce18c4bc01"
  integrity sha512-jIEmSRk98kx2gsmZSoA6Mu3gV6qlh3a2eoBrYa5qSHosQmvoRDxtA96E4f1E1ZEf+NW6fCZbQl2ThejUxtb+Tg==
@@ -7892,7 +7880,7 @@ libnpmorg@*:
    aproba "^2.0.0"
    npm-registry-fetch "^12.0.1"

-libnpmpack@*:
+libnpmpack@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-3.1.0.tgz#de9823cf6d595f5630151d5aa44efc7aeb28b183"
  integrity sha512-dO0ER8L6TPINOSyCAy/XTwsKIz42Bg+SB1XX9zCoaHimP7oqzV7O8PJGoPfEduLt8zidwu8oNW3nYrA43M6VCQ==
@@ -7901,7 +7889,7 @@ libnpmpack@*:
    npm-package-arg "^8.1.0"
    pacote "^12.0.0"

-libnpmpublish@*:
+libnpmpublish@^5.0.1:
  version "5.0.1"
  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-5.0.1.tgz#eda2208392bb74cde9c62d0e841557643153ee72"
  integrity sha512-S9HvvO8kGWWuGFvAQyw0T5NWxib21ktA1REGTB7I+GBqDjyYOjjwzJaavtTxDD8ID18dKCluOXg0PdMmRdKfHA==
@@ -7912,14 +7900,14 @@ libnpmpublish@*:
    semver "^7.1.3"
    ssri "^8.0.1"

-libnpmsearch@*:
+libnpmsearch@^4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-4.0.1.tgz#bf6c96339aadb552c007373623322642a9078512"
  integrity sha512-uSKYwVUNbI8ZOAiZIdfDL60F2MelnqVzLUdkLlAoQnK0CnlU8tsdyX+nRDCTPGqOHq0inh5DyCJKbyMxf6ibBA==
  dependencies:
    npm-registry-fetch "^12.0.1"

-libnpmteam@*:
+libnpmteam@^3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-3.0.1.tgz#6cde5b7b262bf384661d1fd6ff03b3cfd378c6bc"
  integrity sha512-qnUs2oXMYcB8AREl41Q7IUuklY5rSFW4VeVgCwE3TF+vdnsCATW4GAc/vIUZ6gWDA3lUdjqcXHlBJi8g09RRDw==
@@ -7927,7 +7915,7 @@ libnpmteam@*:
    aproba "^2.0.0"
    npm-registry-fetch "^12.0.1"

-libnpmversion@*:
+libnpmversion@^2.0.2:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-2.0.2.tgz#9fc1b94f5a2d0ae8c6378af498f3f44248f467d6"
  integrity sha512-Dg+ccHL/F8BQgEeE9n8OU3T1FXhbdAKaj5+OYYPUrcrXkMh9EhVQ8uIbxCl0FQUeQHeWW9XmfO2icZ5YcZQvbQ==
@@ -8179,7 +8167,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@*, make-fetch-happen@^10.0.1, make-fetch-happen@^10.0.2:
+make-fetch-happen@^10.0.1, make-fetch-happen@^10.0.2, make-fetch-happen@^10.0.3:
  version "10.0.3"
  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.0.3.tgz#94bbe675cf62a811dbab59668052388a078beaf2"
  integrity sha512-CzarPHynPpHjhF5in/YapnO44rSZeYX5VCMfdXa99+gLwpbfFLh20CWa6dP/taV9Net9PWJwXNKtp/4ZTCQnag==
@@ -8493,7 +8481,7 @@ minipass-json-stream@^1.0.1:
    jsonparse "^1.3.1"
    minipass "^3.0.0"

-minipass-pipeline@*, minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
  version "1.2.4"
  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
@@ -8507,7 +8495,7 @@ minipass-sized@^1.0.3:
  dependencies:
    minipass "^3.0.0"

-minipass@*, minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
  version "3.1.6"
  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
@@ -8535,7 +8523,7 @@ mixin-deep@^1.2.0:
    for-in "^1.0.2"
    is-extendable "^1.0.1"

-mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0:
+mkdirp-infer-owner@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
  integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
@@ -8544,11 +8532,6 @@ mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0:
    infer-owner "^1.0.4"
    mkdirp "^1.0.3"

-mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1:
  version "0.5.5"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
@@ -8556,16 +8539,16 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1:
  dependencies:
    minimist "^1.2.5"

+mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 mrmime@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.0.tgz#14d387f0585a5233d291baba339b063752a2398b"
  integrity sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==

-ms@*, ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
 ms@2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -8576,6 +8559,11 @@ ms@2.1.2:
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==

+ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 multicast-dns-service-types@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -8656,22 +8644,6 @@ node-forge@^1.2.0:
  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c"
  integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==

-node-gyp@*, node-gyp@^8.2.0:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
-  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^9.1.0"
-    nopt "^5.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
 node-gyp@^7.1.0:
  version "7.1.2"
  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
@@ -8688,6 +8660,22 @@ node-gyp@^7.1.0:
    tar "^6.0.2"
    which "^2.0.2"

+node-gyp@^8.2.0, node-gyp@^8.4.1:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
+  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
+  dependencies:
+    env-paths "^2.2.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^9.1.0"
+    nopt "^5.0.0"
+    npmlog "^6.0.0"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
+    which "^2.0.2"
+
 node-int64@^0.4.0:
  version "0.4.0"
  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -8755,7 +8743,7 @@ node-sass@6.0.1:
    stdout-stream "^1.4.0"
    "true-case-path" "^1.0.2"

-nopt@*, nopt@^5.0.0:
+nopt@^5.0.0:
  version "5.0.0"
  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
@@ -8817,7 +8805,7 @@ normalize.css@^8.0.1:
  resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3"
  integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==

-npm-audit-report@*:
+npm-audit-report@^2.1.5:
  version "2.1.5"
  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-2.1.5.tgz#a5b8850abe2e8452fce976c8960dd432981737b5"
  integrity sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw==
@@ -8866,7 +8854,7 @@ npm-check-updates@^12.4.0:
    update-notifier "^5.1.0"
    yaml "^1.10.2"

-npm-install-checks@*, npm-install-checks@^4.0.0:
+npm-install-checks@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
@@ -8878,15 +8866,6 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==

-npm-package-arg@*, npm-package-arg@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.0.0.tgz#955a5e4735298fc23f71cb72da3574daa134340c"
-  integrity sha512-yhzXxeor+Zfhe5MGwPdDumz6HtNlj2pMekWB95IX3CC6uDNgde0oPKHDCLDPoJqQfd0HqAWt+y4Hs5m7CK1+9Q==
-  dependencies:
-    hosted-git-info "^4.1.0"
-    semver "^7.3.5"
-    validate-npm-package-name "^3.0.0"
-
 npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.2, npm-package-arg@^8.1.4, npm-package-arg@^8.1.5:
  version "8.1.5"
  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
@@ -8896,6 +8875,15 @@ npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.2, npm-pack
    semver "^7.3.4"
    validate-npm-package-name "^3.0.0"

+npm-package-arg@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.0.0.tgz#955a5e4735298fc23f71cb72da3574daa134340c"
+  integrity sha512-yhzXxeor+Zfhe5MGwPdDumz6HtNlj2pMekWB95IX3CC6uDNgde0oPKHDCLDPoJqQfd0HqAWt+y4Hs5m7CK1+9Q==
+  dependencies:
+    hosted-git-info "^4.1.0"
+    semver "^7.3.5"
+    validate-npm-package-name "^3.0.0"
+
 npm-packlist@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-3.0.0.tgz#0370df5cfc2fcc8f79b8f42b37798dd9ee32c2a9"
@@ -8906,16 +8894,6 @@ npm-packlist@^3.0.0:
    npm-bundled "^1.1.1"
    npm-normalize-package-bin "^1.0.1"

-npm-pick-manifest@*, npm-pick-manifest@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.0.tgz#e3b18b09678a47e894f90941bef8204ea5d96c3b"
-  integrity sha512-njM1AcdioFaKd0JSGtLO09YA1WRwctjGQJbnHGmKS+u+uwP8oFvtZtOQWPYdxrnY5eJud3wn8OpH4sEIx6+GEQ==
-  dependencies:
-    npm-install-checks "^4.0.0"
-    npm-normalize-package-bin "^1.0.1"
-    npm-package-arg "^9.0.0"
-    semver "^7.3.5"
-
 npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1:
  version "6.1.1"
  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
@@ -8926,7 +8904,17 @@ npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1:
    npm-package-arg "^8.1.2"
    semver "^7.3.4"

-npm-profile@*:
+npm-pick-manifest@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.0.tgz#e3b18b09678a47e894f90941bef8204ea5d96c3b"
+  integrity sha512-njM1AcdioFaKd0JSGtLO09YA1WRwctjGQJbnHGmKS+u+uwP8oFvtZtOQWPYdxrnY5eJud3wn8OpH4sEIx6+GEQ==
+  dependencies:
+    npm-install-checks "^4.0.0"
+    npm-normalize-package-bin "^1.0.1"
+    npm-package-arg "^9.0.0"
+    semver "^7.3.5"
+
+npm-profile@^6.0.0:
  version "6.0.2"
  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-6.0.2.tgz#b2da9887d16d1f0d1ce8a9c3b37a48454a372919"
  integrity sha512-0Fq8l+A10YXnnS63E3HThWjOb7+19Wsh1nOVutC2fKuowar8t/5PpINsbcm5xQ2dA28uAu+wjFfUyiEVSMz4Jw==
@@ -8934,7 +8922,19 @@ npm-profile@*:
    npm-registry-fetch "^13.0.0"
    proc-log "^2.0.0"

-npm-registry-fetch@*, npm-registry-fetch@^13.0.0:
+npm-registry-fetch@^12.0.0, npm-registry-fetch@^12.0.1, npm-registry-fetch@^12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-12.0.2.tgz#ae583bb3c902a60dae43675b5e33b5b1f6159f1e"
+  integrity sha512-Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA==
+  dependencies:
+    make-fetch-happen "^10.0.1"
+    minipass "^3.1.6"
+    minipass-fetch "^1.4.1"
+    minipass-json-stream "^1.0.1"
+    minizlib "^2.1.2"
+    npm-package-arg "^8.1.5"
+
+npm-registry-fetch@^13.0.0:
  version "13.0.0"
  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.0.0.tgz#f0cf807f661184217651e0465668e4fd255fd6a8"
  integrity sha512-MmiMuV9DU5gRuAU0jia952Qq+E4h7ZoUaeltCXivhClcqfOVKqNLZEQsRUOb6a8WQY+um8x97JcUuaWFoPoBBw==
@@ -8947,18 +8947,6 @@ npm-registry-fetch@*, npm-registry-fetch@^13.0.0:
    npm-package-arg "^9.0.0"
    proc-log "^2.0.0"

-npm-registry-fetch@^12.0.0, npm-registry-fetch@^12.0.1:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-12.0.2.tgz#ae583bb3c902a60dae43675b5e33b5b1f6159f1e"
-  integrity sha512-Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA==
-  dependencies:
-    make-fetch-happen "^10.0.1"
-    minipass "^3.1.6"
-    minipass-fetch "^1.4.1"
-    minipass-json-stream "^1.0.1"
-    minizlib "^2.1.2"
-    npm-package-arg "^8.1.5"
-
 npm-run-path@^4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -8966,7 +8954,7 @@ npm-run-path@^4.0.1:
  dependencies:
    path-key "^3.0.0"

-npm-user-validate@*:
+npm-user-validate@^1.0.1:
  version "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==
@@ -9048,16 +9036,6 @@ npm@^8.5.1:
    which "^2.0.2"
    write-file-atomic "^4.0.0"

-npmlog@*, npmlog@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.1.tgz#06f1344a174c06e8de9c6c70834cfba2964bba17"
-  integrity sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==
-  dependencies:
-    are-we-there-yet "^3.0.0"
-    console-control-strings "^1.1.0"
-    gauge "^4.0.0"
-    set-blocking "^2.0.0"
-
 npmlog@^4.0.0, npmlog@^4.1.2:
  version "4.1.2"
  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -9068,6 +9046,16 @@ npmlog@^4.0.0, npmlog@^4.1.2:
    gauge "~2.7.3"
    set-blocking "~2.0.0"

+npmlog@^6.0.0, npmlog@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.1.tgz#06f1344a174c06e8de9c6c70834cfba2964bba17"
+  integrity sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==
+  dependencies:
+    are-we-there-yet "^3.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^4.0.0"
+    set-blocking "^2.0.0"
+
 nprogress@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/nprogress/-/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1"
@@ -9213,7 +9201,7 @@ open@8.4.0, open@^8.0.9:
    is-docker "^2.1.1"
    is-wsl "^2.2.0"

-opener@*, opener@^1.5.2:
+opener@^1.5.2:
  version "1.5.2"
  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
@@ -9375,7 +9363,32 @@ package-json@^6.3.0:
    registry-url "^5.0.0"
    semver "^6.2.0"

-pacote@*, pacote@^13.0.2:
+pacote@^12.0.0, pacote@^12.0.2, pacote@^12.0.3:
+  version "12.0.3"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-12.0.3.tgz#b6f25868deb810e7e0ddf001be88da2bcaca57c7"
+  integrity sha512-CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow==
+  dependencies:
+    "@npmcli/git" "^2.1.0"
+    "@npmcli/installed-package-contents" "^1.0.6"
+    "@npmcli/promise-spawn" "^1.2.0"
+    "@npmcli/run-script" "^2.0.0"
+    cacache "^15.0.5"
+    chownr "^2.0.0"
+    fs-minipass "^2.1.0"
+    infer-owner "^1.0.4"
+    minipass "^3.1.3"
+    mkdirp "^1.0.3"
+    npm-package-arg "^8.0.1"
+    npm-packlist "^3.0.0"
+    npm-pick-manifest "^6.0.0"
+    npm-registry-fetch "^12.0.0"
+    promise-retry "^2.0.1"
+    read-package-json-fast "^2.0.1"
+    rimraf "^3.0.2"
+    ssri "^8.0.1"
+    tar "^6.1.0"
+
+pacote@^13.0.2:
  version "13.0.2"
  resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.0.2.tgz#3389b8338cdbec3a1fa433848cf00860f7c08ea6"
  integrity sha512-3LyfvDk2BSJNFQZIcDqnLNa7IsYb6KwX3H9uZPwaHJFIX6Gv5N9QHU+s7mEs/RbN4/ta6KUT39LAi2l6EkBi5A==
@@ -9402,31 +9415,6 @@ pacote@*, pacote@^13.0.2:
    ssri "^8.0.1"
    tar "^6.1.11"

-pacote@^12.0.0, pacote@^12.0.2:
-  version "12.0.3"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-12.0.3.tgz#b6f25868deb810e7e0ddf001be88da2bcaca57c7"
-  integrity sha512-CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow==
-  dependencies:
-    "@npmcli/git" "^2.1.0"
-    "@npmcli/installed-package-contents" "^1.0.6"
-    "@npmcli/promise-spawn" "^1.2.0"
-    "@npmcli/run-script" "^2.0.0"
-    cacache "^15.0.5"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    infer-owner "^1.0.4"
-    minipass "^3.1.3"
-    mkdirp "^1.0.3"
-    npm-package-arg "^8.0.1"
-    npm-packlist "^3.0.0"
-    npm-pick-manifest "^6.0.0"
-    npm-registry-fetch "^12.0.0"
-    promise-retry "^2.0.1"
-    read-package-json-fast "^2.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.1.0"
-
 pako@~1.0.5:
  version "1.0.11"
  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
@@ -9465,7 +9453,7 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
    pbkdf2 "^3.0.3"
    safe-buffer "^5.1.1"

-parse-conflict-json@*, parse-conflict-json@^2.0.1:
+parse-conflict-json@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-2.0.1.tgz#76647dd072e6068bcaff20be6ccea68a18e1fb58"
  integrity sha512-Y7nYw+QaSGBto1LB9lgwOR05Rtz5SbuTf+Oe7HJ6SYQ/DHsvRjQ8O03oWdJbvkt6GzDWospgyZbGmjDYL0sDgA==
@@ -10181,16 +10169,16 @@ printj@~1.3.1:
  resolved "https://registry.yarnpkg.com/printj/-/printj-1.3.1.tgz#9af6b1d55647a1587ac44f4c1654a4b95b8e12cb"
  integrity sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==

-proc-log@*, proc-log@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.0.tgz#25f8cb346a5d08e27f2422b3ca6ba8379bcbf8ba"
-  integrity sha512-I/35MfCX2H8jBUhKN8JB8nmqvQo/nKdrBodBY7L3RhDSPPyvOHwLYNmPuhwuJq7a7C3vgFKWGQM+ecPStcvOHA==
-
 proc-log@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-1.0.0.tgz#0d927307401f69ed79341e83a0b2c9a13395eb77"
  integrity sha512-aCk8AO51s+4JyuYGg3Q/a6gnrlDO09NpVWePtjp7xwphcoQ04x5WAfCyugcsbLooWcMJ87CLkD4+604IckEdhg==

+proc-log@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.0.tgz#25f8cb346a5d08e27f2422b3ca6ba8379bcbf8ba"
+  integrity sha512-I/35MfCX2H8jBUhKN8JB8nmqvQo/nKdrBodBY7L3RhDSPPyvOHwLYNmPuhwuJq7a7C3vgFKWGQM+ecPStcvOHA==
+
 process-nextick-args@~2.0.0:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -10338,7 +10326,7 @@ q@^1.1.2:
  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=

-qrcode-terminal@*:
+qrcode-terminal@^0.12.0:
  version "0.12.0"
  resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
  integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==
@@ -10466,7 +10454,7 @@ read-cmd-shim@^2.0.0:
  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
  integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==

-read-package-json-fast@*, read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
+read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
  integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
@@ -10474,7 +10462,7 @@ read-package-json-fast@*, read-package-json-fast@^2.0.1, read-package-json-fast@
    json-parse-even-better-errors "^2.3.0"
    npm-normalize-package-bin "^1.0.1"

-read-package-json@*, read-package-json@^4.1.1:
+read-package-json@^4.1.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-4.1.1.tgz#153be72fce801578c1c86b8ef2b21188df1b9eea"
  integrity sha512-P82sbZJ3ldDrWCOSKxJT0r/CXMWR0OR3KRh55SgKo3p91GSIEEC32v3lSHAvO/UcH3/IoL7uqhOFBduAnwdldw==
@@ -10503,7 +10491,7 @@ read-pkg@^5.2.0:
    parse-json "^5.0.0"
    type-fest "^0.6.0"

-read@*, read@1, read@^1.0.7:
+read@1, read@^1.0.7, read@~1.0.1, read@~1.0.7:
  version "1.0.7"
  resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
  integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=
@@ -10539,7 +10527,7 @@ readdir-glob@^1.0.0:
  dependencies:
    minimatch "^3.0.4"

-readdir-scoped-modules@*, readdir-scoped-modules@^1.1.0:
+readdir-scoped-modules@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
  integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
@@ -10836,13 +10824,6 @@ reusify@^1.0.4:
  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==

-rimraf@*, rimraf@^3.0.0, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^2.4.4, rimraf@^2.6.1:
  version "2.7.1"
  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -10850,6 +10831,13 @@ rimraf@^2.4.4, rimraf@^2.6.1:
  dependencies:
    glob "^7.1.3"

+rimraf@^3.0.0, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -11059,13 +11047,6 @@ semver-utils@^1.1.4:
  resolved "https://registry.yarnpkg.com/semver-utils/-/semver-utils-1.1.4.tgz#cf0405e669a57488913909fc1c3f29bf2a4871e2"
  integrity sha512-EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==

-semver@*, semver@7.3.5, semver@7.x, semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.7.1:
  version "5.7.1"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -11076,6 +11057,13 @@ semver@7.0.0:
  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==

+semver@7.3.5, semver@7.x, semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
  version "6.3.0"
  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -11470,7 +11458,7 @@ sshpk@^1.7.0:
    safer-buffer "^2.0.2"
    tweetnacl "~0.14.0"

-ssri@*, ssri@^8.0.0, ssri@^8.0.1:
+ssri@^8.0.0, ssri@^8.0.1:
  version "8.0.1"
  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
@@ -11818,7 +11806,7 @@ tar-stream@^2.2.0:
    inherits "^2.0.3"
    readable-stream "^3.1.1"

-tar@*, tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
  version "6.1.11"
  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -11890,7 +11878,7 @@ test-exclude@^6.0.0:
    glob "^7.1.4"
    minimatch "^3.0.4"

-text-table@*, text-table@^0.2.0:
+text-table@^0.2.0, text-table@~0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
@@ -11927,7 +11915,7 @@ timsort@^0.3.0:
  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=

-tiny-relative-date@*:
+tiny-relative-date@^1.3.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
  integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
@@ -12032,7 +12020,7 @@ tr46@^2.1.0:
  dependencies:
    punycode "^2.1.1"

-treeverse@*, treeverse@^1.0.4:
+treeverse@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"
  integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g==
@@ -12496,7 +12484,7 @@ validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
    spdx-correct "^3.0.0"
    spdx-expression-parse "^3.0.0"

-validate-npm-package-name@*, validate-npm-package-name@^3.0.0:
+validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
@@ -12983,7 +12971,7 @@ which-module@^2.0.0:
  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=

-which@*, which@^2.0.1, which@^2.0.2:
+which@^2.0.1, which@^2.0.2:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
@@ -13217,14 +13205,6 @@ wrappy@1:
  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

-write-file-atomic@*, write-file-atomic@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
-  integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
-
 write-file-atomic@^3.0.0:
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
@@ -13235,6 +13215,14 @@ write-file-atomic@^3.0.0:
    signal-exit "^3.0.2"
    typedarray-to-buffer "^3.1.5"

+write-file-atomic@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
+  integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
+
 ws@^6.1.0:
  version "6.2.2"
  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"