diff --git a/_ALL_SITES/arcadei.it/.env.test b/_ALL_SITES/arcadei.it/.env.test new file mode 100755 index 00000000..39998fb2 --- /dev/null +++ b/_ALL_SITES/arcadei.it/.env.test @@ -0,0 +1,28 @@ +APP_VERSION="0.5.28" +SERVICE_WORKER_FILE="service-worker.js" +APP_ID="16" +DIRECTORY_LOCAL=newfreeplanet +DIRECTORY_SERVER=test.freeplanet_serverside +SERVERDIR_WEBSITE="test.kolibrilab.it" +SERVERPW_WEBSITE="pwdadmin@1AOK" +APP_URL="https://test.kolibrilab.it" +URL_FACEBOOK="" +PROVA_PAOLO="" +LANG_DEFAULT="it" +PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" +MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" +MONGODB_HOST="https://test.freeplanet.app:3001" +LOGO_REG='kolibrilab-logo-full.png' +TEST_NAME="" +TEST_SURNAME="" +TEST_EMAIL="" +TEST_USERNAME="" +TEST_PASSWORD="" +TEST_APORTADOR="" +PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" +IN_CONSTRUCTION="0" +DEBUG="1" +TELEGRAM_SUPPORT="" +PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" +TEST_CELL="" +ISTEST=1 diff --git a/_ALL_SITES/arcadei.it/db/static_data.ts b/_ALL_SITES/arcadei.it/db/static_data.ts index 1f20b8e6..73374835 100755 --- a/_ALL_SITES/arcadei.it/db/static_data.ts +++ b/_ALL_SITES/arcadei.it/db/static_data.ts @@ -1,872 +1,85 @@ import { IListRoutes, ILang, - IFunctionality, IPreloadImages, + ISites, } from '@model' import { func } from '@store/Modules/fieldsTable' -const functionality: IFunctionality = { - PWA: false, - SHOW_USER_MENU: true, // Cambiare con true - SHOW_PROFILE: true, - SHOW_REG_BUTTON: true, - ENABLE_REGISTRATION: true, - ENABLE_REG_BY_BOT: false, - ENABLE_REG_NEED_TELEGRAM: false, - SHOW_NEWSLETTER: false, - SHOW_ONLY_POLICY: true, - ENABLE_TODOS_LOADING: false, - ENABLE_PROJECTS_LOADING: false, - SHOW_IF_IS_SERVER_CONNECTION: false, - SHOW_MESSAGES: false, - SHOW_NOTIF: false, - SHOW_COINS: false, - BOOKING_EVENTS: false, - ENABLE_ECOMMERCE: false, - ENABLE_REG_ISP: true, - ENABLE_GROUPS: false, - ENABLE_CIRCUITS: false, - SHOW_COMPETENZE: false, - ENABLE_VIEW_GROUPS: false, - ENABLE_VIEW_USERS: false, - ENABLE_VIEW_PROFILE: true, +const firstPage = { + active: true, + order: 5, + path: '/', + materialIcon: 'home', + name: 'pages.home', + component: () => import('@src/root/home/home.vue'), + reqauth: false, + inmenu: true, + infooter: true, } -// const SHOW_PROJINTHEMENU = false -// -// let arrlistafavourite = [] -// let arrlistaprojtutti = [] -// let arrlistaprojmiei = [] -// if (SHOW_PROJINTHEMENU) { -// arrlistaprojtutti = Projects.getters.listaprojects(RouteNames.projectsall) -// arrlistaprojmiei = Projects.getters.listaprojects(RouteNames.myprojects) -// arrlistafavourite = Projects.getters.listaprojects(RouteNames.favouriteprojects) -// } -// PROGETTI -> FAVORITI : +function getDynamicPages(site: ISites): IListRoutes[] { -// if (arrlistafavourite.length > 0) { -// arrMenu.push({ -// icon: 'favorite_border', -// nametranslate: 'pages.' + RouteNames.favouriteprojects, -// urlroute: RouteNames.favouriteprojects, -// level_parent: 0.0, -// level_child: 0.5, -// routes2: arrlistafavourite, -// idelem: '' -// }) -// } - -const routes_todo: IListRoutes[] = [] -const arrlista = [ - { nametranslate: 'personal', description: 'personal' }, - { nametranslate: 'work', description: 'work' }, - { nametranslate: 'shopping', description: 'shopping' }, -] - -const routes_admin: IListRoutes[] = [ - { - active: true, - order: 10, - path: '/admin/sites', - materialIcon: 'event_seat', - name: 'pages.Sites', - component: () => import('@/rootgen/admin/sites/sites.vue'), - level_parent: 0.0, - level_child: 0.5, - inmenu: true, - submenu: true, - onlyAdmin: true - }, - { - active: true, - order: 1000, - path: '/admin/cfgserv', - materialIcon: 'event_seat', - name: 'pages.Admin', - component: () => import('@/views/admin/cfgServer/cfgServer.vue'), - level_parent: 0.0, - level_child: 0.5, - inmenu: true, - submenu: true, - onlyAdmin: true - }, - { - active: true, - order: 1020, - path: '/admin/dbop', - materialIcon: 'event_seat', - name: 'pages.dbop', - component: () => import('@/views/admin/dbop/dbop.vue'), - level_parent: 0.0, - level_child: 0.5, - inmenu: true, - submenu: true, - onlyAdmin: true - }, - { - active: true, - order: 1040, - path: '/admin/importfile', - materialIcon: 'event_seat', - name: 'otherpages.manage.importfile', - component: () => import('@/rootgen/admin/importdata/importdata.vue'), - level_parent: 0.0, - level_child: 0.5, - inmenu: true, - submenu: true, - onlyAdmin: true - } -] - - -const routes_newsletter: IListRoutes[] = [ - { - active: true, - order: 10, - name: 'newsletter.template', path: '/admin/newsletter/templemail', materialIcon: 'fas fa-users', - component: () => import('@/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true - }, - { - active: true, - order: 20, - name: 'newsletter.sendemail', path: '/admin/newsletter/newnewsletter', materialIcon: 'fas fa-users', - component: () => import('@/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true - }, - { - active: true, - order: 30, - name: 'newsletter.check', path: '/admin/newsletter/check', materialIcon: 'fas fa-users', - component: () => import('@/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true - }, - { - active: true, - order: 40, - name: 'newsletter.sent', path: '/admin/newsletter/newslist', materialIcon: 'fas fa-users', - component: () => import('@/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true - }, - { - active: true, - order: 50, - name: 'newsletter.mailinglist', path: '/admin/newsletter/mailinglist', materialIcon: 'fas fa-users', - component: () => import('@/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true - }, - { - active: true, - order: 60, - name: 'newsletter.settings', path: '/admin/newsletter/settings', materialIcon: 'fas fa-users', - component: () => import('@/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true - }, - { - active: true, - order: 70, - name: 'newsletter.serversettings', path: '/admin/newsletter/main_settings', materialIcon: 'fas fa-users', - component: () => import('@/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true - }, - { - active: true, - order: 80, - name: 'newsletter.others', path: '/admin/newsletter/events', materialIcon: 'fas fa-users', - component: () => import('@/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true - } -] - -const routes_ris: IListRoutes[] = [ - { - active: true, - order: 10, - path: '/admin/ris/circuitslist', - materialIcon: 'fas fa-users', - name: 'otherpages.admin.circuitslist', - component: () => import('@/rootgen/admin/circuitsList/circuitsList.vue'), - inmenu: true, - submenu: true, - level_parent: 0.5, - level_child: 0.5, - onlyManager: true, - onlyFacilitatore: true - }, - { - active: true, - order: 20, - path: '/admin/ris/accountslist', - materialIcon: 'fas fa-users', - name: 'otherpages.admin.accountslist', - component: () => import('@/rootgen/admin/accountsList/accountsList.vue'), - inmenu: true, - submenu: true, - level_parent: 0.5, - level_child: 0.5, - onlyManager: true, - onlyFacilitatore: true - }, - { - active: true, - order: 30, - path: '/admin/ris/movslist', - materialIcon: 'fas fa-users', - name: 'otherpages.admin.movslist', - component: () => import('@/rootgen/admin/movsList/movsList.vue'), - inmenu: true, - submenu: true, - level_parent: 0.5, - level_child: 0.5, - onlyManager: true, - onlyFacilitatore: true - }, -] - - -const routes_manager: IListRoutes[] = [ - { - active: functionality.BOOKING_EVENTS, - order: 70, - path: '/admin/usereventlist', - materialIcon: 'edit', - name: 'otherpages.admin.usereventlist', - component: () => import('@/rootgen/admin/eventlist/eventlist.vue'), - inmenu: functionality.BOOKING_EVENTS, - submenu: functionality.BOOKING_EVENTS, - level_parent: 0, - level_child: 0.5, - infooter: false, - onlyManager: true, - onlyConsiglio: true, - onlyAdmin: true - }, - { - active: true, - order: 10, - path: '/admin/userlist', - materialIcon: 'fas fa-users', - name: 'otherpages.admin.userlist', - component: () => import('@/rootgen/admin/usersList/usersList.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyManager: true, - onlyFacilitatore: true - }, - { - active: true, - order: 10, - path: '/admin/userpanel', - materialIcon: 'fas fa-users', - name: 'otherpages.admin.userpanel', - component: () => import('@/rootgen/admin/userPanel/userPanel.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyManager: true, - onlyFacilitatore: true - }, - { - active: true, - order: 10, - path: '/admin/iscrittiarcadei', - materialIcon: 'fas fa-users', - name: 'otherpages.admin.iscrittiarcadei', - component: () => import('@/rootgen/admin/iscrittiarcadei/iscrittiarcadei.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyManager: true, - onlyFacilitatore: true - }, - - /* - { - active: true, - order: 10, - path: '/admin/iscritticonacreis', - materialIcon: 'fas fa-users', - name: 'otherpages.admin.iscritticonacreis', - component: () => import('@/rootgen/admin/iscritticonacreis/iscritticonacreis.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyManager: true, - onlyFacilitatore: true - }, - - */ - { - active: true, - path: '/admin/ris', - order: 60, - faIcon: 'fa fa-list-alt', - materialIcon: 'fas fa-users', - name: 'otherpages.admin.monete', - routes2: routes_ris, - inmenu: false, - submenu: true, - level_parent: 0.5, - level_child: 0.5, - solotitle: true, - onlyAdmin: true, - onlyManager: true - }, - { - active: false, - order: 10, - path: '/admin/zoomlist', - materialIcon: 'fas fa-users', - name: 'otherpages.admin.zoomlist', - component: () => import('@/rootgen/admin/zoomList/zoomList.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyManager: true, - onlyFacilitatore: false - }, - { - active: true, - order: 27, - path: '/admin/tableslist', - materialIcon: 'fas fa-users', - name: 'otherpages.admin.tableslist', - component: () => import('@/rootgen/admin/tablesList/tablesList.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyAdmin: true, - onlyManager: true - }, - { - active: true, - order: 30, - path: '/admin/pages', - materialIcon: 'fas fa-file-alt', - name: 'otherpages.admin.pages', - component: () => import('@/rootgen/admin/pages/pages.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyManager: true, - onlyEditor: true - }, - { - active: true, - order: 32, - path: '/admin/home', - materialIcon: 'fas fa-file-alt', - name: 'otherpages.admin.Home', - component: () => import('@/rootgen/admin/home/home.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyManager: true, - onlyEditor: true - }, - { - active: true, - order: 30, - path: '/admin/bot', - materialIcon: 'fas fa-file-alt', - name: 'otherpages.admin.bot', - component: () => import('@/rootgen/admin/bot/bot.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyManager: true, - onlyEditor: true - }, - { - active: true, - order: 30, - path: '/admin/confsite', - materialIcon: 'fas fa-file-alt', - name: 'otherpages.admin.confsite', - component: () => import('@/rootgen/admin/confsite/confsite.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyManager: true, - onlyEditor: true - }, - { - active: true, - path: '/admin/newsletter', - order: 60, - faIcon: 'fa fa-list-alt', - materialIcon: 'fas fa-users', - name: 'otherpages.admin.newsletter', - routes2: routes_newsletter, - inmenu: false, - submenu: true, - level_parent: 0.5, - level_child: 0.5, - solotitle: true, - onlyAdmin: true, - onlyManager: true - }, - /* + const baseroutes: IListRoutes[] = [ { - active: functionality.ENABLE_ECOMMERCE, - path: '/admin/ecommerce', - order: 31, - faIcon: 'fa fa-list-alt', - materialIcon: 'next_week', - name: 'pages.admin_ecommerce', - routes2: routes_admin_ecommerce, - inmenu: false, - submenu: true, - level_parent: 0.5, - level_child: 0.5, - solotitle: true, - onlyAdmin: true, - onlyManager: true, - onlyDepartment: true - }, - - */ - { - active: true, - order: 35, - path: '/admin/msg_template', - materialIcon: 'fas fa-file-alt', - name: 'msgs.messages', - component: () => import('@/rootgen/admin/msg_template/msg_template.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyAdmin: true, - onlyManager: true - // onlyFacilitatore: true - }, - { - active: true, - order: 1030, - path: '/admin/sendpushnotif', - materialIcon: 'event_seat', - name: 'otherpages.manage.sendpushnotif', - component: () => import('@/rootgen/admin/sendpushnotif/sendpushnotif.vue'), - level_parent: 0.0, - level_child: 0.5, - inmenu: true, - submenu: true, - onlyAdmin: true, - onlyManager: true, - }, - { - active: true, - order: 40, - path: '/admin/gallery', - materialIcon: 'fas fa-file-alt', - name: 'otherpages.admin.gallery', - component: () => import('@/rootgen/admin/gallery/gallery.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyAdmin: true, - onlyManager: true - }, - { - active: true, - order: 50, - path: '/admin/media', - materialIcon: 'fas fa-file-alt', - name: 'otherpages.admin.media', - component: () => import('@/rootgen/admin/uploader/uploader.vue'), - inmenu: true, - submenu: true, - level_parent: 0, - level_child: 0.5, - onlyAdmin: true, - onlyManager: true - }, -] - - -const baseroutes: IListRoutes[] = [ - { - active: true, - order: 5, - path: '/', - materialIcon: 'home', - name: 'pages.home', - component: () => import('@src/root_spec/home_arcadei/home_arcadei.vue'), - reqauth: false, - inmenu: true, - infooter: true, - }, - /*{ - active: true, - order: 120, - path: '/myprofile', - materialIcon: 'fas fa-user', - name: 'pages.profile', - component: () => import('@/views/user/myprofile/myprofile.vue'), - meta: { requiresAuth: true }, - inmenu: true, - infooter: true, - },*/ - { - active: true, - order: 120, - path: '/editprofile', - materialIcon: 'fas fa-user', - name: 'pages.profile3', - component: () => import('@/views/user/editprofile/editprofile.vue'), - meta: { requiresAuth: true }, - inmenu: false, - infooter: false, - }, - { - active: functionality.ENABLE_GROUPS, - order: 132, - path: '/groups', - materialIcon: 'fas fa-users', - name: 'mypages.groups', - component: () => import('@/views/user/mygroups/mygroups.vue'), - meta: { requiresAuth: true }, - inmenu: true, - infooter: true, - }, - { - active: functionality.ENABLE_CIRCUITS, - order: 133, - path: '/circuits', - materialIcon: 'fas fa-coins', - name: 'mypages.circuits', - component: () => import('@/views/user/mycircuits/mycircuits.vue'), - meta: { requiresAuth: true }, - inmenu: true, - infooter: true, - }, - { - active: true, - order: 135, - path: '/my/:username', - materialIcon: 'fas fa-user', - name: 'pages.profile2', - component: () => import('@/views/user/myprofile/myprofile.vue'), - meta: { requiresAuth: true }, - inmenu: false, - infooter: false, - }, - { - active: true, - order: 136, - path: '/grp/:groupname', - materialIcon: 'fas fa-user', - name: 'proj.group2', - component: () => import('@/views/user/mygroup/mygroup.vue'), - meta: { requiresAuth: true, newpage: true }, - inmenu: false, - infooter: false, - }, { - active: true, - order: 137, - path: '/circuit/:path', - materialIcon: 'fas fa-user', - name: 'proj.circuit2', - component: () => import('@/views/user/mycircuit/mycircuit.vue'), - meta: { requiresAuth: true, newpage: true }, - inmenu: false, - infooter: false, - }, - { - active: true, - order: 130, - path: '/mypage/:idBacheca', - materialIcon: 'fas fa-user', - name: 'pages.mypage2', - component: () => import('@/views/user/mypagebacheca/mypagebacheca.vue'), - meta: { requiresAuth: true, newpage: true }, - inmenu: false, - infooter: false, - }, - { - active: true, - order: 130, - path: '/myservice/:idSkill', - materialIcon: '', - name: 'pages.myservice2', - component: () => import('@/views/user/myservice/myservice.vue'), - meta: { requiresAuth: true, newpage: true }, - inmenu: false, - infooter: false, - }, - { - active: true, - order: 135, - path: '/myhosps/:idHosp', - materialIcon: '', - name: 'pages.myhosps2', - component: () => import('@/views/user/mypagehosp/mypagehosp.vue'), - meta: { requiresAuth: true, newpage: true }, - inmenu: false, - infooter: false, - }, - { - active: true, - order: 132, - path: '/mygood/:idGood', - materialIcon: '', - name: 'pages.mygood2', - component: () => import('@/views/user/mypagegood/mypagegood.vue'), - meta: { requiresAuth: true, newpage: true }, - inmenu: false, - infooter: false, - }, - { - active: true, - order: 60, - path: '/fundraising', - materialIcon: 'fas fa-hand-holding-heart', - name: 'pages.fundraising', - component: () => import('@src/root/fundraising/fundraising.vue'), - inmenu: true, - infooter: true, - }, - { - active: true, - order: 200, - path: '/notifs', - materialIcon: 'fas fa-user', - name: 'pages.notifs', - component: () => import('@/views/user/usernotifs/usernotifs.vue'), - meta: { requiresAuth: true }, - inmenu: false, - infooter: false, - }, - { - active: true, - order: 400, - path: '/test', - materialIcon: 'fas fa-test', - name: 'mypages.test', - component: () => import('@/views/testServer/testServer.vue'), - inmenu: false, - infooter: false, - }, - { - active: true, - order: 400, - path: '/testlocal', - materialIcon: 'fas fa-test', - name: 'mypages.TestLocal', - component: () => import('@/views/test/test.vue'), - meta: { requiresAuth: true }, - inmenu: false, - infooter: false, - }, - { - active: true, - order: 2000, - path: '/admin', - materialIcon: 'fas fa-user-shield', - name: 'otherpages.admin.menu', - inmenu: true, - routes2: routes_admin, - solotitle: true, - infooter: false, - onlyAdmin: true - }, - ...routes_admin, - { - active: true, - order: 2110, - path: '/manage', - materialIcon: 'fas fa-users-cog', - name: 'otherpages.manage.menu', - inmenu: true, - routes2: routes_manager, - solotitle: true, - infooter: false, - onlyAdmin: true, - onlyManager: true, - onlyFacilitatore: true, - onlyEditor: true - }, - ...routes_manager, - { - active: true, - order: 1000, - path: '/404error', - materialIcon: 'fas fa-calendar-plus', - name: 'otherpages.error404', - component: () => import('@/root/My404page/My404page.vue'), - inmenu: false, - infooter: false - }, - - { - active: true, - order: 2000, - path: '/policy', - materialIcon: 'fas fa-user', - name: 'pages.policy', - component: () => import('@src/root/policy/policy.vue'), - inmenu: false, - infooter: true - }, - { - active: functionality.ENABLE_REG_BY_BOT, - order: 1000, - path: '/bot', - materialIcon: 'how_to_reg', - name: 'pages.SignUpBot', - inmenu: functionality.ENABLE_REG_BY_BOT, - infooter: functionality.ENABLE_REG_BY_BOT, - separator: false - }, - { - active: functionality.ENABLE_REGISTRATION && !functionality.ENABLE_REG_NEED_TELEGRAM, - order: 1000, - path: '/signup', - materialIcon: 'how_to_reg', - name: 'pages.SignUp', - component: () => import('@/views/login/signup_noteleg/signup_noteleg.vue'), - inmenu: false, - infooter: false, - separator: false - }, - { - active: true, - order: 1001, - path: '/signup/:invited', - materialIcon: 'how_to_reg', - name: 'pages.SignUp2', - component: () => import('@/views/login/signup/signup.vue'), - inmenu: false, - infooter: false, - separator: false - }, - { - active: functionality.ENABLE_REGISTRATION, - order: 2000, - path: '/regok', - materialIcon: 'how_to_reg', - name: 'pages.regok', - component: () => import('@/views/login/regok/regok.vue'), - inmenu: false, - infooter: false, - separator: false, - }, - { - active: true, - order: 1000, - path: '/signin', - materialIcon: 'account_circle', - name: 'pages.SignIn', - component: () => import('@/views/login/signin_noreg/signin_noreg.vue'), - inmenu: false, - infooter: true - }, - // --- NOT IN MENU: --- - { - active: true, - order: 1000, - path: '/vreg', - name: 'pages.vreg', - component: () => import('@/views/login/vreg/vreg.vue') - }, - { - active: true, - order: 1000, - path: '/requestresetpwd', - name: 'pages.requestresetpwd', - component: () => import('@/views/requestresetpwd/requestresetpwd.vue') - }, - { - active: true, - order: 1000, - path: '/updatepassword', - name: 'pages.updatepassword', - component: () => import('@/views/updatepassword/updatepassword.vue') - }, - { - active: true, - order: 1000, - path: '/offline', - name: 'Offline', - component: () => import('@/views/offline/offline.vue') - }, - { - active: true, - path: '/separator', - name: 'separator', - order: 35, - isseparator: true, - inmenu: true, - }, - { - active: true, - order: 80, - path: '/calendario-eventi', - materialIcon: 'event', - name: 'ris.calendario_eventi_riso', - component: () => import('@/root/calendarioeventi/calendarioeventi.vue'), - extraclass: 'isCalendar', - inmenu: true, - infooter: true - }, - { - active: true, - order: 55, - path: '/iscrizione', - materialIcon: 'how_to_reg', - name: 'pages.SignUpArcadei', - component: () => import('@/views/login/iscrizionearcadei/iscrizionearcadei.vue'), - inmenu: true, - infooter: true, - separator: false, - onlyNotSoci: false, - }, - { - active: true, - order: 1000, - path: '/admin/newsletter/:idparam', - materialIcon: 'event', - name: 'pages.newsletter.menu', - component: () => import('@/rootgen/admin/newsletter/newsletter.vue'), - inmenu: false, - infooter: false - }, - { - active: true, - order: 90, - path: '/event/:typol/:eventid', - materialIcon: 'event', - name: 'pages.evento', - component: () => import('@/root/evento/evento.vue'), - inmenu: false, - infooter: false - }, - { - active: true, - order: 110, - path: '/event/:typol', - materialIcon: 'event', - name: 'pages.eventodef', - component: () => import('@/root/evento/evento.vue'), - inmenu: false, - infooter: false - }, - -] + active: true, + order: 5, + path: '/', + materialIcon: 'home', + name: 'pages.home', + component: () => import('@src/root_spec/home_arcadei/home_arcadei.vue'), + reqauth: false, + inmenu: true, + infooter: true, + }, + /*{ + active: true, + order: 120, + path: '/myprofile', + materialIcon: 'fas fa-user', + name: 'pages.profile', + component: () => import('@/views/user/myprofile/myprofile.vue'), + meta: { requiresAuth: true }, + inmenu: true, + infooter: true, + },*/ + { + active: true, + order: 120, + path: '/editprofile', + materialIcon: 'fas fa-user', + name: 'pages.profile3', + component: () => import('@/views/user/editprofile/editprofile.vue'), + meta: { requiresAuth: true }, + inmenu: false, + infooter: false, + }, + { + active: true, + order: 80, + path: '/calendario-eventi', + materialIcon: 'event', + name: 'ris.calendario_eventi_riso', + component: () => import('@/root/calendarioeventi/calendarioeventi.vue'), + extraclass: 'isCalendar', + inmenu: true, + infooter: true + }, + { + active: true, + order: 55, + path: '/iscrizione', + materialIcon: 'how_to_reg', + name: 'pages.SignUpArcadei', + component: () => import('@/views/login/iscrizionearcadei/iscrizionearcadei.vue'), + inmenu: true, + infooter: true, + separator: false, + onlyNotSoci: false, + }, + ] + return baseroutes +} export function firstimagehome() { @@ -874,41 +87,20 @@ export function firstimagehome() { return img } -const arrLangUsed = [ - 'it', - // 'enUs', - // 'es', -] - - -const lang_available: ILang[] = [ - { - label: 'Italiano', icon: 'fa-flag-it', value: 'it', image: '../images/it.png', short: 'IT', - }, - /*{ - label: 'English', icon: 'fa-flag-us', value: 'enUs', image: '../images/gb.png', short: 'EN', - }, - { - label: 'Español', icon: 'fa-flag-es', value: 'es', image: '../images/es.png', short: 'ES', - }, - - */ -// { label: 'Français', icon: 'fa-facebook', value: 'fr', image: '../public/images/fr.png', short: 'FR' } -// { label: 'German', icon: 'fa-flag-de', value: 'de', image: '../public/images/de.png', short: 'DE' }, -] - const preLoadImages: IPreloadImages[] = [] +export const lang_available: ILang[] = [] +export const arrLangUsed: string[] = [] + export const preloadedimages = [] -export const routes = baseroutes +export const routes: IListRoutes[] = [firstPage] export const static_data = { - baseroutes, routes, - functionality, + arrLangUsed, + getDynamicPages, lang_available, preLoadImages, - arrLangUsed, preloadedimages, } diff --git a/_ALL_SITES/freeplanet.app/db/lang/ws_enUs.js b/_ALL_SITES/freeplanet.app/db/lang/ws_enUs.js index 8dfea3ab..a119ed55 100755 --- a/_ALL_SITES/freeplanet.app/db/lang/ws_enUs.js +++ b/_ALL_SITES/freeplanet.app/db/lang/ws_enUs.js @@ -31,20 +31,6 @@ const msg_website_enUs = { Admin: 'Admin', Test1: 'Test1', Test2: 'Test2', - statusreg: { - reg: 'Participants', - passeggeri: 'Passengers Ships', - giainlista: 'Already in the List', - newreg: 'New registrations:', - nationality: 'Nationality', - verified: 'Verified', - nonverified: 'Not Verified', - req7: 'With 5 steps you enter the boarding list.', - req9: 'With 7 steps help {sitename} to grow!', - req: 'Steps', - people: 'Gue.', - peoplelegend: 'Number of guests', - }, }, msg: { myAppDescription: '', diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test index 6c91b038..39998fb2 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.5.34" +APP_VERSION="0.5.28" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/db/lang/ws_it.js b/_ALL_SITES/riso.app/db/lang/ws_it.js index 865d73d1..592e5baf 100755 --- a/_ALL_SITES/riso.app/db/lang/ws_it.js +++ b/_ALL_SITES/riso.app/db/lang/ws_it.js @@ -57,7 +57,9 @@ const msg_website_it = { SignUp_alreadylista: 'Registrazione per quelli che erano già nella lista di Notevole (del 2019) !', SignUp2: 'Registrazione', SignUp3: 'Reg', - SignUpBot: 'Registrati', + SignUp4: 'Reg', + SignUp5: 'Reg', + SignUpBot: 'Registrati con Telegram', SignIn: 'Login', status: 'Statistiche', nextzoom: 'Conferenze', @@ -97,7 +99,9 @@ const msg_website_it = { autorizzare: 'In attesa di Abilitazione', passeggeri: 'Passeggeri Navi', giainlista: 'Gia in Lista', - newreg: 'Ultime Registrazioni:', + newreg: 'Registrati', + onlineusers: 'OnLine', + diffusori: 'Diffusori', nationality: 'Nazionalità', nationality_born: 'Nazione di Nascita', verified: 'Verificata', @@ -146,10 +150,8 @@ const msg_website_it = { myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito', underconstruction: 'App in costruzione...', myDescriz: '', - sottoTitoloApp: 'Il primo Vero Social', - sottoTitoloApp2: 'Libero, Equo e Solidale', - sottoTitoloApp3: 'dove Vive Consapevolezza e Aiuto Comunitario', - sottoTitoloApp4: 'Gratuito e senza Pubblicità', + sottoTitoloApp: 'Rete Italiana di Scambio Orizzontale', + sottoTitoloApp2: '', }, homepage: { descrapp_title1: 'Uniti per Evolvere e Sperimentare', diff --git a/_ALL_SITES/riso.app/db/static_data.ts b/_ALL_SITES/riso.app/db/static_data.ts index 20e24f04..8fad9042 100755 --- a/_ALL_SITES/riso.app/db/static_data.ts +++ b/_ALL_SITES/riso.app/db/static_data.ts @@ -178,17 +178,6 @@ function getDynamicPages(site: ISites): IListRoutes[] { inmenu: true, infooter: true, }, - { - active: true, - order: 135, - path: '/my/:username', - materialIcon: 'fas fa-user', - name: 'pages.profile2', - component: () => import('@/views/user/myprofile/myprofile.vue'), - meta: { requiresAuth: true }, - inmenu: false, - infooter: false, - }, { active: true, order: 136, diff --git a/_ALL_SITES/riso.app/favicon.ico b/_ALL_SITES/riso.app/favicon.ico index 06be8648..d283c964 100644 Binary files a/_ALL_SITES/riso.app/favicon.ico and b/_ALL_SITES/riso.app/favicon.ico differ diff --git a/_ALL_SITES/riso.app/package.json b/_ALL_SITES/riso.app/package.json index 7104a4e5..8a2ec368 100755 --- a/_ALL_SITES/riso.app/package.json +++ b/_ALL_SITES/riso.app/package.json @@ -22,56 +22,58 @@ "generate-sw": "workbox generateSW workbox-config.js" }, "dependencies": { - "@quasar/extras": "^1.15.2", + "@quasar/extras": "^1.15.6", "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.13", "@vue-leaflet/vue-leaflet": "^0.6.1", - "@vue/compat": "^3.2.38", - "@vue/compiler-sfc": "^3.2.38", + "@vue/compat": "^3.2.45", + "@vue/compiler-sfc": "^3.2.45", "@vue/eslint-config-standard": "7.0.0", - "@vuelidate/core": "^2.0.0-alpha.44", - "@vuelidate/validators": "^2.0.0-alpha.31", - "acorn": "^8.8.0", - "autoprefixer": "^10.4.8", - "axios": "^0.27.2", + "@vuelidate/core": "^2.0.0", + "@vuelidate/validators": "^2.0.0", + "acorn": "^8.8.1", + "animate.css": "^4.1.1", + "autoprefixer": "^10.4.13", + "axios": "^1.2.0", "bcryptjs": "^2.4.3", "chart.js": "^3.9.1", - "core-js": "^3.25.0", + "core-js": "^3.26.1", "crypto": "^1.0.1", - "date-fns": "^2.29.2", - "dotenv": "^16.0.2", + "date-fns": "^2.29.3", + "dotenv": "^16.0.3", "echarts": "^5.3.3", "eslint-plugin-quasar": "^1.1.0", "eslint-plugin-standard": "^5.0.0", "graphql": "^16.6.0", "graphql-tag": "^2.12.6", - "gsap": "^3.11.1", + "gsap": "^3.11.3", "jquery": "^3.6.1", "js-cookie": "^3.0.1", "localforage": "^1.10.0", "lodash": "^4.17.21", "normalize.css": "^8.0.1", - "npm": "^8.19.1", + "npm": "^9.1.2", "nprogress": "^0.2.0", - "pinia": "^2.0.22", + "pinia": "^2.0.27", "prerender-spa-plugin": "^3.4.0", - "quasar": "^2.7.7", + "quasar": "^2.10.2", "quasar-extras": "^2.0.9", "register-service-worker": "^1.7.2", - "vee-validate": "^4.6.7", - "vue": "^3.2.38", + "vee-validate": "^4.7.3", + "vue": "^3.2.45", "vue-chart-3": "^3.1.8", "vue-class-component": "^8.0.0-rc.1", "vue-country-code": "^1.1.3", "vue-echarts": "^6.2.3", "vue-i18n": "^9.2.2", "vue-idb": "^0.2.0", - "vue-loader": "^17.0.0", + "vue-loader": "^17.0.1", "vue-property-decorator": "^10.0.0-rc.3", - "vue-router": "^4.1.5", + "vue-router": "^4.1.6", "vue-scroll-reveal": "^1.0.11", + "vue-social-sharing": "^4.0.0-alpha4", "vue-svgicon": "^4.0.0-alpha.3", "vue2-dragula": "^2.5.5", - "vuex": "^4.0.2", + "vuex": "^4.1.0", "vuex-router-sync": "^6.0.0-rc.1" }, "devDependencies": { @@ -79,56 +81,56 @@ "@types/bcryptjs": "^2.4.2", "@types/dotenv": "^8.2.0", "@types/googlemaps": "^3.43.3", - "@types/jest": "^29.0.0", + "@types/jest": "^29.2.3", "@types/js-cookie": "^3.0.2", - "@types/node": "18.7.15", + "@types/node": "18.11.9", "@types/nprogress": "^0.2.0", "@types/vue-tel-input": "^2.1.2", "@types/vuelidate": "^0.7.15", - "@typescript-eslint/eslint-plugin": "^5.36.2", - "@typescript-eslint/parser": "^5.36.2", - "eslint": "^8.23.0", + "@typescript-eslint/eslint-plugin": "^5.45.0", + "@typescript-eslint/parser": "^5.45.0", + "eslint": "^8.28.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^6.0.1", - "eslint-plugin-vue": "^9.4.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-vue": "^9.8.0", "file-loader": "^6.2.0", "html-webpack-plugin": "^5.5.0", "http-proxy-middleware": "^2.0.6", - "jest": "^29.0.2", + "jest": "^29.3.1", "json-loader": "^0.5.7", "node-sass": "7.0.1", - "npm-check-updates": "^16.1.0", + "npm-check-updates": "^16.4.3", "optimize-css-assets-webpack-plugin": "^6.0.1", - "postcss": "^8.4.16", - "postcss-loader": "^7.0.1", - "sass-loader": "^13.0.2", + "postcss": "^8.4.19", + "postcss-loader": "^7.0.2", + "sass-loader": "^13.2.0", "strip-ansi": "=7.0.1", - "ts-jest": "^28.0.8", - "ts-loader": "^9.3.1", + "ts-jest": "^29.0.3", + "ts-loader": "^9.4.1", "tslint": "^6.1.3", "tslint-config-standard": "^9.0.0", "tslint-loader": "^3.5.4", - "typescript": "^4.8.2", + "typescript": "^4.9.3", "vue-cli-plugin-element-ui": "^1.1.4", "vueify": "^9.4.1", - "webpack": "^5.74.0", + "webpack": "^5.75.0", "workbox-webpack-plugin": "^6.5.4" }, "browser": { "crypto": false }, "browserslist": [ - "last 16 Chrome versions", - "last 16 Firefox versions", + "last 30 Chrome versions", + "last 30 Firefox versions", "last 4 Edge versions", - "last 13 Safari versions", - "last 16 Android versions", - "last 16 ChromeAndroid versions", - "last 16 FirefoxAndroid versions", - "last 12 iOS versions", - "last 7 Opera versions" + "last 30 Safari versions", + "last 30 Android versions", + "last 30 ChromeAndroid versions", + "last 30 FirefoxAndroid versions", + "last 18 iOS versions", + "last 11 Opera versions" ], "engines": { "node": ">= 16.14.0", diff --git a/_ALL_SITES/riso.app/quasar.conf.js b/_ALL_SITES/riso.app/quasar.conf.js index cbf36237..274ad772 100755 --- a/_ALL_SITES/riso.app/quasar.conf.js +++ b/_ALL_SITES/riso.app/quasar.conf.js @@ -37,7 +37,7 @@ module.exports = configure((ctx) => ({ // --> boot files are part of "main.js" // https://v2.quasar.dev/quasar-cli/boot-files // boot: ['vue-i18n', 'vue-meta', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'vue-idb', 'dragula', 'guard'], - boot: ['i18n', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'calendar'], + boot: ['i18n', 'axios', 'vee-validate', 'myconfig', 'local-storage', 'error-handler', 'globalroutines', 'calendar', 'social-sharing'], // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css css: [ @@ -149,6 +149,10 @@ module.exports = configure((ctx) => ({ https: false, port: 8084, open: false, // opens browser window automatically + headers: { + 'Access-Control-Allow-Origin': '*', + 'Access-Control-Allow-Headers': '*', + }, }, // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework diff --git a/now.txt b/now.txt index e5f5d4ff..d78061ad 100644 --- a/now.txt +++ b/now.txt @@ -1 +1 @@ -TERMINA DI LAVORARE SU riso.app: (Sovrascrivo !) +TERMINA DI LAVORARE SU arcadei.it: (Sovrascrivo !) diff --git a/public/images/arcadei-android-icon-144x144.png b/public/images/arcadei-android-icon-144x144.png new file mode 100644 index 00000000..84915be5 Binary files /dev/null and b/public/images/arcadei-android-icon-144x144.png differ diff --git a/public/images/arcadei-android-icon-192x192.png b/public/images/arcadei-android-icon-192x192.png new file mode 100644 index 00000000..359998a6 Binary files /dev/null and b/public/images/arcadei-android-icon-192x192.png differ diff --git a/public/images/arcadei-android-icon-384x384.png b/public/images/arcadei-android-icon-384x384.png new file mode 100644 index 00000000..8f25fe63 Binary files /dev/null and b/public/images/arcadei-android-icon-384x384.png differ diff --git a/public/images/arcadei-android-icon-48x48.png b/public/images/arcadei-android-icon-48x48.png new file mode 100644 index 00000000..cd211909 Binary files /dev/null and b/public/images/arcadei-android-icon-48x48.png differ diff --git a/public/images/arcadei-android-icon-512x512.png b/public/images/arcadei-android-icon-512x512.png new file mode 100644 index 00000000..3480342c Binary files /dev/null and b/public/images/arcadei-android-icon-512x512.png differ diff --git a/public/images/arcadei-android-icon-96x96.png b/public/images/arcadei-android-icon-96x96.png new file mode 100644 index 00000000..fabb52e1 Binary files /dev/null and b/public/images/arcadei-android-icon-96x96.png differ diff --git a/public/images/arcadei-apple-icon-114x114.png b/public/images/arcadei-apple-icon-114x114.png new file mode 100644 index 00000000..02c3ed39 Binary files /dev/null and b/public/images/arcadei-apple-icon-114x114.png differ diff --git a/public/images/arcadei-apple-icon-144x144.png b/public/images/arcadei-apple-icon-144x144.png new file mode 100644 index 00000000..84915be5 Binary files /dev/null and b/public/images/arcadei-apple-icon-144x144.png differ diff --git a/public/images/arcadei-apple-icon-152x152.png b/public/images/arcadei-apple-icon-152x152.png new file mode 100644 index 00000000..12125535 Binary files /dev/null and b/public/images/arcadei-apple-icon-152x152.png differ diff --git a/public/images/arcadei-apple-icon-180x180.png b/public/images/arcadei-apple-icon-180x180.png new file mode 100644 index 00000000..c706a239 Binary files /dev/null and b/public/images/arcadei-apple-icon-180x180.png differ diff --git a/public/images/arcadei-apple-icon-57x57.png b/public/images/arcadei-apple-icon-57x57.png new file mode 100644 index 00000000..0ee523ec Binary files /dev/null and b/public/images/arcadei-apple-icon-57x57.png differ diff --git a/public/images/arcadei-logo-full.jpg b/public/images/arcadei-logo-full.jpg new file mode 100644 index 00000000..29baaec9 Binary files /dev/null and b/public/images/arcadei-logo-full.jpg differ diff --git a/public/images/arcadei-logo-full.png b/public/images/arcadei-logo-full.png new file mode 100644 index 00000000..5d8b7b3c Binary files /dev/null and b/public/images/arcadei-logo-full.png differ diff --git a/public/images/favicon-16x16.png b/public/images/favicon-16x16.png index c28cef9f..18de7b25 100644 Binary files a/public/images/favicon-16x16.png and b/public/images/favicon-16x16.png differ diff --git a/public/images/favicon-32x32.png b/public/images/favicon-32x32.png index a02e38b0..6045a0f4 100644 Binary files a/public/images/favicon-32x32.png and b/public/images/favicon-32x32.png differ diff --git a/public/images/riso-android-icon-144x144.png b/public/images/riso-android-icon-144x144.png index 37dcd661..c5050b30 100644 Binary files a/public/images/riso-android-icon-144x144.png and b/public/images/riso-android-icon-144x144.png differ diff --git a/public/images/riso-android-icon-192x192.png b/public/images/riso-android-icon-192x192.png index 95b960e9..c4d15612 100644 Binary files a/public/images/riso-android-icon-192x192.png and b/public/images/riso-android-icon-192x192.png differ diff --git a/public/images/riso-android-icon-384x384.png b/public/images/riso-android-icon-384x384.png index ce1ffc47..43db963d 100644 Binary files a/public/images/riso-android-icon-384x384.png and b/public/images/riso-android-icon-384x384.png differ diff --git a/public/images/riso-android-icon-48x48.png b/public/images/riso-android-icon-48x48.png index 499e8674..ec317d16 100644 Binary files a/public/images/riso-android-icon-48x48.png and b/public/images/riso-android-icon-48x48.png differ diff --git a/public/images/riso-android-icon-512x512.png b/public/images/riso-android-icon-512x512.png index e1c31acd..72c2b9c7 100644 Binary files a/public/images/riso-android-icon-512x512.png and b/public/images/riso-android-icon-512x512.png differ diff --git a/public/images/riso-android-icon-96x96.png b/public/images/riso-android-icon-96x96.png index 98dbf9d9..7f9197ca 100644 Binary files a/public/images/riso-android-icon-96x96.png and b/public/images/riso-android-icon-96x96.png differ diff --git a/public/images/riso-apple-icon-114x114.png b/public/images/riso-apple-icon-114x114.png index f0a0b073..474d31a1 100644 Binary files a/public/images/riso-apple-icon-114x114.png and b/public/images/riso-apple-icon-114x114.png differ diff --git a/public/images/riso-apple-icon-120x120.png b/public/images/riso-apple-icon-120x120.png index 2217d7e4..b943abce 100644 Binary files a/public/images/riso-apple-icon-120x120.png and b/public/images/riso-apple-icon-120x120.png differ diff --git a/public/images/riso-apple-icon-144x144.png b/public/images/riso-apple-icon-144x144.png index 37dcd661..c5050b30 100644 Binary files a/public/images/riso-apple-icon-144x144.png and b/public/images/riso-apple-icon-144x144.png differ diff --git a/public/images/riso-apple-icon-152x152.png b/public/images/riso-apple-icon-152x152.png index 19a3af7b..26804e4a 100644 Binary files a/public/images/riso-apple-icon-152x152.png and b/public/images/riso-apple-icon-152x152.png differ diff --git a/public/images/riso-apple-icon-180x180.png b/public/images/riso-apple-icon-180x180.png index 83f48a66..0334ed85 100644 Binary files a/public/images/riso-apple-icon-180x180.png and b/public/images/riso-apple-icon-180x180.png differ diff --git a/public/images/riso-apple-icon-57x57.png b/public/images/riso-apple-icon-57x57.png index 86abc554..16ef4430 100644 Binary files a/public/images/riso-apple-icon-57x57.png and b/public/images/riso-apple-icon-57x57.png differ diff --git a/public/images/riso-logo-full.png b/public/images/riso-logo-full.png index 38a9695f..35c8271f 100644 Binary files a/public/images/riso-logo-full.png and b/public/images/riso-logo-full.png differ diff --git a/src/components/CRegistration/CRegistration.ts b/src/components/CRegistration/CRegistration.ts index 13d4f328..129d7ff7 100755 --- a/src/components/CRegistration/CRegistration.ts +++ b/src/components/CRegistration/CRegistration.ts @@ -20,6 +20,11 @@ export default defineComponent({ const $router = useRouter() const site = ref(globalStore.site) + const chooseReg = ref(false) + const noInvited = ref(false) + const start = ref(false) + + const slide= ref('start') function clickToRegister() { @@ -35,6 +40,10 @@ export default defineComponent({ tools, site, clickToRegister, + chooseReg, + start, + noInvited, + slide, } }, }) diff --git a/src/components/CRegistration/CRegistration.vue b/src/components/CRegistration/CRegistration.vue index 562d7388..5cccd9f3 100755 --- a/src/components/CRegistration/CRegistration.vue +++ b/src/components/CRegistration/CRegistration.vue @@ -1,44 +1,164 @@ diff --git a/src/components/CSignIn/CSignIn.vue b/src/components/CSignIn/CSignIn.vue index eb95a727..8fd9d320 100755 --- a/src/components/CSignIn/CSignIn.vue +++ b/src/components/CSignIn/CSignIn.vue @@ -64,14 +64,14 @@
Se non sei ancora Registrato:
Se non sei ancora Registrato:
diff --git a/src/components/CSignUp/CSignUp.ts b/src/components/CSignUp/CSignUp.ts index 96184851..a8e0c928 100755 --- a/src/components/CSignUp/CSignUp.ts +++ b/src/components/CSignUp/CSignUp.ts @@ -87,6 +87,8 @@ export default defineComponent({ const typePassword = ref('password') + const ap_iniziale = ref('') + const globalStore = useGlobalStore() const site = computed(() => globalStore.site) @@ -130,10 +132,10 @@ export default defineComponent({ if (props.show_namesurname) { valid.name = { - required, + } valid.surname = { - required, + } } @@ -173,6 +175,10 @@ export default defineComponent({ error = true } + if (tools.getAskToVerifyReg()) { + error = error || !signup.aportador_solidario + } + return !error } @@ -253,6 +259,8 @@ export default defineComponent({ console.log('$route.params', $route.params) + ap_iniziale.value = !!$route.params.invited ? $route.params.invited.toString() : '' + signup.aportador_solidario = !!$route.params.invited ? $route.params.invited.toString() : '' signup.username = !!$route.params.usernameteleg ? $route.params.usernameteleg.toString() : '' signup.regexpire = !!$route.params.regexpire ? $route.params.regexpire.toString() : props.regexpire @@ -269,7 +277,9 @@ export default defineComponent({ signup.aportador_solidario = tools.getCookie(tools.APORTADOR_SOLIDARIO, signup.aportador_solidario) if (!signup.aportador_solidario || signup.aportador_solidario === 'undefined') { - signup.aportador_solidario = tools.APORTADOR_NONE + if (!tools.getAskToVerifyReg()) { + signup.aportador_solidario = tools.APORTADOR_NONE + } } console.log('signup.aportador_solidario', signup.aportador_solidario) @@ -340,6 +350,7 @@ export default defineComponent({ site, showPassword, typePassword, + ap_iniziale, } }, }) diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue index 7ecbeb4e..7a403faf 100755 --- a/src/components/CSignUp/CSignUp.vue +++ b/src/components/CSignUp/CSignUp.vue @@ -98,7 +98,7 @@ signup.aportador_solidario !== tools.APORTADOR_NONE " bg-color="lightblue" - :readonly="true" + :readonly="!!ap_iniziale" v-model="signup.aportador_solidario" rounded outlined @@ -181,7 +181,7 @@ maxlength="30" debounce="1000" :error-message="tools.errorMsg('name', v$.name)" - :label="$t('reg.name')" + :label="$t('reg.name_opt')" >