diff --git a/src/App.vue b/src/App.vue index 3114ed0ab22..1796123721f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -34,7 +34,6 @@ - @@ -66,7 +65,6 @@ 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 { @@ -79,7 +77,6 @@ export default { RightSidebar, UploadEditor, SettingsDialog, - ConversationSettingsDialog, }, mixins: [ diff --git a/src/components/ConversationSettings/ConversationSettingsDialog.vue b/src/components/ConversationSettings/ConversationSettingsDialog.vue deleted file mode 100644 index bc2f8276b1b..00000000000 --- a/src/components/ConversationSettings/ConversationSettingsDialog.vue +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/components/ConversationSettings/LinkShareSettings.vue b/src/components/ConversationSettings/LinkShareSettings.vue deleted file mode 100644 index 0c769888314..00000000000 --- a/src/components/ConversationSettings/LinkShareSettings.vue +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - {{ t('spreed', 'Allow guests to use a public link to join this conversation.') }} - - - - {{ t('spreed', 'Allow guests') }} - - - - - {{ t('spreed', 'Set a password to restrict who can use the public link.') }} - - - - {{ t('spreed', 'Password protection') }} - - - - - - - - - - - - - - {{ t('spreed', 'Copy public link') }} - - - - - - - - diff --git a/src/components/ConversationSettings/ModerationSettings.vue b/src/components/ConversationSettings/ModerationSettings.vue deleted file mode 100644 index e49305e11b1..00000000000 --- a/src/components/ConversationSettings/ModerationSettings.vue +++ /dev/null @@ -1,262 +0,0 @@ - - - - - - - {{ t('spreed', 'Locking the conversation prevents anyone to post messages or start calls.') }} - - - - {{ t('spreed', 'Lock conversation') }} - - - - - {{ t('spreed', 'Enabling the lobby only allows moderators to post messages.') }} - - - - {{ t('spreed', 'Enable lobby') }} - - - - - {{ t('spreed', 'After the time limit the lobby will be automatically disabled.') }} - - - - - - {{ t('spreed', 'Meeting start time') }} - - - - - - - - - - - - - - - diff --git a/src/components/ConversationSettings/SipSettings.vue b/src/components/ConversationSettings/SipSettings.vue deleted file mode 100644 index f8c8c14a5ad..00000000000 --- a/src/components/ConversationSettings/SipSettings.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - {{ t('spreed', 'Allow participants to join from a phone.') }} - - - {{ t('spreed', 'Enable SIP dial-in') }} - - - - diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue index 7af763b7efb..24970663212 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 { PARTICIPANT } from '../../../constants' +import { CONVERSATION, PARTICIPANT, WEBINAR } from '../../../constants' import { searchPossibleConversations } from '../../../services/conversationsService' import { addParticipant, @@ -119,7 +119,16 @@ export default { return this.$store.getters.getToken() }, conversation() { - return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation + 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, + } }, isSearching() { return this.searchText !== '' diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue index 354fc3d97d5..fc1632852e7 100644 --- a/src/components/RightSidebar/RightSidebar.vue +++ b/src/components/RightSidebar/RightSidebar.vue @@ -143,7 +143,19 @@ export default { return this.$store.getters.getToken() }, conversation() { - return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation + 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: '', + } }, getUserId() { diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue index 2d8eb5657e3..4ffe0b7ed14 100644 --- a/src/components/TopBar/CallButton.vue +++ b/src/components/TopBar/CallButton.vue @@ -84,7 +84,17 @@ export default { }, conversation() { - return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation + 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, + } }, isBlockedByLobby() { diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue index edd6c096925..1955b70b846 100644 --- a/src/components/TopBar/TopBar.vue +++ b/src/components/TopBar/TopBar.vue @@ -81,6 +81,14 @@ @click="handleRenameConversation"> {{ t('spreed', 'Rename conversation') }} + + + {{ t('spreed', 'Share link') }} + {{ t('spreed', 'Copy link') }} + + + + {{ t('spreed', 'Password protection') }} + + + {{ t('spreed', 'Enter a password') }} + + + + {{ t('spreed', 'Lock conversation') }} + + + {{ t('spreed', 'Enable lobby') }} + + + {{ t('spreed', 'Start time (optional)') }} + + + {{ t('spreed', 'Enable SIP dial-in') }} + + @@ -99,15 +157,6 @@ {{ t('spreed', 'Mute others') }} - - - {{ t('spreed', 'More settings') }} - { return { @@ -72,7 +55,6 @@ const getters = { * @returns {object} The conversation object */ conversation: state => token => state.conversations[token], - dummyConversation: state => Object.assign({}, DUMMY_CONVERSATION), } const mutations = {