From 030523c8eef193cda6d8737b03b0db19a465b591 Mon Sep 17 00:00:00 2001
From: paoloar77 <paolo.arena77@gmail.com>
Date: Sun, 23 Jan 2022 23:25:19 +0100
Subject: [PATCH] Aggiunto il filtro per Provincia

---
 package.json                                  |  18 +-
 src/common/shared_vuejs.ts                    | 473 +++++++++++++-
 src/components/CFinder/CFinder.ts             |  37 +-
 src/components/CFinder/CFinder.vue            |   1 +
 src/components/CGallery/CGallery.ts           |   9 +
 src/components/CGallery/CGallery.vue          |   2 +
 src/components/CGridTableRec/CGridTableRec.ts |  17 +-
 .../CGridTableRec/CGridTableRec.vue           |   6 +-
 src/components/CMyPopupEdit/CMyPopupEdit.ts   |  14 +
 src/components/CMyPopupEdit/CMyPopupEdit.vue  |  40 +-
 src/components/CMySelect/CMySelect.ts         |  48 +-
 src/components/CMySelect/CMySelect.vue        |  88 ++-
 src/components/CSkill/CSkill.vue              |   1 +
 src/model/GlobalStore.ts                      |   7 +
 src/model/UserStore.ts                        |   1 +
 src/rootgen/admin/importdata/importdata.ts    |  24 +-
 src/statics/lang/it.js                        |   4 +
 src/store/Modules/fieldsTable.ts              |  38 +-
 src/store/Modules/tools.ts                    |  29 +-
 src/store/globalStore.ts                      |   3 +-
 src/views/user/editprofile/editprofile.vue    |   9 +
 src/views/user/myfriends/myfriends.vue        |   1 +
 src/views/user/myprofile/myprofile.ts         |  11 +
 src/views/user/myprofile/myprofile.vue        |  35 +-
 yarn.lock                                     | 586 +++++++++---------
 25 files changed, 1097 insertions(+), 405 deletions(-)

diff --git a/package.json b/package.json
index d8a71778..9d41f7f9 100755
--- a/package.json
+++ b/package.json
@@ -23,16 +23,16 @@
   "dependencies": {
     "axios": "0.21.4",
     "@vue/eslint-config-standard": "5.1.2",
-    "@quasar/extras": "^1.12.3",
+    "@quasar/extras": "^1.12.4",
     "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.12",
     "@vue/compat": "^3.2.26",
     "@vue/compiler-sfc": "^3.2.26",
-    "@vuelidate/core": "^2.0.0-alpha.33",
+    "@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.2",
+    "core-js": "^3.20.3",
     "crypto": "^1.0.1",
     "date-fns": "^2.28.0",
     "dotenv": "^11.0.0",
@@ -51,7 +51,7 @@
     "nprogress": "^0.2.0",
     "pinia": "^2.0.9",
     "prerender-spa-plugin": "^3.4.0",
-    "quasar": "^2.3.4",
+    "quasar": "^2.4.12",
     "quasar-extras": "^2.0.9",
     "register-service-worker": "^1.7.2",
     "vee-validate": "^4.4.10",
@@ -73,7 +73,7 @@
   "devDependencies": {
     "node-sass": "6.0.1",
     "webpack": "^5.66.0",
-    "@quasar/app": "^3.2.6",
+    "@quasar/app": "^3.2.9",
     "@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.12",
     "@types/bcryptjs": "^2.4.2",
     "@types/dotenv": "^8.2.0",
@@ -84,9 +84,9 @@
     "@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.6.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.0",
+    "@typescript-eslint/parser": "^5.10.0",
+    "eslint": "^8.7.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-node": "^11.1.0",
@@ -108,7 +108,7 @@
     "tslint": "^6.1.3",
     "tslint-config-standard": "^9.0.0",
     "tslint-loader": "^3.5.4",
-    "typescript": "^4.5.4",
+    "typescript": "^4.5.5",
     "vue-cli-plugin-element-ui": "^1.1.4",
     "vueify": "^9.4.1",
     "workbox-webpack-plugin": "^6.4.2"
diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts
index 696ef31b..ffe36b27 100755
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -59,6 +59,7 @@ export const shared_consts = {
 
   TAB_COUNTRY: 'countries',
   TAB_CITIES: 'cities',
+  TAB_PROVINCES: 'provinces',
   TAB_PHONES: 'phones',
   TAB_SITES: 'sites',
   TAB_SETTINGS: 'settings',
@@ -67,6 +68,24 @@ export const shared_consts = {
 
   TablePickup: ['countries', 'phones', 'cities'],
 
+  PARAM_SHOW_PROVINCE: 1,
+
+  TABLES_ID_NUMBER: ['permissions', 'levels', 'statusSkills', 'sectors', 'skills', 'subskills', 'cities', 'provinces', 'myskills'],
+  TABLES_USER_ID: ['myskills'],
+  TABLES_UPDATE_LASTMODIFIED: ['myskills', 'mybots'],
+
+  TABLES_PERM_CHANGE_FOR_USERS: ['myskills'],
+
+  VISIB_ALL: 0,
+  VISIB_ONLYIF_VERIFIED: 1,
+  VISIB_ONLY_MANAGER: 2,
+  VISIB_ONLY_ADMIN: 4,
+
+  BOTTYPE_NONE: 0,
+  BOTTYPE_PAGE: 1,
+  BOTTYPE_LINK: 2,
+  BOTTYPE_TEXT: 3,
+
   CashType: {
     None: 0,
     Incoming: 1,
@@ -79,11 +98,6 @@ export const shared_consts = {
     CITIES_SERVER: 3,
   },
 
-  BOTTYPE_NONE: 0,
-  BOTTYPE_PAGE: 1,
-  BOTTYPE_LINK: 2,
-  BOTTYPE_TEXT: 3,
-
   BotType: [
     {
       value: 0,
@@ -103,11 +117,448 @@ export const shared_consts = {
     },
   ],
 
-  VISIB_ALL: 0,
-  VISIB_ONLYIF_VERIFIED: 1,
-  VISIB_ONLY_MANAGER: 2,
-  VISIB_ONLY_ADMIN: 4,
-
+  Provinces: [
+    {
+      label: 'Agrigento',
+      value: 'AG',
+    },
+    {
+      label: 'Alessandria',
+      value: 'AL',
+    },
+    {
+      label: 'Ancona',
+      value: 'AN',
+    },
+    {
+      label: 'Aosta',
+      value: 'AO',
+    },
+    {
+      label: 'Arezzo',
+      value: 'AR',
+    },
+    {
+      label: 'Ascoli Piceno',
+      value: 'AP',
+    },
+    {
+      label: 'Asti',
+      value: 'AT',
+    },
+    {
+      label: 'Avellino',
+      value: 'AV',
+    },
+    {
+      label: 'Bari',
+      value: 'BA',
+    },
+    {
+      label: 'Barletta-Andria-Trani',
+      value: 'BT',
+    },
+    {
+      label: 'Belluno',
+      value: 'BL',
+    },
+    {
+      label: 'Benevento',
+      value: 'BN',
+    },
+    {
+      label: 'Bergamo',
+      value: 'BG',
+    },
+    {
+      label: 'Biella',
+      value: 'BI',
+    },
+    {
+      label: 'Bologna',
+      value: 'BO',
+    },
+    {
+      label: 'Bolzano',
+      value: 'BZ',
+    },
+    {
+      label: 'Brescia',
+      value: 'BS',
+    },
+    {
+      label: 'Brindisi',
+      value: 'BR',
+    },
+    {
+      label: 'Cagliari',
+      value: 'CA',
+    },
+    {
+      label: 'Caltanissetta',
+      value: 'CL',
+    },
+    {
+      label: 'Campobasso',
+      value: 'CB',
+    },
+    {
+      label: 'Carbonia-Iglesias',
+      value: 'CI',
+    },
+    {
+      label: 'Caserta',
+      value: 'CE',
+    },
+    {
+      label: 'Catania',
+      value: 'CT',
+    },
+    {
+      label: 'Catanzaro',
+      value: 'CZ',
+    },
+    {
+      label: 'Chieti',
+      value: 'CH',
+    },
+    {
+      label: 'Como',
+      value: 'CO',
+    },
+    {
+      label: 'Cosenza',
+      value: 'CS',
+    },
+    {
+      label: 'Cremona',
+      value: 'CR',
+    },
+    {
+      label: 'Crotone',
+      value: 'KR',
+    },
+    {
+      label: 'Cuneo',
+      value: 'CN',
+    },
+    {
+      label: 'Enna',
+      value: 'EN',
+    },
+    {
+      label: 'Fermo',
+      value: 'FM',
+    },
+    {
+      label: 'Ferrara',
+      value: 'FE',
+    },
+    {
+      label: 'Firenze',
+      value: 'FI',
+    },
+    {
+      label: 'Foggia',
+      value: 'FG',
+    },
+    {
+      label: 'Forli-Cesena',
+      value: 'FC',
+    },
+    {
+      label: 'Frosinone',
+      value: 'FR',
+    },
+    {
+      label: 'Genova',
+      value: 'GE',
+    },
+    {
+      label: 'Gorizia',
+      value: 'GO',
+    },
+    {
+      label: 'Grosseto',
+      value: 'GR',
+    },
+    {
+      label: 'Imperia',
+      value: 'IM',
+    },
+    {
+      label: 'Isernia',
+      value: 'IS',
+    },
+    {
+      label: 'La Spezia',
+      value: 'SP',
+    },
+    {
+      label: 'L\'Aquila',
+      value: 'AQ',
+    },
+    {
+      label: 'Latina',
+      value: 'LT',
+    },
+    {
+      label: 'Lecce',
+      value: 'LE',
+    },
+    {
+      label: 'Lecco',
+      value: 'LC',
+    },
+    {
+      label: 'Livorno',
+      value: 'LI',
+    },
+    {
+      label: 'Lodi',
+      value: 'LO',
+    },
+    {
+      label: 'Lucca',
+      value: 'LU',
+    },
+    {
+      label: 'Macerata',
+      value: 'MC',
+    },
+    {
+      label: 'Mantova',
+      value: 'MN',
+    },
+    {
+      label: 'Massa-Carrara',
+      value: 'MS',
+    },
+    {
+      label: 'Matera',
+      value: 'MT',
+    },
+    {
+      label: 'Messina',
+      value: 'ME',
+    },
+    {
+      label: 'Milano',
+      value: 'MI',
+    },
+    {
+      label: 'Modena',
+      value: 'MO',
+    },
+    {
+      label: 'Monza e della Brianza',
+      value: 'MB',
+    },
+    {
+      label: 'Napoli',
+      value: 'NA',
+    },
+    {
+      label: 'Novara',
+      value: 'NO',
+    },
+    {
+      label: 'Nuoro',
+      value: 'NU',
+    },
+    {
+      label: 'Olbia-Tempio',
+      value: 'OT',
+    },
+    {
+      label: 'Oristano',
+      value: 'OR',
+    },
+    {
+      label: 'Padova',
+      value: 'PD',
+    },
+    {
+      label: 'Palermo',
+      value: 'PA',
+    },
+    {
+      label: 'Parma',
+      value: 'PR',
+    },
+    {
+      label: 'Pavia',
+      value: 'PV',
+    },
+    {
+      label: 'Perugia',
+      value: 'PG',
+    },
+    {
+      label: 'Pesaro e Urbino',
+      value: 'PU',
+    },
+    {
+      label: 'Pescara',
+      value: 'PE',
+    },
+    {
+      label: 'Piacenza',
+      value: 'PC',
+    },
+    {
+      label: 'Pisa',
+      value: 'PI',
+    },
+    {
+      label: 'Pistoia',
+      value: 'PT',
+    },
+    {
+      label: 'Pordenone',
+      value: 'PN',
+    },
+    {
+      label: 'Potenza',
+      value: 'PZ',
+    },
+    {
+      label: 'Prato',
+      value: 'PO',
+    },
+    {
+      label: 'Ragusa',
+      value: 'RG',
+    },
+    {
+      label: 'Ravenna',
+      value: 'RA',
+    },
+    {
+      label: 'Reggio Calabria',
+      value: 'RC',
+    },
+    {
+      label: 'Reggio Emilia',
+      value: 'RE',
+    },
+    {
+      label: 'Rieti',
+      value: 'RI',
+    },
+    {
+      label: 'Rimini',
+      value: 'RN',
+    },
+    {
+      label: 'Roma',
+      value: 'RM',
+    },
+    {
+      label: 'Rovigo',
+      value: 'RO',
+    },
+    {
+      label: 'Salerno',
+      value: 'SA',
+    },
+    {
+      label: 'Medio Campidano',
+      value: 'VS',
+    },
+    {
+      label: 'Sassari',
+      value: 'SS',
+    },
+    {
+      label: 'Savona',
+      value: 'SV',
+    },
+    {
+      label: 'Siena',
+      value: 'SI',
+    },
+    {
+      label: 'Siracusa',
+      value: 'SR',
+    },
+    {
+      label: 'Sondrio',
+      value: 'SO',
+    },
+    {
+      label: 'Taranto',
+      value: 'TA',
+    },
+    {
+      label: 'Teramo',
+      value: 'TE',
+    },
+    {
+      label: 'Terni',
+      value: 'TR',
+    },
+    {
+      label: 'Torino',
+      value: 'TO',
+    },
+    {
+      label: 'Ogliastra',
+      value: 'OG',
+    },
+    {
+      label: 'Trapani',
+      value: 'TP',
+    },
+    {
+      label: 'Trento',
+      value: 'TN',
+    },
+    {
+      label: 'Treviso',
+      value: 'TV',
+    },
+    {
+      label: 'Trieste',
+      value: 'TS',
+    },
+    {
+      label: 'Udine',
+      value: 'UD',
+    },
+    {
+      label: 'Varese',
+      value: 'VA',
+    },
+    {
+      label: 'Venezia',
+      value: 'VE',
+    },
+    {
+      label: 'Verbano-Cusio-Ossola',
+      value: 'VB',
+    },
+    {
+      label: 'Vercelli',
+      value: 'VC',
+    },
+    {
+      label: 'Verona',
+      value: 'VR',
+    },
+    {
+      label: 'Vibo Valentia',
+      value: 'VV',
+    },
+    {
+      label: 'Vicenza',
+      value: 'VI',
+    },
+    {
+      label: 'Viterbo',
+      value: 'VT',
+    },
+  ],
 
   Regions: [
     {
@@ -392,7 +843,7 @@ export const shared_consts = {
   },
 
   fieldsUserToChange() {
-    return ['_id', 'username', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'verified_by_aportador', 'trust_modified', 'img', 'ipaddr', 'lasttimeonline', 'profile', 'news_on']
+    return ['_id', 'username', 'group', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'verified_by_aportador', 'trust_modified', 'img', 'ipaddr', 'lasttimeonline', 'profile', 'news_on']
   },
 
 }
diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts
index 1bd9f3f7..8707846d 100755
--- a/src/components/CFinder/CFinder.ts
+++ b/src/components/CFinder/CFinder.ts
@@ -61,6 +61,16 @@ export default defineComponent({
         }
       }
 
+      function getFilterCitiesByProvince(recSubSkill: any, index: number, arr: any) {
+        const recprov:any = searchList.value.find((rec) => rec.table === 'provinces')
+        // console.log('recSubSkill', recSubSkill, 'recskills', recskills)
+        if (recprov) {
+          return recSubSkill.idSkill === recprov.value
+        } else {
+          return true
+        }
+      }
+
 
       searchList.value = [
         {
@@ -110,15 +120,28 @@ export default defineComponent({
           useinput: true,
         },*/
         {
-          label: 'Citta',
+          label: 'Provincia',
+          table: 'provinces',
+          key: 'idProvince',
+          type: costanti.FieldType.multiselect,
+          value: 0,
+          addall: true,
+          arrvalue: tools.getCookie(tools.COOK_SEARCH + 'provinces', [costanti.FILTER_TUTTI]),
+          filter: null,
+          useinput: true,
+          notinsearch: true,
+        },
+        {
+          label: 'Città',
           table: 'cities',
-          key: 'idCity',
+          key: 'idProvince',
           type: costanti.FieldType.multiselect_by_server,
           value: 0,
           addall: true,
           arrvalue: tools.getCookie(tools.COOK_SEARCH + 'cities', [costanti.FILTER_TUTTI]),
-          filter: null,
           useinput: true,
+          filter: getFilterCitiesByProvince,
+          // param1: shared_consts.PARAM_SHOW_PROVINCE,
           tablesel: 'cities',
         },
         {
@@ -248,10 +271,10 @@ export default defineComponent({
           af_objId_tab: '',
         },
         lookup5: {
-          lk_tab: 'cities',
-          lk_LF: 'idCity',
-          lk_FF: '_id',
-          lk_as: 'comune',
+          lk_tab: 'provinces',
+          lk_LF: 'idProvince',
+          lk_FF: 'prov',
+          lk_as: 'descr',
           af_objId_tab: '',
         },
       }
diff --git a/src/components/CFinder/CFinder.vue b/src/components/CFinder/CFinder.vue
index 762f5d14..0d3ceaed 100755
--- a/src/components/CFinder/CFinder.vue
+++ b/src/components/CFinder/CFinder.vue
@@ -12,6 +12,7 @@
         nodataLabel="Nessuna Competenza trovata"
         :prop_search="true"
         :finder="true"
+        :choose_visutype="true"
         :butt_modif_new="false"
         noresultLabel="Il filtro selezionato non ha trovato nessun risultato"
         :arrfilters="arrfilterand"
diff --git a/src/components/CGallery/CGallery.ts b/src/components/CGallery/CGallery.ts
index c6b1367c..05afd418 100755
--- a/src/components/CGallery/CGallery.ts
+++ b/src/components/CGallery/CGallery.ts
@@ -328,6 +328,14 @@ export default defineComponent({
       fullscreensrc.value = getfullname(mygallery)
     }
 
+    function onRejected (rejectedEntries: any) {
+      // Notify plugin needs to be installed
+      // https://quasar.dev/quasar-plugins/notify#Installation
+      $q.notify({
+        type: 'negative',
+        message: 'La Dimensione massima dell\'immagine è di 2 MB'
+      })
+    }
     onMounted(created)
 
     return {
@@ -355,6 +363,7 @@ export default defineComponent({
       ImgFullScreen,
       fullscreen,
       fullscreensrc,
+      onRejected,
     }
   }
 })
diff --git a/src/components/CGallery/CGallery.vue b/src/components/CGallery/CGallery.vue
index 86bb583e..fd8e8122 100755
--- a/src/components/CGallery/CGallery.vue
+++ b/src/components/CGallery/CGallery.vue
@@ -101,6 +101,7 @@
               hide-upload-btn
               no-thumbnails
               @uploaded="uploaded"
+              @rejected="onRejected"
               style="width: 208px"
             ></q-uploader>
           </div>
@@ -215,6 +216,7 @@
                 hide-upload-btn
                 no-thumbnails
                 @uploaded="uploaded"
+                @rejected="onRejected"
                 style="width: 208px"
               ></q-uploader>
             </div>
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts
index 10fd53a9..2560a564 100755
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -167,6 +167,11 @@ export default defineComponent({
       type: Boolean,
       required: false,
       default: true
+    },
+    choose_visutype: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends },
@@ -1116,7 +1121,17 @@ export default defineComponent({
         data: {}
       }
 
-      mydata.data = newRecord.value
+      const myobj = newRecord.value
+
+
+      //++ Eliminare eventuali campi ?
+      mycolumns.value.forEach((col:IColGridTable) => {
+        if (col.notsave) {
+          delete myobj[col.name]
+        }
+      })
+
+      mydata.data = myobj
 
       const data = await globalStore.saveTable(mydata)
         .then((ris) => {
diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue
index 87c033ad..9b7cad41 100755
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -134,6 +134,7 @@
               :addall="true"
               :tablesel="item.tablesel"
               :pickup="true"
+              :param1="item.param1"
               label-color="primary"
               class="combowidth"
               color="primary"
@@ -233,7 +234,7 @@
         <div v-if="pagination.rowsNumber === 1 && prop_search">{{ pagination.rowsNumber }} elemento trovato</div>
         <div v-if="pagination.rowsNumber > 1 && prop_search">{{ pagination.rowsNumber }} elementi trovati</div>
 
-        <div v-if="finder" class="">
+        <div v-if="choose_visutype" class="">
           <q-radio v-model="myvertical" :val="2" label="Lista"
                    @update:model-value="tools.setCookie('myv', myvertical) "/>
           <q-radio v-model="myvertical" :val="-1" label="Scheda"
@@ -326,8 +327,9 @@
             <q-card-section class="inset-shadow">
               <q-list dense>
                 <div v-for="col in mycolumns" :key="col.name">
+
                   <q-item v-if="colVisib.includes(col.field + col.subfield) &&
-                          !col.noshowifnone || (col.noshowifnone && !!props.row.value)"
+                          (!col.noshowifnone || (col.noshowifnone && tools.getValue(props.row,col.field, col.subfield)))"
                           :class="clByCol(col)" class="riduci_pad">
 
                     <q-item-section avatar v-if="visuIntestazCol(col)">
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts
index e7737cb7..be4c3497 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.ts
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts
@@ -595,6 +595,19 @@ export default defineComponent({
       )
     }
 
+    function getTitleEditor(col: IColGridTable, row: any) {
+
+      let title = ''
+      if (!!col.field_extra1) {
+        try {
+          title = tools.getValue(row, col.field_extra1, col.subfield_extra1!)
+        }catch (e){}
+      }
+
+      return title
+
+    }
+
     onBeforeMount(mounted)
 
     crea()
@@ -631,6 +644,7 @@ export default defineComponent({
       col,
       myImgGall,
       noPopupeditByCol,
+      getTitleEditor,
     }
   }
 })
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index b52c552f..1b4f527b 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -31,12 +31,15 @@
             </div>
           </div>
           <div v-else-if="col.fieldtype === costanti.FieldType.string">
-            <div v-if="visulabel || isInModif" :class="{ flex: !isInModif }">
+            <div v-if="visulabel || isInModif" :class="{ flex: !isInModif}">
+
               <q-input
                 v-bind="$attrs"
                 v-model="myvalue"
                 autogrow
+                :style="$q.screen.lt.sm ? 'min-width: 300px' : ''"
                 counter
+                :maxlength="col.maxlength ? col.maxlength : undefined"
                 :disable="disable"
                 :readonly="disable"
                 @keyup.enter.stop
@@ -99,7 +102,7 @@
           </div>
           <div v-else-if="col.fieldtype === costanti.FieldType.listimages" style="text-align: center;">
             <p v-if="isInModif">
-              {{ $t('reg.images') }}:
+              {{ $t('reg.image') }}:
             </p>
             <CGallery
               :title="getTitleGall()"
@@ -243,7 +246,24 @@
           <!-- Show Value -->
           <div v-else-if="col.fieldtype === costanti.FieldType.multiselect">
             <div v-if="isInModif">
-              <q-select
+              <CMySelect
+                :multiple="true"
+                :withToggle="true"
+                :label="col.label"
+                v-model:arrvalue="myvalue"
+                @update:arrvalue="changevalRec"
+                :addall="false"
+                label-color="primary"
+                class="combowidth"
+                color="primary"
+                :optval="fieldsTable.getKeyByTable(col.jointable)"
+                :optlab="fieldsTable.getLabelByTable(col.jointable)"
+                :options="globalStore.getTableJoinByName(col.jointable, col.addall, col.filter)"
+                :sola_lettura="!isInModif"
+                :useinput="false">
+              </CMySelect>
+
+              <!--<q-select
                 v-model="myvalue"
                 rounded
                 outlined
@@ -270,7 +290,7 @@
                   </q-item>
                 </template>
 
-              </q-select>
+              </q-select>-->
 
             </div>
             <div v-else>
@@ -360,9 +380,12 @@
               <div v-if="insertMode">
 
               </div>
+              <p v-if="isInModif" class="text-center">
+                {{ $t('event.testo_di_spiegazione') }}:
+              </p>
               <div v-if="!isFieldDb()">
                 <CMyEditor
-                  v-model:value="myvalue" :title="col.title" @keyup.enter.stop
+                  v-model:value="myvalue" :title="getTitleEditor(col, row)" @keyup.enter.stop
                   :showButtons="false"
                   :canModify="canModify"
                   @update:value="changevalRec"
@@ -379,10 +402,12 @@
               <!--<div v-html="visuValByType(myvalue, col, row)" @click="visueditor = true"></div>-->
 
               <div v-if="!isFieldDb()">
-                <q-dialog v-model="visuhtml" full-height full-width auto-close>
+                <q-dialog v-model="visuhtml" full-height full-width>
                   <q-card>
                     <q-bar dense class="bg-primary text-white">
+                      <span class="ellipsis"> {{ getTitleEditor(col, row) }} </span>
                       <q-space/>
+                      <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
                     </q-bar>
                     <q-card-section class="inset-shadow">
                       <q-card class="dialog_card">
@@ -437,7 +462,7 @@
             v-slot="scope">
 
             <div v-if="col.fieldtype === costanti.FieldType.boolean">
-              <q-checkbox v-model="scope.value" :label="col.title">
+              <q-checkbox v-model="scope.value" :label="col.title ? col.title : col.titlepopupedit">
               </q-checkbox>
               <span v-html="visuValByType(myvalue, col, row)"></span>
             </div>
@@ -445,6 +470,7 @@
               <q-input
                 v-bind="$attrs"
                 counter
+                :maxlength="col.maxlength ? col.maxlength : undefined"
                 v-model="scope.value"
                 autogrow
                 @keyup.enter.stop
diff --git a/src/components/CMySelect/CMySelect.ts b/src/components/CMySelect/CMySelect.ts
index cae2c319..b7b45548 100755
--- a/src/components/CMySelect/CMySelect.ts
+++ b/src/components/CMySelect/CMySelect.ts
@@ -82,6 +82,10 @@ export default defineComponent({
     sola_lettura: {
       type: Boolean,
       default: false,
+    },
+    withToggle: {
+      type: Boolean,
+      default: false,
     }
   },
   components: {},
@@ -116,7 +120,8 @@ export default defineComponent({
     watch(() => props.options, (value: any, oldval: any) => {
         if (!props.multiselect_by_server) {
           valori.value = valoriload.value
-          // console.log('@@@ VALORI CHANGED (1)', valori.value)
+        } else {
+          console.log('@@@ VALORI CHANGED (1)', valori.value)
         }
       },
     )
@@ -170,8 +175,8 @@ export default defineComponent({
 
 
     function changeval(newval: any) {
-      // console.log(' ½½½½½½½ changeval', newval)
-      if (props.multiselect_by_server) {
+      console.log(' ½½½½½½½ changeval', newval)
+      if (props.multiple || props.multiselect_by_server) {
         // localStorage.setItem(props.tablesel + '_' + newval, valori.value[newval])
         myarrvalue.value = newval && newval['arrvalue'] ? newval['arrvalue'] : newval
         saveOptInCookie(newval)
@@ -249,9 +254,9 @@ export default defineComponent({
         }
         // }
       }
+      console.log('@@@ VALORI CHANGED (4)', valori.value)
       if (!props.multiselect_by_server) {
         valori.value = valoriload.value
-        console.log('@@@ VALORI CHANGED (4)', valori.value)
       } else {
         valori.value = arrtempOpt.value
       }
@@ -260,50 +265,34 @@ export default defineComponent({
 
     function filterFn(val: any, update: any, abort: any) {
       update(
-        () => {
+         async () => {
           console.log('Filter val', val, val.length)
           let myarr: any = []
 
           if (val.length <= 1) {
-            valori.value = arrtempOpt.value
+            console.log('@@@ LENGTH <= 1')
+            abort()
             return
           }
 
           let mystr = val.toLocaleLowerCase()
 
-          console.log('props.tablesel', props.tablesel)
+          // console.log('props.tablesel', props.tablesel)
 
           if (fieldsTable.tableRemotePickup.includes(props.tablesel)) {
             try {
+              myarr = props.options
               if (mystr !== '')
-                return globalStore.loadPickup({ table: props.tablesel, search: mystr })
-                  .then((ris) => {
-                    myarr = props.options
-                    if (ris) {
-                      if (props.addall) {
-                        let myobj: any = {}
-                        if (typeof props.optlab === 'string') {
-                          myobj[props.optlab] = '(Tutti)'
-                          myobj[props.optval] = costanti.FILTER_TUTTI
-                        }
-
-                        ris = [myobj, ...ris]
-                      }
-                      valori.value = ris
-                      if (props.multiselect_by_server) {
-                        console.log('@@@ VALORI CHANGED (2)', valori.value)
-                      }
-                    }
-
-                  })
+                // myarr = [{_id:1, prov: 'RN', descr: 'Rimini'}]
+                myarr = await globalStore.loadPickup({ table: props.tablesel, search: mystr.trim() })
 
               if (myarr === null) {
+                console.log('@@@ VALORI VALUE XXX', valori.value)
                 valori.value = arrtempOpt.value
-                return
               }
             } catch (e) {
+              console.log('@@@ VALORI VALUE XXX', valori.value)
               valori.value = arrtempOpt.value
-              return
             }
             // const needle = val.toLocaleLowerCase()
             // optFiltered.value = optFiltered.value.filter((v: any) => v.toLocaleLowerCase().indexOf(needle) > -1)
@@ -332,6 +321,7 @@ export default defineComponent({
         },
         // "ref" is the Vue reference to the QSelect
         (ref: any) => {
+           // console.log('ref.options', ref.options)
           if (val !== '' && ref.options.length > 0) {
             ref.setOptionIndex(-1) // reset optionIndex in case there is something selected
             ref.moveOptionSelection(1, true) // focus the first selectable option and do not update the input-value
diff --git a/src/components/CMySelect/CMySelect.vue b/src/components/CMySelect/CMySelect.vue
index f21a897a..54109484 100755
--- a/src/components/CMySelect/CMySelect.vue
+++ b/src/components/CMySelect/CMySelect.vue
@@ -9,7 +9,7 @@
         @filter="filterFn"
         @filter-abort="abortFilterFn"
         @update:model-value="changeval"
-        input-debounce="300"
+        input-debounce="600"
         rounded
         outlined
         multiple
@@ -66,29 +66,7 @@
       </q-select>
 
     </div>
-    <div v-else-if="useinput">
-      <q-select
-        :multiple="multiple"
-        rounded
-        outlined
-        v-bind="$attrs"
-        :input-class="myclass"
-        :model-value="myvalue"
-        :use-input="useinput"
-        input-debounce="0"
-        @new-value="newvaluefunc"
-        new-value-mode="add-unique"
-        map-options
-        emit-value
-        :options="valori"
-        :option-value="optval"
-        :option-label="optlab"
-        @update:model-value="changeval"
-        :label="label"
-        :dense="dense">
-      </q-select>
-    </div>
-    <div v-else>
+    <div v-else-if="pickup">
       <q-select
         v-if="pickup"
         filled
@@ -126,9 +104,67 @@
           </q-item>
         </template>
       </q-select>
+    </div>
+    <div v-else-if="multiple">
       <q-select
-        v-else
-        :multiple="multiple"
+        :multiple="true"
+        :model-value="myarrvalue"
+        label-color="primary"
+        :label="label"
+        @update:model-value="changeval"
+        rounded
+        outlined
+        v-bind="$attrs"
+        :input-class="myclass"
+        :use-input="useinput"
+        input-debounce="0"
+        @new-value="newvaluefunc"
+        new-value-mode="add-unique"
+        map-options
+        emit-value
+        stack-label
+        :options="valori"
+        :option-value="optval"
+        :option-label="optlab"
+        :dense="dense">
+
+        <template
+          v-slot:selected-item="scope">
+          <div v-if="scope.opt[optlab]">
+            <q-chip
+              removable
+              dense
+              @remove="scope.removeAtIndex(scope.index)"
+              v-if="checkIfShowRec(scope.opt)"
+              color="white"
+              text-color="mycol"
+              class="q-my-none q-ml-xs q-mr-none"
+            >
+              <q-avatar color="primary" text-color="white" :icon="scope.opt.icon ? scope.opt.icon : ''" size="12px"/>
+              {{ scope.opt[optlab] }}
+            </q-chip>
+          </div>
+        </template>
+        <template
+          v-if="withToggle"
+          v-slot:option="{ itemProps, opt, selected, toggleOption }">
+          <q-item v-bind="itemProps">
+
+            <q-item-section>
+              <q-item-label>{{ opt[optlab] }}</q-item-label>
+            </q-item-section>
+            <q-item-section side>
+              <q-toggle :model-value="selected" @update:value="toggleOption(opt)"/>
+            </q-item-section>
+          </q-item>
+        </template>
+
+      </q-select>
+
+    </div>
+    <div v-else>
+      <q-select
+        :multiple="false"
         rounded
         outlined
         :dense="dense"
diff --git a/src/components/CSkill/CSkill.vue b/src/components/CSkill/CSkill.vue
index 931f2607..0f111711 100755
--- a/src/components/CSkill/CSkill.vue
+++ b/src/components/CSkill/CSkill.vue
@@ -9,6 +9,7 @@
         prop_colkey="idSkill"
         col_title="subTitle"
         :vertical="true"
+        :choose_visutype="true"
         nodataLabel="Nessuna Competenza inserita"
         :prop_search="false"
         noresultLabel="Il filtro selezionato non ha trovato nessun risultato"
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 9207a994..f37c5f62 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -505,6 +505,12 @@ export interface IColGridTable {
   noshowifnone?: boolean
   notShowInNewRec?: boolean
   tablesel?: string
+  notsave?: boolean
+  maxlength?: number
+  filter_table?: string
+  filter_field?: string
+  field_extra1?: string
+  subfield_extra1?: string
 }
 
 export interface ITableRec {
@@ -527,6 +533,7 @@ export interface ISearchList {
   value: any
   type: number
   filter: any
+  param1?: any
   useinput: boolean
   notinsearch?: boolean
   addall?: boolean
diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts
index 2d3fa9fc..65ea193a 100755
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -26,6 +26,7 @@ export interface IUserProfile {
   link_payment?: string
   note_payment?: string
   username_telegram?: string
+  website?: string
   teleg_id?: number
   teleg_checkcode?: number
   paymenttypes?: IPaymentType[]
diff --git a/src/rootgen/admin/importdata/importdata.ts b/src/rootgen/admin/importdata/importdata.ts
index 4eefa6af..a9ae99e1 100755
--- a/src/rootgen/admin/importdata/importdata.ts
+++ b/src/rootgen/admin/importdata/importdata.ts
@@ -66,36 +66,36 @@ export default defineComponent({
 
       for (const rec of myarr) {
 
-        let lab = rec[0]
-        let val = rec[1]
+        let lab = tools.addslashes(rec[0])
+        let val = tools.addslashes(rec[1])
         if (cmd === shared_consts.Cmd.PROVINCE) {
-          val = rec[2]
 
           strris += '{ \n'
-          strris += '   label:\'' + lab + '\','
-          strris += '   value:\'' + val + '\','
+          strris += '   _id:' + ind + ','
+          strris += '   prov:\'' + val + '\','
+          strris += '   descr:\'' + lab + '\','
           strris += '}, \n'
 
         } else if (cmd === shared_consts.Cmd.COMUNI) {
           strris += '{ \n'
-          strris += '   istat:\'' + rec[0] + '\','
-          strris += '   comune:\'' + rec[1] + '\','
-          strris += '   prov:\'' + rec[2] + '\''
+          strris += '   istat:\'' + tools.addslashes(rec[0]) + '\','
+          strris += '   comune:\'' + tools.addslashes(rec[1]) + '\','
+          strris += '   prov:\'' + tools.addslashes(rec[2]) + '\''
 
         } else if (cmd === shared_consts.Cmd.CITIES_SERVER) {
           strris += '{ \n'
           strris += '   _id :' + ind + ',\n'
           strris += '   istat :\'' + rec[0] + '\'\n,'
-          strris += '   comune :\'' + rec[1] + '\'\n,'
+          strris += '   comune :\'' + tools.addslashes(rec[1]) + '\'\n,'
           strris += '   prov :\'' + rec[2] + '\'\n,'
-          strris += '   reg :\'' + rec[3] + '\'\n,'
-          strris += '   pref :\'' + rec[4] + '\'\n,'
+          strris += '   reg :\'' + tools.addslashes(rec[3]) + '\'\n,'
+          strris += '   pref :\'' + tools.addslashes(rec[4]) + '\'\n,'
           strris += '   cap :\'' + rec[5] + '\'\n,'
           strris += '   abitanti :\'' + rec[6] + '\'\n,'
           strris += '   country : \'IT\'\n'
           strris += '}, \n'
-          ind += 1
         }
+        ind += 1
 
       }
 
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index e6390a01..a4e1bda8 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -396,6 +396,7 @@ const msg_it = {
       iscrizioneincorso: 'Iscrizione in corso...',
       richiesto: 'Campo Richiesto',
       email: 'Email',
+      website: 'Sito Web',
       intcode_cell: 'Prefisso Int.',
       cell: 'Cellulare',
       cellreg: 'Cellulare con cui ti eri registrato',
@@ -486,6 +487,7 @@ const msg_it = {
       come_ci_hai_conosciuto: 'Come ci hai conosciuto?',
       photo: 'Foto',
       images: 'Immagini',
+      image: 'Immagine',
       err: {
         required: 'è richiesto',
         email: 'inserire una email valida',
@@ -732,6 +734,7 @@ const msg_it = {
       showinhome: 'Mostra nella Home',
       showinnewsletter: 'Mostra nella Newsletter',
       color: 'Colore del titolo',
+      testo_di_spiegazione: 'Testo di Spiegazione',
     },
     disc: {
       typol_code: 'Codice Tipologia',
@@ -802,6 +805,7 @@ const msg_it = {
       city: 'Città',
       photos: 'Foto',
       note: 'Note',
+      short_node: 'Breve Nota',
       subskill: 'Specializz.',
     },
     level: {
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 7ab2ce28..f89f89fd 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -54,6 +54,8 @@ function AddCol(params: IColGridTable) {
     sortable: (params.sortable === undefined) ? true : params.sortable,
     disable: (params.disable === undefined) ? false : params.disable,
     titlepopupedit: (params.titlepopupedit === undefined) ? '' : params.titlepopupedit,
+    field_extra1: (params.field_extra1 === undefined) ? '' : params.field_extra1,
+    subfield_extra1: (params.subfield_extra1 === undefined) ? '' : params.subfield_extra1,
     visible: (params.visible === undefined) ? true : params.visible,
     icon: (params.icon === undefined) ? '' : params.icon,
     action: (params.action === undefined) ? '' : params.action,
@@ -69,6 +71,10 @@ function AddCol(params: IColGridTable) {
     filter: (params.filter === undefined) ? null : params.filter,
     noshowifnone: (params.noshowifnone === undefined) ? false : params.noshowifnone,
     notShowInNewRec: (params.notShowInNewRec === undefined) ? false : params.notShowInNewRec,
+    notsave: (params.notsave === undefined) ? false : params.notsave,
+    filter_table: (params.filter_table === undefined) ? '' : params.filter_table,
+    maxlength: (params.maxlength === undefined) ? 0 : params.maxlength,
+    filter_field: (params.filter_field === undefined) ? '' : params.filter_field,
   }
 }
 
@@ -343,6 +349,14 @@ export const colCitys = [
   AddCol(DuplicateRec),
 ]
 
+export const colProvinces = [
+  // AddCol({ name: '_id', label_trans: 'index', fieldtype: costanti.FieldType.number }),
+  AddCol({ name: 'label', label_trans: 'store.description' }),
+  AddCol({ name: 'value', label_trans: 'city.prov' }),
+  AddCol(DeleteRec),
+  AddCol(DuplicateRec),
+]
+
 export const colTableCountry = [
   AddCol({ name: 'id', label_trans: 'index', fieldtype: costanti.FieldType.string }),
   AddCol({ name: 'value', label_trans: 'city.country' }),
@@ -409,12 +423,22 @@ export const colmySkills = [
   //AddCol({ name: 'name', label_trans: 'reg.name', fieldtype: costanti.FieldType.string }),
   //AddCol({ name: 'surname', label_trans: 'reg.surname', fieldtype: costanti.FieldType.string }),
   AddCol({ name: 'username', label_trans: 'reg.username', foredit: false, tipovisu: costanti.TipoVisu.LINK, link: '/my/username' }),
+  /*AddCol({
+    name: 'idSector',
+    label_trans: 'sectors.name',
+    fieldtype: costanti.FieldType.select,
+    required: true,
+    jointable: 'sectors',
+
+  }), */
+  AddCol({ name: 'subTitle', label_trans: 'event.title', fieldtype: costanti.FieldType.string, noshowifnone: true, maxlength: 40 }),
   AddCol({
     name: 'idSkill',
     label_trans: 'skill.name',
     fieldtype: costanti.FieldType.select,
     required: true,
     jointable: 'skills',
+    // filter_table: 'sectors',
   }),
   AddCol({
     name: 'idSubSkill',
@@ -422,6 +446,8 @@ export const colmySkills = [
     fieldtype: costanti.FieldType.multiselect,
     required: true,
     jointable: 'subskills',
+    filter_table: 'skills',
+    filter_field: 'idSkill',
   }),
   AddCol({
     name: 'numLevel',
@@ -459,8 +485,8 @@ export const colmySkills = [
     jointable: '',
     noshowifnone: true,
   }),
-  AddCol({ name: 'subTitle', label_trans: 'skill.note', fieldtype: costanti.FieldType.string }),
-  AddCol({ name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html, noshowifnone: true }),
+  AddCol({ name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html, noshowifnone: true,
+    titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '' }),
   AddCol(DuplicateRec),
   AddCol(ModifRec),
   AddCol(DeleteRec),
@@ -1789,6 +1815,14 @@ export const fieldsTable = {
       collabel: 'comune',
       remote: true,
     },
+    {
+      value: 'provinces',
+      label: 'Provincia',
+      columns: colTablePermission,
+      colkey: 'value',
+      collabel: 'label',
+      remote: true,
+    },
     {
       value: 'countries',
       label: 'Nazione',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 9136670a..f4dae790 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -4484,7 +4484,7 @@ export const tools = {
         '(?:\"([^\"]*(?:\"\"[^\"]*)*)\"|' +
 
         // Standard fields.
-        '([^\'\\' + strDelimiter + '\\r\\n]*))'
+        '([^\"\\' + strDelimiter + '\\r\\n]*))'
       ),
       'gi'
     )
@@ -4551,6 +4551,33 @@ export const tools = {
     return (arrData)
   },
 
+  getValue(myrow: any, field: string, subfield: string) {
+    let myvalue = ''
+    if (subfield !== '') {
+      if (myrow[field] === undefined) {
+        myrow[field] = {}
+        myvalue = ''
+      } else {
+        myvalue = myrow[field][subfield]
+      }
+    } else {
+      if (field !== '')
+        myvalue = myrow[field]
+      else {
+        // @ts-ignore
+        myvalue = myrow
+      }
+    }
+    if (Array.isArray(myvalue)) {
+      return myvalue.length > 0 ? myvalue : ''
+    } else {
+      return myvalue
+    }
+  },
+  addslashes(str: string) {
+    return (str + '').replace(/[\\"']/g, '\\$&').replace(/\u0000/g, '\\0')
+  },
+
 
 // getLocale() {
   //   if (navigator.languages && navigator.languages.length > 0) {
diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts
index ee5db2ee..63951c10 100644
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -725,7 +725,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
         })
     },
 
-    async loadPickup(params: IParamsPickup) {
+    loadPickup(params: IParamsPickup) {
       console.log('loadPickup', params)
       const userStore = useUserStore()
 
@@ -1295,6 +1295,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
       if (table === 'visibility') return shared_consts.Visibility
       if (table === 'lang') return shared_consts.Lang
       if (table === 'regions') return shared_consts.Regions
+      if (table === 'provinces') return shared_consts.Provinces
 
       let myarr = this.getListByTable(table)
 
diff --git a/src/views/user/editprofile/editprofile.vue b/src/views/user/editprofile/editprofile.vue
index 03811e86..c9f320ee 100755
--- a/src/views/user/editprofile/editprofile.vue
+++ b/src/views/user/editprofile/editprofile.vue
@@ -36,6 +36,8 @@
             mysubkey="username_telegram"
             :type="costanti.FieldType.string">
           </CMyFieldDb>
+        </div>
+        <div class="row">
           <CMyFieldDb
             :title="$t('reg.email')"
             table="users"
@@ -43,6 +45,13 @@
             :disable="true"
             :type="costanti.FieldType.string">
           </CMyFieldDb>
+          <CMyFieldDb
+            :title="$t('reg.website')"
+            table="users"
+            mykey="profile"
+            mysubkey="website"
+            :type="costanti.FieldType.string">
+          </CMyFieldDb>
         </div>
 
         <br/>
diff --git a/src/views/user/myfriends/myfriends.vue b/src/views/user/myfriends/myfriends.vue
index 6fc39caa..8309ff5c 100755
--- a/src/views/user/myfriends/myfriends.vue
+++ b/src/views/user/myfriends/myfriends.vue
@@ -15,6 +15,7 @@
         :prop_search="true"
         hint="Username da trovare"
         :finder="true"
+        :choose_visutype="true"
         :finder_noNull="true"
         :options="shared_consts.OPTIONS_SEARCH_ONLY_FULL_WORDS"
         :butt_modif_new="false"
diff --git a/src/views/user/myprofile/myprofile.ts b/src/views/user/myprofile/myprofile.ts
index 060c72bd..2f63429a 100755
--- a/src/views/user/myprofile/myprofile.ts
+++ b/src/views/user/myprofile/myprofile.ts
@@ -78,6 +78,16 @@ export default defineComponent({
       }
     }
 
+    function getLinkWebSite() {
+      let site = myuser.value.profile.website!
+      if (site) {
+        if (!site.startsWith('http')) {
+          site = 'https://' + site
+        }
+      }
+      return site
+    }
+
     onMounted(mounted)
 
     return {
@@ -90,6 +100,7 @@ export default defineComponent({
       getImgUser,
       checkifShow,
       getLinkUserTelegram,
+      getLinkWebSite,
       filtroutente,
       showPic,
       myusername,
diff --git a/src/views/user/myprofile/myprofile.vue b/src/views/user/myprofile/myprofile.vue
index da2e75f2..775c29a0 100755
--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -19,7 +19,9 @@
       </div>
       <div class="col-12 text-h7">
         <span v-if="myuser.profile.born_city">{{ myuser.profile.born_city }}</span> <span
-        v-if="myuser.profile.nationality && myuser.profile.nationality !== 'Italia'">({{ myuser.profile.nationality }})</span>
+        v-if="myuser.profile.nationality && myuser.profile.nationality !== 'Italia'">({{
+          myuser.profile.nationality
+        }})</span>
       </div>
 
       <div v-if="myuser.username !== userStore.my.username">
@@ -52,16 +54,29 @@
         to="/editprofile">
       </q-btn>
 
-      <div class="col-12 row justify-evenly q-mt-md">
-        <q-btn
-          v-if="getLinkUserTelegram()" icon="fab fa-telegram"
-          color="blue" type="a"
-          size="md"
-          rounded
-          :label="$t('msgs.message')"
-          :href="getLinkUserTelegram()" target="__blank">
-        </q-btn>
+      <div class="row justify-evenly q-pa-sm q-ma-sm">
 
+        <div class="col-md-6 q-mx-sm">
+          <q-btn
+            v-if="getLinkUserTelegram()" icon="fab fa-telegram"
+            color="blue" type="a"
+            size="md"
+            rounded
+            :label="$t('msgs.message')"
+            :href="getLinkUserTelegram()" target="__blank">
+          </q-btn>
+
+        </div>
+        <div class="col-md-6 q-mx-sm">
+          <q-btn
+            v-if="getLinkWebSite()" icon="fas fa-globe"
+            color="blue" type="a"
+            size="md"
+            rounded
+            :label="$t('reg.website')"
+            :href="getLinkWebSite()" target="__blank">
+          </q-btn>
+        </div>
       </div>
     </div>
     <div v-else class="fit column no-wrap justify-evenly items-center content-start">
diff --git a/yarn.lock b/yarn.lock
index e33b4fb7..009dd3c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,21 +1486,19 @@
     promise-limit "^2.5.0"
     puppeteer "^1.7.0"
 
-"@quasar/app@^3.2.6":
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/@quasar/app/-/app-3.2.6.tgz#afb648683f33781c059fdaed431b54178b4b2328"
-  integrity sha512-SITUEWo4oNzvUSegsGmPySvRCu54oSMG8AGdLRkdaFbGC11QY6XB3PyE1jHaWOXWoY+o59FvOBML56TW9eWtHg==
+"@quasar/app@^3.2.9":
+  version "3.2.9"
+  resolved "https://registry.yarnpkg.com/@quasar/app/-/app-3.2.9.tgz#2205a9108886ab0e821013420b27d499aab2ebd5"
+  integrity sha512-HQ6C7yF6dMMs9t3mT95s0tr1HKp22jfse4LL3sLBkwExcXsSNxcmVZTQozb/XtCFgaHzWLzAKv3qIv86f/MFrw==
   dependencies:
     "@quasar/babel-preset-app" "2.0.1"
     "@quasar/fastclick" "1.1.4"
     "@quasar/ssr-helpers" "2.1.1"
-    "@types/compression-webpack-plugin" "9.1.1"
     "@types/cordova" "0.0.34"
     "@types/express" "4.17.13"
     "@types/webpack-bundle-analyzer" "4.4.1"
-    "@types/webpack-dev-server" "4.5.0"
     archiver "5.3.0"
-    autoprefixer "10.4.0"
+    autoprefixer "10.4.2"
     browserslist "^4.12.0"
     chalk "4.1.2"
     chokidar "3.5.2"
@@ -1510,12 +1508,12 @@
     cross-spawn "7.0.3"
     css-loader "5.2.6"
     css-minimizer-webpack-plugin "3.3.1"
-    cssnano "5.0.14"
+    cssnano "5.0.15"
     dot-prop "6.0.1"
     elementtree "0.1.7"
     error-stack-parser "2.0.6"
     express "4.17.2"
-    fast-glob "3.2.7"
+    fast-glob "3.2.11"
     file-loader "6.2.0"
     fork-ts-checker-webpack-plugin "6.5.0"
     fs-extra "10.0.0"
@@ -1544,10 +1542,10 @@
     sass "1.32.12"
     sass-loader "12.4.0"
     semver "7.3.5"
-    table "6.7.5"
+    table "6.8.0"
     terser-webpack-plugin "5.3.0"
     ts-loader "9.2.6"
-    typescript "4.4.2"
+    typescript "4.5.4"
     url-loader "4.1.1"
     vue "^3.2.24"
     vue-loader "16.8.3"
@@ -1556,7 +1554,7 @@
     webpack "^5.58.1"
     webpack-bundle-analyzer "4.5.0"
     webpack-chain "6.5.1"
-    webpack-dev-server "4.7.1"
+    webpack-dev-server "4.7.3"
     webpack-merge "5.8.0"
     webpack-node-externals "3.0.0"
 
@@ -1586,10 +1584,10 @@
     core-js "^3.6.5"
     core-js-compat "^3.6.5"
 
-"@quasar/extras@^1.12.3":
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.12.3.tgz#a8727c9e97ebe44fb4c9ed437cab1446ee6a8c30"
-  integrity sha512-BIWpysRnHqbroPnCtWQPNUdhLo97p45RC7J+SVgJH3hdsCHkwJTBMAwaw1522SJn+nEkrPKq1YLm0MgAYmPvvw==
+"@quasar/extras@^1.12.4":
+  version "1.12.4"
+  resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.12.4.tgz#6058b8cc71d8f1b4444c6a9ba7bca392171f7af3"
+  integrity sha512-a5yIWDzuhH9mwB+TnJs70gLjydUjxzxyGk0MuXfgdXNOVcb5qhZhuPvPx7JrUCQn5N3Jh0cO3+KA4CKCwcpYug==
 
 "@quasar/fastclick@1.1.4":
   version "1.1.4"
@@ -1744,13 +1742,6 @@
     "@types/connect" "*"
     "@types/node" "*"
 
-"@types/bonjour@*":
-  version "3.5.9"
-  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.9.tgz#3cc4e5135dbb5940fc6051604809234612f89cb4"
-  integrity sha512-VkZUiYevvtPyFu5XtpYw9a8moCSzxgjs5PAFF4yXjA7eYHvzBlXe+eJdqBBNWWVzI1r7Ki0KxMYvaQuhm+6f5A==
-  dependencies:
-    "@types/node" "*"
-
 "@types/bonjour@^3.5.9":
   version "3.5.10"
   resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275"
@@ -1758,14 +1749,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/compression-webpack-plugin@9.1.1":
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/@types/compression-webpack-plugin/-/compression-webpack-plugin-9.1.1.tgz#c73bf509c13e51fe05e0b84722ed88503cfa3bcc"
-  integrity sha512-cCZFFPFgZ42nWv+uHNgUenQl4gjo+oIvdPwLkGnsJBD6IpaN8dKxanLksHtc5fvlo74a5/sOuX6H320r/GROUw==
-  dependencies:
-    compression-webpack-plugin "*"
-
-"@types/connect-history-api-fallback@*", "@types/connect-history-api-fallback@^1.3.5":
+"@types/connect-history-api-fallback@^1.3.5":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
   integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==
@@ -1965,7 +1949,7 @@
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
   integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
 
-"@types/serve-index@*", "@types/serve-index@^1.9.1":
+"@types/serve-index@^1.9.1":
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
   integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==
@@ -2020,30 +2004,6 @@
     tapable "^2.2.0"
     webpack "^5"
 
-"@types/webpack-dev-middleware@*":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@types/webpack-dev-middleware/-/webpack-dev-middleware-5.0.2.tgz#0f66566c2ca7d484891b4552c8a7b64a3044e3e2"
-  integrity sha512-S3WUtef//Vx6WETyWZkM45WqgRxWSaqbpWtPcKySNRhiQNyhCqM9EueggaMX3L9N2IbG4dJIK5PgYcAWUifUbA==
-  dependencies:
-    "@types/connect" "*"
-    tapable "^2.1.1"
-    webpack "^5.38.1"
-
-"@types/webpack-dev-server@4.5.0":
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-4.5.0.tgz#52a983de97db81a38b7309a8cf8a730c3e02f28e"
-  integrity sha512-HMb6pZPANObue3LwbdpQLWzQyF9O0wntiPyXj4vGutlAbNKTXH4hDCHaZyfvfZDmFn+5HprrWHm1TGt3awNr/A==
-  dependencies:
-    "@types/bonjour" "*"
-    "@types/connect-history-api-fallback" "*"
-    "@types/express" "*"
-    "@types/serve-index" "*"
-    "@types/serve-static" "*"
-    "@types/webpack-dev-middleware" "*"
-    chokidar "^3.5.1"
-    http-proxy-middleware "^2.0.0"
-    webpack "*"
-
 "@types/ws@^8.2.2":
   version "8.2.2"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.2.2.tgz#7c5be4decb19500ae6b3d563043cd407bf366c21"
@@ -2063,13 +2023,14 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^5.7.0":
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.7.0.tgz#12d54709f8ea1da99a01d8a992cd0474ad0f0aa9"
-  integrity sha512-8RTGBpNn5a9M628wBPrCbJ+v3YTEOE2qeZb7TDkGKTDXSj36KGRg92SpFFaR/0S3rSXQxM0Og/kV9EyadsYSBg==
+"@typescript-eslint/eslint-plugin@^5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz#e90afea96dff8620892ad216b0e4ccdf8ee32d3a"
+  integrity sha512-XXVKnMsq2fuu9K2KsIxPUGqb6xAImz8MEChClbXmE3VbveFtBUU5bzM6IPVWqzyADIgdkS2Ws/6Xo7W2TeZWjQ==
   dependencies:
-    "@typescript-eslint/experimental-utils" "5.7.0"
-    "@typescript-eslint/scope-manager" "5.7.0"
+    "@typescript-eslint/scope-manager" "5.10.0"
+    "@typescript-eslint/type-utils" "5.10.0"
+    "@typescript-eslint/utils" "5.10.0"
     debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
@@ -2077,60 +2038,69 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@5.7.0":
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.7.0.tgz#2b1633e6613c3238036156f70c32634843ad034f"
-  integrity sha512-u57eZ5FbEpzN5kSjmVrSesovWslH2ZyNPnaXQMXWgH57d5+EVHEt76W75vVuI9qKZ5BMDKNfRN+pxcPEjQjb2A==
+"@typescript-eslint/parser@^5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.10.0.tgz#8f59e036f5f1cffc178cacbd5ccdd02aeb96c91c"
+  integrity sha512-pJB2CCeHWtwOAeIxv8CHVGJhI5FNyJAIpx5Pt72YkK3QfEzt6qAlXZuyaBmyfOdM62qU0rbxJzNToPTVeJGrQw==
   dependencies:
-    "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.7.0"
-    "@typescript-eslint/types" "5.7.0"
-    "@typescript-eslint/typescript-estree" "5.7.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
-
-"@typescript-eslint/parser@^5.7.0":
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.7.0.tgz#4dca6de463d86f02d252e681136a67888ea3b181"
-  integrity sha512-m/gWCCcS4jXw6vkrPQ1BjZ1vomP01PArgzvauBqzsoZ3urLbsRChexB8/YV8z9HwE3qlJM35FxfKZ1nfP/4x8g==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.7.0"
-    "@typescript-eslint/types" "5.7.0"
-    "@typescript-eslint/typescript-estree" "5.7.0"
+    "@typescript-eslint/scope-manager" "5.10.0"
+    "@typescript-eslint/types" "5.10.0"
+    "@typescript-eslint/typescript-estree" "5.10.0"
     debug "^4.3.2"
 
-"@typescript-eslint/scope-manager@5.7.0":
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.7.0.tgz#70adf960e5a58994ad50438ba60d98ecadd79452"
-  integrity sha512-7mxR520DGq5F7sSSgM0HSSMJ+TFUymOeFRMfUfGFAVBv8BR+Jv1vHgAouYUvWRZeszVBJlLcc9fDdktxb5kmxA==
+"@typescript-eslint/scope-manager@5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz#bb5d872e8b9e36203908595507fbc4d3105329cb"
+  integrity sha512-tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg==
   dependencies:
-    "@typescript-eslint/types" "5.7.0"
-    "@typescript-eslint/visitor-keys" "5.7.0"
+    "@typescript-eslint/types" "5.10.0"
+    "@typescript-eslint/visitor-keys" "5.10.0"
 
-"@typescript-eslint/types@5.7.0":
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.7.0.tgz#2d4cae0105ba7d08bffa69698197a762483ebcbe"
-  integrity sha512-5AeYIF5p2kAneIpnLFve8g50VyAjq7udM7ApZZ9JYjdPjkz0LvODfuSHIDUVnIuUoxafoWzpFyU7Sqbxgi79mA==
-
-"@typescript-eslint/typescript-estree@5.7.0":
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.7.0.tgz#968fad899050ccce4f08a40cd5fabc0798525006"
-  integrity sha512-aO1Ql+izMrTnPj5aFFlEJkpD4jRqC4Gwhygu2oHK2wfVQpmOPbyDSveJ+r/NQo+PWV43M6uEAeLVbTi09dFLhg==
+"@typescript-eslint/type-utils@5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz#8524b9479c19c478347a7df216827e749e4a51e5"
+  integrity sha512-TzlyTmufJO5V886N+hTJBGIfnjQDQ32rJYxPaeiyWKdjsv2Ld5l8cbS7pxim4DeNs62fKzRSt8Q14Evs4JnZyQ==
   dependencies:
-    "@typescript-eslint/types" "5.7.0"
-    "@typescript-eslint/visitor-keys" "5.7.0"
+    "@typescript-eslint/utils" "5.10.0"
+    debug "^4.3.2"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/types@5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.10.0.tgz#beb3cb345076f5b088afe996d57bcd1dfddaa75c"
+  integrity sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ==
+
+"@typescript-eslint/typescript-estree@5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz#4be24a3dea0f930bb1397c46187d0efdd955a224"
+  integrity sha512-x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA==
+  dependencies:
+    "@typescript-eslint/types" "5.10.0"
+    "@typescript-eslint/visitor-keys" "5.10.0"
     debug "^4.3.2"
     globby "^11.0.4"
     is-glob "^4.0.3"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@5.7.0":
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.7.0.tgz#e05164239eb7cb8aa9fa06c516ede480ce260178"
-  integrity sha512-hdohahZ4lTFcglZSJ3DGdzxQHBSxsLVqHzkiOmKi7xVAWC4y2c1bIMKmPJSrA4aOEoRUPOKQ87Y/taC7yVHpFg==
+"@typescript-eslint/utils@5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.10.0.tgz#c3d152a85da77c400e37281355561c72fb1b5a65"
+  integrity sha512-IGYwlt1CVcFoE2ueW4/ioEwybR60RAdGeiJX/iDAw0t5w0wK3S7QncDwpmsM70nKgGTuVchEWB8lwZwHqPAWRg==
   dependencies:
-    "@typescript-eslint/types" "5.7.0"
+    "@types/json-schema" "^7.0.9"
+    "@typescript-eslint/scope-manager" "5.10.0"
+    "@typescript-eslint/types" "5.10.0"
+    "@typescript-eslint/typescript-estree" "5.10.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+
+"@typescript-eslint/visitor-keys@5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz#770215497ad67cd15a572b52089991d5dfe06281"
+  integrity sha512-GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ==
+  dependencies:
+    "@typescript-eslint/types" "5.10.0"
     eslint-visitor-keys "^3.0.0"
 
 "@vue/compat@^3.2.26":
@@ -2337,10 +2307,10 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.26.tgz#7acd1621783571b9a82eca1f041b4a0a983481d9"
   integrity sha512-vPV6Cq+NIWbH5pZu+V+2QHE9y1qfuTq49uNWw4f7FDEeZaDU2H2cx5jcUZOAKW7qTrUS4k6qZPbMy1x4N96nbA==
 
-"@vuelidate/core@^2.0.0-alpha.33":
-  version "2.0.0-alpha.33"
-  resolved "https://registry.yarnpkg.com/@vuelidate/core/-/core-2.0.0-alpha.33.tgz#2a5dd948747d638cffbe27fc604897b971711a56"
-  integrity sha512-1u+nP5qYjeWm7S8ezAlHeEy15rMawOFsMFsmZL5F2BhI0eVnBBSrSzsq7V+Fz2kathFdHvl2fBdkY5JXtvjjRw==
+"@vuelidate/core@^2.0.0-alpha.34":
+  version "2.0.0-alpha.34"
+  resolved "https://registry.yarnpkg.com/@vuelidate/core/-/core-2.0.0-alpha.34.tgz#4a2ce2ae18c8ffadb76b296b2c7c0e10a2f48a37"
+  integrity sha512-8SHViBA+bBaXGH8UwcdGG7vEQ8mG8rhtsddJiq9Abz9YvzWxFxd8spAhe9ggfCtyRuvwCCpPbxx63NOGThVZkQ==
   dependencies:
     vue-demi "^0.12.0"
 
@@ -2630,11 +2600,6 @@ ansi-align@^3.0.0:
   dependencies:
     string-width "^4.1.0"
 
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
 ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
@@ -2943,19 +2908,7 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@10.4.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.0.tgz#c3577eb32a1079a440ec253e404eaf1eb21388c8"
-  integrity sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==
-  dependencies:
-    browserslist "^4.17.5"
-    caniuse-lite "^1.0.30001272"
-    fraction.js "^4.1.1"
-    normalize-range "^0.1.2"
-    picocolors "^1.0.0"
-    postcss-value-parser "^4.1.0"
-
-autoprefixer@^10.4.2:
+autoprefixer@10.4.2, autoprefixer@^10.4.2:
   version "10.4.2"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.2.tgz#25e1df09a31a9fba5c40b578936b90d35c9d4d3b"
   integrity sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==
@@ -3601,7 +3554,7 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001283.tgz#741a42721d387d9980228288820bbf9dd5751f3c"
   integrity sha512-xEAlBjCxAdtEc05VVrNJQdDvY7jfOx1QiVbmEavio5DSM/hAypRz7pqKyVF0o9uaDX4j8bAjKieLIfTHRfANgA==
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001280:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001280:
   version "1.0.30001283"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001283.tgz#8573685bdae4d733ef18f78d44ba0ca5fe9e896b"
   integrity sha512-9RoKo841j1GQFSJz/nCXOj0sD7tHBtlowjYlrqIUS812x9/emfBLBt6IyMz1zIaYc/eRL8Cs6HPUVi2Hzq4sIg==
@@ -3654,7 +3607,7 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@3.5.2, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.2, chokidar@^3.5.1, chokidar@^3.5.2:
+chokidar@3.5.2, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.2, chokidar@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
   integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
@@ -4029,7 +3982,7 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.43.0 < 2"
 
-compression-webpack-plugin@*, compression-webpack-plugin@9.2.0:
+compression-webpack-plugin@9.2.0:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-9.2.0.tgz#57fd539d17c5907eebdeb4e83dcfe2d7eceb9ef6"
   integrity sha512-R/Oi+2+UHotGfu72fJiRoVpuRifZT0tTC6UqFD/DUo+mv8dbOow9rVOuTvDv5nPPm3GZhHL/fKkwxwIHnJ8Nyw==
@@ -4171,10 +4124,10 @@ core-js-compat@^3.18.0, core-js-compat@^3.19.1, core-js-compat@^3.6.5:
     browserslist "^4.18.1"
     semver "7.0.0"
 
-core-js@^3.20.2:
-  version "3.20.2"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.2.tgz#46468d8601eafc8b266bd2dd6bf9dee622779581"
-  integrity sha512-nuqhq11DcOAbFBV4zCbKeGbKQsUDRqTX0oqx7AttUBuqe3h20ixsE039QHelbL6P4h+9kytVqyEtyZ6gsiwEYw==
+core-js@^3.20.3:
+  version "3.20.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.3.tgz#c710d0a676e684522f3db4ee84e5e18a9d11d69a"
+  integrity sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==
 
 core-js@^3.6.5:
   version "3.19.2"
@@ -4372,6 +4325,41 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
+cssnano-preset-default@^5.1.10:
+  version "5.1.11"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.11.tgz#db10fb1ecee310e8285c5aca45bd8237be206828"
+  integrity sha512-ETet5hqHxmzQq2ynXMOQofKuLm7VOjMiOB7E2zdtm/hSeCKlD9fabzIUV4GoPcRyJRHi+4kGf0vsfGYbQ4nmPw==
+  dependencies:
+    css-declaration-sorter "^6.0.3"
+    cssnano-utils "^3.0.1"
+    postcss-calc "^8.2.0"
+    postcss-colormin "^5.2.4"
+    postcss-convert-values "^5.0.3"
+    postcss-discard-comments "^5.0.2"
+    postcss-discard-duplicates "^5.0.2"
+    postcss-discard-empty "^5.0.2"
+    postcss-discard-overridden "^5.0.3"
+    postcss-merge-longhand "^5.0.5"
+    postcss-merge-rules "^5.0.5"
+    postcss-minify-font-values "^5.0.3"
+    postcss-minify-gradients "^5.0.5"
+    postcss-minify-params "^5.0.4"
+    postcss-minify-selectors "^5.1.2"
+    postcss-normalize-charset "^5.0.2"
+    postcss-normalize-display-values "^5.0.2"
+    postcss-normalize-positions "^5.0.3"
+    postcss-normalize-repeat-style "^5.0.3"
+    postcss-normalize-string "^5.0.3"
+    postcss-normalize-timing-functions "^5.0.2"
+    postcss-normalize-unicode "^5.0.3"
+    postcss-normalize-url "^5.0.4"
+    postcss-normalize-whitespace "^5.0.3"
+    postcss-ordered-values "^5.0.4"
+    postcss-reduce-initial "^5.0.2"
+    postcss-reduce-transforms "^5.0.3"
+    postcss-svgo "^5.0.3"
+    postcss-unique-selectors "^5.0.3"
+
 cssnano-preset-default@^5.1.8:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.8.tgz#7525feb1b72f7b06e57f55064cbdae341d79dea2"
@@ -4407,57 +4395,22 @@ cssnano-preset-default@^5.1.8:
     postcss-svgo "^5.0.3"
     postcss-unique-selectors "^5.0.2"
 
-cssnano-preset-default@^5.1.9:
-  version "5.1.10"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.10.tgz#9350765fdf3c49bf78fac7673354fa58fa95daa4"
-  integrity sha512-BcpSzUVygHMOnp9uG5rfPzTOCb0GAHQkqtUQx8j1oMNF9A1Q8hziOOhiM4bdICpmrBIU85BE64RD5XGYsVQZNA==
-  dependencies:
-    css-declaration-sorter "^6.0.3"
-    cssnano-utils "^3.0.0"
-    postcss-calc "^8.2.0"
-    postcss-colormin "^5.2.3"
-    postcss-convert-values "^5.0.2"
-    postcss-discard-comments "^5.0.1"
-    postcss-discard-duplicates "^5.0.1"
-    postcss-discard-empty "^5.0.1"
-    postcss-discard-overridden "^5.0.2"
-    postcss-merge-longhand "^5.0.4"
-    postcss-merge-rules "^5.0.4"
-    postcss-minify-font-values "^5.0.2"
-    postcss-minify-gradients "^5.0.4"
-    postcss-minify-params "^5.0.3"
-    postcss-minify-selectors "^5.1.1"
-    postcss-normalize-charset "^5.0.1"
-    postcss-normalize-display-values "^5.0.2"
-    postcss-normalize-positions "^5.0.2"
-    postcss-normalize-repeat-style "^5.0.2"
-    postcss-normalize-string "^5.0.2"
-    postcss-normalize-timing-functions "^5.0.2"
-    postcss-normalize-unicode "^5.0.2"
-    postcss-normalize-url "^5.0.4"
-    postcss-normalize-whitespace "^5.0.2"
-    postcss-ordered-values "^5.0.3"
-    postcss-reduce-initial "^5.0.2"
-    postcss-reduce-transforms "^5.0.2"
-    postcss-svgo "^5.0.3"
-    postcss-unique-selectors "^5.0.2"
-
 cssnano-utils@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz#8660aa2b37ed869d2e2f22918196a9a8b6498ce2"
   integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==
 
-cssnano-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.0.0.tgz#c0b9fcd6e4f05c5155b07e9ab11bf94b97163057"
-  integrity sha512-Pzs7/BZ6OgT+tXXuF12DKR8SmSbzUeVYCtMBbS8lI0uAm3mrYmkyqCXXPsQESI6kmLfEVBppbdVY/el3hg3nAA==
+cssnano-utils@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.0.1.tgz#d3cc0a142d3d217f8736837ec0a2ccff6a89c6ea"
+  integrity sha512-VNCHL364lh++/ono+S3j9NlUK+d97KNkxI77NlqZU2W3xd2/qmyN61dsa47pTpb55zuU4G4lI7qFjAXZJH1OAQ==
 
-cssnano@5.0.14:
-  version "5.0.14"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.14.tgz#99bc550f663b48c38e9b8e0ae795697c9de84b47"
-  integrity sha512-qzhRkFvBhv08tbyKCIfWbxBXmkIpLl1uNblt8SpTHkgLfON5OCPX/CCnkdNmEosvo8bANQYmTTMEgcVBlisHaw==
+cssnano@5.0.15:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.15.tgz#8779eaf60e3665e6a12687c814d375cc9f78db76"
+  integrity sha512-ppZsS7oPpi2sfiyV5+i+NbB/3GtQ+ab2Vs1azrZaXWujUSN4o+WdTxlCZIMcT9yLW3VO/5yX3vpyDaQ1nIn8CQ==
   dependencies:
-    cssnano-preset-default "^5.1.9"
+    cssnano-preset-default "^5.1.10"
     lilconfig "^2.0.3"
     yaml "^1.10.2"
 
@@ -5084,13 +5037,6 @@ enhanced-resolve@^5.0.0, enhanced-resolve@^5.8.3:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
 entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
@@ -5383,10 +5329,15 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"
   integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
 
-eslint@^8.6.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.6.0.tgz#4318c6a31c5584838c1a2e940c478190f58d558e"
-  integrity sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==
+eslint-visitor-keys@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz#6fbb166a6798ee5991358bc2daa1ba76cc1254a1"
+  integrity sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==
+
+eslint@^8.7.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.7.0.tgz#22e036842ee5b7cf87b03fe237731675b4d3633c"
+  integrity sha512-ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w==
   dependencies:
     "@eslint/eslintrc" "^1.0.5"
     "@humanwhocodes/config-array" "^0.9.2"
@@ -5395,11 +5346,10 @@ eslint@^8.6.0:
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
     eslint-scope "^7.1.0"
     eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.1.0"
+    eslint-visitor-keys "^3.2.0"
     espree "^9.3.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
@@ -5408,7 +5358,7 @@ eslint@^8.6.0:
     functional-red-black-tree "^1.0.1"
     glob-parent "^6.0.1"
     globals "^13.6.0"
-    ignore "^4.0.6"
+    ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
@@ -5419,9 +5369,7 @@ eslint@^8.6.0:
     minimatch "^3.0.4"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
-    progress "^2.0.0"
     regexpp "^3.2.0"
-    semver "^7.2.1"
     strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
@@ -5721,7 +5669,18 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@3.2.7, fast-glob@^3.1.1, fast-glob@^3.2.7:
+fast-glob@3.2.11:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
+  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
+fast-glob@^3.1.1, fast-glob@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
   integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
@@ -5981,7 +5940,7 @@ fp-and-or@^0.1.3:
   resolved "https://registry.yarnpkg.com/fp-and-or/-/fp-and-or-0.1.3.tgz#e6fba83872a5853a56b3ebdf8d3167f5dfca1882"
   integrity sha512-wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g==
 
-fraction.js@^4.1.1, fraction.js@^4.1.2:
+fraction.js@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.2.tgz#13e420a92422b6cf244dff8690ed89401029fbe8"
   integrity sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA==
@@ -6761,6 +6720,11 @@ ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb"
   integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==
 
+ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
@@ -8946,10 +8910,10 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-forge@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
-  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
+node-forge@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c"
+  integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==
 
 node-gyp@^7.1.0:
   version "7.1.2"
@@ -9961,10 +9925,10 @@ postcss-colormin@^5.2.1:
     colord "^2.9.1"
     postcss-value-parser "^4.1.0"
 
-postcss-colormin@^5.2.3:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.3.tgz#da7fb80e81ad80d2867ea9e38672a892add5df15"
-  integrity sha512-dra4xoAjub2wha6RUXAgadHEn2lGxbj8drhFcIGLOMn914Eu7DkPUurugDXgstwttCYkJtZ/+PkWRWdp3UHRIA==
+postcss-colormin@^5.2.4:
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.4.tgz#7726d3f3d24f111d39faff50a6500688225d5324"
+  integrity sha512-rYlC5015aNqVQt/B6Cy156g7sH5tRUJGmT9xeagYthtKehetbKx7jHxhyLpulP4bs4vbp8u/B2rac0J7S7qPQg==
   dependencies:
     browserslist "^4.16.6"
     caniuse-api "^3.0.0"
@@ -9986,6 +9950,13 @@ postcss-convert-values@^5.0.2:
   dependencies:
     postcss-value-parser "^4.1.0"
 
+postcss-convert-values@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.3.tgz#492db08a28af84d57651f10edc8f6c8fb2f6df40"
+  integrity sha512-fVkjHm2T0PSMqXUCIhHNWVGjhB9mHEWX2GboVs7j3iCgr6FpIl9c/IdXy0PHWZSQ9LFTRgmj98amxJE6KOnlsA==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
 postcss-discard-comments@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
@@ -9998,6 +9969,11 @@ postcss-discard-comments@^5.0.1:
   resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe"
   integrity sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==
 
+postcss-discard-comments@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.2.tgz#811ed34e2b6c40713daab0beb4d7a04125927dcd"
+  integrity sha512-6VQ3pYTsJHEsN2Bic88Aa7J/Brn4Bv8j/rqaFQZkH+pcVkKYwxCIvoMQkykEW7fBjmofdTnQgcivt5CCBJhtrg==
+
 postcss-discard-duplicates@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
@@ -10010,6 +9986,11 @@ postcss-discard-duplicates@^5.0.1:
   resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d"
   integrity sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==
 
+postcss-discard-duplicates@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.2.tgz#61076f3d256351bdaac8e20aade730fef0609f44"
+  integrity sha512-LKY81YjUjc78p6rbXIsnppsaFo8XzCoMZkXVILJU//sK0DgPkPSpuq/cZvHss3EtdKvWNYgWzQL+wiJFtEET4g==
+
 postcss-discard-empty@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
@@ -10022,6 +10003,11 @@ postcss-discard-empty@^5.0.1:
   resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8"
   integrity sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==
 
+postcss-discard-empty@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.2.tgz#0676a9bcfc44bb00d338352a45ab80845a31d8f0"
+  integrity sha512-SxBsbTjlsKUvZLL+dMrdWauuNZU8TBq5IOL/DHa6jBUSXFEwmDqeXRfTIK/FQpPTa8MJMxEHjSV3UbiuyLARPQ==
+
 postcss-discard-overridden@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
@@ -10034,10 +10020,10 @@ postcss-discard-overridden@^5.0.1:
   resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6"
   integrity sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==
 
-postcss-discard-overridden@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.2.tgz#e6f51d83e66feffcf05ed94c4ad20b814d0aab5f"
-  integrity sha512-+56BLP6NSSUuWUXjRgAQuho1p5xs/hU5Sw7+xt9S3JSg+7R6+WMGnJW7Hre/6tTuZ2xiXMB42ObkiZJ2hy/Pew==
+postcss-discard-overridden@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.3.tgz#004b9818cabb407e60616509267567150b327a3f"
+  integrity sha512-yRTXknIZA4k8Yo4FiF1xbsLj/VBxfXEWxJNIrtIy6HC9KQ4xJxcPtoaaskh6QptCGrrcGnhKsTsENTRPZOBu4g==
 
 postcss-discard-unused@^2.2.1:
   version "2.2.3"
@@ -10087,6 +10073,14 @@ postcss-merge-longhand@^5.0.4:
     postcss-value-parser "^4.1.0"
     stylehacks "^5.0.1"
 
+postcss-merge-longhand@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.5.tgz#cbc217ca22fb5a3e6ee22a6a1aa6920ec1f3c628"
+  integrity sha512-R2BCPJJ/U2oh1uTWEYn9CcJ7MMcQ1iIbj9wfr2s/zHu5om5MP/ewKdaunpfJqR1WYzqCsgnXuRoVXPAzxdqy8g==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+    stylehacks "^5.0.2"
+
 postcss-merge-rules@^2.0.3:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
@@ -10108,14 +10102,14 @@ postcss-merge-rules@^5.0.3:
     cssnano-utils "^2.0.1"
     postcss-selector-parser "^6.0.5"
 
-postcss-merge-rules@^5.0.4:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.4.tgz#a50640fd832380f322bd2861a9b33fbde4219f9b"
-  integrity sha512-yOj7bW3NxlQxaERBB0lEY1sH5y+RzevjbdH4DBJurjKERNpknRByFNdNe+V72i5pIZL12woM9uGdS5xbSB+kDQ==
+postcss-merge-rules@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.5.tgz#2a18669ec214019884a60f0a0d356803a8138366"
+  integrity sha512-3Oa26/Pb9VOFVksJjFG45SNoe4nhGvJ2Uc6TlRimqF8uhfOCEhVCaJ3rvEat5UFOn2UZqTY5Da8dFgCh3Iq0Ug==
   dependencies:
     browserslist "^4.16.6"
     caniuse-api "^3.0.0"
-    cssnano-utils "^3.0.0"
+    cssnano-utils "^3.0.1"
     postcss-selector-parser "^6.0.5"
 
 postcss-message-helpers@^2.0.0:
@@ -10139,10 +10133,10 @@ postcss-minify-font-values@^5.0.1:
   dependencies:
     postcss-value-parser "^4.1.0"
 
-postcss-minify-font-values@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.2.tgz#4603e956d85cd0719156e2b3eb68e3cd2f917092"
-  integrity sha512-R6MJZryq28Cw0AmnyhXrM7naqJZZLoa1paBltIzh2wM7yb4D45TLur+eubTQ4jCmZU9SGeZdWsc5KcSoqTMeTg==
+postcss-minify-font-values@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.3.tgz#48c455c4cd980ecd07ac9bf3fc58e9d8a2ae4168"
+  integrity sha512-bC45rVzEwsLhv/cL1eCjoo2OOjbSk9I7HKFBYnBvtyuIZlf7uMipMATXtA0Fc3jwPo3wuPIW1jRJWKzflMh1sA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -10163,13 +10157,13 @@ postcss-minify-gradients@^5.0.3:
     cssnano-utils "^2.0.1"
     postcss-value-parser "^4.1.0"
 
-postcss-minify-gradients@^5.0.4:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.4.tgz#f13146950513f5a201015306914e3c76d10b591d"
-  integrity sha512-RVwZA7NC4R4J76u8X0Q0j+J7ItKUWAeBUJ8oEEZWmtv3Xoh19uNJaJwzNpsydQjk6PkuhRrK+YwwMf+c+68EYg==
+postcss-minify-gradients@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.5.tgz#a5572b9c98ed52cbd7414db24b873f8b9e418290"
+  integrity sha512-/YjvXs8PepsoiZAIpjstOO4IHKwFAqYNqbA1yVdqklM84tbUUneh6omJxGlRlF3mi6K5Pa067Mg6IwqEnYC8Zg==
   dependencies:
     colord "^2.9.1"
-    cssnano-utils "^3.0.0"
+    cssnano-utils "^3.0.1"
     postcss-value-parser "^4.2.0"
 
 postcss-minify-params@^1.0.4:
@@ -10192,14 +10186,13 @@ postcss-minify-params@^5.0.2:
     cssnano-utils "^2.0.1"
     postcss-value-parser "^4.1.0"
 
-postcss-minify-params@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.3.tgz#9f933d37098ef1dcf007e159a47bb2c1cf06989d"
-  integrity sha512-NY92FUikE+wralaiVexFd5gwb7oJTIDhgTNeIw89i1Ymsgt4RWiPXfz3bg7hDy4NL6gepcThJwOYNtZO/eNi7Q==
+postcss-minify-params@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.4.tgz#230a4d04456609e614db1d48c2eebc21f6490a45"
+  integrity sha512-Z0vjod9lRZEmEPfEmA2sCfjbfEEFKefMD3RDIQSUfXK4LpCyWkX1CniUgyNvnjJFLDPSxtgKzozhHhPHKoeGkg==
   dependencies:
-    alphanum-sort "^1.0.2"
     browserslist "^4.16.6"
-    cssnano-utils "^3.0.0"
+    cssnano-utils "^3.0.1"
     postcss-value-parser "^4.2.0"
 
 postcss-minify-selectors@^2.0.4:
@@ -10220,12 +10213,11 @@ postcss-minify-selectors@^5.1.0:
     alphanum-sort "^1.0.2"
     postcss-selector-parser "^6.0.5"
 
-postcss-minify-selectors@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.1.tgz#20ae03b411f7fb397451e3d7d85b989f944b871c"
-  integrity sha512-TOzqOPXt91O2luJInaVPiivh90a2SIK5Nf1Ea7yEIM/5w+XA5BGrZGUSW8aEx9pJ/oNj7ZJBhjvigSiBV+bC1Q==
+postcss-minify-selectors@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.2.tgz#bc9698f713b9dab7f44f1ec30643fcbad9a043c0"
+  integrity sha512-gpn1nJDMCf3g32y/7kl+jsdamhiYT+/zmEt57RoT9GmzlixBNRPohI7k8UIHelLABhdLf3MSZhtM33xuH5eQOQ==
   dependencies:
-    alphanum-sort "^1.0.2"
     postcss-selector-parser "^6.0.5"
 
 postcss-modules-extract-imports@^3.0.0:
@@ -10268,6 +10260,11 @@ postcss-normalize-charset@^5.0.1:
   resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0"
   integrity sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==
 
+postcss-normalize-charset@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.2.tgz#eb6130c8a8e950ce25f9ea512de1d9d6a6f81439"
+  integrity sha512-fEMhYXzO8My+gC009qDc/3bgnFP8Fv1Ic8uw4ec4YTlhIOw63tGPk1YFd7fk9bZUf1DAbkhiL/QPWs9JLqdF2g==
+
 postcss-normalize-display-values@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd"
@@ -10290,10 +10287,10 @@ postcss-normalize-positions@^5.0.1:
   dependencies:
     postcss-value-parser "^4.1.0"
 
-postcss-normalize-positions@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.2.tgz#799fa494b352a5da183be8f050024af6d92fa29c"
-  integrity sha512-tqghWFVDp2btqFg1gYob1etPNxXLNh3uVeWgZE2AQGh6b2F8AK2Gj36v5Vhyh+APwIzNjmt6jwZ9pTBP+/OM8g==
+postcss-normalize-positions@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.3.tgz#b63fcc4ff5fbf65934fafaf83270b2da214711d1"
+  integrity sha512-U+rmhjrNBvIGYqr/1tD4wXPFFMKUbXsYXvlUCzLi0tOCUS6LoeEAnmVXXJY/MEB/1CKZZwBSs2tmzGawcygVBA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -10305,10 +10302,10 @@ postcss-normalize-repeat-style@^5.0.1:
     cssnano-utils "^2.0.1"
     postcss-value-parser "^4.1.0"
 
-postcss-normalize-repeat-style@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.2.tgz#fd9bddba3e6fd5f5d95c18dfb42a09ecd563adea"
-  integrity sha512-/rIZn8X9bBzC7KvY4iKUhXUGW3MmbXwfPF23jC9wT9xTi7kAvgj8sEgwxjixBmoL6MVa4WOgxNz2hAR6wTK8tw==
+postcss-normalize-repeat-style@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.3.tgz#488c0ad8aac0fa4f66ef56cc8d604b3fd9bf705f"
+  integrity sha512-uk1+xYx0AMbA3nLSNhbDrqbf/rx+Iuq5tVad2VNyaxxJzx79oGieJ6D9F6AfOL2GtiIbP7vTYlpYHtG+ERFXTg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -10319,10 +10316,10 @@ postcss-normalize-string@^5.0.1:
   dependencies:
     postcss-value-parser "^4.1.0"
 
-postcss-normalize-string@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.2.tgz#1b2bbf91526f61266f28abf7f773e4136b2c4bd2"
-  integrity sha512-zaI1yzwL+a/FkIzUWMQoH25YwCYxi917J4pYm1nRXtdgiCdnlTkx5eRzqWEC64HtRa06WCJ9TIutpb6GmW4gFw==
+postcss-normalize-string@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.3.tgz#49e0a1d58a119d5435ef21893ad03136a6e8f0e6"
+  integrity sha512-Mf2V4JbIDboNGQhW6xW0YREDiYXoX3WrD3EjKkjvnpAJ6W4qqjLnK/c9aioyVFaWWHVdP5zVRw/9DI5S3oLDFw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -10349,10 +10346,10 @@ postcss-normalize-unicode@^5.0.1:
     browserslist "^4.16.0"
     postcss-value-parser "^4.1.0"
 
-postcss-normalize-unicode@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.2.tgz#c4db89a0116066716b9e9fcb6444ce63178f5ced"
-  integrity sha512-3y/V+vjZ19HNcTizeqwrbZSUsE69ZMRHfiiyLAJb7C7hJtYmM4Gsbajy7gKagu97E8q5rlS9k8FhojA8cpGhWw==
+postcss-normalize-unicode@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.3.tgz#10f0d30093598a58c48a616491cc7fa53256dd43"
+  integrity sha512-uNC7BmS/7h6to2UWa4RFH8sOTzu2O9dVWPE/F9Vm9GdhONiD/c1kNaCLbmsFHlKWcEx7alNUChQ+jH/QAlqsQw==
   dependencies:
     browserslist "^4.16.6"
     postcss-value-parser "^4.2.0"
@@ -10391,10 +10388,10 @@ postcss-normalize-whitespace@^5.0.1:
   dependencies:
     postcss-value-parser "^4.1.0"
 
-postcss-normalize-whitespace@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.2.tgz#92c5eaffe5255b5c43fca0baf19227e607c534db"
-  integrity sha512-CXBx+9fVlzSgbk0IXA/dcZn9lXixnQRndnsPC5ht3HxlQ1bVh77KQDL1GffJx1LTzzfae8ftMulsjYmO2yegxA==
+postcss-normalize-whitespace@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.3.tgz#fb6bcc9ff2f834448b802657c7acd0956f4591d1"
+  integrity sha512-333JWRnX655fSoUbufJ10HJop3c8mrpKkCCUnEmgz/Cb/QEtW+/TMZwDAUt4lnwqP6tCCk0x0b58jqvDgiQm/A==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -10414,12 +10411,12 @@ postcss-ordered-values@^5.0.2:
     cssnano-utils "^2.0.1"
     postcss-value-parser "^4.1.0"
 
-postcss-ordered-values@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.3.tgz#d80a8565f2e21efe8a06abacd60629a783bbcf54"
-  integrity sha512-T9pDS+P9bWeFvqivXd5ACzQmrCmHjv3ZP+djn8E1UZY7iK79pFSm7i3WbKw2VSmFmdbMm8sQ12OPcNpzBo3Z2w==
+postcss-ordered-values@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.4.tgz#f799dca87a7f17526d31a20085e61768d0b00534"
+  integrity sha512-taKtGDZtyYUMVYkg+MuJeBUiTF6cGHZmo/qcW7ibvW79UlyKuSHbo6dpCIiqI+j9oJsXWzP+ovIxoyLDOeQFdw==
   dependencies:
-    cssnano-utils "^3.0.0"
+    cssnano-utils "^3.0.1"
     postcss-value-parser "^4.2.0"
 
 postcss-reduce-idents@^2.2.2:
@@ -10462,10 +10459,10 @@ postcss-reduce-transforms@^5.0.1:
     cssnano-utils "^2.0.1"
     postcss-value-parser "^4.1.0"
 
-postcss-reduce-transforms@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.2.tgz#9242758629f9ad4d90312eadbc921259d15bee4d"
-  integrity sha512-25HeDeFsgiPSUx69jJXZn8I06tMxLQJJNF5h7i9gsUg8iP4KOOJ8EX8fj3seeoLt3SLU2YDD6UPnDYVGUO7DEA==
+postcss-reduce-transforms@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.3.tgz#df60fab34698a43073e8b87938c71df7a3b040ac"
+  integrity sha512-yDnTUab5i7auHiNwdcL1f+pBnqQFf+7eC4cbC7D8Lc1FkvNZhtpkdad+9U4wDdFb84haupMf0rA/Zc5LcTe/3A==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -10528,6 +10525,13 @@ postcss-unique-selectors@^5.0.2:
     alphanum-sort "^1.0.2"
     postcss-selector-parser "^6.0.5"
 
+postcss-unique-selectors@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.3.tgz#07fd116a8fbd9202e7030f7c4952e7b52c26c63d"
+  integrity sha512-V5tX2hadSSn+miVCluuK1IDGy+7jAXSOfRZ2DQ+s/4uQZb/orDYBjH0CHgFrXsRw78p4QTuEFA9kI6C956UnHQ==
+  dependencies:
+    postcss-selector-parser "^6.0.5"
+
 postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
@@ -10647,7 +10651,7 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-progress@^2.0.0, progress@^2.0.1, progress@^2.0.3:
+progress@^2.0.1, progress@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -10809,10 +10813,10 @@ quasar-extras@^2.0.9:
   resolved "https://registry.yarnpkg.com/quasar-extras/-/quasar-extras-2.0.9.tgz#f3274f8cd8e054a76d0b52a2410ccf0cdfb197fd"
   integrity sha512-ifwaaop0GNuxlcD7Ams0X3f7S49es+2NlR/fI4YAMAOW70ZxTkD4QkAFsVhk7dNPcpPodSOTKAWDOPaO+MqsBg==
 
-quasar@^2.3.4:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/quasar/-/quasar-2.3.4.tgz#cd622f84ad4fc9bd4c156d4a0e6f896e3e92d27b"
-  integrity sha512-VgqjuzlRqZU2t4gKDHQHc/gt9nKXi9y1VRM7xYO6VOuJcm48wgOzyBdTwl1vVseghWeEIEHRM9M+R629WWF9MQ==
+quasar@^2.4.12:
+  version "2.4.12"
+  resolved "https://registry.yarnpkg.com/quasar/-/quasar-2.4.12.tgz#a2f4f17fd433ca766b675f51e4cf7e351af76ab5"
+  integrity sha512-obyqi5wxHpnlPSTfT/WEVCqt+J5LcgnjRGGmhuYMOrgSj8ytSbm5ToZfi/gj1yurifnX4dCIkneFtuFdOHnLZQ==
 
 query-string@^4.1.0:
   version "4.3.4"
@@ -11472,12 +11476,12 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selfsigned@^1.10.11:
-  version "1.10.11"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
-  integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
+selfsigned@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.0.tgz#e927cd5377cbb0a1075302cff8df1042cc2bce5b"
+  integrity sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ==
   dependencies:
-    node-forge "^0.10.0"
+    node-forge "^1.2.0"
 
 semver-compare@^1.0.0:
   version "1.0.0"
@@ -11506,7 +11510,7 @@ 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.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+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==
@@ -12175,6 +12179,14 @@ stylehacks@^5.0.1:
     browserslist "^4.16.0"
     postcss-selector-parser "^6.0.4"
 
+stylehacks@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.2.tgz#fa10e5181c6e8dc0bddb4a3fb372e9ac42bba2ad"
+  integrity sha512-114zeJdOpTrbQYRD4OU5UWJ99LKUaqCPJTU1HQ/n3q3BwmllFN8kHENaLnOeqVq6AhXrWfxHNZTl33iJ4oy3cQ==
+  dependencies:
+    browserslist "^4.16.6"
+    postcss-selector-parser "^6.0.4"
+
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -12247,10 +12259,10 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-table@6.7.5:
-  version "6.7.5"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.7.5.tgz#f04478c351ef3d8c7904f0e8be90a1b62417d238"
-  integrity sha512-LFNeryOqiQHqCVKzhkymKwt6ozeRhlm8IL1mE8rNUurkir4heF6PzMyRgaTa4tlyPTGGgXuvVOF/OLWiH09Lqw==
+table@6.8.0:
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca"
+  integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==
   dependencies:
     ajv "^8.0.1"
     lodash.truncate "^4.4.2"
@@ -12736,16 +12748,16 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.2.tgz#6d618640d430e3569a1dfb44f7d7e600ced3ee86"
-  integrity sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==
-
-typescript@^4.5.4:
+typescript@4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8"
   integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==
 
+typescript@^4.5.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
+  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
+
 uglify-js@3.4.x:
   version "3.4.10"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
@@ -13337,10 +13349,10 @@ webpack-dev-middleware@^5.3.0:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@4.7.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.1.tgz#4fe8f7435843dd2e676d687846f7a3d53f758c0d"
-  integrity sha512-bkoNgFyqlF/CT726Axtf/ELHHYsTZJWz3QJ6HqstWPbalhjAPunlPH9bwt/Lr5cLb+uoLmsta6svVplVzq8beA==
+webpack-dev-server@4.7.3:
+  version "4.7.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz#4e995b141ff51fa499906eebc7906f6925d0beaa"
+  integrity sha512-mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
@@ -13364,7 +13376,7 @@ webpack-dev-server@4.7.1:
     p-retry "^4.5.0"
     portfinder "^1.0.28"
     schema-utils "^4.0.0"
-    selfsigned "^1.10.11"
+    selfsigned "^2.0.0"
     serve-index "^1.9.1"
     sockjs "^0.3.21"
     spdy "^4.0.2"
@@ -13398,7 +13410,7 @@ webpack-sources@^3.2.2:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260"
   integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==
 
-webpack@*, webpack@^5, webpack@^5.38.1, webpack@^5.58.1:
+webpack@^5, webpack@^5.58.1:
   version "5.64.4"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.64.4.tgz#e1454b6a13009f57cc2c78e08416cd674622937b"
   integrity sha512-LWhqfKjCLoYJLKJY8wk2C3h77i8VyHowG3qYNZiIqD6D0ZS40439S/KVuc/PY48jp2yQmy0mhMknq8cys4jFMw==