diff --git a/src/App.vue b/src/App.vue index 1796123721f..3114ed0ab22 100644 --- a/src/App.vue +++ b/src/App.vue @@ -34,6 +34,7 @@ + @@ -65,6 +66,7 @@ import talkHashCheck from './mixins/talkHashCheck' import { generateUrl } from '@nextcloud/router' import UploadEditor from './components/UploadEditor' import SettingsDialog from './components/SettingsDialog/SettingsDialog' +import ConversationSettingsDialog from './components/ConversationSettings/ConversationSettingsDialog' import '@nextcloud/dialogs/styles/toast.scss' export default { @@ -77,6 +79,7 @@ export default { RightSidebar, UploadEditor, SettingsDialog, + ConversationSettingsDialog, }, mixins: [ diff --git a/src/components/ConversationSettings/ConversationSettingsDialog.vue b/src/components/ConversationSettings/ConversationSettingsDialog.vue new file mode 100644 index 00000000000..bc2f8276b1b --- /dev/null +++ b/src/components/ConversationSettings/ConversationSettingsDialog.vue @@ -0,0 +1,124 @@ + + + + + + diff --git a/src/components/ConversationSettings/LinkShareSettings.vue b/src/components/ConversationSettings/LinkShareSettings.vue new file mode 100644 index 00000000000..0c769888314 --- /dev/null +++ b/src/components/ConversationSettings/LinkShareSettings.vue @@ -0,0 +1,229 @@ + + + + + + + diff --git a/src/components/ConversationSettings/ModerationSettings.vue b/src/components/ConversationSettings/ModerationSettings.vue new file mode 100644 index 00000000000..e49305e11b1 --- /dev/null +++ b/src/components/ConversationSettings/ModerationSettings.vue @@ -0,0 +1,262 @@ + + + + + + + diff --git a/src/components/ConversationSettings/SipSettings.vue b/src/components/ConversationSettings/SipSettings.vue new file mode 100644 index 00000000000..f8c8c14a5ad --- /dev/null +++ b/src/components/ConversationSettings/SipSettings.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue index 24970663212..7af763b7efb 100644 --- a/src/components/RightSidebar/Participants/ParticipantsTab.vue +++ b/src/components/RightSidebar/Participants/ParticipantsTab.vue @@ -48,7 +48,7 @@ import CurrentParticipants from './CurrentParticipants/CurrentParticipants' import SearchBox from '../../LeftSidebar/SearchBox/SearchBox' import debounce from 'debounce' import { EventBus } from '../../../services/EventBus' -import { CONVERSATION, PARTICIPANT, WEBINAR } from '../../../constants' +import { PARTICIPANT } from '../../../constants' import { searchPossibleConversations } from '../../../services/conversationsService' import { addParticipant, @@ -119,16 +119,7 @@ export default { return this.$store.getters.getToken() }, conversation() { - if (this.$store.getters.conversation(this.token)) { - return this.$store.getters.conversation(this.token) - } - return { - token: '', - displayName: '', - isFavorite: false, - type: CONVERSATION.TYPE.PUBLIC, - lobbyState: WEBINAR.LOBBY.NONE, - } + return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation }, isSearching() { return this.searchText !== '' diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue index fc1632852e7..354fc3d97d5 100644 --- a/src/components/RightSidebar/RightSidebar.vue +++ b/src/components/RightSidebar/RightSidebar.vue @@ -143,19 +143,7 @@ export default { return this.$store.getters.getToken() }, conversation() { - if (this.$store.getters.conversation(this.token)) { - return this.$store.getters.conversation(this.token) - } - return { - token: '', - displayName: '', - isFavorite: false, - hasPassword: false, - type: CONVERSATION.TYPE.PUBLIC, - lobbyState: WEBINAR.LOBBY.NONE, - lobbyTimer: 0, - attendeePin: '', - } + return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation }, getUserId() { diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue index 4ffe0b7ed14..2d8eb5657e3 100644 --- a/src/components/TopBar/CallButton.vue +++ b/src/components/TopBar/CallButton.vue @@ -84,17 +84,7 @@ export default { }, conversation() { - if (this.$store.getters.conversation(this.token)) { - return this.$store.getters.conversation(this.token) - } - return { - participantFlags: PARTICIPANT.CALL_FLAG.DISCONNECTED, - participantType: PARTICIPANT.TYPE.USER, - readOnly: CONVERSATION.STATE.READ_ONLY, - hasCall: false, - canStartCall: false, - lobbyState: WEBINAR.LOBBY.NONE, - } + return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation }, isBlockedByLobby() { diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue index 1955b70b846..edd6c096925 100644 --- a/src/components/TopBar/TopBar.vue +++ b/src/components/TopBar/TopBar.vue @@ -81,14 +81,6 @@ @click="handleRenameConversation"> {{ t('spreed', 'Rename conversation') }} - - - {{ t('spreed', 'Share link') }} - {{ t('spreed', 'Copy link') }} - - + + + {{ t('spreed', 'More settings') }} + { return { @@ -55,6 +72,7 @@ const getters = { * @returns {object} The conversation object */ conversation: state => token => state.conversations[token], + dummyConversation: state => Object.assign({}, DUMMY_CONVERSATION), } const mutations = {