diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index b5fe710b..fddd26cd 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -45,6 +45,7 @@ export const shared_consts = { BOTT_CONDIVIDI: 190, BUTTON: 195, PRESENTAZIONE: 200, + MYACTIVITIES: 205, NOTIFATTOP: 210, CHART: 220, CHECKNEWVERSION: 230, @@ -1312,6 +1313,10 @@ export const shared_consts = { value: 200, label: 'Presentazione', }, + { + value: 205, + label: 'Attività', + }, { value: 210, label: 'Notifiche in Top', diff --git a/src/components/CCheckIfIsLogged/CCheckIfIsLogged.ts b/src/components/CCheckIfIsLogged/CCheckIfIsLogged.ts index d3c72884..363bab0e 100755 --- a/src/components/CCheckIfIsLogged/CCheckIfIsLogged.ts +++ b/src/components/CCheckIfIsLogged/CCheckIfIsLogged.ts @@ -6,11 +6,11 @@ import { useI18n } from '@/boot/i18n' import { tools } from '@store/Modules/tools' import { costanti } from '@store/Modules/costanti' import { static_data } from '@src/db/static_data' - +import { CRegistration } from '@/components/CRegistration' export default defineComponent({ name: 'CCheckIfIsLogged', - components: { }, + components: { CRegistration }, props: {}, setup(props, { emit }) { diff --git a/src/components/CCheckIfIsLogged/CCheckIfIsLogged.vue b/src/components/CCheckIfIsLogged/CCheckIfIsLogged.vue index a8c136ff..859efaa3 100755 --- a/src/components/CCheckIfIsLogged/CCheckIfIsLogged.vue +++ b/src/components/CCheckIfIsLogged/CCheckIfIsLogged.vue @@ -1,40 +1,132 @@ diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index df242f44..bdd77d8f 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -251,6 +251,11 @@ export default defineComponent({ required: false, default: false, }, + hidetitleIfEmpty: { + type: Boolean, + required: false, + default: false, + }, }, components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups, @@ -282,6 +287,7 @@ export default defineComponent({ const search = ref('') const tablesel = ref('') + const showSpin = ref(false) const loading = ref(false) const editOn = computed({ @@ -2178,6 +2184,7 @@ export default defineComponent({ showNotification, editOn, newRecordBoolOld, + showSpin, } } }) diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 66fe834b..2679088a 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -1,7 +1,5 @@ + diff --git a/src/components/CMyActivities/index.ts b/src/components/CMyActivities/index.ts new file mode 100755 index 00000000..bf87d49e --- /dev/null +++ b/src/components/CMyActivities/index.ts @@ -0,0 +1 @@ +export {default as CMyActivities} from './CMyActivities.vue' diff --git a/src/components/CMyElem/CMyElem.ts b/src/components/CMyElem/CMyElem.ts index 18cdc661..6da3dbe6 100755 --- a/src/components/CMyElem/CMyElem.ts +++ b/src/components/CMyElem/CMyElem.ts @@ -12,6 +12,7 @@ import { CTitle } from '@/components/CTitle/index' import { tools } from '@store/Modules/tools' import { shared_consts } from '@/common/shared_vuejs' import { LandingFooter } from '@/components/LandingFooter' +import { CMyActivities } from '@/components/CMyActivities' import { COpenStreetMap } from '@src/components/COpenStreetMap' import { CCardCarousel } from '@src/components/CCardCarousel' import { CMyPage } from '@src/components/CMyPage' @@ -46,7 +47,7 @@ export default defineComponent({ CCardCarousel, COpenStreetMap, CMyPage, CMyPageIntro, CMyEditor, CMyFieldRec, CSelectColor, CSelectFontSize, CImgPoster, CCheckIfIsLogged, CStatusReg, CDashboard, CMainView, CNotifAtTop, - CPresentazione, + CPresentazione, CMyActivities, CTitleBanner, CShareSocial, CCheckAppRunning, CRegistration, }, emits: ['selElemClick'], diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue index 76383f02..a64e72b9 100755 --- a/src/components/CMyElem/CMyElem.vue +++ b/src/components/CMyElem/CMyElem.vue @@ -521,6 +521,10 @@
Pagina di Presentazione
+
+
Pagina Attività
+ +
Notifiche in Cima
diff --git a/src/components/CSkill/CSkill.ts b/src/components/CSkill/CSkill.ts index e78636dd..cefafb66 100755 --- a/src/components/CSkill/CSkill.ts +++ b/src/components/CSkill/CSkill.ts @@ -19,6 +19,11 @@ export default defineComponent({ type: String, required: true, }, + title: { + type: String, + required: false, + default: '', + }, defaultnewrec: { type: Function, required: false, diff --git a/src/components/CSkill/CSkill.vue b/src/components/CSkill/CSkill.vue index 011c01cf..28c44e93 100755 --- a/src/components/CSkill/CSkill.vue +++ b/src/components/CSkill/CSkill.vue @@ -4,7 +4,7 @@ + :noaut="noaut" + :hidetitleIfEmpty="true">
diff --git a/src/components/MyHeader/MyHeader.vue b/src/components/MyHeader/MyHeader.vue index fef5d6c9..9fb55380 100755 --- a/src/components/MyHeader/MyHeader.vue +++ b/src/components/MyHeader/MyHeader.vue @@ -180,7 +180,7 @@ dense flat round - icon="menu" + icon="fas fa-user" @click="rightDrawerOpen = !rightDrawerOpen" > diff --git a/src/router/routesAdmin.ts b/src/router/routesAdmin.ts index f17e9b54..2b6986d8 100644 --- a/src/router/routesAdmin.ts +++ b/src/router/routesAdmin.ts @@ -441,17 +441,7 @@ function getRoutesAd(site: ISites) { inmenu: false, infooter: false, }, - { - active: true, - order: 141, - path: '/attivita/:username', - materialIcon: 'fas fa-user', - name: 'otherpages.myactivities2', - component: () => import('@/views/user/myactivities/myactivities.vue'), - meta: { requiresAuth: true }, - inmenu: false, - infooter: false, - }, + { active: true, order: 200, diff --git a/src/views/user/myactivities/myactivities.ts b/src/views/user/myactivities/myactivities.ts index f5649403..b9324f1b 100755 --- a/src/views/user/myactivities/myactivities.ts +++ b/src/views/user/myactivities/myactivities.ts @@ -1,206 +1,27 @@ -import { CMyFieldDb } from '@/components/CMyFieldDb' -import { CMyFieldRec } from '@/components/CMyFieldRec' -import { CTitleBanner } from '@/components/CTitleBanner' -import { CProfile } from '@/components/CProfile' -import { CLabel } from '@/components/CLabel' -import { CCopyBtn } from '@/components/CCopyBtn' -import { CSkill } from '@/components/CSkill' -import { CDateTime } from '@/components/CDateTime' -import { CMyGroup } from '@/components/CMyGroup' -import { CMyCircuit } from '@/components/CMyCircuit' -import { CNotifAtTop } from '@src/components/CNotifAtTop' -import { CSendCoins } from '@/components/CSendCoins' -import { CMyUser } from '@/components/CMyUser' -import { CUserNonVerif } from '@/components/CUserNonVerif' +import { CMyActivities } from '@/components/CMyActivities' import { tools } from '@store/Modules/tools' import { computed, defineComponent, onMounted, ref, watch } from 'vue' -import { useUserStore } from '@store/UserStore' -import { useRoute, useRouter } from 'vue-router' -import { useGlobalStore } from '@store/globalStore' -import { useI18n } from '@/boot/i18n' -import { toolsext } from '@store/Modules/toolsext' -import { useQuasar } from 'quasar' -import { costanti } from '@costanti' -import { ICircuit, IMyCircuit, IMyGroup, IUserFields } from 'model' -import { shared_consts } from '@/common/shared_vuejs' -import { static_data } from '@/db/static_data' -import { fieldsTable } from '@store/Modules/fieldsTable' -import { useNotifStore } from '@store/NotifStore' -import MixinUsers from '@/mixins/mixin-users' export default defineComponent({ name: 'myactivities', components: { - CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CCopyBtn, CUserNonVerif, CMyFieldRec, CMyUser, - CMyGroup, CLabel, CMyCircuit, CSendCoins, CNotifAtTop + CMyActivities }, props: {}, setup() { - const userStore = useUserStore() - const globalStore = useGlobalStore() - const $route = useRoute() - const $q = useQuasar() - const { t } = useI18n() - const site = ref(globalStore.site) - - const { getRefLink } = MixinUsers() - - const animation = ref('fade') - - const username = computed(() => $route.params.username ? $route.params.username.toString() : userStore.my.username) - const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '') - - const filtroutente = ref([]) - const showPic = ref(false) - const caricato = ref(false) - const showsendCoinTo = ref(false) - - const myuser = ref(null) - - const actualcard = ref('mygoods') - - const notifStore = useNotifStore() - - const mycards = computed(() => { - return costanti.MAINCARDS.filter((rec: any) => rec.table) - }) - const optionsMainCards = ref({}) - - const listgroupsfiltered = ref([]) - const listcircuitsfiltered = ref([]) - - - function profile() { - return userStore.my.profile - } - - function myusername() { - return userStore.my.username - } - - async function loadProfile() { - console.log('loadProfile...', username.value) - try { - // Carica il profilo di quest'utente - if (username.value) { - await userStore.loadUserProfile({ username: username.value, idnotif: idnotif.value }).then((ris) => { - console.log('loadUserProfile = ', ris) - myuser.value = ris - if (myuser.value) { - filtroutente.value = [{ userId: myuser.value._id }] - notifStore.setAsRead(idnotif.value) - - try { - listgroupsfiltered.value = globalStore.mygroups.filter((grp: IMyGroup) => myuser.value!.profile.mygroups.findIndex((rec: IMyGroup) => rec.groupname === grp.groupname) >= 0) - } catch (e) { - listgroupsfiltered.value = [] - } - - try { - listcircuitsfiltered.value = myuser.value.profile.mycircuits - } catch (e) { - listcircuitsfiltered.value = [] - } - - } - }) - - } - caricato.value = true - - optionsMainCards.value = tools.getoptionsMainCards(true) - }catch (e) { - console.error('ERR loadProfile', e) - } - } - - watch(() => username.value, (to: any, from: any) => { - loadProfile() - }) - - watch(() => actualcard.value, (to: any, from: any) => { - loadProfile() - }) + // const username = computed(() => $route.params.username ? $route.params.username.toString() : userStore.my.username) + // const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '') function mounted() { - loadProfile() - } - - function getImgUser() { - if (myuser.value) - return userStore.getImgByProfile(myuser.value) - else - return '' - } - - function checkifShow(col: string) { - //++Todo: checkifShow Permessi ! - return true - } - - function getLinkUserTelegram() { - - if (myuser.value) { - if (!!myuser.value.profile.username_telegram) { - return 'https://t.me/' + myuser.value.profile.username_telegram - } - } else { - return '' - } - } - - function getLinkWebSite() { - if (myuser.value) { - let site = myuser.value.profile.website! - if (site) { - if (!site.startsWith('http')) { - site = 'https://' + site - } - } - return site - } else { - return '' - } - } - - function isMyRecord(username: string) { - return username === userStore.my.username + // } onMounted(mounted) return { - username, - profile, tools, - costanti, - myuser, - shared_consts, - getImgUser, - checkifShow, - getLinkUserTelegram, - getLinkWebSite, - filtroutente, - showPic, - myusername, - userStore, - t, - static_data, - animation, - isMyRecord, - getRefLink, - fieldsTable, - mycards, - actualcard, - caricato, - listgroupsfiltered, - idnotif, - showsendCoinTo, - site, - listcircuitsfiltered, - optionsMainCards, } } }) diff --git a/src/views/user/myactivities/myactivities.vue b/src/views/user/myactivities/myactivities.vue index 060f5912..972830fb 100755 --- a/src/views/user/myactivities/myactivities.vue +++ b/src/views/user/myactivities/myactivities.vue @@ -1,162 +1,5 @@