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/eslint-config from 8.0.0 to 8.1.2 #1251

Merged
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
4 changes: 2 additions & 2 deletions js/notifications-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/notifications-main.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/notifications-settings.js.map

Large diffs are not rendered by default.

1,263 changes: 662 additions & 601 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 @@ -42,7 +42,7 @@
"devDependencies": {
"@nextcloud/babel-config": "^1.0.0",
"@nextcloud/browserslist-config": "^2.3.0",
"@nextcloud/eslint-config": "^8.0.0",
"@nextcloud/eslint-config": "^8.1.2",
"@nextcloud/stylelint-config": "^2.2.0",
"@nextcloud/webpack-vue-config": "^5.3.0",
"babel-loader-exclude-node-modules-except": "^1.2.1"
Expand Down
8 changes: 4 additions & 4 deletions src/Components/Action.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@
@keyup.shift.tab="handleTabUp">
{{ label }}
</a>
<Button v-else-if="!isWebLink"
<ButtonVue v-else-if="!isWebLink"
:type="buttonType"
class="action-button pull-right"
@click="onClickActionButton">
{{ label }}
</Button>
</ButtonVue>
</template>

<script>
import axios from '@nextcloud/axios'
import { showError } from '@nextcloud/dialogs'
import Button from '@nextcloud/vue/dist/Components/Button'
import ButtonVue from '@nextcloud/vue/dist/Components/Button.js'

export default {
name: 'Action',

components: {
Button,
ButtonVue,
},

props: {
Expand Down
2 changes: 1 addition & 1 deletion src/Components/HeaderMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

<script>
import { directive as ClickOutside } from 'v-click-outside'
import excludeClickOutsideClasses from '@nextcloud/vue/dist/Mixins/excludeClickOutsideClasses'
import excludeClickOutsideClasses from '@nextcloud/vue/dist/Mixins/excludeClickOutsideClasses.js'

export default {
name: 'HeaderMenu',
Expand Down
20 changes: 10 additions & 10 deletions src/Components/Notification.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<span v-tooltip.bottom="absoluteDate"
class="notification-time live-relative-timestamp"
:data-timestamp="timestamp">{{ relativeDate }}</span>
<Button class="notification-dismiss-button"
<ButtonVue class="notification-dismiss-button"
type="tertiary"
:aria-label="t('notifications', 'Dismiss')"
@click="onDismissNotification">
<template #icon>
<Close :size="20" />
</template>
</Button>
</ButtonVue>
</div>

<a v-if="useLink" :href="link" class="notification-subject full-subject-link">
Expand Down Expand Up @@ -48,26 +48,26 @@

<script>
import axios from '@nextcloud/axios'
import Button from '@nextcloud/vue/dist/Components/Button'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
import Close from 'vue-material-design-icons/Close'
import ButtonVue from '@nextcloud/vue/dist/Components/Button.js'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
import Close from 'vue-material-design-icons/Close.vue'
import { showError } from '@nextcloud/dialogs'
import { loadState } from '@nextcloud/initial-state'
import { Howl } from 'howler'
import Action from './Action'
import Action from './Action.vue'
import { generateOcsUrl, generateFilePath } from '@nextcloud/router'
import moment from '@nextcloud/moment'
import RichText from '@juliushaertl/vue-richtext'
import DefaultParameter from './Parameters/DefaultParameter'
import File from './Parameters/File'
import User from './Parameters/User'
import DefaultParameter from './Parameters/DefaultParameter.vue'
import File from './Parameters/File.vue'
import User from './Parameters/User.vue'

export default {
name: 'Notification',

components: {
Action,
Button,
ButtonVue,
Close,
RichText,
},
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Parameters/File.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</template>

<script>
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'

export default {
name: 'File',
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Parameters/User.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<script>

import UserBubble from '@nextcloud/vue/dist/Components/UserBubble'
import UserBubble from '@nextcloud/vue/dist/Components/UserBubble.js'

export default {
name: 'User',
Expand Down
20 changes: 10 additions & 10 deletions src/NotificationsApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
<span v-if="notifications.length > 0"
class="dismiss-all"
@click="onDismissAll">
<Button type="tertiary"
<ButtonVue type="tertiary"
@click="onDismissAll">
<template #icon>
<Close :size="20" />
</template>
{{ t('notifications', 'Dismiss all notifications') }}
</Button>
</ButtonVue>
</span>
</div>

Expand All @@ -68,25 +68,25 @@
</template>

<script>
import Notification from './Components/Notification'
import Button from '@nextcloud/vue/dist/Components/Button'
import Close from 'vue-material-design-icons/Close'
import Notification from './Components/Notification.vue'
import ButtonVue from '@nextcloud/vue/dist/Components/Button.js'
import Close from 'vue-material-design-icons/Close.vue'
import axios from '@nextcloud/axios'
import { subscribe, unsubscribe } from '@nextcloud/event-bus'
import { showError } from '@nextcloud/dialogs'
import { generateOcsUrl } from '@nextcloud/router'
import { getNotificationsData } from './services/notificationsService'
import { getNotificationsData } from './services/notificationsService.js'
import { listen } from '@nextcloud/notify_push'
import Bell from 'vue-material-design-icons/Bell'
import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent'
import Bell from 'vue-material-design-icons/Bell.vue'
import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent.js'
import { getCapabilities } from '@nextcloud/capabilities'
import HeaderMenu from './Components/HeaderMenu'
import HeaderMenu from './Components/HeaderMenu.vue'

export default {
name: 'NotificationsApp',

components: {
Button,
ButtonVue,
Close,
Bell,
EmptyContent,
Expand Down
2 changes: 1 addition & 1 deletion src/services/notificationsService.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import moment from '@nextcloud/moment'
import axios from '@nextcloud/axios'
import { generateOcsUrl } from '@nextcloud/router'
import BrowserStorage from './BrowserStorage'
import BrowserStorage from './BrowserStorage.js'

const getNotificationsData = async (tabId, lastETag, forceRefresh, hasNotifyPush) => {
const lastUpdated = parseInt(BrowserStorage.getItem('lastUpdated'), 10)
Expand Down
2 changes: 1 addition & 1 deletion src/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/

import Vue from 'vue'
import UserSettings from './views/UserSettings'
import UserSettings from './views/UserSettings.vue'

Vue.prototype.t = t
Vue.prototype.n = n
Expand Down
4 changes: 2 additions & 2 deletions src/views/UserSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ import axios from '@nextcloud/axios'
import { generateOcsUrl } from '@nextcloud/router'
import { loadState } from '@nextcloud/initial-state'
import { showSuccess, showError } from '@nextcloud/dialogs'
import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch'
import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
import CheckboxRadioSwitch from '@nextcloud/vue/dist/Components/CheckboxRadioSwitch.js'
import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection.js'

const EmailFrequency = {
EMAIL_SEND_OFF: 0,
Expand Down