summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevlin Junker <devlin.junker@gmail.com>2023-08-08 08:28:08 -0700
committerBenjamin Brahmer <info@b-brahmer.de>2023-08-11 09:22:24 +0200
commit2287835894a4552c8247c6be85934ff9eb00ed07 (patch)
tree89b06035dde2a1dd57165658915b9e05243d0d03
parentda782c0b07070f63b17135a6dfce61eb95f4c7e7 (diff)
use eslint --fix to clean up linting errors
Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
-rw-r--r--src/components/AddFeed.vue67
-rw-r--r--src/components/Sidebar.vue1
-rw-r--r--src/store/feed.ts17
-rw-r--r--src/store/folder.ts6
4 files changed, 44 insertions, 47 deletions
diff --git a/src/components/AddFeed.vue b/src/components/AddFeed.vue
index 4f21b6852..6f57fee9f 100644
--- a/src/components/AddFeed.vue
+++ b/src/components/AddFeed.vue
@@ -3,8 +3,8 @@
<div id="new-feed">
<form name="feedform">
<fieldset style="padding: 16px">
- <input type="text"
- v-model="feedUrl"
+ <input v-model="feedUrl"
+ type="text"
:placeholder="t('news', 'Web address')"
:class="{ 'invalid': feedUrlExists() }"
name="address"
@@ -13,10 +13,9 @@
autofocus
style="width: 90%;">
- <p class="error" v-if="feedUrlExists()">
+ <p v-if="feedUrlExists()" class="error">
{{ t("news", "Feed exists already!") }}
</p>
-
<!-- select a folder -->
<div style="display:flex;">
@@ -30,8 +29,8 @@
<!-- add a folder -->
<input v-if="createNewFolder"
- type="text"
v-model="newFolderName"
+ type="text"
:class="{ 'invalid': folderNameExists() }"
:placeholder="t('news', 'Folder name')"
name="folderName"
@@ -39,13 +38,13 @@
required>
<NcCheckboxRadioSwitch :checked.sync="createNewFolder" type="switch">
- {{ t("news", "New folder") }}?
+ {{ t("news", "New folder") }}?
</NcCheckboxRadioSwitch>
</div>
- <p class="error"
- v-if="folderNameExists()">
- {{ t("news", "Folder exists already!") }}
+ <p v-if="folderNameExists()"
+ class="error">
+ {{ t("news", "Folder exists already!") }}
</p>
<!-- basic auth -->
@@ -60,19 +59,19 @@
<div style="display: flex">
<NcCheckboxRadioSwitch :checked.sync="withBasicAuth" type="switch" style="flex-grow: 1;">
- {{ t("news", "Credentials") }}?
+ {{ t("news", "Credentials") }}?
</NcCheckboxRadioSwitch>
<div v-if="withBasicAuth" class="add-feed-basicauth" style="flex-grow: 1; display: flex;">
- <input type="text"
- v-model="feedUser"
+ <input v-model="feedUser"
+ type="text"
:placeholder="t('news', 'Username')"
name="user"
autofocus
style="flex-grow: 1">
- <input type="password"
- v-model="feedPassword"
+ <input v-model="feedPassword"
+ type="password"
:placeholder="t('news', 'Password')"
name="password"
autocomplete="new-password"
@@ -103,7 +102,6 @@ import Vue from 'vue'
import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
import { Folder } from '../types/Folder'
@@ -111,15 +109,15 @@ import { ACTIONS } from '../store'
type AddFeedState = {
folder?: Folder;
- newFolderName: String;
+ newFolderName: string;
autoDiscover: boolean;
createNewFolder: boolean;
withBasicAuth: boolean;
- feedUrl?: String;
- feedUser?: String;
- feedPassword?: String;
+ feedUrl?: string;
+ feedUser?: string;
+ feedPassword?: string;
};
export default Vue.extend({
@@ -127,8 +125,7 @@ export default Vue.extend({
NcModal,
NcCheckboxRadioSwitch,
NcButton,
- NcMultiselect,
- NcSelect
+ NcSelect,
},
data: (): AddFeedState => {
return {
@@ -141,7 +138,7 @@ export default Vue.extend({
feedUrl: '',
feedUser: '',
- feedPassword: ''
+ feedPassword: '',
}
},
computed: {
@@ -149,8 +146,10 @@ export default Vue.extend({
return this.$store.state.folders.folders
},
disableAddFeed(): boolean {
- return this.feed === "" || this.feedUrlExists() || (this.createNewFolder && this.newFolderName === "" || this.folderNameExists())
- }
+ return (this.feed === ''
+ || this.feedUrlExists()
+ || (this.createNewFolder && (this.newFolderName === '' || this.folderNameExists())))
+ },
},
methods: {
/**
@@ -163,37 +162,37 @@ export default Vue.extend({
folder: this.createNewFolder ? { name: this.newFolderName } : this.folder,
autoDiscover: this.autoDiscover,
user: this.feedUser === '' ? undefined : this.feedUser,
- password: this.feedPassword === '' ? undefined : this.feedPassword
+ password: this.feedPassword === '' ? undefined : this.feedPassword,
},
- });
+ })
- this.$emit('close');
+ this.$emit('close')
},
/**
* Checks if Feed Url exists in Vuex Store Feeds
*/
feedUrlExists(): boolean {
- for (let feed of this.$store.state.feeds.feeds) {
+ for (const feed of this.$store.state.feeds.feeds) {
if (feed.url === this.feedUrl) {
- return true;
+ return true
}
}
- return false;
+ return false
},
/**
* Check if Folder Name exists in Vuex Store Folders
*/
folderNameExists(): boolean {
if (this.createNewFolder) {
- for (let folder of this.$store.state.folders.folders) {
+ for (const folder of this.$store.state.folders.folders) {
if (folder.name === this.newFolderName) {
- return true;
+ return true
}
}
}
- return false;
- }
+ return false
+ },
},
})
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index bf7e2b82e..5ef486d85 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -33,7 +33,6 @@
</template>
</NcAppNavigationItem>
-
<NcAppNavigationItem v-for="topLevelItem in topLevelNav"
:key="topLevelItem.name || topLevelItem.title"
:title="topLevelItem.name || topLevelItem.title"
diff --git a/src/store/feed.ts b/src/store/feed.ts
index 6332fb988..737b90c5a 100644
--- a/src/store/feed.ts
+++ b/src/store/feed.ts
@@ -35,9 +35,8 @@ export const actions = {
commit(FEED_MUTATION_TYPES.SET_FEEDS, feeds.data.feeds)
},
async [FEED_ACTION_TYPES.ADD_FEED](
- { commit }: ActionParams,
- { feedReq }: { feedReq: { url: string; folder?: { id: number }, user?: string; password?: string; } })
- {
+ { commit }: ActionParams,
+ { feedReq }: { feedReq: { url: string; folder?: { id: number }, user?: string; password?: string; } }) {
let url = feedReq.url.trim()
if (!url.startsWith('http')) {
url = 'https://' + url
@@ -69,10 +68,10 @@ export const actions = {
})
commit(FEED_MUTATION_TYPES.ADD_FEED, response.data.feeds[0])
- } catch(e) {
- // TODO: show error to user if failure
- console.log(e);
- return;
+ } catch (e) {
+ // TODO: show error to user if failure
+ console.log(e)
+
}
},
}
@@ -84,8 +83,8 @@ export const mutations = {
})
},
[FEED_MUTATION_TYPES.ADD_FEED](state: AppState, feed: Feed) {
- state.feeds.push(feed);
- }
+ state.feeds.push(feed)
+ },
}
export default {
diff --git a/src/store/folder.ts b/src/store/folder.ts
index 140d8b602..e6ef70341 100644
--- a/src/store/folder.ts
+++ b/src/store/folder.ts
@@ -1,9 +1,9 @@
-import { Feed } from '@/types/Feed'
import axios from '@nextcloud/axios'
import { generateUrl } from '@nextcloud/router'
import { AppState, ActionParams } from '../store'
import { Folder } from '../types/Folder'
+import { Feed } from '../types/Feed'
import { FEED_MUTATION_TYPES } from './feed'
export const FOLDER_ACTION_TYPES = {
@@ -72,7 +72,7 @@ export const mutations = {
folder.feeds.push(it)
folder.feedCount += it.unreadCount
}
- });
+ })
},
[FEED_MUTATION_TYPES.ADD_FEED](state: AppState, feed: Feed) {
const folder = state.folders.find(folder => folder.id === feed.folderId)
@@ -80,7 +80,7 @@ export const mutations = {
folder.feeds.push(feed)
folder.feedCount += feed.unreadCount
}
- }
+ },
}
export default {