diff --git a/public/images/riso_home_dark.png b/public/images/riso_home_dark.png new file mode 100644 index 00000000..f8572648 Binary files /dev/null and b/public/images/riso_home_dark.png differ diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index ecefa7f4..4b820561 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -7,7 +7,7 @@ export const shared_consts = { icon: 'fas fa-user-shield', color: 'red', }, - CHECK_SEE_VIDEO_PRINCIPI: { + CHECK_SEE_VIDEO_PRINCIPI: { value: 2, label: 'steps.video_intro', icon: 'fas fa-tools', @@ -15,6 +15,43 @@ export const shared_consts = { }, }, + ELEMTYPE: { + TITLE: 5, + MARGINI: 6, + CARD: 7, + IMGTITLE: 8, + IMGPOSTER: 9, + TEXT: 10, + HTML: 20, + IMAGE: 30, + IMAGEUPLOAD: 35, + SEPARATOR: 40, + VIDEO: 50, + PAGE: 55, + PAGEINTRO: 58, + GALLERY: 60, + CALENDAR: 70, + CAROUSEL_IDISCIPLINE: 80, + CAROUSEL_HOME: 85, + CHECK_EMAIL: 100, + CAROUSEL_IMGS: 110, + OPENSTREETMAP: 120, + MAINVIEW: 130, + DASHBOARD: 140, + STATUSREG: 160, + CHECKIFISLOGGED: 170, + INFO_VERSION: 180, + BOTT_CONDIVIDI: 190, + PRESENTAZIONE: 200, + NOTIFATTOP: 210, + CHART: 220, + CHECKNEWVERSION: 230, + CHECKTESTENV: 240, + BTN_REG: 250, + BTN_REG_BYBOT: 255, + BTN_LOGIN: 260, + }, + QUERYTYPE_MYGROUP: 1, QUERYTYPE_REFUSED_USER_GRP: 2, ALL_SAW_AND_ACCEPTED: 3, @@ -1213,7 +1250,7 @@ export const shared_consts = { }, { value: 7, - label: 'Card', + label: 'Scheda', }, { value: 8, @@ -1283,6 +1320,58 @@ export const shared_consts = { value: 120, label: 'OpenStreetMap', }, + { + value: 130, + label: 'MainView', + }, + { + value: 140, + label: 'Dashboard', + }, + { + value: 160, + label: 'Stato Registrati', + }, + { + value: 180, + label: 'Info Versione', + }, + { + value: 190, + label: 'Bottone Condividi', + }, + { + value: 200, + label: 'Presentazione', + }, + { + value: 210, + label: 'Notifiche in Top', + }, + { + value: 220, + label: 'CHART', + }, + { + value: 230, + label: 'Check New Version', + }, + { + value: 240, + label: 'Check Test Version', + }, + { + value: 250, + label: 'Butt Registrati', + }, + { + value: 255, + label: 'Butt Registrati col Bot', + }, + { + value: 260, + label: 'Butt Login', + }, ], LISTBESTCOLORS: [ @@ -1340,29 +1429,6 @@ export const shared_consts = { }, ], - ELEMTYPE: { - TITLE: 5, - MARGINI: 6, - CARD: 7, - IMGTITLE: 8, - IMGPOSTER: 9, - TEXT: 10, - HTML: 20, - IMAGE: 30, - IMAGEUPLOAD: 35, - SEPARATOR: 40, - VIDEO: 50, - PAGE: 55, - PAGEINTRO: 58, - GALLERY: 60, - CALENDAR: 70, - CAROUSEL_IDISCIPLINE: 80, - CAROUSEL_HOME: 85, - CHECK_EMAIL: 100, - CAROUSEL_IMGS: 110, - OPENSTREETMAP: 120, - }, - ALIGNTYPE: { NONE: 0, LEFT: 1, diff --git a/src/components/CFundRaising/CFundRaising.ts b/src/components/CFundRaising/CFundRaising.ts index 87ee08be..441a1987 100755 --- a/src/components/CFundRaising/CFundRaising.ts +++ b/src/components/CFundRaising/CFundRaising.ts @@ -2,7 +2,8 @@ import { defineComponent, ref, computed, PropType, toRef, onMounted, onBeforeUnm import { useGlobalStore } from '@store/globalStore' import { useI18n } from '@/boot/i18n' import { tools } from '@store/Modules/tools' -import { LandingFooter, Logo } from '@components' +import { LandingFooter } from '@/components/LandingFooter' +import { Logo } from '@/components/logo' import { IMyPage } from 'model' diff --git a/src/components/CMyEditElem/CMyEditElem.ts b/src/components/CMyEditElem/CMyEditElem.ts index df673b6d..df2b826f 100755 --- a/src/components/CMyEditElem/CMyEditElem.ts +++ b/src/components/CMyEditElem/CMyEditElem.ts @@ -38,7 +38,7 @@ export default defineComponent({ CCardCarousel, COpenStreetMap, CMyPage, CMyPageIntro, CMyEditor, CMyFieldRec, CSelectColor, CSelectFontSize, CSelectImage, CImgPoster, CSelectAnimation }, - emits: ['saveElem'], + emits: ['saveElem', 'selElemClick'], props: { myelem: { type: Object as PropType, @@ -127,8 +127,9 @@ export default defineComponent({ newrec.class2 = 'row justify-center' } - globalStore.addNewElem($q, t, newrec) + + emit('selElemClick', newrec) } function dupElem(order?: number) { @@ -201,6 +202,8 @@ export default defineComponent({ myel.value.listcards.push({ _id: objectId(), imagefile: '', alt: '', description: '' }) modifElem() + + } function addNewElemText() { diff --git a/src/components/CMyEditElem/CMyEditElem.vue b/src/components/CMyEditElem/CMyEditElem.vue index 353e6ec3..4322be6f 100755 --- a/src/components/CMyEditElem/CMyEditElem.vue +++ b/src/components/CMyEditElem/CMyEditElem.vue @@ -8,7 +8,7 @@ " >
- + +
+
+
+
diff --git a/src/components/CMyPageElem/CMyPageElem.vue b/src/components/CMyPageElem/CMyPageElem.vue index 76a95f00..f43c320b 100755 --- a/src/components/CMyPageElem/CMyPageElem.vue +++ b/src/components/CMyPageElem/CMyPageElem.vue @@ -30,7 +30,12 @@ @click="visuEditor = false" > - + diff --git a/src/components/CPresentazione/CPresentazione.scss b/src/components/CPresentazione/CPresentazione.scss index 05adb2a4..a56079e4 100755 --- a/src/components/CPresentazione/CPresentazione.scss +++ b/src/components/CPresentazione/CPresentazione.scss @@ -252,11 +252,6 @@ body.mobile .landing:before { text-shadow: 0.125rem 0.125rem 0.25rem $grayshadow; } -.shadow-max { - //color: white; - text-shadow: .25rem .25rem .5rem $grayshadow; -} - .text-h1 { font-size: 6rem; font-weight: 300; @@ -455,6 +450,3 @@ ul li::before { } } -.buttreg { - font-weight: bold; -} diff --git a/src/components/CPresentazione/CPresentazione.ts b/src/components/CPresentazione/CPresentazione.ts index 7f2bf112..e969c18e 100755 --- a/src/components/CPresentazione/CPresentazione.ts +++ b/src/components/CPresentazione/CPresentazione.ts @@ -4,7 +4,8 @@ import { useRouter } from 'vue-router' import { useGlobalStore } from '@store/globalStore' import { useI18n } from '@/boot/i18n' import { tools } from '@store/Modules/tools' -import { LandingFooter, Logo } from '@components' +import { Logo } from '@/components/logo' +import { LandingFooter } from '@/components/LandingFooter' import { CFundRaising } from '@/components/CFundRaising' import { CShowContentPage } from '@/components/CShowContentPage' import { static_data } from '@src/db/static_data' diff --git a/src/components/CPresentazione/CPresentazione.vue b/src/components/CPresentazione/CPresentazione.vue index 3746cf2e..9a185441 100755 --- a/src/components/CPresentazione/CPresentazione.vue +++ b/src/components/CPresentazione/CPresentazione.vue @@ -16,7 +16,7 @@ height="100%" width="100%" > - +
@@ -24,18 +24,10 @@
-
{{ t('msg.myAppName') }}
+
{{ t('msg.myAppName') }}
- {{ t('msg.sottoTitoloApp') }} + {{ t('msg.sottoTitoloApp') }}
-
- {{t('msg.sottoTitoloApp2')}} - -
-
- {{ t('msg.sottoTitoloApp3') }} -
-
globalStore.finishLoading) const { setmeta } = MixinMetaTags() @@ -50,6 +53,7 @@ export default defineComponent({ setmeta, getValDb, notifStore, + isfinishLoading, } }, }) diff --git a/src/root/mainview/mainview.vue b/src/root/mainview/mainview.vue index 2dc40736..c86e7fe9 100755 --- a/src/root/mainview/mainview.vue +++ b/src/root/mainview/mainview.vue @@ -1,100 +1,33 @@ diff --git a/src/views/user/editprofile/editprofile.vue b/src/views/user/editprofile/editprofile.vue index 9354c1a1..71ce8d36 100755 --- a/src/views/user/editprofile/editprofile.vue +++ b/src/views/user/editprofile/editprofile.vue @@ -179,19 +179,6 @@ > - - -