diff --git a/.env.development b/.env.development index 7828fb02..209ff209 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.71" +APP_VERSION="0.5.73" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 82168c27..5a7c847b 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.71" +APP_VERSION="0.5.73" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index 95d9de54..77d9b0b0 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="0.5.71" +APP_VERSION="0.5.73" 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 7828fb02..209ff209 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.71" +APP_VERSION="0.5.73" 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 42135f7f..be8c9880 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.71" +APP_VERSION="0.5.73" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index f53dfe18..10de50ba 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.71" +APP_VERSION="0.5.73" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 2831907f..4e4cdf2c 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -55,6 +55,7 @@ export const shared_consts = { REGISTRATION: 258, BTN_LOGIN: 260, FOOTER: 270, + PROFILETUTORIAL: 280, }, QUERYTYPE_MYGROUP: 1, @@ -1307,6 +1308,10 @@ export const shared_consts = { value: 140, label: 'Dashboard', }, + { + value: 280, + label: 'Tutorial', + }, ], TypesElemAdminTools: [ diff --git a/src/components/CMyElem/CMyElem.ts b/src/components/CMyElem/CMyElem.ts index 6da3dbe6..b7d40a72 100755 --- a/src/components/CMyElem/CMyElem.ts +++ b/src/components/CMyElem/CMyElem.ts @@ -22,6 +22,7 @@ import { CMyEditor } from '@src/components/CMyEditor' import { CMyFieldRec } from '@src/components/CMyFieldRec' import { CSelectColor } from '@src/components/CSelectColor' import { CMainView } from '@src/components/CMainView' +import { CMyProfileTutorial } from '@src/components/CMyProfileTutorial' import { CDashboard } from '@src/components/CDashboard' import { CCheckAppRunning } from '@src/components/CCheckAppRunning' import { CStatusReg } from '@src/components/CStatusReg' @@ -48,6 +49,7 @@ export default defineComponent({ CSelectColor, CSelectFontSize, CImgPoster, CCheckIfIsLogged, CStatusReg, CDashboard, CMainView, CNotifAtTop, CPresentazione, CMyActivities, + CMyProfileTutorial, CTitleBanner, CShareSocial, CCheckAppRunning, CRegistration, }, emits: ['selElemClick'], diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue index 91f32685..a3ee77e0 100755 --- a/src/components/CMyElem/CMyElem.vue +++ b/src/components/CMyElem/CMyElem.vue @@ -435,6 +435,10 @@
CMainView
+
+
CMyProFileTutorual
+ +
CheckAppRunning
diff --git a/src/components/CMyProfileTutorial/CMyProfileTutorial.scss b/src/components/CMyProfileTutorial/CMyProfileTutorial.scss new file mode 100755 index 00000000..b892863a --- /dev/null +++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.scss @@ -0,0 +1,4 @@ +.myflex{ + display: flex; + flex: 1; +} diff --git a/src/components/CMyProfileTutorial/CMyProfileTutorial.ts b/src/components/CMyProfileTutorial/CMyProfileTutorial.ts new file mode 100755 index 00000000..58c9bf4c --- /dev/null +++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.ts @@ -0,0 +1,120 @@ +import { defineComponent, onMounted, PropType, ref, watch, computed } from 'vue' +import { useUserStore } from '@store/UserStore' +import { ICircuit, IImgGallery, IUserFields, IUserProfile } from 'model' +import { costanti } from '@costanti' +import { shared_consts } from '@/common/shared_vuejs' +import { tools } from '@store/Modules/tools' +import { useQuasar } from 'quasar' +import { CSendCoins } from '@/components/CSendCoins' +import { CMyFieldRec } from '@/components/CMyFieldRec' +import { CSaldo } from '@/components/CSaldo' +import { CMySelectCity } from '@/components/CMySelectCity' +import { CMySelect } from '@/components/CMySelect' +import { CUserInfoAccount } from '@/components/CUserInfoAccount' +import { useI18n } from '@/boot/i18n' +import { useRoute, useRouter } from 'vue-router' +import { useCircuitStore } from '@store/CircuitStore' + +export default defineComponent({ + name: 'CMyProfileTutorial', + components: { CSendCoins, CSaldo, CUserInfoAccount, + CMySelectCity, CMyFieldRec, CMySelect }, + emits: ['setCmd'], + props: { + mycontact: { + type: Object as PropType, + required: false, + default: null, + }, + myusername: { + type: String, + required: false, + default: null, + }, + }, + + setup(props, { emit }) { + + const userStore = useUserStore() + const circuitStore = useCircuitStore() + const $q = useQuasar() + const { t } = useI18n() + const $router = useRouter() + const $route = useRoute() + + const showAccountInfo = ref(false) + const slide = ref('1') + + const username = ref('') + const showsendCoinTo = ref(false) + + const contact = ref(null) + const circuit = ref(null) + + watch(() => props.mycontact, (newval, oldval) => { + console.log('watch: mycontact') + mounted() + }) + + function mounted() { + if (!props.mycontact) { + if (props.myusername) { + username.value = props.myusername + //++Todo: carica contact + contact.value = null + } else { + contact.value = userStore.my + } + } else { + if (props.mycontact) { + contact.value = props.mycontact + username.value = props.mycontact.username + } + } + + // circuit.value = circuitStore.getCircuitByName(props.circuitname) + } + + function getImgUser(profile: IUserFields) { + return userStore.getImgByProfile(profile) + } + + function naviga(path: string) { + $router.push(path) + } + + function setCmd($q: any, cmd: number, myusername: string, value: any, dest: string) { + emit('setCmd', $q, cmd, myusername, value, dest) + } + + const checkifDisabled = computed(() => { + let ret = true + if (slide.value === '1') { + // Invitante + Email + } else if (slide.value === '2') { + // Username + } else if (slide.value === '3') { + // Password + } + + return ret + }) + + onMounted(mounted) + + return { + contact, + costanti, + checkifDisabled, + getImgUser, + naviga, + setCmd, + shared_consts, + tools, + showsendCoinTo, + circuit, + showAccountInfo, + slide, + } + }, +}) diff --git a/src/components/CMyProfileTutorial/CMyProfileTutorial.vue b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue new file mode 100755 index 00000000..0997da52 --- /dev/null +++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/src/components/CMyProfileTutorial/index.ts b/src/components/CMyProfileTutorial/index.ts new file mode 100755 index 00000000..69800ba8 --- /dev/null +++ b/src/components/CMyProfileTutorial/index.ts @@ -0,0 +1 @@ +export { default as CMyProfileTutorial } from './CMyProfileTutorial.vue' diff --git a/src/components/CMySelect/CMySelect.vue b/src/components/CMySelect/CMySelect.vue index 81988a06..406307ff 100755 --- a/src/components/CMySelect/CMySelect.vue +++ b/src/components/CMySelect/CMySelect.vue @@ -25,8 +25,8 @@ :options="valori" :option-value="optval" options-selected-class="text-deep-blue" - class="combowidth" - style="min-width: 250px" + :class="myclass ? myclass : 'combowidth'" + style="min-width: 250px !important" >