From a9fbf39562724f69d3b8ca86bb3ae3f37ab401cc Mon Sep 17 00:00:00 2001 From: Jonathan Weth <git@jonathanweth.de> Date: Sun, 15 Jan 2023 12:40:29 +0100 Subject: [PATCH] Fix lint --- aleksis/core/assets/app/apollo.js | 4 ++-- .../assets/components/app/AccountMenu.vue | 19 ++++++++++++++----- .../core/assets/components/app/SideNav.vue | 4 ++-- .../assets/components/generic/DetailView.vue | 2 +- aleksis/core/assets/mixins/offline.js | 8 ++++---- aleksis/core/assets/plugins/aleksis.js | 18 +++++++++--------- 6 files changed, 32 insertions(+), 23 deletions(-) diff --git a/aleksis/core/assets/app/apollo.js b/aleksis/core/assets/app/apollo.js index 7236b9d3f..4ea2907d8 100644 --- a/aleksis/core/assets/app/apollo.js +++ b/aleksis/core/assets/app/apollo.js @@ -114,11 +114,11 @@ const apolloOpts = { defaultClient: apolloClient, defaultOptions: { $query: { - skip: (vm, queryKey) => { + skip: (vm) => { // We only want to run this query when background activity is on and we are not reported offline return !vm.$root.backgroundActive || vm.$root.offline; }, - error: ({ graphQLErrors, networkError }, vm, key, type, options) => { + error: ({ graphQLErrors, networkError }, vm) => { if (graphQLErrors) { // Add a snackbar on all errors returned by the GraphQL endpoint console.error("A GraphQL query failed on the server"); diff --git a/aleksis/core/assets/components/app/AccountMenu.vue b/aleksis/core/assets/components/app/AccountMenu.vue index d70de72bc..4a5a94992 100644 --- a/aleksis/core/assets/components/app/AccountMenu.vue +++ b/aleksis/core/assets/components/app/AccountMenu.vue @@ -37,7 +37,7 @@ :to="{ name: 'impersonate.stop', query: { next: $route.path } }" > <v-list-item-icon> - <v-icon> mdi-stop </v-icon> + <v-icon> mdi-stop</v-icon> </v-list-item-icon> <v-list-item-title> {{ $t("person.impersonation.stop") }} @@ -52,7 +52,7 @@ <v-list-item-icon> <v-icon v-if="menuItem.icon">{{ menuItem.icon }}</v-icon> </v-list-item-icon> - <v-list-item-title>{{ $t(menuItem.titleKey) }} </v-list-item-title> + <v-list-item-title>{{ $t(menuItem.titleKey) }}</v-list-item-title> </v-list-item> </div> </v-list> @@ -63,9 +63,18 @@ export default { name: "AccountMenu", props: { - accountMenu: Array, - systemProperties: Object, - whoAmI: Object, + accountMenu: { + type: Array, + required: true, + }, + systemProperties: { + type: Object, + required: true, + }, + whoAmI: { + type: Object, + required: true, + }, }, }; </script> diff --git a/aleksis/core/assets/components/app/SideNav.vue b/aleksis/core/assets/components/app/SideNav.vue index e3452851f..826fa1252 100644 --- a/aleksis/core/assets/components/app/SideNav.vue +++ b/aleksis/core/assets/components/app/SideNav.vue @@ -86,8 +86,8 @@ export default { SidenavSearch, }, props: { - sideNavMenu: Array, - systemProperties: Object, + sideNavMenu: { type: Array, required: true }, + systemProperties: { type: Object, required: true }, }, }; </script> diff --git a/aleksis/core/assets/components/generic/DetailView.vue b/aleksis/core/assets/components/generic/DetailView.vue index dfe6e482b..da921bbc8 100644 --- a/aleksis/core/assets/components/generic/DetailView.vue +++ b/aleksis/core/assets/components/generic/DetailView.vue @@ -27,7 +27,7 @@ <v-col order="1" order-sm="last" class="ms-5"> <slot name="actions" - v-bind:classes="'d-flex gap justify-md-end flex-column-reverse flex-md-row align-end align-md-center'" + :classes="'d-flex gap justify-md-end flex-column-reverse flex-md-row align-end align-md-center'" /> </v-col> </v-row> diff --git a/aleksis/core/assets/mixins/offline.js b/aleksis/core/assets/mixins/offline.js index 02a34644e..dfdc03484 100644 --- a/aleksis/core/assets/mixins/offline.js +++ b/aleksis/core/assets/mixins/offline.js @@ -22,11 +22,11 @@ const offlineMixin = { }; }, mounted() { - window.addEventListener("online", (e) => { + window.addEventListener("online", () => { console.info("Navigator changed status to online."); this.checkOfflineState(); }); - window.addEventListener("offline", (e) => { + window.addEventListener("offline", () => { console.info("Navigator changed status to offline."); this.checkOfflineState(); }); @@ -55,14 +55,14 @@ const offlineMixin = { }; }, pollInterval: 1000, - skip: (component, query) => { + skip: (component) => { // We only want to run this query when background activity is on and we are reported offline return !(component.$root.backgroundActive && component.$root.offline); }, }, }, watch: { - ping(payload) { + ping() { console.info("Pong received, clearing offline state"); this.$root.offline = false; }, diff --git a/aleksis/core/assets/plugins/aleksis.js b/aleksis/core/assets/plugins/aleksis.js index 4f6a960da..c264c64c9 100644 --- a/aleksis/core/assets/plugins/aleksis.js +++ b/aleksis/core/assets/plugins/aleksis.js @@ -3,12 +3,12 @@ */ // aleksisAppImporter is a virtual module defined in Vite config -import { appObjects, appMessages } from "aleksisAppImporter"; +import { appMessages } from "aleksisAppImporter"; console.debug("Defining AleksisVue plugin"); const AleksisVue = {}; -AleksisVue.install = function (Vue, options) { +AleksisVue.install = function (Vue) { /* * The browser title when the app was loaded. * @@ -51,25 +51,25 @@ AleksisVue.install = function (Vue, options) { * Register all global components that shall be reusable by apps. */ Vue.$registerGlobalComponents = function () { - Vue.component("message-box", () => + Vue.component("MessageBox", () => import("../components/generic/MessageBox.vue") ); - Vue.component("small-container", () => + Vue.component("SmallContainer", () => import("../components/generic/BackButton.vue") ); - Vue.component("back-button", () => + Vue.component("BackButton", () => import("../components/generic/BackButton.vue") ); - Vue.component("avatar-clickbox", () => + Vue.component("AvatarClickbox", () => import("../components/generic/AvatarClickbox.vue") ); - Vue.component("detail-view", () => + Vue.component("DetailView", () => import("../components/generic/DetailView.vue") ); - Vue.component("list-view", () => + Vue.component("ListView", () => import("../components/generic/ListView.vue") ); - Vue.component("button-menu", () => + Vue.component("ButtonMenu", () => import("../components/generic/ButtonMenu.vue") ); }; -- GitLab