From c65a56b0e3511b67da23b22936254574d458377e Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 9 Oct 2019 12:11:42 +0200
Subject: [PATCH] Fix eslint

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .drone.yml                                    |  4 ++--
 Makefile                                      |  2 ++
 package.json                                  | 24 +++----------------
 run-eslint.sh                                 | 11 ---------
 .../AppContentListItem/AppContentListItem.vue | 14 +++++------
 .../ConversationsList/ConversationsList.vue   |  2 +-
 6 files changed, 15 insertions(+), 42 deletions(-)
 delete mode 100755 run-eslint.sh

diff --git a/.drone.yml b/.drone.yml
index edc9185aa3..a45e6bddf6 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:
diff --git a/Makefile b/Makefile
index 2fdce17974..2571eeb710 100644
--- a/Makefile
+++ b/Makefile
@@ -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 1b76723799..d2c4996269 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 50548f1079..0000000000
--- 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 f2185e9fc2..597c15cff1 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 6a635c2f7d..46100749b3 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>