From 9c35b5d73a8c26dd7a2564077e8f9228ccf41f2e Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Fri, 8 Nov 2019 23:43:00 +0100 Subject: [PATCH] - Inserted Prerendering plugin('prerender-spa-plugin') to create HTML pages (for Google... crawler) - Added Meta Tags (title, description and keywords) --- .../CEventsCalendar/CEventsCalendar.scss | 9 ++-- .../CEventsCalendar/CEventsCalendar.ts | 29 +++++++--- .../CEventsCalendar/CEventsCalendar.vue | 15 +++--- .../CMySingleEvent/CMySingleEvent.vue | 53 ++++++++++--------- src/components/Footer/Footer.vue | 8 +-- src/components/Header/Header.vue | 2 +- src/store/Modules/GlobalStore.ts | 6 ++- src/store/Modules/tools.ts | 2 +- 8 files changed, 74 insertions(+), 50 deletions(-) diff --git a/src/components/CEventsCalendar/CEventsCalendar.scss b/src/components/CEventsCalendar/CEventsCalendar.scss index d1db11b..8e2eb10 100644 --- a/src/components/CEventsCalendar/CEventsCalendar.scss +++ b/src/components/CEventsCalendar/CEventsCalendar.scss @@ -153,6 +153,9 @@ $graytext: #555; border-radius: 1rem; } + &__table tr:hover { + background-color: #deecef; + } &__align_center_mobile { text-align: left; @@ -270,14 +273,14 @@ $graytext: #555; .windowcol { background-color: #ffffff; - // background: radial-gradient(circle, #ffffff 0%, #94dbfb 100%) + // background: radial-gradient(circle, #ffffff 0%, #94dbfb 100%) } -.mysel{ +.mysel { color: white; } -.myflex{ +.myflex { display: flex; flex: 1; @media (max-width: 400px) { diff --git a/src/components/CEventsCalendar/CEventsCalendar.ts b/src/components/CEventsCalendar/CEventsCalendar.ts index 6d21aad..234742d 100644 --- a/src/components/CEventsCalendar/CEventsCalendar.ts +++ b/src/components/CEventsCalendar/CEventsCalendar.ts @@ -40,10 +40,22 @@ import { CMySingleEvent } from '../CMySingleEvent' @Component({ mixins: [MixinOperator, MixinUsers, MixinEvents], name: 'CEventsCalendar', - components: { Logo, Footer, CTitle, CImgText, QDateTimeScroller, QDateScroller, CMySelect, CMyEditor, CDateTime, CMyAvatar, CMySingleEvent } + components: { + Logo, + Footer, + CTitle, + CImgText, + QDateTimeScroller, + QDateScroller, + CMySelect, + CMyEditor, + CDateTime, + CMyAvatar, + CMySingleEvent + } }) export default class CEventsCalendar extends MixinEvents { - @Prop ({required: false, default: null}) public mysingleevent: IEvents + @Prop({ required: false, default: null }) public mysingleevent: IEvents public $q public $t: any public calendarView = 'month' @@ -524,14 +536,15 @@ export default class CEventsCalendar extends MixinEvents { tools.CancelEvent(this, eventparam) } - public duplicateEvent(eventparam, numgg, numev: number = 1 ) { + public duplicateEvent(eventparam, numgg, numev: number = 1) { for (let i = 0; i < numev; ++i) { GlobalStore.actions.DuplicateRec({ table: tools.TABEVENTS, id: eventparam._id }).then((rec) => { - rec.dateTimeStart = tools.addDays(new Date(rec.dateTimeStart), numgg * (i + 1)) - rec.dateTimeEnd = tools.addDays(new Date(rec.dateTimeEnd), numgg * (i + 1)) - CalendarStore.state.eventlist.push(rec) - this.editEvent(rec) - + if (rec) { + rec.dateTimeStart = tools.addDays(new Date(rec.dateTimeStart), numgg * (i + 1)) + rec.dateTimeEnd = tools.addDays(new Date(rec.dateTimeEnd), numgg * (i + 1)) + CalendarStore.state.eventlist.push(rec) + this.editEvent(rec) + } }) } // tools.ActionRecTable(this, lists.MenuAction.DUPLICATE_RECTABLE, tools.TABEVENTS, eventparam._id, eventparam, 'db.duplicatedrecord') diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue b/src/components/CEventsCalendar/CEventsCalendar.vue index 93b20fb..05f499c 100644 --- a/src/components/CEventsCalendar/CEventsCalendar.vue +++ b/src/components/CEventsCalendar/CEventsCalendar.vue @@ -72,7 +72,7 @@ - + Località showpage @@ -487,7 +487,7 @@ {{ getTitleEv(event) }}
+ class="text-center listaev__tdimg_small" alt="Evento">
@@ -595,7 +595,7 @@ @click="deleteEvent(myevent)"> - + @@ -709,16 +710,16 @@ :label="$t('event.showpage')"> - - - {{$t('cal.booked')}} - +
+ - - - - - Tra 1 Settimana - - - Tra 2 Settimane - - - 4 Eventi ogni Settimana - - - - - - - - + + + + + Tra 1 Settimana + + + Tra 2 Settimane + + + 4 Eventi ogni Settimana + + + + + + + + +
@@ -142,7 +145,7 @@ :label="$t('event.showpage')"> -
+
diff --git a/src/components/Footer/Footer.vue b/src/components/Footer/Footer.vue index 0407441..2fd2cb9 100644 --- a/src/components/Footer/Footer.vue +++ b/src/components/Footer/Footer.vue @@ -31,18 +31,20 @@ class="q-icon fas fa-envelope q-mx-sm"> {{ getValDb('MAIN_EMAIL') }}
-
+ {{ rec.name }}: {{ rec.phone }} +
- + - +
{{rec.email}}
+
orari per chiamate:
 diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue index 41b91c6..ace39ad 100644 --- a/src/components/Header/Header.vue +++ b/src/components/Header/Header.vue @@ -37,7 +37,7 @@ - + Immagine Logo {{tools.getappname()}}
{{$t('msg.myDescriz')}} {{ getAppVersion() }}
diff --git a/src/store/Modules/GlobalStore.ts b/src/store/Modules/GlobalStore.ts index 1bafb88..d0bb01f 100644 --- a/src/store/Modules/GlobalStore.ts +++ b/src/store/Modules/GlobalStore.ts @@ -676,12 +676,12 @@ namespace Actions { async function loadSite(context) { // console.log('CalendarStore: loadAfterLogin') // Load local data - CalendarStore.state.editable = UserStore.state.isAdmin || UserStore.state.isManager - const showall = UserStore.state.isAdmin || UserStore.state.isManager ? '1' : '0' const myuserid = (UserStore.state.my._id) ? UserStore.state.my._id : '0' + CalendarStore.state.editable = false + return await Api.SendReq('/loadsite/' + myuserid + '/' + process.env.APP_ID + '/' + showall, 'GET', null) .then((res) => { CalendarStore.state.bookedevent = (res.data.bookedevent) ? res.data.bookedevent : [] @@ -691,6 +691,8 @@ namespace Actions { CalendarStore.state.contribtype = (res.data.contribtype) ? res.data.contribtype : [] GlobalStore.state.settings = (res.data.settings) ? [...res.data.settings] : [] + CalendarStore.state.editable = UserStore.state.isAdmin || UserStore.state.isManager + }) .catch((error) => { console.log('error dbLoad', error) diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index fb972b5..72eb673 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -1742,7 +1742,7 @@ export const tools = { mystr = `${tools.getstrDate(myevent.dateTimeStart)} ${mythis.$t('cal.starttime')} ${ tools.getstrTime(myevent.dateTimeStart) } ${ mythis.$t('cal.enddate')} ${tools.getstrDate(myevent.dateTimeEnd)} - ${ mythis.$t('cal.endtime')}: ${ tools.getstrTime(myevent.dateTimeEnd) } ` + ${ mythis.$t('cal.endtime')} ${ tools.getstrTime(myevent.dateTimeEnd) } ` } if (myevent.infoextra) {