- Message notify when 'Ask Info' and user is not logged

- Ask Info and Book show message if not logged - TableField fixed and added some features
2019-11-04 20:29:35 +01:00
parent f30e6afd9e
commit b27f7e3cbf
26 changed files with 577 additions and 372 deletions
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
    "normalize.css": "^8.0.0",
    "npm": "^6.10.1",
    "nprogress": "^0.2.0",
-    "quasar": "^1.1.6",
+    "quasar": "^1.3.0",
    "quasar-extras": "^2.0.8",
    "register-service-worker": "^1.0.0",
    "vee-validate": "^2.1.2",
@@ -85,7 +85,7 @@
    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
    "@babel/plugin-syntax-import-meta": "^7.2.0",
    "@babel/preset-env": "^7.4.2",
-    "@quasar/app": "^1.1.2",
+    "@quasar/app": "^1.2.3",
    "@quasar/quasar-app-extension-colorize": "^1.0.0-alpha.1",
    "@quasar/quasar-app-extension-typescript": "^1.0.0-alpha.11",
    "@types/dotenv": "^4.0.3",
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -27,7 +27,7 @@ export const shared_consts = {
  },

  fieldsUserToChange() {
-    return ['username', 'email', 'cell', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'img', 'ipaddr', 'lasttimeonline']
+    return ['username', 'email', 'cell', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'img', 'ipaddr', 'lasttimeonline', 'profile']
  }

 }
--- a/src/components/CEventsCalendar/CEventsCalendar.ts
+++ b/src/components/CEventsCalendar/CEventsCalendar.ts
@@ -33,11 +33,12 @@ import { IMessagePage, IMessage, IIdentity, MsgDefault } from '../../model'
 import MixinUsers from '../../mixins/mixin-users'
 import { CDateTime } from '../CDateTime'
 import MixinOperator from '../../mixins/mixin-operator'
+import { CMyAvatar } from '../CMyAvatar'

@Component({
  mixins: [MixinOperator, MixinUsers],
  name: 'CEventsCalendar',
-  components: { Logo, Footer, CTitle, CImgText, QDateTimeScroller, QDateScroller, CMySelect, CMyEditor, CDateTime }
+  components: { Logo, Footer, CTitle, CImgText, QDateTimeScroller, QDateScroller, CMySelect, CMyEditor, CDateTime, CMyAvatar }
 })
 export default class CEventsCalendar extends Vue {
  public $q
@@ -442,6 +443,10 @@ export default class CEventsCalendar extends Vue {
    if (!UserStore.state.isLogged || !UserStore.state.my.verified_email) {
      // Visu right Toolbar to make SignIn
      GlobalStore.state.RightDrawerOpen = true
+      tools.showNeutralNotif(this.$q, this.$t('login.needlogin'))
+      tools.scrollToTop()
+      // window.scrollTo(0, 0)
+
      // this.$router.push('/signin')
    } else {
      console.log('addBookEventMenu')
@@ -461,6 +466,10 @@ export default class CEventsCalendar extends Vue {
    if (!UserStore.state.isLogged || !UserStore.state.my.verified_email) {
      // Visu right Toolbar to make SignIn
      GlobalStore.state.RightDrawerOpen = true
+
+      tools.showNeutralNotif(this.$q, this.$t('login.needlogin'))
+      tools.scrollToTop()
+
      // this.$router.push('/signin')
    } else {
      console.log('askForInfoEventMenu')
--- a/src/components/CEventsCalendar/CEventsCalendar.vue
+++ b/src/components/CEventsCalendar/CEventsCalendar.vue
@@ -55,17 +55,13 @@
                                <!--<span class="cal__teacher-content">{{myevent.teacher}}</span>-->
                                <span class="cal__teacher-content">
                                    <q-chip>
-                                        <q-avatar>
-                                            <img :src="getImgTeacherByUsername(myevent.teacher)">
-                                        </q-avatar>
+                                        <CMyAvatar :myimg="getImgTeacherByUsername(myevent.teacher)"></CMyAvatar>
                                        <span class="cal__teacher-content">{{getTeacherByUsername(myevent.teacher)}}</span>
                                    </q-chip>
                                    <span v-if="getImgTeacherByUsername(myevent.teacher2) && isValidUsername(myevent.teacher2)"
                                          class="margin_avatar2"></span>
                                    <q-chip v-if="getImgTeacherByUsername(myevent.teacher2) && isValidUsername(myevent.teacher2)">
-                                        <q-avatar>
-                                            <img :src="getImgTeacherByUsername(myevent.teacher2)">
-                                        </q-avatar>
+                                        <CMyAvatar :myimg="getImgTeacherByUsername(myevent.teacher2)"></CMyAvatar>
                                        <span class="cal__teacher-content">{{getTeacherByUsername(myevent.teacher2)}}</span>
                                    </q-chip>
                                </span>
@@ -297,6 +293,7 @@

                                        <q-input v-model="bookEventForm.msgbooking" :label="$t('cal.msgbooking')+':'"
                                                 type="textarea" debounce="500"
+                                                 input-class="myinput-area"
                                        >
                                        </q-input>
                                    </q-card-section>
@@ -358,7 +355,8 @@
                                <q-card class="text-white windowcol">
                                    <q-card-section>
                                        <q-input v-model="askInfoForm.message" :label="$t('cal.msgbooking')+':'"
-                                                 autofocus debounce="500" type="textarea">
+                                                 autofocus debounce="500" type="textarea"
+                                                 input-class="myinput-area">
                                        </q-input>
                                    </q-card-section>
                                </q-card>
@@ -610,17 +608,13 @@
                                            class="margin_with"></span></span>

                                <q-chip>
-                                    <q-avatar>
-                                        <img :src="getImgTeacherByUsername(event.teacher)">
-                                    </q-avatar>
+                                    <CMyAvatar :myimg="getImgTeacherByUsername(event.teacher)"></CMyAvatar>
                                    <span class="cal__teacher-content">{{getTeacherByUsername(event.teacher)}}</span>
                                </q-chip>
                                <span v-if="getImgTeacherByUsername(event.teacher2) && isValidUsername(event.teacher2)"
                                      class="margin_avatar2"></span>
                                <q-chip v-if="getImgTeacherByUsername(event.teacher2) && isValidUsername(event.teacher2)">
-                                    <q-avatar>
-                                        <img :src="getImgTeacherByUsername(event.teacher2)">
-                                    </q-avatar>
+                                    <CMyAvatar :myimg="getImgTeacherByUsername(event.teacher2)"></CMyAvatar>
                                    <span class="cal__teacher-content">{{getTeacherByUsername(event.teacher2)}}</span>
                                </q-chip>

--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -11,12 +11,10 @@ import { SingleProject } from '../projects/SingleProject'
 import { lists } from '../../store/Modules/lists'
 import { IParamsQuery } from '../../model/GlobalStore'
 import { fieldsTable } from '../../store/Modules/fieldsTable'
-import { CDateTime } from '../CDateTime'
-import { CMyToggleList } from '../CMyToggleList'
-import { CMyChipList } from '../CMyChipList'
+import { CMyPopupEdit } from '../CMyPopupEdit'

@Component({
-  components: { CDateTime, CMyToggleList, CMyChipList }
+  components: { CMyPopupEdit }
 })
 export default class CGridTableRec extends Vue {
  @Prop({ required: false }) public prop_mytable: string
@@ -54,7 +52,7 @@ export default class CGridTableRec extends Vue {
  public valPrec: string = ''

  public separator: 'horizontal'
-  public filter: string = ''
+  public filter = undefined
  public rowsel: any
  public dark: boolean = true
  public canEdit: boolean = false
@@ -84,8 +82,16 @@ export default class CGridTableRec extends Vue {
  public undoVal() {
    console.log('undoVal', 'colsel', this.colsel, 'valprec', this.valPrec, 'this.colkey', this.colkey, 'this.selected', this.rowsel)
    console.table(this.serverData)
-    if (this.colsel)
-      this.rowsel[this.colsel.field] = this.valPrec
+    if (this.colsel) {
+      if (this.colsel.subfield !== '') {
+        if (this.rowsel[this.colsel.field] === undefined)
+          this.rowsel[this.colsel.field] = {}
+        this.rowsel[this.colsel.field][this.colsel.subfield] = this.valPrec
+      } else {
+        this.rowsel[this.colsel.field] = this.valPrec
+      }
+    }
+
    // this.serverData[this.colsel] = this.valPrec

  }
@@ -93,13 +99,29 @@ export default class CGridTableRec extends Vue {
  public SaveValue(newVal, valinitial) {
    console.log('SaveValue', newVal, 'rowsel', this.rowsel)

+    // Update value in table memory
+    if (this.colsel.subfield !== '') {
+      if (this.rowsel[this.colsel.field] === undefined)
+        this.rowsel[this.colsel.field] = {}
+      this.rowsel[this.colsel.field][this.colsel.subfield] = newVal
+    } else {
+      this.rowsel[this.colsel.field] = newVal
+    }
+
    const mydata = {
      id: this.idsel,
      table: this.mytable,
      fieldsvalue: {}
    }

-    mydata.fieldsvalue[this.colsel.field] = newVal
+    if (this.colsel.subfield !== '') {
+      if (mydata.fieldsvalue[this.colsel.field] === undefined) {
+        mydata.fieldsvalue[this.colsel.field] = {}
+      }
+      mydata.fieldsvalue[this.colsel.field][this.colsel.subfield] = newVal
+    } else {
+      mydata.fieldsvalue[this.colsel.field] = newVal
+    }

    this.valPrec = valinitial

@@ -124,7 +146,7 @@ export default class CGridTableRec extends Vue {
      this.colExtra = []
      this.mycolumns.forEach((elem) => {
        if (elem.field !== tools.NOFIELD)
-          this.colVisib.push(elem.field)
+          this.colVisib.push(elem.field + elem.subfield)

        if (elem.visible && elem.field === tools.NOFIELD)
          this.colExtra.push(elem.name)
@@ -138,7 +160,7 @@ export default class CGridTableRec extends Vue {
  }

  public onRequest(props) {
-    console.log('onRequest')
+    console.log('onRequest', 'filter = ' , this.filter)
    const { page, rowsPerPage, rowsNumber, sortBy, descending } = props.pagination
    const filter = this.filter

@@ -273,13 +295,6 @@ export default class CGridTableRec extends Vue {
    return this.returnedCount
  }

-  public getclassCol(col) {
-    let mycl = (col.disable || !this.canEdit) ? '' : 'colmodif'
-    mycl += (col.fieldtype === tools.FieldType.date) ? ' coldate flex flex-container' : ''
-
-    return mycl
-  }
-
  public async createNewRecord() {
    this.loading = true

@@ -331,16 +346,19 @@ export default class CGridTableRec extends Vue {
  }

  public refresh() {
+    this.serverData = []
+
+    console.log('refresh')
    // console.log('this.search', this.search)
    if (!!this.search && this.search !== '')
      this.filter = this.search
    else
-      this.filter = ''
+      this.filter = undefined

    // console.log('this.filter', this.filter)

    this.onRequest({
-      pagination: this.pagination
+      pagination: this.pagination,
    })
  }

@@ -373,38 +391,6 @@ export default class CGridTableRec extends Vue {
    }
  }

-  public visuValByType(col: IColGridTable, val) {
-    if (col.fieldtype === tools.FieldType.date) {
-      if (val === undefined) {
-        return '[]'
-      } else {
-        return tools.getstrDateTime(val)
-      }
-    } else if (col.fieldtype === tools.FieldType.boolean) {
-      return (val) ? this.$t('dialog.yes') : this.$t('dialog.no')
-    } else if (col.fieldtype === tools.FieldType.binary) {
-      if (val === undefined)
-        return '[---]'
-      else
-        return fieldsTable.getArrStrByValueBinary(this, col, val)
-    } else {
-      if (val === undefined)
-        return '[]'
-      else if (val === '') {
-        return '[]'
-      } else {
-        let mystr = tools.firstchars(val, tools.MAX_CHARACTERS)
-        if (val) {
-          if (val.length > tools.MAX_CHARACTERS)
-            mystr += '...'
-        } else {
-          return val
-        }
-        return mystr
-      }
-    }
-  }
-
  public changeCol(newval) {
    tools.setCookie(this.mytable, this.colVisib.join('|'))
  }
@@ -420,6 +406,13 @@ export default class CGridTableRec extends Vue {
      mytab = this.tablesList.find((rec) => rec.value === this.tablesel)
    }

+    if (mytab === undefined) {
+      this.tablesel = this.tablesList[0].value
+      if (this.tablesList) {
+        mytab = this.tablesList.find((rec) => rec.value === this.tablesel)
+      }
+    }
+
    console.log('this.tablesel', this.tablesel, 'mytab', mytab)

    if (mytab) {
@@ -428,10 +421,10 @@ export default class CGridTableRec extends Vue {
      this.mycolumns = [...mytab.columns]
    }

-    console.log('this.mycolumns')
-    console.log(this.mycolumns)
-    console.log('this.tablesList:')
-    console.table(this.tablesList)
+    // console.log('this.mycolumns')
+    // console.log(this.mycolumns)
+    // console.log('this.tablesList:')
+    // console.table(this.tablesList)

    if (!!this.mycolumns) {
      this.mycolumns.forEach((rec: IColGridTable) => {
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -20,7 +20,7 @@
                <q-tr :props="props">
                    <q-th
                            v-for="col in props.cols"
-                            v-if="colVisib.includes(col.field)"
+                            v-if="colVisib.includes(col.field + col.subfield)"
                            :key="col.name"
                            :props="props"
                            class="text-italic text-weight-bold"
@@ -56,8 +56,9 @@
                <q-select
                        v-if="mytable"
                        v-model="colVisib"
+                        rounded
+                        outlined
                        multiple
-                        borderless
                        dense
                        options-dense
                        :display-value="$t('grid.columns')"
@@ -90,95 +91,16 @@
            </template>

            <q-tr v-if="mytable" slot="body" slot-scope="props" :props="props">
-                <q-td v-for="col in mycolumns" :key="col.name" :props="props" v-if="colVisib.includes(col.field)">
-                    <div v-if="col.fieldtype === tools.FieldType.date">
-                        <div :class="getclassCol(col)">
-                            <CDateTime
-                                    :label="col.label"
-                                    class="cursor-pointer"
-                                    :valueDate="props.row[col.name]"
-                                    :readonly="false"
-                                    :dense="true"
-                                    :canEdit="canEdit"
-                                    @savetoclose="SaveValue"
-                                    @show="selItem(props.row, col)"
-                                    >
-                            </CDateTime>
-                        </div>
-                    </div>
-                    <div v-else-if="col.fieldtype === tools.FieldType.boolean">
-                        <div :class="getclassCol(col)">
-                            {{ visuValByType(col, props.row[col.name]) }}
-                            <q-popup-edit v-if="canEdit" v-model="props.row[col.name]" :disable="col.disable"
-                                          :title="col.title" buttons
-                                          @save="SaveValue" @show="selItem(props.row, col)">
-                                <q-checkbox v-model="props.row[col.name]" label="">
+                <q-td v-for="col in mycolumns" :key="col.name" :props="props" v-if="colVisib.includes(col.field + col.subfield)">
+                    <CMyPopupEdit :canEdit="canEdit"
+                                  :col="col"
+                                  :row.sync="props.row"
+                                  :field="col.field"
+                                  :subfield="col.subfield"
+                                  @save="SaveValue"
+                                  @show="selItem(props.row, col)">

-                                </q-checkbox>
-                                {{ visuValByType(col, props.row[col.name]) }}
-
-                            </q-popup-edit>
-                        </div>
-                    </div>
-                    <div v-else-if="col.fieldtype === tools.FieldType.binary">
-                        <div :class="getclassCol(col)">
-
-                            <CMyChipList
-                                    :value="props.row[col.name]"
-                                    :options="db_fieldsTable.getTableJoinByName(col.jointable)"
-                                    :optval="db_fieldsTable.getKeyByTable(col.jointable)"
-                                    :optlab="db_fieldsTable.getLabelByTable(col.jointable)"
-                                    :opticon="db_fieldsTable.getIconByTable(col.jointable)"
-                            ></CMyChipList>
-
-                            <q-popup-edit v-if="canEdit" v-model="props.row[col.name]" :disable="col.disable"
-                                          :title="col.title" buttons
-                                          @save="SaveValue" @show="selItem(props.row, col)">
-
-                                <CMyToggleList :label="col.title"
-                                        :options="db_fieldsTable.getTableJoinByName(col.jointable)"
-                                               :value.sync="props.row[col.name]"
-                                               :optval="db_fieldsTable.getKeyByTable(col.jointable)"
-                                               :optlab="db_fieldsTable.getLabelByTable(col.jointable)"
-
-                                >
-
-                                </CMyToggleList>
-
-                            </q-popup-edit>
-                        </div>
-                    </div>
-                    <div v-else-if="col.fieldtype === tools.FieldType.string">
-                        <div :class="getclassCol(col)">
-                            {{ visuValByType(col, props.row[col.name]) }}
-                            <q-popup-edit v-if="canEdit" v-model="props.row[col.name]" :disable="col.disable"
-                                          :title="col.title" buttons
-                                          @save="SaveValue" @show="selItem(props.row, col)">
-                                <q-input v-model="props.row[col.name]"
-                                         autofocus
-                                >
-
-                                </q-input>
-
-                            </q-popup-edit>
-                        </div>
-                    </div>
-                    <div v-else-if="col.fieldtype === tools.FieldType.html">
-                        <div :class="getclassCol(col)">
-                            {{ visuValByType(col, props.row[col.name]) }}
-                            <q-popup-edit v-if="canEdit" v-model="props.row[col.name]" :disable="col.disable"
-                                          :title="col.title" buttons
-                                          @save="SaveValue" @show="selItem(props.row, col)">
-                                <q-input v-model="props.row[col.name]"
-                                         autofocus
-                                         @keyup.enter.stop
-                                         type="textarea">
-
-                                </q-input>
-
-                            </q-popup-edit>
-                        </div>
-                    </div>
+                    </CMyPopupEdit>
                </q-td>
                <q-td v-for="col in mycolumns" :key="col.name" :props="props" v-if="colExtra.includes(col.name)">
                    <div v-if="col.action && visCol(col)">
--- a/src/components/CMySelect/CMySelect.ts
+++ b/src/components/CMySelect/CMySelect.ts
@@ -3,7 +3,6 @@ import { Component, Prop, Watch } from 'vue-property-decorator'

 import { tools } from '../../store/Modules/tools'
 import { toolsext } from '@src/store/Modules/toolsext'
-import { IOperators } from '../../model/GlobalStore'

@Component({
  name: 'CMySelect'
@@ -26,14 +25,7 @@ export default class CMySelect extends Vue {
    return tools
  }

-  public nothing() {
-
-  }
-
  public changeval(newval) {
-    // console.log('changeval', newval)
-    // const newvallab = newval[`${this.optval}`]
-    // this.myvalue = newvallab
    this.$emit('update:value', newval)
  }

--- a/src/components/CMySelect/CMySelect.vue
+++ b/src/components/CMySelect/CMySelect.vue
@@ -2,8 +2,9 @@
    <div>
        <div v-if="useinput">
            <q-select
+                    rounded
+                    outlined
                    :input-class="myclass"
-                    filled
                    v-model="myvalue"
                    :use-input="useinput"
                    input-debounce="0"
@@ -20,8 +21,10 @@
        </div>
        <div v-else>
            <q-select
+                    rounded
+                    outlined
+                    dense
                    :input-class="myclass"
-                    filled
                    v-model="myvalue"
                    :options="options"
                    :option-value="optval"
--- a/src/components/Footer/Footer.ts
+++ b/src/components/Footer/Footer.ts
@@ -12,6 +12,7 @@ import { static_data } from '@src/db/static_data'

 import Quasar from 'quasar'
 import { FormNewsletter } from '../FormNewsletter'
+import { IUserState } from '../../model'

@Component({
  name: 'Footer',
@@ -32,18 +33,25 @@ export default class Footer extends Vue {
  }

  get TelegramSupport() {
-    return db_data.TELEGRAM_SUPPORT
+    return GlobalStore.getters.getValueSettingsByKey('TELEGRAM_SUPPORT')
+  }
+
+  get Whatsapp_Cell() {
+    return GlobalStore.getters.getValueSettingsByKey('WHATSAPP_CELL')
  }

  get FBPage() {
-    return db_data.URL_FACEBOOK
+    const fb = GlobalStore.getters.getValueSettingsByKey('URL_FACEBOOK')
+    return fb
  }

  get InstagramPage() {
-    return db_data.URL_INSTAGRAM
+    const insta = GlobalStore.getters.getValueSettingsByKey('URL_INSTAGRAM')
+    return insta
  }

-  get static_data(){
+  get static_data() {
    return static_data
  }
+
 }
--- a/src/components/Footer/Footer.vue
+++ b/src/components/Footer/Footer.vue
@@ -80,6 +80,9 @@
        <q-page-scroller position="bottom-right" :scroll-offset="850" :offset="[18, 18]" style="opacity: 0.3">
            <q-btn fab icon="keyboard_arrow_up" color="accent"/>
        </q-page-scroller>
+        <q-page-sticky position="bottom-right" :offset="[18, 78]">
+            <q-btn fab icon="fab fa-whatsapp" color="green" />
+        </q-page-sticky>
    </div>
 </template>

--- a/src/components/Header/Header.ts
+++ b/src/components/Header/Header.ts
@@ -16,13 +16,14 @@ import { static_data } from '../../db/static_data'
 import globalroutines from '../../globalroutines'

 import MixinUsers from '../../mixins/mixin-users'
+import { CMyAvatar } from '../CMyAvatar'

@Component({
  name: 'Header',
  mixins: [MixinUsers],
  components: {
    drawer,
-    messagePopover, CSignIn
+    messagePopover, CSignIn, CMyAvatar
  }
 })

--- a/src/components/Header/Header.vue
+++ b/src/components/Header/Header.vue
@@ -109,9 +109,7 @@
                </q-btn>
                <q-btn class="q-mx-xs" v-if="static_data.functionality.SHOW_USER_MENU && isLogged" round dense flat
                       @click="rightDrawerOpen = !rightDrawerOpen">
-                    <q-avatar size="30px">
-                        <img :src="getMyImg">
-                    </q-avatar>
+                    <CMyAvatar :myimg="getMyImg"></CMyAvatar>
                </q-btn>

            </q-toolbar>
@@ -130,6 +128,7 @@

        </q-drawer>

+
        <!-- USER BAR -->
        <q-drawer v-if="static_data.functionality.SHOW_USER_MENU" v-model="rightDrawerOpen" side="right" elevated>
            <div id="profile">
@@ -138,9 +137,8 @@
                </q-img>
                <div class="absolute-top bg-transparent text-black center_img" style="margin-top: 10px;">

-                    <q-avatar class="q-mb-sm center_img">
-                        <img :src="`../../` + getMyImg">
-                    </q-avatar>
+                    <CMyAvatar :myimg="getMyImg"></CMyAvatar>
+
                    <q-btn class="absolute-top-right" style="margin-right: 10px; color: white;"
                           dense flat round icon="close" @click="rightDrawerOpen = !rightDrawerOpen">
                    </q-btn>
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -7,6 +7,8 @@ export * from './CBook'
 export * from './CMyPage'
 export * from './CTitle'
 export * from './CMySelect'
+export * from './CMyAvatar'
+export * from './CMyPopupEdit'
 export * from './CMyToggleList'
 export * from './CMyChipList'
 export * from './CMyEditor'
--- a/src/mixins/mixin-users.ts
+++ b/src/mixins/mixin-users.ts
@@ -53,7 +53,8 @@ export default class MixinUsers extends Vue {
  }

  get getMyImg() {
-    return 'statics/' + UserStore.getters.getImgByUsername(UserStore.state.my.username)
+    const ris = UserStore.getters.getImgByUsername(UserStore.state.my.username)
+    return (ris !== '') ? 'statics/' + ris : ''
  }

  get MenuCollapse() {
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -26,6 +26,14 @@ export interface ICfgData {
  userId?: string
 }

+export interface ISettings {
+  key?: string
+  type?: number
+  value_str?: string
+  value_date?: Date,
+  value_num?: number
+}
+
 export interface ITestp1 {
  contatore: number
  mioarray: ICfgServer[]
@@ -40,6 +48,7 @@ export interface IConfig {
 }

 export interface IGlobalState {
+  finishLoading: boolean
  conta: number
  wasAlreadySubOnDb: boolean
  wasAlreadySubscribed: boolean
@@ -60,6 +69,7 @@ export interface IGlobalState {
  listatodo: IMenuList[]
  arrConfig: IConfig[]
  lastaction: IAction
+  settings: ISettings[],
 }

 export interface IMenuList {
@@ -217,6 +227,7 @@ export interface IParamsQuery {

 export interface IColGridTable {
  name: string
+  subfield?: string
  required?: boolean
  label?: string
  label_trans?: string
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -1,16 +1,5 @@
 import { IToken } from 'model/other'

-export const DefaultUser: IUserFields = {
-  email: '',
-  username: '',
-  name: '',
-  surname: '',
-  password: '',
-  profile: {
-    img: ''
-  }
-}
-
 const enum ESexType {
  None = 0,
  Male = 1,
--- a/src/statics/i18n.js
+++ b/src/statics/i18n.js
@@ -144,6 +144,7 @@ const msgglobal = {
      enter: 'Login',
      errato: "Username o password errata. Riprovare",
      completato: 'Login effettuato!',
+      needlogin: 'E\' necessario effettuare il login prima di continuare'
    },
    reset: {
      title_reset_pwd: "Reimposta la tua Password",
@@ -442,6 +443,7 @@ const msgglobal = {
      enter: 'Entra',
      errato: "Nombre de usuario, correo o contraseña incorrectos. inténtelo de nuevo",
      completato: 'Login realizado!',
+      needlogin: 'Debes iniciar sesión antes de continuar',
    },
    reset: {
      title_reset_pwd: "Restablece tu contraseña",
@@ -737,6 +739,7 @@ const msgglobal = {
      enter: 'Entrez',
      errato: "Nom d'utilisateur, email ou mot de passe incorrect. réessayer",
      completato: 'Connexion faite!',
+      needlogin: 'Vous devez vous connecter avant de continuer',
    },
    reset: {
      title_reset_pwd: "Réinitialiser votre mot de passe",
@@ -1031,6 +1034,7 @@ const msgglobal = {
      enter: 'Login',
      errato: "Username or password wrong. Please retry again",
      completato: 'Login successfully!',
+      needlogin: 'You must login before continuing',
    },
    reset: {
      title_reset_pwd: "Reset your Password",
@@ -1327,6 +1331,7 @@ const msgglobal = {
      enter: 'Login',
      errato: "Username or password wrong. Please retry again",
      completato: 'Login successfully!',
+      needlogin: 'You must login before continuing',
    },
    reset: {
      title_reset_pwd: "Reset your Password",
--- a/src/store/Modules/GlobalStore.ts
+++ b/src/store/Modules/GlobalStore.ts
@@ -34,6 +34,7 @@ getstateConnSaved()
  })

 const state: IGlobalState = {
+  finishLoading: false,
  conta: 0,
  wasAlreadySubscribed: false,
  wasAlreadySubOnDb: false,
@@ -66,7 +67,8 @@ const state: IGlobalState = {
    table: '',
    type: 0,
    _id: 0
-  }
+  },
+  settings: []
 }

 async function getConfig(id) {
@@ -152,6 +154,45 @@ namespace Getters {
    return ris
  }, 't')

+  const getListByTable = b.read((state) => (table) => {
+    if (table === tools.TABEVENTS)
+      return CalendarStore.state.eventlist
+    else if (table === 'operators')
+      return CalendarStore.state.operators
+    else if (table === 'wheres')
+      return CalendarStore.state.wheres
+    else if (table === 'contribtype')
+      return CalendarStore.state.contribtype
+    else if (table === 'bookings')
+      return CalendarStore.state.bookedevent
+    else if (table === 'users')
+      return UserStore.state.usersList
+    else if (table === 'sendmsgs')
+      return MessageStore.state.last_msgs
+    else if (table === 'settings')
+      return UserStore.state.settings
+    else if (table === 'permissions')
+      return UserStore.state.permissionsList
+    else
+      return null
+
+  }, 'getListByTable')
+
+  const getValueSettingsByKey = b.read((mystate: IGlobalState) => (key): any => {
+    const myrec = mystate.settings.find((rec) => rec.key === key)
+    if (!!myrec) {
+      if (myrec.type === tools.FieldType.date)
+        return myrec.value_date
+      if (myrec.type === tools.FieldType.number)
+        return myrec.value_num
+      else
+        return myrec.value_str
+    } else {
+      return ''
+    }
+
+  }, 'getValueSettingsByKey')
+
  export const getters = {
    get testpao1_getter_contatore() {
      return testpao1_getter_contatore()
@@ -187,6 +228,14 @@ namespace Getters {
      return getmenu()
    },

+    get getListByTable() {
+      return getListByTable()
+    },
+
+    get getValueSettingsByKey() {
+      return getValueSettingsByKey()
+    },
+
    get t() {
      return t()
    },
@@ -270,35 +319,13 @@ namespace Mutations {

  }

-  function getListByTable(table): any[] {
-    if (table === tools.TABEVENTS)
-      return CalendarStore.state.eventlist
-    else if (table === 'operators')
-      return CalendarStore.state.operators
-    else if (table === 'wheres')
-      return CalendarStore.state.wheres
-    else if (table === 'contribtype')
-      return CalendarStore.state.contribtype
-    else if (table === 'bookings')
-      return CalendarStore.state.bookedevent
-    else if (table === 'users')
-      return UserStore.state.usersList
-    else if (table === 'sendmsgs')
-      return MessageStore.state.last_msgs
-    else if (table === 'permissions')
-      return UserStore.state.permissionsList
-    else
-      return null
-
-  }
-
  function UpdateValuesInMemory(mystate: IGlobalState, mydata: IDataPass) {

    const id = mydata.id
    const table = mydata.table

    try {
-      const mylist = getListByTable(table)
+      const mylist = Getters.getters.getListByTable(table)
      const mykey = fieldsTable.getKeyByTable(table)

      const myrec = mylist.find((event) => event[mykey] === id)
@@ -653,13 +680,14 @@ namespace Actions {

    const myuserid = (UserStore.state.my._id) ? UserStore.state.my._id : '0'

-    const ris = await Api.SendReq('/loadsite/' + myuserid + '/' + process.env.APP_ID + '/' + showall, 'GET', null)
+    return await Api.SendReq('/loadsite/' + myuserid + '/' + process.env.APP_ID + '/' + showall, 'GET', null)
      .then((res) => {
        CalendarStore.state.bookedevent = (res.data.bookedevent) ? res.data.bookedevent : []
        CalendarStore.state.eventlist = (res.data.eventlist) ? res.data.eventlist : []
        CalendarStore.state.operators = (res.data.operators) ? res.data.operators : []
        CalendarStore.state.wheres = (res.data.wheres) ? res.data.wheres : []
        CalendarStore.state.contribtype = (res.data.contribtype) ? res.data.contribtype : []
+        GlobalStore.state.settings = (res.data.settings) ? [...res.data.settings] : []

      })
      .catch((error) => {
@@ -668,8 +696,6 @@ namespace Actions {
        return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, tools.ERR_GENERICO, error)
      })

-    return ris
-
  }

  export const actions = {
--- a/src/store/Modules/MessageStore.ts
+++ b/src/store/Modules/MessageStore.ts
@@ -122,7 +122,7 @@ namespace Actions {
    data.datemsg = tools.getDateNow()
    data.status = StatusMessage.WaitingToSend
    // Options
-    // data.options = tools.SetBit(data.options, shared_consts.MessageOptions.Notify_ByEmail)
+    data.options = tools.SetBit(data.options, shared_consts.MessageOptions.Notify_ByEmail)
    data.options = tools.SetBit(data.options, shared_consts.MessageOptions.Notify_ByPushNotification)

    console.log('DOPO:')
--- a/src/store/Modules/Store/calendar/CalendarStore.ts
+++ b/src/store/Modules/Store/calendar/CalendarStore.ts
@@ -86,13 +86,13 @@ namespace Getters {

  const getImgTeacherByUsername = b.read((mystate: ICalendarState) => (username): string => {
    if (username === '')
-      return 'images/avatar/avatar3_small.png'
+      return ''
    // Check if is this User!
    const myop = CalendarStore.getters.getOperatorByUsername(username)
    if (myop && !!myop.img && myop.img !== '' && myop.img !== 'undefined') {
      return myop.img
    } else {
-      return 'images/avatar/avatar3_small.png'
+      return ''
    }
  }, 'getImgTeacherByUsername')

--- a/src/store/Modules/UserStore.ts
+++ b/src/store/Modules/UserStore.ts
@@ -20,21 +20,23 @@ import { shared_consts } from '../../common/shared_vuejs'

 const bcrypt = require('bcryptjs')

+const DefaultUser: IUserFields = {
+  _id: '',
+  email: '',
+  username: '',
+  name: '',
+  surname: '',
+  password: '',
+  tokens: [],
+  verified_email: false,
+  profile: {
+    img: ''
+  }
+}
+
 // State
 const state: IUserState = {
-  my: {
-    _id: '',
-    email: '',
-    username: '',
-    name: '',
-    surname: '',
-    password: '',
-    tokens: [],
-    verified_email: false,
-    profile: {
-      img: ''
-    }
-  },
+  my: DefaultUser,
  lang: process.env.LANG_DEFAULT,
  repeatPassword: '',
  categorySel: 'personal',
@@ -143,13 +145,14 @@ namespace Getters {

  const getImgByUsername = b.read((mystate: IUserState) => (username): string => {
    if (username === '')
-      return 'images/avatar/avatar3_small.png'
+      return ''
    // Check if is this User!
    const myrec = UserStore.getters.getUserByUsername(username)
+    // console.log('myrec', myrec)
    if (myrec && myrec.profile && !!myrec.profile.img && myrec.profile.img !== '' && myrec.profile.img !== 'undefined') {
      return myrec.profile.img
    } else {
-      return 'images/avatar/avatar3_small.png'
+      return ''
    }
  }, 'getImgByUsername')

@@ -192,7 +195,7 @@ namespace Getters {
    },
    get getUsersList() {
      return getUsersList()
-    }
+    },
  }

 }
@@ -613,6 +616,7 @@ namespace Actions {
    localStorage.removeItem(tools.localStorage.wasAlreadySubOnDb)

    state.isLogged = false
+    state.my = { ...DefaultUser }

    await GlobalStore.actions.clearDataAfterLogout()

@@ -634,7 +638,6 @@ namespace Actions {
  async function setGlobal(isLogged: boolean) {
    console.log('setGlobal')
    // state.isLogged = true
-    state.isLogged = isLogged
    if (isLogged) {
      // console.log('state.isLogged', state.isLogged)

@@ -646,12 +649,17 @@ namespace Actions {

    const p3 = await GlobalStore.actions.loadAfterLogin()

+    state.isLogged = isLogged
+
    if (static_data.functionality.ENABLE_TODOS_LOADING)
      await Todos.actions.dbLoad({ checkPending: true })

    if (static_data.functionality.ENABLE_PROJECTS_LOADING)
      await Projects.actions.dbLoad({ checkPending: true, onlyiffirsttime: true })

+    GlobalStore.state.finishLoading = true
+
+    return true
    // console.log('setGlobal: END')
  }

@@ -698,11 +706,11 @@ namespace Actions {
        }
      }

-      await setGlobal(isLogged)
+      return await setGlobal(isLogged)

      // console.log('autologin _id STATE ', state._id)

-      return true
+      // return true
    } catch (e) {
      console.error('ERR autologin ', e.message)
      return false
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -2,6 +2,7 @@ import { IColGridTable } from '../../model'
 import { lists } from './lists'
 import { tools } from '@src/store/Modules/tools'
 import { shared_consts } from '@src/common/shared_vuejs'
+import { GlobalStore } from '@store'

 const DeleteRec = {
  name: 'deleterec',
@@ -24,6 +25,7 @@ function AddCol(params: IColGridTable) {
    label_trans: (params.label_trans === undefined) ? '' : params.label_trans,
    align: (params.align === undefined) ? 'left' : params.align,
    field: (params.field === undefined) ? params.name : params.field,
+    subfield: (params.subfield === undefined) ? '' : params.subfield,
    sortable: (params.sortable === undefined) ? true : params.sortable,
    disable: (params.disable === undefined) ? false : params.disable,
    titlepopupedit: (params.titlepopupedit === undefined) ? '' : params.titlepopupedit,
@@ -40,7 +42,7 @@ function AddCol(params: IColGridTable) {

 const colTableWhere = [
  AddCol({ name: 'code', label_trans: 'where.code' }),
-  AddCol({ name: 'placename', label_trans: 'cal.where' }),
+  AddCol({ name: 'placename', label_trans: 'cal.where'} ),
  AddCol({ name: 'whereicon', label_trans: 'where.whereicon' }),
  AddCol(DeleteRec)
 ]
@@ -51,6 +53,15 @@ const colcontribtype = [
  AddCol(DeleteRec)
 ]

+const colsettings = [
+  AddCol({ name: 'key', label_trans: 'col.label' }),
+  AddCol({ name: 'type', label_trans: 'col.type', fieldtype: tools.FieldType.select, jointable: 'fieldstype' }),
+  AddCol({ name: 'value_str', label_trans: 'col.value', fieldtype: tools.FieldType.string }),
+  AddCol({ name: 'value_date', label_trans: 'cal.data', fieldtype: tools.FieldType.date }),
+  AddCol({ name: 'value_num', label_trans: 'cal.num', fieldtype: tools.FieldType.number }),
+  AddCol(DeleteRec)
+]
+
 const colTablePermission = [
  AddCol({ name: '_id', label_trans: 'others.value' }),
  AddCol({ name: 'label', label_trans: 'proj.longdescr' }),
@@ -86,12 +97,12 @@ const colTableEvents = [
  AddCol({ name: 'icon', label_trans: 'event.icon' }),
  AddCol({ name: 'img_small', label_trans: 'event.img_small' }),
  AddCol({ name: 'img', label_trans: 'event.img' }),
-  AddCol({ name: 'wherecode', label_trans: 'event.where' }),
-  AddCol({ name: 'contribtype', label_trans: 'event.contribtype' }),
+  AddCol({ name: 'wherecode', label_trans: 'event.where', fieldtype: tools.FieldType.select, jointable: 'wheres' }),
+  AddCol({ name: 'contribtype', label_trans: 'event.contribtype', fieldtype: tools.FieldType.select, jointable: 'contribtype' }),
  AddCol({ name: 'price', label_trans: 'event.price' }),
  AddCol({ name: 'infoafterprice', label_trans: 'event.infoafterprice' }),
-  AddCol({ name: 'teacher', label_trans: 'event.teacher' }),
-  AddCol({ name: 'teacher2', label_trans: 'event.teacher2' }),
+  AddCol({ name: 'teacher', label_trans: 'event.teacher', fieldtype: tools.FieldType.select, jointable: 'operators' }),
+  AddCol({ name: 'teacher2', label_trans: 'event.teacher2', fieldtype: tools.FieldType.select, jointable: 'operators' }),
  AddCol({ name: 'infoextra', label_trans: 'event.infoextra' }),
  AddCol({ name: 'linkpage', label_trans: 'event.linkpage' }),
  AddCol({ name: 'linkpdf', label_trans: 'event.linkpdf' }),
@@ -142,15 +153,41 @@ export const fieldsTable = {
    }
  },

+  getValueByTable(col: IColGridTable, val) {
+    if (col.jointable) {
+      const mylist = this.getTableJoinByName(col.jointable)
+      const key = this.getKeyByTable(col.jointable)
+      const collab = this.getLabelByTable(col.jointable)
+
+      // console.table(mylist)
+      // console.log('key=', key, 'collab', collab, 'val', val)
+
+      const myris = mylist.find((myrec) => myrec[key] === val)
+      // console.log('myris', myris)
+      if (myris) {
+        return myris[collab]
+      } else {
+        return ''
+      }
+
+    } else {
+      return ''
+    }
+  },
+
  getColByTable(table) {
    if (table === 'permissions') {
      return ['value', 'label']
    }
  },
  getTableJoinByName(table) {
-    if (table === 'permissions') {
+    if (table === 'permissions')
      return [shared_consts.Permissions.Admin, shared_consts.Permissions.Manager, shared_consts.Permissions.Teacher]
-    }
+    else if (table === 'fieldstype')
+      return tools.FieldTypeArr
+    else
+      return GlobalStore.getters.getListByTable(table)
+
  },
  getrecTableList(mytable) {
    return this.tablesList.find((rec) => rec.value === mytable)
@@ -181,14 +218,14 @@ export const fieldsTable = {
      value: 'operators',
      label: 'Insegnanti',
      columns: colTableOperator,
-      colkey: '_id',
+      colkey: 'username',
      collabel: 'username'
    },
    {
      value: 'wheres',
      label: 'Luoghi',
      columns: colTableWhere,
-      colkey: '_id',
+      colkey: 'code',
      collabel: 'placename'
    },
    {
@@ -212,7 +249,20 @@ export const fieldsTable = {
      colkey: 'value',
      collabel: 'label',
      colicon: 'icon'
-    }
+    },
+    {
+      value: 'fieldstype',
+      label: 'Tipi di Campi',
+      colkey: 'value',
+      collabel: 'label'
+    },
+    {
+      value: 'settings',
+      label: 'Impostazioni',
+      columns: colsettings,
+      colkey: 'key',
+      collabel: 'key'
+    },
  ],

  // IColGridTable
@@ -222,9 +272,9 @@ export const fieldsTable = {
    AddCol({ name: 'surname', label_trans: 'reg.surname' }),
    AddCol({ name: 'email', label_trans: 'reg.email' }),
    AddCol({ name: 'cell', label_trans: 'reg.cell' }),
+    AddCol({ name: 'profile.img', field: 'profile', subfield: 'img', label_trans: 'reg.img', sortable: false }),
    AddCol({ name: 'date_reg', label_trans: 'reg.date_reg', fieldtype: tools.FieldType.date }),
    AddCol({ name: 'perm', label_trans: 'reg.perm', fieldtype: tools.FieldType.binary, jointable: 'permissions' }),
-    AddCol({ name: 'img', label_trans: 'reg.img', sortable: false }),
    AddCol(DeleteRec),
    AddCol({
      name: 'copyrec',
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -4,6 +4,9 @@ import { costanti } from './costanti'
 import { toolsext } from './toolsext'
 import { translation } from './translation'
 import Quasar, { colors, date, Screen } from 'quasar'
+import { scroll } from 'quasar'
+const { getScrollTarget, setScrollPosition } = scroll
+
 import {
  IBookedEvent,
  ICollaborations,
@@ -124,9 +127,22 @@ export const tools = {
    date: 2,
    string: 4,
    binary: 8,
-    html: 16
+    html: 16,
+    select: 32,
+    number: 64,
+    typeinrec: 128,
  },

+  FieldTypeArr: [
+    { label: 'Boolean', value: 1 },
+    { label: 'Date', value: 2 },
+    { label: 'String', value: 4 },
+    { label: 'Binary', value: 8 },
+    { label: 'Html', value: 16 },
+    { label: 'Select', value: 32 },
+    { label: 'Number', value: 64 }
+  ],
+
  SelectListNumPeople: [
    {
      id: 1,
@@ -1430,7 +1446,7 @@ export const tools = {
  },

  showNeutralNotif(q: any, msg) {
-    tools.showNotif(q, msg, { color: 'warning', icon: 'notifications' })
+    tools.showNotif(q, msg, { color: 'info', icon: 'notifications' })
  },

  showNotif(q: any, msg, data ?: INotify | null
@@ -2567,17 +2583,33 @@ export const tools = {
    return Cookies.remove(mytok)
  },
  notshowPwd(payload) {
-    const mypay = {...payload}
-    try{
+    const mypay = { ...payload }
+    try {
      if (!!mypay.password) {
        mypay.password = '**********'
      }
-    }catch (e) {
+    } catch (e) {
      console.log('error', e)
    }
    return mypay
+  },
+  scrollToTop() {
+    const element = document.getElementById('mypage')
+    this.scrollToElement(element)
+  },
+  scrollToElementId(myid) {
+    const element = document.getElementById(myid)
+    this.scrollToElement(element)
+  },
+  scrollToElement(el) {
+    const target = getScrollTarget(el)
+    const offset = el.offsetTop
+    const duration = 500
+    console.log('target', target, 'offset', offset, 'duration', duration)
+    setScrollPosition(target, offset, duration)
  }

+
 // getLocale() {
  //   if (navigator.languages && navigator.languages.length > 0) {
  //     return navigator.languages[0]
--- a/src/views/messages/messages.ts
+++ b/src/views/messages/messages.ts
@@ -9,10 +9,7 @@ import { IChat, IMessage, IUserState, MsgDefault, StatusMessage } from '../../mo
 import { Getter } from 'vuex-class'
 import { IMsgUsers } from '../../model/MessageStore'
 import MixinUsers from '../../mixins/mixin-users'
-
-import { scroll } from 'quasar'
-
-const { getScrollTarget, setScrollPosition } = scroll
+import { CMyAvatar } from '../../components/CMyAvatar'

 // import {Loading, QSpinnerFacebook, QSpinnerGears} from 'quasar'

@@ -21,7 +18,7 @@ const namespace = 'MessageModule'
@Component({
  name: 'Messages',
  mixins: [MixinUsers],
-  components: {}
+  components: { CMyAvatar }
 })

 export default class Messages extends Vue {
@@ -81,14 +78,6 @@ export default class Messages extends Vue {
    return mystr
  }

-  public scrollToElement(el) {
-    const target = getScrollTarget(el)
-    const offset = el.offsetTop
-    const duration = 1000
-    // console.log('target', target, 'offset', offset, 'duration', duration)
-    setScrollPosition(target, offset, duration)
-  }
-
  public refreshdata(username: string) {
    this.loading = true

@@ -103,7 +92,7 @@ export default class Messages extends Vue {
      this.loading = false

      const element = document.getElementById('last')
-      this.scrollToElement(element)
+      tools.scrollToElement(element)

      // this.changemsgs('', '')

@@ -224,7 +213,7 @@ export default class Messages extends Vue {
      data.status = StatusMessage.Sending

      const element = document.getElementById('last')
-      this.scrollToElement(element)
+      tools.scrollToElement(element)

      if (!ris)
        tools.showNegativeNotif(self.$q, self.$t('cal.sendmsg_error'))
--- a/src/views/messages/messages.vue
+++ b/src/views/messages/messages.vue
@@ -76,9 +76,7 @@
                                <q-item clickable v-if="!!chatsel.username" @scroll="myonScroll">

                                    <q-item-section avatar>
-                                        <q-avatar>
-                                            <img :src="getImgByUsername(chatsel.username)">
-                                        </q-avatar>
+                                        <CMyAvatar :username="chatsel.username"></CMyAvatar>
                                    </q-item-section>

                                    <q-item-section>
@@ -116,9 +114,7 @@
                                                sent
                                                bg-color="blue-2">
                                            <template v-slot:avatar>
-                                                <q-avatar size="sm">
-                                                    <img :src="getMyImg">
-                                                </q-avatar>
+                                                <CMyAvatar size="sm" :username="Username"></CMyAvatar>
                                            </template>

                                        </q-chat-message>
--- a/yarn.lock
+++ b/yarn.lock
@@ -1078,7 +1078,7 @@
    "@nodelib/fs.stat" "2.0.3"
    run-parallel "^1.1.9"

-"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.1":
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
@@ -1088,7 +1088,7 @@
  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==

-"@nodelib/fs.walk@^1.2.1":
+"@nodelib/fs.walk@^1.2.3":
  version "1.2.4"
  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
@@ -1101,27 +1101,27 @@
  resolved "https://registry.yarnpkg.com/@positron/stack-trace/-/stack-trace-1.0.0.tgz#14fcc712a530038ef9be1ce6952315a839f466a8"
  integrity sha1-FPzHEqUwA475vhzmlSMVqDn0Zqg=

-"@quasar/app@^1.1.2":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@quasar/app/-/app-1.2.1.tgz#2cc23ed9230106ffc1605cc01de43395bff21405"
-  integrity sha512-cJaq56iTrIf0n1jjov2IRGCkjEA66iq+gPF7y1UAHr38s699pNPLugblvdqoFAa20ogDw/VtlrHOuQBcHoZSqQ==
+"@quasar/app@^1.2.3":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@quasar/app/-/app-1.2.3.tgz#da67dd62b35568e2dca6d406276e72b485bf6f38"
+  integrity sha512-CngV2kti6ngQEw8Jn0fFFIsIJ/rUMCGQ214aLzUk7lVYzHPYtrVjZQSCFT+tdaPWNRjEw0CYtozdQskpRuwv8Q==
  dependencies:
    "@quasar/babel-preset-app" "1.1.6"
    "@quasar/fastclick" "1.1.4"
    "@vue/preload-webpack-plugin" "1.1.1"
-    autoprefixer "9.6.1"
+    autoprefixer "9.7.1"
    chalk "2.4.2"
    chokidar "3.2.1"
    ci-info "2.0.0"
    compression-webpack-plugin "3.0.0"
    copy-webpack-plugin "5.0.4"
-    cross-spawn "7.0.0"
+    cross-spawn "7.0.1"
    css-loader "3.2.0"
    cssnano "4.1.10"
-    dot-prop "5.1.0"
+    dot-prop "5.1.1"
    elementtree "0.1.7"
    express "4.17.1"
-    fast-glob "3.0.4"
+    fast-glob "3.1.0"
    file-loader "4.2.0"
    friendly-errors-webpack-plugin "1.7.0"
    fs-extra "8.1.0"
@@ -1135,13 +1135,13 @@
    lodash.throttle "4.1.1"
    log-update "3.3.0"
    lru-cache "5.1.1"
-    memory-fs "0.4.1"
+    memory-fs "0.5.0"
    mini-css-extract-plugin "^0.8.0"
    minimist "1.2.0"
    ms "2.1.2"
    node-loader "0.6.0"
-    node-sass "4.12.0"
-    open "6.4.0"
+    node-sass "4.13.0"
+    open "7.0.0"
    optimize-css-assets-webpack-plugin "5.0.3"
    ouch "2.0.0"
    postcss-loader "3.0.0"
@@ -1153,8 +1153,8 @@
    strip-ansi "5.2.0"
    stylus "0.54.7"
    stylus-loader "3.0.2"
-    terser-webpack-plugin "2.1.2"
-    url-loader "2.1.0"
+    terser-webpack-plugin "2.2.1"
+    url-loader "2.2.0"
    vue "2.6.10"
    vue-loader "15.7.1"
    vue-router "3.1.3"
@@ -1162,10 +1162,10 @@
    vue-style-loader "4.1.2"
    vue-template-compiler "2.6.10"
    vuex "3.1.1"
-    webpack "4.41.0"
-    webpack-bundle-analyzer "3.5.2"
+    webpack "4.41.2"
+    webpack-bundle-analyzer "3.6.0"
    webpack-chain "6.0.0"
-    webpack-dev-server "3.8.2"
+    webpack-dev-server "3.9.0"
    webpack-merge "4.2.2"
    webpack-node-externals "1.7.2"
    workbox-webpack-plugin "4.3.1"
@@ -2234,7 +2234,7 @@ async@^1.5.2:
  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=

-async@^2.1.4:
+async@^2.1.4, async@^2.6.2:
  version "2.6.3"
  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -2256,18 +2256,18 @@ atob@^2.1.1:
  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==

-autoprefixer@9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
-  integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
+autoprefixer@9.7.1:
+  version "9.7.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.1.tgz#9ffc44c55f5ca89253d9bb7186cefb01ef57747f"
+  integrity sha512-w3b5y1PXWlhYulevrTJ0lizkQ5CyqfeU6BIRDbuhsMupstHQOeb1Ur80tcB1zxSu7AwyY/qCQ7Vvqklh31ZBFw==
  dependencies:
-    browserslist "^4.6.3"
-    caniuse-lite "^1.0.30000980"
+    browserslist "^4.7.2"
+    caniuse-lite "^1.0.30001006"
    chalk "^2.4.2"
    normalize-range "^0.1.2"
    num2fraction "^1.2.2"
-    postcss "^7.0.17"
-    postcss-value-parser "^4.0.0"
+    postcss "^7.0.21"
+    postcss-value-parser "^4.0.2"

 autoprefixer@^6.3.1:
  version "6.7.7"
@@ -2905,7 +2905,7 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
    caniuse-db "^1.0.30000639"
    electron-to-chromium "^1.2.7"

-browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.6.0, browserslist@^4.6.3, browserslist@^4.6.6, browserslist@^4.7.0:
+browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.6.0, browserslist@^4.6.6, browserslist@^4.7.0:
  version "4.7.0"
  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17"
  integrity sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA==
@@ -2914,6 +2914,15 @@ browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.5.4, browserslist@^4.6
    electron-to-chromium "^1.3.247"
    node-releases "^1.1.29"

+browserslist@^4.7.2:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.2.tgz#1bb984531a476b5d389cedecb195b2cd69fb1348"
+  integrity sha512-uZavT/gZXJd2UTi9Ov7/Z340WOSQ3+m1iBVRUknf+okKxonL9P83S3ctiBDtuRmRu8PiCHjqyueqQ9HYlJhxiw==
+  dependencies:
+    caniuse-lite "^1.0.30001004"
+    electron-to-chromium "^1.3.295"
+    node-releases "^1.1.38"
+
 bs-logger@0.x:
  version "0.2.6"
  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
@@ -3052,7 +3061,7 @@ cacache@^12.0.0, cacache@^12.0.2, cacache@^12.0.3:
    unique-filename "^1.1.1"
    y18n "^4.0.0"

-cacache@^13.0.0:
+cacache@^13.0.1:
  version "13.0.1"
  resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c"
  integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==
@@ -3204,11 +3213,16 @@ 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.30000999.tgz#4f0071fbaeeafc12adebeec31b355c0868f07de9"
  integrity sha512-NzRdDmSmg/kp+eNIE1FT+/aXsyGy0PPoAmSrRAR4kFFOs+P19csnJWx4OeIKo6sxurr4xzlsso3rO7SkK71SGw==

-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30000998:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30000998:
  version "1.0.30000999"
  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz#427253a69ad7bea4aa8d8345687b8eec51ca0e43"
  integrity sha512-1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg==

+caniuse-lite@^1.0.30001004, caniuse-lite@^1.0.30001006:
+  version "1.0.30001006"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001006.tgz#5b6e8288792cfa275f007b2819a00ccad7112655"
+  integrity sha512-MXnUVX27aGs/QINz+QG1sWSLDr3P1A3Hq5EUWoIt0T7K24DuvMxZEnh3Y5aHlJW6Bz2aApJdSewdYLd8zQnUuw==
+
 capture-exit@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
@@ -3983,14 +3997,14 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
    shebang-command "^1.2.0"
    which "^1.2.9"

-cross-spawn@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.0.tgz#21ef9470443262f33dba80b2705a91db959b2e03"
-  integrity sha512-6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw==
+cross-spawn@7.0.1, cross-spawn@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"
+  integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==
  dependencies:
    path-key "^3.1.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
+    shebang-command "^2.0.0"
+    which "^2.0.1"

 cross-spawn@^3.0.0:
  version "3.0.1"
@@ -4009,15 +4023,6 @@ cross-spawn@^5.0.1:
    shebang-command "^1.2.0"
    which "^1.2.9"

-cross-spawn@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"
-  integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
 crossvent@1.5.4:
  version "1.5.4"
  resolved "https://registry.yarnpkg.com/crossvent/-/crossvent-1.5.4.tgz#da2c4f8f40c94782517bf2beec1044148194ab92"
@@ -4424,7 +4429,7 @@ debug@3.1.0, debug@=3.1.0, debug@~3.1.0:
  dependencies:
    ms "2.0.0"

-debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.2.5, debug@^3.2.6:
+debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
  version "3.2.6"
  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -4768,10 +4773,10 @@ domutils@^1.5.1, domutils@^1.7.0:
    dom-serializer "0"
    domelementtype "1"

-dot-prop@5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.1.0.tgz#bdd8c986a77b83e3fca524e53786df916cabbd8a"
-  integrity sha512-n1oC6NBF+KM9oVXtjmen4Yo7HyAVWV2UUl50dCYJdw2924K6dX9bf9TTTWaKtYlRn0FEtxG27KS80ayVLixxJA==
+dot-prop@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.1.1.tgz#85783b39f2a54e04ae1981489a0ef2b9719bbd7d"
+  integrity sha512-QCHI6Lkf+9fJMpwfAFsTvbiSh6ujoPmhCLiDvD/n4dGtLvHfhuBwPdN6z2x4YSOwwtTcLoO/LP70xELWGF/JVA==
  dependencies:
    is-obj "^2.0.0"

@@ -4880,6 +4885,11 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.247:
  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.280.tgz#5f8950c8329e3e11b59c705fd59b4b8d9b3de5b9"
  integrity sha512-qYWNMjKLEfQAWZF2Sarvo+ahigu0EArnpCFSoUuZJS3W5wIeVfeEvsgmT2mgIrieQkeQ0+xFmykK3nx2ezekPQ==

+electron-to-chromium@^1.3.295:
+  version "1.3.301"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.301.tgz#a501a4542ceb78eeba55736fdaafb64a4c421a3a"
+  integrity sha512-MRUScWKAi/zh0B0vCOIWTXvFZDdCGtqFH9rmB0r8s6CR6zPgDFpc80JYj/kEB7dvoU5LpwGhIxF4BkeUWwKlqA==
+
 elegant-spinner@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
@@ -5591,16 +5601,15 @@ fast-deep-equal@^2.0.1:
  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=

-fast-glob@3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.0.4.tgz#d484a41005cb6faeb399b951fd1bd70ddaebb602"
-  integrity sha512-wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg==
+fast-glob@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.1.0.tgz#77375a7e3e6f6fc9b18f061cddd28b8d1eec75ae"
+  integrity sha512-TrUz3THiq2Vy3bjfQUB2wNyPdGBeGmdjbzzBLhfHN4YFurYptCKwGq/TfiRavbGywFRzY6U2CdmQ1zmsY5yYaw==
  dependencies:
-    "@nodelib/fs.stat" "^2.0.1"
-    "@nodelib/fs.walk" "^1.2.1"
-    glob-parent "^5.0.0"
-    is-glob "^4.0.1"
-    merge2 "^1.2.3"
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
    micromatch "^4.0.2"

 fast-glob@^2.2.6:
@@ -6235,7 +6244,7 @@ glob-parent@^3.1.0:
    is-glob "^3.1.0"
    path-dirname "^1.0.0"

-glob-parent@^5.0.0, glob-parent@~5.1.0:
+glob-parent@^5.1.0, glob-parent@~5.1.0:
  version "5.1.0"
  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
@@ -7557,6 +7566,11 @@ is-wsl@^1.1.0:
  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=

+is-wsl@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d"
+  integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==
+
 isarray@0.0.1:
  version "0.0.1"
  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -9384,18 +9398,18 @@ mem@^4.0.0:
    mimic-fn "^2.0.0"
    p-is-promise "^2.0.0"

-memory-fs@0.4.1, memory-fs@^0.4.0, memory-fs@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
+memory-fs@0.5.0, memory-fs@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
  dependencies:
    errno "^0.1.3"
    readable-stream "^2.0.1"

-memory-fs@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
-  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
+memory-fs@^0.4.0, memory-fs@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
  dependencies:
    errno "^0.1.3"
    readable-stream "^2.0.1"
@@ -9440,7 +9454,7 @@ merge-stream@^2.0.0:
  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==

-merge2@^1.2.3:
+merge2@^1.2.3, merge2@^1.3.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
  integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
@@ -9949,7 +9963,37 @@ node-releases@^1.1.29:
  dependencies:
    semver "^6.3.0"

-node-sass@4.12.0, node-sass@^4.11.0:
+node-releases@^1.1.38:
+  version "1.1.39"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.39.tgz#c1011f30343aff5b633153b10ff691d278d08e8d"
+  integrity sha512-8MRC/ErwNCHOlAFycy9OPca46fQYUjbJRDcZTHVWIGXIjYLM73k70vv3WkYutVnM4cCo4hE0MqBVVZjP6vjISA==
+  dependencies:
+    semver "^6.3.0"
+
+node-sass@4.13.0:
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066"
+  integrity sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==
+  dependencies:
+    async-foreach "^0.1.3"
+    chalk "^1.1.1"
+    cross-spawn "^3.0.0"
+    gaze "^1.0.0"
+    get-stdin "^4.0.1"
+    glob "^7.0.3"
+    in-publish "^2.0.0"
+    lodash "^4.17.15"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    nan "^2.13.2"
+    node-gyp "^3.8.0"
+    npmlog "^4.0.0"
+    request "^2.88.0"
+    sass-graph "^2.2.4"
+    stdout-stream "^1.4.0"
+    "true-case-path" "^1.0.2"
+
+node-sass@^4.11.0:
  version "4.12.0"
  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
  integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
@@ -10441,7 +10485,14 @@ onetime@^5.1.0:
  dependencies:
    mimic-fn "^2.1.0"

-open@6.4.0, open@^6.3.0:
+open@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-7.0.0.tgz#7e52999b14eb73f90f0f0807fe93897c4ae73ec9"
+  integrity sha512-K6EKzYqnwQzk+/dzJAQSBORub3xlBTxMz+ntpZpH/LyCa1o6KjXhuN+2npAaI9jaSmU3R1Q8NWf4KUWcyytGsQ==
+  dependencies:
+    is-wsl "^2.1.0"
+
+open@^6.3.0:
  version "6.4.0"
  resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
  integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==
@@ -11008,6 +11059,15 @@ portfinder@^1.0.20, portfinder@^1.0.24:
    debug "^2.2.0"
    mkdirp "0.5.x"

+portfinder@^1.0.25:
+  version "1.0.25"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
+  integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
+  dependencies:
+    async "^2.6.2"
+    debug "^3.1.1"
+    mkdirp "^0.5.1"
+
 posix-character-classes@^0.1.0:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -11646,6 +11706,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.1
    source-map "^0.6.1"
    supports-color "^6.1.0"

+postcss@^7.0.21:
+  version "7.0.21"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17"
+  integrity sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -11879,10 +11948,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.1.6:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/quasar/-/quasar-1.2.1.tgz#83117f5b17adcc7c08526b9aadc4ca7c2ab21287"
-  integrity sha512-7PbX8HecdrDzpG9zcZk5PSuPRFicU6b07N9Dk0uk5N+2LNGEFGBwIuQnLeDpq03Xdv98Q6GpTTZNaWpXdYBZcg==
+quasar@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/quasar/-/quasar-1.3.0.tgz#e0615595cef651ffa4a59ad8e333ba393fa98617"
+  integrity sha512-RnE/yGjk8tjl8OrfXX1Cno0GrSic51z6/7MxudV/8PaqjRWPKCQNQbFNQO2eQLlUU3yBuRxByziJHJ0LqWM+dQ==

 query-string@^4.1.0:
  version "4.3.4"
@@ -12723,6 +12792,14 @@ schema-utils@^2.0.0, schema-utils@^2.1.0, schema-utils@^2.4.1:
    ajv "^6.10.2"
    ajv-keywords "^3.4.1"

+schema-utils@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz#8f254f618d402cc80257486213c8970edfd7c22f"
+  integrity sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==
+  dependencies:
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+
 scrollreveal@^4.0.2:
  version "4.0.5"
  resolved "https://registry.yarnpkg.com/scrollreveal/-/scrollreveal-4.0.5.tgz#cf83cc5d9874dc0d92ef9c89a8894e57f3f8e034"
@@ -13655,18 +13732,18 @@ term-size@^1.2.0:
  dependencies:
    execa "^0.7.0"

-terser-webpack-plugin@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.1.2.tgz#2b9b8147a6f18918348200800cf9560c50f701bb"
-  integrity sha512-MF/C4KABwqYOfRDi87f7gG07GP7Wj/kyiX938UxIGIO6l5mkh8XJL7xtS0hX/CRdVQaZI7ThGUPZbznrCjsGpg==
+terser-webpack-plugin@2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.2.1.tgz#5569e6c7d8be79e5e43d6da23acc3b6ba77d22bd"
+  integrity sha512-jwdauV5Al7zopR6OAYvIIRcxXCSvLjZjr7uZE8l2tIWb/ryrGN48sJftqGf5k9z09tWhajx53ldp0XPI080YnA==
  dependencies:
-    cacache "^13.0.0"
+    cacache "^13.0.1"
    find-cache-dir "^3.0.0"
    jest-worker "^24.9.0"
-    schema-utils "^2.4.1"
+    schema-utils "^2.5.0"
    serialize-javascript "^2.1.0"
    source-map "^0.6.1"
-    terser "^4.3.4"
+    terser "^4.3.9"
    webpack-sources "^1.4.3"

 terser-webpack-plugin@^1.2.3, terser-webpack-plugin@^1.4.1:
@@ -13684,7 +13761,7 @@ terser-webpack-plugin@^1.2.3, terser-webpack-plugin@^1.4.1:
    webpack-sources "^1.4.0"
    worker-farm "^1.7.0"

-terser@^4.1.2, terser@^4.3.4:
+terser@^4.1.2:
  version "4.3.8"
  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.8.tgz#707f05f3f4c1c70c840e626addfdb1c158a17136"
  integrity sha512-otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ==
@@ -13693,6 +13770,15 @@ terser@^4.1.2, terser@^4.3.4:
    source-map "~0.6.1"
    source-map-support "~0.5.12"

+terser@^4.3.9:
+  version "4.3.9"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.9.tgz#e4be37f80553d02645668727777687dad26bbca8"
+  integrity sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
 test-exclude@^4.2.1:
  version "4.2.3"
  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20"
@@ -14256,14 +14342,14 @@ urix@^0.1.0:
  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=

-url-loader@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz#bcc1ecabbd197e913eca23f5e0378e24b4412961"
-  integrity sha512-kVrp/8VfEm5fUt+fl2E0FQyrpmOYgMEkBsv8+UDP1wFhszECq5JyGF33I7cajlVY90zRZ6MyfgKXngLvHYZX8A==
+url-loader@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.2.0.tgz#af321aece1fd0d683adc8aaeb27829f29c75b46e"
+  integrity sha512-G8nk3np8ZAnwhHXas1JxJEwJyQdqFXAKJehfgZ/XrC48volFBRtO+FIKtF2u0Ma3bw+4vnDVjHPAQYlF9p2vsw==
  dependencies:
    loader-utils "^1.2.3"
    mime "^2.4.4"
-    schema-utils "^2.0.0"
+    schema-utils "^2.4.1"

 url-loader@^1.1.2:
  version "1.1.2"
@@ -14663,7 +14749,26 @@ webidl-conversions@^4.0.2:
  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==

-webpack-bundle-analyzer@3.5.2, webpack-bundle-analyzer@^3.3.0:
+webpack-bundle-analyzer@3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz#39b3a8f829ca044682bc6f9e011c95deb554aefd"
+  integrity sha512-orUfvVYEfBMDXgEKAKVvab5iQ2wXneIEorGNsyuOyVYpjYrI7CUOhhXNDd3huMwQ3vNNWWlGP+hzflMFYNzi2g==
+  dependencies:
+    acorn "^6.0.7"
+    acorn-walk "^6.1.1"
+    bfj "^6.1.1"
+    chalk "^2.4.1"
+    commander "^2.18.0"
+    ejs "^2.6.1"
+    express "^4.16.3"
+    filesize "^3.6.1"
+    gzip-size "^5.0.0"
+    lodash "^4.17.15"
+    mkdirp "^0.5.1"
+    opener "^1.5.1"
+    ws "^6.0.0"
+
+webpack-bundle-analyzer@^3.3.0:
  version "3.5.2"
  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.5.2.tgz#ac02834f4b31de8e27d71e6c7a612301ebddb79f"
  integrity sha512-g9spCNe25QYUVqHRDkwG414GTok2m7pTTP0wr6l0J50Z3YLS04+BGodTqqoVBL7QfU/U/9p/oiI5XFOyfZ7S/A==
@@ -14726,7 +14831,46 @@ webpack-dev-middleware@^3.2.0, webpack-dev-middleware@^3.7.2:
    range-parser "^1.2.1"
    webpack-log "^2.0.0"

-webpack-dev-server@3.8.2, webpack-dev-server@^3.4.1:
+webpack-dev-server@3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz#27c3b5d0f6b6677c4304465ac817623c8b27b89c"
+  integrity sha512-E6uQ4kRrTX9URN9s/lIbqTAztwEPdvzVrcmHE8EQ9YnuT9J8Es5Wrd8n9BKg1a0oZ5EgEke/EQFgUsp18dSTBw==
+  dependencies:
+    ansi-html "0.0.7"
+    bonjour "^3.5.0"
+    chokidar "^2.1.8"
+    compression "^1.7.4"
+    connect-history-api-fallback "^1.6.0"
+    debug "^4.1.1"
+    del "^4.1.1"
+    express "^4.17.1"
+    html-entities "^1.2.1"
+    http-proxy-middleware "0.19.1"
+    import-local "^2.0.0"
+    internal-ip "^4.3.0"
+    ip "^1.1.5"
+    is-absolute-url "^3.0.3"
+    killable "^1.0.1"
+    loglevel "^1.6.4"
+    opn "^5.5.0"
+    p-retry "^3.0.1"
+    portfinder "^1.0.25"
+    schema-utils "^1.0.0"
+    selfsigned "^1.10.7"
+    semver "^6.3.0"
+    serve-index "^1.9.1"
+    sockjs "0.3.19"
+    sockjs-client "1.4.0"
+    spdy "^4.0.1"
+    strip-ansi "^3.0.1"
+    supports-color "^6.1.0"
+    url "^0.11.0"
+    webpack-dev-middleware "^3.7.2"
+    webpack-log "^2.0.0"
+    ws "^6.2.1"
+    yargs "12.0.5"
+
+webpack-dev-server@^3.4.1:
  version "3.8.2"
  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.8.2.tgz#3292427bf6510da9a3ac2d500b924a4197667ff9"
  integrity sha512-0xxogS7n5jHDQWy0WST0q6Ykp7UGj4YvWh+HVN71JoE7BwPxMZrwgraBvmdEMbDVMBzF0u+mEzn8TQzBm5NYJQ==
@@ -14803,7 +14947,36 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-
    source-list-map "^2.0.0"
    source-map "~0.6.1"

-webpack@4.41.0, webpack@^4.0.0, webpack@^4.29.6:
+webpack@4.41.2:
+  version "4.41.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e"
+  integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    acorn "^6.2.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.3"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.1"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
+    schema-utils "^1.0.0"
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.1"
+    watchpack "^1.6.0"
+    webpack-sources "^1.4.1"
+
+webpack@^4.0.0, webpack@^4.29.6:
  version "4.41.0"
  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.0.tgz#db6a254bde671769f7c14e90a1a55e73602fc70b"
  integrity sha512-yNV98U4r7wX1VJAj5kyMsu36T8RPPQntcb5fJLOsMz/pt/WrKC0Vp1bAlqPLkA1LegSwQwf6P+kAbyhRKVQ72g==