Skip to content
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.

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

Bump @nextcloud/vue to v6.0.0-beta.1 #7711

Merged
merged 9 commits into from
Aug 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
754 changes: 178 additions & 576 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@nextcloud/moment": "^1.2.1",
"@nextcloud/paths": "^2.1.0",
"@nextcloud/router": "^2.0.0",
"@nextcloud/vue": "^5.4.0",
"@nextcloud/vue": "^6.0.0-beta.2",
"@nextcloud/vue-dashboard": "^2.0.1",
"attachmediastream": "^2.1.0",
"color.js": "^1.2.0",
Expand Down
12 changes: 6 additions & 6 deletions src/FilesSidebarTabApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
<div class="icon icon-talk" />
<h2>{{ t('spreed', 'Discuss this file') }}</h2>
<p>{{ t('spreed', 'Share this file with others to discuss it') }}</p>
<Button type="primary" @click="openSharingTab">
<ButtonVue type="primary" @click="openSharingTab">
{{ t('spreed', 'Share this file') }}
</Button>
</ButtonVue>
</div>
<div v-else-if="isTalkSidebarSupportedForFile && !token" class="emptycontent room-not-joined">
<div class="icon icon-talk" />
<h2>{{ t('spreed', 'Discuss this file') }}</h2>
<Button type="primary" @click="joinConversation">
<ButtonVue type="primary" @click="joinConversation">
{{ t('spreed', 'Join conversation') }}
</Button>
</ButtonVue>
</div>
<template v-else>
<CallButton class="call-button" />
Expand Down Expand Up @@ -66,7 +66,7 @@ import sessionIssueHandler from './mixins/sessionIssueHandler.js'
import browserCheck from './mixins/browserCheck.js'
import '@nextcloud/dialogs/styles/toast.scss'
import DeviceChecker from './components/DeviceChecker/DeviceChecker.vue'
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'

export default {

Expand All @@ -77,7 +77,7 @@ export default {
ChatView,
UploadEditor,
DeviceChecker,
Button,
ButtonVue,
},

mixins: [
Expand Down
8 changes: 4 additions & 4 deletions src/PublicShareAuthRequestPasswordButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
<!-- "submit-wrapper" is used to mimic the login button and thus get
automatic colouring of the confirm icon by the Theming app. -->
<div id="submit-wrapper" class="request-password-wrapper">
<Button id="request-password-button"
<ButtonVue id="request-password-button"
type="primary"
:wide="true"
:disabled="isRequestInProgress"
@click="requestPassword"
@keydown.enter="requestPassword">
{{ t('spreed', 'Request password') }}
</Button>
</ButtonVue>
</div>
<p v-if="hasRequestFailed" class="warning error-message">
{{ t('spreed', 'Error requesting the password.') }}
Expand All @@ -39,7 +39,7 @@
</template>

<script>
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
import { getPublicShareAuthConversationToken } from './services/publicShareAuthService.js'
import browserCheck from './mixins/browserCheck.js'
import '@nextcloud/dialogs/styles/toast.scss'
Expand All @@ -49,7 +49,7 @@ export default {
name: 'PublicShareAuthRequestPasswordButton',

components: {
Button,
ButtonVue,
},

mixins: [
Expand Down
2 changes: 1 addition & 1 deletion src/PublicShareSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</template>

<script>
import ButtonVue from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
import PreventUnload from 'vue-prevent-unload'
import { loadState } from '@nextcloud/initial-state'
import CallView from './components/CallView/CallView.vue'
Expand Down
8 changes: 4 additions & 4 deletions src/PublicShareSidebarTrigger.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,26 @@

<template>
<div class="button-holder">
<Button type="tertiary-on-primary"
<ButtonVue type="tertiary-on-primary"
:aria-label="ariaLabel"
@click="$emit('click')">
<template #icon>
<MenuPeople :size="20" />
</template>
</Button>
</ButtonVue>
</div>
</template>

<script>
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
import MenuPeople from './components/missingMaterialDesignIcons/MenuPeople.vue'

export default {

name: 'PublicShareSidebarTrigger',

components: {
Button,
ButtonVue,
MenuPeople,
},

Expand Down
12 changes: 6 additions & 6 deletions src/components/AdminSettings/AllowedGroups.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
label="displayname"
@search-change="searchGroup" />

<Button type="primary"
<ButtonVue type="primary"
:disabled="loading"
@click="saveAllowedGroups">
{{ saveLabelAllowedGroups }}
</Button>
</ButtonVue>
</div>

<h3>{{ t('spreed', 'Limit creating a public and group conversation') }}</h3>
Expand All @@ -75,11 +75,11 @@
label="displayname"
@search-change="searchGroup" />

<Button type="primary"
<ButtonVue type="primary"
:disabled="loading"
@click="saveStartConversationsGroups">
{{ saveLabelStartConversations }}
</Button>
</ButtonVue>
</div>

<h3>{{ t('spreed', 'Limit starting a call') }}</h3>
Expand All @@ -106,7 +106,7 @@ import axios from '@nextcloud/axios'
import debounce from 'debounce'
import { generateOcsUrl } from '@nextcloud/router'
import { loadState } from '@nextcloud/initial-state'
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'

const startCallOptions = [
{ value: 0, label: t('spreed', 'Everyone') },
Expand All @@ -120,7 +120,7 @@ export default {

components: {
Multiselect,
Button,
ButtonVue,
},

data() {
Expand Down
12 changes: 6 additions & 6 deletions src/components/AdminSettings/HostedSignalingServer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@
</option>
</select>

<Button type="primary"
<ButtonVue type="primary"
:disabled="!hostedHPBFilled || loading"
@click="requestHPBTrial">
{{ t('spreed', 'Request signaling server trial') }}
</Button>
</ButtonVue>

<p v-if="requestError !== ''"
class="warning">
Expand Down Expand Up @@ -122,17 +122,17 @@
{{ requestError }}
</p>

<Button type="error"
<ButtonVue type="error"
:disabled="loading"
@click="deleteAccount">
{{ t('spreed', 'Delete the signaling server account') }}
</Button>
</ButtonVue>
</div>
</div>
</template>

<script>
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
import { loadState } from '@nextcloud/initial-state'
import axios from '@nextcloud/axios'
import { generateOcsUrl } from '@nextcloud/router'
Expand All @@ -142,7 +142,7 @@ export default {
name: 'HostedSignalingServer',

components: {
Button,
ButtonVue,
},

data() {
Expand Down
12 changes: 6 additions & 6 deletions src/components/AdminSettings/MatterbridgeIntegration.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,23 @@
</p>

<p>
<Button v-if="isInstalling">
<ButtonVue v-if="isInstalling">
<template #icon>
<span class="icon icon-loading-small" />
</template>
{{ t('spreed', 'Downloading …') }}
</Button>
<Button v-else
</ButtonVue>
<ButtonVue v-else
@click="enableMatterbridgeApp">
{{ t('spreed', 'Install Talk Matterbridge') }}
</Button>
</ButtonVue>
</p>
</template>
</div>
</template>

<script>
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
import { loadState } from '@nextcloud/initial-state'
import { showError } from '@nextcloud/dialogs'
import {
Expand All @@ -86,7 +86,7 @@ export default {
name: 'MatterbridgeIntegration',

components: {
Button,
ButtonVue,
},

data() {
Expand Down
8 changes: 4 additions & 4 deletions src/components/AdminSettings/SIPBridge.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@
:disabled="loading"
:placeholder="t('spreed', 'Phone number (Country)')" />

<Button type="primary"
<ButtonVue type="primary"
:disabled="loading"
@click="saveSIPSettings">
{{ t('spreed', 'Save changes') }}
</Button>
</ButtonVue>
</template>
</div>
</template>

<script>
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
import axios from '@nextcloud/axios'
import debounce from 'debounce'
Expand All @@ -96,7 +96,7 @@ export default {
name: 'SIPBridge',

components: {
Button,
ButtonVue,
Multiselect,
},

Expand Down
8 changes: 4 additions & 4 deletions src/components/AdminSettings/SignalingServer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,29 +38,29 @@
@change="updateVerify">
<label :for="'verify' + index">{{ t('spreed', 'Validate SSL certificate') }}</label>

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

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

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

export default {
name: 'SignalingServer',

components: {
Button,
ButtonVue,
Delete,
},

Expand Down
8 changes: 4 additions & 4 deletions src/components/AdminSettings/SignalingServers.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
<h2>
{{ t('spreed', 'High-performance backend') }}

<Button v-if="!loading && showAddServerButton"
<ButtonVue 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">
<template #icon>
<Plus :size="20" />
</template>
</Button>
</ButtonVue>
</h2>

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

<script>
import SignalingServer from '../../components/AdminSettings/SignalingServer.vue'
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
import Plus from 'vue-material-design-icons/Plus'
import { showSuccess } from '@nextcloud/dialogs'
import { loadState } from '@nextcloud/initial-state'
Expand All @@ -97,7 +97,7 @@ export default {
name: 'SignalingServers',

components: {
Button,
ButtonVue,
SignalingServer,
Plus,
},
Expand Down
12 changes: 6 additions & 6 deletions src/components/AdminSettings/StunServer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,34 +32,34 @@
:disabled="loading"
:aria-label="t('spreed', 'STUN server URL')"
@input="update">
<Button v-show="!isValidServer"
<ButtonVue v-show="!isValidServer"
type="tertiary-no-background"
:aria-label="t('spreed', 'The server address is invalid')">
<template #icon>
<AlertCircle />
</template>
</Button>
<Button v-show="!loading"
</ButtonVue>
<ButtonVue v-show="!loading"
type="tertiary-no-background"
:aria-label="t('spreed', 'Delete this server')"
@click="removeServer">
<template #icon>
<Delete :size="20" />
</template>
</Button>
</ButtonVue>
</div>
</template>

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

export default {
name: 'StunServer',

components: {
Button,
ButtonVue,
AlertCircle,
Delete,
},
Expand Down
Loading