Merge pull request #87 from paoloar77/Messages

Messages

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",

src/common/shared_vuejs.ts

@@ -4,17 +4,20 @@ export const shared_consts = {
     Admin: {
       value: 1,
       label: 'pages.Admin',
-      icon: 'fas fa-user-shield'
+      icon: 'fas fa-user-shield',
+      color: 'red'
     },
     Manager: {
       value: 2,
       label: 'otherpages.manage.manager',
-      icon: 'fas fa-tools'
+      icon: 'fas fa-tools',
+      color: 'green'
     },
     Teacher: {
       value: 4,
       label: 'event.teacher',
-      icon: 'fas fa-user-tie'
+      icon: 'fas fa-user-tie',
+      color: 'blue'
     }
   },
 
@@ -24,7 +27,7 @@ export const shared_consts = {
   },
 
   fieldsUserToChange() {
-    return ['username', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'img', 'ipaddr', 'lasttimeonline']
+    return ['_id', 'username', 'email', 'cell', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'img', 'ipaddr', 'lasttimeonline', 'profile']
   }
 
 }

src/components/CBook/CBook.ts

@@ -3,7 +3,7 @@ import { Component, Prop, Watch } from 'vue-property-decorator'
 
 import { tools } from '../../store/Modules/tools'
 import { toolsext } from '@src/store/Modules/toolsext'
-import { IPerson } from '../../model/GlobalStore'
+import { IOperators } from '../../model/GlobalStore'
 
 @Component({
   name: 'CBook',
@@ -21,7 +21,7 @@ export default class CBook extends Vue {
     this.tab = 'two'
   }
 
-  @Prop({ required: true }) public op: IPerson
+  @Prop({ required: true }) public op: IOperators
 
   get tools() {
     return tools
@@ -35,9 +35,9 @@ export default class CBook extends Vue {
         index: 0,
         tab: '',
         name: '',
-        sub1: '',
+        qualification: '',
         sub2: '',
-        sub3: '',
+        certifications: '',
         img: '',
         cell: '',
         email: '',

src/components/CBook/CBook.vue

@@ -3,7 +3,7 @@
         <q-img :src="myop.img" class="myimg">
             <div class="absolute-bottom text-spacetrans text-shadow">
                 <div class="text-h6 text-trans">{{myop.name}}</div>
-                <div class="text-subtitle-carica text-trans">{{myop.sub1}}</div>
+                <div class="text-subtitle-carica text-trans">{{myop.qualification}}</div>
             </div>
         </q-img>
 
@@ -16,8 +16,8 @@
 
         <q-tab-panels v-model="tab" animated>
             <q-tab-panel name="one">
-                <div class="text-subtitle-carica">{{myop.sub2}}</div>
+                <div class="text-subtitle-carica">{{myop.disciplines}}</div>
-                <div v-if="myop.sub3" class="text-subtitle-certificato">{{myop.sub3}}</div>
+                <div v-if="myop.certifications" class="text-subtitle-certificato">{{myop.certifications}}</div>
                 <div class="op__cell">
                     <q-icon class="flex-icon" name="mobile_friendly"></q-icon>
                     {{myop.cell}}
@@ -33,7 +33,7 @@
         </q-tab-panels>
 
         <!--<q-card-section>-->
-        <!--<div class="text-subtitle3">{{myop.sub2}}</div>-->
+        <!--<div class="text-subtitle3">{{myop.disciplines}}</div>-->
         <!--{{myop.info}}-->
         <!--</q-card-section>-->
     </q-card>

src/components/CCard/CCard.ts

@@ -3,7 +3,7 @@ import { Component, Prop, Watch } from 'vue-property-decorator'
 
 import { tools } from '../../store/Modules/tools'
 import { toolsext } from '@src/store/Modules/toolsext'
-import { IPerson } from '../../model/GlobalStore'
+import { IOperators } from '../../model/GlobalStore'
 
 @Component({
   name: 'CCard',
@@ -16,28 +16,28 @@ import { IPerson } from '../../model/GlobalStore'
 
 export default class CCard extends Vue {
   @Prop({ required: true, default: 'one' }) public tab
+  @Prop({ required: true }) public op: IOperators
 
   public clicca() {
     this.tab = 'two'
   }
 
-  @Prop({ required: true }) public op: IPerson
-
   get tools() {
     return tools
   }
 
-  get myop() {
+  get myop(): IOperators {
     if (!!this.op) {
       return this.op
     } else {
       return {
-        index: 0,
         tab: '',
+        username: '',
         name: '',
-        sub1: '',
+        surname: '',
-        sub2: '',
+        qualification: '',
-        sub3: '',
+        disciplines: '',
+        certifications: '',
         img: '',
         cell: '',
         email: '',

src/components/CCard/CCard.vue

@@ -1,9 +1,9 @@
 <template>
     <q-card class="my-card text-center">
-        <q-img :src="myop.img" class="myimg">
+        <q-img :src="`statics/images/` + myop.img" class="myimg">
             <div class="absolute-bottom text-spacetrans text-shadow">
-                <div class="text-h6 text-trans">{{myop.name}}</div>
+                <div class="text-h6 text-trans">{{myop.name}} {{myop.surname}}</div>
-                <div class="text-subtitle-carica text-trans">{{myop.sub1}}</div>
+                <div class="text-subtitle-carica text-trans">{{myop.qualification}}</div>
             </div>
         </q-img>
 
@@ -16,11 +16,19 @@
 
         <q-tab-panels v-model="tab" animated>
             <q-tab-panel name="one">
-                <div class="text-subtitle-carica">{{myop.sub2}}</div>
+                <div class="text-subtitle-carica">{{myop.disciplines}}</div>
-                <div v-if="myop.sub3" class="text-subtitle-certificato">{{myop.sub3}}</div>
+                <div v-if="myop.certifications" class="text-subtitle-certificato">{{myop.certifications}}</div>
                 <div class="op__cell">
                     <q-icon class="flex-icon" name="mobile_friendly"></q-icon>
-                    {{myop.cell}}
+                    <span class="q-mx-sm">{{myop.cell}}</span>
+
+                    <q-btn fab-mini icon="fab fa-whatsapp"
+                           color="green" type="a"
+                           size="xs"
+
+                           :href="tools.getHttpForWhatsapp(myop.cell)" target="__blank">
+
+                    </q-btn>
                 </div>
                 <div class="op__email">
                     <q-icon class="flex-icon" name="contact_mail"> </q-icon>&nbsp;
@@ -45,7 +53,7 @@
         </q-tab-panels>
 
         <!--<q-card-section>-->
-        <!--<div class="text-subtitle3">{{myop.sub2}}</div>-->
+        <!--<div class="text-subtitle3">{{myop.disciplines}}</div>-->
         <!--{{myop.info}}-->
         <!--</q-card-section>-->
     </q-card>

src/components/CDateTime/CDateTime.scss

@@ -4,3 +4,7 @@
     max-width: 400px;
   }
 }
+
+.calendar_comp  {
+  vertical-align: center;
+}

src/components/CDateTime/CDateTime.ts

@@ -5,18 +5,21 @@ import { toolsext } from '@src/store/Modules/toolsext'
 
 import { date } from 'quasar'
 import { CalendarStore } from '../../store/Modules'
+import MixinBase from '../../mixins/mixin-base'
 
 @Component({
-  name: 'CDateTime'
+  name: 'CDateTime',
+  mixins: [MixinBase]
 })
 
 export default class CDateTime extends Vue {
   public $q
   public $t
-  @Prop() public value!: Date
+  @Prop({ required: false, default: null }) public value: Date
-  @Prop({ required: false, default: '' }) public label: string
+  @Prop({ required: false, default: null }) public valueDate: Date
+  @Prop({ required: true, default: 'Val:' }) public label: string
   @Prop({ required: false, default: '' }) public data_class!: string
-  @Prop({ required: false, default: false }) public readonly!: boolean
+  @Prop({ required: false, default: true }) public canEdit!: boolean
   @Prop({ required: false, default: false }) public disable!: boolean
   @Prop({ required: false, default: '' }) public bgcolor!: string
   @Prop({ required: false, default: false }) public dense: boolean
@@ -31,13 +34,17 @@ export default class CDateTime extends Vue {
     return 'calendar_comp ' + this.data_class
   }
 
-  @Watch('showDateTimeScroller')
+  // @Watch('showDateTimeScroller')
+
   public Opening() {
-    if (this.showDateTimeScroller) {
+    // console.log('Opening', 'myvalue', this.myvalue, 'value', this.value)
     this.saveit = false
     this.valueprec = this.myvalue
     this.$emit('show')
-    } else {
+  }
+
+  public Closing() {
+    // console.log('Closing')
     if (!this.saveit) {
       if (this.myvalue !== this.valueprec) {
         this.myvalue = this.valueprec
@@ -45,6 +52,16 @@ export default class CDateTime extends Vue {
       }
     }
   }
+
+  @Watch('valueDate')
+  public changevalueDate() {
+    this.myvalue = tools.getstrYYMMDDDateTime(this.valueDate)
+    // console.log('changevalueDate myvalue', this.myvalue)
+  }
+  @Watch('value')
+  public changevalue() {
+    this.myvalue = this.value
+    // console.log('changevalue myvalue', this.myvalue)
   }
 
   public savetoclose() {
@@ -72,12 +89,24 @@ export default class CDateTime extends Vue {
     return CalendarStore.state.locale
   }
 
-  public mounted() {
+  public created() {
+    if (this.value !== null)
       this.myvalue = this.value
+    else
+      this.myvalue = tools.getstrYYMMDDDateTime(this.valueDate)
+
+    // console.log('myvalue', this.myvalue)
   }
 
   public changeval(newval) {
-    // console.log('changeval', newval)
+    // console.log('changeval', newval, 'value=', this.value, 'myvalue=', this.myvalue)
     this.$emit('update:value', newval)
   }
+
+  public mystyle() {
+    if (this.label !== '')
+      return ''
+    else
+      return ''
+  }
 }

src/components/CDateTime/CDateTime.vue

@@ -1,24 +1,47 @@
 <template>
+    <div class="" :style="mystyle">
         <q-input v-model="myvalue"
+                 v-show="false"
                  color="blue-6"
+                 hide-bottom-space
                  outlined
+                 borderless
                  :label="label"
                  :bg-color="bgcolor"
-             :readonly="readonly"
                  :disable="disable"
                  :dense="dense"
                  mask="####-##-## ##:##"
                  debounce="500"
                  @input="changeval"
-             :class="getclass">
+                 :input-class="getclass"
+        >
+        </q-input>
 
-        <template #append>
+        <q-field
-            <q-icon name="event" class="cursor-pointer">
+                :label="label"
-                <q-popup-proxy v-model="showDateTimeScroller">
+                stack-label
+                :value="myvalue"
+                outlined
+                :dense="dense"
+                color="blue-6"
+                :bg-color="bgcolor"
+                debounce="500"
+                :input-class="getclass">
+
+            <template v-slot:control>
+                <div style="">
+                    <div class="self-center full-width no-outline" :style="mystyle" tabindex="0">
+                        {{ tools.getstrDateTime(myvalue) }}
+                    </div>
+                </div>
+            </template>
+            <template v-slot:append>
+                <q-icon v-if="canEdit" name="event" class="cursor-pointer">
+                    <q-popup-proxy v-model="showDateTimeScroller" @before-show="Opening" @before-hide="Closing">
 
                         <q-date-time-scroller
                                 v-model="myvalue"
-                            :locale="locale"
+                                :locale="toolsext.getLocale()"
                                 :hour24-format="true"
                                 :rounded-borders="true"
                                 border-color="#2196f3"
@@ -35,7 +58,8 @@
                     </q-popup-proxy>
                 </q-icon>
             </template>
-    </q-input>
+        </q-field>
+    </div>
 </template>
 
 <script lang="ts" src="./CDateTime.ts">

src/components/CEventsCalendar/CEventsCalendar.scss

@@ -134,6 +134,14 @@ $graytext: #555;
     height: 150px;
   }
 
+  &__tdimg_small {
+    width: auto;
+    height: 50px !important;
+    @media (max-width: 800px) {
+      height: 40px !important;
+    }
+  }
+
   &__table {
     margin: 10px;
     border: solid 1px #4198ef;
@@ -167,7 +175,7 @@ $graytext: #555;
   }
 
   &__img {
-    padding: 0.5rem !important;
+    padding: 0.25rem !important;
     float: left;
     width: 150px;
     height: 150px;
@@ -181,6 +189,14 @@ $graytext: #555;
     }
   }
 
+  &__img:hover {
+    transition: transform .2s;
+    transform: scale(1.05);
+    border: inset;
+    border-color: blue;
+    border-width: 1px;
+  }
+
 }
 
 @media (max-width: 718px) {
@@ -238,6 +254,20 @@ $graytext: #555;
   }
 }
 
+.chipmodif {
+
+  position: absolute;
+  margin-top: -10px;
+  overflow: hidden;
+  z-index: 9999;
+  box-sizing: border-box;
+  right: 0;
+  @media (max-width: 400px) {
+    position: initial;
+    right: initial;
+  }
+}
+
 .windowcol {
   background-color: #ffffff;
           // background: radial-gradient(circle, #ffffff 0%, #94dbfb 100%)

src/components/CEventsCalendar/CEventsCalendar.ts

@@ -32,11 +32,13 @@ import { GlobalStore, MessageStore } from '../../store/Modules'
 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: [MixinUsers],
+  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
@@ -252,7 +254,14 @@ export default class CEventsCalendar extends Vue {
   }
 
   get dayHeight() {
-    return CalendarStore.state.dayHeight
+    if (Screen.height < 500)
+      return 100
+    if (Screen.height < 700)
+      return 110
+    else if (Screen.height < 800)
+      return 120
+    else
+      return 140
   }
 
   get theme() {
@@ -392,6 +401,14 @@ export default class CEventsCalendar extends Vue {
     // console.log('showEvent - FINE ' + myevent)
   }
 
+  public selectEvent(eventparam: IEvents) {
+    if (this.myevent === eventparam)
+      this.myevent = null
+    else
+      this.myevent = eventparam
+
+  }
+
   public onDateChanged(mydate) {
     this.calendarView = 'day'
   }
@@ -426,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')
@@ -445,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')
@@ -485,6 +510,19 @@ export default class CEventsCalendar extends Vue {
     tools.CancelEvent(this, eventparam)
   }
 
+  public duplicateEvent(eventparam, numgg, numev: number = 1 ) {
+    for (let i = 0; i < numev; ++i) {
+      GlobalStore.actions.DuplicateRec({ table: tools.TABEVENTS, id: eventparam._id }).then((rec) => {
+        rec.dateTimeStart = tools.addDays(new Date(rec.dateTimeStart), numgg * (i + 1))
+        rec.dateTimeEnd = tools.addDays(new Date(rec.dateTimeEnd), numgg * (i + 1))
+        CalendarStore.state.eventlist.push(rec)
+        this.editEvent(rec)
+
+      })
+    }
+    // tools.ActionRecTable(this, lists.MenuAction.DUPLICATE_RECTABLE, tools.TABEVENTS, eventparam._id, eventparam, 'db.duplicatedrecord')
+  }
+
   public findEventIndex(eventparam) {
     for (let i = 0; i < CalendarStore.state.eventlist.length; ++i) {
       if (eventparam) {
@@ -997,4 +1035,14 @@ export default class CEventsCalendar extends Vue {
 
     return (new Date(myevent.dateTimeEnd) >= datenow)
   }
+
+  public getTitleEv(event: IEvents) {
+    return (!!event.short_tit) ? event.short_tit : event.title
+  }
+
+  public getStyleByEvent(event: IEvents) {
+    if (event === this.myevent) {
+      return 'border: inset; border-color: darkblue; border-width: 3px; padding: 5px !important; '
+    }
+  }
 }

src/components/CEventsCalendar/CEventsCalendar.vue

@@ -10,11 +10,28 @@
                         <q-toolbar-title>
                             {{ $t('cal.event') }}
                         </q-toolbar-title>
+                        <q-btn v-if="editable" flat round color="white" icon="fas fa-copy">
+                            <q-menu
+                                    transition-show="flip-right"
+                                    transition-hide="flip-left">
+                                <q-list style="min-width: 100px">
+                                    <q-item clickable @click="duplicateEvent(myevent, 7)">
+                                        <q-item-section>Tra 1 Settimana</q-item-section>
+                                    </q-item>
+                                    <q-item clickable @click="duplicateEvent(myevent, 14)">
+                                        <q-item-section>Tra 2 Settimane</q-item-section>
+                                    </q-item>
+                                    <q-item clickable @click="duplicateEvent(myevent, 7, 4)">
+                                        <q-item-section>4 Eventi ogni Settimana</q-item-section>
+                                    </q-item>
+                                </q-list>
+                            </q-menu>
+                        </q-btn>
                         <q-btn v-if="editable" flat round color="white" icon="delete" v-close-popup
                                @click="deleteEvent(myevent)"></q-btn>
                         <q-btn v-if="editable" flat round color="white" icon="edit" v-close-popup
                                @click="editEvent(myevent)"></q-btn>
-                        <q-btn flat round color="white" icon="cancel" v-close-popup></q-btn>
+                        <q-btn flat round color="white" icon="cancel" v-close-popup @click="myevent = null; displayEvent = false"></q-btn>
                     </q-toolbar>
                     <q-card-section class="inset-shadow">
                         <q-img :src="getImgEvent(myevent)"
@@ -38,18 +55,14 @@
                                 <!--<span class="cal__teacher-content">{{myevent.teacher}}</span>-->
                                 <span class="cal__teacher-content">
                                     <q-chip>
-                                        <q-avatar>
+                                        <CMyAvatar :myimg="getImgTeacherByUsername(myevent.teacher)"></CMyAvatar>
-                                            <img :src="`../../statics/images/` + getImgByUsername(myevent.teacher)">
+                                        <span class="cal__teacher-content">{{getTeacherByUsername(myevent.teacher)}}</span>
-                                        </q-avatar>
-                                        <span class="cal__teacher-content">{{getUserByUsername(myevent.teacher)}}</span>
                                     </q-chip>
-                                    <span v-if="getImgByUsername(myevent.teacher2) && myevent.teacher2"
+                                    <span v-if="getImgTeacherByUsername(myevent.teacher2) && isValidUsername(myevent.teacher2)"
                                           class="margin_avatar2"></span>
-                                    <q-chip v-if="getImgByUsername(myevent.teacher2) && myevent.teacher2">
+                                    <q-chip v-if="getImgTeacherByUsername(myevent.teacher2) && isValidUsername(myevent.teacher2)">
-                                        <q-avatar>
+                                        <CMyAvatar :myimg="getImgTeacherByUsername(myevent.teacher2)"></CMyAvatar>
-                                            <img :src="`../../statics/images/` + getImgByUsername(myevent.teacher2)">
+                                        <span class="cal__teacher-content">{{getTeacherByUsername(myevent.teacher2)}}</span>
-                                        </q-avatar>
-                                        <span class="cal__teacher-content">{{getUserByUsername(myevent.teacher2)}}</span>
                                     </q-chip>
                                 </span>
                             </div>
@@ -109,10 +122,15 @@
                                 v-if="contextDay"
                                 ref='myevent'
                                 class="q-gutter-sm">
+                            <q-input color="grey-1" v-model="eventForm.short_tit" autofocus
+                                     :input-style="`background-color: ${eventForm.bgcolor} !important; color: white !important; font-weight: bold; `"
+                                     borderless rounded dense :label="$t('event.short_tit')"
+                            ></q-input>
+
                             <q-input color="grey-1" v-model="eventForm.title" autofocus
                                      :input-style="`background-color: ${eventForm.bgcolor} !important; color: white !important; font-weight: bold; `"
                                      borderless rounded dense :label="$t('event.title')"
-                                     :rules="[v => v && v.length > 0 || 'Field cannot be empty']"></q-input>
+                                     :rules="[v => v && v.length > 0 || $t('event.notempty')]"></q-input>
 
                             <CMyEditor :value.sync="eventForm.details">
 
@@ -274,7 +292,9 @@
                                         </div>
 
                                         <q-input v-model="bookEventForm.msgbooking" :label="$t('cal.msgbooking')+':'"
-                                                 autogrow>
+                                                 type="textarea" debounce="500"
+                                                 input-class="myinput-area"
+                                        >
                                         </q-input>
                                     </q-card-section>
                                 </q-card>
@@ -335,7 +355,8 @@
                                 <q-card class="text-white windowcol">
                                     <q-card-section>
                                         <q-input v-model="askInfoForm.message" :label="$t('cal.msgbooking')+':'"
-                                                 autogrow>
+                                                 autofocus debounce="500" type="textarea"
+                                                 input-class="myinput-area">
                                         </q-input>
                                     </q-card-section>
                                 </q-card>
@@ -425,7 +446,6 @@
                             <q-badge
                                     :key="index"
                                     style="width: 100%; cursor: pointer;"
-                                    class="ellipsis"
                                     :class="badgeClasses(event, 'day')"
                                     :style="badgeStyles(event, 'day')"
                                     @click.stop.prevent="showEvent(event)"
@@ -435,9 +455,12 @@
                                     @dragenter.native="(e) => onDragEnter(e, event)"
                                     @touchmove.native="(e) => {}"
                             >
-                                <q-icon v-if="event.icon" :name="event.icon" class="q-mr-xs"></q-icon>
+
-                                <span class="ellipsis">{{ event.title }}</span>
+                                <span class="">{{ getTitleEv(event) }}</span>
                             </q-badge>
+                            <div class="text-center"><img :src="getImgEvent(event)"
+                                                          class="text-center listaev__tdimg_small">
+                            </div>
                         </template>
                     </template>
 
@@ -475,7 +498,7 @@
                         <template v-for="(event, index) in getEvents(date)">
                             <q-badge
                                     :key="index"
-                                    class="my-event justify-center ellipsis"
+                                    class="my-event justify-center"
                                     :class="badgeClasses(event, 'body')"
                                     :style="badgeStyles(event, 'body', timeStartPos, timeDurationHeight)"
                                     @click.stop.prevent="showEvent(event)"
@@ -486,7 +509,7 @@
                                     @touchmove.native="(e) => {}"
                             >
                                 <q-icon v-if="event.icon" :name="event.icon" class="q-mr-xs"></q-icon>
-                                <span class="ellipsis">{{ event.title }}</span>
+                                <span class="">{{ getTitleEv(event) }}</span>
                             </q-badge>
                         </template>
                     </template>
@@ -502,21 +525,49 @@
                 <tbody>
                 <tr v-for="(event, index) in getEventList()" class="listaev listaev__table">
                     <td :class="clEvent(event)">
-                        <p class="listaev__align_chips">
+                        <div class="listaev__align_chips">
                             <img :src="getImgEvent(event)"
-                                 class="text-left padding_cell listaev__tdimg listaev__img">
+                                 @click="selectEvent(event)"
+                                 class="text-left padding_cell listaev__tdimg listaev__img cursor-pointer"
+                                :style="getStyleByEvent(event)">
                             <q-chip dense v-if="isAlreadyBooked(event)" class="cltexth4 chipbooked shadow-5 q-mb-md"
                                     color="green" text-color="white"
                                     icon="event_available">{{$t('cal.booked')}}
                             </q-chip>
 
+                            <q-chip v-if="event === myevent && !displayEvent && editable" class="text-center shadow-5 glossy bg-blue chipmodif">
+
+                                <q-btn v-if="editable" flat round color="white" icon="fas fa-copy">
+                                    <q-menu
+                                            transition-show="flip-right"
+                                            transition-hide="flip-left">
+                                        <q-list style="min-width: 100px">
+                                            <q-item clickable @click="duplicateEvent(myevent, 7)">
+                                                <q-item-section>Tra 1 Settimana</q-item-section>
+                                            </q-item>
+                                            <q-item clickable @click="duplicateEvent(myevent, 14)">
+                                                <q-item-section>Tra 2 Settimane</q-item-section>
+                                            </q-item>
+                                            <q-item clickable @click="duplicateEvent(myevent, 7, 4)">
+                                                <q-item-section>4 Eventi ogni Settimana</q-item-section>
+                                            </q-item>
+                                        </q-list>
+                                    </q-menu>
+                                </q-btn>
+                                <q-btn v-if="editable" flat round color="white" icon="delete"  v-close-popup
+                                       @click="deleteEvent(myevent)"></q-btn>
+                                <q-btn v-if="editable" flat round color="white" icon="edit"  v-close-popup
+                                       @click="editEvent(myevent)"></q-btn>
+                                <q-btn flat round color="white" icon="cancel" @click="selectEvent(null)"></q-btn>
+                            </q-chip>
                             <q-chip v-if="event.news" class="cltexth4 chipnews shadow-5 glossy text-right" color="red"
                                     text-color="white" icon-right="star" icon="star" dense
                                     style="">
                                 {{$t('event.news')}}
                             </q-chip>
 
-                        </p>
+                        </div>
+
                         <div class="listaev__date listaev__align_center_mobile">
                             <span v-html="tools.getstrDateTimeEvent(mythis(), event, true)"></span>
                         </div>
@@ -557,17 +608,14 @@
                                             class="margin_with"></span></span>
 
                                 <q-chip>
-                                    <q-avatar>
+                                    <CMyAvatar :myimg="getImgTeacherByUsername(event.teacher)"></CMyAvatar>
-                                        <img :src="`../../statics/images/` + getImgByUsername(event.teacher)">
+                                    <span class="cal__teacher-content">{{getTeacherByUsername(event.teacher)}}</span>
-                                    </q-avatar>
-                                    <span class="cal__teacher-content">{{getUserByUsername(event.teacher)}}</span>
                                 </q-chip>
-                                <span v-if="getImgByUsername(event.teacher2)" class="margin_avatar2"></span>
+                                <span v-if="getImgTeacherByUsername(event.teacher2) && isValidUsername(event.teacher2)"
-                                <q-chip v-if="getImgByUsername(event.teacher2) && event.teacher2">
+                                      class="margin_avatar2"></span>
-                                    <q-avatar>
+                                <q-chip v-if="getImgTeacherByUsername(event.teacher2) && isValidUsername(event.teacher2)">
-                                        <img :src="`../../statics/images/` + getImgByUsername(event.teacher2)">
+                                    <CMyAvatar :myimg="getImgTeacherByUsername(event.teacher2)"></CMyAvatar>
-                                    </q-avatar>
+                                    <span class="cal__teacher-content">{{getTeacherByUsername(event.teacher2)}}</span>
-                                    <span class="cal__teacher-content">{{getUserByUsername(event.teacher2)}}</span>
                                 </q-chip>
 
                                 <span v-if="event.wherecode" class="">

src/components/CGridTableRec/CGridTableRec.ts

@@ -11,17 +11,15 @@ 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 { CMyPopupEdit } from '../CMyPopupEdit'
-import { CMyToggleList } from '../CMyToggleList'
-import { CMyChipList } from '../CMyChipList'
 
 @Component({
-  components: { CDateTime, CMyToggleList, CMyChipList }
+  components: { CMyPopupEdit }
 })
 export default class CGridTableRec extends Vue {
   @Prop({ required: false }) public prop_mytable: string
   @Prop({ required: true }) public prop_mytitle: string
-  @Prop({ required: false, default: [] }) public prop_mycolumns: any[]
+  @Prop({ required: false, default: null }) public prop_mycolumns: any[]
   @Prop({ required: false, default: '' }) public prop_colkey: string
   @Prop({ required: false, default: '' }) public nodataLabel: string
   @Prop({ required: false, default: '' }) public noresultLabel: string
@@ -54,20 +52,16 @@ 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 funcActivated = []
+  public canEdit: boolean = false
 
   public returnedData
   public returnedCount
   public colVisib: any[] = []
   public colExtra: any[] = []
 
-  get canEdit() {
-    return this.funcActivated.includes(lists.MenuAction.CAN_EDIT_TABLE)
-  }
-
   get lists() {
     return lists
   }
@@ -79,7 +73,7 @@ export default class CGridTableRec extends Vue {
   }
 
   public selItem(item, col: IColGridTable) {
-    // console.log('item', item)
+    console.log('selItem', item)
     this.rowsel = item
     this.idsel = item._id
     this.colsel = col
@@ -88,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)
+    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
 
   }
@@ -97,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: {}
     }
 
+    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
 
@@ -122,12 +140,13 @@ export default class CGridTableRec extends Vue {
   }
 
   public updatedcol() {
+    console.log('updatedcol')
     if (this.mycolumns) {
       this.colVisib = []
       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)
@@ -141,6 +160,7 @@ export default class CGridTableRec extends Vue {
   }
 
   public onRequest(props) {
+    console.log('onRequest', 'filter = ' , this.filter)
     const { page, rowsPerPage, rowsNumber, sortBy, descending } = props.pagination
     const filter = this.filter
 
@@ -275,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
 
@@ -317,18 +330,35 @@ export default class CGridTableRec extends Vue {
   }
 
   public mounted() {
+
+    this.canEdit = tools.getCookie(tools.CAN_EDIT, this.canEdit) === 'true'
+
+    this.tablesel = tools.getCookie('tablesel', this.tablesel)
+    if (this.tablesel === '') {
+      if (!!this.tablesList)
+        this.tablesel = this.tablesList[0].value
+      else
+        this.tablesel = this.mytable
+    }
+
     this.changeTable(false)
 
   }
 
   public refresh() {
-    if (this.search !== '')
+    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,
     })
   }
 
@@ -338,7 +368,6 @@ export default class CGridTableRec extends Vue {
     }
   }
 
-
   public ActionAfterYes(action, item, data) {
     if (action === lists.MenuAction.DELETE_RECTABLE) {
       if (this.serverData.length > 0)
@@ -362,62 +391,63 @@ export default class CGridTableRec extends Vue {
     }
   }
 
-  public visuValByType(col: IColGridTable, val) {
+  public changeCol(newval) {
-    if (col.fieldtype === tools.FieldType.date) {
+    tools.setCookie(this.mytable, this.colVisib.join('|'))
-      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.length > tools.MAX_CHARACTERS)
-          mystr += '...'
-        return mystr
-      }
-    }
   }
 
   public changeTable(mysel) {
-    // console.log('changeTable')
+    if (this.tablesel === undefined || this.tablesel === '')
+      return
+
+    console.log('changeTable mysel=', mysel, 'tablesel', this.tablesel)
 
     let mytab = null
     if (this.tablesList) {
-      if (!this.tablesel) {
-        this.tablesel = this.tablesList[1].value
-      }
-
       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) {
       this.mytitle = mytab.label
       this.colkey = mytab.colkey
       this.mycolumns = [...mytab.columns]
     }
 
+    // console.log('this.mycolumns')
+    // console.log(this.mycolumns)
+    // console.log('this.tablesList:')
+    // console.table(this.tablesList)
+
+    if (!!this.mycolumns) {
       this.mycolumns.forEach((rec: IColGridTable) => {
         if (rec.label_trans)
           rec.label = this.$t(rec.label_trans)
       })
+    }
 
     if (mytab) {
       this.mytable = mytab.value
     }
 
+    tools.setCookie('tablesel', this.tablesel)
+
     this.updatedcol()
+
+    if (!!this.mytable) {
+      const myselcol = tools.getCookie(this.mytable, '')
+      if (!!myselcol && myselcol.length > 0) {
+        this.colVisib = myselcol.split('|')
+      }
+    }
+
     this.refresh()
   }
 
@@ -430,8 +460,11 @@ export default class CGridTableRec extends Vue {
   }
 
   public doSearch() {
-
     this.refresh()
   }
 
+  public changefuncAct(newval) {
+    tools.setCookie(tools.CAN_EDIT, newval)
+  }
+
 }

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"
@@ -35,13 +35,14 @@
 
                 <!--<p style="color:red"> Rows: {{ getrows }}</p>-->
 
-                <q-input v-model="search" filled dense type="search" hint="Search" v-on:keyup.enter="doSearch">
+                <q-input v-model="search" filled dense type="search" debounce="500" hint="Search" v-on:keyup.enter="doSearch">
                     <template v-slot:after>
                         <q-btn v-if="mytable" label="" color="primary" @click="refresh" icon="search"></q-btn>
                     </template>
                 </q-input>
-                <q-toggle v-if="mytable" v-model="funcActivated" :val="lists.MenuAction.CAN_EDIT_TABLE" class="q-mx-sm"
+                <q-toggle v-if="mytable" v-model="canEdit" :val="lists.MenuAction.CAN_EDIT_TABLE" class="q-mx-sm"
-                          :label="$t('grid.editvalues')"></q-toggle>
+                          :label="$t('grid.editvalues')" @input="changefuncAct"
+                ></q-toggle>
 
                 <q-btn v-if="mytable" flat dense color="primary" :disable="loading || !canEdit"
                        :label="$t('grid.addrecord')"
@@ -55,8 +56,9 @@
                 <q-select
                         v-if="mytable"
                         v-model="colVisib"
+                        rounded
+                        outlined
                         multiple
-                        borderless
                         dense
                         options-dense
                         :display-value="$t('grid.columns')"
@@ -64,7 +66,8 @@
                         map-options
                         :options="mycolumns"
                         option-value="name"
-                        style="min-width: 150px">
+                        style="min-width: 150px"
+                        @input="changeCol">
 
                 </q-select>
 
@@ -88,74 +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)">
+                <q-td v-for="col in mycolumns" :key="col.name" :props="props" v-if="colVisib.includes(col.field + col.subfield)">
-                    <div v-if="col.fieldtype === tools.FieldType.date">
+                    <CMyPopupEdit :canEdit="canEdit"
-                        <div :class="getclassCol(col)">
+                                  :col="col"
-                            <CDateTime
+                                  :row.sync="props.row"
-                                    class="cursor-pointer"
+                                  :field="col.field"
-                                    :value.sync="props.row[col.name]"
+                                  :subfield="col.subfield"
-                                    :label="col.title"
+                                  @save="SaveValue"
-                                    :dense="true"
+                                  @show="selItem(props.row, col)">
-                                    :readonly="true"
-                                    @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-checkbox>
+                    </CMyPopupEdit>
-                                {{ 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>
-                        <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]"/>
-
-                            </q-popup-edit>
-                        </div>
-                    </div>
                 </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)">

src/components/CMyAvatar/CMyAvatar.scss

@@ -0,0 +1,4 @@
+.myflex{
+  display: flex;
+  flex: 1;
+}

src/components/CMyAvatar/CMyAvatar.ts

@@ -0,0 +1,48 @@
+import Vue from 'vue'
+import { Component, Prop, Watch } from 'vue-property-decorator'
+
+import { tools } from '../../store/Modules/tools'
+import { UserStore } from '../../store/Modules'
+
+@Component({
+  name: 'CMyAvatar'
+})
+
+export default class CMyAvatar extends Vue {
+  @Prop({ required: false, default: '' }) public myimg
+  @Prop({ required: false, default: '40px' }) public size
+
+  public myicon: string = ''
+  public myimgint: string = ''
+
+  get tools() {
+    return tools
+  }
+
+  @Watch('GlobalStore.state.my.profile.img')
+  public imgChanged() {
+    // console.log('imgChanged')
+    this.refresh()
+  }
+
+  @Watch('myimg')
+  public imglocalChanged() {
+    this.myimgint = ''
+    // console.log('myimg')
+
+    this.refresh()
+  }
+
+  public refresh() {
+    if (!this.myimg) {
+      this.myicon = 'fas fa-user-circle'
+    } else {
+      this.myimgint = this.myimg
+    }
+    // console.log('myimgint', this.myimgint)
+  }
+
+  public mounted() {
+    this.refresh()
+  }
+}

src/components/CMyAvatar/CMyAvatar.vue

@@ -0,0 +1,17 @@
+<template>
+    <div>
+        <q-avatar v-if="!myimgint" class="q-mb-sx center_img" :icon="myicon" :font-size="size">
+
+        </q-avatar>
+        <q-avatar v-if="myimgint" class="q-mb-sx center_img">
+            <img :src="myimgint" :font-size="size">
+        </q-avatar>
+    </div>
+</template>
+
+<script lang="ts" src="./CMyAvatar.ts">
+</script>
+
+<style lang="scss" scoped>
+    @import './CMyAvatar.scss';
+</style>

src/components/CMyAvatar/index.ts

@@ -0,0 +1 @@
+export {default as CMyAvatar} from './CMyAvatar.vue'

src/components/CMyChipList/CMyChipList.ts

@@ -25,10 +25,15 @@ export default class CMyChipList extends Vue {
     return tools
   }
 
-  public mounted() {
+  @Watch('value', { immediate: true, deep: true })
+  public valchange() {
+    this.refreshval()
+  }
+
+  public refreshval() {
     this.myarrvalues = []
 
-    console.table(this.options)
+    // console.table(this.options)
     this.options.forEach((rec, index) => {
       if (tools.isBitActive(this.value, rec[this.optval])) {
         const mydata = {
@@ -51,7 +56,10 @@ export default class CMyChipList extends Vue {
     if (this.myarrvalues.length === 0)
       this.myarrvalues.push({ label: this.$t('otherpages.manage.nessuno'), color: 'gray' })
 
-    console.log('arrvalues=', this.myarrvalues)
+    // console.log('arrvalues=', this.myarrvalues)
+  }
 
+  public mounted() {
+    this.refreshval()
   }
 }

src/components/CMyPopupEdit/CMyPopupEdit.ts

@@ -0,0 +1,138 @@
+import Vue from 'vue'
+import { Component, Prop } from 'vue-property-decorator'
+
+import { tools } from '../../store/Modules/tools'
+import { toolsext } from '@src/store/Modules/toolsext'
+import { IColGridTable } from '../../model'
+import { fieldsTable } from '../../store/Modules/fieldsTable'
+import { CMyChipList } from '../CMyChipList'
+import { CDateTime } from '../CDateTime'
+import { CMyToggleList } from '../CMyToggleList'
+import { CMySelect } from '../CMySelect'
+
+@Component({
+  name: 'CMyPopupEdit',
+  components: {CMyChipList, CDateTime, CMyToggleList, CMySelect}
+})
+
+export default class CMyPopupEdit extends Vue {
+  @Prop({ required: true }) public row
+  @Prop({ required: true }) public col
+  @Prop({ required: false, default: false }) public canEdit
+  @Prop({ required: false, default: '' }) public field
+  @Prop({ required: false, default: '' }) public subfield
+
+  public myvalue = ''
+
+  get tools() {
+    return tools
+  }
+
+  get db_fieldsTable() {
+    return fieldsTable
+  }
+  public changeval(newval) {
+    this.$emit('update:row', newval)
+  }
+
+  public mounted() {
+    if ((this.subfield !== '') && (this.subfield !== '')) {
+      if (this.row[this.field] === undefined) {
+        this.row[this.field] = {}
+        this.myvalue = ''
+      } else {
+        this.myvalue = this.row[this.field][this.subfield]
+      }
+    } else {
+      if (this.field !== '')
+        this.myvalue = this.row[this.field]
+      else
+        this.myvalue = this.row
+    }
+  }
+
+  public OpenEdit() {
+    console.log('OpenEdit')
+    this.$emit('show')
+  }
+
+  public SaveValueInt(newVal, valinitial) {
+
+    console.log('SaveValueInt', newVal)
+
+    // Update value in table memory
+    if (this.subfield !== '') {
+      if (this.row[this.field] === undefined)
+        this.row[this.field] = {}
+      this.row[this.field][this.subfield] = newVal
+    } else {
+      if (this.field !== '')
+        this.row[this.field] = newVal
+      else
+        this.row = newVal
+    }
+
+    this.$emit('save', newVal, valinitial)
+  }
+
+  public visuValByType(val, col: IColGridTable, row) {
+    if (col === undefined || row === undefined)
+      return
+
+    // let val = ''
+    // if (col.subfield !== '') {
+    //   if (row[col.field] === undefined)
+    //     row[col.field] = {}
+    //
+    //   val = row[col.field][col.subfield]
+    // } else {
+    //   val = row[col.field]
+    // }
+    //
+    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 (col.fieldtype === tools.FieldType.select) {
+      if (val === undefined)
+        return '[---]'
+      else
+        return fieldsTable.getValueByTable(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 getclassCol(col) {
+    if (col) {
+      let mycl = (col.disable || !this.canEdit) ? '' : 'colmodif'
+      mycl += (col.fieldtype === tools.FieldType.date) ? ' coldate flex flex-container' : ''
+
+      return mycl
+    } else {
+      return ''
+    }
+  }
+}

src/components/CMyPopupEdit/CMyPopupEdit.vue

@@ -0,0 +1,103 @@
+<template>
+    <div :class="getclassCol(col)">
+        <div v-if="col.fieldtype === tools.FieldType.date">
+            <CDateTime
+                    :label="col.label"
+                    class="cursor-pointer"
+                    :valueDate="myvalue"
+                    :readonly="false"
+                    :dense="true"
+                    :canEdit="canEdit"
+                    @savetoclose="SaveValueInt"
+                    @show="OpenEdit">
+            </CDateTime>
+        </div>
+        <div v-else>
+            <div v-if="col.fieldtype === tools.FieldType.binary">
+                <CMyChipList
+                        :value="myvalue"
+                        :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>
+            </div>
+            <!-- Show Value -->
+            <div v-else>
+                {{ visuValByType(myvalue, col, row) }}
+            </div>
+
+            <!--<q-select v-model="myvalue"-->
+            <!--rounded-->
+            <!--outlined-->
+            <!--dense-->
+            <!--:options="db_fieldsTable.getTableJoinByName(col.jointable)"-->
+            <!--:display-value="db_fieldsTable.getLabelByTable(col.jointable)"-->
+            <!--emit-value-->
+            <!--@input="SaveValueInt"-->
+            <!--&gt;-->
+            <!--</q-select>-->
+
+            <!-- Edit Value -->
+            <q-popup-edit
+                    v-if="canEdit"
+                    v-model="myvalue"
+                    :disable="col.disable"
+                    :title="col.title"
+                    buttons
+                    @save="SaveValueInt"
+                    @show="OpenEdit">
+
+                <div v-if="col.fieldtype === tools.FieldType.boolean">
+                    <q-checkbox v-model="myvalue" :label="col.title">
+                    </q-checkbox>
+                    {{ visuValByType(myvalue, col, row) }}
+                </div>
+                <div v-else-if="col.fieldtype === tools.FieldType.string">
+                    <q-input v-model="myvalue"
+                             autogrow
+                             autofocus>
+
+                    </q-input>
+                </div>
+                <div v-else-if="col.fieldtype === tools.FieldType.number">
+                    <q-input v-model="myvalue" type="number"
+                             autofocus>
+
+                    </q-input>
+                </div>
+                <div v-else-if="col.fieldtype === tools.FieldType.binary">
+                    <CMyToggleList :label="col.title"
+                                   :options="db_fieldsTable.getTableJoinByName(col.jointable)"
+                                   :value.sync="myvalue"
+                                   :optval="db_fieldsTable.getKeyByTable(col.jointable)"
+                                   :optlab="db_fieldsTable.getLabelByTable(col.jointable)">
+                    </CMyToggleList>
+                </div>
+                <div v-else-if="col.fieldtype === tools.FieldType.html">
+                    <q-input v-model="myvalue"
+                             autofocus
+                             @keyup.enter.stop
+                             type="textarea"></q-input>
+                </div>
+                <div v-else-if="col.fieldtype === tools.FieldType.select">
+                    <CMySelect :label="col.title"
+                               :value.sync="myvalue"
+                               :optval="db_fieldsTable.getKeyByTable(col.jointable)"
+                               :optlab="db_fieldsTable.getLabelByTable(col.jointable)"
+                               :options="db_fieldsTable.getTableJoinByName(col.jointable)"
+                               :useinput="false">
+                    </CMySelect>
+                </div>
+
+            </q-popup-edit>
+        </div>
+    </div>
+
+</template>
+
+<script lang="ts" src="./CMyPopupEdit.ts">
+</script>
+
+<style lang="scss" scoped>
+    @import './CMyPopupEdit.scss';
+</style>

src/components/CMyPopupEdit/index.ts

@@ -0,0 +1 @@
+export {default as CMyPopupEdit} from './CMyPopupEdit.vue'

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 { IPerson } 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)
   }
 

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"

src/components/CMyToggleList/CMyToggleList.ts

@@ -36,7 +36,7 @@ export default class CMyToggleList extends Vue {
   public mounted() {
     this.myarrvalues = []
 
-    console.table(this.options)
+    // console.table(this.options)
     this.options.forEach((rec) => {
       const mydata = {
         label: this.$t(rec[this.optlab]),

src/components/Footer/Footer.ts

@@ -12,8 +12,11 @@ import { static_data } from '@src/db/static_data'
 
 import Quasar from 'quasar'
 import { FormNewsletter } from '../FormNewsletter'
+import { IUserState } from '../../model'
+import MixinBase from '../../mixins/mixin-base'
 
 @Component({
+  mixins: [MixinBase],
   name: 'Footer',
   components: { Logo, FormNewsletter }
 })
@@ -32,18 +35,29 @@ 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() {
     return static_data
   }
+
+  get ChatWhatsapp() {
+    return tools.getHttpForWhatsapp(this.Whatsapp_Cell)
+  }
+
 }

src/components/Footer/Footer.vue

@@ -26,7 +26,34 @@
                             <p class="mycontacts_title">{{$t('homepage.titlecontatti')}}</p>
 
 
-                            <p class="mycontacts_text" v-html="$t('homepage.contacts')"></p>
+                            <p class="mycontacts_text">
+                                <i v-if="getValDb('MAIN_EMAIL')" aria-hidden="true"
+                                   class="q-icon fas fa-envelope q-mx-sm"></i>
+                                <a :href="`mailto:` + getValDb('MAIN_EMAIL')" class="links">{{ getValDb('MAIN_EMAIL')
+                                    }}</a><br>
+                                <br>
+                                <span v-for="rec in getarrValDb('CONTACTS_EMAIL_CELL')">
+                                    {{ rec.name }}: {{ rec.phone }}
+                                    <a v-if="!!tools.getHttpForWhatsapp(rec.phone)" :href="tools.getHttpForWhatsapp(rec.phone)" target="_blank">
+                                        <i aria-hidden="true" class="q-icon fab fa-whatsapp icon_contact links"></i></a>
+                                    <br>
+                                    <i v-if="rec.email" aria-hidden="true"
+                                       class="q-icon fas fa-envelope q-mx-sm"></i> <a :href="`mailto:`+ rec.email "
+                                                                                      class="links">{{rec.email}}</a>
+                                    <br>
+                                </span>
+                                <span v-if="getValDb('CALL_WORKING_DAYS')"><br>orari per chiamate:<br>
+                                    <span v-html="getValDb('CALL_WORKING_DAYS')"></span></span>
+                                <!--Elisa Ghizzardi: 338-9344724 <a href="mailto:elisa.ghizzardi@yahoo.com" class="links">elisa.ghizzardi@yahoo.com</a><br>
+
+                                Cristina Barattoni: 335-8233721 <a href="mailto:info@cristinabarattoni.it"
+                                                                    class="links">info@cristinabarattoni.it</a><br><br>'
+                                +
+                                'orari per chiamate:<br>lun-ven: 12:30-13:30; 17:00-19.30<br>sab-dom: 10-18
+
+                                -->
+
+                            </p>
                         </div>
                         <div class="landing__footer-icons row flex-center">
                             <a v-if="!!FBPage" :href="FBPage" target="_blank">
@@ -38,6 +65,9 @@
                             <a v-if="!!TelegramSupport" :href="TelegramSupport" target="_blank">
                                 <i aria-hidden="true" class="q-icon fab fa-telegram icon_contact links"></i></a>
 
+                            <a v-if="!!Whatsapp_Cell" :href="ChatWhatsapp" target="_blank">
+                                <i aria-hidden="true" class="q-icon fab fa-whatsapp icon_contact links"></i></a>
+
 
                             <!--<a href="" target="_blank"><i aria-hidden="true" class="q-icon fab fa-github"> </i></a>-->
                             <!--<a href="https://twitter.com/" target="_blank"><i aria-hidden="true" class="q-icon fab fa-twitter"> </i></a>-->
@@ -52,7 +82,8 @@
                     </div>
 
                     <p class="text-center">
-                        <router-link v-if="static_data.functionality.SHOW_ONLY_POLICY" to="/policy"><span class="footer_link">{{$t('privacy_policy')}}</span></router-link>
+                        <router-link v-if="static_data.functionality.SHOW_ONLY_POLICY" to="/policy"><span
+                                class="footer_link">{{$t('privacy_policy')}}</span></router-link>
                     </p>
 
                 </div>
@@ -77,9 +108,13 @@
                 </div>
             </div>
         </section>
-        <q-page-scroller position="bottom-right" :scroll-offset="850" :offset="[18, 18]" style="opacity: 0.3">
+        <q-page-scroller position="bottom-right" :scroll-offset="850" :offset="[18, 78]" style="opacity: 0.3">
             <q-btn fab icon="keyboard_arrow_up" color="accent"/>
         </q-page-scroller>
+        <q-page-sticky v-if="ChatWhatsapp" position="bottom-right" :offset="[18, 18]">
+            <q-btn fab icon="fab fa-whatsapp" color="green" type="a" :href="ChatWhatsapp" target="__blank"
+                   class="mybtn_sticky"/>
+        </q-page-sticky>
     </div>
 </template>
 

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
   }
 })
 

src/components/Header/Header.vue

@@ -92,8 +92,9 @@
                     </q-list>
                 </q-btn-dropdown>
 
-
+                <div v-if="static_data.functionality.SHOW_MESSAGES">
                     <message-popover></message-popover>
+                </div>
 
                 <!--
                 <div class="right-itens">
@@ -102,14 +103,13 @@
 
                 <!-- BUTTON USER BAR -->
 
-                <q-btn class="q-mx-xs" v-if="static_data.functionality.SHOW_USER_MENU && !isLogged" dense flat round icon="menu"
+                <q-btn class="q-mx-xs" v-if="static_data.functionality.SHOW_USER_MENU && !isLogged" dense flat round
+                       icon="menu"
                        @click="rightDrawerOpen = !rightDrawerOpen">
                 </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">
+                    <CMyAvatar :myimg="getMyImg"></CMyAvatar>
-                        <img :src="getMyImg">
-                    </q-avatar>
                 </q-btn>
 
             </q-toolbar>
@@ -128,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">
@@ -136,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">
+                    <CMyAvatar :myimg="getMyImg"></CMyAvatar>
-                        <img :src="`../../` + getMyImg">
+
-                    </q-avatar>
                     <q-btn class="absolute-top-right" style="margin-right: 10px; color: white;"
                            dense flat round icon="close" @click="rightDrawerOpen = !rightDrawerOpen">
                     </q-btn>

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'

src/mixins/mixin-base.ts

@@ -0,0 +1,43 @@
+import Vue from 'vue'
+
+import Component from 'vue-class-component'
+import { func_tools } from '../store/Modules/toolsext'
+import { tools } from '../store/Modules/tools'
+import { toolsext } from '@src/store/Modules/toolsext'
+import { GlobalStore } from '../store/Modules'
+
+// You can declare a mixin as the same style as components.
+@Component
+export default class MixinBase extends Vue {
+  public mythis() {
+    return this
+  }
+
+  get toolsext() {
+    return toolsext
+  }
+
+  get func_tools() {
+    return func_tools
+  }
+
+  get tools() {
+    return tools
+  }
+
+  public getValDb(keystr) {
+    return GlobalStore.getters.getValueSettingsByKey(keystr)
+  }
+  public getarrValDb(keystr) {
+    const myval = GlobalStore.getters.getValueSettingsByKey(keystr)
+    // console.log('myval', myval)
+    if (myval) {
+      const myrec = JSON.parse(myval)
+      // console.log('*************** getarrValDb')
+      // console.table(myrec)
+      return myrec
+    } else {
+      return []
+    }
+  }
+}

src/mixins/mixin-operator.ts

@@ -0,0 +1,30 @@
+import Vue from 'vue'
+
+import Component from 'vue-class-component'
+import { CalendarStore } from '../store/Modules'
+import { UserStore } from '@modules'
+
+@Component
+export default class MixinOperator extends Vue {
+  public getOperators() {
+    return CalendarStore.state.operators
+  }
+
+  public getOperatorByUsername(username) {
+    return CalendarStore.getters.getOperatorByUsername(username)
+  }
+
+  public getImgTeacherByUsername(username) {
+    return `statics/images/` + CalendarStore.getters.getImgTeacherByUsername(username)
+  }
+
+  public getTeacherByUsername(username) {
+    const op = this.getOperatorByUsername(username)
+    if (!!op) {
+      return op.name + ' ' + op.surname
+    } else {
+      return ''
+    }
+  }
+
+}

src/mixins/mixin-users.ts

@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import { GlobalStore, UserStore, MessageStore } from '../store/Modules'
 
-
 import Component from 'vue-class-component'
 import { func_tools } from '../store/Modules/toolsext'
 import { tools } from '../store/Modules/tools'
@@ -30,6 +29,10 @@ export default class MixinUsers extends Vue {
     return `statics/` + UserStore.getters.getImgByUsername(username)
   }
 
+  public isValidUsername(username) {
+    return username && username !== 'nessuno' && username !== 'none'
+  }
+
   public getMyUsername() {
     return UserStore.state.my.username
   }
@@ -50,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() {

src/model/Calendar.ts

@@ -1,3 +1,4 @@
+import { IOperators } from '@src/model/GlobalStore'
 
 export interface IEvents {
   _id?: any
@@ -41,18 +42,6 @@ export interface IBookedEvent {
   booked: boolean
 }
 
-export interface IOperators {
-  username: string
-  cell: string
-  webpage?: string
-  img: string
-  skype?: string
-  days_working?: string
-  facebook?: string
-  disciplines?: string
-  offers?: string
-}
-
 export interface IWheres {
   code: string
   placename: string
@@ -75,7 +64,6 @@ export interface IBookedEventPage {
   state: EState
 }
 
-
 export interface ICalendarState {
   editable: boolean
   eventlist: IEvents[]

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 {
@@ -98,21 +108,22 @@ export interface IListRoutes {
   separator?: boolean
 }
 
-export interface IPerson {
+export interface IOperators {
-  index?: number
+  username: string
-  tab?: string
   name: string
-  sub1: string
+  surname: string
-  sub2?: string
-  sub3?: string
-  img: string
-  cell?: string
   email?: string
+  qualification?: string
+  disciplines?: string
+  certifications?: string
+  img?: string
+  cell?: string
   paginaweb?: string
   paginafb?: string
   intro?: string
   info?: string
   vario?: string
+  tab?: string
 }
 
 export interface IPreloadImages {
@@ -201,6 +212,7 @@ export interface IFunctionality {
   ENABLE_PROJECTS_LOADING?: boolean
   SHOW_NEWSLETTER?: boolean
   SHOW_ONLY_POLICY?: boolean
+  SHOW_MESSAGES?: boolean
   BOOKING_EVENTS?: boolean
 }
 
@@ -215,6 +227,7 @@ export interface IParamsQuery {
 
 export interface IColGridTable {
   name: string
+  subfield?: string
   required?: boolean
   label?: string
   label_trans?: string

src/model/UserStore.ts

@@ -1,11 +1,16 @@
 import { IToken } from 'model/other'
 
-export const DefaultUser: IUserFields = {
+const enum ESexType {
-  email: '',
+  None = 0,
-  username: '',
+  Male = 1,
-  name: '',
+  Female = 2
-  surname: '',
+}
-  password: ''
+
+export interface IUserProfile {
+  img?: string
+  cell?: string
+  dateofbirth?: Date
+  sex?: ESexType
 }
 
 export interface IUserFields {
@@ -17,10 +22,10 @@ export interface IUserFields {
   password?: string
   ipaddr?: string
   perm?: number
-  img?: string
   verified_email?: boolean
   tokens?: IToken[]
   lasttimeonline?: Date
+  profile?: IUserProfile
 }
 
 /*

src/statics/i18n.js

@@ -91,7 +91,7 @@ const msgglobal = {
       incorso: 'Registrazione in corso...',
       richiesto: 'Campo Richiesto',
       email: 'Email',
-      cell: 'Móvil',
+      cell: 'Telefono',
       img: 'Immagine',
       date_reg: 'Data Reg.',
       perm: 'Permessi',
@@ -128,12 +128,23 @@ const msgglobal = {
 
       }
     },
+    op: {
+      qualification: 'Qualifica',
+      disciplines: 'Discipline',
+      certifications: 'Certificazioni',
+      intro: 'Introduzione',
+      info: 'Biografia',
+      webpage: 'Pagina Web',
+      days_working: 'Giorni Lavorativi',
+      facebook: 'Pagina Facebook',
+    },
     login: {
       page_title: 'Login',
       incorso: 'Login in corso',
       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",
@@ -253,7 +264,8 @@ const msgglobal = {
       short_tit: 'Titolo Breve',
       title: 'Titolo',
       details: 'Dettagli',
-      date: 'Data',
+      dateTimeStart: 'Data Inizio',
+      dateTimeEnd: 'Data Fine',
       bgcolor: 'Colore Sfondo',
       days: 'Giorni',
       icon: 'Icona',
@@ -275,6 +287,7 @@ const msgglobal = {
       canceled: 'Cancellato',
       deleted: 'Eliminato',
       duplicate: 'Duplica',
+      notempty: 'Il campo non può essere vuoto',
       modified: 'Modificato'
     },
     newsletter: {
@@ -384,7 +397,7 @@ const msgglobal = {
       incorso: 'Registro en curso...',
       richiesto: 'Campo requerido',
       email: 'Email',
-      cell: 'Telefono',
+      cell: 'Móvil',
       img: 'File image',
       date_reg: 'Fecha Reg.',
       perm: 'Permisos',
@@ -414,12 +427,23 @@ const msgglobal = {
         sameaspassword: 'Las contraseñas deben ser idénticas',
       }
     },
+    op: {
+      qualification: 'Calificación',
+      disciplines: 'Disciplinas',
+      certifications: 'Certificaciones',
+      intro: 'Introducción',
+      info: 'Biografia',
+      webpage: 'Página web',
+      days_working: 'Días laborables',
+      facebook: 'Página de Facebook',
+    },
     login: {
       page_title: 'Login',
       incorso: 'Login en curso',
       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",
@@ -537,7 +561,8 @@ const msgglobal = {
       short_tit: 'Título Corto',
       title: 'Título',
       details: 'Detalles',
-      date: 'Fecha',
+      dateTimeStart: 'Fecha de Inicio',
+      dateTimeEnd: 'Fecha Final',
       bgcolor: 'Color de fondo',
       days: 'Días',
       icon: 'Icono',
@@ -559,6 +584,7 @@ const msgglobal = {
       canceled: 'Cancelado',
       deleted: 'Eliminado',
       duplicate: 'Duplica',
+      notempty: 'El campo no puede estar vacío.',
       modified: 'Modificado'
     },
     newsletter: {
@@ -697,12 +723,23 @@ const msgglobal = {
         sameaspassword: 'Les mots de passe doivent être identiques',
       }
     },
+    op: {
+      qualification: 'Qualification',
+      disciplines: 'Disciplines',
+      certifications: 'Certifications',
+      intro: 'Introduction',
+      info: 'Biographie',
+      webpage: 'Page Web',
+      days_working: 'Jours ouvrés',
+      facebook: 'Page Facebook',
+    },
     login: {
       page_title: 'Login',
       incorso: 'Connexion en cours',
       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",
@@ -820,7 +857,8 @@ const msgglobal = {
       short_tit: 'Titre abrégé\'',
       title: 'Titre',
       details: 'Détails',
-      date: 'Date',
+      dateTimeStart: 'Data Initiale',
+      dateTimeEnd: 'Date de fin',
       bgcolor: 'Couleur de fond',
       days: 'Journées',
       icon: 'Icône',
@@ -842,6 +880,7 @@ const msgglobal = {
       canceled: 'Annulé',
       deleted: 'Supprimé',
       duplicate: 'Duplique',
+      notempty: 'Le champ ne peut pas être vide',
       modified: 'modifié'
     },
     newsletter: {
@@ -980,11 +1019,22 @@ const msgglobal = {
         sameaspassword: 'Passwords must be identical',
       }
     },
+    op: {
+      qualification: 'Qualification',
+      disciplines: 'Disciplines',
+      certifications: 'Certifications',
+      intro: 'Introduction',
+      info: 'Biography',
+      webpage: 'Web Page',
+      days_working: 'Working Days',
+      facebook: 'Facebook Page',
+    },
     login: {
       incorso: 'Login...',
       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",
@@ -1102,7 +1152,8 @@ const msgglobal = {
       short_tit: 'Short Title',
       title: 'Title',
       details: 'Details',
-      date: 'Date',
+      dateTimeStart: 'Date Start',
+      dateTimeEnd: 'Date End',
       bgcolor: 'Background color',
       days: 'Days',
       icon: 'Icon',
@@ -1124,6 +1175,7 @@ const msgglobal = {
       canceled: 'Canceled',
       deleted: 'Deleted',
       duplicate: 'Duplicate',
+      notempty: 'Field cannot be empty',
       modified: 'Modified'
     },
     newsletter: {
@@ -1263,12 +1315,23 @@ const msgglobal = {
         sameaspassword: 'Passwords must be identical',
       }
     },
+    op: {
+      qualification: 'Qualification',
+      disciplines: 'Disciplines',
+      certifications: 'Certifications',
+      intro: 'Introduction',
+      info: 'Biography',
+      webpage: 'Web Page',
+      days_working: 'Working Days',
+      facebook: 'Facebook Page',
+    },
     login: {
       page_title: 'Login',
       incorso: 'Login...',
       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",
@@ -1386,7 +1449,8 @@ const msgglobal = {
       short_tit: 'Short Title',
       title: 'Title',
       details: 'Details',
-      date: 'Date',
+      dateTimeStart: 'Date Start',
+      dateTimeEnd: 'Date End',
       bgcolor: 'Background color',
       days: 'Days',
       icon: 'Icon',
@@ -1408,6 +1472,7 @@ const msgglobal = {
       canceled: 'Canceled',
       deleted: 'Deleted',
       duplicate: 'Duplicate',
+      notempty: 'Field cannot be empty',
       modified: 'Modified'
     },
     newsletter: {

src/store/Api/Instance.ts

@@ -51,7 +51,7 @@ export const removeAuthHeaders = () => {
 async function Request(type: string, path: string, payload: any): Promise<Types.AxiosSuccess | Types.AxiosError> {
   let ricevuto = false
   try {
-    console.log('Axios Request', path, type, payload)
+    console.log('Axios Request', path, type, tools.notshowPwd(payload))
     let response: AxiosResponse
     if (type === 'post' || type === 'put' || type === 'patch') {
       response = await axiosInstance[type](path, payload, {

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,37 +319,16 @@ 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)
 
+      if (!!mylist) {
         const myrec = mylist.find((event) => event[mykey] === id)
         // console.log('myrec', myrec)
         if (myrec) {
@@ -309,6 +337,7 @@ namespace Mutations {
             myrec[key] = value
           }
         }
+      }
     } catch (e) {
       console.error(e)
     }
@@ -653,13 +682,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 +698,6 @@ namespace Actions {
         return new Types.AxiosError(serv_constants.RIS_CODE_ERR, null, tools.ERR_GENERICO, error)
       })
 
-    return ris
-
   }
 
   export const actions = {

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:')

src/store/Modules/Store/calendar/CalendarStore.ts

@@ -9,8 +9,9 @@ import { tools } from '../../tools'
 import translate from '../../../../globalroutines/util'
 import * as Types from '../../../Api/ApiTypes'
 import { db_data } from '@src/db/db_data'
-import { GlobalStore, UserStore } from '@store'
+import { CalendarStore, GlobalStore, UserStore } from '@store'
 import { lists } from '@src/store/Modules/lists'
+import { IUserState } from '@src/model'
 
 // State
 const state: ICalendarState = {
@@ -36,10 +37,10 @@ const state: ICalendarState = {
   showWorkWeeks: false,
   intervalRange: { min: 9, max: 23 },
   intervalRangeStep: 1,
-  intervalHeight: 35,
+  intervalHeight: 35, // 35
-  resourceHeight: 60,
+  resourceHeight: 80, // 60
   resourceWidth: 100,
-  dayHeight: 100,
+  dayHeight: 150,
   enableThemes: false,
   theme: {}
 }
@@ -77,6 +78,24 @@ namespace Getters {
 
   }, 'getContribtypeRec')
 
+  const getOperatorByUsername = b.read((mystate: ICalendarState) => (username) => {
+    const ctrec = mystate.operators.find((rec) => rec.username === username)
+    return (ctrec)
+
+  }, 'getOperatorByUsername')
+
+  const getImgTeacherByUsername = b.read((mystate: ICalendarState) => (username): string => {
+    if (username === '')
+      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 ''
+    }
+  }, 'getImgTeacherByUsername')
+
   const getContribtypeById = b.read((mystate: ICalendarState) => (id) => {
     const ctrec = mystate.contribtype.find((mycontr) => mycontr._id === id)
     return (ctrec) ? ctrec.label : ''
@@ -109,6 +128,12 @@ namespace Getters {
     },
     get getContribtypeRecByLabel() {
       return getContribtypeRecByLabel()
+    },
+    get getOperatorByUsername() {
+      return getOperatorByUsername()
+    },
+    get getImgTeacherByUsername() {
+      return getImgTeacherByUsername()
     }
   }
 }

src/store/Modules/UserStore.ts

@@ -20,9 +20,7 @@ import { shared_consts } from '../../common/shared_vuejs'
 
 const bcrypt = require('bcryptjs')
 
-// State
+const DefaultUser: IUserFields = {
-const state: IUserState = {
-  my: {
   _id: '',
   email: '',
   username: '',
@@ -30,8 +28,15 @@ const state: IUserState = {
   surname: '',
   password: '',
   tokens: [],
-    verified_email: false
+  verified_email: false,
-  },
+  profile: {
+    img: ''
+  }
+}
+
+// State
+const state: IUserState = {
+  my: DefaultUser,
   lang: process.env.LANG_DEFAULT,
   repeatPassword: '',
   categorySel: 'personal',
@@ -140,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)
-    if (myrec && !!myrec.img && myrec.img !== '' && myrec.img !== 'undefined') {
+    // console.log('myrec', myrec)
-      return myrec.img
+    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')
 
@@ -189,7 +195,7 @@ namespace Getters {
     },
     get getUsersList() {
       return getUsersList()
-    }
+    },
   }
 
 }
@@ -203,8 +209,8 @@ namespace Mutations {
     mystate.isTeacher = tools.isBitActive(mystate.my.perm, shared_consts.Permissions.Teacher.value)
 
     // console.log('authUser', 'state.isAdmin', mystate.isAdmin)
-    console.table(mystate)
+    // console.table(mystate)
-    console.table(data)
+    // console.table(data)
 
     // if (data.my.verified_email) {
     //   mystate.my.verified_email = data.my.verified_email
@@ -561,7 +567,10 @@ namespace Actions {
             localStorage.setItem(tools.localStorage.name, myuser.name)
             localStorage.setItem(tools.localStorage.surname, myuser.surname)
             localStorage.setItem(tools.localStorage.perm, String(myuser.perm) || '')
-            localStorage.setItem(tools.localStorage.img, String(myuser.img) || '')
+            if (myuser.profile !== undefined)
+              localStorage.setItem(tools.localStorage.img, (!!myuser.profile.img) ? String(myuser.profile.img) || '' : '')
+            else
+              localStorage.setItem(tools.localStorage.img, '')
             localStorage.setItem(tools.localStorage.token, state.x_auth_token)
             localStorage.setItem(tools.localStorage.expirationDate, expirationDate.toString())
             localStorage.setItem(tools.localStorage.isLogged, String(true))
@@ -607,6 +616,7 @@ namespace Actions {
     localStorage.removeItem(tools.localStorage.wasAlreadySubOnDb)
 
     state.isLogged = false
+    state.my = { ...DefaultUser }
 
     await GlobalStore.actions.clearDataAfterLogout()
 
@@ -628,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)
 
@@ -640,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')
   }
 
@@ -685,18 +699,18 @@ namespace Actions {
             surname,
             verified_email,
             perm,
-            img
+            profile: { img }
           })
 
           isLogged = true
         }
       }
 
-      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

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,
@@ -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' }),
@@ -59,12 +70,19 @@ const colTablePermission = [
 
 const colTableOperator = [
   AddCol({ name: 'username', label_trans: 'reg.username' }),
-  // AddCol({ name: 'name', label_trans: 'reg.name' }),
+  AddCol({ name: 'name', label_trans: 'reg.name' }),
-  // AddCol({ name: 'surname', label_trans: 'reg.surname' }),
+  AddCol({ name: 'surname', label_trans: 'reg.surname' }),
-  // AddCol({ name: 'webpage', label_trans: 'reg.webpage' }),
+  AddCol({ name: 'email', label_trans: 'reg.email' }),
-  // AddCol({ name: 'email', label_trans: 'reg.email' }),
+  AddCol({ name: 'img', label_trans: 'event.img' }),
-  // AddCol({ name: 'cell', label_trans: 'reg.cell' }),
+  AddCol({ name: 'cell', label_trans: 'reg.cell' }),
-  // AddCol({ name: 'img', label_trans: 'reg.img' }),
+  AddCol({ name: 'qualification', label_trans: 'op.qualification' }),
+  AddCol({ name: 'disciplines', label_trans: 'op.disciplines' }),
+  AddCol({ name: 'certifications', label_trans: 'op.certifications' }),
+  AddCol({ name: 'intro', label_trans: 'op.intro' , fieldtype: tools.FieldType.html }),
+  AddCol({ name: 'info', label_trans: 'op.info', fieldtype: tools.FieldType.html }),
+  AddCol({ name: 'webpage', label_trans: 'op.webpage' }),
+  AddCol({ name: 'days_working', label_trans: 'op.days_working' }),
+  AddCol({ name: 'facebook', label_trans: 'op.facebook' }),
   AddCol(DeleteRec)]
 
 const colTableEvents = [
@@ -74,17 +92,17 @@ const colTableEvents = [
   AddCol({ name: 'title', label_trans: 'event.title' }),
   AddCol({ name: 'details', label_trans: 'event.details' }),
   AddCol({ name: 'dateTimeStart', label_trans: 'event.dateTimeStart', fieldtype: tools.FieldType.date }),
-  AddCol({ name: 'dateTimeEnd', label_trans: 'event.dateTimeEnd' }),
+  AddCol({ name: 'dateTimeEnd', label_trans: 'event.dateTimeEnd', fieldtype: tools.FieldType.date }),
   AddCol({ name: 'bgcolor', label_trans: 'event.bgcolor' }),
   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: 'wherecode', label_trans: 'event.where', fieldtype: tools.FieldType.select, jointable: 'wheres' }),
-  AddCol({ name: 'contribtype', label_trans: 'event.contribtype' }),
+  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: 'teacher', label_trans: 'event.teacher', fieldtype: tools.FieldType.select, jointable: 'operators' }),
-  AddCol({ name: 'teacher2', label_trans: 'event.teacher2' }),
+  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' }),
@@ -135,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)
@@ -174,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'
     },
     {
@@ -205,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
@@ -214,9 +271,10 @@ export const fieldsTable = {
     AddCol({ name: 'name', label_trans: 'reg.name' }),
     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',

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,
@@ -30,6 +33,10 @@ import { dom } from 'quasar'
 
 const { height, width } = dom
 
+import Cookies from 'js-cookie'
+
+const TokenKey = 'Admin-Token'
+
 export interface INotify {
   color?: string | 'primary'
   textColor?: string
@@ -37,6 +44,8 @@ export interface INotify {
 }
 
 export const tools = {
+  CAN_EDIT: 'q-ce',
+
   listBestColor: [
     'blue',
     'green',
@@ -117,9 +126,23 @@ export const tools = {
     boolean: 1,
     date: 2,
     string: 4,
-    binary: 8
+    binary: 8,
+    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,
@@ -1356,7 +1379,7 @@ export const tools = {
         notify: par.param2 === true ? '1' : '0'
       }).then((ris) => {
         if (ris) {
-          tools.showPositiveNotif(myself.$q, myself.$t('cal.canceledbooking') + ' "' + par.param1.title + '"')
+          tools.showPositiveNotif(myself.$q, myself.$t('cal.canceledbooking') + ' "' + par.param3 + '"')
           if (myself.bookEventpage)
             myself.bookEventpage.show = false
         } else
@@ -1423,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
@@ -1712,7 +1735,7 @@ export const tools = {
       } else {
         mystr = `${tools.getstrDate(myevent.dateTimeStart)}
                  ${mythis.$t('cal.starttime')} ${ tools.getstrTime(myevent.dateTimeStart) }          
-                 ${ mythis.$t('cal.endtime')}: ${ tools.getstrTime(myevent.dateTimeEnd) }`
+                 ${ mythis.$t('cal.endtime')} ${ tools.getstrTime(myevent.dateTimeEnd) }`
       }
     } else {
       mystr = `<span class="cal__where-content">${tools.getstrDate(myevent.dateTimeStart)}</span>
@@ -1776,10 +1799,7 @@ export const tools = {
   },
 
 // mystrdate "26.04.2013"
-  convertstrtoDate(mystrdate
+  convertstrtoDate(mystrdate: string) {
-                     :
-                     string
-  ) {
     if (mystrdate.length < 10) {
       return null
     }
@@ -2456,7 +2476,8 @@ export const tools = {
     console.log('CancelBookingEvent ', eventparam)
     tools.askConfirm(mythis.$q, translate('cal.titlebooking'), translate('cal.cancelbooking') + ' ' + tools.gettextevent(mythis, eventparam) + '?', translate('dialog.yes'), translate('dialog.no'), mythis, '', lists.MenuAction.DELETE, 0, {
       param1: bookeventid,
-      param2: notify
+      param2: notify,
+      param3: eventparam.title
     })
   }
   ,
@@ -2544,6 +2565,67 @@ export const tools = {
       return this.listBestColor[index]
     else
       return 'primary'
+  },
+  getCookie(mytok, oldval?) {
+    const ris = Cookies.get(mytok)
+    console.log('getCookie', ris)
+    if (!!ris) {
+      return ris
+    } else {
+      return oldval
+    }
+  },
+
+  setCookie(mytok, value: string) {
+    return Cookies.set(mytok, value)
+  },
+
+  removeCookie(mytok) {
+    return Cookies.remove(mytok)
+  },
+  notshowPwd(payload) {
+    const mypay = { ...payload }
+    try {
+      if (!!mypay.password) {
+        mypay.password = '**********'
+      }
+    } catch (e) {
+      console.log('error', e)
+    }
+    return mypay
+  },
+  scrollToTop() {
+    const element = document.getElementById('mypage')
+    this.scrollToElement(element)
+  },
+  scrollToElementId(myid) {
+    const element = document.getElementById(myid)
+    this.scrollToElement(element)
+  },
+  scrollToElement(el) {
+    const target = getScrollTarget(el)
+    const offset = el.offsetTop
+    const duration = 500
+    console.log('target', target, 'offset', offset, 'duration', duration)
+    setScrollPosition(target, offset, duration)
+  },
+  getCellForWhatsapp(numbercell) {
+    let mynum = numbercell.replace(/\-/g, '')
+    const intcode = GlobalStore.getters.getValueSettingsByKey('INT_CODE')
+    if (numbercell.substring(0, 1) !== '+')
+      mynum = intcode + mynum
+    else
+      mynum = mynum.substring(1)
+
+    return mynum
+  },
+
+  getHttpForWhatsapp(numbercell) {
+    const mynum = this.getCellForWhatsapp(numbercell)
+    if (mynum)
+      return 'https://wa.me/' + mynum
+    else
+      return ''
   }
 
 // getLocale() {

src/utils/auth.ts

@@ -2,14 +2,14 @@ import Cookies from 'js-cookie'
 
 const TokenKey = 'Admin-Token'
 
-export function getToken() {
+export function getCookie() {
   return Cookies.get(TokenKey)
 }
 
-export function setToken(token: string) {
+export function setCookie(token: string) {
   return Cookies.set(TokenKey, token)
 }
 
-export function removeToken() {
+export function removeCookie() {
   return Cookies.remove(TokenKey)
 }

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 { CMyAvatar } from '../../components/CMyAvatar'
-import { scroll } from 'quasar'
-
-const { getScrollTarget, setScrollPosition } = scroll
 
 // 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'))

src/views/messages/messages.vue

@@ -76,9 +76,7 @@
                                 <q-item clickable v-if="!!chatsel.username" @scroll="myonScroll">
 
                                     <q-item-section avatar>
-                                        <q-avatar>
+                                        <CMyAvatar :username="chatsel.username"></CMyAvatar>
-                                            <img :src="getImgByUsername(chatsel.username)">
-                                        </q-avatar>
                                     </q-item-section>
 
                                     <q-item-section>
@@ -116,9 +114,7 @@
                                                 sent
                                                 bg-color="blue-2">
                                             <template v-slot:avatar>
-                                                <q-avatar size="sm">
+                                                <CMyAvatar size="sm" :username="Username"></CMyAvatar>
-                                                    <img :src="getMyImg">
-                                                </q-avatar>
                                             </template>
 
                                         </q-chat-message>

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":
+"@quasar/app@^1.2.3":
-  version "1.2.1"
+  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@quasar/app/-/app-1.2.1.tgz#2cc23ed9230106ffc1605cc01de43395bff21405"
+  resolved "https://registry.yarnpkg.com/@quasar/app/-/app-1.2.3.tgz#da67dd62b35568e2dca6d406276e72b485bf6f38"
-  integrity sha512-cJaq56iTrIf0n1jjov2IRGCkjEA66iq+gPF7y1UAHr38s699pNPLugblvdqoFAa20ogDw/VtlrHOuQBcHoZSqQ==
+  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"
+    node-sass "4.13.0"
-    open "6.4.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"
+    terser-webpack-plugin "2.2.1"
-    url-loader "2.1.0"
+    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 "4.41.2"
-    webpack-bundle-analyzer "3.5.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:
+autoprefixer@9.7.1:
-  version "9.6.1"
+  version "9.7.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.1.tgz#9ffc44c55f5ca89253d9bb7186cefb01ef57747f"
-  integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
+  integrity sha512-w3b5y1PXWlhYulevrTJ0lizkQ5CyqfeU6BIRDbuhsMupstHQOeb1Ur80tcB1zxSu7AwyY/qCQ7Vvqklh31ZBFw==
   dependencies:
-    browserslist "^4.6.3"
+    browserslist "^4.7.2"
-    caniuse-lite "^1.0.30000980"
+    caniuse-lite "^1.0.30001006"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.17"
+    postcss "^7.0.21"
-    postcss-value-parser "^4.0.0"
+    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:
+cross-spawn@7.0.1, cross-spawn@^7.0.0:
-  version "7.0.0"
+  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.0.tgz#21ef9470443262f33dba80b2705a91db959b2e03"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"
-  integrity sha512-6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw==
+  integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==
   dependencies:
     path-key "^3.1.0"
-    shebang-command "^1.2.0"
+    shebang-command "^2.0.0"
-    which "^1.2.9"
+    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:
+dot-prop@5.1.1:
-  version "5.1.0"
+  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.1.0.tgz#bdd8c986a77b83e3fca524e53786df916cabbd8a"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.1.1.tgz#85783b39f2a54e04ae1981489a0ef2b9719bbd7d"
-  integrity sha512-n1oC6NBF+KM9oVXtjmen4Yo7HyAVWV2UUl50dCYJdw2924K6dX9bf9TTTWaKtYlRn0FEtxG27KS80ayVLixxJA==
+  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:
+fast-glob@3.1.0:
-  version "3.0.4"
+  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.0.4.tgz#d484a41005cb6faeb399b951fd1bd70ddaebb602"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.1.0.tgz#77375a7e3e6f6fc9b18f061cddd28b8d1eec75ae"
-  integrity sha512-wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg==
+  integrity sha512-TrUz3THiq2Vy3bjfQUB2wNyPdGBeGmdjbzzBLhfHN4YFurYptCKwGq/TfiRavbGywFRzY6U2CdmQ1zmsY5yYaw==
   dependencies:
-    "@nodelib/fs.stat" "^2.0.1"
+    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.1"
+    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.0.0"
+    glob-parent "^5.1.0"
-    is-glob "^4.0.1"
+    merge2 "^1.3.0"
-    merge2 "^1.2.3"
     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:
+memory-fs@0.5.0, memory-fs@^0.5.0:
-  version "0.4.1"
+  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
-  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-memory-fs@^0.5.0:
+memory-fs@^0.4.0, memory-fs@^0.4.1:
-  version "0.5.0"
+  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
+  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:
+quasar@^1.3.0:
-  version "1.2.1"
+  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/quasar/-/quasar-1.2.1.tgz#83117f5b17adcc7c08526b9aadc4ca7c2ab21287"
+  resolved "https://registry.yarnpkg.com/quasar/-/quasar-1.3.0.tgz#e0615595cef651ffa4a59ad8e333ba393fa98617"
-  integrity sha512-7PbX8HecdrDzpG9zcZk5PSuPRFicU6b07N9Dk0uk5N+2LNGEFGBwIuQnLeDpq03Xdv98Q6GpTTZNaWpXdYBZcg==
+  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:
+terser-webpack-plugin@2.2.1:
-  version "2.1.2"
+  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.1.2.tgz#2b9b8147a6f18918348200800cf9560c50f701bb"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.2.1.tgz#5569e6c7d8be79e5e43d6da23acc3b6ba77d22bd"
-  integrity sha512-MF/C4KABwqYOfRDi87f7gG07GP7Wj/kyiX938UxIGIO6l5mkh8XJL7xtS0hX/CRdVQaZI7ThGUPZbznrCjsGpg==
+  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:
+url-loader@2.2.0:
-  version "2.1.0"
+  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz#bcc1ecabbd197e913eca23f5e0378e24b4412961"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.2.0.tgz#af321aece1fd0d683adc8aaeb27829f29c75b46e"
-  integrity sha512-kVrp/8VfEm5fUt+fl2E0FQyrpmOYgMEkBsv8+UDP1wFhszECq5JyGF33I7cajlVY90zRZ6MyfgKXngLvHYZX8A==
+  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==