Skip to content

Move signaling to vue buttons #7647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 4 commits into from
Aug 11, 2022
Merged

Move signaling to vue buttons #7647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0fdae8
Move signaling to vue buttons
nickvergessen Jul 26, 2022
a829ecb
Also fix stun and turn icon sizes
nickvergessen Aug 11, 2022
f12f892
Remove unused tooltip imports
nickvergessen Aug 11, 2022
016f329
Remove unnecessary CSS rules
nickvergessen Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/components/AdminSettings/SignalingServer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,30 @@
@change="updateVerify">
<label :for="'verify' + index">{{ t('spreed', 'Validate SSL certificate') }}</label>

<a v-show="!loading"
v-tooltip.auto="t('spreed', 'Delete this server')"
class="icon icon-delete"
@click="removeServer" />
<Button v-show="!loading"
type="tertiary-no-background"
:aria-label="t('spreed', 'Delete this server')"
@click="removeServer">
<template #icon>
<Delete :size="20" />
</template>
</Button>

<span v-if="server">{{ connectionState }}</span>
</div>
</template>

<script>
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
import Button from '@nextcloud/vue/dist/Components/Button'
import Delete from 'vue-material-design-icons/Delete'
import { getWelcomeMessage } from '../../services/signalingService.js'

export default {
name: 'SignalingServer',

directives: {
tooltip: Tooltip,
components: {
Button,
Delete,
},

props: {
Expand Down
38 changes: 25 additions & 13 deletions src/components/AdminSettings/SignalingServers.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,19 @@
-->

<template>
<div id="signaling_server" class="videocalls section">
<div id="signaling_server" class="videocalls section signaling-server">
<h2>
{{ t('spreed', 'High-performance backend') }}
<span v-if="saved" class="icon icon-checkmark-color" :title="t('spreed', 'Saved')" />
<a v-else-if="!loading && showAddServerButton"
v-tooltip.auto="t('spreed', 'Add a new server')"
class="icon icon-add"

<Button v-if="!loading && showAddServerButton"
class="signaling-server__add-icon"
type="tertiary-no-background"
:aria-label="t('spreed', 'Add a new high-performance backend server')"
@click="newServer">
<span class="hidden-visually">{{ t('spreed', 'Add a new server') }}</span>
</a>
<span v-else-if="loading" class="icon icon-loading-small" />
<template #icon>
<Plus :size="20" />
</template>
</Button>
</h2>

<p class="settings-hint">
Expand Down Expand Up @@ -84,20 +86,20 @@

<script>
import SignalingServer from '../../components/AdminSettings/SignalingServer.vue'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
import Button from '@nextcloud/vue/dist/Components/Button'
import Plus from 'vue-material-design-icons/Plus'
import { showSuccess } from '@nextcloud/dialogs'
import { loadState } from '@nextcloud/initial-state'
import debounce from 'debounce'
import { SIGNALING } from '../../constants.js'

export default {
name: 'SignalingServers',

directives: {
tooltip: Tooltip,
},

components: {
Button,
SignalingServer,
Plus,
},

data() {
Expand Down Expand Up @@ -144,6 +146,7 @@ export default {

OCP.AppConfig.setValue('spreed', 'hide_signaling_warning', this.hideWarning ? 'yes' : 'no', {
success() {
showSuccess(t('spreed', 'Missing high-performance backend warning hidden'))
self.loading = false
self.toggleSave()
},
Expand All @@ -165,6 +168,7 @@ export default {
secret: this.secret,
}), {
success() {
showSuccess(t('spreed', 'High-performance backend settings saved'))
self.loading = false
self.toggleSave()
},
Expand All @@ -184,6 +188,14 @@ export default {
<style lang="scss" scoped>
@import '../../assets/variables';

.signaling-server {
h2 {
height: 44px;
display: flex;
align-items: center;
}
}

.signaling-warning label {
margin: 0;
}
Expand Down
7 changes: 1 addition & 6 deletions src/components/AdminSettings/StunServer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,20 @@
:aria-label="t('spreed', 'Delete this server')"
@click="removeServer">
<template #icon>
<Delete />
<Delete :size="20" />
</template>
</Button>
</div>
</template>

<script>
import Button from '@nextcloud/vue/dist/Components/Button'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
import AlertCircle from 'vue-material-design-icons/AlertCircle'
import Delete from 'vue-material-design-icons/Delete'

export default {
name: 'StunServer',

directives: {
tooltip: Tooltip,
},

components: {
Button,
AlertCircle,
Expand Down
14 changes: 1 addition & 13 deletions src/components/AdminSettings/StunServers.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
:aria-label="t('spreed', 'Add a new STUN server')"
@click="newServer">
<template #icon>
<Plus />
<Plus :size="20" />
</template>
</Button>
</h2>
Expand All @@ -57,7 +57,6 @@
<script>
import StunServer from '../../components/AdminSettings/StunServer.vue'
import Button from '@nextcloud/vue/dist/Components/Button'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
import Plus from 'vue-material-design-icons/Plus'
import debounce from 'debounce'
import { loadState } from '@nextcloud/initial-state'
Expand All @@ -66,10 +65,6 @@ import { showSuccess } from '@nextcloud/dialogs'
export default {
name: 'StunServers',

directives: {
tooltip: Tooltip,
},

components: {
Button,
StunServer,
Expand Down Expand Up @@ -159,13 +154,6 @@ export default {
display: flex;
align-items: center;
}

&__add-icon {
display: inline-block;
width: 44px;
height: 44px;
vertical-align: middle;
}
}

</style>
2 changes: 1 addition & 1 deletion src/components/AdminSettings/TurnServer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
:aria-label="t('spreed', 'Delete this server')"
@click="removeServer">
<template #icon>
<Delete />
<Delete :size="20" />
</template>
</Button>
</div>
Expand Down
14 changes: 1 addition & 13 deletions src/components/AdminSettings/TurnServers.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
:aria-label="t('spreed', 'Add a new TURN server')"
@click="newServer">
<template #icon>
<Plus />
<Plus :size="20" />
</template>
</Button>
</h2>
Expand Down Expand Up @@ -61,7 +61,6 @@

<script>
import Button from '@nextcloud/vue/dist/Components/Button'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
import TurnServer from '../../components/AdminSettings/TurnServer.vue'
import { loadState } from '@nextcloud/initial-state'
import Plus from 'vue-material-design-icons/Plus'
Expand All @@ -71,10 +70,6 @@ import debounce from 'debounce'
export default {
name: 'TurnServers',

directives: {
tooltip: Tooltip,
},

components: {
Button,
TurnServer,
Expand Down Expand Up @@ -176,13 +171,6 @@ export default {
display: flex;
align-items: center;
}

&__add-icon {
display: inline-block;
width: 44px;
height: 44px;
vertical-align: middle;
}
}

</style>