diff options
| -rw-r--r-- | .drone.yml | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | package.json | 24 | ||||
| -rwxr-xr-x | run-eslint.sh | 11 | ||||
| -rw-r--r-- | src/components/Navigation/ConversationsList/AppContentListItem/AppContentListItem.vue | 14 | ||||
| -rw-r--r-- | src/components/Navigation/ConversationsList/ConversationsList.vue | 2 |
6 files changed, 15 insertions, 42 deletions
diff --git a/.drone.yml b/.drone.yml index edc9185aa..a45e6bddf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,9 +32,9 @@ name: eslint steps: - name: eslint - image: nextcloudci/eslint:eslint-1 + image: node:lts commands: - - ./run-eslint.sh + - make lint trigger: branch: @@ -29,9 +29,11 @@ watch-js: cd vue/ && npm run watch lint: + npm run lint cd vue/ && npm run lint lint-fix: + npm run lint:fix cd vue/ && npm run lint:fix npm-init: npm-init-root npm-init-vue diff --git a/package.json b/package.json index 1b7672379..d2c499626 100644 --- a/package.json +++ b/package.json @@ -1,26 +1,8 @@ { "name": "talk", - "description": "A simple Nextcloud app using vue-components", - "version": "3.2.0", - "author": "John Molakvoæ <skjnldsv@protonmail.com>", - "contributors": [ - "John Molakvoæ <skjnldsv@protonmail.com>" - ], - "keywords": [ - "nextcloud", - "vueexample", - "app", - "dev", - "vuejs" - ], - "bugs": { - "url": "https://github.com/skjnldsv/vueexample/issues" - }, - "repository": { - "url": "https://github.com/skjnldsv/vueexample", - "type": "git" - }, - "homepage": "https://github.com/skjnldsv/vueexample", + "description": "", + "version": "8.0.0", + "author": "Joas Schilling <coding@schilljs.com>", "license": "agpl", "private": true, "scripts": { diff --git a/run-eslint.sh b/run-eslint.sh deleted file mode 100755 index 50548f107..000000000 --- a/run-eslint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -ESLINT=$(which eslint || true) -if [ -z "$ESLINT" ]; then - echo "Can't find command \"eslint\" in $PATH" - exit 1 -fi - -echo Checking scripts with $ESLINT ... -find -name "*.js" -print0 | xargs -0 $ESLINT diff --git a/src/components/Navigation/ConversationsList/AppContentListItem/AppContentListItem.vue b/src/components/Navigation/ConversationsList/AppContentListItem/AppContentListItem.vue index f2185e9fc..597c15cff 100644 --- a/src/components/Navigation/ConversationsList/AppContentListItem/AppContentListItem.vue +++ b/src/components/Navigation/ConversationsList/AppContentListItem/AppContentListItem.vue @@ -30,7 +30,7 @@ <div class="acli__content"> <div class="acli__content__line-one"> <span class="acli__content__line-one__title"> - {{title}} + {{ title }} </span> <span> <Actions @@ -100,12 +100,6 @@ export default { default: '' } }, - methods: { - // forward click event - onClick(event) { - this.$emit('click', event) - } - }, computed: { hasDetails() { return (this.details !== '' && !this.$slots.counter) @@ -129,6 +123,12 @@ export default { } } + }, + methods: { + // forward click event + onClick(event) { + this.$emit('click', event) + } } } </script> diff --git a/src/components/Navigation/ConversationsList/ConversationsList.vue b/src/components/Navigation/ConversationsList/ConversationsList.vue index 6a635c2f7..46100749b 100644 --- a/src/components/Navigation/ConversationsList/ConversationsList.vue +++ b/src/components/Navigation/ConversationsList/ConversationsList.vue @@ -49,7 +49,7 @@ <ActionButton icon="icon-delete" @click.prevent.exact="deleteConversation(item.token)"> - {{t('spreed', 'Leave Conversation')}} + {{ t('spreed', 'Leave Conversation') }} </ActionButton> </template> </AppContentListItem> |