- Fixed Image avatar user list, q-qvatar rounded image

src/components/CEventsCalendar/CEventsCalendar.ts

@@ -440,7 +440,7 @@ export default class CEventsCalendar extends Vue {
   }
 
   public addBookEventMenu(eventparam) {
-    if (!UserStore.state.isLogged || !UserStore.state.verified_email) {
+    if (!UserStore.state.isLogged || !UserStore.state.my.verified_email) {
       // Visu right Toolbar to make SignIn
       GlobalStore.state.RightDrawerOpen = true
       // this.$router.push('/signin')
@@ -459,7 +459,7 @@ export default class CEventsCalendar extends Vue {
   }
 
   public askForInfoEventMenu(eventparam) {
-    if (!UserStore.state.isLogged || !UserStore.state.verified_email) {
+    if (!UserStore.state.isLogged || !UserStore.state.my.verified_email) {
       // Visu right Toolbar to make SignIn
       GlobalStore.state.RightDrawerOpen = true
       // this.$router.push('/signin')
@@ -665,7 +665,7 @@ export default class CEventsCalendar extends Vue {
     const data: IMessage = {
       idapp: process.env.APP_ID,
       origin: {
-        userId: UserStore.state.userId,
+        userId: UserStore.state.my._id,
         page: '',
         event_id: myevent._id,
         infoevent: tools.gettextevent(this, myevent)
@@ -688,7 +688,6 @@ export default class CEventsCalendar extends Vue {
         tools.showNegativeNotif(self.$q, self.$t('cal.sendmsg_error'))
     })
 
-
   }
 
   public saveBookEvent(myevent: IEvents) {
@@ -703,7 +702,7 @@ export default class CEventsCalendar extends Vue {
       // self.bookEventForm.booked = self.bookEventForm.bookedcheck
 
       const data: IBookedEvent = {
-        userId: UserStore.state.userId,
+        userId: UserStore.state.my._id,
         id_bookedevent: myevent._id,
         numpeople: self.bookEventForm.numpeople,
         infoevent: tools.gettextevent(self, myevent),

src/components/CSignUp/CSignUp.ts

@@ -4,7 +4,7 @@ import { UserStore } from '@store'
 import { tools } from '../../store/Modules/tools'
 import { toolsext } from '@src/store/Modules/toolsext'
 
-import { ISignupOptions, IUserState } from 'model'
+import { ISignupOptions, IUserState, IUserFields } from 'model'
 import { validations, TSignup } from './CSignUp-validate'
 
 import { validationMixin } from 'vuelidate'

src/components/Header/Header.scss

@@ -211,7 +211,7 @@ canvas {
 }
 
 .toolbar {
-  min-height: 30px;
+  min-height: 43px;
 }
 
 .right-itens a, .right-itens button {
@@ -296,3 +296,8 @@ canvas {
   margin-bottom: 5px;
 }
 
+.roundimg  {
+  border-radius: 50% !important;
+  color: red;
+  background-color: red;
+}

src/components/Header/Header.ts

@@ -15,8 +15,11 @@ import Quasar, { Screen } from 'quasar'
 import { static_data } from '../../db/static_data'
 import globalroutines from '../../globalroutines'
 
+import MixinUsers from '../../mixins/mixin-users'
+
 @Component({
   name: 'Header',
+  mixins: [MixinUsers],
   components: {
     drawer,
     messagePopover, CSignIn
@@ -315,28 +318,6 @@ export default class Header extends Vue {
     }, 100)
   }
 
-  get MenuCollapse() {
-    return GlobalStore.state.menuCollapse
-    // return true
-  }
-
-  get Username() {
-    return UserStore.state.username
-  }
-  get myName() {
-    return UserStore.state.name
-  }
-  get mySurname() {
-    return UserStore.state.surname
-  }
-  get Verificato() {
-    return UserStore.state.verified_email
-  }
-
-  get Email() {
-    return UserStore.state.email
-  }
-
   public logoutHandler() {
     UserStore.actions.logout()
       .then(() => {
@@ -359,7 +340,7 @@ export default class Header extends Vue {
   }
 
   get isVerified() {
-    return UserStore.state.verified_email
+    return UserStore.state.my.verified_email
   }
 
   public loginOk() {

src/components/Header/Header.vue

@@ -102,11 +102,14 @@
 
                 <!-- BUTTON USER BAR -->
 
-                <q-btn 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 v-if="static_data.functionality.SHOW_USER_MENU && isLogged" dense flat round
-                       icon="img:statics/images/avatar/avatar3_small.png" @click="rightDrawerOpen = !rightDrawerOpen">
+                <q-btn class="q-mx-xs" v-if="static_data.functionality.SHOW_USER_MENU && isLogged" round dense flat
+                       @click="rightDrawerOpen = !rightDrawerOpen">
+                    <q-avatar size="30px">
+                        <img :src="`statics/`+ getMyImg">
+                    </q-avatar>
                 </q-btn>
 
             </q-toolbar>
@@ -134,7 +137,7 @@
                 <div class="absolute-top bg-transparent text-black center_img" style="margin-top: 10px;">
 
                     <q-avatar class="q-mb-sm center_img">
-                        <img src="../../statics/images/avatar/avatar3_small.png">
+                        <img :src="`../../statics/` + getMyImg">
                     </q-avatar>
                     <q-btn class="absolute-top-right" style="margin-right: 10px; color: white;"
                            dense flat round icon="close" @click="rightDrawerOpen = !rightDrawerOpen">

src/components/projects/SingleProject/SingleProject.ts

@@ -293,7 +293,7 @@ export default class SingleProject extends Vue {
   }
 
   get isMyProject() {
-    return this.itemproject.userId === UserStore.state.userId
+    return this.itemproject.userId === UserStore.state.my._id
   }
 
   get tipoProj() {