diff --git a/.env.development b/.env.development index 7f188f99..1719ee07 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.2.16" +APP_VERSION="0.2.18" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/freeplanet.app/.env.development b/_ALL_SITES/freeplanet.app/.env.development index 2690b374..0157f1a5 100755 --- a/_ALL_SITES/freeplanet.app/.env.development +++ b/_ALL_SITES/freeplanet.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.2.16" +APP_VERSION="0.2.18" SERVICE_WORKER_FILE="service-worker.js" APP_ID="1" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/freeplanet.app/db/static_data.ts b/_ALL_SITES/freeplanet.app/db/static_data.ts index 0405c1d5..66c7d1a5 100755 --- a/_ALL_SITES/freeplanet.app/db/static_data.ts +++ b/_ALL_SITES/freeplanet.app/db/static_data.ts @@ -503,10 +503,10 @@ const baseroutes: IListRoutes[] = [ { active: true, order: 130, - path: '/mywork/:idSkill', + path: '/myservice/:idSkill', materialIcon: '', - name: 'pages.mywork2', - component: () => import('@/views/user/mywork/mywork.vue'), + name: 'pages.myservice2', + component: () => import('@/views/user/myservice/myservice.vue'), meta: { requiresAuth: true }, inmenu: false, infooter: false, diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index 7f188f99..1719ee07 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.2.16" +APP_VERSION="0.2.18" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js b/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js index 88b81af6..faa23ab7 100755 --- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js +++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js @@ -25,7 +25,7 @@ const msg_website_it = { profile: 'Profilo', profile2: 'ProfiloU', mypage2: 'mypage2', - mywork2: 'mywork2', + myservice2: 'myservice2', test: 'Test', projects: 'Progetti', report: 'Report Ore', diff --git a/_ALL_SITES/insiemesipuo.app/db/static_data.ts b/_ALL_SITES/insiemesipuo.app/db/static_data.ts index 2cb39bfe..a3e77358 100755 --- a/_ALL_SITES/insiemesipuo.app/db/static_data.ts +++ b/_ALL_SITES/insiemesipuo.app/db/static_data.ts @@ -503,10 +503,10 @@ const baseroutes: IListRoutes[] = [ { active: true, order: 130, - path: '/mywork/:idSkill', + path: '/myservice/:idSkill', materialIcon: '', - name: 'pages.mywork2', - component: () => import('@/views/user/mywork/mywork.vue'), + name: 'pages.myservice2', + component: () => import('@/views/user/myservice/myservice.vue'), meta: { requiresAuth: true }, inmenu: false, infooter: false, diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 57f6f765..79cd2cb4 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.2.16" +APP_VERSION="0.2.18" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/popolodelnuovomondo.app/db/data/popolazione.js b/_ALL_SITES/popolodelnuovomondo.app/db/data/popolazione.js index b86043a2..0402d3e2 100644 --- a/_ALL_SITES/popolodelnuovomondo.app/db/data/popolazione.js +++ b/_ALL_SITES/popolodelnuovomondo.app/db/data/popolazione.js @@ -439,6 +439,14 @@ export const Province = [ label: 'Viterbo', value: 'VT', }, + { + label: 'Estero', + value: 'EST', + }, + { + label: 'On Line', + value: 'ONL', + }, ] export const Comuni = [ diff --git a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts index 3a7b1565..7ced4350 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts +++ b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts @@ -503,10 +503,10 @@ const baseroutes: IListRoutes[] = [ { active: true, order: 130, - path: '/mywork/:idSkill', + path: '/myservice/:idSkill', materialIcon: '', - name: 'pages.mywork2', - component: () => import('@/views/user/mywork/mywork.vue'), + name: 'pages.myservice2', + component: () => import('@/views/user/myservice/myservice.vue'), meta: { requiresAuth: true }, inmenu: false, infooter: false, diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 48bade12..eddfa054 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -469,12 +469,17 @@ export const shared_consts = { reg: 'CAL', value: 'VV', label: 'Vibo Valentia', - }, { _id: 109, reg: 'VEN', value: 'VI', label: 'Vicenza', }, { + }, + { _id: 109, reg: 'VEN', value: 'VI', label: 'Vicenza', }, { _id: 110, reg: 'LAZ', value: 'VT', label: 'Viterbo', - }, { _id: 111, reg: 'RSM', value: 'RSM', label: 'Repubblica di San Marino', }], + }, + { _id: 111, reg: 'RSM', value: 'RSM', label: 'Repubblica di San Marino', }, + { _id: 112, reg: 'EST', value: 'EST', label: 'Estero', }, + { _id: 113, reg: 'ONL', value: 'ONL', label: 'On Line', }, + ], Regions: [ { @@ -561,6 +566,14 @@ export const shared_consts = { value: 'VEN', label: 'Veneto', }, + { + value: 'EST', + label: 'Estero', + }, + { + value: 'ONL', + label: 'On Line', + }, ], Lang: [ diff --git a/src/components/CCheckIfIsLogged/CCheckIfIsLogged.scss b/src/components/CCheckIfIsLogged/CCheckIfIsLogged.scss new file mode 100755 index 00000000..e69de29b diff --git a/src/components/CCheckIfIsLogged/CCheckIfIsLogged.ts b/src/components/CCheckIfIsLogged/CCheckIfIsLogged.ts new file mode 100755 index 00000000..e2201bf3 --- /dev/null +++ b/src/components/CCheckIfIsLogged/CCheckIfIsLogged.ts @@ -0,0 +1,29 @@ +import { defineComponent, ref, computed, PropType, toRef } from 'vue' +import { useUserStore } from '@store/UserStore' +import { useRouter } from 'vue-router' +import { useGlobalStore } from '@store/globalStore' +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' + + +export default defineComponent({ + name: 'CCheckIfIsLogged', + components: { }, + props: {}, + setup(props, { emit }) { + + const userStore = useUserStore() + const $router = useRouter() + const globalStore = useGlobalStore() + const { t } = useI18n() + + return { + userStore, + tools, + costanti, + static_data, + } + } +}) diff --git a/src/components/CCheckIfIsLogged/CCheckIfIsLogged.vue b/src/components/CCheckIfIsLogged/CCheckIfIsLogged.vue new file mode 100755 index 00000000..d92a7f3d --- /dev/null +++ b/src/components/CCheckIfIsLogged/CCheckIfIsLogged.vue @@ -0,0 +1,31 @@ + + + + + + Accedi al menu inserendo le tue credenziali 🔑 + 📝 Non sei Registrato? + 👉🏻 Chiedi in chat il link a chi ti ha invitato. + + + + + + + + + {{ $t('login.enter') }} + + + + + + + + + diff --git a/src/components/CCheckIfIsLogged/index.ts b/src/components/CCheckIfIsLogged/index.ts new file mode 100755 index 00000000..e3ca5d6e --- /dev/null +++ b/src/components/CCheckIfIsLogged/index.ts @@ -0,0 +1 @@ +export {default as CCheckIfIsLogged} from './CCheckIfIsLogged.vue' diff --git a/src/components/CGallery/CGallery.ts b/src/components/CGallery/CGallery.ts index 4babe361..4c69f250 100755 --- a/src/components/CGallery/CGallery.ts +++ b/src/components/CGallery/CGallery.ts @@ -343,7 +343,7 @@ export default defineComponent({ function getUrl() { const myurl = tools.geturlupload() + getParamDir() - // console.log('myurl', myurl) + console.log('myurl', myurl) return myurl } diff --git a/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts b/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts index aa412f93..d70696b2 100644 --- a/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts +++ b/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts @@ -5,6 +5,7 @@ import { CTitleBanner } from '@/components/CTitleBanner' import { CProfile } from '@/components/CProfile' import { CDateTime } from '@/components/CDateTime' import { CMyPage } from '@/components/CMyPage' +import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged' import { CMyFieldRec } from '@/components/CMyFieldRec' import { tools } from '@store/Modules/tools' import { useUserStore } from '@store/UserStore' @@ -19,7 +20,7 @@ import { colCitys, fieldsTable } from '@store/Modules/fieldsTable' export default defineComponent({ name: 'CMyCardGrpPopup', - components: { CProfile, CTitleBanner, CMyFieldDb, CDateTime, CMyPage, CMyFieldRec }, + components: { CProfile, CTitleBanner, CMyFieldDb, CDateTime, CMyPage, CMyFieldRec, CCheckIfIsLogged }, props: { table: { type: String, @@ -54,7 +55,7 @@ export default defineComponent({ function load() { // Carica il profilo di quest'utente - if (props.idRec > 0) { + if (props.idRec && props.idRec > 0) { userStore.loadGeneric(props.table, props.idRec).then((ris) => { myrec.value = ris }) diff --git a/src/components/CMyCardGrpPopup/CMyCardGrpPopup.vue b/src/components/CMyCardGrpPopup/CMyCardGrpPopup.vue index e8b5c844..54ea9fdf 100644 --- a/src/components/CMyCardGrpPopup/CMyCardGrpPopup.vue +++ b/src/components/CMyCardGrpPopup/CMyCardGrpPopup.vue @@ -1,4 +1,7 @@ + + + null) @@ -61,9 +61,9 @@ export default defineComponent({ return userStore.getImgByProfile(profile) } - /*function naviga(path: string) { + function naviga(path: string) { $router.push(path) - }*/ + } function setCmd($q: any, cmd: number, myusername: string, value: any, groupname: string) { emit('setCmd', $q, cmd, myusername, value, groupname) @@ -80,7 +80,7 @@ export default defineComponent({ myrec, costanti, getImgUser, - // naviga, + naviga, setCmd, shared_consts, userStore, diff --git a/src/components/CMyRecCard/CMyRecCard.vue b/src/components/CMyRecCard/CMyRecCard.vue index f63b1691..a887be10 100755 --- a/src/components/CMyRecCard/CMyRecCard.vue +++ b/src/components/CMyRecCard/CMyRecCard.vue @@ -3,14 +3,21 @@ + + + {{ fieldsTable.getValByTabAndId(table, 'adType', myrec.adType) }} + + + {{ fieldsTable.getValByTabAndId(table, 'adType', myrec.adType) }} import('@/views/user/mywork/mywork.vue'), + name: 'pages.myservice2', + component: () => import('@/views/user/myservice/myservice.vue'), meta: { requiresAuth: true }, inmenu: false, infooter: false, diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 7c359c94..19fc8e39 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -757,6 +757,8 @@ export interface IMySkill { descr: string date_created?: Date, date_updated?: Date, + + username?: string } export interface IMyGoods { diff --git a/src/root/mainview/mainview.ts b/src/root/mainview/mainview.ts index c74a27a8..7522e945 100755 --- a/src/root/mainview/mainview.ts +++ b/src/root/mainview/mainview.ts @@ -10,6 +10,7 @@ import { CChartMap } from '@src/components/CChartMap' import { Footer } from '@src/components/Footer' import { CUserNonVerif } from '@/components/CUserNonVerif' import { CCopyBtn } from '@/components/CCopyBtn' +import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged' import { CMapsEsempio } from '@src/components/CMapsEsempio' import { useGlobalStore } from '@store/globalStore' import { useUserStore } from '@store/UserStore' @@ -20,7 +21,7 @@ import MixinUsers from '@/mixins/mixin-users' export default defineComponent({ name: 'mainview', - components: { CSkill, CChartMap, CMapsEsempio, CDashboard, CUserNonVerif, CMainView, CCopyBtn, Footer }, + components: { CSkill, CChartMap, CMapsEsempio, CDashboard, CUserNonVerif, CMainView, CCopyBtn, Footer, CCheckIfIsLogged }, setup() { const globalStore = useGlobalStore() const userStore = useUserStore() diff --git a/src/root/mainview/mainview.vue b/src/root/mainview/mainview.vue index 30b3f39e..ddb31bde 100755 --- a/src/root/mainview/mainview.vue +++ b/src/root/mainview/mainview.vue @@ -44,25 +44,7 @@ - - - - Accedi al menu inserendo le tue credenziali 🔑 - 📝 Non sei Registrato? - 👉🏻 Chiedi in chat il link a chi ti ha invitato. - - - - - - - - - {{ $t('login.enter') }} - - +