From d7730fcac1b97dcdb122478544093689249d245e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 12 Oct 2022 17:52:57 +0530 Subject: [PATCH 01/14] video conf --- .../Properties/PropertyTextLocation.vue | 40 +++++++++++++++++-- .../Editor/Resources/ResourceList.vue | 4 +- src/mixins/PropertyMixin.js | 2 + src/models/rfcProps.js | 2 +- src/views/EditSidebar.vue | 6 +-- 5 files changed, 45 insertions(+), 9 deletions(-) diff --git a/src/components/Editor/Properties/PropertyTextLocation.vue b/src/components/Editor/Properties/PropertyTextLocation.vue index b87b36d49..0bc26f5c8 100644 --- a/src/components/Editor/Properties/PropertyTextLocation.vue +++ b/src/components/Editor/Properties/PropertyTextLocation.vue @@ -15,6 +15,11 @@ :title="readableName" :value="value" @input.prevent.stop="changeValue" /> + 0; --i) result += chars[Math.floor(Math.random() * chars.length)] + return result +} +function JitsiUrlGenerator(){ + let url='https://meet.jit.si/' + let randomString + let charstr ='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' + randomString= generateRandomString(6,charstr) + url= url+randomString + return url +} /** * @param el @@ -59,7 +77,6 @@ function isValidHttpUrl(string) { function setVisibility(el, binding) { el.style.visibility = (binding.value === true) ? 'visible' : 'hidden' } - export default { name: 'PropertyTextLocation', directives: { @@ -87,6 +104,7 @@ export default { ], data: () => ({ visibleValue: true, + clearValue: true, }), computed: { display() { @@ -112,15 +130,26 @@ export default { }, }, mounted() { - this.visibleValue = isValidHttpUrl(this.value) + if (typeof this.value !== 'string') { + this.$emit('update:value',JitsiUrlGenerator()) + this.visibleValue = true + this.clearValue = true + }else if (this.value === '') { + this.$emit('update:value',JitsiUrlGenerator()) + this.visibleValue = true + this.clearValue = true + }else{ + this.visibleValue = this.clearValue = isValidHttpUrl(this.value.trim()) + } }, methods: { changeValue(event) { if (event.target.value.trim() === '') { this.visibleValue = false + this.clearValue = false this.$emit('update:value', null) } else { - this.visibleValue = isValidHttpUrl(event.target.value.trim()) + this.visibleValue = this.clearValue = isValidHttpUrl(event.target.value.trim()) this.$emit('update:value', event.target.value) } }, @@ -128,6 +157,11 @@ export default { const urlval = this.value window.open(urlval, '_blank').focus() }, + removeval() { + this.visibleValue = false + this.clearValue = false + this.$emit('update:value', null) + }, }, } diff --git a/src/components/Editor/Resources/ResourceList.vue b/src/components/Editor/Resources/ResourceList.vue index bf3c25a86..0ddc97d07 100644 --- a/src/components/Editor/Resources/ResourceList.vue +++ b/src/components/Editor/Resources/ResourceList.vue @@ -65,7 +65,7 @@ import ResourceListItem from './ResourceListItem' import OrganizerNoEmailError from '../OrganizerNoEmailError' import { organizerDisplayName, removeMailtoPrefix } from '../../../utils/attendee' -import MapMarker from 'vue-material-design-icons/MapMarker.vue' +import VideoBox from 'vue-material-design-icons/VideoBox.vue' export default { name: 'ResourceList', @@ -74,7 +74,7 @@ export default { NoAttendeesView, ResourceListSearch, OrganizerNoEmailError, - MapMarker, + VideoBox, }, props: { isReadOnly: { diff --git a/src/mixins/PropertyMixin.js b/src/mixins/PropertyMixin.js index ed6891d48..2ee38cf16 100644 --- a/src/mixins/PropertyMixin.js +++ b/src/mixins/PropertyMixin.js @@ -37,6 +37,7 @@ import MapMarker from 'vue-material-design-icons/MapMarker.vue' import Tag from 'vue-material-design-icons/Tag.vue' import TextBoxOutline from 'vue-material-design-icons/TextBoxOutline.vue' import Bell from 'vue-material-design-icons/Bell.vue' +import Video from 'vue-material-design-icons/Video.vue' export default { components: { @@ -48,6 +49,7 @@ export default { Tag, TextBoxOutline, Bell, + Video, }, props: { /** diff --git a/src/models/rfcProps.js b/src/models/rfcProps.js index 487e490b2..0434ae3fa 100644 --- a/src/models/rfcProps.js +++ b/src/models/rfcProps.js @@ -50,7 +50,7 @@ const getRFCProperties = () => { location: { readableName: t('calendar', 'Location'), placeholder: t('calendar', 'Add a location'), - icon: 'MapMarker', + icon: 'Video', tagPlaceholder: t('calendar', 'Open Link'), }, /** diff --git a/src/views/EditSidebar.vue b/src/views/EditSidebar.vue index c961acd26..8c9b2303e 100644 --- a/src/views/EditSidebar.vue +++ b/src/views/EditSidebar.vue @@ -205,7 +205,7 @@ :name="$t('calendar', 'Resources')" :order="2">
Date: Wed, 12 Oct 2022 18:07:38 +0530 Subject: [PATCH 02/14] video conf --- .../Properties/PropertyTextLocation.vue | 41 +++++++++++-------- .../Editor/Resources/ResourceList.vue | 3 -- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/components/Editor/Properties/PropertyTextLocation.vue b/src/components/Editor/Properties/PropertyTextLocation.vue index 0bc26f5c8..8849f26ef 100644 --- a/src/components/Editor/Properties/PropertyTextLocation.vue +++ b/src/components/Editor/Properties/PropertyTextLocation.vue @@ -56,17 +56,24 @@ function isValidHttpUrl(string) { } return url.protocol === 'http:' || url.protocol === 'https:' } +/** + * + * @param length + * @param chars + */ function generateRandomString(length, chars) { - var result = ''; - for (var i = length; i > 0; --i) result += chars[Math.floor(Math.random() * chars.length)] - return result + let result = '' + for (let i = length; i > 0; --i) result += chars[Math.floor(Math.random() * chars.length)] + return result } -function JitsiUrlGenerator(){ - let url='https://meet.jit.si/' - let randomString - let charstr ='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' - randomString= generateRandomString(6,charstr) - url= url+randomString +/** + * + */ +function JitsiUrlGenerator() { + let url = 'https://meet.jit.si/' + const charstr = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' + const randomString = generateRandomString(6, charstr) + url = url + randomString return url } @@ -131,15 +138,15 @@ export default { }, mounted() { if (typeof this.value !== 'string') { - this.$emit('update:value',JitsiUrlGenerator()) - this.visibleValue = true - this.clearValue = true - }else if (this.value === '') { - this.$emit('update:value',JitsiUrlGenerator()) + this.$emit('update:value', JitsiUrlGenerator()) + this.visibleValue = true + this.clearValue = true + } else if (this.value === '') { + this.$emit('update:value', JitsiUrlGenerator()) this.visibleValue = true this.clearValue = true - }else{ - this.visibleValue = this.clearValue = isValidHttpUrl(this.value.trim()) + } else { + this.visibleValue = this.clearValue = isValidHttpUrl(this.value.trim()) } }, methods: { @@ -149,7 +156,7 @@ export default { this.clearValue = false this.$emit('update:value', null) } else { - this.visibleValue = this.clearValue = isValidHttpUrl(event.target.value.trim()) + this.visibleValue = this.clearValue = isValidHttpUrl(event.target.value.trim()) this.$emit('update:value', event.target.value) } }, diff --git a/src/components/Editor/Resources/ResourceList.vue b/src/components/Editor/Resources/ResourceList.vue index 0ddc97d07..5d71c5da8 100644 --- a/src/components/Editor/Resources/ResourceList.vue +++ b/src/components/Editor/Resources/ResourceList.vue @@ -65,8 +65,6 @@ import ResourceListItem from './ResourceListItem' import OrganizerNoEmailError from '../OrganizerNoEmailError' import { organizerDisplayName, removeMailtoPrefix } from '../../../utils/attendee' -import VideoBox from 'vue-material-design-icons/VideoBox.vue' - export default { name: 'ResourceList', components: { @@ -74,7 +72,6 @@ export default { NoAttendeesView, ResourceListSearch, OrganizerNoEmailError, - VideoBox, }, props: { isReadOnly: { -- GitLab From 96bf18d43d5f30462822bb1f917b79db726f5adf Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 13 Oct 2022 14:03:46 +0530 Subject: [PATCH 03/14] add link with attendee --- .../Editor/Invitees/InviteesList.vue | 5 ++ .../Properties/PropertyTextLocation.vue | 62 +++++++++++-------- .../Editor/Resources/ResourceList.vue | 3 + src/views/EditSidebar.vue | 11 +++- 4 files changed, 53 insertions(+), 28 deletions(-) diff --git a/src/components/Editor/Invitees/InviteesList.vue b/src/components/Editor/Invitees/InviteesList.vue index 35941920f..41ac5fb33 100644 --- a/src/components/Editor/Invitees/InviteesList.vue +++ b/src/components/Editor/Invitees/InviteesList.vue @@ -178,6 +178,7 @@ export default { timezoneId, organizer: this.$store.getters.getCurrentUserPrincipal, }) + this.$emit('newattendeeadded', 'added') }, removeAttendee(attendee) { this.$store.commit('removeAttendee', { @@ -191,6 +192,10 @@ export default { closeFreeBusy() { this.showFreeBusyModel = false }, + messagelist() { + alert('d') + this.$emit('messagechk', 'child component (emitted)') + }, async createTalkRoom() { const NEW_LINE = '\r\n' try { diff --git a/src/components/Editor/Properties/PropertyTextLocation.vue b/src/components/Editor/Properties/PropertyTextLocation.vue index 8849f26ef..c3a2a2478 100644 --- a/src/components/Editor/Properties/PropertyTextLocation.vue +++ b/src/components/Editor/Properties/PropertyTextLocation.vue @@ -26,14 +26,10 @@ class="icon-externallink" @click="goto" /> -
+
-
- +
+
@@ -63,7 +59,9 @@ function isValidHttpUrl(string) { */ function generateRandomString(length, chars) { let result = '' - for (let i = length; i > 0; --i) result += chars[Math.floor(Math.random() * chars.length)] + for (let i = length; i > 0; --i) { result += chars[Math.floor(Math.random() * chars.length)] } + const todaynow = new Date() + result = result + todaynow.getDate() + todaynow.getMonth() + todaynow.getFullYear().toString().substr(-2) return result } /** @@ -71,8 +69,8 @@ function generateRandomString(length, chars) { */ function JitsiUrlGenerator() { let url = 'https://meet.jit.si/' - const charstr = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' - const randomString = generateRandomString(6, charstr) + const charstr = '0123456789abcdefghijklmnopqrstuvwxyz' + const randomString = generateRandomString(5, charstr) url = url + randomString return url } @@ -82,7 +80,7 @@ function JitsiUrlGenerator() { * @param binding */ function setVisibility(el, binding) { - el.style.visibility = (binding.value === true) ? 'visible' : 'hidden' + el.style.visibility = binding.value === true ? 'visible' : 'hidden' } export default { name: 'PropertyTextLocation', @@ -92,26 +90,23 @@ export default { InformationVariant, visible: { bind(el, binding) { - setVisibility(el, binding) + setVisibility(el, binding) }, inserted(el, binding) { - setVisibility(el, binding) + setVisibility(el, binding) }, update(el, binding) { - setVisibility(el, binding) + setVisibility(el, binding) }, componentUpdated(el, binding) { - setVisibility(el, binding) + setVisibility(el, binding) }, - }, }, - mixins: [ - PropertyMixin, - ], + mixins: [PropertyMixin], data: () => ({ - visibleValue: true, - clearValue: true, + visibleValue: false, + clearValue: false, }), computed: { display() { @@ -137,7 +132,7 @@ export default { }, }, mounted() { - if (typeof this.value !== 'string') { + /* if (typeof this.value !== 'string') { this.$emit('update:value', JitsiUrlGenerator()) this.visibleValue = true this.clearValue = true @@ -145,9 +140,9 @@ export default { this.$emit('update:value', JitsiUrlGenerator()) this.visibleValue = true this.clearValue = true - } else { - this.visibleValue = this.clearValue = isValidHttpUrl(this.value.trim()) - } + } else { */ + this.visibleValue = this.clearValue = isValidHttpUrl(this.value) + /* } */ }, methods: { changeValue(event) { @@ -156,7 +151,9 @@ export default { this.clearValue = false this.$emit('update:value', null) } else { - this.visibleValue = this.clearValue = isValidHttpUrl(event.target.value.trim()) + this.visibleValue = this.clearValue = isValidHttpUrl( + event.target.value.trim() + ) this.$emit('update:value', event.target.value) } }, @@ -169,6 +166,19 @@ export default { this.clearValue = false this.$emit('update:value', null) }, + addjitsiurl() { + if (typeof this.value !== 'string') { + this.$emit('update:value', JitsiUrlGenerator()) + this.visibleValue = true + this.clearValue = true + } else if (this.value === '') { + this.$emit('update:value', JitsiUrlGenerator()) + this.visibleValue = true + this.clearValue = true + } else { + this.visibleValue = this.clearValue = isValidHttpUrl(this.value.trim()) + } + }, }, } diff --git a/src/components/Editor/Resources/ResourceList.vue b/src/components/Editor/Resources/ResourceList.vue index 5d71c5da8..bf3c25a86 100644 --- a/src/components/Editor/Resources/ResourceList.vue +++ b/src/components/Editor/Resources/ResourceList.vue @@ -65,6 +65,8 @@ import ResourceListItem from './ResourceListItem' import OrganizerNoEmailError from '../OrganizerNoEmailError' import { organizerDisplayName, removeMailtoPrefix } from '../../../utils/attendee' +import MapMarker from 'vue-material-design-icons/MapMarker.vue' + export default { name: 'ResourceList', components: { @@ -72,6 +74,7 @@ export default { NoAttendeesView, ResourceListSearch, OrganizerNoEmailError, + MapMarker, }, props: { isReadOnly: { diff --git a/src/views/EditSidebar.vue b/src/views/EditSidebar.vue index 8c9b2303e..d2d2a66f4 100644 --- a/src/views/EditSidebar.vue +++ b/src/views/EditSidebar.vue @@ -122,7 +122,8 @@
- + :is-read-only="isReadOnly" + @newattendeeadded="newattendeeadded" />
-- GitLab From a8397930c859d4365b660b992b0c35e44a4327a0 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 13 Oct 2022 15:13:30 +0530 Subject: [PATCH 04/14] icon added --- css/app-sidebar.scss | 14 ++++++++++++++ css/icons.scss | 3 ++- img/close.svg | 3 +++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 img/close.svg diff --git a/css/app-sidebar.scss b/css/app-sidebar.scss index d2cb1a634..50a892b77 100644 --- a/css/app-sidebar.scss +++ b/css/app-sidebar.scss @@ -48,6 +48,20 @@ text-align: center; cursor:pointer; } + .icon-delete { + background-image: var(--icon-calendar-close-0075E0); + opacity: 1; + position: absolute; + top: 0; + right: 34px; + z-index: 2; + display: block; + width: 34px; + height: 100%; + line-height: 34px; + text-align: center; + cursor:pointer; + } } .app-sidebar-header__action { diff --git a/css/icons.scss b/css/icons.scss index dfc0e47e4..c5079fae7 100644 --- a/css/icons.scss +++ b/css/icons.scss @@ -45,4 +45,5 @@ @include icon-black-white('view-week', 'calendar', 1); @include icon-color('reminder', 'calendar', '#fffffe', 1); @include icon-color('reminder', 'calendar', '#000001', 1); -@include icon-color('openlink', 'calendar', '#0075E0', 1); \ No newline at end of file +@include icon-color('openlink', 'calendar', '#0075E0', 1); +@include icon-color('close', 'calendar', '#0075E0', 1); \ No newline at end of file diff --git a/img/close.svg b/img/close.svg new file mode 100644 index 000000000..c265bd87e --- /dev/null +++ b/img/close.svg @@ -0,0 +1,3 @@ + + + -- GitLab From 1dd5827abc8581a24702f8be338c129abd223804 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 17 Oct 2022 10:30:40 +0530 Subject: [PATCH 05/14] border fix --- css/app-sidebar.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/css/app-sidebar.scss b/css/app-sidebar.scss index 50a892b77..9ec1d43ec 100644 --- a/css/app-sidebar.scss +++ b/css/app-sidebar.scss @@ -31,7 +31,6 @@ align-items: stretch !important; position:relative; textarea { - border-right: 0px; padding-right:27px; } .icon-externallink { @@ -774,9 +773,6 @@ .property-text-location { align-items: stretch !important; position: relative; - textarea { - border-right: 0px; - } } .empty-content { -- GitLab From fa4acb2808822a33974f8eb805131d0af75cddc6 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 19 Oct 2022 15:31:48 +0530 Subject: [PATCH 06/14] video link --- .../Editor/Invitees/InviteesList.vue | 4 --- .../Properties/PropertyTextLocation.vue | 32 +++++++------------ 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/components/Editor/Invitees/InviteesList.vue b/src/components/Editor/Invitees/InviteesList.vue index 41ac5fb33..a2ecdedaf 100644 --- a/src/components/Editor/Invitees/InviteesList.vue +++ b/src/components/Editor/Invitees/InviteesList.vue @@ -192,10 +192,6 @@ export default { closeFreeBusy() { this.showFreeBusyModel = false }, - messagelist() { - alert('d') - this.$emit('messagechk', 'child component (emitted)') - }, async createTalkRoom() { const NEW_LINE = '\r\n' try { diff --git a/src/components/Editor/Properties/PropertyTextLocation.vue b/src/components/Editor/Properties/PropertyTextLocation.vue index c3a2a2478..cbeb12721 100644 --- a/src/components/Editor/Properties/PropertyTextLocation.vue +++ b/src/components/Editor/Properties/PropertyTextLocation.vue @@ -16,10 +16,10 @@ :value="value" @input.prevent.stop="changeValue" /> + @click="removeValue" /> ({ visibleValue: false, - clearValue: false, + clearUrl: false, }), computed: { display() { @@ -132,26 +132,16 @@ export default { }, }, mounted() { - /* if (typeof this.value !== 'string') { - this.$emit('update:value', JitsiUrlGenerator()) - this.visibleValue = true - this.clearValue = true - } else if (this.value === '') { - this.$emit('update:value', JitsiUrlGenerator()) - this.visibleValue = true - this.clearValue = true - } else { */ - this.visibleValue = this.clearValue = isValidHttpUrl(this.value) - /* } */ + this.visibleValue = this.clearUrl = isValidHttpUrl(this.value) }, methods: { changeValue(event) { if (event.target.value.trim() === '') { this.visibleValue = false - this.clearValue = false + this.clearUrl = false this.$emit('update:value', null) } else { - this.visibleValue = this.clearValue = isValidHttpUrl( + this.visibleValue = this.clearUrl = isValidHttpUrl( event.target.value.trim() ) this.$emit('update:value', event.target.value) @@ -161,22 +151,22 @@ export default { const urlval = this.value window.open(urlval, '_blank').focus() }, - removeval() { + removeValue() { this.visibleValue = false - this.clearValue = false + this.clearUrl = false this.$emit('update:value', null) }, addjitsiurl() { if (typeof this.value !== 'string') { this.$emit('update:value', JitsiUrlGenerator()) this.visibleValue = true - this.clearValue = true + this.clearUrl = true } else if (this.value === '') { this.$emit('update:value', JitsiUrlGenerator()) this.visibleValue = true - this.clearValue = true + this.clearUrl = true } else { - this.visibleValue = this.clearValue = isValidHttpUrl(this.value.trim()) + this.visibleValue = this.clearUrl = isValidHttpUrl(this.value.trim()) } }, }, -- GitLab From 79b8d628ff75a6caceae1be1288bd2287179f2b1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 19 Oct 2022 18:25:51 +0530 Subject: [PATCH 07/14] code optimized --- src/components/Editor/Properties/PropertyTextLocation.vue | 4 ++-- src/views/EditSidebar.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Editor/Properties/PropertyTextLocation.vue b/src/components/Editor/Properties/PropertyTextLocation.vue index cbeb12721..37097dfcf 100644 --- a/src/components/Editor/Properties/PropertyTextLocation.vue +++ b/src/components/Editor/Properties/PropertyTextLocation.vue @@ -144,7 +144,7 @@ export default { this.visibleValue = this.clearUrl = isValidHttpUrl( event.target.value.trim() ) - this.$emit('update:value', event.target.value) + this.$emit('update:value', event.target.value.trim()) } }, goto() { @@ -156,7 +156,7 @@ export default { this.clearUrl = false this.$emit('update:value', null) }, - addjitsiurl() { + addJitsiUrl() { if (typeof this.value !== 'string') { this.$emit('update:value', JitsiUrlGenerator()) this.visibleValue = true diff --git a/src/views/EditSidebar.vue b/src/views/EditSidebar.vue index d2d2a66f4..eda684e7e 100644 --- a/src/views/EditSidebar.vue +++ b/src/views/EditSidebar.vue @@ -406,7 +406,7 @@ export default { }, newattendeeadded(v) { if (v === 'added') { - this.$refs.form.addjitsiurl() + this.$refs.form.addJitsiUrl() } }, }, -- GitLab From 019867ab4a90106fecdc45f480f3c7d32e9bb787 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 20 Oct 2022 15:29:19 +0530 Subject: [PATCH 08/14] map marker /video icon added --- css/app-sidebar.scss | 3 +++ .../Properties/PropertyTextLocation.vue | 25 ++++++++++++++++--- src/mixins/PropertyMixin.js | 3 +++ src/models/rfcProps.js | 3 ++- src/views/EditSidebar.vue | 4 ++- 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/css/app-sidebar.scss b/css/app-sidebar.scss index 9ec1d43ec..7c1595bc2 100644 --- a/css/app-sidebar.scss +++ b/css/app-sidebar.scss @@ -32,6 +32,9 @@ position:relative; textarea { padding-right:27px; + :hover { + border: 1px solid var(--color-primary-element); + } } .icon-externallink { background-image: var(--icon-calendar-openlink-0075E0); diff --git a/src/components/Editor/Properties/PropertyTextLocation.vue b/src/components/Editor/Properties/PropertyTextLocation.vue index 37097dfcf..216a0d083 100644 --- a/src/components/Editor/Properties/PropertyTextLocation.vue +++ b/src/components/Editor/Properties/PropertyTextLocation.vue @@ -4,7 +4,16 @@ :size="20" :title="readableName" class="property-text__icon" - :class="{ 'property-text__icon--hidden': !showIcon }" /> + :class="{ 'property-text__icon--hidden': !showIcon }" + v-show="vshow1" + /> +
@@ -107,6 +116,8 @@ export default { data: () => ({ visibleValue: false, clearUrl: false, + vshow1:true, + vshow2:false, }), computed: { display() { @@ -132,7 +143,8 @@ export default { }, }, mounted() { - this.visibleValue = this.clearUrl = isValidHttpUrl(this.value) + this.vshow2 = this.visibleValue = this.clearUrl = isValidHttpUrl(this.value) + this.vshow1 = !this.vshow2 }, methods: { changeValue(event) { @@ -141,9 +153,10 @@ export default { this.clearUrl = false this.$emit('update:value', null) } else { - this.visibleValue = this.clearUrl = isValidHttpUrl( + this.vshow2 = this.visibleValue = this.clearUrl = isValidHttpUrl( event.target.value.trim() ) + this.vshow1 = !this.vshow2 this.$emit('update:value', event.target.value.trim()) } }, @@ -155,16 +168,22 @@ export default { this.visibleValue = false this.clearUrl = false this.$emit('update:value', null) + this.vshow2 = false + this.vshow1 = true }, addJitsiUrl() { if (typeof this.value !== 'string') { this.$emit('update:value', JitsiUrlGenerator()) this.visibleValue = true this.clearUrl = true + this.vshow2 = true + this.vshow1 = false } else if (this.value === '') { this.$emit('update:value', JitsiUrlGenerator()) this.visibleValue = true this.clearUrl = true + this.vshow2 = true + this.vshow1 = false } else { this.visibleValue = this.clearUrl = isValidHttpUrl(this.value.trim()) } diff --git a/src/mixins/PropertyMixin.js b/src/mixins/PropertyMixin.js index 2ee38cf16..455912250 100644 --- a/src/mixins/PropertyMixin.js +++ b/src/mixins/PropertyMixin.js @@ -95,6 +95,9 @@ export default { icon() { return this.propModel.icon || '' }, + iconOptional() { + return this.propModel.iconOptional || '' + }, /** * Returns the placeholder text stored in the property-model * If there is no placeholder text set, it returns an empty string diff --git a/src/models/rfcProps.js b/src/models/rfcProps.js index 0434ae3fa..bfd416115 100644 --- a/src/models/rfcProps.js +++ b/src/models/rfcProps.js @@ -50,7 +50,8 @@ const getRFCProperties = () => { location: { readableName: t('calendar', 'Location'), placeholder: t('calendar', 'Add a location'), - icon: 'Video', + icon: 'MapMarker', + iconOptional: 'Video', tagPlaceholder: t('calendar', 'Open Link'), }, /** diff --git a/src/views/EditSidebar.vue b/src/views/EditSidebar.vue index eda684e7e..a717b54e5 100644 --- a/src/views/EditSidebar.vue +++ b/src/views/EditSidebar.vue @@ -207,7 +207,7 @@ :name="$t('calendar', 'Resources')" :order="2">
Date: Thu, 20 Oct 2022 16:18:48 +0530 Subject: [PATCH 09/14] map marker /video icon added --- .../Editor/Properties/PropertyTextLocation.vue | 14 ++++++-------- src/views/EditSidebar.vue | 2 -- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/components/Editor/Properties/PropertyTextLocation.vue b/src/components/Editor/Properties/PropertyTextLocation.vue index 216a0d083..f365ea654 100644 --- a/src/components/Editor/Properties/PropertyTextLocation.vue +++ b/src/components/Editor/Properties/PropertyTextLocation.vue @@ -1,19 +1,17 @@