Adjust eslint rules

Signed-off-by: Julius Härtl <jus@bitgrid.net>

.eslintrc.js

@@ -51,9 +51,14 @@ module.exports = {
 		'node/no-unpublished-require': ['off'],
 		'node/no-unsupported-features/es-syntax': ['off'],
 		// kebab case components for vuejs
- 		'vue/component-name-in-template-casing': ['error', 'kebab-case'],
+		'vue/component-name-in-template-casing': ['error', 'kebab-case'],
 		// space before self-closing elements
 		'vue/html-closing-bracket-spacing': 'error',
+		// newline before closing bracket
+		'vue/html-closing-bracket-newline': ["error", {
+			"singleline": "never",
+			"multiline": "never"
+		}],
 		// code spacing with attributes
 		'vue/max-attributes-per-line': [
 			'error',

src/App.vue

@@ -10,8 +10,7 @@
 				</h3>
 				<p v-if="!serverData.checks.checks.wellknown">
 					{{ t('social', 'Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud can\'t configure this automatically. To use Social, the admin of this Nextcloud instance needs to manually configure the .well-known redirects: ') }}<a class="external_link" href="https://docs.nextcloud.com/server/15/go.php?to=admin-setup-well-known-URL" target="_blank"
-						rel="noreferrer noopener"
+						rel="noreferrer noopener">
-					>
 						{{ t('social', 'Open documentation') }} ↗
 					</a>
 				</p>
@@ -30,8 +29,7 @@
 						{{ t('social', 'ActivityPub URL base') }}
 					</label>
 					<input v-model="cloudAddress" :placeholder="serverData.cliUrl" type="url"
-						required
+						required>
-					>
 					<input :value="t('social', 'Finish setup')" type="submit" class="primary">
 				</p>
 				<template v-if="!serverData.checks.success">
@@ -40,8 +38,7 @@
 					</h3>
 					<p v-if="!serverData.checks.checks.wellknown">
 						{{ t('social', 'Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud can\'t configure this automatically. To use Social, the admin of this Nextcloud instance needs to manually configure the .well-known redirects: ') }}<a class="external_link" href="https://docs.nextcloud.com/server/15/go.php?to=admin-setup-well-known-URL" target="_blank"
-							rel="noreferrer noopener"
+							rel="noreferrer noopener">
-						>
 							{{ t('social', 'Open documentation') }} ↗
 						</a>
 					</p>

src/components/Composer.vue

@@ -24,8 +24,7 @@
 	<div class="new-post" data-id="">
 		<div class="new-post-author">
 			<avatar :user="currentUser.uid" :display-name="currentUser.displayName" :disable-tooltip="true"
-				:size="32"
+				:size="32" />
-			/>
 			<div class="post-author">
 				<span class="post-author-name">
 					{{ currentUser.displayName }}
@@ -39,23 +38,19 @@
 			<vue-tribute :options="tributeOptions">
 				<!-- eslint-disable-next-line vue/valid-v-model -->
 				<div ref="composerInput" v-contenteditable:post.dangerousHTML="canType" class="message"
-					placeholder="What would you like to share?" @keyup.enter="keyup"
+					placeholder="What would you like to share?" @keyup.enter="keyup" />
-				/>
 			</vue-tribute>
 			<emoji-picker ref="emojiPicker" :search="search" class="emoji-picker-wrapper"
-				@emoji="insert"
+				@emoji="insert">
-			>
 				<a slot="emoji-invoker" v-tooltip="'Insert emoji'" slot-scope="{ events }"
 					class="emoji-invoker" tabindex="0" v-on="events"
-					@keyup.enter="events.click" @keyup.space="events.click"
+					@keyup.enter="events.click" @keyup.space="events.click" />
-				/>
 				<!-- eslint-disable-next-line vue/no-template-shadow -->
 				<div slot="emoji-picker" slot-scope="{ emojis, insert }" class="emoji-picker popovermenu">
 					<div>
 						<div>
 							<input v-model="search" v-focus-on-create type="text"
-								@keyup.enter="insert(emojis)"
+								@keyup.enter="insert(emojis)">
-							>
 						</div>
 						<div>
 							<div v-for="(emojiGroup, category) in emojis" :key="category">
@@ -65,8 +60,7 @@
 									<span v-for="(emoji, emojiName) in emojiGroup" :key="emojiName" :title="emojiName"
 										tabindex="0"
 										class="emoji" @click="insert(emoji)" @keyup.enter="insert(emoji)"
-										@keyup.space="insert(emoji)" v-html="$twemoji.parse(emoji)"
+										@keyup.space="insert(emoji)" v-html="$twemoji.parse(emoji)" />
-									/>
 								</div>
 							</div>
 						</div>
@@ -76,8 +70,7 @@
 
 			<div class="options">
 				<input :value="currentVisibilityPostLabel" :disabled="post.length < 1" class="submit primary"
-					type="submit" title="" data-original-title="Post"
+					type="submit" title="" data-original-title="Post">
-				>
 				<div v-click-outside="hidePopoverMenu">
 					<button :class="currentVisibilityIconClass" @click.prevent="togglePopoverMenu" />
 					<div :class="{open: menuOpened}" class="popovermenu menu-center">

src/components/FollowButton.vue

@@ -24,13 +24,11 @@
 	<div v-if="!serverData.public && cloudId !== account && actorInfo">
 		<button v-if="isCurrentUserFollowing" :class="{'icon-loading-small': followLoading}"
 			@click="unfollow()"
-			@mouseover="followingText=t('social', 'Unfollow')" @mouseleave="followingText=t('social', 'Following')"
+			@mouseover="followingText=t('social', 'Unfollow')" @mouseleave="followingText=t('social', 'Following')">
-		>
 			<span><span class="icon-checkmark" />{{ followingText }}</span>
 		</button>
 		<button v-else :class="{'icon-loading-small': followLoading}" class="primary"
-			@click="follow"
+			@click="follow">
-		>
 			<span>{{ t('social', 'Follow') }}</span>
 		</button>
 	</div>

src/components/ProfileInfo.vue

@@ -24,11 +24,9 @@
 	<div v-if="account && accountInfo" class="user-profile">
 		<div class="user-profile--info">
 			<avatar v-if="accountInfo.local" :user="uid" :disable-tooltip="true"
-				:size="128"
+				:size="128" />
-			/>
 			<avatar v-else :url="avatarUrl" :disable-tooltip="true"
-				:size="128"
+				:size="128" />
-			/>
 			<h2>{{ displayName }}</h2>
 			<p>{{ accountInfo.account }}</p>
 			<p v-if="accountInfo.website">

src/components/TimelineEntry.vue

@@ -3,11 +3,9 @@
 		<div class="entry-content">
 			<div v-if="item.actor_info" class="post-avatar">
 				<avatar v-if="item.local" :size="32" :user="item.actor_info.preferredUsername"
-					:display-name="item.actor_info.account" :disable-tooltip="true"
+					:display-name="item.actor_info.account" :disable-tooltip="true" />
-				/>
 				<avatar v-else :size="32" :url="avatarUrl"
-					:disable-tooltip="true"
+					:disable-tooltip="true" />
-				/>
 			</div>
 			<div class="post-content">
 				<div class="post-author-wrapper">

src/components/UserEntry.vue

@@ -25,8 +25,7 @@
 		<div class="entry-content">
 			<div class="user-avatar">
 				<avatar v-if="item.local" :size="32" :user="item.preferredUsername"
-					:disable-tooltip="true"
+					:disable-tooltip="true" />
-				/>
 				<avatar v-else :url="avatarUrl" />
 			</div>
 			<div class="user-details">
@@ -39,8 +38,7 @@
 					</span>
 				</router-link>
 				<a v-else :href="item.id" target="_blank"
-					rel="noreferrer"
+					rel="noreferrer">
-				>
 					<span class="post-author">
 						{{ item.name }}
 					</span>

src/views/Timeline.vue

@@ -17,8 +17,7 @@
 				<div v-show="!isFollowingNextcloudAccount" class="follow-nextcloud">
 					<p>{{ t('social', 'Since you are new to Social, start by following the official Nextcloud account so you don\'t miss any news') }}</p>
 					<input :value="t('social', 'Follow Nextcloud on mastodon.xyz')" type="button" class="primary"
-						@click="followNextcloud"
+						@click="followNextcloud">
-					>
 				</div>
 			</div>
 		</transition>