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.

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

Jump to bottom

Bump @nextcloud/vue to 6.0.0-beta.1 and vue-template-compiler #33508

Closed
wants to merge 2 commits into from
Closed

Bump @nextcloud/vue to 6.0.0-beta.1 and vue-template-compiler #33508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e93188
Bump @nextcloud/vue to 6.0.0-beta.1 and vue-template-compiler
PVince81 Aug 11, 2022
97c5291
Update calendar-availability-vue to 0.4.0
PVince81 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
8 changes: 4 additions & 4 deletions apps/comments/src/components/Comment.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
:value="localMessage"
@update:value="updateLocalMessage"
@submit="onSubmit" />
<Button class="comment__submit"
<ButtonVue class="comment__submit"
type="tertiary-no-background"
native-type="submit"
:aria-label="t('comments', 'Post comment')"
Expand All @@ -81,7 +81,7 @@
<span v-if="loading" class="icon-loading-small" />
<ArrowRight v-else :size="20" />
</template>
</Button>
</ButtonVue>
</div>

<!-- Message content -->
Expand All @@ -103,7 +103,7 @@ import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import Actions from '@nextcloud/vue/dist/Components/Actions'
import ActionSeparator from '@nextcloud/vue/dist/Components/ActionSeparator'
import Avatar from '@nextcloud/vue/dist/Components/Avatar'
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
import RichContenteditable from '@nextcloud/vue/dist/Components/RichContenteditable'
import RichEditorMixin from '@nextcloud/vue/dist/Mixins/richEditor'
import ArrowRight from 'vue-material-design-icons/ArrowRight'
Expand All @@ -120,7 +120,7 @@ export default {
ActionSeparator,
ArrowRight,
Avatar,
Button,
ButtonVue,
Moment,
RichContenteditable,
},
Expand Down
8 changes: 4 additions & 4 deletions apps/dashboard/src/DashboardApp.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
</Draggable>

<div class="footer">
<Button @click="showModal">
<ButtonVue @click="showModal">
<template #icon>
<Pencil :size="20" />
</template>
{{ t('dashboard', 'Customize') }}
</Button>
</ButtonVue>
</div>

<Modal v-if="modal" size="large" @close="closeModal">
Expand Down Expand Up @@ -97,7 +97,7 @@ import { generateUrl } from '@nextcloud/router'
import { getCurrentUser } from '@nextcloud/auth'
import { loadState } from '@nextcloud/initial-state'
import axios from '@nextcloud/axios'
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
import Draggable from 'vuedraggable'
import Modal from '@nextcloud/vue/dist/Components/Modal'
import Pencil from 'vue-material-design-icons/Pencil.vue'
Expand Down Expand Up @@ -129,7 +129,7 @@ export default {
name: 'DashboardApp',
components: {
BackgroundSettings,
Button,
ButtonVue,
Draggable,
Modal,
Pencil,
Expand Down
8 changes: 4 additions & 4 deletions apps/dav/src/views/Availability.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
{{ $t('dav', 'Automatically set user status to "Do not disturb" outside of availability to mute all notifications.') }}
</CheckboxRadioSwitch>

<Button :disabled="loading || saving"
<ButtonVue :disabled="loading || saving"
type="primary"
@click="save">
{{ $t('dav', 'Save') }}
</Button>
</ButtonVue>
</SettingsSection>
</template>

Expand All @@ -53,15 +53,15 @@ import {
disableUserStatusAutomation,
} from '../service/PreferenceService'
import jstz from 'jstimezonedetect'
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch'
import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
import TimezonePicker from '@nextcloud/vue/dist/Components/TimezonePicker'

export default {
name: 'Availability',
components: {
Button,
ButtonVue,
CheckboxRadioSwitch,
CalendarAvailability,
SettingsSection,
Expand Down
24 changes: 12 additions & 12 deletions apps/federatedfilesharing/src/components/PersonalSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,46 +23,46 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<p class="cloud-id-text">
{{ t('federatedfilesharing', 'Your Federated Cloud ID:') }}
<strong id="cloudid">{{ cloudId }}</strong>
<Button ref="clipboard"
<ButtonVue ref="clipboard"
v-tooltip="copyLinkTooltip"
class="clipboard"
type="tertiary-no-background"
@click.prevent="copyCloudId">
<template #icon>
<Clipboard :size="20" />
</template>
</Button>
</ButtonVue>
</p>

<p class="social-button">
{{ t('federatedfilesharing', 'Share it so your friends can share files with you:') }}<br>
<Button @click="goTo(shareFacebookUrl)">
<ButtonVue @click="goTo(shareFacebookUrl)">
{{ t('federatedfilesharing', 'Facebook') }}
<template #icon>
<Facebook :size="20" />
</template>
</Button>
<Button @click="goTo(shareTwitterUrl)">
</ButtonVue>
<ButtonVue @click="goTo(shareTwitterUrl)">
{{ t('federatedfilesharing', 'Twitter') }}
<template #icon>
<Twitter :size="20" />
</template>
</Button>
<Button @click="goTo(shareDiasporaUrl)">
</ButtonVue>
<ButtonVue @click="goTo(shareDiasporaUrl)">
{{ t('federatedfilesharing', 'Diaspora') }}
<template #icon>
<svg width="20"
height="20"
viewBox="-10 -5 1034 1034"
xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="M502 197q-96 0-96.5 1.5t-1.5 137-1.5 138-2 2.5T266 432.5 132.5 390t-30 94T74 578l232 77q21 8 21 10t-79.5 117.5T168 899t79.5 56.5T328 1011t81-110 82-110 41 55l83 115q43 60 44 60t79.5-58 79-59-76-112.5-76-113.5T795 632.5t129.5-44-28-94T867 400t-128 42-128.5 43-2.5-7.5-1-38.5l-3-108q-4-133-5-133.5t-97-.5z" /></svg>
</template>
</Button>
<Button @click="showHtml = !showHtml">
</ButtonVue>
<ButtonVue @click="showHtml = !showHtml">
<template #icon>
<Web :size="20" />
</template>
{{ t('federatedfilesharing', 'Add to your website') }}
</Button>
</ButtonVue>
</p>

<template v-if="showHtml">
Expand All @@ -89,7 +89,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
import { showError } from '@nextcloud/dialogs'
import { loadState } from '@nextcloud/initial-state'
import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
import Twitter from 'vue-material-design-icons/Twitter'
import Facebook from 'vue-material-design-icons/Facebook'
import Web from 'vue-material-design-icons/Web'
Expand All @@ -99,7 +99,7 @@ import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
export default {
name: 'PersonalSettings',
components: {
Button,
ButtonVue,
SettingsSection,
Twitter,
Facebook,
Expand Down
12 changes: 6 additions & 6 deletions apps/files/src/components/TransferOwnershipDialogue.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
<form @submit.prevent="submit">
<p class="transfer-select-row">
<span>{{ readableDirectory }}</span>
<Button v-if="directory === undefined" @click.prevent="start">
<ButtonVue v-if="directory === undefined" @click.prevent="start">
{{ t('files', 'Choose file or folder to transfer') }}
</Button>
<Button v-else @click.prevent="start">
</ButtonVue>
<ButtonVue v-else @click.prevent="start">
{{ t('files', 'Change') }}
</Button>
</ButtonVue>
<span class="error">{{ directoryPickerError }}</span>
</p>
<p class="new-owner-row">
Expand Down Expand Up @@ -72,7 +72,7 @@ import { generateOcsUrl } from '@nextcloud/router'
import { getFilePickerBuilder, showSuccess } from '@nextcloud/dialogs'
import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
import Vue from 'vue'
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'

import logger from '../logger'

Expand All @@ -87,7 +87,7 @@ export default {
name: 'TransferOwnershipDialogue',
components: {
Multiselect,
Button,
ButtonVue,
},
data() {
return {
Expand Down
8 changes: 4 additions & 4 deletions apps/oauth2/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
type="url"
name="redirectUri"
:placeholder="t('oauth2', 'Redirection URI')">
<Button class="inline-button">
<ButtonVue class="inline-button">
{{ t('oauth2', 'Add') }}
</Button>
</ButtonVue>
</form>
</SettingsSection>
</template>
Expand All @@ -67,15 +67,15 @@ import OAuthItem from './components/OAuthItem'
import { generateUrl } from '@nextcloud/router'
import { getCapabilities } from '@nextcloud/capabilities'
import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
import { loadState } from '@nextcloud/initial-state'

export default {
name: 'App',
components: {
OAuthItem,
SettingsSection,
Button,
ButtonVue,
},
props: {
clients: {
Expand Down
8 changes: 4 additions & 4 deletions apps/oauth2/src/components/OAuthItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,28 +42,28 @@
</table>
</td>
<td class="action-column">
<Button type="tertiary-no-background"
<ButtonVue type="tertiary-no-background"
:aria-label="t('oauth2', 'Delete')"
@click="$emit('delete', id)">
<template #icon>
<Delete :size="20"
:title="t('oauth2', 'Delete')" />
</template>
</Button>
</ButtonVue>
</td>
</tr>
</template>

<script>

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

export default {
name: 'OAuthItem',
components: {
Delete,
Button,
ButtonVue,
},
props: {
client: {
Expand Down
8 changes: 4 additions & 4 deletions apps/settings/src/components/AdminTwoFactor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@
</p>
</template>
<p class="top-margin">
<Button v-if="dirty"
<ButtonVue v-if="dirty"
type="primary"
:disabled="loading"
@click="saveChanges">
{{ t('settings', 'Save changes') }}
</Button>
</ButtonVue>
</p>
</SettingsSection>
</template>

<script>
import axios from '@nextcloud/axios'
import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'
import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch'
import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
import { loadState } from '@nextcloud/initial-state'
Expand All @@ -78,7 +78,7 @@ export default {
name: 'AdminTwoFactor',
components: {
Multiselect,
Button,
ButtonVue,
CheckboxRadioSwitch,
SettingsSection,
},
Expand Down
8 changes: 4 additions & 4 deletions apps/settings/src/components/AppList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
<template v-if="useListView">
<div v-if="showUpdateAll" class="toolbar">
{{ n('settings', '%n app has an update available', '%n apps have an update available', counter) }}
<Button v-if="showUpdateAll"
<ButtonVue v-if="showUpdateAll"
id="app-list-update-all"
type="primary"
@click="updateAll">
{{ n('settings', 'Update', 'Update all', counter) }}
</Button>
</ButtonVue>
</div>

<div v-if="!showUpdateAll" class="toolbar">
Expand Down Expand Up @@ -107,13 +107,13 @@
import AppItem from './AppList/AppItem'
import PrefixMixin from './PrefixMixin'
import pLimit from 'p-limit'
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'

export default {
name: 'AppList',
components: {
AppItem,
Button,
ButtonVue,
},
mixins: [PrefixMixin],
props: ['category', 'app', 'search'],
Expand Down
12 changes: 6 additions & 6 deletions apps/settings/src/components/AuthTokenSetupDialogue.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
:disabled="loading"
:placeholder="t('settings', 'App name')"
@keydown.enter="submit">
<Button :disabled="loading || deviceName.length === 0"
<ButtonVue :disabled="loading || deviceName.length === 0"
type="primary"
@click="submit">
{{ t('settings', 'Create new app password') }}
</Button>
</ButtonVue>
</div>
<div v-else class="spacing">
{{ t('settings', 'Use the credentials below to configure your app or device.') }}
Expand Down Expand Up @@ -63,9 +63,9 @@
class="icon icon-clippy"
@mouseover="hoveringCopyButton = true"
@mouseleave="hoveringCopyButton = false" />
<Button @click="reset">
<ButtonVue @click="reset">
{{ t('settings', 'Done') }}
</Button>
</ButtonVue>
</div>
<div class="app-password-row">
<span class="app-password-label" />
Expand All @@ -83,13 +83,13 @@
import QR from '@chenfengyuan/vue-qrcode'
import confirmPassword from '@nextcloud/password-confirmation'
import { getRootUrl } from '@nextcloud/router'
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/ButtonVue'

export default {
name: 'AuthTokenSetupDialogue',
components: {
QR,
Button,
ButtonVue,
},
props: {
add: {
Expand Down
Loading