- Chart Maps Nationality

- Username lowercase
- Statistics
- Telegram

package.json

@@ -31,7 +31,7 @@
     "@babel/plugin-transform-runtime": "^7.4.0",
     "@babel/runtime": "^7.0.0",
     "@quasar/babel-preset-app": "^1.1.8",
-    "@quasar/extras": "^1.4.2",
+    "@quasar/extras": "^1.5.0",
     "@types/googlemaps": "^3.38.0",
     "@types/lodash": "^4.14.142",
     "@types/vuelidate": "^0.7.0",
@@ -41,6 +41,7 @@
     "axios": "^0.19.0",
     "babel-eslint": "^10.0.1",
     "bcryptjs": "^2.4.3",
+    "chart.js": "^2.9.3",
     "dotenv": "^6.1.0",
     "element-ui": "^2.3.6",
     "eslint-plugin-vue": "^5.2.2",
@@ -53,11 +54,12 @@
     "npm": "^6.10.0",
     "nprogress": "^0.2.0",
     "prerender-spa-plugin": "^3.4.0",
-    "quasar": "^1.7.4",
+    "quasar": "^1.8.2",
     "quasar-extras": "^2.0.8",
     "register-service-worker": "^1.0.0",
     "vee-validate": "^2.1.2",
     "vue": "^2.6.10",
+    "vue-chartkick": "^0.6.0",
     "vue-class-component": "^6.3.2",
     "vue-country-code": "^1.0.9",
     "vue-i18n": "^8.1.0",
@@ -92,7 +94,7 @@
     "@babel/plugin-syntax-import-meta": "^7.2.0",
     "@babel/preset-env": "^7.4.2",
     "@quasar/app": "^1.5.2",
-    "@quasar/quasar-app-extension-qcalendar": "^1.3.13",
+    "@quasar/quasar-app-extension-qcalendar": "^1.3.14",
     "@quasar/quasar-app-extension-qmediaplayer": "^1.0.17",
     "@quasar/quasar-app-extension-qscroller": "^1.0.5",
     "@quasar/quasar-app-extension-typescript": "^1.0.0-alpha.11",

quasar.conf.js

@@ -105,7 +105,8 @@ module.exports = function (ctx) {
       { path: 'globalroutines', server: true, client: true },
       { path: 'vue-idb', server: true, client: true },
       { path: 'guard', server: true, client: true },
-      { path: 'vuetelinput', server: true, client: true }],
+      { path: 'vuetelinput', server: true, client: true },
+      { path: 'mycharts', server: true, client: true }],
       // { path: 'googlemap', server: true, client: true }],
     css: [
       'app.styl'

src/App.scss

@@ -491,6 +491,11 @@ $heightBtn: 100%;
 
 .fa-flag-it:before {
   content: url('statics/icons/flag_it.svg');
+  overflow-y: hidden;
+}
+
+.fa-flag-si:before {
+  content: url('statics/icons/flag_si.svg');
 }
 
 .fa-flag-us:before {
@@ -509,6 +514,18 @@ $heightBtn: 100%;
   content: url('statics/icons/flag_de.svg');
 }
 
+.fa-flag-ch:before {
+  content: url('statics/icons/flag_ch.svg');
+}
+
+.fa-flag-pe:before {
+  content: url('statics/icons/flag_pe.svg');
+}
+
+.fa-flag-hr:before {
+  content: url('statics/icons/flag_hr.svg');
+}
+
 .animazione {
   animation-duration: 2s;
   animation-fill-mode: both;
@@ -517,3 +534,10 @@ $heightBtn: 100%;
 .wrapword {
   overflow-wrap: break-word;
 }
+
+.clBorderWarning {
+  border: #f69f09 solid 5px;
+  border-radius: 32px;
+  font-size: 1rem;
+  padding: 4px;
+}

src/db/i18n_website.js

@@ -4,7 +4,9 @@ const msg_website = {
       home: 'Home',
       profile: 'Il tuo Profilo',
       payment: 'Pagamenti',
-      SignUp: 'Registrazione',
+      regok: 'Registrazione Confermata',
+      SignUp: 'Nuova Registrazione',
+      SignUp_alreadylista: 'Registrazione per chi è gia nella Lista!',
       SignUp2: 'Registrazione',
       SignIn: 'Login',
       status: 'Statistiche',
@@ -28,7 +30,8 @@ const msg_website = {
       statusreg: {
         reg:'Partecipanti',
         giainlista:'Gia in Lista',
-        newreg:'Nuove Registrazioni:',
+        newreg:'Ultime Registrazioni:',
+        nationality: 'Nazionalità',
         verified:'Verificata',
         nonverified:'Non Verificata',
       }
@@ -39,8 +42,8 @@ const msg_website = {
       myAppDescription: 'Ayni',
       keywords_base: 'Ayni',
       myDescriz: '',
-      sottoTitoloApp: 'Gift Economy',
+      sottoTitoloApp: '',
-      sottoTitoloApp2: 'Dare e Ricevere',
+      sottoTitoloApp2: '',
       sottoTitoloApp3: '',
       sottoTitoloApp4: '',
     },
@@ -87,6 +90,7 @@ const msg_website = {
         reg:'Participantes',
         giainlista:'Gia in Lista',
         newreg:'Nuevas inscripciones :',
+        nationality: 'Nacionalidad',
         verified:'Verificada',
         nonverified:'No Verificada',
       }
@@ -144,13 +148,14 @@ const msg_website = {
         reg:'Participants',
         giainlista:'Gia in Lista',
         newreg:'Nouvelles inscriptions:',
+        nationality: 'Nationalité',
         verified:'Vérifié',
         nonverified:'Non Vérifié',
       }
     },
     msg: {
       myAppName: 'Ayni',
-      myAppNameShort: 'Ayni',
+      myAppNameShort: '',
       myAppDescription: '',
       keywords_base: '',
       myDescriz: '',
@@ -186,8 +191,9 @@ const msg_website = {
       Test2: 'Test2',
       statusreg: {
         reg:'Participants',
-        giainlista:'Gia in Lista',
+        giainlista:'Already in the List',
         newreg:'New registrations:',
+        nationality: 'Nationality',
         verified:'Verified',
         nonverified:'Not Verified',
       }

src/db/static_data.ts

@@ -360,6 +360,17 @@ const baseroutes: IListRoutes[] = [
     infooter: false,
     separator: false
   },
+  {
+    active: functionality.ENABLE_REGISTRATION,
+    order: 2000,
+    path: '/regok',
+    materialIcon: 'how_to_reg',
+    name: 'pages.regok',
+    component: () => import('@/views/login/regok/regok.vue'),
+    inmenu: false,
+    infooter: false,
+    separator: false
+  },
   {
     active: functionality.ENABLE_REGISTRATION,
     order: 1000,

src/index.template.html

@@ -1,23 +1,28 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <!-- <title><%= htmlWebpackPlugin.options.appName %></title>-->
+  <!-- <title><%= htmlWebpackPlugin.options.appName %></title>-->
 
-    <meta charset="utf-8">
+  <meta charset="utf-8">
-    <!--<meta name="description" content="<%= htmlWebpackPlugin.options.appDescription %>">-->
+  <!--<meta name="description" content="<%= htmlWebpackPlugin.options.appDescription %>">-->
-    <!--<meta name="keywords" content="<%= htmlWebpackPlugin.options.keywords %>">-->
+  <!--<meta name="keywords" content="<%= htmlWebpackPlugin.options.keywords %>">-->
-    <meta name="format-detection" content="telephone=no">
+  <meta name="format-detection" content="telephone=no">
-    <meta name="msapplication-tap-highlight" content="no">
+  <meta name="msapplication-tap-highlight" content="no">
-    <meta name="viewport"
+  <meta name="viewport"
-          content="user-scalable=no, initial-scale=1, minimum-scale=1, width=device-width<% if (htmlWebpackPlugin.options.ctx.mode.cordova || htmlWebpackPlugin.options.ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
+        content="user-scalable=no, initial-scale=1, minimum-scale=1, width=device-width<% if (htmlWebpackPlugin.options.ctx.mode.cordova || htmlWebpackPlugin.options.ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
 
-    <link rel="icon" href="<%= htmlWebpackPlugin.files.publicPath %>statics/icons/favicon.ico" type="image/x-icon">
+  <link rel="icon" href="<%= htmlWebpackPlugin.files.publicPath %>statics/icons/favicon.ico" type="image/x-icon">
-    <link rel="icon" type="image/png" sizes="32x32"
+  <link rel="icon" type="image/png" sizes="32x32"
-          href="<%= htmlWebpackPlugin.files.publicPath %>statics/icons/favicon-32x32.png">
+        href="<%= htmlWebpackPlugin.files.publicPath %>statics/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16"
+  <link rel="icon" type="image/png" sizes="16x16"
-          href="<%= htmlWebpackPlugin.files.publicPath %>statics/icons/favicon-16x16.png">
+        href="<%= htmlWebpackPlugin.files.publicPath %>statics/icons/favicon-16x16.png">
 
-    <script src="<%= htmlWebpackPlugin.files.publicPath %>statics/js/track.js"></script>
+  <script src="<%= htmlWebpackPlugin.files.publicPath %>statics/js/track.js"></script>
+
+  <script src="https://www.gstatic.com/charts/loader.js"></script>
+
+  <!--<script src="https://unpkg.com/chart.js@2.8.0/dist/Chart.bundle.js"></script>
+  <script src="https://unpkg.com/vue-chartkick@0.5.1"></script>-->
 
 </head>
 <body>

src/root/home/home.scss

@@ -15,6 +15,18 @@ p {
   //text-shadow: .125rem .125rem .25rem $grayshadow;
 }
 
+.logo{
+  margin-left: auto;
+  margin-right: auto;
+
+  max-height: 250px;
+  max-width: 250px;
+  @media (max-width: 718px) {
+    max-height: 180px;
+    max-width: 180px;
+  }
+}
+
 h4 {
   font-size: 1.25rem;
 }
@@ -27,8 +39,8 @@ h4 {
 }
 
 .landing_background {
-  background: #000 url(../../statics/images/foto1.jpg) no-repeat 50% fixed;
+  background: #000 url(../../statics/images/foto1.jpg) no-repeat 100% fixed;
-  background-size: cover
+  background-size: contain !important;
 }
 
 .landing > section {
@@ -123,7 +135,7 @@ h4 {
 }
 
 .landing__header {
-  height: 0
+  height: 0vh
 }
 
 .landing__arrow {
@@ -223,7 +235,6 @@ body.mobile .landing:before {
   z-index: -1;
   //background: #000 url(../../statics/images/cover.jpg) 50%;
 
-  background-size: cover
 }
 
 /*
@@ -351,7 +362,7 @@ body.mobile .landing:before {
     text-align: center
   }
   .landing__header {
-    height: 0
+    height: 10vh
   }
   .clgutter {
     margin-top: 0;
@@ -477,5 +488,8 @@ body.mobile .landing:before {
 }
 
 .q-carousel__slide{
-  background-size: auto;
+  // background-size: auto;
+  background-size: contain !important;
+  background-repeat: no-repeat;
+  background-position: 50%;
 }

src/root/home/home.ts

@@ -12,7 +12,15 @@ import { tools } from '@src/store/Modules/tools'
 import { func_tools, toolsext } from '@src/store/Modules/toolsext'
 import { Screen } from 'quasar'
 import MixinMetaTags from '@src/mixins/mixin-metatags'
-import { CCardCarousel, CImgText, CTitleBanner, CStatus, CStatusReg, CNextZoom } from '@components'
+import {
+  CCardCarousel,
+  CImgText,
+  CTitleBanner,
+  CStatus,
+  CStatusReg,
+  CNextZoom,
+  CVerifyTelegram, CVerifyEmail
+} from '@components'
 import MixinBase from '@src/mixins/mixin-base'
 import { static_data } from '@src/db/static_data'
 import { INotData } from '@src/model'
@@ -32,7 +40,7 @@ import { INotData } from '@src/model'
 
 @Component({
   mixins: [MixinBase],
-  components: { Logo, Footer, CMyPage, CCardCarousel, CTitleBanner, CImgText, CStatus, CStatusReg, CNextZoom }
+  components: { Logo, Footer, CMyPage, CCardCarousel, CTitleBanner, CImgText, CStatus, CStatusReg, CNextZoom, CVerifyTelegram, CVerifyEmail }
 })
 export default class Home extends MixinBase {
   public text: string = ''
@@ -175,6 +183,10 @@ export default class Home extends MixinBase {
     return tools
   }
 
+  get TelegVerificato() {
+    return UserStore.state.my.profile.teleg_id > 0
+  }
+
   get visuStatus() {
     return !this.isVerificato || !this.TelegVerificato || UserStore.state.my.profile.paymenttypes.length === 0
   }
@@ -328,12 +340,16 @@ export default class Home extends MixinBase {
     return UserStore.getters.isVerificato
   }
 
-  get TelegVerificato() {
+  get isEmailVerified() {
-    return UserStore.state.my.profile.teleg_id > 0
+    return UserStore.state.my.verified_email
   }
 
   public openrighttoolbar() {
     GlobalStore.state.RightDrawerOpen = true
   }
 
+  get TelegCode() {
+    return UserStore.state.my.profile.teleg_checkcode
+  }
+
 }

src/root/home/home.vue

@@ -8,7 +8,10 @@
             </span>
 
       <div class="landing">
-        <section>
+        <div class="text-center">
+          <q-img src="statics/images/background.jpg" class="logo"></q-img>
+        </div>
+        <!--<section>
           <div class="landing__hero maxwidth1200 text-white">
             <q-carousel
               animated
@@ -78,16 +81,37 @@
                     </div>
                   </div>
                   <div class="landing__arrow absolute-bottom text-center">
-                    <!--<i aria-hidden="true"-->
-                    <!--class="q-icon text-h2 text-white material-icons">expand_more</i>-->
                   </div>
                 </q-carousel-slide>
               </div>
             </q-carousel>
 
           </div>
-        </section>
+        </section> -->
 
+        <div v-if="isLogged">
+          <CVerifyEmail v-if="!isEmailVerified">
+
+          </CVerifyEmail>
+
+          <CVerifyTelegram v-if="TelegCode">
+
+          </CVerifyTelegram>
+
+        </div>
+        <div v-else>
+          <div v-if="!isLogged && static_data.functionality.ENABLE_REGISTRATION" align="center" style="margin:20px;">
+            <q-btn rounded size="lg" color="primary" @click="openrighttoolbar"
+            >{{$t('login.enter')}}
+            </q-btn>
+          </div>
+
+          <div v-if="!isLogged && static_data.functionality.ENABLE_REGISTRATION" align="center" style="margin:20px;">
+            <q-btn rounded size="lg" color="primary" to="/signup">{{$t('reg.submit')}}
+            </q-btn>
+          </div>
+
+        </div>
         <CNextZoom>
 
         </CNextZoom>
@@ -101,23 +125,6 @@
         </div>
 
 
-        <div v-if="!isLogged && static_data.functionality.ENABLE_REGISTRATION" align="center" style="margin:20px;">
-          <q-btn rounded size="lg" color="primary" @click="openrighttoolbar"
-          >{{$t('login.enter')}}
-          </q-btn>
-        </div>
-
-        <div v-if="!isLogged && static_data.functionality.ENABLE_REGISTRATION" align="center" style="margin:20px;">
-          <q-btn rounded size="lg" color="primary" to="/signup">{{$t('reg.submit')}}
-          </q-btn>
-        </div>
-
-        <div v-if="!isLogged">
-          <div style="margin-bottom: 50px;">
-
-          </div>
-        </div>
-
         <div v-if="false">
           <CTitleBanner class="q-pa-xs" :title="$t('text.how')" bgcolor="bg-primary" clcolor="text-white"
                         mystyle=" " myclass="myshad" canopen="true">

src/statics/icons/flag_it.svg

@@ -1,7 +1,40 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="flag-icon-css-it" viewBox="0 0 512 512">
+<?xml version="1.0" encoding="iso-8859-1"?>
-  <g fill-rule="evenodd" stroke-width="1pt">
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-    <path fill="#fff" d="M0 0h512v512H0z"/>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-    <path fill="#009246" d="M0 0h170.7v512H0z"/>
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-    <path fill="#ce2b37" d="M341.3 0H512v512H341.3z"/>
+<path style="fill:#73AF00;" d="M38.345,88.273C17.167,88.273,0,105.44,0,126.618v258.759c0,21.177,17.167,38.345,38.345,38.345
-  </g>
+	h132.322V88.273H38.345z"/>
+<rect x="170.67" y="88.277" style="fill:#F5F5F5;" width="170.67" height="335.45"/>
+<path style="fill:#FF4B55;" d="M473.655,88.273H341.333v335.448h132.322c21.177,0,38.345-17.167,38.345-38.345V126.618
+	C512,105.44,494.833,88.273,473.655,88.273z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
 </svg>

yarn.lock

@@ -1224,22 +1224,22 @@
     babel-plugin-module-resolver "^3.2.0"
     babel-plugin-transform-imports "^1.0.0"
 
-"@quasar/extras@^1.4.2":
+"@quasar/extras@^1.5.0":
-  version "1.4.2"
+  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.4.2.tgz#177f3cdbd7b604c8bf903946dbee7ebd3a0ecad4"
+  resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.5.0.tgz#68ac3aa5056634f90ba5a4e58c584793d15b4997"
-  integrity sha512-lq2h18+IUs8M6weWRVoqzsPluENsBRdb4t2ePbsX0mjYz50Xpk1/K9isUotl7bDQDkJSwbshQKLOD7P1co0fTg==
+  integrity sha512-SE1npMOvXGSEI1nWnEd2/EQswkM2QAiZ2K1WSPMOeqZtDvc29uLqv5A9mecWPLxVN/bSpLiX65j+ZYilY6KNHQ==
 
 "@quasar/fastclick@1.1.4":
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/@quasar/fastclick/-/fastclick-1.1.4.tgz#21ed3e9a4387dcb43022a08af4ef08a5f1abf159"
   integrity sha512-i9wbyV4iT+v4KhtHJynUFhH5LiEPvAEgSnwMqPN4hf/8uRe82nDl5qP5agrp2el1h0HzyBpbvHaW7NB0BPrtvA==
 
-"@quasar/quasar-app-extension-qcalendar@^1.3.13":
+"@quasar/quasar-app-extension-qcalendar@^1.3.14":
-  version "1.3.13"
+  version "1.3.14"
-  resolved "https://registry.yarnpkg.com/@quasar/quasar-app-extension-qcalendar/-/quasar-app-extension-qcalendar-1.3.13.tgz#0823e0cd5670b53c8c5ec86597f8902f8f9fc6bd"
+  resolved "https://registry.yarnpkg.com/@quasar/quasar-app-extension-qcalendar/-/quasar-app-extension-qcalendar-1.3.14.tgz#40a9d0c330861cfddd1c03a4c28e43bb51eba361"
-  integrity sha512-t6KGIMefSoc2Pw0EMklxLAogoRQshprZL5tQeShzb8KpPRnbiHXBDc9SRBZIqnJAKeslz6cFXMEaRgpt1r8L6Q==
+  integrity sha512-wWO6V7Ti4aPcNAKytAprZT/FxYXkrQaH4zH9h+08sEDH/4mkgygIo3TJ1XIX/yxY7UBRWISfChhBnpBSX05nvw==
   dependencies:
-    "@quasar/quasar-ui-qcalendar" "^1.3.13"
+    "@quasar/quasar-ui-qcalendar" "^1.3.14"
 
 "@quasar/quasar-app-extension-qmediaplayer@^1.0.17":
   version "1.0.17"
@@ -1268,10 +1268,10 @@
     vue-property-decorator "^7.3.0"
     vue-template-compiler "^2.6.7"
 
-"@quasar/quasar-ui-qcalendar@^1.3.13":
+"@quasar/quasar-ui-qcalendar@^1.3.14":
-  version "1.3.13"
+  version "1.3.14"
-  resolved "https://registry.yarnpkg.com/@quasar/quasar-ui-qcalendar/-/quasar-ui-qcalendar-1.3.13.tgz#4d755db7b1eb7a49c161bddf59c2b6cc112eb931"
+  resolved "https://registry.yarnpkg.com/@quasar/quasar-ui-qcalendar/-/quasar-ui-qcalendar-1.3.14.tgz#36b3c9ba06512284924f642c57551cd83944c3ab"
-  integrity sha512-lfcl/6tmH6C28hGNe5n+P9lwBPBmeLnKh4ec9MOmli9ePrUIqn2LJJ5rwNwRUJakhtL/RXMJcLV5mvZEl2dT4A==
+  integrity sha512-KOtpxSbJCMWu5qChqANUb4a7XBRIx8wmumXt8YAWPqPdBMiYkq7l4VaTucMqgwAL1W3LC2ZA1qoJv8iph4UW7A==
   dependencies:
     q-colorize-mixin "^1.0.6"
     q-theme-mixin "^1.0.1"
@@ -3360,6 +3360,34 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
+chart.js@^2.9.3:
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.3.tgz#ae3884114dafd381bc600f5b35a189138aac1ef7"
+  integrity sha512-+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw==
+  dependencies:
+    chartjs-color "^2.1.0"
+    moment "^2.10.2"
+
+chartjs-color-string@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
+  integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
+  dependencies:
+    color-name "^1.0.0"
+
+chartjs-color@^2.1.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
+  integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
+  dependencies:
+    chartjs-color-string "^0.6.0"
+    color-convert "^1.9.3"
+
+chartkick@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/chartkick/-/chartkick-3.2.0.tgz#5296bbadfa6fbb93d3ab0f9c8e5d27649860e806"
+  integrity sha512-EkscIyDBdtUJVIuA2kIIjMq+YkNf4jDWr1fYjDUMZ9IakIJFoJ+9Hl+PW/POutElu8iYbebCEHWsrsXu09o4hw==
+
 check-more-types@2.24.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
@@ -3659,7 +3687,7 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.3.0, color-convert@^1.9.0, color-convert@^1.9.1:
+color-convert@^1.3.0, color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -4572,7 +4600,7 @@ deepmerge@^1.2.0, deepmerge@^1.5.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
   integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==
 
-deepmerge@^4.0.0:
+deepmerge@^4.0.0, deepmerge@^4.2.0:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
@@ -9788,7 +9816,7 @@ mkdirp@0.5.1, mkdirp@0.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp
   dependencies:
     minimist "0.0.8"
 
-moment@2.24.0:
+moment@2.24.0, moment@^2.10.2:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
@@ -12020,10 +12048,10 @@ quasar-extras@^2.0.8:
   resolved "https://registry.yarnpkg.com/quasar-extras/-/quasar-extras-2.0.9.tgz#f3274f8cd8e054a76d0b52a2410ccf0cdfb197fd"
   integrity sha512-ifwaaop0GNuxlcD7Ams0X3f7S49es+2NlR/fI4YAMAOW70ZxTkD4QkAFsVhk7dNPcpPodSOTKAWDOPaO+MqsBg==
 
-quasar@^1.7.4:
+quasar@^1.8.2:
-  version "1.7.4"
+  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/quasar/-/quasar-1.7.4.tgz#47d26c6fe158c129cdb3243221c443d0671c583f"
+  resolved "https://registry.yarnpkg.com/quasar/-/quasar-1.8.2.tgz#d3e7125c8f3bb5e3f59068f2f4257a9889e41368"
-  integrity sha512-gAp/q5Bn1lbBsKi7lZHZVNw/VI3EvUm5KwdRx7+O44RBb0i0P3oBib8HjpSzfQGaqdPogJFd7nQ/Az+jAfMYEA==
+  integrity sha512-P4egUCvOeWa2mSZ17ImIemgQLhOio3XhrIltQdLWJI3kKZglxt6DOULgNuRVbTA7hSqOIc1ST6E6wYSKYGNElA==
 
 query-string@^4.1.0:
   version "4.3.4"
@@ -14574,6 +14602,15 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
+vue-chartkick@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/vue-chartkick/-/vue-chartkick-0.6.0.tgz#fed022406ce1541dea96da6ad55089558e3b408d"
+  integrity sha512-ev6T38XD1TJVTXwX05hKhmeTjJdjCXbDGJ6CnhVfxL/f61QDQ5zI0jRp8hcA5hKGwCXsL0CqY4zC+7FxfsQXtw==
+  dependencies:
+    chartkick "^3.2.0"
+    deep-equal "^1.0.1"
+    deepmerge "^4.2.0"
+
 vue-class-component@^6.2.0, vue-class-component@^6.3.2:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-6.3.2.tgz#e6037e84d1df2af3bde4f455e50ca1b9eec02be6"