From fab0dbbb72a34a0462387bd123b47d5361e6b996 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Wed, 23 Nov 2022 23:57:21 +0100 Subject: [PATCH] ++ Animation fixed in Home pic. ++"Dark Mode" --- src/components/CImgPoster/CImgPoster.ts | 39 +-- src/components/CImgPoster/CImgPoster.vue | 41 +-- src/components/CMyEditElem/CMyEditElem.ts | 32 +- src/components/CMyEditElem/CMyEditElem.vue | 151 +++++---- src/components/CMyElem/CMyElem.vue | 51 ++- .../CSelectAnimation/CSelectAnimation.ts | 2 +- .../CSelectAnimation/CSelectAnimation.vue | 18 +- src/components/LandingFooter/LandingFooter.ts | 4 +- src/components/MyHeader/MyHeader.ts | 30 +- src/components/MyHeader/MyHeader.vue | 318 +++++++++++++----- src/css/app.scss | 148 ++++++++ src/model/GlobalStore.ts | 18 +- src/rootgen/admin/confsite/confsite.ts | 7 +- src/rootgen/admin/confsite/confsite.vue | 12 + src/store/Modules/fieldsTable.ts | 16 + src/store/Modules/tools.ts | 64 +++- src/store/globalStore.ts | 3 +- 17 files changed, 722 insertions(+), 232 deletions(-) diff --git a/src/components/CImgPoster/CImgPoster.ts b/src/components/CImgPoster/CImgPoster.ts index e8d58621..2dca34bd 100755 --- a/src/components/CImgPoster/CImgPoster.ts +++ b/src/components/CImgPoster/CImgPoster.ts @@ -2,7 +2,7 @@ import { defineComponent, PropType, ref } from 'vue' import { tools } from '@src/store/Modules/tools' import { shared_consts } from '@src/common/shared_vuejs' -import { IAnim } from '@src/model' +import { IAnim, IElemText } from '@src/model' export default defineComponent({ name: 'CImgPoster', @@ -27,40 +27,25 @@ export default defineComponent({ required: false, default: 0, }, - legendinside: { - type: String, + elemsText: { + type: Array, required: false, - default: '', + default: () => { + return [] + } }, - legend: { - type: String, - required: false, - default: '', - }, - classTitle: String, - classSubtitle: String, - colorTitle: String, - colorSubtitle: String, vertalign: Number, + anim: { type: Object as PropType, + required: false, + default : () => { + return {name: '', clduration: '', cldelay: '', timingtype: 'ease-in-out'} + }, + }, speed: { type: Number, required: false, default: 1 }, - anim: { - type: Object as PropType, - required: false, - default: () => { - return { name: '', clduration: '', cldelay: '' } - }, - }, - anim2: { - type: Object as PropType, - required: false, - default: () => { - return { name: '', clduration: '', cldelay: '' } - }, - }, logo: String, logoheight: String, logowidth: String, diff --git a/src/components/CImgPoster/CImgPoster.vue b/src/components/CImgPoster/CImgPoster.vue index 73e21474..01a6ec03 100755 --- a/src/components/CImgPoster/CImgPoster.vue +++ b/src/components/CImgPoster/CImgPoster.vue @@ -1,10 +1,16 @@ diff --git a/src/components/CMyEditElem/CMyEditElem.ts b/src/components/CMyEditElem/CMyEditElem.ts index b39c1ee0..df673b6d 100755 --- a/src/components/CMyEditElem/CMyEditElem.ts +++ b/src/components/CMyEditElem/CMyEditElem.ts @@ -2,7 +2,7 @@ import { defineComponent, onMounted, PropType, ref, toRef, watch, } from 'vue' -import { IImgGallery, ILabelValue, IMyCard, IMyElem, IMyPage, IOperators } from '@src/model' +import { IElemText, IImgGallery, ILabelValue, IMyCard, IMyElem, IMyPage, IOperators } from '@src/model' import { useGlobalStore } from '@store/globalStore' import { CImgTitle } from '@/components/CImgTitle' @@ -74,6 +74,7 @@ export default defineComponent({ const slide = ref(0) const slide2 = ref(0) const tabCard = ref('card0') + const tabElemsText = ref('elem0') const arrPages = ref([] as any[]) const disableSave = ref(true) const enableEdit = ref(true) @@ -202,6 +203,14 @@ export default defineComponent({ modifElem() } + function addNewElemText() { + if (!myel.value.elemsText) + myel.value.elemsText = [] + + myel.value.elemsText.push({ _id: objectId(), text: '', color: '#ffffff', class: '', size: '', anim: { name: 'FadeIn', clduration: '', cldelay: '', timingtype: 'ease-in-out'} }) + modifElem() + } + function getClass() { let mycl = '' if (props.myelem.align === shared_consts.ALIGNTYPE.CEHTER) { @@ -222,10 +231,15 @@ export default defineComponent({ return false } - function delRecCard(idcard: string, myel: IMyElem) { + function delRecCard(id: string, myel: IMyElem) { // - if (myel.listcards) - myel.listcards = myel.listcards.filter((card: IMyCard) => card._id !== idcard) + if (props.myelem.type === shared_consts.ELEMTYPE.CARD) { + if (myel.listcards) + myel.listcards = myel.listcards.filter((card: IMyCard) => card._id !== id) + } else if (props.myelem.type === shared_consts.ELEMTYPE.IMGPOSTER) { + if (myel.elemsText) + myel.elemsText = myel.elemsText.filter((rec: IElemText) => rec._id !== id) + } } @@ -238,6 +252,14 @@ export default defineComponent({ } }) } + } else if (props.myelem.type === shared_consts.ELEMTYPE.IMGPOSTER) { + if (props.myelem.elemsText) { + props.myelem.elemsText.forEach((rec: IElemText) => { + if (recpass._id === rec._id) { + rec.text = myval + } + }) + } } else if ((props.myelem.type === shared_consts.ELEMTYPE.IMGTITLE) || (props.myelem.type === shared_consts.ELEMTYPE.IMAGE)) { myel.value.image = myval @@ -290,6 +312,7 @@ export default defineComponent({ dupElem, enableEdit, addNewCard, + addNewElemText, arrPages, costanti, delRecCard, @@ -297,6 +320,7 @@ export default defineComponent({ updateElem, showAnimation, tabCard, + tabElemsText, } }, diff --git a/src/components/CMyEditElem/CMyEditElem.vue b/src/components/CMyEditElem/CMyEditElem.vue index f7af662f..020d3eba 100755 --- a/src/components/CMyEditElem/CMyEditElem.vue +++ b/src/components/CMyEditElem/CMyEditElem.vue @@ -471,7 +471,7 @@ table="myelems" :id="myel._id" :rec="myel" - field="container3" + field="img" @update:model-value="modifElem" :canEdit="true" :canModify="true" @@ -499,65 +499,100 @@ - - - + + - - - - - - - - -
- - - - + + + + + +
+ + Elem {{ ind + 1 }} + + + + +
+ + + + +
+ + + + + + +
+
+
diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue index 13986878..be8b2061 100755 --- a/src/components/CMyElem/CMyElem.vue +++ b/src/components/CMyElem/CMyElem.vue @@ -45,8 +45,8 @@ :class="tools.getClassAnim(myel.anim2)" :src="tools.getImgFileByElem(myel, rec)" /> -˛ -
+ +
{{ rec.alt }}
-
-
+ - - -
+
@@ -252,7 +245,9 @@ :class="myel.class + (editOn ? ` clEdit` : ``) + getClass()" @click="clickOnElem" > -
Pagina: {{ myel.container }}
+
+ Pagina: {{ myel.container }} +
diff --git a/src/components/CSelectAnimation/CSelectAnimation.ts b/src/components/CSelectAnimation/CSelectAnimation.ts index d690714f..628174d2 100755 --- a/src/components/CSelectAnimation/CSelectAnimation.ts +++ b/src/components/CSelectAnimation/CSelectAnimation.ts @@ -13,7 +13,7 @@ export default defineComponent({ type: Object as PropType, required: false, default : () => { - return {name: '', clduration: '', cldelay: ''} + return {name: '', clduration: '', cldelay: '', timingtype: 'ease-in-out'} } }, label: { diff --git a/src/components/CSelectAnimation/CSelectAnimation.vue b/src/components/CSelectAnimation/CSelectAnimation.vue index 9707d4d9..14f1459b 100755 --- a/src/components/CSelectAnimation/CSelectAnimation.vue +++ b/src/components/CSelectAnimation/CSelectAnimation.vue @@ -1,9 +1,10 @@