diff --git a/.env.development b/.env.development index f9c64983..c305ec1d 100755 --- a/.env.development +++ b/.env.development @@ -1,23 +1,23 @@ -APP_VERSION="0.1.8" +APP_VERSION="0.1.9" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="1" +APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_SERVER="freeplanet_serverside" SERVERDIR_WEBSITE="" SERVERPW_WEBSITE="" APP_URL="http://localhost" -URL_FACEBOOK="https://www.facebook.com/freeplanetapp" +URL_FACEBOOK="https://www.facebook.com/" PROVA_PAOLO="PROVA ENV FUNZIONA!" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" MONGODB_HOST="http://192.168.0.200:3000" -LOGO_REG="freeplanet-logo-full.svg" +LOGO_REG='logo-full.png' TEST_NAME="Paolo" TEST_SURNAME="Arena" -TEST_EMAIL="paolo@freeplanet.app" +TEST_EMAIL="perseo@freeplanet.app" TEST_USERNAME="paoloar773" -TEST_PASSWORD="" +TEST_PASSWORD="passpao1fr@1A" TEST_APORTADOR="" PUBLICKEY_PUSH='BDncvMiUZmjaCG2Kr1V9N0_33hOG-AuNSbHSvL24y2dzBiUjAxKm02emx5SeJvz2IGmtRf6YqCgopeQwCwUmZw8' IN_CONSTRUCTION="0" diff --git a/_ALL_SITES/freeplanet.app/.env.development b/_ALL_SITES/freeplanet.app/.env.development index f9c64983..68d60a14 100755 --- a/_ALL_SITES/freeplanet.app/.env.development +++ b/_ALL_SITES/freeplanet.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.1.8" +APP_VERSION="0.1.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="1" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/freeplanet.app/db/lang/ws_it.js b/_ALL_SITES/freeplanet.app/db/lang/ws_it.js index 4652b915..77ef8712 100755 --- a/_ALL_SITES/freeplanet.app/db/lang/ws_it.js +++ b/_ALL_SITES/freeplanet.app/db/lang/ws_it.js @@ -208,7 +208,7 @@ const msg_website_it = { descr: '' + 'Vedo un futuro dove non si utilizzerà più denaro. Dove le persone si aiuteranno a vicenda e non avranno bisogno di "possedere" cose, ma le condivideranno con gli altri.
', }, diff --git a/_ALL_SITES/freeplanet.app/db/static_data.ts b/_ALL_SITES/freeplanet.app/db/static_data.ts index 00735d46..e78b2215 100755 --- a/_ALL_SITES/freeplanet.app/db/static_data.ts +++ b/_ALL_SITES/freeplanet.app/db/static_data.ts @@ -416,7 +416,7 @@ const baseroutes: IListRoutes[] = [ active: true, order: 130, path: '/friends', - materialIcon: 'fas fa-users', + materialIcon: 'fas fa-user-friends', name: 'mypages.friends', component: () => import('@/views/user/myfriends/myfriends.vue'), meta: { requiresAuth: true }, @@ -583,7 +583,7 @@ const baseroutes: IListRoutes[] = [ inmenu: true, }, { - active: true, + active: false, order: 80, path: '/calendario-eventi', materialIcon: 'event', @@ -628,8 +628,8 @@ const baseroutes: IListRoutes[] = [ const arrLangUsed = [ 'it', - 'enUs', - 'es', + // 'enUs', + // 'es', ] const lang_available: ILang[] = [ diff --git a/_ALL_SITES/freeplanet.app/quasar.conf.js b/_ALL_SITES/freeplanet.app/quasar.conf.js index 1060c9a4..414ca655 100755 --- a/_ALL_SITES/freeplanet.app/quasar.conf.js +++ b/_ALL_SITES/freeplanet.app/quasar.conf.js @@ -49,7 +49,7 @@ module.exports = configure((ctx) => ({ extras: [ // 'ionicons-v4', // 'mdi-v5', - // 'eva-icons', + 'eva-icons', // 'themify', // 'line-awesome', 'ionicons-v4', @@ -57,6 +57,7 @@ module.exports = configure((ctx) => ({ 'fontawesome-v5', 'roboto-font', // optional, you are not bound to it 'material-icons', // optional, you are not bound to it + 'material-icons-outlined' ], aliases: { @@ -154,7 +155,6 @@ module.exports = configure((ctx) => ({ framework: { config: {}, - // iconSet: 'material-icons', // Quasar icon set // lang: 'en-US', // Quasar language pack // For special cases outside of where the auto-import strategy can have an impact diff --git a/_ALL_SITES/freeplanet.app/root/home/home.ts b/_ALL_SITES/freeplanet.app/root/home/home.ts deleted file mode 100755 index c2b4ef32..00000000 --- a/_ALL_SITES/freeplanet.app/root/home/home.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { - defineComponent, ref, computed, -} from 'vue' - -import { tools } from '@src/store/Modules/tools' -import { CSkill } from '@/components/CSkill' -import { CFinder } from '@/components/CFinder' -import { CChartMap } from '@src/components/CChartMap' -import { CMapsEsempio } from '@src/components/CMapsEsempio' -import { CVerifyEmail } from '@src/components/CVerifyEmail' -import { CVerifyTelegram } from '@src/components/CVerifyTelegram' -import { useGlobalStore } from '@store/globalStore' -import { useUserStore } from '@store/UserStore' -import { static_data } from '@/db/static_data' -import MixinBase from '@/mixins/mixin-base' - - -export default defineComponent({ - name: 'Home', - components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram }, - setup() { - const globalStore = useGlobalStore() - const userStore = useUserStore() - const { getValDb } = MixinBase() - - function isEmailVerified() { - return userStore.my.verified_email - } - - function TelegCode() { - return userStore.my.profile.teleg_checkcode - } - - function TelegVerificato(): boolean { - return userStore.my.profile ? userStore.my.profile.teleg_id! > 0 : false - } - - function openrighttoolbar() { - globalStore.rightDrawerOpen = true - } - - function isLogged() { - return userStore.isLogged - } - function isUserOk() { - return userStore.isUserOk() - } - - function getLinkBotTelegram(): string { - if (tools.isTest() && !process.env.DEV) { - return getValDb('TELEG_BOT_LINK_TEST', false) - } else{ - return getValDb('TELEG_BOT_LINK', false) - } - } - - return { - tools, - static_data, - isEmailVerified, - TelegCode, - TelegVerificato, - isLogged, - openrighttoolbar, - isUserOk, - getLinkBotTelegram, - } - }, -}) diff --git a/_ALL_SITES/freeplanet.app/root/home/home.vue b/_ALL_SITES/freeplanet.app/root/home/home.vue deleted file mode 100755 index 8c0df873..00000000 --- a/_ALL_SITES/freeplanet.app/root/home/home.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index b1285fc2..14a0a151 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.1.8" +APP_VERSION="0.1.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="1" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/insiemesipuo.app/db/static_data.ts b/_ALL_SITES/insiemesipuo.app/db/static_data.ts index f475e32b..3e4b7b01 100755 --- a/_ALL_SITES/insiemesipuo.app/db/static_data.ts +++ b/_ALL_SITES/insiemesipuo.app/db/static_data.ts @@ -416,7 +416,7 @@ const baseroutes: IListRoutes[] = [ active: true, order: 130, path: '/friends', - materialIcon: 'eva-people-outline', + materialIcon: 'fas fa-user-friends', name: 'mypages.friends', component: () => import('@/views/user/myfriends/myfriends.vue'), meta: { requiresAuth: true }, diff --git a/_ALL_SITES/insiemesipuo.app/quasar.conf.js b/_ALL_SITES/insiemesipuo.app/quasar.conf.js index 52dc5d63..eedeaf4e 100755 --- a/_ALL_SITES/insiemesipuo.app/quasar.conf.js +++ b/_ALL_SITES/insiemesipuo.app/quasar.conf.js @@ -57,6 +57,7 @@ module.exports = configure((ctx) => ({ 'fontawesome-v5', 'roboto-font', // optional, you are not bound to it 'material-icons', // optional, you are not bound to it + 'material-icons-outlined', ], aliases: { diff --git a/_ALL_SITES/insiemesipuo.app/root/home/home.scss b/_ALL_SITES/insiemesipuo.app/root/home/home.scss deleted file mode 100755 index e69de29b..00000000 diff --git a/_ALL_SITES/insiemesipuo.app/root/home/home.ts b/_ALL_SITES/insiemesipuo.app/root/home/home.ts deleted file mode 100755 index 40521a32..00000000 --- a/_ALL_SITES/insiemesipuo.app/root/home/home.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { - defineComponent, ref, computed, -} from 'vue' - -import { tools } from '@src/store/Modules/tools' -import { CSkill } from '@/components/CSkill' -import { CFinder } from '@/components/CFinder' -import { CChartMap } from '@src/components/CChartMap' -import { CMapsEsempio } from '@src/components/CMapsEsempio' -import { CVerifyEmail } from '@src/components/CVerifyEmail' -import { CVerifyTelegram } from '@src/components/CVerifyTelegram' -import { useGlobalStore } from '@store/globalStore' -import { useUserStore } from '@store/UserStore' -import { static_data } from '@/db/static_data' -import MixinBase from '@/mixins/mixin-base' - - -export default defineComponent({ - name: 'Home', - components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram }, - setup() { - const globalStore = useGlobalStore() - const userStore = useUserStore() - const { getValDb } = MixinBase() - - function isEmailVerified() { - return userStore.my.verified_email - } - - function TelegCode() { - return userStore.my.profile.teleg_checkcode - } - - function TelegVerificato(): boolean { - return userStore.my.profile ? userStore.my.profile.teleg_id! > 0 : false - } - - function openrighttoolbar() { - globalStore.rightDrawerOpen = true - } - - function isLogged() { - return userStore.isLogged - } - function isUserOk() { - return userStore.isUserOk() - } - - function getLinkBotTelegram(): string { - if ( tools.isTest() && !process.env.DEV) { - return getValDb('TELEG_BOT_LINK_TEST', false) - } else{ - return getValDb('TELEG_BOT_LINK', false) - } - } - - return { - tools, - static_data, - isEmailVerified, - TelegCode, - TelegVerificato, - isLogged, - openrighttoolbar, - isUserOk, - getLinkBotTelegram, - } - }, -}) diff --git a/_ALL_SITES/insiemesipuo.app/root/home/home.vue b/_ALL_SITES/insiemesipuo.app/root/home/home.vue deleted file mode 100755 index 0922f514..00000000 --- a/_ALL_SITES/insiemesipuo.app/root/home/home.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 385f5ec1..54e34361 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.1.8" +APP_VERSION="0.1.9" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts index 5fcf68ee..08e9fabd 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts +++ b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts @@ -416,7 +416,7 @@ const baseroutes: IListRoutes[] = [ active: true, order: 130, path: '/friends', - materialIcon: 'fas fa-users', + materialIcon: 'fas fa-user-friends', name: 'mypages.friends', component: () => import('@/views/user/myfriends/myfriends.vue'), meta: { requiresAuth: true }, diff --git a/_ALL_SITES/popolodelnuovomondo.app/quasar.conf.js b/_ALL_SITES/popolodelnuovomondo.app/quasar.conf.js index 9d8dbbb1..e5e780c5 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/quasar.conf.js +++ b/_ALL_SITES/popolodelnuovomondo.app/quasar.conf.js @@ -57,6 +57,7 @@ module.exports = configure((ctx) => ({ 'fontawesome-v5', 'roboto-font', // optional, you are not bound to it 'material-icons', // optional, you are not bound to it + 'material-icons-outlined', ], aliases: { diff --git a/_ALL_SITES/popolodelnuovomondo.app/root/home/home.scss b/_ALL_SITES/popolodelnuovomondo.app/root/home/home.scss deleted file mode 100755 index e69de29b..00000000 diff --git a/_ALL_SITES/popolodelnuovomondo.app/root/home/home.ts b/_ALL_SITES/popolodelnuovomondo.app/root/home/home.ts deleted file mode 100755 index 40521a32..00000000 --- a/_ALL_SITES/popolodelnuovomondo.app/root/home/home.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { - defineComponent, ref, computed, -} from 'vue' - -import { tools } from '@src/store/Modules/tools' -import { CSkill } from '@/components/CSkill' -import { CFinder } from '@/components/CFinder' -import { CChartMap } from '@src/components/CChartMap' -import { CMapsEsempio } from '@src/components/CMapsEsempio' -import { CVerifyEmail } from '@src/components/CVerifyEmail' -import { CVerifyTelegram } from '@src/components/CVerifyTelegram' -import { useGlobalStore } from '@store/globalStore' -import { useUserStore } from '@store/UserStore' -import { static_data } from '@/db/static_data' -import MixinBase from '@/mixins/mixin-base' - - -export default defineComponent({ - name: 'Home', - components: { CSkill, CChartMap, CMapsEsempio, CFinder, CVerifyEmail, CVerifyTelegram }, - setup() { - const globalStore = useGlobalStore() - const userStore = useUserStore() - const { getValDb } = MixinBase() - - function isEmailVerified() { - return userStore.my.verified_email - } - - function TelegCode() { - return userStore.my.profile.teleg_checkcode - } - - function TelegVerificato(): boolean { - return userStore.my.profile ? userStore.my.profile.teleg_id! > 0 : false - } - - function openrighttoolbar() { - globalStore.rightDrawerOpen = true - } - - function isLogged() { - return userStore.isLogged - } - function isUserOk() { - return userStore.isUserOk() - } - - function getLinkBotTelegram(): string { - if ( tools.isTest() && !process.env.DEV) { - return getValDb('TELEG_BOT_LINK_TEST', false) - } else{ - return getValDb('TELEG_BOT_LINK', false) - } - } - - return { - tools, - static_data, - isEmailVerified, - TelegCode, - TelegVerificato, - isLogged, - openrighttoolbar, - isUserOk, - getLinkBotTelegram, - } - }, -}) diff --git a/_ALL_SITES/popolodelnuovomondo.app/root/home/home.vue b/_ALL_SITES/popolodelnuovomondo.app/root/home/home.vue deleted file mode 100755 index 8c0df873..00000000 --- a/_ALL_SITES/popolodelnuovomondo.app/root/home/home.vue +++ /dev/null @@ -1,76 +0,0 @@ - - - diff --git a/package.json b/package.json index 3b208847..9d41f7f9 100755 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "freeplanet", - "version": "0.0.7", - "description": "FreePlanet", - "productName": "FreePlanet", + "name": "popolodelnuovomondo", + "version": "0.0.8", + "description": "Popolo Del Nuovo Mondo", + "productName": "Popolo Del Nuovo Mondo", "author": "Paolo Arena", "private": true, "keywords": [ @@ -23,25 +23,25 @@ "dependencies": { "axios": "0.21.4", "@vue/eslint-config-standard": "5.1.2", - "@quasar/extras": "^1.12.2", - "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.11", + "@quasar/extras": "^1.12.4", + "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.12", "@vue/compat": "^3.2.26", "@vue/compiler-sfc": "^3.2.26", - "@vuelidate/core": "^2.0.0-alpha.32", - "@vuelidate/validators": "^2.0.0-alpha.25", - "acorn": "^8.6.0", - "autoprefixer": "^10.4.0", + "@vuelidate/core": "^2.0.0-alpha.34", + "@vuelidate/validators": "^2.0.0-alpha.26", + "acorn": "^8.7.0", + "autoprefixer": "^10.4.2", "bcryptjs": "^2.4.3", - "core-js": "^3.20.0", + "core-js": "^3.20.3", "crypto": "^1.0.1", - "date-fns": "^2.27.0", - "dotenv": "^10.0.0", + "date-fns": "^2.28.0", + "dotenv": "^11.0.0", "echarts": "^5.2.2", - "eslint-plugin-quasar": "^1.0.0", + "eslint-plugin-quasar": "^1.1.0", "eslint-plugin-standard": "^5.0.0", - "graphql": "^16.1.0", + "graphql": "^16.2.0", "graphql-tag": "^2.12.6", - "gsap": "^3.9.0", + "gsap": "^3.9.1", "jquery": "^3.6.0", "js-cookie": "^3.0.1", "localforage": "^1.10.0", @@ -49,9 +49,9 @@ "normalize.css": "^8.0.1", "npm": "^8.3.0", "nprogress": "^0.2.0", - "pinia": "^2.0.6", + "pinia": "^2.0.9", "prerender-spa-plugin": "^3.4.0", - "quasar": "^2.3.4", + "quasar": "^2.4.12", "quasar-extras": "^2.0.9", "register-service-worker": "^1.7.2", "vee-validate": "^4.4.10", @@ -72,9 +72,9 @@ }, "devDependencies": { "node-sass": "6.0.1", - "webpack": "^5.0.0", - "@quasar/app": "^3.2.5", - "@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.11", + "webpack": "^5.66.0", + "@quasar/app": "^3.2.9", + "@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.12", "@types/bcryptjs": "^2.4.2", "@types/dotenv": "^8.2.0", "@types/googlemaps": "^3.43.3", @@ -84,31 +84,31 @@ "@types/nprogress": "^0.2.0", "@types/vue-tel-input": "^2.1.2", "@types/vuelidate": "^0.7.15", - "@typescript-eslint/eslint-plugin": "^5.7.0", - "@typescript-eslint/parser": "^5.7.0", - "eslint": "^8.4.1", + "@typescript-eslint/eslint-plugin": "^5.10.0", + "@typescript-eslint/parser": "^5.10.0", + "eslint": "^8.7.0", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-import": "^2.25.3", + "eslint-plugin-import": "^2.25.4", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^5.2.0", - "eslint-plugin-vue": "^8.2.0", + "eslint-plugin-vue": "^8.3.0", "file-loader": "^6.2.0", "html-webpack-plugin": "^5.5.0", "http-proxy-middleware": "^2.0.1", "jest": "^27.4.5", "json-loader": "^0.5.7", - "npm-check-updates": "^12.0.5", + "npm-check-updates": "^12.1.0", "optimize-css-assets-webpack-plugin": "^6.0.1", "postcss": "^8.4.5", "postcss-loader": "^6.2.1", "sass-loader": "^12.4.0", "strip-ansi": "=7.0.1", - "ts-jest": "^27.1.1", + "ts-jest": "^27.1.2", "ts-loader": "^9.2.6", "tslint": "^6.1.3", "tslint-config-standard": "^9.0.0", "tslint-loader": "^3.5.4", - "typescript": "^4.5.4", + "typescript": "^4.5.5", "vue-cli-plugin-element-ui": "^1.1.4", "vueify": "^9.4.1", "workbox-webpack-plugin": "^6.4.2" diff --git a/quasar.conf.js b/quasar.conf.js index 414ca655..e5e780c5 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -49,7 +49,7 @@ module.exports = configure((ctx) => ({ extras: [ // 'ionicons-v4', // 'mdi-v5', - 'eva-icons', + // 'eva-icons', // 'themify', // 'line-awesome', 'ionicons-v4', @@ -57,7 +57,7 @@ module.exports = configure((ctx) => ({ 'fontawesome-v5', 'roboto-font', // optional, you are not bound to it 'material-icons', // optional, you are not bound to it - 'material-icons-outlined' + 'material-icons-outlined', ], aliases: { @@ -147,14 +147,16 @@ module.exports = configure((ctx) => ({ }, devServer: { https: false, - port: 8082, + port: 8083, open: false, // opens browser window automatically + liveReload: false, }, // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework framework: { config: {}, + // iconSet: 'material-icons', // Quasar icon set // lang: 'en-US', // Quasar language pack // For special cases outside of where the auto-import strategy can have an impact @@ -284,21 +286,31 @@ module.exports = configure((ctx) => ({ }, manifest: { - name: 'FreePlanet', - short_name: 'FreePlanet', - description: 'New Free Social', + name: 'PopoloDelNuovoMondo', + short_name: 'PdNM', + description: 'Popolo del Nuovo Mondo', display: 'standalone', orientation: 'portrait', background_color: '#ffffff', theme_color: '#027be3', icons: [ { - src: 'images/android-chrome-192x192.png', - sizes: '384x384', + src: 'images/pdnm-android-icon-96x96.png', + sizes: '96x96', type: 'image/png', }, { - src: 'images/android-chrome-512x512.png', + src: 'images/pdnm-android-icon-144x144.png', + sizes: '144x144', + type: 'image/png', + }, + { + src: 'images/pdnm-android-icon-192x192.png', + sizes: '192x192', + type: 'image/png', + }, + { + src: 'images/pdnm-android-icon-512x512.png', sizes: '512x512', type: 'image/png', }, diff --git a/src/common/pattern.ts b/src/common/pattern.ts index 8647dda3..820cc88c 100755 --- a/src/common/pattern.ts +++ b/src/common/pattern.ts @@ -16,5 +16,5 @@ export class Patterns { * * 8 to 20 characters string with at least one digit, one upper case letter, one lower case letter and one special symbol */ - public static Password = /^((?=.*[A-Z])(?=.*\d)(?=.*[@#*=])(?!.* ).{8,30})/i + public static Password = /^((?=.*[A-Z])(?=.*\d)(?!.* ).{8,30})/i } diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index b55b398c..7905ee43 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -84,12 +84,14 @@ export const shared_consts = { PARAM_SHOW_PROVINCE: 1, - TABLES_ID_NUMBER: ['permissions', 'levels', 'statusSkills', 'sectors', 'catgrps', 'skills', 'subskills', 'cities', 'provinces', 'myskills', 'mygroups'], + TABLES_ID_NUMBER: ['permissions', 'levels', 'adtypes', 'statusSkills', 'sectors', 'catgrps', 'skills', 'subskills', 'cities', 'provinces', 'myskills', 'mygroups'], TABLES_USER_ID: ['myskills'], TABLES_UPDATE_LASTMODIFIED: ['myskills', 'mybots'], TABLES_FINDER: ['myskills', 'mygroups'], TABLES_PERM_CHANGE_FOR_USERS: ['myskills'], + TABLES_VISU_LISTA_USER: ['myskills', 'users'], + TABLES_NOT_SHOW_IF_USERNAME: ['myskills'], VISIB_ALL: 0, VISIB_ONLYIF_VERIFIED: 1, @@ -459,6 +461,10 @@ export const shared_consts = { label: 'Reggio Emilia', value: 'RE', }, + { + label: 'Repubblica di San Marino', + value: 'RSM', + }, { label: 'Rieti', value: 'RI', diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index 7c7a848a..81fc3a78 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -90,6 +90,17 @@ export default defineComponent({ searchList.value = [ + { + label: 'Offro/Cerco', + table: 'adtypes', + key: 'adType', + value: tools.getCookie(tools.COOK_SEARCH + 'adtypes', costanti.FILTER_TUTTI), + arrvalue: [], + addall: true, + type: costanti.FieldType.select, + filter: null, + useinput: false, + }, { label: 'Settore', table: 'sectors', @@ -204,27 +215,6 @@ export default defineComponent({ } - async function createNewRecordInUserTable() { - console.log('createNewRecordInUserTable') - - let mydata = { - table: mytable, - data: { - userId: userStore.my._id, - data: {}, - field: 'myskills' - } - }; - - if (props.defaultnewrec) { - - mydata.data.data = props.defaultnewrec - } - - console.log('mydata', mydata) - const data = await globalStore.saveSubRec(mydata) - } - function getdefaultnewrec(): IMySkill { return { _id: 0, @@ -235,9 +225,10 @@ export default defineComponent({ idContribType: [], idCity: [], NumLevel: 0, + adType: 0, photos: [], note: '', - subTitle: '', + descr: '', } } @@ -263,13 +254,15 @@ export default defineComponent({ idSector: 1, idSkill: 1, idSubSkill: 1, + myskill: 1, idStatusSkill: 1, idContribType: 1, idCity: 1, numLevel: 1, + adType: 1, photos: 1, note: 1, - subTitle: 1, + descr: 1, date_created: 1, date_updated: 1, userId: 1, diff --git a/src/components/CFinder/CFinder.vue b/src/components/CFinder/CFinder.vue index 1bc5f93a..41c21b05 100755 --- a/src/components/CFinder/CFinder.vue +++ b/src/components/CFinder/CFinder.vue @@ -18,7 +18,9 @@ prop_mytitle="" :prop_mycolumns="colmySkills" prop_colkey="idSkill" - col_title="subTitle" + col_title="descr" + col_footer="idCity" + col_tabfooter="mycities" :vertical="-1" :nodataLabel="idSector > 0 ? 'Nessuna Competenza trovata': 'Selezionare un Settore'" :prop_search="true" diff --git a/src/components/CGallery/CGallery.vue b/src/components/CGallery/CGallery.vue index a5fe0014..078a63df 100755 --- a/src/components/CGallery/CGallery.vue +++ b/src/components/CGallery/CGallery.vue @@ -18,7 +18,6 @@
- diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 44aacf37..988bf626 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -20,6 +20,7 @@ import { lists } from '@store/Modules/lists' import { IParamsQuery } from 'model' import { CMyPopupEdit } from '../CMyPopupEdit' import { CMyFriends } from '../CMyFriends' +import { CMyUser } from '../CMyUser' import { CMyGroups } from '../CMyGroups' import { CMyFieldDb } from '../CMyFieldDb' import { CMySelect } from '../CMySelect' @@ -172,6 +173,16 @@ export default defineComponent({ required: false, default: '', }, + col_footer: { + type: String, + required: false, + default: '', + }, + col_tabfooter: { + type: String, + required: false, + default: '', + }, showCol: { type: Boolean, required: false, @@ -193,7 +204,7 @@ export default defineComponent({ default: '', }, }, - components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups }, + components: { CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups, CMyUser }, setup(props, { emit }) { const $q = useQuasar() const { t } = useI18n() @@ -342,6 +353,8 @@ export default defineComponent({ if (userId === userStore.my._id) { // E' il mio, quindi modificalo return true + } else { + return false } } else { return false @@ -878,9 +891,7 @@ export default defineComponent({ pagination.value = props.prop_pagination myvertical.value = props.vertical - if (props.finder) { - myvertical.value = tools.getCookie('myv', 0) - } + myvertical.value = tools.getCookie('myv_' + props.prop_mytable, props.vertical) } function mounted() { @@ -1019,7 +1030,7 @@ export default defineComponent({ function checkIfColShow(field: string | undefined) { let vis = true - if (props.prop_mytable === 'myskills' && !props.prop_search) { + if (shared_consts.TABLES_NOT_SHOW_IF_USERNAME.includes(props.prop_mytable) && !props.prop_search) { if (field === 'username') { vis = false } @@ -1333,6 +1344,17 @@ export default defineComponent({ return '' } + function getLabelFooterByRow(row: any) { + if (props.col_footer) { + + let mycol = fieldsTable.getColByTable(tablesel.value, props.col_footer) + if (mycol) { + return tools.getValueByRemoteField(mycol, row, row[props.col_footer], props.col_tabfooter) + } + } + return '' + } + // onMounted(mounted) created() @@ -1413,6 +1435,7 @@ export default defineComponent({ showColCheck, getValueExtra, shared_consts, + getLabelFooterByRow, } } }) diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index fa07152e..0913c1f1 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -247,13 +247,13 @@
+ @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/> + @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/> - + @update:model-value="tools.setCookie('myv_' + prop_mytable, myvertical) "/> +
@@ -303,8 +303,18 @@
+
+ +
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index ba39a450..c7b6fa0e 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -31,7 +31,7 @@ const msg_it = { otherpages: { product: 'Prodotto', sito_offline: 'Sito in Aggiornamento', - modifprof: 'Modifica Profilo', + modifprof: 'Modifica', modifgrp: 'Modifica Gruppo', biografia: 'Biografia', qualifica: 'Qualifica (in breve)', diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index dafc0018..db117a3e 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -316,6 +316,11 @@ export const colTableStorehouse = [ AddCol(DuplicateRec), ] +export const colAdType = [ + AddCol({ name: '_id', label_trans: 'index', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'descr', label_trans: 'store.description' }), +] + export const colSectors = [ AddCol({ name: '_id', label_trans: 'index', fieldtype: costanti.FieldType.number }), AddCol({ name: 'descr', label_trans: 'store.description' }), @@ -502,7 +507,7 @@ export const colmyUserGroup = [ noshowlabel: true, icon: 'fas fa-map-marker-alt', showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, - remote_table: 'comune', + remote_table: 'mycities', remote_key: '_id', remote_field: 'comune', }), @@ -523,8 +528,18 @@ export const colmySkills = [ }), */ //AddCol({ name: 'name', label_trans: 'reg.name', fieldtype: costanti.FieldType.string }), //AddCol({ name: 'surname', label_trans: 'reg.surname', fieldtype: costanti.FieldType.string }), - AddCol({ name: 'subTitle', label_trans: 'event.title', fieldtype: costanti.FieldType.string, - showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit , maxlength: 70, noshowlabel: true }), + // AddCol({ name: 'subTitle', label_trans: 'event.title', fieldtype: costanti.FieldType.string, + // showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit , maxlength: 70, noshowlabel: true }), + AddCol({ + name: 'adTypes', + label_trans: 'adTypes.name', + fieldtype: costanti.FieldType.select, + required: true, + jointable: 'adtypes', + showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, + noshowlabel: true, + icon: 'grading', + }), AddCol({ name: 'descr', label_trans: 'proj.shortdescr', fieldtype: costanti.FieldType.string, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, noshowlabel: true, maxlength: 200 }), AddCol({ @@ -569,7 +584,7 @@ export const colmySkills = [ filter_field: 'idSkill', noshowlabel: true, icon: 'far fa-id-card', - showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, + showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, allowNewValue: true, }), AddCol({ @@ -609,7 +624,10 @@ export const colmySkills = [ tablesel: 'cities', noshowlabel: true, icon: 'fas fa-map-marker-alt', - showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, + showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, + remote_table: 'mycities', + remote_key: '_id', + remote_field: 'comune', }), AddCol({ name: 'username', label_trans: 'reg.username', foredit: false, tipovisu: costanti.TipoVisu.LINK, link: '/my/username', noshowlabel: true }), AddCol({ name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html, @@ -1984,6 +2002,13 @@ export const fieldsTable = { colkey: '_id', collabel: 'descr', }, + { + value: 'adtypes', + label: 'Tipo Annuncio', + columns: colAdType, + colkey: '_id', + collabel: 'descr', + }, { value: 'cities', label: 'Comune', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index be1ba9d9..2236c9c6 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -3124,7 +3124,7 @@ export const tools = { const msg2 = t('fetch.errore_generico') + userStore.getMsgError(riscode) this.showNotif(mythisq, msg2) } else if (riscode === this.OK) { - $router.push('/regok') + $router.push('/') this.showNotif(mythisq, t('components.authentication.email_verification.link_sent', { botname: t('ws.botname') }), { color: 'green', textColor: 'black', @@ -4856,6 +4856,27 @@ export const tools = { } else { return value[keyfunz] } + }, + + getValueByRemoteField(col: IColGridTable, row: any, value: any, col_tabfooter: string) { + if (col) { + if (col.remote_table && col.remote_key && col.remote_field && col_tabfooter) { + + const myarrremote = row[col.remote_table] + + let myarr: any = [] + + for (const myrec of myarrremote) { + let myval = myrec[col.remote_field] + myarr.push(myval) + } + + return myarr ? myarr.join(' - ') : '' + + } + } + return '' + } diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts index 5851decd..a78554ff 100755 --- a/src/store/UserStore.ts +++ b/src/store/UserStore.ts @@ -221,7 +221,12 @@ export const useUserStore = defineStore('UserStore', { return '' }, - getImgByProfile(userparam: IUserFields): string { + getImgUserByUsername(username: string): string { + let img = this.getImgByUsername(username) + return img ? img : 'images/noimg-user.svg' + }, + + getImgByProfile(userparam: IUserFields, reale: any = false): string { try { if (userparam.profile && userparam.profile.img) { @@ -229,7 +234,10 @@ export const useUserStore = defineStore('UserStore', { } } catch (e) { } - return 'images/noimg.png' + if (!reale) + return 'images/noimg.png' + else + return '' }, getImgByGroup(group: IMyGroup): string { diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts index d629d7fd..806a4166 100644 --- a/src/store/globalStore.ts +++ b/src/store/globalStore.ts @@ -117,6 +117,7 @@ export const useGlobalStore = defineStore('GlobalStore', { URL_RITORNA: '', URL_RESTORE: '', levels: [], + adtypes: [], skills: [], subSkills: [], statusSkills: [], @@ -232,6 +233,8 @@ export const useGlobalStore = defineStore('GlobalStore', { return state.settings else if (table === 'levels') return state.levels + else if (table === 'adtypes') + return state.adtypes else if (table === 'skills') return state.skills else if (table === 'subskills') @@ -1227,6 +1230,7 @@ export const useGlobalStore = defineStore('GlobalStore', { this.sectors = (res.data.sectors) ? [...res.data.sectors] : [] this.cities = (res.data.cities) ? [...res.data.cities] : [] this.catgrps = (res.data.catgrps) ? [...res.data.catgrps] : [] + this.adtypes = (res.data.adtypes) ? [...res.data.adtypes] : [] // console.log('res.data.cart', res.data.cart) diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue index 5c5baa25..f2b596cf 100755 --- a/src/views/admin/dbop/dbop.vue +++ b/src/views/admin/dbop/dbop.vue @@ -220,6 +220,40 @@
+
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+
+ +
+
+ -
-
- - -
{{ myuser.profile.qualifica }}
-
{{ myuser.profile.born_city }} - ({{ - myuser.profile.nationality - }}) -
- - - - -
{{ myuser.username }}
-
- {{ myuser.profile.biografia }} -
- - - - - - - - - - - - -
-
- - -
-
- {{ myuser.name }} {{ - myuser.surname - }} -
-
- -
- - - - - - -
-
- - - -
- - - -
- -
-
- - - -
-
- - -
-
- - - - -
- - - -
-
-
+
+ + + +
+ +
+
+ {{ myuser.name }} {{ + myuser.surname + }} +
+
+
+ {{ myuser.username }} +
+
+ {{ myuser.profile.born_city }} ({{ + myuser.profile.nationality + }}) +
+
+ + {{ myuser.profile.qualifica }} + +
+
+ {{ myuser.profile.biografia }} +
+ +
+ + + +
+ + + + + +
+ +
+ + + +
+
+ + +
+
@@ -149,7 +111,7 @@ @@ -158,6 +120,28 @@ +
+ + +
+ +
+ + + +
+ +
+ + +
+