diff --git a/.env.development b/.env.development index b9e9f538..b7ec499f 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.42" +APP_VERSION="0.5.44" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index cb055412..aa3c1323 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.42" +APP_VERSION="0.5.44" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index b9e9f538..b7ec499f 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.42" +APP_VERSION="0.5.44" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index 5586c01a..be4c2a40 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.42" +APP_VERSION="0.5.44" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/package.json b/_ALL_SITES/riso.app/package.json index 8a2ec368..80058814 100755 --- a/_ALL_SITES/riso.app/package.json +++ b/_ALL_SITES/riso.app/package.json @@ -122,15 +122,15 @@ "crypto": false }, "browserslist": [ - "last 30 Chrome versions", - "last 30 Firefox versions", + "last 20 Chrome versions", + "last 20 Firefox versions", "last 4 Edge 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" + "last 20 Safari versions", + "last 20 Android versions", + "last 20 ChromeAndroid versions", + "last 20 FirefoxAndroid versions", + "last 10 iOS versions", + "last 8 Opera versions" ], "engines": { "node": ">= 16.14.0", diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index ac270570..e283501b 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.42" +APP_VERSION="0.5.44" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/package.json b/package.json index 8a2ec368..bc87fc54 100755 --- a/package.json +++ b/package.json @@ -22,9 +22,9 @@ "generate-sw": "workbox generateSW workbox-config.js" }, "dependencies": { - "@quasar/extras": "^1.15.6", + "@quasar/extras": "^1.15.8", "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.13", - "@vue-leaflet/vue-leaflet": "^0.6.1", + "@vue-leaflet/vue-leaflet": "^0.7.0", "@vue/compat": "^3.2.45", "@vue/compiler-sfc": "^3.2.45", "@vue/eslint-config-standard": "7.0.0", @@ -33,29 +33,29 @@ "acorn": "^8.8.1", "animate.css": "^4.1.1", "autoprefixer": "^10.4.13", - "axios": "^1.2.0", + "axios": "^1.2.1", "bcryptjs": "^2.4.3", - "chart.js": "^3.9.1", + "chart.js": "3.9.1", "core-js": "^3.26.1", "crypto": "^1.0.1", "date-fns": "^2.29.3", "dotenv": "^16.0.3", - "echarts": "^5.3.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.3", - "jquery": "^3.6.1", + "jquery": "^3.6.2", "js-cookie": "^3.0.1", "localforage": "^1.10.0", "lodash": "^4.17.21", "normalize.css": "^8.0.1", - "npm": "^9.1.2", + "npm": "^9.2.0", "nprogress": "^0.2.0", - "pinia": "^2.0.27", + "pinia": "^2.0.28", "prerender-spa-plugin": "^3.4.0", - "quasar": "^2.10.2", + "quasar": "^2.11.0", "quasar-extras": "^2.0.9", "register-service-worker": "^1.7.2", "vee-validate": "^4.7.3", @@ -63,7 +63,7 @@ "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-echarts": "^6.3.1", "vue-i18n": "^9.2.2", "vue-idb": "^0.2.0", "vue-loader": "^17.0.1", @@ -81,15 +81,15 @@ "@types/bcryptjs": "^2.4.2", "@types/dotenv": "^8.2.0", "@types/googlemaps": "^3.43.3", - "@types/jest": "^29.2.3", + "@types/jest": "^29.2.4", "@types/js-cookie": "^3.0.2", - "@types/node": "18.11.9", + "@types/node": "18.11.16", "@types/nprogress": "^0.2.0", "@types/vue-tel-input": "^2.1.2", "@types/vuelidate": "^0.7.15", - "@typescript-eslint/eslint-plugin": "^5.45.0", - "@typescript-eslint/parser": "^5.45.0", - "eslint": "^8.28.0", + "@typescript-eslint/eslint-plugin": "^5.46.1", + "@typescript-eslint/parser": "^5.46.1", + "eslint": "^8.30.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-node": "^11.1.0", @@ -101,18 +101,18 @@ "jest": "^29.3.1", "json-loader": "^0.5.7", "node-sass": "7.0.1", - "npm-check-updates": "^16.4.3", + "npm-check-updates": "^16.6.0", "optimize-css-assets-webpack-plugin": "^6.0.1", - "postcss": "^8.4.19", + "postcss": "^8.4.20", "postcss-loader": "^7.0.2", "sass-loader": "^13.2.0", "strip-ansi": "=7.0.1", "ts-jest": "^29.0.3", - "ts-loader": "^9.4.1", + "ts-loader": "^9.4.2", "tslint": "^6.1.3", "tslint-config-standard": "^9.0.0", "tslint-loader": "^3.5.4", - "typescript": "^4.9.3", + "typescript": "^4.9.4", "vue-cli-plugin-element-ui": "^1.1.4", "vueify": "^9.4.1", "webpack": "^5.75.0", diff --git a/src/components/CSignIn/CSignIn.ts b/src/components/CSignIn/CSignIn.ts index c558b2ca..143a5bd7 100755 --- a/src/components/CSignIn/CSignIn.ts +++ b/src/components/CSignIn/CSignIn.ts @@ -40,6 +40,8 @@ export default defineComponent({ const myForm = ref(null) + const typePassword = ref('password') + const iswaitingforRes = ref(false) const signin = ref({ username: process.env.TEST_USERNAME || '', @@ -144,6 +146,11 @@ export default defineComponent({ // console.log(' END submit') } + function showPassword() { + // + typePassword.value = typePassword.value === 'password' ? 'text' : 'password' + } + created() return { @@ -155,6 +162,8 @@ export default defineComponent({ getlinkforgetpwd, myForm, site, + showPassword, + typePassword, } }, }) diff --git a/src/components/CSignIn/CSignIn.vue b/src/components/CSignIn/CSignIn.vue index 8fd9d320..ee6a233c 100755 --- a/src/components/CSignIn/CSignIn.vue +++ b/src/components/CSignIn/CSignIn.vue @@ -7,77 +7,112 @@ - +
- - + (val) => !!val || $t('reg.err.required'), + (val) => + val.length >= 6 || + $t('reg.err.atleast') + ' 6 ' + $t('reg.err.char'), + ]" + > - - - @@ -118,6 +118,11 @@ v-model="signup.aportador_solidario" rounded outlined + @keyup.enter=" + v$.aportador_solidario.$touch && !v$.aportador_solidario.$error + ? $refs.inputEmail.focus() + : null + " @blur="v$.aportador_solidario.$touch" :error="v$.aportador_solidario.$error" :error-message=" @@ -134,7 +139,7 @@ -
+
@@ -199,6 +212,7 @@ @@ -226,6 +243,9 @@ @blur="v$.password.$touch" :error="v$.password.$error" :error-message="`${tools.errorMsg('password', v$.password)}`" + @keyup.enter=" + !v$.password.$error ? $refs.inputPassword2.focus() : null + " maxlength="30" debounce="1000" :label="$t('reg.password_reg')" @@ -260,6 +280,9 @@ 'repeatpassword', v$.repeatPassword )}`" + v-on:keyup.enter=" + !checkifDisabled ? $refs.carousel.next() : null + " :label="$t('reg.repeatPassword')" >