diff --git a/.env.development b/.env.development index 9a63bb7a..a0344fe7 100755 --- a/.env.development +++ b/.env.development @@ -11,7 +11,7 @@ PROVA_PAOLO="PROVA ENV FUNZIONA!" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" -MONGODB_HOST="http://192.168.1.8:3000" +MONGODB_HOST="http://192.168.0.200:3000" LOGO_REG="freeplanet-logo-full.svg" TEST_NAME="Paolo" TEST_SURNAME="Arena" diff --git a/quasar.conf.js b/quasar.conf.js index 1df8eb8f..e764deb1 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -148,6 +148,7 @@ module.exports = configure((ctx) => ({ https: false, port: 8083, open: false, // opens browser window automatically + liveReload: false, }, // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index 7271c0bb..dcef732e 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -94,7 +94,7 @@ if (workbox) { registerRoute( new RegExp(/\.(?:png|gif|jpg|jpeg)$/), new CacheFirst({ - cacheName: 'images', + cacheName: 'images-upload', plugins: [ // Ensure that only requests that result in a 200 status are cached new CacheableResponsePlugin({ @@ -314,9 +314,9 @@ if (workbox) { ) registerRoute( - new RegExp(/.*\/(?:statics).*$/), + new RegExp(/.*\/(?:public).*$/), new CacheFirst({ - cacheName: 'statics', + cacheName: 'public', plugins: [ // Ensure that only requests that result in a 200 status are cached new CacheableResponsePlugin({ diff --git a/src-pwa/register-service-worker.js b/src-pwa/register-service-worker.js index 7415cb25..c0859b88 100755 --- a/src-pwa/register-service-worker.js +++ b/src-pwa/register-service-worker.js @@ -21,6 +21,9 @@ register(process.env.SERVICE_WORKER_FILE ? process.env.SERVICE_WORKER_FILE : '', // $('#newvers').addClass('btnNewVersShow').removeClass("btnNewVersHide") }, updated(registration) { + document.dispatchEvent( + new CustomEvent('swUpdated', { detail: registration }) + ) console.log('New content is available; please refresh.') }, offline() { diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 0c997848..37bd6cdb 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -41,11 +41,14 @@ export const shared_consts = { FILTER_MYSKILL_SKILL: 1, + OPTIONS_SEARCH_ONLY_FULL_WORDS: 1, + FRIENDSCMD: { SETTRUST: 121, SETFRIEND: 132, REMOVE_FROM_MYFRIENDS: 144, BLOCK_USER: 155, + FIND_PEOPLE: 166, }, REPORT_FILT_RESP: 1, diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue b/src/components/CEventsCalendar/CEventsCalendar.vue index b181a245..dfc6fce5 100755 --- a/src/components/CEventsCalendar/CEventsCalendar.vue +++ b/src/components/CEventsCalendar/CEventsCalendar.vue @@ -79,7 +79,7 @@ Località @@ -837,7 +837,7 @@ diff --git a/src/components/CGallery/CGallery.ts b/src/components/CGallery/CGallery.ts index 55f3ead0..c6b1367c 100755 --- a/src/components/CGallery/CGallery.ts +++ b/src/components/CGallery/CGallery.ts @@ -6,6 +6,7 @@ import { IGallery, IImgGallery } from 'model' import { CMyPage } from '@/components/CMyPage' import { tools } from '@store/Modules/tools' import { useGlobalStore } from '@store/globalStore' +import { costanti } from '@costanti' export default defineComponent({ name: 'CGallery', @@ -246,7 +247,7 @@ export default defineComponent({ } function getfullname(rec: any) { - return 'upload/' + props.directory + '/' + rec.imagefile + return costanti.DIR_UPLOAD + props.directory + '/' + rec.imagefile } function copytoclipboard(rec: any) { @@ -306,7 +307,7 @@ export default defineComponent({ if (tools.getextfile(gallerylistery.imagefile) === 'pdf') return 'images/images/pdf.jpg' else - return 'upload/' + props.directory + '/' + gallerylistery.imagefile + return costanti.DIR_UPLOAD + props.directory + '/' + gallerylistery.imagefile } else { return 'images/noimg.png'; } diff --git a/src/components/CGallery/CGallery.vue b/src/components/CGallery/CGallery.vue index 79562bf7..86bb583e 100755 --- a/src/components/CGallery/CGallery.vue +++ b/src/components/CGallery/CGallery.vue @@ -95,7 +95,7 @@ accept=".jpg, image/*, .pdf" :url="getUrl()" :headers="tools.getheaders()" - :max-file-size="2000000" + :max-file-size="3000000" multiple auto-upload hide-upload-btn diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index a487a53f..4d94b67e 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -18,6 +18,7 @@ import { } from '../../model' import { lists } from '../../store/Modules/lists' import { IParamsQuery } from '../../model/GlobalStore' +import { CMyUser } from '../CMyUser' import { CMyPopupEdit } from '../CMyPopupEdit' import { CMyFieldDb } from '../CMyFieldDb' import { CMySelect } from '../CMySelect' @@ -53,6 +54,11 @@ export default defineComponent({ required: false, default: '', }, + hint: { + type: String, + required: false, + default: 'Cerca', + }, prop_search: { type: Boolean, required: false, @@ -68,6 +74,16 @@ export default defineComponent({ required: false, default: false, }, + showType: { + type: Number, + required: false, + default: 0, + }, + finder_noNull: { + type: Boolean, + required: false, + default: false, + }, vertical: { type: Boolean, required: false, @@ -131,6 +147,10 @@ export default defineComponent({ required: false, default: {}, }, + options: { + required: false, + default: 0, + }, prop_pagination: { type: Object as PropType, required: false, @@ -148,7 +168,7 @@ export default defineComponent({ default: '', }, }, - components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect }, + components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyUser }, setup(props, { emit }) { const $q = useQuasar() const { t } = useI18n() @@ -272,10 +292,10 @@ export default defineComponent({ return true } } else { - return true + return false } - // if (userStore.isAdmin || userStore.isManager) - // return true + if (userStore.isAdmin || userStore.isManager) + return true } // emulate 'SELECT count(*) FROM ...WHERE...' @@ -397,7 +417,7 @@ export default defineComponent({ }) } } - if (false && nosearch && props.finder) { + if ((false && nosearch && props.finder) || (props.finder_noNull && nosearch)) { returnedData.value = [] returnedCount = 0 return true @@ -423,6 +443,7 @@ export default defineComponent({ descending, userId: userStore.my._id, codeId: '', + options: props.options, } params.codeId = mycodeid.value @@ -820,7 +841,7 @@ export default defineComponent({ function clickFunz(item: any, col: IColGridTable) { - if (col.action) { + if (!!col && col.action) { const table = mytable.value const ok = translate('dialog.yes') diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index d849483d..a371d0ce 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -174,7 +174,7 @@