From 7fe6b5fb6a458bfd251b03f7249c1d53adfc8cbb Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Wed, 6 Nov 2019 22:28:45 +0100 Subject: [PATCH 01/18] - Fixed pagination not refreshing the data... - Start creating single page of an Event --- src/components/CCard/CCard.ts | 1 + src/components/CCard/CCard.vue | 25 +++++-- .../CEventsCalendar/CEventsCalendar.ts | 67 ++----------------- .../CEventsCalendar/CEventsCalendar.vue | 35 ++++++---- src/components/CGridTableRec/CGridTableRec.ts | 16 +++-- src/components/Footer/Footer.ts | 5 ++ src/components/Footer/Footer.vue | 7 +- src/layouts/menuone/menuOne.scss | 4 ++ src/layouts/menuone/menuOne.ts | 3 + src/mixins/mixin-base.ts | 16 +++-- src/model/Calendar.ts | 1 + src/model/GlobalStore.ts | 2 + src/statics/i18n.js | 10 +++ src/store/Modules/fieldsTable.ts | 4 +- src/store/Modules/tools.ts | 7 ++ src/views/admin/testp1/testp1.ts | 5 +- 16 files changed, 112 insertions(+), 96 deletions(-) diff --git a/src/components/CCard/CCard.ts b/src/components/CCard/CCard.ts index 5ff151e..bd6fa95 100644 --- a/src/components/CCard/CCard.ts +++ b/src/components/CCard/CCard.ts @@ -36,6 +36,7 @@ export default class CCard extends Vue { name: '', surname: '', qualification: '', + usertelegram: '', disciplines: '', certifications: '', img: '', diff --git a/src/components/CCard/CCard.vue b/src/components/CCard/CCard.vue index d8d5422..f850d68 100644 --- a/src/components/CCard/CCard.vue +++ b/src/components/CCard/CCard.vue @@ -22,16 +22,27 @@ {{myop.cell}} - + + + + - :href="tools.getHttpForWhatsapp(myop.cell)" target="__blank"> - - + + +
-   +   {{myop.email}}
diff --git a/src/components/CEventsCalendar/CEventsCalendar.ts b/src/components/CEventsCalendar/CEventsCalendar.ts index 6e1b96b..c4c5fd9 100644 --- a/src/components/CEventsCalendar/CEventsCalendar.ts +++ b/src/components/CEventsCalendar/CEventsCalendar.ts @@ -1,5 +1,5 @@ import Vue from 'vue' -import { Component, Prop, Watch } from 'vue-property-decorator' +import { Component, Mixins, Prop, Watch } from 'vue-property-decorator' import { CalendarStore, UserStore } from '@store' import { Logo } from '../../components/logo/index' @@ -31,16 +31,17 @@ import { lists } from '../../store/Modules/lists' import { GlobalStore, MessageStore } from '../../store/Modules' import { IMessagePage, IMessage, IIdentity, MsgDefault } from '../../model' import MixinUsers from '../../mixins/mixin-users' -import { CDateTime } from '../CDateTime' import MixinOperator from '../../mixins/mixin-operator' +import MixinEvents from '../../mixins/mixin-events' +import { CDateTime } from '../CDateTime' import { CMyAvatar } from '../CMyAvatar' @Component({ - mixins: [MixinOperator, MixinUsers], + mixins: [MixinOperator, MixinUsers, MixinEvents], name: 'CEventsCalendar', components: { Logo, Footer, CTitle, CImgText, QDateTimeScroller, QDateScroller, CMySelect, CMyEditor, CDateTime, CMyAvatar } }) -export default class CEventsCalendar extends Vue { +export default class CEventsCalendar extends MixinEvents { public $q public $t: any public calendarView = 'month' @@ -48,6 +49,7 @@ export default class CEventsCalendar extends Vue { public formDefault: IEvents = { title: '', details: '', + bodytext: '', dateTimeStart: tools.getstrYYMMDDDateTime(tools.getDateNow()), dateTimeEnd: tools.getstrYYMMDDDateTime(tools.getDateNow()), icon: '', @@ -284,9 +286,6 @@ export default class CEventsCalendar extends Vue { return (CalendarStore.state.intervalRange.max - CalendarStore.state.intervalRange.min) * (1 / CalendarStore.state.intervalRangeStep) } - get editable() { - return CalendarStore.state.editable - } get containerStyle() { const styles = { height: '' } @@ -851,17 +850,6 @@ export default class CEventsCalendar extends Vue { return await CalendarStore.actions.BookEvent(eventparam) } - public isAlreadyBooked(eventparam: IEvents) { - return CalendarStore.getters.findEventBooked(eventparam, true) - } - - public getImgEvent(event: IEvents) { - if (!!event.img) - return '../../statics/' + event.img - else - return '../../statics/images/noimg.png' - } - get getContribTypeArr() { return CalendarStore.state.contribtype } @@ -874,15 +862,6 @@ export default class CEventsCalendar extends Vue { return CalendarStore.state.wheres } - public isShowPrice(event: IEvents) { - const rec = CalendarStore.getters.getContribtypeRec(event.contribtype) - return (rec) ? rec.showprice : true - } - - public getContribtypeById(id) { - return CalendarStore.getters.getContribtypeById(id) - } - public createContribType(value) { console.log('createContribType', value) tools.createNewRecord(this, 'contribtype', { label: value }).then((myrec) => { @@ -897,26 +876,6 @@ export default class CEventsCalendar extends Vue { return this.dateFormatter.format(mydate) } - public getPrice(event: IEvents) { - let myprice = (event.price > 0) ? event.price + ' €' : '' - myprice = (event.price === -1) ? this.$t('event.askinfo') : myprice - - if (event.infoafterprice) - myprice += ' ' + event.infoafterprice - - return myprice - } - - public getWhereIcon(where) { - const whererec = CalendarStore.getters.getWhereRec(where) - return (whererec) ? whererec.whereicon : '' - } - - public getWhereName(where) { - const whererec = CalendarStore.getters.getWhereRec(where) - return (whererec) ? whererec.placename : '' - } - public badgeClasses(eventparam, type) { const cssColor = tools.isCssColor(eventparam.bgcolor) const isHeader = type === 'header' @@ -1027,22 +986,8 @@ export default class CEventsCalendar extends Vue { return eventsloc } - public isEventEnabled(myevent) { - // check if event is in the past - const datenow = tools.addDays(tools.getDateNow(), -1) - - // console.log('datenow', datenow, 'end', myevent.dateTimeEnd) - - return (new Date(myevent.dateTimeEnd) >= datenow) - } - public getTitleEv(event: IEvents) { return (!!event.short_tit) ? event.short_tit : event.title } - public getStyleByEvent(event: IEvents) { - if (event === this.myevent) { - return 'border: inset; border-color: darkblue; border-width: 3px; padding: 5px !important; ' - } - } } diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue b/src/components/CEventsCalendar/CEventsCalendar.vue index 1383382..52d7f79 100644 --- a/src/components/CEventsCalendar/CEventsCalendar.vue +++ b/src/components/CEventsCalendar/CEventsCalendar.vue @@ -74,7 +74,7 @@ - + {{getWhereName(myevent.wherecode)}} @@ -528,8 +528,8 @@
+ class="text-left padding_cell listaev__tdimg listaev__img cursor-pointer q-mx-sm" + :style="getStyleByEvent(event, event === myevent)"> {{$t('cal.booked')}} @@ -587,16 +587,25 @@
-
- {{event.title}} -
- {{event.title}} - + + + + + + + + + + + + +
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 6625bcf..7c2ecd5 100644 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -180,6 +180,10 @@ export default class CGridTableRec extends Vue { const startRow = (page - 1) * rowsPerPage const endRow = startRow + fetchCount + console.log('startRow', startRow) + + this.serverData = [] + // fetch data from "server" this.fetchFromServer(startRow, endRow, filter, sortBy, descending).then((ris) => { @@ -189,12 +193,14 @@ export default class CGridTableRec extends Vue { if (this.returnedData === []) { this.serverData = [] } else { - if (this.serverData.length > 0) - this.serverData.splice(0, this.serverData.length, ...this.returnedData) - else - this.serverData = [...this.returnedData] + // if (this.serverData.length > 0) + // this.serverData.splice(0, this.serverData.length, ...this.returnedData) + // else + this.serverData = [...this.returnedData] } + console.log('this.serverData', this.serverData) + // don't forget to update local pagination object this.pagination.page = page this.pagination.rowsPerPage = rowsPerPage @@ -358,7 +364,7 @@ export default class CGridTableRec extends Vue { // console.log('this.filter', this.filter) this.onRequest({ - pagination: this.pagination, + pagination: this.pagination }) } diff --git a/src/components/Footer/Footer.ts b/src/components/Footer/Footer.ts index efcd5a7..c5e5c8d 100644 --- a/src/components/Footer/Footer.ts +++ b/src/components/Footer/Footer.ts @@ -42,6 +42,11 @@ export default class Footer extends Vue { return GlobalStore.getters.getValueSettingsByKey('WHATSAPP_CELL') } + get Telegram_UsernameHttp() { + + return tools.getHttpForTelegram(GlobalStore.getters.getValueSettingsByKey('TELEGRAM_USERNAME')) + } + get FBPage() { const fb = GlobalStore.getters.getValueSettingsByKey('URL_FACEBOOK') return fb diff --git a/src/components/Footer/Footer.vue b/src/components/Footer/Footer.vue index b893f9c..92d36ce 100644 --- a/src/components/Footer/Footer.vue +++ b/src/components/Footer/Footer.vue @@ -35,7 +35,9 @@ {{ rec.name }}: {{ rec.phone }} - + + +
+ + + diff --git a/src/layouts/menuone/menuOne.scss b/src/layouts/menuone/menuOne.scss index baf8709..395b2d5 100644 --- a/src/layouts/menuone/menuOne.scss +++ b/src/layouts/menuone/menuOne.scss @@ -61,6 +61,10 @@ color: red; } +.isCalendar { + color: #fff241; +} + .isManager { color: green; } diff --git a/src/layouts/menuone/menuOne.ts b/src/layouts/menuone/menuOne.ts index e92c85e..da8ea85 100644 --- a/src/layouts/menuone/menuOne.ts +++ b/src/layouts/menuone/menuOne.ts @@ -74,6 +74,9 @@ export default class MenuOne extends Vue { if (elem.onlyManager) menu += ' isManager' + if (elem.extraclass) + menu += ' ' + elem.extraclass + return menu } } diff --git a/src/mixins/mixin-base.ts b/src/mixins/mixin-base.ts index 72975e3..29b4b31 100644 --- a/src/mixins/mixin-base.ts +++ b/src/mixins/mixin-base.ts @@ -31,12 +31,16 @@ export default class MixinBase extends Vue { public getarrValDb(keystr) { const myval = GlobalStore.getters.getValueSettingsByKey(keystr) // console.log('myval', myval) - if (myval) { - const myrec = JSON.parse(myval) - // console.log('*************** getarrValDb') - // console.table(myrec) - return myrec - } else { + try { + if (myval) { + const myrec = JSON.parse(myval) + // console.log('*************** getarrValDb') + // console.table(myrec) + return myrec + } else { + return [] + } + }catch (e) { return [] } } diff --git a/src/model/Calendar.ts b/src/model/Calendar.ts index a20aae8..32ac880 100644 --- a/src/model/Calendar.ts +++ b/src/model/Calendar.ts @@ -6,6 +6,7 @@ export interface IEvents { short_tit?: string title?: string details?: string + bodytext?: string dateTimeStart?: Date dateTimeEnd?: Date side?: string diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 8d3bee1..787418e 100644 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -96,6 +96,7 @@ export interface IListRoutes { submenu?: boolean onlyAdmin?: boolean onlyManager?: boolean + extraclass?: string meta?: any idelem?: string urlroute?: string @@ -118,6 +119,7 @@ export interface IOperators { certifications?: string img?: string cell?: string + usertelegram?: string paginaweb?: string paginafb?: string intro?: string diff --git a/src/statics/i18n.js b/src/statics/i18n.js index d1d71b6..7cff765 100644 --- a/src/statics/i18n.js +++ b/src/statics/i18n.js @@ -130,6 +130,7 @@ const msgglobal = { }, op: { qualification: 'Qualifica', + usertelegram: 'Username Telegram', disciplines: 'Discipline', certifications: 'Certificazioni', intro: 'Introduzione', @@ -264,6 +265,7 @@ const msgglobal = { short_tit: 'Titolo Breve', title: 'Titolo', details: 'Dettagli', + bodytext: 'Testo Evento', dateTimeStart: 'Data Inizio', dateTimeEnd: 'Data Fine', bgcolor: 'Colore Sfondo', @@ -429,6 +431,7 @@ const msgglobal = { }, op: { qualification: 'Calificación', + usertelegram: 'Username Telegram', disciplines: 'Disciplinas', certifications: 'Certificaciones', intro: 'Introducción', @@ -561,6 +564,7 @@ const msgglobal = { short_tit: 'Título Corto', title: 'Título', details: 'Detalles', + bodytext: 'Texto del evento', dateTimeStart: 'Fecha de Inicio', dateTimeEnd: 'Fecha Final', bgcolor: 'Color de fondo', @@ -725,6 +729,7 @@ const msgglobal = { }, op: { qualification: 'Qualification', + usertelegram: 'Username Telegram', disciplines: 'Disciplines', certifications: 'Certifications', intro: 'Introduction', @@ -857,6 +862,7 @@ const msgglobal = { short_tit: 'Titre abrégé\'', title: 'Titre', details: 'Détails', + bodytext: 'texte de l\'événement', dateTimeStart: 'Data Initiale', dateTimeEnd: 'Date de fin', bgcolor: 'Couleur de fond', @@ -1021,6 +1027,7 @@ const msgglobal = { }, op: { qualification: 'Qualification', + usertelegram: 'Username Telegram', disciplines: 'Disciplines', certifications: 'Certifications', intro: 'Introduction', @@ -1152,6 +1159,7 @@ const msgglobal = { short_tit: 'Short Title', title: 'Title', details: 'Details', + bodytext: 'Event Text', dateTimeStart: 'Date Start', dateTimeEnd: 'Date End', bgcolor: 'Background color', @@ -1317,6 +1325,7 @@ const msgglobal = { }, op: { qualification: 'Qualification', + usertelegram: 'Username Telegram', disciplines: 'Disciplines', certifications: 'Certifications', intro: 'Introduction', @@ -1449,6 +1458,7 @@ const msgglobal = { short_tit: 'Short Title', title: 'Title', details: 'Details', + bodytext: 'Event Text', dateTimeStart: 'Date Start', dateTimeEnd: 'Date End', bgcolor: 'Background color', diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index c5c6105..f6e1772 100644 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -75,6 +75,7 @@ const colTableOperator = [ AddCol({ name: 'email', label_trans: 'reg.email' }), AddCol({ name: 'img', label_trans: 'event.img' }), AddCol({ name: 'cell', label_trans: 'reg.cell' }), + AddCol({ name: 'usertelegram', label_trans: 'op.usertelegram' }), AddCol({ name: 'qualification', label_trans: 'op.qualification' }), AddCol({ name: 'disciplines', label_trans: 'op.disciplines' }), AddCol({ name: 'certifications', label_trans: 'op.certifications' }), @@ -90,7 +91,8 @@ const colTableEvents = [ AddCol({ name: 'typol', label_trans: 'event.typol' }), AddCol({ name: 'short_tit', label_trans: 'event.short_tit' }), AddCol({ name: 'title', label_trans: 'event.title' }), - AddCol({ name: 'details', label_trans: 'event.details' }), + AddCol({ name: 'details', label_trans: 'event.details', fieldtype: tools.FieldType.html }), + AddCol({ name: 'bodytext', label_trans: 'event.bodytext', fieldtype: tools.FieldType.html }), AddCol({ name: 'dateTimeStart', label_trans: 'event.dateTimeStart', fieldtype: tools.FieldType.date }), AddCol({ name: 'dateTimeEnd', label_trans: 'event.dateTimeEnd', fieldtype: tools.FieldType.date }), AddCol({ name: 'bgcolor', label_trans: 'event.bgcolor' }), diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 3e7e1e7..ce226f8 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -2626,6 +2626,13 @@ export const tools = { return 'https://wa.me/' + mynum else return '' + }, + + getHttpForTelegram(usertelegram) { + if (usertelegram) + return 'https://t.me/' + usertelegram + else + return '' } // getLocale() { diff --git a/src/views/admin/testp1/testp1.ts b/src/views/admin/testp1/testp1.ts index 8d16fde..8aeab2a 100644 --- a/src/views/admin/testp1/testp1.ts +++ b/src/views/admin/testp1/testp1.ts @@ -23,11 +23,12 @@ export default class Testp1 extends Vue { public testpao1_array: (state: IGlobalState, miorec: ICfgServer) => ICfgServer[] @Watch('GlobalStore.state.testp1.mioarray', { immediate: true, deep: true }) - array_changed() { + public array_changed() { console.log('*** array_changed *** ', GlobalStore.state.testp1.mioarray[GlobalStore.state.testp1.mioarray.length - 1]) } - @Watch('$route.params.category') changecat() { + @Watch('$route.params.category') + public changecat() { // this.mytypetransgroup = '' console.log('PRIMA this.paramcategory', this.paramcategory) this.paramcategory = this.$route.params.category From 53930925423756e73f93dd448b8470109d4b3eba Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Thu, 7 Nov 2019 18:57:41 +0100 Subject: [PATCH 02/18] - Using CEventsCalendar also for show a Single Event, with his button edit/add/duplicate... --- .../CEventsCalendar/CEventsCalendar.ts | 17 +- .../CEventsCalendar/CEventsCalendar.vue | 942 +++++++++--------- .../CMySingleEvent/CMySingleEvent.scss | 86 ++ .../CMySingleEvent/CMySingleEvent.ts | 85 ++ .../CMySingleEvent/CMySingleEvent.vue | 172 ++++ src/components/CMySingleEvent/index.ts | 1 + src/components/index.ts | 1 + src/store/Modules/UserStore.ts | 1 + 8 files changed, 845 insertions(+), 460 deletions(-) create mode 100644 src/components/CMySingleEvent/CMySingleEvent.scss create mode 100644 src/components/CMySingleEvent/CMySingleEvent.ts create mode 100644 src/components/CMySingleEvent/CMySingleEvent.vue create mode 100644 src/components/CMySingleEvent/index.ts diff --git a/src/components/CEventsCalendar/CEventsCalendar.ts b/src/components/CEventsCalendar/CEventsCalendar.ts index c4c5fd9..afd6f96 100644 --- a/src/components/CEventsCalendar/CEventsCalendar.ts +++ b/src/components/CEventsCalendar/CEventsCalendar.ts @@ -35,13 +35,15 @@ import MixinOperator from '../../mixins/mixin-operator' import MixinEvents from '../../mixins/mixin-events' import { CDateTime } from '../CDateTime' import { CMyAvatar } from '../CMyAvatar' +import { CMySingleEvent } from '../CMySingleEvent' @Component({ mixins: [MixinOperator, MixinUsers, MixinEvents], name: 'CEventsCalendar', - components: { Logo, Footer, CTitle, CImgText, QDateTimeScroller, QDateScroller, CMySelect, CMyEditor, CDateTime, CMyAvatar } + 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 public $q public $t: any public calendarView = 'month' @@ -191,6 +193,10 @@ export default class CEventsCalendar extends MixinEvents { // } // ] + get visuAllCal() { + return this.mysingleevent === null + } + get title_cal() { if (this.titleFormatter && this.locale) { const mydate = new Date(this.selectedDate) @@ -986,6 +992,15 @@ export default class CEventsCalendar extends MixinEvents { return eventsloc } + public isEventEnabled(myevent) { + // check if event is in the past + const datenow = tools.addDays(tools.getDateNow(), -1) + + // console.log('datenow', datenow, 'end', myevent.dateTimeEnd) + + return (new Date(myevent.dateTimeEnd) >= datenow) + } + public getTitleEv(event: IEvents) { return (!!event.short_tit) ? event.short_tit : event.title } diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue b/src/components/CEventsCalendar/CEventsCalendar.vue index 52d7f79..c03a801 100644 --- a/src/components/CEventsCalendar/CEventsCalendar.vue +++ b/src/components/CEventsCalendar/CEventsCalendar.vue @@ -1,59 +1,59 @@ + + diff --git a/src/components/CMySingleEvent/index.ts b/src/components/CMySingleEvent/index.ts new file mode 100644 index 0000000..002c163 --- /dev/null +++ b/src/components/CMySingleEvent/index.ts @@ -0,0 +1 @@ +export {default as CMySingleEvent} from './CMySingleEvent.vue' diff --git a/src/components/index.ts b/src/components/index.ts index e091501..67b5583 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -18,6 +18,7 @@ export * from './CPreloadImages' export * from './CSignIn' export * from './CSignUp' export * from './CEventsCalendar' +export * from './CMySingleEvent' export * from './CDate' export * from './CDateTime' export * from './BannerCookies' diff --git a/src/store/Modules/UserStore.ts b/src/store/Modules/UserStore.ts index 6280707..5eda16a 100644 --- a/src/store/Modules/UserStore.ts +++ b/src/store/Modules/UserStore.ts @@ -658,6 +658,7 @@ namespace Actions { await Projects.actions.dbLoad({ checkPending: true, onlyiffirsttime: true }) GlobalStore.state.finishLoading = true + console.log('finishLoading', GlobalStore.state.finishLoading) return true // console.log('setGlobal: END') From 8ba6c8361be62fcb736964b665171b95e5c3f23a Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Thu, 7 Nov 2019 23:11:05 +0100 Subject: [PATCH 03/18] - Create single page of an Event (to share on FB for example). --- .../CEventsCalendar/CEventsCalendar.ts | 10 +++ .../CEventsCalendar/CEventsCalendar.vue | 60 ++++++++++---- src/components/CMyPage/CMyPage.ts | 1 + src/components/CMyPage/CMyPage.vue | 2 +- .../CMySingleEvent/CMySingleEvent.scss | 83 +++++++++++++++++++ .../CMySingleEvent/CMySingleEvent.vue | 33 ++++---- src/components/CTitle/CTitle.ts | 3 +- src/components/CTitle/CTitle.vue | 2 +- src/components/Footer/Footer.ts | 2 +- src/components/Footer/Footer.vue | 6 +- src/statics/i18n.js | 15 ++-- 11 files changed, 176 insertions(+), 41 deletions(-) diff --git a/src/components/CEventsCalendar/CEventsCalendar.ts b/src/components/CEventsCalendar/CEventsCalendar.ts index afd6f96..ed5c258 100644 --- a/src/components/CEventsCalendar/CEventsCalendar.ts +++ b/src/components/CEventsCalendar/CEventsCalendar.ts @@ -48,6 +48,7 @@ export default class CEventsCalendar extends MixinEvents { public $t: any public calendarView = 'month' public selectedDate = '2019-04-01' + public tabeditor: string = 'details' public formDefault: IEvents = { title: '', details: '', @@ -497,6 +498,13 @@ export default class CEventsCalendar extends MixinEvents { return (this.isAlreadyBooked(event) ? 'text-left bg-light-green-1' : 'text-left') } + public checkFieldUndef() { + if (this.eventForm.bodytext === undefined) + this.eventForm.bodytext = '' + if (this.eventForm.details === undefined) + this.eventForm.details = '' + } + public editEvent(eventparam) { console.log('editEvent - INIZIO') this.resetForm() @@ -505,6 +513,8 @@ export default class CEventsCalendar extends MixinEvents { this.eventForm = { ...eventparam } + this.checkFieldUndef() + this.eventForm.dateTimeStart = tools.getstrYYMMDDDateTime(eventparam.dateTimeStart) this.eventForm.dateTimeEnd = tools.getstrYYMMDDDateTime(eventparam.dateTimeEnd) diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue b/src/components/CEventsCalendar/CEventsCalendar.vue index c03a801..93b20fb 100644 --- a/src/components/CEventsCalendar/CEventsCalendar.vue +++ b/src/components/CEventsCalendar/CEventsCalendar.vue @@ -75,7 +75,7 @@ - + showpage {{getWhereName(myevent.wherecode)}} @@ -93,7 +93,7 @@

+ target="_blank" rounded color="primary" icon="info" :label="$t('cal.showpdf')">

@@ -132,9 +132,35 @@ borderless rounded dense :label="$t('event.title')" :rules="[v => v && v.length > 0 || $t('event.notempty')]"> - - + + + + + + + + + + + + + + + + + + + + @@ -304,7 +330,7 @@

+ target="_blank" rounded color="primary" icon="info" :label="$t('cal.showpdf')">

@@ -377,7 +403,7 @@ -
+
@@ -669,16 +695,20 @@
-

- - - - - -

+
+ + + + + +
diff --git a/src/components/CMyPage/CMyPage.ts b/src/components/CMyPage/CMyPage.ts index fb44dd4..cfa5af9 100644 --- a/src/components/CMyPage/CMyPage.ts +++ b/src/components/CMyPage/CMyPage.ts @@ -35,6 +35,7 @@ export default class CMyPage extends Vue { @Prop({ required: false, default: '' }) public img: string @Prop({ required: false, default: '' }) public imgbackground: string @Prop({ required: false, default: '' }) public sizes: string + @Prop({ required: false, default: '' }) public styleadd: string public $t public $q diff --git a/src/components/CMyPage/CMyPage.vue b/src/components/CMyPage/CMyPage.vue index cc33c69..147afef 100644 --- a/src/components/CMyPage/CMyPage.vue +++ b/src/components/CMyPage/CMyPage.vue @@ -1,7 +1,7 @@ @@ -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) { From 6c4ebb2ace07ec320726356538088e004f5cc3ab Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Tue, 12 Nov 2019 21:33:18 +0100 Subject: [PATCH 08/18] - Table of Disciplines #101 - Insert Facebook bar to the Site #97 --- .../CCardDiscipline/CCardDiscipline.scss | 84 +++++++++++++++++++ .../CCardDiscipline/CCardDiscipline.ts | 21 +++++ .../CCardDiscipline/CCardDiscipline.vue | 35 ++++++++ src/components/CCardDiscipline/index.ts | 1 + .../CEventsCalendar/CEventsCalendar.ts | 4 + .../CEventsCalendar/CEventsCalendar.vue | 7 ++ .../CFacebookFrame/CFacebookFrame.scss | 0 .../CFacebookFrame/CFacebookFrame.ts | 25 ++++++ .../CFacebookFrame/CFacebookFrame.vue | 22 +++++ src/components/CFacebookFrame/index.ts | 1 + src/components/CGridTableRec/CGridTableRec.ts | 2 +- src/components/CMyPopupEdit/CMyPopupEdit.ts | 4 +- src/components/Header/Header.vue | 1 - src/components/index.ts | 2 + src/model/GlobalStore.ts | 20 +++++ src/store/Modules/GlobalStore.ts | 6 +- src/store/Modules/fieldsTable.ts | 27 +++++- src/store/Modules/tools.ts | 30 +++++++ src/views/admin/cfgServer/cfgServer.ts | 2 +- 19 files changed, 286 insertions(+), 8 deletions(-) create mode 100644 src/components/CCardDiscipline/CCardDiscipline.scss create mode 100644 src/components/CCardDiscipline/CCardDiscipline.ts create mode 100644 src/components/CCardDiscipline/CCardDiscipline.vue create mode 100644 src/components/CCardDiscipline/index.ts create mode 100644 src/components/CFacebookFrame/CFacebookFrame.scss create mode 100644 src/components/CFacebookFrame/CFacebookFrame.ts create mode 100644 src/components/CFacebookFrame/CFacebookFrame.vue create mode 100644 src/components/CFacebookFrame/index.ts diff --git a/src/components/CCardDiscipline/CCardDiscipline.scss b/src/components/CCardDiscipline/CCardDiscipline.scss new file mode 100644 index 0000000..ae21da2 --- /dev/null +++ b/src/components/CCardDiscipline/CCardDiscipline.scss @@ -0,0 +1,84 @@ +$heightBtn: 100%; +$grayshadow: #555; + +.text-subtitle-carica { + font-size: 1rem; + font-weight: 400; + line-height: 1.75rem; + letter-spacing: .00937em; + text-shadow: .1rem .1rem .1rem $grayshadow; +} + +.text-subtitle-certificato { + font-size: 0.75rem; + line-height: 1rem; +} + +@media (max-width: 718px) { + // PER VERSIONE MOBILE + .text-subtitle-carica { + font-size: 1rem; + } +} + +.my-card-discipline { + width: 100%; + max-width: 350px; + min-width: 300px; + padding: 1rem 1rem; + + box-shadow: none; + border-radius: 20px; + margin: 1rem 1rem; + transition: transform .2s ease-out; +} + +.my-card-discipline:hover { + transition: transform .2s ease-in; + transform: scale(1.03); +} + +.disc { + text-align: center !important; + font-size: 1rem; + font-weight: 400; + line-height: 1.75rem; + letter-spacing: .00937em; + text-shadow: .1rem .1rem .1rem $grayshadow; + + &__title { + //color: white; + text-shadow: .125rem .125rem .125rem #2d2260; + } + + &__cell { + font-size: 1rem; + color: red; + } + + &__email { + font-size: 1rem; + color: #3b5998; + } + + &__description { + font-size: 1rem; + color: #000000; + } + + &__email a { + text-decoration: none; + } + +} + +.myimg { + border-radius: 30px !important; + margin: 30px auto 10px; +} + +.q-img { + &__image { + border-radius: 30px !important; + } +} diff --git a/src/components/CCardDiscipline/CCardDiscipline.ts b/src/components/CCardDiscipline/CCardDiscipline.ts new file mode 100644 index 0000000..cf2cc2a --- /dev/null +++ b/src/components/CCardDiscipline/CCardDiscipline.ts @@ -0,0 +1,21 @@ +import Vue from 'vue' +import { Component, Prop, Watch } from 'vue-property-decorator' + +import { tools } from '../../store/Modules/tools' +import { toolsext } from '@src/store/Modules/toolsext' +import { IDiscipline } from '../../model' +import MixinBase from '../../mixins/mixin-base' + +@Component({ + mixins: [MixinBase], + name: 'CCardDiscipline' +}) + +export default class CCardDiscipline extends Vue { + @Prop({ required: true }) public discipline: IDiscipline + + public getNextLesson(typol) { + // Get next lesson + return '' + } +} diff --git a/src/components/CCardDiscipline/CCardDiscipline.vue b/src/components/CCardDiscipline/CCardDiscipline.vue new file mode 100644 index 0000000..60a4072 --- /dev/null +++ b/src/components/CCardDiscipline/CCardDiscipline.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/components/CCardDiscipline/index.ts b/src/components/CCardDiscipline/index.ts new file mode 100644 index 0000000..df98f1c --- /dev/null +++ b/src/components/CCardDiscipline/index.ts @@ -0,0 +1 @@ +export {default as CCardDiscipline} from './CCardDiscipline.vue' diff --git a/src/components/CEventsCalendar/CEventsCalendar.ts b/src/components/CEventsCalendar/CEventsCalendar.ts index 234742d..8bad9a6 100644 --- a/src/components/CEventsCalendar/CEventsCalendar.ts +++ b/src/components/CEventsCalendar/CEventsCalendar.ts @@ -890,6 +890,10 @@ export default class CEventsCalendar extends MixinEvents { return CalendarStore.state.wheres } + get getDisciplines() { + return GlobalStore.state.disciplines + } + public createContribType(value) { console.log('createContribType', value) tools.createNewRecord(this, 'contribtype', { label: value }).then((myrec) => { diff --git a/src/components/CEventsCalendar/CEventsCalendar.vue b/src/components/CEventsCalendar/CEventsCalendar.vue index 05f499c..b4f394d 100644 --- a/src/components/CEventsCalendar/CEventsCalendar.vue +++ b/src/components/CEventsCalendar/CEventsCalendar.vue @@ -122,6 +122,12 @@ v-if="contextDay" ref='myevent' class="q-gutter-sm"> + + + + + +
+ + + + + + + + + +
+ + + + + diff --git a/src/components/CFacebookFrame/index.ts b/src/components/CFacebookFrame/index.ts new file mode 100644 index 0000000..ff3a74f --- /dev/null +++ b/src/components/CFacebookFrame/index.ts @@ -0,0 +1 @@ +export {default as CFacebookFrame} from './CFacebookFrame.vue' diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 7c2ecd5..6438766 100644 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -97,7 +97,7 @@ export default class CGridTableRec extends Vue { } public SaveValue(newVal, valinitial) { - console.log('SaveValue', newVal, 'rowsel', this.rowsel) + // console.log('SaveValue', newVal, 'rowsel', this.rowsel) // Update value in table memory if (this.colsel.subfield !== '') { diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts index 00f2408..8b70c74 100644 --- a/src/components/CMyPopupEdit/CMyPopupEdit.ts +++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts @@ -52,13 +52,13 @@ export default class CMyPopupEdit extends Vue { } public OpenEdit() { - console.log('OpenEdit') + // console.log('OpenEdit') this.$emit('show') } public SaveValueInt(newVal, valinitial) { - console.log('SaveValueInt', newVal) + // console.log('SaveValueInt', newVal) // Update value in table memory if (this.subfield !== '') { diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue index ace39ad..b3f6e57 100644 --- a/src/components/Header/Header.vue +++ b/src/components/Header/Header.vue @@ -128,7 +128,6 @@ -
diff --git a/src/components/index.ts b/src/components/index.ts index 67b5583..c6e82fe 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -3,6 +3,7 @@ export * from './todos' export * from './logo' export * from './CProgress' export * from './CCard' +export * from './CCardDiscipline' export * from './CBook' export * from './CMyPage' export * from './CTitle' @@ -25,4 +26,5 @@ export * from './BannerCookies' export * from './PagePolicy' export * from './FormNewsletter' export * from './CGridTableRec' +export * from './CFacebookFrame' export * from './Shen/CTesseraElettronica' diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 96402e1..42d4e42 100644 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -34,6 +34,25 @@ export interface ISettings { value_num?: number } +export interface ITeachUname { + username?: string +} + +export interface IDiscipline { + typol_code?: string + order?: number + label?: string + description?: string + linkpage?: string + color?: string + icon?: string + img_small?: string + showinhome?: boolean + showinnewsletter?: boolean + img?: string + teachers?: ITeachUname[] +} + export interface ITestp1 { contatore: number mioarray: ICfgServer[] @@ -76,6 +95,7 @@ export interface IGlobalState { arrConfig: IConfig[] lastaction: IAction settings: ISettings[], + disciplines: IDiscipline[], } export interface IMenuList { diff --git a/src/store/Modules/GlobalStore.ts b/src/store/Modules/GlobalStore.ts index d0bb01f..e49941c 100644 --- a/src/store/Modules/GlobalStore.ts +++ b/src/store/Modules/GlobalStore.ts @@ -68,7 +68,8 @@ const state: IGlobalState = { type: 0, _id: 0 }, - settings: [] + settings: [], + disciplines: [] } async function getConfig(id) { @@ -163,6 +164,8 @@ namespace Getters { return CalendarStore.state.wheres else if (table === 'contribtype') return CalendarStore.state.contribtype + else if (table === 'disciplines') + return GlobalStore.state.disciplines else if (table === 'bookings') return CalendarStore.state.bookedevent else if (table === 'users') @@ -690,6 +693,7 @@ namespace Actions { CalendarStore.state.wheres = (res.data.wheres) ? res.data.wheres : [] CalendarStore.state.contribtype = (res.data.contribtype) ? res.data.contribtype : [] GlobalStore.state.settings = (res.data.settings) ? [...res.data.settings] : [] + GlobalStore.state.disciplines = (res.data.disciplines) ? [...res.data.disciplines] : [] CalendarStore.state.editable = UserStore.state.isAdmin || UserStore.state.isManager diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index f6e1772..0841d70 100644 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -53,6 +53,22 @@ const colcontribtype = [ AddCol(DeleteRec) ] +const coldisciplines = [ + AddCol({ name: 'typol_code', label_trans: 'disc.typol_code' }), + AddCol({ name: 'order', label_trans: 'disc.order', fieldtype: tools.FieldType.number }), + AddCol({ name: 'label', label_trans: 'event.title' }), + AddCol({ name: 'description', label_trans: 'proj.longdescr' }), + AddCol({ name: 'linkpage', label_trans: 'event.linkpage' }), + AddCol({ name: 'color', label_trans: 'event.color' }), + AddCol({ name: 'icon', label_trans: 'event.icon' }), + AddCol({ name: 'img', label_trans: 'event.img' }), + AddCol({ name: 'img_small', label_trans: 'event.img_small' }), + AddCol({ name: 'showinhome', label_trans: 'event.showinhome', fieldtype: tools.FieldType.boolean }), + AddCol({ name: 'showinnewsletter', label_trans: 'event.showinnewsletter', fieldtype: tools.FieldType.boolean }), + AddCol({ name: 'teachers', label_trans: 'event.teacher', fieldtype: tools.FieldType.multiselect, jointable: 'operators' }), + AddCol(DeleteRec) +] + const colsettings = [ AddCol({ name: 'key', label_trans: 'col.label' }), AddCol({ name: 'type', label_trans: 'col.type', fieldtype: tools.FieldType.select, jointable: 'fieldstype' }), @@ -88,7 +104,7 @@ const colTableOperator = [ const colTableEvents = [ AddCol({ name: '_id', label_trans: 'event._id' }), - AddCol({ name: 'typol', label_trans: 'event.typol' }), + AddCol({ name: 'typol', label_trans: 'event.typol', fieldtype: tools.FieldType.select, jointable: 'disciplines' }), AddCol({ name: 'short_tit', label_trans: 'event.short_tit' }), AddCol({ name: 'title', label_trans: 'event.title' }), AddCol({ name: 'details', label_trans: 'event.details', fieldtype: tools.FieldType.html }), @@ -244,6 +260,13 @@ export const fieldsTable = { colkey: '_id', collabel: 'label' }, + { + value: 'disciplines', + label: 'Discipline', + columns: coldisciplines, + colkey: '_id', + collabel: 'label' + }, { value: 'permissions', label: 'Permessi', @@ -264,7 +287,7 @@ export const fieldsTable = { columns: colsettings, colkey: 'key', collabel: 'key' - }, + } ], // IColGridTable diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 72eb673..3b1489b 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -132,6 +132,7 @@ export const tools = { select: 32, number: 64, typeinrec: 128, + multiselect: 256, }, FieldTypeArr: [ @@ -2526,6 +2527,35 @@ export const tools = { return mythis.$q.screen.width }, + getwidthscale(mythis, mywidth, maxwidth) { + if (this.isMobile()) { + return mywidth + } else { + let myw = mywidth + ((this.getwidth(mythis) - mywidth - 300) * 0.4) + if (myw > maxwidth) + myw = maxwidth + + return myw + } + }, + + getheightbywidth(mythis, mywidth, myheight, maxwidth) { + const myw = this.getwidthscale(mythis, mywidth, maxwidth) + return myw * (myheight / mywidth) + }, + + getheightscale(mythis, myheight, maxheight) { + if (this.isMobile()) { + return myheight + } else { + let myh = myheight + ((this.getheight(mythis) - myheight) * 0.3) + if (myh > maxheight) + myh = maxheight + + return myh + } + }, + isIsoDate(str) { if (!/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/.test(str)) return false const d = new Date(str) diff --git a/src/views/admin/cfgServer/cfgServer.ts b/src/views/admin/cfgServer/cfgServer.ts index 6b0a6be..ec7dd90 100644 --- a/src/views/admin/cfgServer/cfgServer.ts +++ b/src/views/admin/cfgServer/cfgServer.ts @@ -52,7 +52,7 @@ export default class CfgServer extends Vue { } public SaveValue(newVal, valinitial) { - console.log('SaveValue', newVal, 'selected', this.selected) + // console.log('SaveValue', newVal, 'selected', this.selected) const mydata = { chiave: this.keysel, From 5cff83f582bf578de0ef4871872c5f2bdae8545d Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Fri, 15 Nov 2019 00:32:39 +0100 Subject: [PATCH 09/18] - Open Dialog for Operators when click on Chip #91 - HOME: Show last 5 Events #99 - Creating HOME page with the Services Offering (Disciplines...) #96 - CCardDiscipline #104 --- src/components/CBook/CBook.vue | 2 +- src/components/CCard/CCard.vue | 2 +- .../CCardDiscipline/CCardDiscipline.scss | 28 ++- .../CCardDiscipline/CCardDiscipline.ts | 42 ++++- .../CCardDiscipline/CCardDiscipline.vue | 53 +++--- .../CEventsCalendar/CEventsCalendar.scss | 3 +- .../CEventsCalendar/CEventsCalendar.ts | 31 ++-- .../CEventsCalendar/CEventsCalendar.vue | 166 +++++------------- .../CFacebookFrame/CFacebookFrame.ts | 10 ++ .../CFacebookFrame/CFacebookFrame.vue | 2 +- src/components/CMyChipList/CMyChipList.ts | 53 ++++-- src/components/CMyPage/CMyPage.ts | 1 + src/components/CMyPage/CMyPage.vue | 4 +- src/components/CMyPopupEdit/CMyPopupEdit.ts | 9 + src/components/CMyPopupEdit/CMyPopupEdit.vue | 29 +++ .../CMySingleEvent/CMySingleEvent.scss | 3 +- .../CMySingleEvent/CMySingleEvent.ts | 16 +- .../CMySingleEvent/CMySingleEvent.vue | 16 +- src/components/Footer/Footer.scss | 1 + src/components/Footer/Footer.ts | 3 +- src/components/Footer/Footer.vue | 103 +++++------ .../FormNewsletter/FormNewsletter.vue | 3 + src/components/Header/Header.ts | 2 +- src/components/index.ts | 2 + src/mixins/mixin-base.ts | 8 +- src/mixins/mixin-events.ts | 15 +- src/model/GlobalStore.ts | 1 + src/statics/i18n.js | 20 +++ src/store/Modules/GlobalStore.ts | 3 +- src/store/Modules/fieldsTable.ts | 32 +++- src/store/Modules/tools.ts | 105 ++++++++++- 31 files changed, 489 insertions(+), 279 deletions(-) diff --git a/src/components/CBook/CBook.vue b/src/components/CBook/CBook.vue index f290c2e..a36cb57 100644 --- a/src/components/CBook/CBook.vue +++ b/src/components/CBook/CBook.vue @@ -9,7 +9,7 @@ - + diff --git a/src/components/CCard/CCard.vue b/src/components/CCard/CCard.vue index f850d68..caaf301 100644 --- a/src/components/CCard/CCard.vue +++ b/src/components/CCard/CCard.vue @@ -9,7 +9,7 @@ - + diff --git a/src/components/CCardDiscipline/CCardDiscipline.scss b/src/components/CCardDiscipline/CCardDiscipline.scss index ae21da2..27b34db 100644 --- a/src/components/CCardDiscipline/CCardDiscipline.scss +++ b/src/components/CCardDiscipline/CCardDiscipline.scss @@ -25,15 +25,33 @@ $grayshadow: #555; width: 100%; max-width: 350px; min-width: 300px; - padding: 1rem 1rem; + padding: 0; box-shadow: none; - border-radius: 20px; - margin: 1rem 1rem; + border-radius: 30px; +} + +.my-card-shadow { + width: 100%; + max-width: 350px; + min-width: 300px; + padding-bottom: 20px; + margin-left: 0; + margin-right: 0; + margin-top: 1rem; + margin-bottom: 1rem; + border-radius: 30px; + transition: transform .2s ease-out; } -.my-card-discipline:hover { +.yes_shadow { + -webkit-box-shadow: 0 0 24px 0 rgba(0, 0, 0, 0.16); + box-shadow: 0 0 24px 0 rgba(0, 0, 0, 0.16); +} + + +.my-card-shadow:hover { transition: transform .2s ease-in; transform: scale(1.03); } @@ -73,8 +91,8 @@ $grayshadow: #555; } .myimg { + height: 200px; border-radius: 30px !important; - margin: 30px auto 10px; } .q-img { diff --git a/src/components/CCardDiscipline/CCardDiscipline.ts b/src/components/CCardDiscipline/CCardDiscipline.ts index cf2cc2a..99a4f25 100644 --- a/src/components/CCardDiscipline/CCardDiscipline.ts +++ b/src/components/CCardDiscipline/CCardDiscipline.ts @@ -3,19 +3,53 @@ import { Component, Prop, Watch } from 'vue-property-decorator' import { tools } from '../../store/Modules/tools' import { toolsext } from '@src/store/Modules/toolsext' -import { IDiscipline } from '../../model' +import { IDiscipline, IEvents } from '../../model' import MixinBase from '../../mixins/mixin-base' +import MixinOperator from '../../mixins/mixin-operator' +import MixinUsers from '../../mixins/mixin-users' +import { CMyTeacher } from '../CMyTeacher' +import { CalendarStore } from '../../store/Modules' @Component({ - mixins: [MixinBase], - name: 'CCardDiscipline' + mixins: [MixinBase, MixinOperator, MixinUsers], + name: 'CCardDiscipline', + components: { CMyTeacher } }) export default class CCardDiscipline extends Vue { @Prop({ required: true }) public discipline: IDiscipline + @Prop({ required: false, default: '' }) public mystyle: string + @Prop({ required: false, default: false }) public autoplay: boolean + + public nextlesson: IEvents + + @Watch('discipline') + public disciplinechanged(value) { + this.nextlesson = this.getNextLesson(value.typol_code) + // console.log('nextlesson', this.nextlesson) + } public getNextLesson(typol) { // Get next lesson - return '' + const datenow = tools.addDays(tools.getDateNow(), -1) + return CalendarStore.state.eventlist.find((myevent) => (myevent.typol === typol) && (new Date(myevent.dateTimeEnd) >= datenow)) + // return CalendarStore.state.eventlist.find((myevent) => (myevent.typol === typol)) } + + public ExistLesson() { + return !!this.nextlesson + } + + public NextEventDate() { + return tools.getstrDateTimeEventSimple(this, this.nextlesson) + } + + get getLinkEvent() { + return `event/${this.nextlesson.typol}/${this.nextlesson._id}` + } + + public created() { + this.disciplinechanged(this.discipline) + } + } diff --git a/src/components/CCardDiscipline/CCardDiscipline.vue b/src/components/CCardDiscipline/CCardDiscipline.vue index 60a4072..3ba2d2c 100644 --- a/src/components/CCardDiscipline/CCardDiscipline.vue +++ b/src/components/CCardDiscipline/CCardDiscipline.vue @@ -1,30 +1,43 @@ + + diff --git a/src/components/CCardCarousel/index.ts b/src/components/CCardCarousel/index.ts new file mode 100644 index 0000000..9162173 --- /dev/null +++ b/src/components/CCardCarousel/index.ts @@ -0,0 +1 @@ +export {default as CCardCarousel} from './CCardCarousel.vue' diff --git a/src/components/CMyTeacher/CMyTeacher.scss b/src/components/CMyTeacher/CMyTeacher.scss new file mode 100644 index 0000000..254acd3 --- /dev/null +++ b/src/components/CMyTeacher/CMyTeacher.scss @@ -0,0 +1,92 @@ +$heightBtn: 100%; +$grayshadow: #555; + +.text-subtitle-carica { + font-size: 1rem; + font-weight: 400; + line-height: 1.75rem; + letter-spacing: .00937em; + text-shadow: .1rem .1rem .1rem $grayshadow; +} + +.text-subtitle-certificato { + font-size: 0.75rem; + line-height: 1rem; +} + +@media (max-width: 718px) { + // PER VERSIONE MOBILE + .text-subtitle-carica { + font-size: 1rem; + } +} + +.op { + text-align: center !important; + font-size: 1rem; + font-weight: 400; + line-height: 1.75rem; + letter-spacing: .00937em; + text-shadow: .1rem .1rem .1rem $grayshadow; + + &__cell { + font-size: 1rem; + color: red; + } + + &__email { + font-size: 1rem; + color: #3b5998; + } + + &__email a { + text-decoration: none; + } + + &__facebook a { + font-size: 1rem; + text-decoration: none; + } + + &__storia { + margin-top: 1rem; + margin-bottom: 1rem; + text-align: justify; + } +} + +.myimg { + border-radius: 300px !important; +} + +.q-img { + &__image { + border-radius: 300px !important; + } +} + +.myflex { + display: flex; + flex: 1; +} + +.mybase { + color: black; + font-size: 0.75rem; + font-weight: 400; + line-height: 1.25rem; + letter-spacing: 0.03333em; + + &__teacher { + margin-top: 5px; + + &-content { + color: darkblue; + } + + &-content:hover { + + } + } + +} diff --git a/src/components/CMyTeacher/CMyTeacher.ts b/src/components/CMyTeacher/CMyTeacher.ts new file mode 100644 index 0000000..bbde801 --- /dev/null +++ b/src/components/CMyTeacher/CMyTeacher.ts @@ -0,0 +1,43 @@ +import Vue from 'vue' +import { Component, Prop, Watch } from 'vue-property-decorator' + +import { tools } from '../../store/Modules/tools' +import { GlobalStore, UserStore } from '../../store/Modules' +import { CMyAvatar } from '../CMyAvatar' +import MixinBase from '../../mixins/mixin-base' +import MixinOperator from '../../mixins/mixin-operator' +import MixinUsers from '../../mixins/mixin-users' + + +@Component({ + name: 'CMyTeacher', + mixins: [MixinBase, MixinOperator, MixinUsers], + components: { CMyAvatar } +}) + +export default class CMyTeacher extends MixinOperator { + @Prop({ required: true, default: '' }) public username + + public showuserdetails = false + public autoplaydiscsaved: number + public tab: string = 'one' + + @Watch('showuserdetails') + public changeshowuserdetails() { + if (!this.showuserdetails) { + GlobalStore.state.autoplaydisc = this.autoplaydiscsaved + } + } + + public executeclick(event) { + console.log('executeclick') + this.showuserdetails = true + + this.autoplaydiscsaved = GlobalStore.state.autoplaydisc + GlobalStore.state.autoplaydisc = 0 + } + + get myop() { + return this.getOperatorByUsername(this.username) + } +} diff --git a/src/components/CMyTeacher/CMyTeacher.vue b/src/components/CMyTeacher/CMyTeacher.vue new file mode 100644 index 0000000..ff600e8 --- /dev/null +++ b/src/components/CMyTeacher/CMyTeacher.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/src/components/CMyTeacher/index.ts b/src/components/CMyTeacher/index.ts new file mode 100644 index 0000000..6da701e --- /dev/null +++ b/src/components/CMyTeacher/index.ts @@ -0,0 +1 @@ +export {default as CMyTeacher} from './CMyTeacher.vue' From ca7ee499449ffbacfb7560296ab794faf10a80f7 Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Sun, 17 Nov 2019 01:07:23 +0100 Subject: [PATCH 11/18] - Adding map page (where is the location) #100 - fix menu appear Admin and Manager --- package-lock.json | 1811 +---------------- package.json | 1 + src/boot/vee-validate.ts | 2 +- .../CCardDiscipline/CCardDiscipline.vue | 2 +- src/components/CGoogleMap/CGoogleMap.scss | 4 + src/components/CGoogleMap/CGoogleMap.ts | 28 + src/components/CGoogleMap/CGoogleMap.vue | 12 + src/components/CGoogleMap/index.ts | 1 + .../COpenStreetMap/COpenStreetMap.scss | 4 + .../COpenStreetMap/COpenStreetMap.ts | 24 + .../COpenStreetMap/COpenStreetMap.vue | 19 + src/components/COpenStreetMap/index.ts | 1 + src/components/Footer/Footer.vue | 2 +- src/components/index.ts | 2 + src/js/storage.js___jb_tmp___ | 0 src/layouts/menuone/menuOne.ts | 5 - src/layouts/menuone/menuOne.vue | 4 +- src/statics/i18n.js | 5 + src/store/Modules/fieldsTable.ts | 2 +- src/store/Modules/tools.ts | 6 + src/typings/libs/axios.d.ts | 1 - src/typings/libs/globalroutines.d.ts | 1 - 22 files changed, 121 insertions(+), 1816 deletions(-) create mode 100644 src/components/CGoogleMap/CGoogleMap.scss create mode 100644 src/components/CGoogleMap/CGoogleMap.ts create mode 100644 src/components/CGoogleMap/CGoogleMap.vue create mode 100644 src/components/CGoogleMap/index.ts create mode 100644 src/components/COpenStreetMap/COpenStreetMap.scss create mode 100644 src/components/COpenStreetMap/COpenStreetMap.ts create mode 100644 src/components/COpenStreetMap/COpenStreetMap.vue create mode 100644 src/components/COpenStreetMap/index.ts delete mode 100644 src/js/storage.js___jb_tmp___ diff --git a/package-lock.json b/package-lock.json index ce45b44..409408d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -954,16 +954,6 @@ "regenerator-runtime": "^0.13.2" } }, - "@babel/runtime-corejs3": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.6.3.tgz", - "integrity": "sha512-933SXHQr7apa95F+3IqkBne8mqOnu1kDh6dnSddC07aW/R51WsOVD7MSczJ6DRpq/L8KLll7TFDxmt30pft44w==", - "dev": true, - "requires": { - "core-js-pure": "^3.0.0", - "regenerator-runtime": "^0.13.2" - } - }, "@babel/template": { "version": "7.6.0", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz", @@ -3138,428 +3128,11 @@ "glob-to-regexp": "^0.3.0" } }, - "@nodelib/fs.scandir": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", - "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.3", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", - "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", - "dev": true - }, - "@nodelib/fs.walk": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", - "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.3", - "fastq": "^1.6.0" - } - }, - "@positron/stack-trace": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@positron/stack-trace/-/stack-trace-1.0.0.tgz", - "integrity": "sha1-FPzHEqUwA475vhzmlSMVqDn0Zqg=", - "dev": true - }, - "@quasar/app": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@quasar/app/-/app-1.2.1.tgz", - "integrity": "sha512-cJaq56iTrIf0n1jjov2IRGCkjEA66iq+gPF7y1UAHr38s699pNPLugblvdqoFAa20ogDw/VtlrHOuQBcHoZSqQ==", - "dev": true, - "requires": { - "@quasar/babel-preset-app": "1.1.6", - "@quasar/fastclick": "1.1.4", - "@vue/preload-webpack-plugin": "1.1.1", - "autoprefixer": "9.6.1", - "chalk": "2.4.2", - "chokidar": "3.2.1", - "ci-info": "2.0.0", - "compression-webpack-plugin": "3.0.0", - "copy-webpack-plugin": "5.0.4", - "cross-spawn": "7.0.0", - "css-loader": "3.2.0", - "cssnano": "4.1.10", - "dot-prop": "5.1.0", - "elementtree": "0.1.7", - "express": "4.17.1", - "fast-glob": "3.0.4", - "file-loader": "4.2.0", - "friendly-errors-webpack-plugin": "1.7.0", - "fs-extra": "8.1.0", - "hash-sum": "2.0.0", - "html-minifier": "4.0.0", - "html-webpack-plugin": "3.2.0", - "inquirer": "7.0.0", - "isbinaryfile": "4.0.2", - "lodash.debounce": "4.0.8", - "lodash.template": "4.5.0", - "lodash.throttle": "4.1.1", - "log-update": "3.3.0", - "lru-cache": "5.1.1", - "memory-fs": "0.4.1", - "mini-css-extract-plugin": "^0.8.0", - "minimist": "1.2.0", - "ms": "2.1.2", - "node-loader": "0.6.0", - "node-sass": "4.12.0", - "open": "6.4.0", - "optimize-css-assets-webpack-plugin": "5.0.3", - "ouch": "2.0.0", - "postcss-loader": "3.0.0", - "postcss-rtl": "1.5.0", - "postcss-safe-parser": "4.0.1", - "register-service-worker": "1.6.2", - "sass-loader": "8.0.0", - "semver": "6.3.0", - "strip-ansi": "5.2.0", - "stylus": "0.54.7", - "stylus-loader": "3.0.2", - "terser-webpack-plugin": "2.1.2", - "url-loader": "2.1.0", - "vue": "2.6.10", - "vue-loader": "15.7.1", - "vue-router": "3.1.3", - "vue-server-renderer": "2.6.10", - "vue-style-loader": "4.1.2", - "vue-template-compiler": "2.6.10", - "vuex": "3.1.1", - "webpack": "4.41.0", - "webpack-bundle-analyzer": "3.5.2", - "webpack-chain": "6.0.0", - "webpack-dev-server": "3.8.2", - "webpack-merge": "4.2.2", - "webpack-node-externals": "1.7.2", - "workbox-webpack-plugin": "4.3.1" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "autoprefixer": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz", - "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==", - "dev": true, - "requires": { - "browserslist": "^4.6.3", - "caniuse-lite": "^1.0.30000980", - "chalk": "^2.4.2", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.17", - "postcss-value-parser": "^4.0.0" - } - }, - "big.js": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", - "dev": true - }, - "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", - "dev": true - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "chokidar": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.2.1.tgz", - "integrity": "sha512-/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w==", - "dev": true, - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.0", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.1.3" - } - }, - "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", - "dev": true - }, - "cross-spawn": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.0.tgz", - "integrity": "sha512-6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "file-loader": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.2.0.tgz", - "integrity": "sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==", - "dev": true, - "requires": { - "loader-utils": "^1.2.3", - "schema-utils": "^2.0.0" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "fsevents": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.0.tgz", - "integrity": "sha512-+iXhW3LuDQsno8dOIrCIT/CBjeBWuP7PXe8w9shnj9Lebny/Gx1ZjVBYwexLz36Ri2jKuXMNpV6CYNh8lHHgrQ==", - "dev": true, - "optional": true - }, - "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "html-webpack-plugin": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", - "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", - "dev": true, - "requires": { - "html-minifier": "^3.2.3", - "loader-utils": "^0.2.16", - "lodash": "^4.17.3", - "pretty-error": "^2.0.2", - "tapable": "^1.0.0", - "toposort": "^1.0.0", - "util.promisify": "1.0.0" - }, - "dependencies": { - "html-minifier": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz", - "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==", - "dev": true, - "requires": { - "camel-case": "3.0.x", - "clean-css": "4.2.x", - "commander": "2.17.x", - "he": "1.2.x", - "param-case": "2.1.x", - "relateurl": "0.2.x", - "uglify-js": "3.4.x" - } - }, - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "^3.1.3", - "emojis-list": "^2.0.0", - "json5": "^0.5.0", - "object-assign": "^4.0.1" - } - } - } - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true - }, - "readdirp": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.3.tgz", - "integrity": "sha512-ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q==", - "dev": true, - "requires": { - "picomatch": "^2.0.4" - } - }, - "sass-loader": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.0.tgz", - "integrity": "sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==", - "dev": true, - "requires": { - "clone-deep": "^4.0.1", - "loader-utils": "^1.2.3", - "neo-async": "^2.6.1", - "schema-utils": "^2.1.0", - "semver": "^6.3.0" - } - }, - "schema-utils": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.4.1.tgz", - "integrity": "sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==", - "dev": true, - "requires": { - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "uglify-js": { - "version": "3.4.10", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz", - "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==", - "dev": true, - "requires": { - "commander": "~2.19.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "commander": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", - "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==", - "dev": true - } - } - } - } - }, - "@quasar/babel-preset-app": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@quasar/babel-preset-app/-/babel-preset-app-1.1.6.tgz", - "integrity": "sha512-D25+EIou1eBQ7Fjjd/byB8SZ/nbV7+5fKi8kUugrI/DjEzBdWdNSWCa9pXulLbArXH7pslBZ3ZgHPSO6FblP+g==", - "dev": true, - "requires": { - "@babel/core": "^7.5.5", - "@babel/plugin-proposal-class-properties": "^7.5.5", - "@babel/plugin-proposal-decorators": "^7.4.4", - "@babel/plugin-proposal-export-namespace-from": "^7.2.0", - "@babel/plugin-proposal-function-sent": "^7.2.0", - "@babel/plugin-proposal-json-strings": "^7.2.0", - "@babel/plugin-proposal-numeric-separator": "^7.2.0", - "@babel/plugin-proposal-throw-expressions": "^7.2.0", - "@babel/plugin-syntax-dynamic-import": "^7.2.0", - "@babel/plugin-syntax-import-meta": "^7.2.0", - "@babel/plugin-transform-runtime": "^7.5.5", - "@babel/preset-env": "^7.5.5", - "@babel/runtime": "^7.5.5", - "@babel/runtime-corejs2": "^7.5.5", - "@babel/runtime-corejs3": "^7.5.5", - "babel-loader": "^8.0.6", - "babel-plugin-dynamic-import-node": "^2.3.0", - "babel-plugin-module-resolver": "^3.2.0", - "babel-plugin-transform-imports": "^1.0.0" - }, - "dependencies": { - "babel-loader": { - "version": "8.0.6", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz", - "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==", - "dev": true, - "requires": { - "find-cache-dir": "^2.0.0", - "loader-utils": "^1.0.2", - "mkdirp": "^0.5.1", - "pify": "^4.0.1" - } - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - } - } - }, "@quasar/extras": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.3.2.tgz", "integrity": "sha512-EGBvl4By7Cv/WFGD4dc2FX+iLA+GX7YOnDj8AH92Df4pSMDKxP3TdvpXRnKs3V6bfHKyafc3VklVdf30hT5EoA==" }, - "@quasar/fastclick": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@quasar/fastclick/-/fastclick-1.1.4.tgz", - "integrity": "sha512-i9wbyV4iT+v4KhtHJynUFhH5LiEPvAEgSnwMqPN4hf/8uRe82nDl5qP5agrp2el1h0HzyBpbvHaW7NB0BPrtvA==", - "dev": true - }, "@quasar/quasar-app-extension-colorize": { "version": "1.0.0-alpha.1", "resolved": "https://registry.npmjs.org/@quasar/quasar-app-extension-colorize/-/quasar-app-extension-colorize-1.0.0-alpha.1.tgz", @@ -3694,6 +3267,11 @@ "@types/node": "*" } }, + "@types/googlemaps": { + "version": "3.38.0", + "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.38.0.tgz", + "integrity": "sha512-Rp7FnrwyYGnjoxM+/q/4DRqUzvV9JKK1SBRXx8APxU6NNMtYMsWmOMsQOV2U6z8aMFzlUbRv3EDixLcDep8t9w==" + }, "@types/istanbul-lib-coverage": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", @@ -5710,24 +5288,6 @@ "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==", "dev": true }, - "aggregate-error": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", - "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", - "dev": true, - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "dependencies": { - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true - } - } - }, "ajv": { "version": "6.10.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", @@ -5779,15 +5339,6 @@ "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", "dev": true }, - "ansi-escapes": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz", - "integrity": "sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==", - "dev": true, - "requires": { - "type-fest": "^0.5.2" - } - }, "ansi-html": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", @@ -7089,28 +6640,6 @@ "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", "dev": true }, - "cacache": { - "version": "11.3.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz", - "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", - "dev": true, - "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" - } - }, "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", @@ -7467,27 +6996,12 @@ "source-map": "~0.6.0" } }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true - }, "cli-boxes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", "dev": true }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "requires": { - "restore-cursor": "^3.1.0" - } - }, "cli-highlight": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.1.tgz", @@ -7862,91 +7376,6 @@ } } }, - "compression-webpack-plugin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-3.0.0.tgz", - "integrity": "sha512-ls+oKw4eRbvaSv/hj9NmctihhBcR26j76JxV0bLRLcWhrUBdQFgd06z/Kgg7exyQvtWWP484wZxs0gIUX3NO0Q==", - "dev": true, - "requires": { - "cacache": "^11.2.0", - "find-cache-dir": "^3.0.0", - "neo-async": "^2.5.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^1.4.0", - "webpack-sources": "^1.0.1" - }, - "dependencies": { - "find-cache-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.0.0.tgz", - "integrity": "sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.0", - "pkg-dir": "^4.1.0" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "make-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz", - "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==", - "dev": true, - "requires": { - "semver": "^6.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -8163,26 +7592,6 @@ "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, - "copy-webpack-plugin": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz", - "integrity": "sha512-YBuYGpSzoCHSSDGyHy6VJ7SHojKp6WHT4D7ItcQFNAYx2hrwkMe56e97xfVR0/ovDuMTrMffXUiltvQljtAGeg==", - "dev": true, - "requires": { - "cacache": "^11.3.3", - "find-cache-dir": "^2.1.0", - "glob-parent": "^3.1.0", - "globby": "^7.1.1", - "is-glob": "^4.0.1", - "loader-utils": "^1.2.3", - "minimatch": "^3.0.4", - "normalize-path": "^3.0.0", - "p-limit": "^2.2.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^1.7.0", - "webpack-log": "^2.0.0" - } - }, "core-js": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz", @@ -8206,12 +7615,6 @@ } } }, - "core-js-pure": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.2.1.tgz", - "integrity": "sha512-+qpvnYrsi/JDeQTArB7NnNc2VoMYLE1YSkziCDHgjexC2KH7OFiGhLUd3urxfyWmNjSwSW7NYXPWHMhuIJx9Ow==", - "dev": true - }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -8366,47 +7769,6 @@ "timsort": "^0.3.0" } }, - "css-loader": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.2.0.tgz", - "integrity": "sha512-QTF3Ud5H7DaZotgdcJjGMvyDj5F3Pn1j/sC6VBEOVp94cbwqyIBdcs/quzj4MC1BKQSrTpQznegH/5giYbhnCQ==", - "dev": true, - "requires": { - "camelcase": "^5.3.1", - "cssesc": "^3.0.0", - "icss-utils": "^4.1.1", - "loader-utils": "^1.2.3", - "normalize-path": "^3.0.0", - "postcss": "^7.0.17", - "postcss-modules-extract-imports": "^2.0.0", - "postcss-modules-local-by-default": "^3.0.2", - "postcss-modules-scope": "^2.1.0", - "postcss-modules-values": "^3.0.0", - "postcss-value-parser": "^4.0.0", - "schema-utils": "^2.0.0" - }, - "dependencies": { - "schema-utils": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.4.1.tgz", - "integrity": "sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==", - "dev": true, - "requires": { - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1" - } - } - } - }, - "css-parse": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz", - "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=", - "dev": true, - "requires": { - "css": "^2.0.0" - } - }, "css-select": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz", @@ -8495,12 +7857,6 @@ "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" }, - "cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true - }, "cssnano": { "version": "4.1.10", "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz", @@ -9169,23 +8525,6 @@ "domelementtype": "1" } }, - "dot-prop": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.1.0.tgz", - "integrity": "sha512-n1oC6NBF+KM9oVXtjmen4Yo7HyAVWV2UUl50dCYJdw2924K6dX9bf9TTTWaKtYlRn0FEtxG27KS80ayVLixxJA==", - "dev": true, - "requires": { - "is-obj": "^2.0.0" - }, - "dependencies": { - "is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true - } - } - }, "dotenv": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz", @@ -9311,23 +8650,6 @@ "throttle-debounce": "^1.0.1" } }, - "elementtree": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz", - "integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=", - "dev": true, - "requires": { - "sax": "1.1.4" - }, - "dependencies": { - "sax": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz", - "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=", - "dev": true - } - } - }, "elliptic": { "version": "6.5.1", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz", @@ -10289,74 +9611,6 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, - "fast-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.0.4.tgz", - "integrity": "sha512-wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.1", - "@nodelib/fs.walk": "^1.2.1", - "glob-parent": "^5.0.0", - "is-glob": "^4.0.1", - "merge2": "^1.2.3", - "micromatch": "^4.0.2" - }, - "dependencies": { - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "micromatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", - "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", - "dev": true, - "requires": { - "braces": "^3.0.1", - "picomatch": "^2.0.5" - } - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - } - } - }, "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", @@ -10375,15 +9629,6 @@ "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==", "dev": true }, - "fastq": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz", - "integrity": "sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==", - "dev": true, - "requires": { - "reusify": "^1.0.0" - } - }, "faye-websocket": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", @@ -10417,15 +9662,6 @@ "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==", "dev": true }, - "figures": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz", - "integrity": "sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, "file-entry-cache": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", @@ -10541,30 +9777,6 @@ "locate-path": "^3.0.0" } }, - "findup": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/findup/-/findup-0.1.5.tgz", - "integrity": "sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs=", - "dev": true, - "requires": { - "colors": "~0.6.0-1", - "commander": "~2.1.0" - }, - "dependencies": { - "colors": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", - "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=", - "dev": true - }, - "commander": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", - "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=", - "dev": true - } - } - }, "findup-sync": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", @@ -10708,44 +9920,6 @@ "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", "dev": true }, - "friendly-errors-webpack-plugin": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0.tgz", - "integrity": "sha512-K27M3VK30wVoOarP651zDmb93R9zF28usW4ocaK3mfQeIEI5BPht/EzZs5E8QLLwbLRJQMwscAjDxYPb1FuNiw==", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "error-stack-parser": "^2.0.0", - "string-width": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, "from2": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", @@ -10756,17 +9930,6 @@ "readable-stream": "^2.0.0" } }, - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, "fs-plus": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/fs-plus/-/fs-plus-3.1.1.tgz", @@ -11611,34 +10774,6 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, - "globby": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", - "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "dir-glob": "^2.0.0", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true - } - } - }, "globule": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", @@ -11850,12 +10985,6 @@ "safe-buffer": "^5.0.1" } }, - "hash-sum": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", - "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", - "dev": true - }, "hash.js": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", @@ -11975,21 +11104,6 @@ "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", "dev": true }, - "html-minifier": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz", - "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", - "dev": true, - "requires": { - "camel-case": "^3.0.0", - "clean-css": "^4.2.1", - "commander": "^2.19.0", - "he": "^1.2.0", - "param-case": "^2.1.1", - "relateurl": "^0.2.7", - "uglify-js": "^3.5.1" - } - }, "html-tags": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz", @@ -12196,15 +11310,6 @@ "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=", "dev": true }, - "icss-utils": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz", - "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==", - "dev": true, - "requires": { - "postcss": "^7.0.14" - } - }, "ieee754": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", @@ -12332,67 +11437,6 @@ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" }, - "inquirer": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz", - "integrity": "sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^2.4.2", - "cli-cursor": "^3.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.15", - "mute-stream": "0.0.8", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^4.1.0", - "strip-ansi": "^5.1.0", - "through": "^2.3.6" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "string-width": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz", - "integrity": "sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^5.2.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, "internal-ip": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz", @@ -12856,12 +11900,6 @@ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, - "isbinaryfile": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.2.tgz", - "integrity": "sha512-C3FSxJdNrEr2F4z6uFtNzECDM5hXk+46fxaa+cwBe5/XrWSmzdG8DDgyjfX6/NRdBB21q2JXuRAzPCUs+fclnQ==", - "dev": true - }, "isemail": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz", @@ -13020,12 +12058,6 @@ "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz", "integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==" }, - "javascript-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.0.0.tgz", - "integrity": "sha512-zzK8+ByrzvOL6N92hRewwUKL0wN0TOaIuUjX0Jj8lraxWvr5wHYs2YTjaj2lstF+8qMv5cmPPef47va8NT8lDw==", - "dev": true - }, "jest": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz", @@ -15259,18 +14291,6 @@ "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", "dev": true }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true - }, "lodash.defaultsdeep": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz", @@ -15338,12 +14358,6 @@ "lodash._reinterpolate": "^3.0.0" } }, - "lodash.throttle": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", - "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=", - "dev": true - }, "lodash.transform": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz", @@ -15365,96 +14379,6 @@ "chalk": "^2.0.1" } }, - "log-update": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-3.3.0.tgz", - "integrity": "sha512-YSKm5n+YjZoGZT5lfmOqasVH1fIH9xQA9A81Y48nZ99PxAP62vdCCtua+Gcu6oTn0nqtZd/LwRV+Vflo53ZDWA==", - "dev": true, - "requires": { - "ansi-escapes": "^3.2.0", - "cli-cursor": "^2.1.0", - "wrap-ansi": "^5.0.0" - }, - "dependencies": { - "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true - }, - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - } - } - } - }, "loglevel": { "version": "1.6.4", "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz", @@ -15807,50 +14731,6 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, - "minipass": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.0.1.tgz", - "integrity": "sha512-2y5okJ4uBsjoD2vAbLKL9EUQPPkC0YMIp+2mZOXG3nBba++pdfJWRxx2Ewirc0pwAJYu4XtWg2EkVo1nRXuO/w==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - }, - "dependencies": { - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } - } - }, - "minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "minipass-pipeline": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz", - "integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, "miniraf": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/miniraf/-/miniraf-1.0.0.tgz", @@ -15957,12 +14837,6 @@ "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", "dev": true }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true - }, "mz": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", @@ -16134,12 +15008,6 @@ } } }, - "node-loader": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/node-loader/-/node-loader-0.6.0.tgz", - "integrity": "sha1-x5fvUQle1YWZArFX9jhPY2HgWug=", - "dev": true - }, "node-modules-regexp": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz", @@ -19803,18 +18671,6 @@ "os-tmpdir": "^1.0.0" } }, - "ouch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ouch/-/ouch-2.0.0.tgz", - "integrity": "sha512-kaAZtzpV3iSDdGHQKz7/dRVWd7nXNO1OUNHNtZIW9ryoBvb6y8QtYfpWdcBUFgBzMbMYVA/PGPeoeJU95VHK7Q==", - "dev": true, - "requires": { - "@positron/stack-trace": "1.0.0", - "ejs": "^2.3.1", - "escape-html": "^1.0.1", - "lodash": "^4.17.10" - } - }, "output-file-sync": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-2.0.1.tgz", @@ -19866,15 +18722,6 @@ "p-limit": "^2.0.0" } }, - "p-map": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", - "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, "p-reduce": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz", @@ -20110,12 +18957,6 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, - "picomatch": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz", - "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==", - "dev": true - }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -20791,47 +19632,6 @@ } } }, - "postcss-modules-extract-imports": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz", - "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==", - "dev": true, - "requires": { - "postcss": "^7.0.5" - } - }, - "postcss-modules-local-by-default": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz", - "integrity": "sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==", - "dev": true, - "requires": { - "icss-utils": "^4.1.1", - "postcss": "^7.0.16", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.0.0" - } - }, - "postcss-modules-scope": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz", - "integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==", - "dev": true, - "requires": { - "postcss": "^7.0.6", - "postcss-selector-parser": "^6.0.0" - } - }, - "postcss-modules-values": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz", - "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==", - "dev": true, - "requires": { - "icss-utils": "^4.0.0", - "postcss": "^7.0.6" - } - }, "postcss-normalize-charset": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz", @@ -21124,35 +19924,6 @@ } } }, - "postcss-rtl": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/postcss-rtl/-/postcss-rtl-1.5.0.tgz", - "integrity": "sha512-7uQeaMBhAlnu7xgytvTocojFKp08W4FND/xE/ajj/J6ABOGhdDF1mLGzaRrC5/u/Sr71BEUi13xgvs2j8U16AA==", - "dev": true, - "requires": { - "rtlcss": "^2.4.0" - } - }, - "postcss-safe-parser": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.1.tgz", - "integrity": "sha512-xZsFA3uX8MO3yAda03QrG3/Eg1LN3EPfjjf07vke/46HERLZyHrTsQ9E1r1w1W//fWEhtYNndo2hQplN2cVpCQ==", - "dev": true, - "requires": { - "postcss": "^7.0.0" - } - }, - "postcss-selector-parser": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz", - "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==", - "dev": true, - "requires": { - "cssesc": "^3.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - }, "postcss-svgo": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz", @@ -21184,12 +19955,6 @@ "uniqs": "^2.0.0" } }, - "postcss-value-parser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz", - "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==", - "dev": true - }, "postcss-zindex": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", @@ -21297,12 +20062,6 @@ "js-beautify": "^1.6.12" } }, - "pretty-bytes": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz", - "integrity": "sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==", - "dev": true - }, "pretty-error": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz", @@ -21466,11 +20225,6 @@ "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", "dev": true }, - "quasar": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/quasar/-/quasar-1.2.1.tgz", - "integrity": "sha512-7PbX8HecdrDzpG9zcZk5PSuPRFicU6b07N9Dk0uk5N+2LNGEFGBwIuQnLeDpq03Xdv98Q6GpTTZNaWpXdYBZcg==" - }, "quasar-extras": { "version": "2.0.9", "resolved": "https://registry.npmjs.org/quasar-extras/-/quasar-extras-2.0.9.tgz", @@ -22077,16 +20831,6 @@ "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, "ret": { "version": "0.1.15", "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", @@ -22098,12 +20842,6 @@ "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", "dev": true }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, "rgb-regex": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz", @@ -22140,41 +20878,6 @@ "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==", "dev": true }, - "rtlcss": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-2.4.0.tgz", - "integrity": "sha512-hdjFhZ5FCI0ABOfyXOMOhBtwPWtANLCG7rOiOcRf+yi5eDdxmDjqBruWouEnwVdzfh/TWF6NNncIEsigOCFZOA==", - "dev": true, - "requires": { - "chalk": "^2.3.0", - "findup": "^0.1.5", - "mkdirp": "^0.5.1", - "postcss": "^6.0.14", - "strip-json-comments": "^2.0.0" - }, - "dependencies": { - "postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, "run-async": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", @@ -22184,12 +20887,6 @@ "is-promise": "^2.1.0" } }, - "run-parallel": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", - "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", - "dev": true - }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", @@ -23304,62 +22001,6 @@ } } }, - "stylus": { - "version": "0.54.7", - "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz", - "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==", - "dev": true, - "requires": { - "css-parse": "~2.0.0", - "debug": "~3.1.0", - "glob": "^7.1.3", - "mkdirp": "~0.5.x", - "safer-buffer": "^2.1.2", - "sax": "~1.2.4", - "semver": "^6.0.0", - "source-map": "^0.7.3" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true - } - } - }, - "stylus-loader": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz", - "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", - "dev": true, - "requires": { - "loader-utils": "^1.0.2", - "lodash.clonedeep": "^4.5.0", - "when": "~3.6.x" - } - }, "supports-color": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", @@ -23541,154 +22182,6 @@ "source-map-support": "~0.5.12" } }, - "terser-webpack-plugin": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.1.2.tgz", - "integrity": "sha512-MF/C4KABwqYOfRDi87f7gG07GP7Wj/kyiX938UxIGIO6l5mkh8XJL7xtS0hX/CRdVQaZI7ThGUPZbznrCjsGpg==", - "dev": true, - "requires": { - "cacache": "^13.0.0", - "find-cache-dir": "^3.0.0", - "jest-worker": "^24.9.0", - "schema-utils": "^2.4.1", - "serialize-javascript": "^2.1.0", - "source-map": "^0.6.1", - "terser": "^4.3.4", - "webpack-sources": "^1.4.3" - }, - "dependencies": { - "cacache": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz", - "integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==", - "dev": true, - "requires": { - "chownr": "^1.1.2", - "figgy-pudding": "^3.5.1", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "graceful-fs": "^4.2.2", - "infer-owner": "^1.0.4", - "lru-cache": "^5.1.1", - "minipass": "^3.0.0", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "p-map": "^3.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^2.7.1", - "ssri": "^7.0.0", - "unique-filename": "^1.1.1" - } - }, - "find-cache-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.0.0.tgz", - "integrity": "sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.0", - "pkg-dir": "^4.1.0" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "fs-minipass": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.0.0.tgz", - "integrity": "sha512-40Qz+LFXmd9tzYVnnBmZvFfvAADfUA14TXPK1s7IfElJTIZ97rA8w4Kin7Wt5JBrC3ShnnFJO/5vPjPEeJIq9A==", - "dev": true, - "requires": { - "minipass": "^3.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "make-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz", - "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==", - "dev": true, - "requires": { - "semver": "^6.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, - "schema-utils": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.4.1.tgz", - "integrity": "sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==", - "dev": true, - "requires": { - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "serialize-javascript": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.0.tgz", - "integrity": "sha512-a/mxFfU00QT88umAJQsNWOnUKckhNCqOl028N48e7wFmo2/EHpTo9Wso+iJJCMrQnmFvcjto5RJdAHEvVhcyUQ==", - "dev": true - }, - "ssri": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.0.1.tgz", - "integrity": "sha512-FfndBvkXL9AHyGLNzU3r9AvYIBBZ7gm+m+kd0p8cT3/v4OliMAyipZAhLVEv1Zi/k4QFq9CstRGVd9pW/zcHFQ==", - "dev": true, - "requires": { - "figgy-pudding": "^3.5.1", - "minipass": "^3.0.0" - } - } - } - }, "test-exclude": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.3.tgz", @@ -24228,12 +22721,6 @@ "prelude-ls": "~1.1.2" } }, - "type-fest": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz", - "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==", - "dev": true - }, "type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", @@ -24261,6 +22748,7 @@ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.1.tgz", "integrity": "sha512-+dSJLJpXBb6oMHP+Yvw8hUgElz4gLTh82XuX68QiJVTXaE5ibl6buzhNkQdYhBlIhozWOC9ge16wyRmjG4TwVQ==", "dev": true, + "optional": true, "requires": { "commander": "2.20.0", "source-map": "~0.6.1" @@ -24270,7 +22758,8 @@ "version": "2.20.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", - "dev": true + "dev": true, + "optional": true } } }, @@ -24525,35 +23014,6 @@ } } }, - "url-loader": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.1.0.tgz", - "integrity": "sha512-kVrp/8VfEm5fUt+fl2E0FQyrpmOYgMEkBsv8+UDP1wFhszECq5JyGF33I7cajlVY90zRZ6MyfgKXngLvHYZX8A==", - "dev": true, - "requires": { - "loader-utils": "^1.2.3", - "mime": "^2.4.4", - "schema-utils": "^2.0.0" - }, - "dependencies": { - "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", - "dev": true - }, - "schema-utils": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.4.1.tgz", - "integrity": "sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==", - "dev": true, - "requires": { - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1" - } - } - } - }, "url-parse": { "version": "1.4.7", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", @@ -24813,61 +23273,6 @@ "scrollreveal": "^4.0.2" } }, - "vue-server-renderer": { - "version": "2.6.10", - "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.6.10.tgz", - "integrity": "sha512-UYoCEutBpKzL2fKCwx8zlRtRtwxbPZXKTqbl2iIF4yRZUNO/ovrHyDAJDljft0kd+K0tZhN53XRHkgvCZoIhug==", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "hash-sum": "^1.0.2", - "he": "^1.1.0", - "lodash.template": "^4.4.0", - "lodash.uniq": "^4.5.0", - "resolve": "^1.2.0", - "serialize-javascript": "^1.3.0", - "source-map": "0.5.6" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=", - "dev": true - }, - "source-map": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", @@ -25655,16 +24060,6 @@ "ws": "^6.0.0" } }, - "webpack-chain": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.0.0.tgz", - "integrity": "sha512-NK62XgJOOSmYs4kaXFIKKeClpuOVHY7m6e4XwxbVX/2HAUboH6xFCTVXMVv8+jB6K8o/UGjlo1Cv3XXOyNAAGw==", - "dev": true, - "requires": { - "deepmerge": "^1.5.2", - "javascript-stringify": "^2.0.0" - } - }, "webpack-cli": { "version": "3.3.9", "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz", @@ -25920,12 +24315,6 @@ "lodash": "^4.17.15" } }, - "webpack-node-externals": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz", - "integrity": "sha512-ajerHZ+BJKeCLviLUUmnyd5B4RavLF76uv3cs6KNuO8W+HuQaEs0y0L7o40NQxdPy5w0pcv8Ew7yPUAQG0UdCg==", - "dev": true - }, "webpack-sources": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", @@ -25979,12 +24368,6 @@ "webidl-conversions": "^4.0.2" } }, - "when": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz", - "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=", - "dev": true - }, "whet.extend": { "version": "0.9.9", "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", @@ -26036,15 +24419,6 @@ "babel-runtime": "6.x.x" } }, - "workbox-background-sync": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-4.3.1.tgz", - "integrity": "sha512-1uFkvU8JXi7L7fCHVBEEnc3asPpiAL33kO495UMcD5+arew9IbKW2rV5lpzhoWcm/qhGB89YfO4PmB/0hQwPRg==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, "workbox-broadcast-cache-update": { "version": "3.6.3", "resolved": "https://registry.npmjs.org/workbox-broadcast-cache-update/-/workbox-broadcast-cache-update-3.6.3.tgz", @@ -26062,59 +24436,6 @@ } } }, - "workbox-broadcast-update": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-4.3.1.tgz", - "integrity": "sha512-MTSfgzIljpKLTBPROo4IpKjESD86pPFlZwlvVG32Kb70hW+aob4Jxpblud8EhNb1/L5m43DUM4q7C+W6eQMMbA==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-build": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-4.3.1.tgz", - "integrity": "sha512-UHdwrN3FrDvicM3AqJS/J07X0KXj67R8Cg0waq1MKEOqzo89ap6zh6LmaLnRAjpB+bDIz+7OlPye9iii9KBnxw==", - "dev": true, - "requires": { - "@babel/runtime": "^7.3.4", - "@hapi/joi": "^15.0.0", - "common-tags": "^1.8.0", - "fs-extra": "^4.0.2", - "glob": "^7.1.3", - "lodash.template": "^4.4.0", - "pretty-bytes": "^5.1.0", - "stringify-object": "^3.3.0", - "strip-comments": "^1.0.2", - "workbox-background-sync": "^4.3.1", - "workbox-broadcast-update": "^4.3.1", - "workbox-cacheable-response": "^4.3.1", - "workbox-core": "^4.3.1", - "workbox-expiration": "^4.3.1", - "workbox-google-analytics": "^4.3.1", - "workbox-navigation-preload": "^4.3.1", - "workbox-precaching": "^4.3.1", - "workbox-range-requests": "^4.3.1", - "workbox-routing": "^4.3.1", - "workbox-strategies": "^4.3.1", - "workbox-streams": "^4.3.1", - "workbox-sw": "^4.3.1", - "workbox-window": "^4.3.1" - }, - "dependencies": { - "fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - } - } - }, "workbox-cache-expiration": { "version": "3.6.3", "resolved": "https://registry.npmjs.org/workbox-cache-expiration/-/workbox-cache-expiration-3.6.3.tgz", @@ -26132,15 +24453,6 @@ } } }, - "workbox-cacheable-response": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz", - "integrity": "sha512-Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, "workbox-cli": { "version": "3.6.3", "resolved": "https://registry.npmjs.org/workbox-cli/-/workbox-cli-3.6.3.tgz", @@ -26431,113 +24743,6 @@ } } }, - "workbox-core": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-4.3.1.tgz", - "integrity": "sha512-I3C9jlLmMKPxAC1t0ExCq+QoAMd0vAAHULEgRZ7kieCdUd919n53WC0AfvokHNwqRhGn+tIIj7vcb5duCjs2Kg==", - "dev": true - }, - "workbox-expiration": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-4.3.1.tgz", - "integrity": "sha512-vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-google-analytics": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-4.3.1.tgz", - "integrity": "sha512-xzCjAoKuOb55CBSwQrbyWBKqp35yg1vw9ohIlU2wTy06ZrYfJ8rKochb1MSGlnoBfXGWss3UPzxR5QL5guIFdg==", - "dev": true, - "requires": { - "workbox-background-sync": "^4.3.1", - "workbox-core": "^4.3.1", - "workbox-routing": "^4.3.1", - "workbox-strategies": "^4.3.1" - } - }, - "workbox-navigation-preload": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-4.3.1.tgz", - "integrity": "sha512-K076n3oFHYp16/C+F8CwrRqD25GitA6Rkd6+qAmLmMv1QHPI2jfDwYqrytOfKfYq42bYtW8Pr21ejZX7GvALOw==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-precaching": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-4.3.1.tgz", - "integrity": "sha512-piSg/2csPoIi/vPpp48t1q5JLYjMkmg5gsXBQkh/QYapCdVwwmKlU9mHdmy52KsDGIjVaqEUMFvEzn2LRaigqQ==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-range-requests": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-4.3.1.tgz", - "integrity": "sha512-S+HhL9+iTFypJZ/yQSl/x2Bf5pWnbXdd3j57xnb0V60FW1LVn9LRZkPtneODklzYuFZv7qK6riZ5BNyc0R0jZA==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-routing": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-4.3.1.tgz", - "integrity": "sha512-FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-strategies": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-4.3.1.tgz", - "integrity": "sha512-F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-streams": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-4.3.1.tgz", - "integrity": "sha512-4Kisis1f/y0ihf4l3u/+ndMkJkIT4/6UOacU3A4BwZSAC9pQ9vSvJpIi/WFGQRH/uPXvuVjF5c2RfIPQFSS2uA==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-sw": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-4.3.1.tgz", - "integrity": "sha512-0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w==", - "dev": true - }, - "workbox-webpack-plugin": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-4.3.1.tgz", - "integrity": "sha512-gJ9jd8Mb8wHLbRz9ZvGN57IAmknOipD3W4XNE/Lk/4lqs5Htw4WOQgakQy/o/4CoXQlMCYldaqUg+EJ35l9MEQ==", - "dev": true, - "requires": { - "@babel/runtime": "^7.0.0", - "json-stable-stringify": "^1.0.1", - "workbox-build": "^4.3.1" - } - }, - "workbox-window": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-4.3.1.tgz", - "integrity": "sha512-C5gWKh6I58w3GeSc0wp2Ne+rqVw8qwcmZnQGpjiek8A2wpbxSJb1FdCoQVO+jDJs35bFgo/WETgl1fqgsxN0Hg==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, "worker-farm": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", diff --git a/package.json b/package.json index 84f7245..186a2c4 100755 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "@babel/plugin-transform-runtime": "^7.4.0", "@babel/runtime": "^7.0.0", "@quasar/extras": "^1.3.2", + "@types/googlemaps": "^3.38.0", "@types/vuelidate": "^0.7.0", "@vue/eslint-config-standard": "^4.0.0", "acorn": "^6.0.0", diff --git a/src/boot/vee-validate.ts b/src/boot/vee-validate.ts index d849de1..4dea2c4 100644 --- a/src/boot/vee-validate.ts +++ b/src/boot/vee-validate.ts @@ -1,4 +1,4 @@ -import VeeValidate from "vee-validate"; +import VeeValidate from 'vee-validate' export default ({ Vue }) => { Vue.use(VeeValidate, { inject: false }) diff --git a/src/components/CCardDiscipline/CCardDiscipline.vue b/src/components/CCardDiscipline/CCardDiscipline.vue index 3ba2d2c..a2d6ba2 100644 --- a/src/components/CCardDiscipline/CCardDiscipline.vue +++ b/src/components/CCardDiscipline/CCardDiscipline.vue @@ -10,7 +10,7 @@ -
{{discipline.description}}
+
diff --git a/src/components/CGoogleMap/CGoogleMap.scss b/src/components/CGoogleMap/CGoogleMap.scss new file mode 100644 index 0000000..09d48a3 --- /dev/null +++ b/src/components/CGoogleMap/CGoogleMap.scss @@ -0,0 +1,4 @@ +#map { + height: 400px; + width: 90%; +} diff --git a/src/components/CGoogleMap/CGoogleMap.ts b/src/components/CGoogleMap/CGoogleMap.ts new file mode 100644 index 0000000..f9623b1 --- /dev/null +++ b/src/components/CGoogleMap/CGoogleMap.ts @@ -0,0 +1,28 @@ +import Vue from 'vue' +import { Component, Prop, Watch } from 'vue-property-decorator' + +import { toolsext } from '@src/store/Modules/toolsext' + +@Component({ + name: 'CGoogleMap' +}) + +export default class CGoogleMap extends Vue { + @Prop({ required: true, default: 'one' }) public tab + + public map = null + + public initMap() { + + // this.map = new window.google.maps.Map(document.getElementById('map'), { + // center: { lat: -34.397, lng: 150.644 }, + // zoom: 8 + // }) + } + + public async mounted() { + // await this.$google() + // this.initMap() + } + +} diff --git a/src/components/CGoogleMap/CGoogleMap.vue b/src/components/CGoogleMap/CGoogleMap.vue new file mode 100644 index 0000000..4efe53d --- /dev/null +++ b/src/components/CGoogleMap/CGoogleMap.vue @@ -0,0 +1,12 @@ + + + + + diff --git a/src/components/CGoogleMap/index.ts b/src/components/CGoogleMap/index.ts new file mode 100644 index 0000000..4394732 --- /dev/null +++ b/src/components/CGoogleMap/index.ts @@ -0,0 +1 @@ +export {default as CGoogleMap} from './CGoogleMap.vue' diff --git a/src/components/COpenStreetMap/COpenStreetMap.scss b/src/components/COpenStreetMap/COpenStreetMap.scss new file mode 100644 index 0000000..09d48a3 --- /dev/null +++ b/src/components/COpenStreetMap/COpenStreetMap.scss @@ -0,0 +1,4 @@ +#map { + height: 400px; + width: 90%; +} diff --git a/src/components/COpenStreetMap/COpenStreetMap.ts b/src/components/COpenStreetMap/COpenStreetMap.ts new file mode 100644 index 0000000..d434d14 --- /dev/null +++ b/src/components/COpenStreetMap/COpenStreetMap.ts @@ -0,0 +1,24 @@ +import Vue from 'vue' +import { Component, Prop, Watch } from 'vue-property-decorator' + +import { toolsext } from '@src/store/Modules/toolsext' +import { tools } from '../../store/Modules/tools' + +@Component({ + name: 'COpenStreetMap' +}) + +export default class COpenStreetMap extends Vue { + @Prop({required: true}) public title: string + @Prop({required: true}) public coordinates: string + @Prop({required: true}) public coord_big: string + + get mywidth() { + return tools.getwidth(this) - 20 + } + + get myheight() { + return 450 + } + +} diff --git a/src/components/COpenStreetMap/COpenStreetMap.vue b/src/components/COpenStreetMap/COpenStreetMap.vue new file mode 100644 index 0000000..61308d0 --- /dev/null +++ b/src/components/COpenStreetMap/COpenStreetMap.vue @@ -0,0 +1,19 @@ + + + + diff --git a/src/components/COpenStreetMap/index.ts b/src/components/COpenStreetMap/index.ts new file mode 100644 index 0000000..fd183f7 --- /dev/null +++ b/src/components/COpenStreetMap/index.ts @@ -0,0 +1 @@ +export {default as COpenStreetMap} from './COpenStreetMap.vue' diff --git a/src/components/Footer/Footer.vue b/src/components/Footer/Footer.vue index 5036a47..d2143a7 100644 --- a/src/components/Footer/Footer.vue +++ b/src/components/Footer/Footer.vue @@ -98,7 +98,7 @@

-
+
{{tools.getLabelByItem(myitemmenu, mythisfoot)}}
diff --git a/src/components/index.ts b/src/components/index.ts index d3ded28..be84d1f 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -30,3 +30,5 @@ export * from './FormNewsletter' export * from './CGridTableRec' export * from './CFacebookFrame' export * from './Shen/CTesseraElettronica' +export * from './CGoogleMap' +export * from './COpenStreetMap' diff --git a/src/js/storage.js___jb_tmp___ b/src/js/storage.js___jb_tmp___ deleted file mode 100644 index e69de29..0000000 diff --git a/src/layouts/menuone/menuOne.ts b/src/layouts/menuone/menuOne.ts index da8ea85..088a5f9 100644 --- a/src/layouts/menuone/menuOne.ts +++ b/src/layouts/menuone/menuOne.ts @@ -32,11 +32,6 @@ export default class MenuOne extends Vue { return GlobalStore.getters.getmenu } - public visumenu(elem) { // : IListRoutes - return (elem.onlyAdmin && UserStore.state.isAdmin) || (elem.onlyManager && UserStore.state.isManager) - || ((!elem.onlyAdmin) && (!elem.onlyManager)) - } - public setParentVisibilityBasedOnRoute(parent) { parent.routes.forEach((item) => { if (this.$route.path === item.path) { diff --git a/src/layouts/menuone/menuOne.vue b/src/layouts/menuone/menuOne.vue index 3eebf2c..0b2ff09 100644 --- a/src/layouts/menuone/menuOne.vue +++ b/src/layouts/menuone/menuOne.vue @@ -4,7 +4,7 @@