From 8d91ba5649385cfb8008c0975304ccd1fb316519 Mon Sep 17 00:00:00 2001 From: JesusPerez Date: Thu, 24 Mar 2022 12:54:08 +0000 Subject: [PATCH] chore: tracking info data fixes --- src/views/Home.vue | 41 ++++++++++++++++---------------- src/views/cv/InfoPanel.vue | 6 +++-- src/views/cv/InfoPanelMain.vue | 6 +++-- src/views/cv/InfoPanelSkills.vue | 7 ++++-- src/views/cv/Projects.vue | 10 ++++---- 5 files changed, 40 insertions(+), 30 deletions(-) diff --git a/src/views/Home.vue b/src/views/Home.vue index fb55ccf..2791586 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -352,29 +352,30 @@ const onView = (itm: string) => { useState().showinfo.value[itm] = !useState().showinfo.value[itm] } const onNavMenu = (item: { src: string, target: string }) => { + const lng = i18n.locale.value switch (item.src) { case 'locale': - track_action(null, { ref: 'locale',text: i18n.locale.value}) + track_action(null, { ref: 'locale',text: i18n.locale.value, lng},routeKy.toString()) refresh() break case 'infopanel': - track_action(null, { ref: 'onNavMenu',text: 'item.src'}) + track_action(null, { ref: 'onNavMenu',text: item.src, lng},routeKy.toString()) show_infopanel.value = !show_infopanel.value break case 'fixmenu': - track_action(null, { ref: 'onNavMenu',text: 'item.src'}) + track_action(null, { ref: 'onNavMenu',text: item.src, lng},routeKy.toString()) fixMenu.value = !fixMenu.value break case 'endinput': show_input.value = false break case 'select': - track_action(null, { ref: 'onNavMenu',text: 'item.src'}) + track_action(null, { ref: 'onNavMenu',text: item.src, lng},routeKy.toString()) message_type.value = MessageBoxType.Select openMessageBox.value = true break case 'save': - track_action(null, { ref: 'onNavMenu',text: 'item.src'}) + track_action(null, { ref: 'onNavMenu',text: item.src, lng},routeKy.toString()) input_placeholder.value = `${t('name', 'Name')} o 'data'` show_input.value = true message_type.value = MessageBoxType.Save @@ -382,20 +383,20 @@ const onNavMenu = (item: { src: string, target: string }) => { openMessageBox.value = true break case 'editable': - track_action(null, { ref: 'onNavMenu',text: 'item.src'}) + track_action(null, { ref: 'onNavMenu',text: item.src, lng},routeKy.toString()) useState().authinfo.value.editable = !useState().authinfo.value.editable const state = useState().authinfo.value.editable ? 'on' : 'off' const msgTyp = state === 'on' ? MessageType.Warning : MessageType.Info show_message(msgTyp, `${t('saveload.editMode','Edit Mode')} ${t('cv.'+state,'')}`) break case 'viewchange': - track_action(null, { ref: 'onNavMenu',text: 'item.src'}) + track_action(null, { ref: 'onNavMenu',text: item.src, lng},routeKy.toString()) useState().authinfo.value.viewchange = !useState().authinfo.value.viewchange break case 'goto': const dom_id = document.getElementById(item.target) if (dom_id) { - track_action(null, { ref: 'gotp',text: item.target}) + track_action(null, { ref: 'gotp',text: item.target, lng},routeKy.toString()) dom_id.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'nearest' }) setTimeout(() => window.scrollBy(0, -40), 4000) } @@ -424,13 +425,13 @@ const saveData = async(mode: string,val: string) => { if (mode == 'send' && url !== '') { onMessageBox({src: 'done', val: ''}) const res = await send_data(url, cv, true, true, () => { - track_action(null, { ref: 'saveData',text: `${url} -> ${val}`}) + track_action(null, { ref: 'saveData',text: `${url} -> ${val}`, lng: i18n.locale.value },routeKy.toString()) show_message(MessageType.Success, `${t('saveload.dataSaved','Data saved')}`,2000,() => { }) }) console.log(res) } else { - track_action(null, { ref: 'saveData',text: `local_json -> ${val}`}) + track_action(null, { ref: 'saveData',text: `local_json -> ${val}`, lng: i18n.locale.value },routeKy.toString()) show_message(MessageType.Warning, `${t('saveload.saveData','Save data')}`,2000,() => { data_url_encoded.value = `text/json;charset=utf-8,${encodeURIComponent(JSON.stringify(cv))}` }) @@ -477,16 +478,16 @@ const onHome = () => { dom_body.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'nearest' }) } } -const onSkills = () => { - show_info.value.skills = !show_info.value.skills - useState().showinfo.value.skills_itms = show_info.value.skills - // !useState().showinfo.value.skills_itms -} -const onSoftSkills = () => { - show_info.value.soft_skills = !show_info.value.soft_skills - useState().showinfo.value.soft_skills_itms = show_info.value.soft_skills - // !useState().showinfo.value.soft_skills_itms -} +// const onSkills = () => { +// show_info.value.skills = !show_info.value.skills +// useState().showinfo.value.skills_itms = show_info.value.skills +// // !useState().showinfo.value.skills_itms +// } +// const onSoftSkills = () => { +// show_info.value.soft_skills = !show_info.value.soft_skills +// useState().showinfo.value.soft_skills_itms = show_info.value.soft_skills +// // !useState().showinfo.value.soft_skills_itms +// } const onLoadModel = (model: { id: string}) => { const url = useState().CONFURLS.value.data || '' if (useState().models.value[model.id] && url.length > 0 ) { diff --git a/src/views/cv/InfoPanel.vue b/src/views/cv/InfoPanel.vue index bf185c7..f6fd76c 100644 --- a/src/views/cv/InfoPanel.vue +++ b/src/views/cv/InfoPanel.vue @@ -434,7 +434,8 @@ import useState from '~/hooks/useState' import { track_action } from '~/hooks/tracking' const emit = defineEmits(['onEditor', 'onItem']) const { t } = useI18n() -// const router = useRouter() +const i18n = useI18n() +const router = useRouter() const props = defineProps({ data: { type: Object as PropType, @@ -457,6 +458,7 @@ const props = defineProps({ required: true, }, }) +const routeKy = router.currentRoute.value.params.ky || router.currentRoute.value.query.k || '' const assets_path = useState().ASSETS_PATH.value const showinfo = ref(props.showinfo as ShowInfoType) const authinfo = computed(() => { @@ -513,6 +515,6 @@ const onSoftSkills = (data: { src: string, idx: number }) => { emit('onItem', { root: 'info', src: data.src, itm: props.data[data.src][data.idx], idx: data.idx }) } const onLink = (e: any) => { - track_action(e) + track_action(e,{ ref: 'infoPanel',text: e.target.href || '', lng: i18n.locale.value },routeKy.toString()) } \ No newline at end of file diff --git a/src/views/cv/InfoPanelMain.vue b/src/views/cv/InfoPanelMain.vue index 5855bd2..d63ef35 100644 --- a/src/views/cv/InfoPanelMain.vue +++ b/src/views/cv/InfoPanelMain.vue @@ -272,7 +272,8 @@ import useState from '~/hooks/useState' import { track_action } from '~/hooks/tracking' const emit = defineEmits(['onEditor', 'onItem']) const { t } = useI18n() -// const router = useRouter() +const i18n = useI18n() +const router = useRouter() const props = defineProps({ data: { type: Object as PropType, @@ -295,6 +296,7 @@ const props = defineProps({ required: true, }, }) +const routeKy = router.currentRoute.value.params.ky || router.currentRoute.value.query.k || '' const assets_path = useState().ASSETS_PATH.value const showinfo = ref(props.showinfo as ShowInfoType) const authinfo = computed(() => { @@ -343,6 +345,6 @@ const onItem = (src: string, idx: number) => { emit('onItem', { root: 'info', src, itm: props.data[src][idx], idx }) } const onLink = (e: any) => { - track_action(e) + track_action(e,{ ref: 'infoPanelMain',text: e.target.href || '', lng: i18n.locale.value },routeKy.toString()) } \ No newline at end of file diff --git a/src/views/cv/InfoPanelSkills.vue b/src/views/cv/InfoPanelSkills.vue index 7d06c96..2752320 100644 --- a/src/views/cv/InfoPanelSkills.vue +++ b/src/views/cv/InfoPanelSkills.vue @@ -171,7 +171,8 @@ import useState from '~/hooks/useState' import { track_action } from '~/hooks/tracking' const emit = defineEmits(['onEditor', 'onItem']) const { t } = useI18n() -// const router = useRouter() +const i18n = useI18n() +const router = useRouter() const props = defineProps({ data: { type: Object as PropType, @@ -194,6 +195,7 @@ const props = defineProps({ required: true, }, }) +const routeKy = router.currentRoute.value.params.ky || router.currentRoute.value.query.k || '' // const assets_path = useState().ASSETS_PATH.value const showinfo = ref(props.showinfo as ShowInfoType) const authinfo = computed(() => { @@ -222,6 +224,7 @@ const onSoftSkills = (data: { src: string, idx: number }) => { emit('onItem', { root: 'info', src: data.src, itm: props.data[data.src][data.idx], idx: data.idx }) } const onLink = (e: any) => { - track_action(e) + track_action(e,{ ref: 'infoPanelSkills',text: e.target.href || '', lng: i18n.locale.value },routeKy.toString()) } + \ No newline at end of file diff --git a/src/views/cv/Projects.vue b/src/views/cv/Projects.vue index 9dc8cc7..1c94004 100644 --- a/src/views/cv/Projects.vue +++ b/src/views/cv/Projects.vue @@ -1,5 +1,5 @@