Al load, compare la barra di sinistra aperta ! (non deve farlo su cell)

Quando ti sei loggato la prima volta, devo chiudere la barra a destra, cosi si vedrà la HOME principale.
This commit is contained in:
paoloar77
2022-02-22 15:57:48 +01:00
parent f717702d67
commit 7b3a5a2ba8
12 changed files with 66 additions and 58 deletions

View File

@@ -26,3 +26,4 @@ TELEGRAM_SUPPORT=""
PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
TEST_CELL="" TEST_CELL=""
ISTEST=1 ISTEST=1
BAK_MONGODB_HOST="http://192.168.0.200:3000"

View File

@@ -6,6 +6,7 @@ const msg_website = {
SignIn: 'Login', SignIn: 'Login',
vreg: 'Verifica Reg', vreg: 'Verifica Reg',
Test: 'Test', Test: 'Test',
TestLocal: 'TestLocal',
Category: 'Categorie', Category: 'Categorie',
Todo: 'Todo', Todo: 'Todo',
personal: 'Personale', personal: 'Personale',

View File

@@ -25,6 +25,7 @@ const msg_website_it = {
profile: 'Profilo', profile: 'Profilo',
profile2: 'ProfiloU', profile2: 'ProfiloU',
mypage2: 'mypage2', mypage2: 'mypage2',
mywork2: 'mywork2',
test: 'Test', test: 'Test',
projects: 'Progetti', projects: 'Progetti',
report: 'Report Ore', report: 'Report Ore',

View File

@@ -380,21 +380,21 @@ const baseroutes: IListRoutes[] = [
infooter: true, infooter: true,
}, },
{ {
active: true, active: false,
order: 100, order: 100,
path: '/bacheca', path: '/bacheca',
materialIcon: 'fas fa-bullhorn', materialIcon: 'fas fa-bullhorn',
name: 'mypages.bacheca', name: 'mypages.bacheca',
component: () => import('@/root/bacheca/bacheca.vue'), component: () => import('@/root/bacheca/bacheca.vue'),
meta: { requiresAuth: true }, meta: { requiresAuth: true },
inmenu: true, inmenu: false,
infooter: true, infooter: false,
}, },
{ {
active: true, active: true,
order: 12, order: 12,
path: '/goods', path: '/goods',
materialIcon: 'fas fa-briefcase', materialIcon: 'fas fa-tshirt',
name: 'mypages.goods', name: 'mypages.goods',
component: () => import('@/root/goods/goods.vue'), component: () => import('@/root/goods/goods.vue'),
meta: { requiresAuth: true }, meta: { requiresAuth: true },
@@ -405,7 +405,7 @@ const baseroutes: IListRoutes[] = [
active: true, active: true,
order: 15, order: 15,
path: '/services', path: '/services',
materialIcon: 'fas fa-briefcase', materialIcon: 'fas fa-house-user',
name: 'mypages.services', name: 'mypages.services',
component: () => import('@/root/services/services.vue'), component: () => import('@/root/services/services.vue'),
meta: { requiresAuth: true }, meta: { requiresAuth: true },
@@ -518,6 +518,16 @@ const baseroutes: IListRoutes[] = [
materialIcon: 'fas fa-test', materialIcon: 'fas fa-test',
name: 'mypages.test', name: 'mypages.test',
component: () => import('@/views/testServer/testServer.vue'), 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 }, meta: { requiresAuth: true },
inmenu: false, inmenu: false,
infooter: false, infooter: false,

View File

@@ -23,51 +23,51 @@
"dependencies": { "dependencies": {
"axios": "0.21.4", "axios": "0.21.4",
"@vue/eslint-config-standard": "5.1.2", "@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", "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.11",
"@vue/compat": "^3.2.26", "@vue/compat": "^3.2.31",
"@vue/compiler-sfc": "^3.2.26", "@vue/compiler-sfc": "^3.2.31",
"@vuelidate/core": "^2.0.0-alpha.32", "@vuelidate/core": "^2.0.0-alpha.34",
"@vuelidate/validators": "^2.0.0-alpha.25", "@vuelidate/validators": "^2.0.0-alpha.26",
"acorn": "^8.6.0", "acorn": "^8.7.0",
"autoprefixer": "^10.4.0", "autoprefixer": "^10.4.2",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"core-js": "^3.20.0", "core-js": "^3.21.0",
"crypto": "^1.0.1", "crypto": "^1.0.1",
"date-fns": "^2.27.0", "date-fns": "^2.28.0",
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
"echarts": "^5.2.2", "echarts": "^5.3.0",
"eslint-plugin-quasar": "^1.0.0", "eslint-plugin-quasar": "^1.1.0",
"eslint-plugin-standard": "^5.0.0", "eslint-plugin-standard": "^5.0.0",
"graphql": "^16.1.0", "graphql": "^16.3.0",
"graphql-tag": "^2.12.6", "graphql-tag": "^2.12.6",
"gsap": "^3.9.0", "gsap": "^3.9.1",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"js-cookie": "^3.0.1", "js-cookie": "^3.0.1",
"localforage": "^1.10.0", "localforage": "^1.10.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",
"npm": "^8.3.0", "npm": "^8.5.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"pinia": "^2.0.6", "pinia": "^2.0.11",
"prerender-spa-plugin": "^3.4.0", "prerender-spa-plugin": "^3.4.0",
"quasar": "^2.3.4", "quasar": "^2.5.5",
"quasar-extras": "^2.0.9", "quasar-extras": "^2.0.9",
"register-service-worker": "^1.7.2", "register-service-worker": "^1.7.2",
"vee-validate": "^4.4.10", "vee-validate": "^4.5.8",
"vue": "^3.2.26", "vue": "^3.2.31",
"vue-class-component": "^8.0.0-rc.1", "vue-class-component": "^8.0.0-rc.1",
"vue-country-code": "^1.1.2", "vue-country-code": "^1.1.3",
"vue-echarts": "^6.0.0", "vue-echarts": "^6.0.2",
"vue-i18n": "^9.2.0-beta.26", "vue-i18n": "^9.2.0-beta.26",
"vue-idb": "^0.2.0", "vue-idb": "^0.2.0",
"vue-loader": "^16.5.0", "vue-loader": "^17.0.0",
"vue-property-decorator": "^10.0.0-rc.3", "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-scroll-reveal": "^1.0.11",
"vue-svgicon": "^4.0.0-alpha.3", "vue-svgicon": "^4.0.0-alpha.3",
"vue2-dragula": "^2.5.5", "vue2-dragula": "^2.5.5",
"vuex": "^4.0.1", "vuex": "^4.0.2",
"vuex-router-sync": "^6.0.0-rc.1" "vuex-router-sync": "^6.0.0-rc.1"
}, },
"devDependencies": { "devDependencies": {
@@ -78,32 +78,32 @@
"@types/bcryptjs": "^2.4.2", "@types/bcryptjs": "^2.4.2",
"@types/dotenv": "^8.2.0", "@types/dotenv": "^8.2.0",
"@types/googlemaps": "^3.43.3", "@types/googlemaps": "^3.43.3",
"@types/jest": "^27.0.3", "@types/jest": "^27.4.0",
"@types/js-cookie": "^3.0.1", "@types/js-cookie": "^3.0.1",
"@types/node": "17.0.0", "@types/node": "17.0.19",
"@types/nprogress": "^0.2.0", "@types/nprogress": "^0.2.0",
"@types/vue-tel-input": "^2.1.2", "@types/vue-tel-input": "^2.1.2",
"@types/vuelidate": "^0.7.15", "@types/vuelidate": "^0.7.15",
"@typescript-eslint/eslint-plugin": "^5.7.0", "@typescript-eslint/eslint-plugin": "^5.12.0",
"@typescript-eslint/parser": "^5.7.0", "@typescript-eslint/parser": "^5.12.0",
"eslint": "^8.4.1", "eslint": "^8.9.0",
"eslint-config-prettier": "^8.3.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-node": "^11.1.0",
"eslint-plugin-promise": "^5.2.0", "eslint-plugin-promise": "^6.0.0",
"eslint-plugin-vue": "^8.2.0", "eslint-plugin-vue": "^8.4.1",
"file-loader": "^6.2.0", "file-loader": "^6.2.0",
"html-webpack-plugin": "^5.5.0", "html-webpack-plugin": "^5.5.0",
"http-proxy-middleware": "^2.0.1", "http-proxy-middleware": "^2.0.3",
"jest": "^27.4.5", "jest": "^27.5.1",
"json-loader": "^0.5.7", "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", "optimize-css-assets-webpack-plugin": "^6.0.1",
"postcss": "^8.4.5", "postcss": "^8.4.6",
"postcss-loader": "^6.2.1", "postcss-loader": "^6.2.1",
"sass-loader": "^12.4.0", "sass-loader": "^12.6.0",
"strip-ansi": "=7.0.1", "strip-ansi": "=7.0.1",
"ts-jest": "^27.1.1", "ts-jest": "^27.1.3",
"ts-loader": "^9.2.6", "ts-loader": "^9.2.6",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"tslint-config-standard": "^9.0.0", "tslint-config-standard": "^9.0.0",

View File

@@ -75,6 +75,9 @@ export default {
.then((loadstorage: any) => { .then((loadstorage: any) => {
if (loadstorage) { if (loadstorage) {
if ($q.screen.gt.xs) {
globalStore.setleftDrawerOpen(true)
}
/*if (toolsext.getLocale() !== '') { /*if (toolsext.getLocale() !== '') {
// console.log('SETLOCALE :', this.$i18n.locale) // console.log('SETLOCALE :', this.$i18n.locale)

View File

@@ -97,8 +97,14 @@ export default defineComponent({
userStore.signin($router, signin.value) userStore.signin($router, signin.value)
.then((riscode: number) => { .then((riscode: number) => {
if ($q.screen.lt.sm) {
globalStore.setleftDrawerOpen(false)
}
console.log('signin FINITO CALL: riscode=', riscode) console.log('signin FINITO CALL: riscode=', riscode)
if (riscode === tools.OK) { if (riscode === tools.OK) {
if (userStore.isLogged) {
globalStore.rightDrawerOpen = false
}
// router.push('/signin') // router.push('/signin')
} }
return riscode return riscode

View File

@@ -34,10 +34,6 @@ export default defineComponent({
return userStore.my.profile.teleg_checkcode return userStore.my.profile.teleg_checkcode
} }
function openrighttoolbar() {
globalStore.rightDrawerOpen = true
}
function isLogged() { function isLogged() {
return userStore.isLogged return userStore.isLogged
} }
@@ -62,7 +58,6 @@ export default defineComponent({
TelegCode, TelegCode,
TelegVerificato, TelegVerificato,
isLogged, isLogged,
openrighttoolbar,
isUserOk, isUserOk,
getLinkBotTelegram, getLinkBotTelegram,
} }

View File

@@ -32,10 +32,6 @@ export default defineComponent({
return userStore.my.profile.teleg_checkcode return userStore.my.profile.teleg_checkcode
} }
function openrighttoolbar() {
globalStore.rightDrawerOpen = true
}
function isLogged() { function isLogged() {
return userStore.isLogged return userStore.isLogged
} }
@@ -58,7 +54,6 @@ export default defineComponent({
TelegCode, TelegCode,
TelegVerificato, TelegVerificato,
isLogged, isLogged,
openrighttoolbar,
isUserOk, isUserOk,
getLinkBotTelegram, getLinkBotTelegram,
} }

View File

@@ -32,10 +32,6 @@ export default defineComponent({
return userStore.my.profile.teleg_checkcode return userStore.my.profile.teleg_checkcode
} }
function openrighttoolbar() {
globalStore.rightDrawerOpen = true
}
function isLogged() { function isLogged() {
return userStore.isLogged return userStore.isLogged
} }
@@ -58,7 +54,6 @@ export default defineComponent({
TelegCode, TelegCode,
TelegVerificato, TelegVerificato,
isLogged, isLogged,
openrighttoolbar,
isUserOk, isUserOk,
getLinkBotTelegram, getLinkBotTelegram,
} }

View File

@@ -805,6 +805,7 @@ export const useUserStore = defineStore('UserStore', {
globalStore.checkUpdates() globalStore.checkUpdates()
} }
const isok = await globalStore.loadAfterLogin() const isok = await globalStore.loadAfterLogin()
this.isLogged = isok && isLogged this.isLogged = isok && isLogged

View File

@@ -63,7 +63,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
layoutNeeded: true, layoutNeeded: true,
mobileMode: false, mobileMode: false,
menuCollapse: true, menuCollapse: true,
leftDrawerOpen: true, leftDrawerOpen: false,
rightDrawerOpen: false, rightDrawerOpen: false,
rightCartOpen: false, rightCartOpen: false,
stateConnection: stateConnDefault, stateConnection: stateConnDefault,