diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index 40824226..53c5f5db 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -26,3 +26,4 @@ TELEGRAM_SUPPORT="" PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" TEST_CELL="" ISTEST=1 +BAK_MONGODB_HOST="http://192.168.0.200:3000" diff --git a/_ALL_SITES/insiemesipuo.app/db/i18n_website.js b/_ALL_SITES/insiemesipuo.app/db/i18n_website.js index ae7d4c5d..ed005866 100755 --- a/_ALL_SITES/insiemesipuo.app/db/i18n_website.js +++ b/_ALL_SITES/insiemesipuo.app/db/i18n_website.js @@ -6,6 +6,7 @@ const msg_website = { SignIn: 'Login', vreg: 'Verifica Reg', Test: 'Test', + TestLocal: 'TestLocal', Category: 'Categorie', Todo: 'Todo', personal: 'Personale', diff --git a/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js b/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js index bc789990..363971a7 100755 --- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js +++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js @@ -25,6 +25,7 @@ const msg_website_it = { profile: 'Profilo', profile2: 'ProfiloU', mypage2: 'mypage2', + mywork2: 'mywork2', test: 'Test', projects: 'Progetti', report: 'Report Ore', diff --git a/_ALL_SITES/insiemesipuo.app/db/static_data.ts b/_ALL_SITES/insiemesipuo.app/db/static_data.ts index 6bc7d572..8b1e5ecd 100755 --- a/_ALL_SITES/insiemesipuo.app/db/static_data.ts +++ b/_ALL_SITES/insiemesipuo.app/db/static_data.ts @@ -380,21 +380,21 @@ const baseroutes: IListRoutes[] = [ infooter: true, }, { - active: true, + active: false, order: 100, path: '/bacheca', materialIcon: 'fas fa-bullhorn', name: 'mypages.bacheca', component: () => import('@/root/bacheca/bacheca.vue'), meta: { requiresAuth: true }, - inmenu: true, - infooter: true, + inmenu: false, + infooter: false, }, { active: true, order: 12, path: '/goods', - materialIcon: 'fas fa-briefcase', + materialIcon: 'fas fa-tshirt', name: 'mypages.goods', component: () => import('@/root/goods/goods.vue'), meta: { requiresAuth: true }, @@ -405,7 +405,7 @@ const baseroutes: IListRoutes[] = [ active: true, order: 15, path: '/services', - materialIcon: 'fas fa-briefcase', + materialIcon: 'fas fa-house-user', name: 'mypages.services', component: () => import('@/root/services/services.vue'), meta: { requiresAuth: true }, @@ -518,6 +518,16 @@ const baseroutes: IListRoutes[] = [ materialIcon: 'fas fa-test', name: 'mypages.test', component: () => import('@/views/testServer/testServer.vue'), + inmenu: true, + 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, diff --git a/_ALL_SITES/insiemesipuo.app/package.json b/_ALL_SITES/insiemesipuo.app/package.json index 1eee1a02..a3da4aee 100755 --- a/_ALL_SITES/insiemesipuo.app/package.json +++ b/_ALL_SITES/insiemesipuo.app/package.json @@ -23,51 +23,51 @@ "dependencies": { "axios": "0.21.4", "@vue/eslint-config-standard": "5.1.2", - "@quasar/extras": "^1.12.2", + "@quasar/extras": "^1.12.5", "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.11", - "@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", + "@vue/compat": "^3.2.31", + "@vue/compiler-sfc": "^3.2.31", + "@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.21.0", "crypto": "^1.0.1", - "date-fns": "^2.27.0", + "date-fns": "^2.28.0", "dotenv": "^10.0.0", - "echarts": "^5.2.2", - "eslint-plugin-quasar": "^1.0.0", + "echarts": "^5.3.0", + "eslint-plugin-quasar": "^1.1.0", "eslint-plugin-standard": "^5.0.0", - "graphql": "^16.1.0", + "graphql": "^16.3.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", "lodash": "^4.17.21", "normalize.css": "^8.0.1", - "npm": "^8.3.0", + "npm": "^8.5.1", "nprogress": "^0.2.0", - "pinia": "^2.0.6", + "pinia": "^2.0.11", "prerender-spa-plugin": "^3.4.0", - "quasar": "^2.3.4", + "quasar": "^2.5.5", "quasar-extras": "^2.0.9", "register-service-worker": "^1.7.2", - "vee-validate": "^4.4.10", - "vue": "^3.2.26", + "vee-validate": "^4.5.8", + "vue": "^3.2.31", "vue-class-component": "^8.0.0-rc.1", - "vue-country-code": "^1.1.2", - "vue-echarts": "^6.0.0", + "vue-country-code": "^1.1.3", + "vue-echarts": "^6.0.2", "vue-i18n": "^9.2.0-beta.26", "vue-idb": "^0.2.0", - "vue-loader": "^16.5.0", + "vue-loader": "^17.0.0", "vue-property-decorator": "^10.0.0-rc.3", - "vue-router": "^4.0.11", + "vue-router": "^4.0.12", "vue-scroll-reveal": "^1.0.11", "vue-svgicon": "^4.0.0-alpha.3", "vue2-dragula": "^2.5.5", - "vuex": "^4.0.1", + "vuex": "^4.0.2", "vuex-router-sync": "^6.0.0-rc.1" }, "devDependencies": { @@ -78,32 +78,32 @@ "@types/bcryptjs": "^2.4.2", "@types/dotenv": "^8.2.0", "@types/googlemaps": "^3.43.3", - "@types/jest": "^27.0.3", + "@types/jest": "^27.4.0", "@types/js-cookie": "^3.0.1", - "@types/node": "17.0.0", + "@types/node": "17.0.19", "@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.12.0", + "@typescript-eslint/parser": "^5.12.0", + "eslint": "^8.9.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-promise": "^6.0.0", + "eslint-plugin-vue": "^8.4.1", "file-loader": "^6.2.0", "html-webpack-plugin": "^5.5.0", - "http-proxy-middleware": "^2.0.1", - "jest": "^27.4.5", + "http-proxy-middleware": "^2.0.3", + "jest": "^27.5.1", "json-loader": "^0.5.7", - "npm-check-updates": "^12.0.5", + "npm-check-updates": "^12.4.0", "optimize-css-assets-webpack-plugin": "^6.0.1", - "postcss": "^8.4.5", + "postcss": "^8.4.6", "postcss-loader": "^6.2.1", - "sass-loader": "^12.4.0", + "sass-loader": "^12.6.0", "strip-ansi": "=7.0.1", - "ts-jest": "^27.1.1", + "ts-jest": "^27.1.3", "ts-loader": "^9.2.6", "tslint": "^6.1.3", "tslint-config-standard": "^9.0.0", diff --git a/src/App.ts b/src/App.ts index a04f1f31..379a6d73 100755 --- a/src/App.ts +++ b/src/App.ts @@ -75,6 +75,9 @@ export default { .then((loadstorage: any) => { if (loadstorage) { + if ($q.screen.gt.xs) { + globalStore.setleftDrawerOpen(true) + } /*if (toolsext.getLocale() !== '') { // console.log('SETLOCALE :', this.$i18n.locale) diff --git a/src/components/CSignIn/CSignIn.ts b/src/components/CSignIn/CSignIn.ts index 980a6485..64af1f74 100755 --- a/src/components/CSignIn/CSignIn.ts +++ b/src/components/CSignIn/CSignIn.ts @@ -97,8 +97,14 @@ export default defineComponent({ userStore.signin($router, signin.value) .then((riscode: number) => { + if ($q.screen.lt.sm) { + globalStore.setleftDrawerOpen(false) + } console.log('signin FINITO CALL: riscode=', riscode) if (riscode === tools.OK) { + if (userStore.isLogged) { + globalStore.rightDrawerOpen = false + } // router.push('/signin') } return riscode diff --git a/src/root/bacheca/bacheca.ts b/src/root/bacheca/bacheca.ts index 8fa8408e..edfdf71f 100755 --- a/src/root/bacheca/bacheca.ts +++ b/src/root/bacheca/bacheca.ts @@ -34,10 +34,6 @@ export default defineComponent({ return userStore.my.profile.teleg_checkcode } - function openrighttoolbar() { - globalStore.rightDrawerOpen = true - } - function isLogged() { return userStore.isLogged } @@ -62,7 +58,6 @@ export default defineComponent({ TelegCode, TelegVerificato, isLogged, - openrighttoolbar, isUserOk, getLinkBotTelegram, } diff --git a/src/root/mobility/mobility.ts b/src/root/mobility/mobility.ts index 0d44d6bd..fb2caab8 100755 --- a/src/root/mobility/mobility.ts +++ b/src/root/mobility/mobility.ts @@ -32,10 +32,6 @@ export default defineComponent({ return userStore.my.profile.teleg_checkcode } - function openrighttoolbar() { - globalStore.rightDrawerOpen = true - } - function isLogged() { return userStore.isLogged } @@ -58,7 +54,6 @@ export default defineComponent({ TelegCode, TelegVerificato, isLogged, - openrighttoolbar, isUserOk, getLinkBotTelegram, } diff --git a/src/root/scuola/scuola.ts b/src/root/scuola/scuola.ts index 8aae7949..cbbb49ca 100755 --- a/src/root/scuola/scuola.ts +++ b/src/root/scuola/scuola.ts @@ -32,10 +32,6 @@ export default defineComponent({ return userStore.my.profile.teleg_checkcode } - function openrighttoolbar() { - globalStore.rightDrawerOpen = true - } - function isLogged() { return userStore.isLogged } @@ -58,7 +54,6 @@ export default defineComponent({ TelegCode, TelegVerificato, isLogged, - openrighttoolbar, isUserOk, getLinkBotTelegram, } diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts index 3fb166f5..91f463ac 100755 --- a/src/store/UserStore.ts +++ b/src/store/UserStore.ts @@ -805,6 +805,7 @@ export const useUserStore = defineStore('UserStore', { globalStore.checkUpdates() } + const isok = await globalStore.loadAfterLogin() this.isLogged = isok && isLogged diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts index a70606fb..9665b43c 100644 --- a/src/store/globalStore.ts +++ b/src/store/globalStore.ts @@ -63,7 +63,7 @@ export const useGlobalStore = defineStore('GlobalStore', { layoutNeeded: true, mobileMode: false, menuCollapse: true, - leftDrawerOpen: true, + leftDrawerOpen: false, rightDrawerOpen: false, rightCartOpen: false, stateConnection: stateConnDefault,