diff --git a/.env.development b/.env.development index d69779f1..5830dc4c 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,8 @@ +<<<<<<< HEAD APP_VERSION="0.5.83" +======= +APP_VERSION="0.5.85" +>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index b1bb20fb..5419689b 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,8 @@ +<<<<<<< HEAD APP_VERSION="0.5.83" +======= +APP_VERSION="0.5.85" +>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index 7301eea0..178a37da 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,8 @@ +<<<<<<< HEAD APP_VERSION="0.5.83" +======= +APP_VERSION="0.5.85" +>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index d69779f1..5830dc4c 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,8 @@ +<<<<<<< HEAD APP_VERSION="0.5.83" +======= +APP_VERSION="0.5.85" +>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index 6f6da6aa..c665d304 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,8 @@ +<<<<<<< HEAD APP_VERSION="0.5.83" +======= +APP_VERSION="0.5.85" +>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index e26c4796..b6eb089e 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,8 @@ +<<<<<<< HEAD APP_VERSION="0.5.83" +======= +APP_VERSION="0.5.85" +>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/package.json b/package.json index b3f7ec19..0c0c5f0d 100755 --- a/package.json +++ b/package.json @@ -123,6 +123,7 @@ "crypto": false }, "browserslist": [ +<<<<<<< HEAD "last 20 Chrome versions", "last 20 Firefox versions", "last 10 Edge versions", @@ -133,6 +134,18 @@ "last 20 iOS versions", "last 10 Opera versions", "> 0.1%", +======= + "last 40 Chrome versions", + "last 40 Firefox versions", + "last 10 Edge versions", + "last 35 Safari versions", + "last 60 Android versions", + "last 250 ChromeAndroid versions", + "last 60 FirefoxAndroid versions", + "last 30 iOS versions", + "last 10 Opera versions", + "> 0.05%", +>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) "not dead" ], "engines": { diff --git a/src/components/CAccomodation/CAccomodation.ts b/src/components/CAccomodation/CAccomodation.ts index 80048498..cf83ccfb 100755 --- a/src/components/CAccomodation/CAccomodation.ts +++ b/src/components/CAccomodation/CAccomodation.ts @@ -68,7 +68,7 @@ export default defineComponent({ }) function created() { - console.log('created CAccomodation', props.mylist) + // console.log('created CAccomodation', props.mylist) if (isValid(props.mylist)) { // @ts-ignore let myarr: any = props.mylist diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 885949dc..e5d688ad 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -1102,6 +1102,18 @@ :prop_myrec="myrecdialog" > +<<<<<<< HEAD +======= + + + + + + +>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) diff --git a/src/components/CMyActivities/CMyActivities.vue b/src/components/CMyActivities/CMyActivities.vue index 69810cb5..38fbcbb8 100755 --- a/src/components/CMyActivities/CMyActivities.vue +++ b/src/components/CMyActivities/CMyActivities.vue @@ -91,6 +91,7 @@ myclass="myshad" :canopen="true" > +<<<<<<< HEAD
@@ -104,6 +105,75 @@ + + + + + + + +
+ +
+ + + + + + +
+
+
{{ card.title }}
+ + + + + + +
+
+ >>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) :noaut="true" > diff --git a/src/components/CMyCardService/CMyCardService.ts b/src/components/CMyCardService/CMyCardService.ts new file mode 100644 index 00000000..904b4aa5 --- /dev/null +++ b/src/components/CMyCardService/CMyCardService.ts @@ -0,0 +1,197 @@ +import { computed, defineComponent, onMounted, PropType, ref, watch } from 'vue' + +import { CMyFieldDb } from '@/components/CMyFieldDb' +import { CTitleBanner } from '@/components/CTitleBanner' +import { CProfile } from '@/components/CProfile' +import { CDateTime } from '@/components/CDateTime' +import { CMyPage } from '@/components/CMyPage' +import { CMyChipList } from '@/components/CMyChipList' +import { CMyFieldRec } from '@/components/CMyFieldRec' +import { CMyUser } from '@/components/CMyUser' +import { CGalleryImages } from '@/components/CGalleryImages' +import { CAccomodation } from '@/components/CAccomodation' +import { tools } from '@store/Modules/tools' +import { useUserStore } from '@store/UserStore' +import { useCalendarStore } from '@store/CalendarStore' +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 { IColGridTable, IImgGallery, IUserFields } from 'model' +import { shared_consts } from '@/common/shared_vuejs' +import { colCitys, fieldsTable } from '@store/Modules/fieldsTable' +import { useRoute, useRouter } from 'vue-router' +import { useNotifStore } from '@store/NotifStore' + +export default defineComponent({ + name: 'CMyCardService', + components: { + CProfile, CTitleBanner, + CMyFieldDb, CDateTime, CMyPage, CMyFieldRec, CAccomodation, + CMyUser, CGalleryImages, CMyChipList + }, + props: { + table: { + type: String, + required: true, + }, + prop_myrec: { + type: Object as PropType, + required: false, + default: null, + }, + idRec: { + type: Number, + required: false, + default: 0 + }, + nopopup: { + type: Boolean, + required: false, + default: false + }, + }, + setup(props) { + + const userStore = useUserStore() + const calendarStore = useCalendarStore() + const notifStore = useNotifStore() + const globalStore = useGlobalStore() + const $q = useQuasar() + const $route = useRoute() + const { t } = useI18n() + + const showPic = ref(false) + + const $router = useRouter() + + const usersList = ref({ show: false, title: '', list: [] }) + + const myrec = ref({}) + const col = ref({}) + + const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '') + + function profile() { + return userStore.my.profile + } + + function load() { + // Carica il profilo di quest'utente + if (props.idRec) { + userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => { + myrec.value = ris + notifStore.setAsRead(idnotif.value) + }) + + } else { + myrec.value = props.prop_myrec + } + + col.value = fieldsTable.getArrColsByTable(props.table) + } + + watch(() => props.idRec, (to: any, from: any) => { + load() + }) + + function mounted() { + load() + } + + function getlinkpage() { + return self.location.host + tools.getPathByTable(props.table, myrec.value._id) + } + function condividipag() { + const mystr = getlinkpage() + tools.copyStringToClipboard($q, mystr, true) + tools.sendMsgTelegramCmd($q, t, shared_consts.MsgTeleg.SHARE_TEXT, false, mystr) + return true + } + + function showBadge() { + if (shared_consts.TABLES_SHOW_ADTYPE.includes(props.table)) { + return true + } + + return false + } + + function getRecGoodSkillByRec(rec: any) { + if (props.table === 'myskills') + return rec.recSkill + else if (props.table === 'mygoods') + return rec.recGood + + return null + } + + function getSectorByRec(rec: any) { + if (props.table === 'myskills') + return rec.sector + else if (props.table === 'mygoods') + return rec.sectorGood + + return null + } + + function clicca(tipo: any, set: any, title: string) { + if (set && myrec.value.username !== userStore.my.username && tipo === costanti.TIPOFAVBOOK.FAVORITE) { + userStore.setFavorite($q, t, myrec.value._id, props.table, myrec.value); + } + if (set && myrec.value.username !== userStore.my.username && tipo === costanti.TIPOFAVBOOK.BOOKMARK) { + userStore.setBookmark($q, t, myrec.value._id, props.table, myrec.value); + } + + if (!set) { + usersList.value.show = true; + usersList.value.title = title; + usersList.value.list = myrec.value.myfav; + } + } + + function naviga(path: string) { + $router.push(path) + } + + function getTypeHosps() { + let obj = null + if (myrec.value.typeHosp) { + obj = globalStore.getRecordByTableSingle(toolsext.TABTYPEHOSP, myrec.value.typeHosp) + if (obj) + return obj.label + } + + return obj + } + + onMounted(mounted) + + return { + profile, + tools, + costanti, + myrec, + shared_consts, + globalStore, + showPic, + userStore, + t, + fieldsTable, + colCitys, + toolsext, + col, + condividipag, + showBadge, + getlinkpage, + calendarStore, + getSectorByRec, + getRecGoodSkillByRec, + usersList, + clicca, + naviga, + getTypeHosps, + } + } +}) diff --git a/src/components/CMyCardService/CMyCardService.vue b/src/components/CMyCardService/CMyCardService.vue new file mode 100644 index 00000000..1a687210 --- /dev/null +++ b/src/components/CMyCardService/CMyCardService.vue @@ -0,0 +1,433 @@ + + + + + + diff --git a/src/css/app.scss b/src/css/app.scss index c5fa19e4..5d0875cb 100755 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -1570,3 +1570,53 @@ h3 { max-width: 100%; height: auto; } +<<<<<<< HEAD +======= + +.show_province_title { + font-size: 0.85rem; + font-style: italic; + text-align: right; + color: #A0A0A0; +} + +.show_province { + font-size: 0.85rem; + font-style: italic; + text-align: right; + color: grey; +} + +.buttons_bottom { + max-width: 400px; + margin-left: auto; + justify-content: space-around; + margin-right: auto; + text-align: center; + padding-top: 8px; + padding-bottom: 8px; +} + +.body--light { + .buttons_bottom { + background: -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(15%, rgba(255, 255, 255, .7))); + background: linear-gradient(180deg, transparent, rgba(255, 255, 255, .7) 15%) + } +} +.body--dark { + .buttons_bottom { + background: -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(15%, rgba(0, 0, 0, .6))); + background: linear-gradient(180deg, transparent, rgba(0, 0, 0, .6) 15%) + } +} + +.fulldiv { + min-height: 100% !important; +} + +.numfav_text{ + text-align: center; + color: grey; + font-size: 0.8rem; +} +>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index f7b5c416..913a9d50 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -1482,6 +1482,18 @@ const msg_it = { step_fine_title: 'Fine', step_fine: 'Hai completato l\'aggiornamento del tuo Profilo. Ricorda che potrai modificarlo, cliccando sulla prima icona in alto a destra 🙎🏻‍♂️ .', }, +<<<<<<< HEAD +======= + + cmd: { + favorite_set: 'Aggiunto ai Preferiti', + favorite_unset: 'Rimosso dai Preferiti', + bookmark_set: 'Aggiunto ai Segnalibri', + bookmark_unset: 'Rimosso dai Segnalibri', + favorite: 'Utenti Favoriti', + bookmark: 'Utenti Segnalibri', + }, +>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) }, };