Skip to content
Snippets Groups Projects
Verified Commit e996102f authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Reformat and fix lint issues

parent 7d2e70a6
No related branches found
No related tags found
1 merge request!1123Resolve "Finalise Vuetify app as SPA"
Pipeline #108508 failed
......@@ -8,8 +8,6 @@ import { RetryLink } from "@/apollo-link-retry";
import { persistCache, LocalStorageWrapper } from "@/apollo3-cache-persist";
import { InMemoryCache } from "@/apollo-cache-inmemory";
import gql from "@/graphql-tag";
// Cache for GraphQL query results in memory and persistent across sessions
const cache = new InMemoryCache();
await persistCache({
......@@ -63,7 +61,12 @@ const apolloOpts = {
error: ({ graphQLErrors, networkError }, vm) => {
if (graphQLErrors) {
for (let err of graphQLErrors) {
console.error("GraphQL query error in query", err.path.join(".") , ":", err.message);
console.error(
"GraphQL query error in query",
err.path.join("."),
":",
err.message
);
}
// Add a snackbar on all errors returned by the GraphQL endpoint
// If App is offline, don't add snackbar since only the ping query is active
......
......@@ -66,6 +66,7 @@ export default {
accountMenu: {
type: Array,
required: false,
default: () => [],
},
systemProperties: {
type: Object,
......
......@@ -116,10 +116,7 @@
<div v-if="footerMenu && footerMenu.items">
<v-card-text class="pa-0">
<v-container class="px-6">
<v-row
justify="center"
no-gutters
>
<v-row justify="center" no-gutters>
<v-btn
v-for="menu_item in footerMenu.items"
:key="menu_item.name"
......@@ -186,7 +183,7 @@
:snackbar-item="item"
/>
<v-snackbar v-model="needRefresh" v-if="!refreshDismissed" timeout="-1">
{{ $t("service_worker.new_version_available") }}
{{ $t("service_worker.new_version_available") }}
<template #action="{ attrs }">
<v-btn color="primary" text @click="updateServiceWorker()">
......
......@@ -16,9 +16,15 @@
export default {
name: "ErrorPage",
props: {
shortErrorMessageKey: String,
longErrorMessageKey: String,
}
shortErrorMessageKey: {
type: String,
required: true,
},
longErrorMessageKey: {
type: String,
required: true,
},
},
};
</script>
......
......@@ -86,7 +86,7 @@ export default {
SidenavSearch,
},
props: {
sideNavMenu: { type: Array, required: false },
sideNavMenu: { type: Array, required: false, default: null },
systemProperties: { type: Object, required: true },
value: { type: Boolean, required: true },
},
......
......@@ -3,15 +3,14 @@
<slot name="loading" v-if="$apollo.queries.object.loading"></slot>
<slot v-else-if="object" v-bind="object"></slot>
<error-page
v-else
:shortErrorMessageKey="shortErrorMessageKey"
:longErrorMessageKey="longErrorMessageKey"
v-else
:short-error-message-key="shortErrorMessageKey"
:long-error-message-key="longErrorMessageKey"
/>
</div>
</template>
<script>
export default {
name: "ObjectOverview",
props: {
......@@ -37,9 +36,11 @@ export default {
methods: {
getTitleAttr(obj) {
let tmpObj = obj;
this.titleAttr.split(".").forEach((attr) => {tmpObj = tmpObj[attr]})
this.titleAttr.split(".").forEach((attr) => {
tmpObj = tmpObj[attr];
});
return tmpObj;
}
},
},
apollo: {
object() {
......@@ -53,18 +54,16 @@ export default {
}
return {};
},
result({data}) {
result({ data }) {
if (data && data.object) {
this.$root.$setPageTitle(this.getTitleAttr(data.object));
}
},
error() {}
error() {},
};
},
},
}
};
</script>
<style scoped>
</style>
<style scoped></style>
<template>
<object-overview
:query="query"
title-attr="fullName"
>
<object-overview :query="query" title-attr="fullName">
<template #loading>
<v-skeleton-loader type="article" />
......@@ -12,7 +9,7 @@
</v-col>
</v-row>
</template>
<template v-slot="person">
<template #default="person">
<detail-view>
<template #avatarContent>
<person-avatar-clickbox :id="id" />
......@@ -218,7 +215,7 @@ export default {
data() {
return {
query: gqlPersonOverview,
}
};
},
props: {
id: {
......
......@@ -13,7 +13,9 @@ import VueApollo from "@/vue-apollo";
import AleksisVue from "./plugins/aleksis.js";
console.info("🎒 Welcome to AlekSIS®, the Free School Information System!");
console.info("AlekSIS® is Free Software, licenced under the EUPL, version 1.2 or later, by Teckids e.V. (Bonn, Germany)");
console.info(
"AlekSIS® is Free Software, licenced under the EUPL, version 1.2 or later, by Teckids e.V. (Bonn, Germany)"
);
// Install the AleksisVue plugin first and let it do early setup
Vue.use(AleksisVue);
......
......@@ -29,7 +29,7 @@ AleksisVue.install = function (Vue) {
*/
Vue.$configureSentry = function (router) {
if (Vue.$aleksisFrontendSettings.sentry.enabled) {
import("../app/sentry.js").then(mod => {
import("../app/sentry.js").then((mod) => {
mod.default.Sentry.init({
Vue,
dsn: Vue.$aleksisFrontendSettings.sentry.dsn,
......@@ -39,7 +39,8 @@ AleksisVue.install = function (Vue) {
logError: true,
integrations: [
new mod.default.BrowserTracing({
routingInstrumentation: Sentry.vueRouterInstrumentation(router),
routingInstrumentation:
mod.default.Sentry.vueRouterInstrumentation(router),
}),
],
});
......@@ -72,7 +73,7 @@ AleksisVue.install = function (Vue) {
Vue.component("ButtonMenu", () =>
import("../components/generic/ButtonMenu.vue")
);
Vue.component("ErrorPage", () => import("../components/app/ErrorPage.vue"))
Vue.component("ErrorPage", () => import("../components/app/ErrorPage.vue"));
};
/**
......
......@@ -782,7 +782,7 @@ const routes = [
// and generates importing code at bundle time.
for (const [appName, appRoutes] of Object.entries(appObjects)) {
routes.push({
...appRoutes,
...appRoutes,
path: `/app/${appName}`,
component: () => import("./components/Parent.vue"),
name: `${appName}`,
......@@ -794,7 +794,10 @@ routes.push({
path: "/*",
component: () => import("./components/app/ErrorPage.vue"),
name: "core.error404",
props: { shortErrorMessageKey: "network_errors.error_404", longErrorMessageKey: "network_errors.page_not_found" },
props: {
shortErrorMessageKey: "network_errors.error_404",
longErrorMessageKey: "network_errors.page_not_found",
},
});
export default routes;
......@@ -83,7 +83,7 @@ class SeleniumTests(SeleniumTestCase):
# Should redirect away from login page and not put up an alert about wrong credentials
assert "Please enter a correct username and password." not in self.selenium.page_source
# Deactivated for now as Selenium test infrastructure needs a complete rethinking
# Deactivated for now as Selenium test infrastructure needs a complete rethinking
# because of the new Vue frontend
# def test_pdf_generation(self):
# self._login()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment