Skip to content

Commit

Permalink
fixup! feat:select existing talk roomfor convesations
Browse files Browse the repository at this point in the history
Signed-off-by: greta <[email protected]>
  • Loading branch information
GretaD committed Jan 8, 2025
1 parent 6cf7c40 commit 35d624d
Showing 1 changed file with 28 additions and 20 deletions.
48 changes: 28 additions & 20 deletions src/views/EditSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,27 +83,28 @@
@update-end-timezone="updateEndTimezone"
@toggle-all-day="toggleAllDay" />
<div class="location-container">
<PropertyText class="property-location"
:is-read-only="isReadOnly"
:prop-model="rfcProps.location"
:value="location"
:linkify-links="true"
@update:value="updateLocation" />
<AddTalkModal v-if="isModalOpen"
:conversations="talkConversations"
:calendar-object-instance="calendarObjectInstance"
@close="closeModal"
@update-location="updateLocation"
@update-description="updateDescription" />
<NcButton :disabled="isCreateTalkRoomButtonDisabled"
class="add-talk-button"
@click="openModal">
<template #icon>
<IconCheck :size="16" />
</template>
{{ t('calendar','Add Talk') }}
</NcButton>
<div class="button-container">
<IconVideo :size="20" class="icon-left" />
<NcButton type="tertiary"
class="add-talk-button"
:disabled="isCreateTalkRoomButtonDisabled"
@click="openModal">
{{ t('calendar','Add Talk conversation') }}
</NcButton>
</div>
</div>
<PropertyText class="property-location"
:is-read-only="isReadOnly"
:prop-model="rfcProps.location"
:value="location"
:linkify-links="true"
@update:value="updateLocation" />
<PropertyText class="property-description"
:is-read-only="isReadOnly"
:prop-model="rfcProps.description"
Expand Down Expand Up @@ -332,7 +333,7 @@ import { mapStores, mapState } from 'pinia'
import AddTalkModal from '../components/Editor/AddTalkModal.vue'
import { createTalkRoom, doesContainTalkLink } from '../services/talkService.js'
import { showError, showSuccess } from '@nextcloud/dialogs'
import IconCheck from 'vue-material-design-icons/Check.vue'
import IconVideo from 'vue-material-design-icons/Video.vue'

export default {
name: 'EditSidebar',
Expand Down Expand Up @@ -368,7 +369,7 @@ export default {
AttachmentsList,
CalendarPickerHeader,
PropertyTitle,
IconCheck,
IconVideo,
},
mixins: [
EditorMixin,
Expand Down Expand Up @@ -766,17 +767,24 @@ export default {
height: auto;
border-radius: var(--border-radius);
}
.location-container{
.location-container {
display: flex;
align-items: center;
gap: 4px;
flex-direction: column;
width: 100%;
}
.button-container {
display: flex;
align-items: center;
margin-top: 10px;
}
.icon-left {
margin-left: 3px;
}
.add-talk-button {
flex-shrink: 0;
margin-left: 2px;
}
.property-location {
margin-top: 10px;
flex-grow: 1;
}
.property-description {
Expand Down

0 comments on commit 35d624d

Please sign in to comment.