Skip to content

Commit

Permalink
Merge pull request #3810 from nextcloud/eslint-warnings
Browse files Browse the repository at this point in the history
Fix eslint warnings
  • Loading branch information
juliusknorr authored May 19, 2022
2 parents 7a4432f + 31580bb commit 9737c3a
Show file tree
Hide file tree
Showing 45 changed files with 112 additions and 109 deletions.
5 changes: 2 additions & 3 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,10 @@

<script>
import { mapState } from 'vuex'
import AppNavigation from './components/navigation/AppNavigation'
import { Modal, Content, AppContent } from '@nextcloud/vue'
import { BoardApi } from './services/BoardApi'
import { emit, subscribe } from '@nextcloud/event-bus'

import AppNavigation from './components/navigation/AppNavigation.vue'
import { BoardApi } from './services/BoardApi.js'
const boardApi = new BoardApi()

export default {
Expand Down
2 changes: 1 addition & 1 deletion src/CardCreateDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ import Modal from '@nextcloud/vue/dist/Components/Modal'
import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent'
import axios from '@nextcloud/axios'
import { CardApi } from './services/CardApi'
import { CardApi } from './services/CardApi.js'

const cardApi = new CardApi()

Expand Down
4 changes: 3 additions & 1 deletion src/components/ActivityEntry.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
</div>
</div>
<!-- FIXME ins/del tags do no longer work with activity so we should get rid of that -->
<!-- eslint-disable vue/no-v-html -->
<p v-if="activity.message" class="activity--message" v-html="sanitizedMessage" />
<!-- eslint-enable -->
</div>
</template>

Expand All @@ -39,7 +41,7 @@ import RichText from '@juliushaertl/vue-richtext'
import { UserBubble } from '@nextcloud/vue'
import moment from '@nextcloud/moment'
import DOMPurify from 'dompurify'
import relativeDate from '../mixins/relativeDate'
import relativeDate from '../mixins/relativeDate.js'

const InternalLink = {
name: 'InternalLink',
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActivityList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<script>
import axios from '@nextcloud/axios'
import { generateOcsUrl } from '@nextcloud/router'
import ActivityEntry from './ActivityEntry'
import ActivityEntry from './ActivityEntry.vue'
import InfiniteLoading from 'vue-infinite-loading'

const ACTIVITY_FETCH_LIMIT = 50
Expand Down
2 changes: 1 addition & 1 deletion src/components/AttachmentDragAndDrop.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

<script>
import { Modal } from '@nextcloud/vue'
import attachmentUpload from '../mixins/attachmentUpload'
import attachmentUpload from '../mixins/attachmentUpload.js'
import { loadState } from '@nextcloud/initial-state'

let maxUploadSizeState
Expand Down
4 changes: 2 additions & 2 deletions src/components/Controls.vue
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@
<script>
import { mapState, mapGetters } from 'vuex'
import { Actions, ActionButton, Popover, Avatar } from '@nextcloud/vue'
import labelStyle from '../mixins/labelStyle'
import CardCreateDialog from '../CardCreateDialog'
import labelStyle from '../mixins/labelStyle.js'
import CardCreateDialog from '../CardCreateDialog.vue'
import ArchiveIcon from 'vue-material-design-icons/Archive'
import FilterIcon from 'vue-material-design-icons/Filter'
import FilterOffIcon from 'vue-material-design-icons/FilterOff'
Expand Down
10 changes: 5 additions & 5 deletions src/components/board/Board.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@
<script>

import { Container, Draggable } from 'vue-smooth-dnd'
import { mapState, mapGetters } from 'vuex'
import Controls from '../Controls'
import Stack from './Stack'
import { EmptyContent } from '@nextcloud/vue'
import GlobalSearchResults from '../search/GlobalSearchResults'
import { showError } from '../../helpers/errors'
import { mapState, mapGetters } from 'vuex'
import Controls from '../Controls.vue'
import Stack from './Stack.vue'
import GlobalSearchResults from '../search/GlobalSearchResults.vue'
import { showError } from '../../helpers/errors.js'

export default {
name: 'Board',
Expand Down
8 changes: 4 additions & 4 deletions src/components/board/BoardSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@

<script>
import { mapState, mapGetters } from 'vuex'
import SharingTabSidebar from './SharingTabSidebar'
import TagsTabSidebar from './TagsTabSidebar'
import DeletedTabSidebar from './DeletedTabSidebar'
import TimelineTabSidebar from './TimelineTabSidebar'
import SharingTabSidebar from './SharingTabSidebar.vue'
import TagsTabSidebar from './TagsTabSidebar.vue'
import DeletedTabSidebar from './DeletedTabSidebar.vue'
import TimelineTabSidebar from './TimelineTabSidebar.vue'
import { AppSidebar, AppSidebarTab } from '@nextcloud/vue'

const capabilities = window.OC.getCapabilities()
Expand Down
2 changes: 1 addition & 1 deletion src/components/board/DeletedTabSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<script>
import { mapState } from 'vuex'
import relativeDate from '../../mixins/relativeDate'
import relativeDate from '../../mixins/relativeDate.js'
export default {
name: 'DeletedTabSidebar',
Expand Down
2 changes: 1 addition & 1 deletion src/components/board/Stack.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ import { Container, Draggable } from 'vue-smooth-dnd'

import { Actions, ActionButton, Modal } from '@nextcloud/vue'
import { showError, showUndo } from '@nextcloud/dialogs'
import CardItem from '../cards/CardItem'
import CardItem from '../cards/CardItem.vue'

import '@nextcloud/dialogs/styles/toast.scss'
import ArchiveIcon from 'vue-material-design-icons/Archive'
Expand Down
2 changes: 1 addition & 1 deletion src/components/board/TagsTabSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<script>
import { mapGetters } from 'vuex'
import Color from '../../mixins/color'
import Color from '../../mixins/color.js'
import { ColorPicker, Actions, ActionButton } from '@nextcloud/vue'
export default {
Expand Down
2 changes: 1 addition & 1 deletion src/components/board/TimelineTabSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</template>

<script>
import ActivityList from '../ActivityList'
import ActivityList from '../ActivityList.vue'
export default {
name: 'TimelineTabSidebar',
Expand Down
4 changes: 2 additions & 2 deletions src/components/boards/Boards.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@

<script>

import BoardItem from './BoardItem'
import Controls from '../Controls'
import BoardItem from './BoardItem.vue'
import Controls from '../Controls.vue'

export default {
name: 'Boards',
Expand Down
7 changes: 4 additions & 3 deletions src/components/card/AttachmentList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,16 @@
<script>
import axios from '@nextcloud/axios'
import { Actions, ActionButton, ActionLink } from '@nextcloud/vue'
import AttachmentDragAndDrop from '../AttachmentDragAndDrop'
import relativeDate from '../../mixins/relativeDate'
import { formatFileSize } from '@nextcloud/files'
import { getCurrentUser } from '@nextcloud/auth'
import { generateUrl, generateOcsUrl, generateRemoteUrl } from '@nextcloud/router'
import { mapState, mapActions } from 'vuex'
import { loadState } from '@nextcloud/initial-state'
import attachmentUpload from '../../mixins/attachmentUpload'
import { getFilePickerBuilder } from '@nextcloud/dialogs'
import AttachmentDragAndDrop from '../AttachmentDragAndDrop.vue'
import relativeDate from '../../mixins/relativeDate.js'
import attachmentUpload from '../../mixins/attachmentUpload.js'

const maxUploadSizeState = loadState('deck', 'maxUploadSize')

const picker = getFilePickerBuilder(t('deck', 'File to share'))
Expand Down
17 changes: 8 additions & 9 deletions src/components/card/CardSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,16 @@
<script>
import { ActionButton, AppSidebar, AppSidebarTab } from '@nextcloud/vue'
import { generateUrl } from '@nextcloud/router'
import { mapState, mapGetters } from 'vuex'
import CardSidebarTabDetails from './CardSidebarTabDetails'
import CardSidebarTabAttachments from './CardSidebarTabAttachments'
import CardSidebarTabComments from './CardSidebarTabComments'
import CardSidebarTabActivity from './CardSidebarTabActivity'
import relativeDate from '../../mixins/relativeDate'
import moment from '@nextcloud/moment'
import AttachmentIcon from 'vue-material-design-icons/Paperclip.vue'

import { showError } from '@nextcloud/dialogs'
import { getLocale } from '@nextcloud/l10n'
import moment from '@nextcloud/moment'
import { mapState, mapGetters } from 'vuex'
import AttachmentIcon from 'vue-material-design-icons/Paperclip.vue'
import CardSidebarTabDetails from './CardSidebarTabDetails.vue'
import CardSidebarTabAttachments from './CardSidebarTabAttachments.vue'
import CardSidebarTabComments from './CardSidebarTabComments.vue'
import CardSidebarTabActivity from './CardSidebarTabActivity.vue'
import relativeDate from '../../mixins/relativeDate.js'

const capabilities = window.OC.getCapabilities()

Expand Down
2 changes: 1 addition & 1 deletion src/components/card/CardSidebarTabActivity.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</template>

<script>
import ActivityList from '../ActivityList'
import ActivityList from '../ActivityList.vue'

export default {
name: 'CardSidebarTabActivity',
Expand Down
2 changes: 1 addition & 1 deletion src/components/card/CardSidebarTabAttachments.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</template>

<script>
import AttachmentList from './AttachmentList'
import AttachmentList from './AttachmentList.vue'
export default {
name: 'CardSidebarTabAttachments',
components: {
Expand Down
4 changes: 2 additions & 2 deletions src/components/card/CardSidebarTabComments.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
<script>
import { mapState, mapGetters } from 'vuex'
import { Avatar } from '@nextcloud/vue'
import CommentItem from './CommentItem'
import CommentForm from './CommentForm'
import CommentItem from './CommentItem.vue'
import CommentForm from './CommentForm.vue'
import InfiniteLoading from 'vue-infinite-loading'
import { getCurrentUser } from '@nextcloud/auth'
Expand Down
4 changes: 2 additions & 2 deletions src/components/card/CardSidebarTabDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,14 @@ import moment from '@nextcloud/moment'
import { Avatar, Actions, ActionButton, Multiselect, DatetimePicker } from '@nextcloud/vue'

import { CollectionList } from 'nextcloud-vue-collections'
import Color from '../../mixins/color'
import Color from '../../mixins/color.js'
import {
getLocale,
getDayNamesMin,
getFirstDay,
getMonthNamesShort,
} from '@nextcloud/l10n'
import Description from './Description'
import Description from './Description.vue'

export default {
name: 'CardSidebarTabDetails',
Expand Down
2 changes: 1 addition & 1 deletion src/components/card/CommentForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
import { mapState } from 'vuex'
import { UserBubble, Avatar } from '@nextcloud/vue'
import At from 'vue-at'
import { rawToParsed } from '../../helpers/mentions'
import { rawToParsed } from '../../helpers/mentions.js'

export default {
name: 'CommentForm',
Expand Down
4 changes: 2 additions & 2 deletions src/components/card/CommentItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
<script>
import { Avatar, Actions, ActionButton, UserBubble } from '@nextcloud/vue'
import RichText from '@juliushaertl/vue-richtext'
import CommentForm from './CommentForm'
import CommentForm from './CommentForm.vue'
import { getCurrentUser } from '@nextcloud/auth'
import md5 from 'blueimp-md5'
import relativeDate from '../../mixins/relativeDate'
import relativeDate from '../../mixins/relativeDate.js'
import ReplyIcon from 'vue-material-design-icons/Reply'
const AtMention = {
Expand Down
4 changes: 3 additions & 1 deletion src/components/card/Description.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,12 @@
</Actions>
</h5>

<!-- eslint-disable vue/no-v-html -->
<div v-if="!descriptionEditing && hasDescription"
id="description-preview"
@click="clickedPreview"
v-html="renderedDescription" />
<!-- eslint-enable -->
<p v-else-if="!descriptionEditing" class="placeholder" @click="showEditor()">
{{ t('deck', 'Write a description …') }}
</p>
Expand All @@ -78,7 +80,7 @@
import MarkdownIt from 'markdown-it'
import MarkdownItTaskLists from 'markdown-it-task-lists'
import MarkdownItLinkAttributes from 'markdown-it-link-attributes'
import AttachmentList from './AttachmentList'
import AttachmentList from './AttachmentList.vue'
import { Actions, ActionButton, Modal } from '@nextcloud/vue'
import { formatFileSize } from '@nextcloud/files'
import { generateUrl } from '@nextcloud/router'
Expand Down
4 changes: 2 additions & 2 deletions src/components/cards/CardBadges.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
</div>
</template>
<script>
import AvatarList from './AvatarList'
import CardMenu from './CardMenu'
import AvatarList from './AvatarList.vue'
import CardMenu from './CardMenu.vue'
import TextIcon from 'vue-material-design-icons/Text.vue'
import AttachmentIcon from 'vue-material-design-icons/Paperclip.vue'
import CheckmarkIcon from 'vue-material-design-icons/CheckboxMarked.vue'
Expand Down
12 changes: 6 additions & 6 deletions src/components/cards/CardItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@
<script>
import ClickOutside from 'vue-click-outside'
import { mapState, mapGetters } from 'vuex'
import CardBadges from './CardBadges'
import Color from '../../mixins/color'
import labelStyle from '../../mixins/labelStyle'
import AttachmentDragAndDrop from '../AttachmentDragAndDrop'
import CardMenu from './CardMenu'
import DueDate from './badges/DueDate'
import CardBadges from './CardBadges.vue'
import Color from '../../mixins/color.js'
import labelStyle from '../../mixins/labelStyle.js'
import AttachmentDragAndDrop from '../AttachmentDragAndDrop.vue'
import CardMenu from './CardMenu.vue'
import DueDate from './badges/DueDate.vue'

export default {
name: 'CardItem',
Expand Down
4 changes: 2 additions & 2 deletions src/components/navigation/AppNavigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ import axios from '@nextcloud/axios'
import { mapGetters } from 'vuex'
import ClickOutside from 'vue-click-outside'
import { AppNavigation as AppNavigationVue, AppNavigationItem, AppNavigationSettings, Multiselect } from '@nextcloud/vue'
import AppNavigationAddBoard from './AppNavigationAddBoard'
import AppNavigationBoardCategory from './AppNavigationBoardCategory'
import AppNavigationAddBoard from './AppNavigationAddBoard.vue'
import AppNavigationBoardCategory from './AppNavigationBoardCategory.vue'
import { loadState } from '@nextcloud/initial-state'
import { generateOcsUrl } from '@nextcloud/router'
import { getCurrentUser } from '@nextcloud/auth'
Expand Down
2 changes: 1 addition & 1 deletion src/components/navigation/AppNavigationBoardCategory.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</template>

<script>
import AppNavigationBoard from './AppNavigationBoard'
import AppNavigationBoard from './AppNavigationBoard.vue'
import { AppNavigationItem } from '@nextcloud/vue'

export default {
Expand Down
6 changes: 3 additions & 3 deletions src/components/overview/Overview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@

<script>

import Controls from '../Controls'
import CardItem from '../cards/CardItem'
import Controls from '../Controls.vue'
import CardItem from '../cards/CardItem.vue'
import { mapGetters } from 'vuex'
import moment from '@nextcloud/moment'
import GlobalSearchResults from '../search/GlobalSearchResults'
import GlobalSearchResults from '../search/GlobalSearchResults.vue'

const FILTER_UPCOMING = 'upcoming'

Expand Down
4 changes: 2 additions & 2 deletions src/components/search/GlobalSearchResults.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
</template>

<script>
import CardItem from '../cards/CardItem'
import CardItem from '../cards/CardItem.vue'
import { mapState } from 'vuex'
import axios from '@nextcloud/axios'
import { generateOcsUrl } from '@nextcloud/router'
import InfiniteLoading from 'vue-infinite-loading'
import RichText from '@juliushaertl/vue-richtext'
import Placeholder from './Placeholder'
import Placeholder from './Placeholder.vue'
import { Actions, ActionButton } from '@nextcloud/vue'

const createCancelToken = () => axios.CancelToken.source()
Expand Down
8 changes: 4 additions & 4 deletions src/init-collections.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import Vue from 'vue'

import './../css/collections.css'
import FileSharingPicker from './views/FileSharingPicker'
import { buildSelector } from './helpers/selector'
import FileSharingPicker from './views/FileSharingPicker.js'
import { buildSelector } from './helpers/selector.js'

// eslint-disable-next-line
__webpack_nonce__ = btoa(OC.requestToken);
Expand All @@ -44,7 +44,7 @@ window.addEventListener('DOMContentLoaded', () => {

window.OCP.Collaboration.registerType('deck', {
action: () => {
const BoardSelector = () => import('./BoardSelector')
const BoardSelector = () => import('./BoardSelector.vue')
return buildSelector(BoardSelector)
},
typeString: t('deck', 'Link to a board'),
Expand All @@ -53,7 +53,7 @@ window.addEventListener('DOMContentLoaded', () => {

window.OCP.Collaboration.registerType('deck-card', {
action: () => {
const CardSelector = () => import('./CardSelector')
const CardSelector = () => import('./CardSelector.vue')
return buildSelector(CardSelector)
},
typeString: t('deck', 'Link to a card'),
Expand Down
Loading

0 comments on commit 9737c3a

Please sign in to comment.