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

Fix lint

parent 5e38d429
No related branches found
No related tags found
1 merge request!1696Improve eslint configuration
Pipeline #195159 passed
Showing
with 42 additions and 47 deletions
query customMenu($name: String!) { query customMenu($name: String!) {
customMenuByName(name: $name) { customMenuByName(name: $name) {
id
name name
items { items {
id
name name
url url
icon icon
......
...@@ -6,6 +6,7 @@ query whoAmI($permissions: [String]!) { ...@@ -6,6 +6,7 @@ query whoAmI($permissions: [String]!) {
isAnonymous isAnonymous
isImpersonate isImpersonate
person { person {
id
photo { photo {
url url
} }
......
mutation revokeOauthTokens($ids: [ID]!) { mutation revokeOauthTokens($ids: [ID]!) {
revokeOauthTokens(ids: $ids) { revokeOauthTokens(ids: $ids) {
revokationCount ok
} }
} }
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<script> <script>
import queryMixin from "../../../mixins/queryMixin.js"; import queryMixin from "../../../mixins/queryMixin.js";
import { groups } from "./group.graphql"; import { formGroups } from "./group.graphql";
export default { export default {
name: "GroupField", name: "GroupField",
...@@ -26,7 +26,7 @@ export default { ...@@ -26,7 +26,7 @@ export default {
gqlQuery: { gqlQuery: {
type: Object, type: Object,
required: false, required: false,
default: () => groups, default: () => formGroups,
}, },
}, },
}; };
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<script> <script>
import queryMixin from "../../../mixins/queryMixin.js"; import queryMixin from "../../../mixins/queryMixin.js";
import { persons } from "./person.graphql"; import { formPersons } from "./person.graphql";
export default { export default {
name: "PersonField", name: "PersonField",
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
gqlQuery: { gqlQuery: {
type: Object, type: Object,
required: false, required: false,
default: () => persons, default: () => formPersons,
}, },
}, },
methods: { methods: {
......
query groups { query formGroups {
items: groups { items: groups {
id id
shortName shortName
......
query persons { query formPersons {
items: persons { items: persons {
id id
shortName shortName
......
<template> <template>
<avatar-clickbox> <avatar-clickbox>
<template #activator> <template #activator>
<avatar-content :imageUrl="url" class="rounded-circle" /> <avatar-content :image-url="url" class="rounded-circle" />
</template> </template>
<avatar-content :imageUrl="url" contain /> <avatar-content :image-url="url" contain />
</avatar-clickbox> </avatar-clickbox>
</template> </template>
......
<script> <script>
import CRUDList from "../generic/CRUDList.vue"; import CRUDList from "../generic/CRUDList.vue";
import { deleteGroups, groups } from "./groupList.graphql"; import { deleteGroups, groups } from "./groups.graphql";
import CreateButton from "../generic/buttons/CreateButton.vue"; import CreateButton from "../generic/buttons/CreateButton.vue";
import TableLink from "../generic/TableLink.vue"; import TableLink from "../generic/TableLink.vue";
import AvatarContent from "../person/AvatarContent.vue"; import AvatarContent from "../person/AvatarContent.vue";
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
<template #avatarUrl="{ item }"> <template #avatarUrl="{ item }">
<table-link :to="{ name: 'core.group', params: { id: item.id } }"> <table-link :to="{ name: 'core.group', params: { id: item.id } }">
<v-avatar class="my-1 me-2"> <v-avatar class="my-1 me-2">
<avatar-content :imageUrl="item.avatarUrl" contain /> <avatar-content :image-url="item.avatarUrl" contain />
</v-avatar> </v-avatar>
</table-link> </table-link>
</template> </template>
......
...@@ -76,7 +76,7 @@ export default { ...@@ -76,7 +76,7 @@ export default {
<!-- eslint-disable-next-line vue/valid-v-slot --> <!-- eslint-disable-next-line vue/valid-v-slot -->
<template #item.id="{ item }"> <template #item.id="{ item }">
<v-tooltip bottom> <v-tooltip bottom>
<template v-slot:activator="{ on, attrs }"> <template #activator="{ on, attrs }">
<secondary-action-button <secondary-action-button
v-bind="attrs" v-bind="attrs"
v-on="on" v-on="on"
......
query groups($orderBy: [String], $filters: JSONString) {
items: groups(orderBy: $orderBy, filters: $filters) {
id
shortName
name
avatarUrl
schoolTerm {
id
name
}
groupType {
id
name
}
canEdit
canDelete
}
}
mutation deleteGroups($ids: [ID]!) {
deleteGroups(ids: $ids) {
deletionCount
}
}
query groups($orderBy: [String], $filters: JSONString) {
items: groups(orderBy: $orderBy, filters: $filters) {
id
shortName
name
avatarUrl
schoolTerm {
id
name
}
groupType {
id
name
}
canEdit
canDelete
}
}
query groupById($id: ID) { query groupById($id: ID) {
object: groupById(id: $id) { object: groupById(id: $id) {
id id
......
...@@ -2,6 +2,7 @@ query myNotifications { ...@@ -2,6 +2,7 @@ query myNotifications {
myNotifications: whoAmI { myNotifications: whoAmI {
id id
person { person {
id
notifications { notifications {
id id
title title
......
query pdf($id: ID!) { query pdf($id: ID!) {
pdf: pdfById(id: $id) { pdf: pdfById(id: $id) {
id
file { file {
url url
} }
......
...@@ -101,7 +101,8 @@ ...@@ -101,7 +101,8 @@
</template> </template>
<script> <script>
import { personActions, deletePersons } from "./personActions.graphql"; import { personActions } from "./personActions.graphql";
import { deletePersons } from "./personList.graphql";
import DeleteDialog from "../generic/dialogs/DeleteDialog.vue"; import DeleteDialog from "../generic/dialogs/DeleteDialog.vue";
export default { export default {
......
...@@ -10,9 +10,3 @@ query personActions($id: ID!) { ...@@ -10,9 +10,3 @@ query personActions($id: ID!) {
canImpersonatePerson canImpersonatePerson
} }
} }
mutation deletePersons($ids: [ID]!) {
deletePersons(ids: $ids) {
deletionCount
}
}
...@@ -12,7 +12,7 @@ export default { ...@@ -12,7 +12,7 @@ export default {
<template> <template>
<v-tooltip bottom> <v-tooltip bottom>
<template v-slot:activator="{ on, attrs }"> <template #activator="{ on, attrs }">
<v-chip v-bind="{ ...attrs, ...$attrs }" v-on="{ ...on, ...$listeners }"> <v-chip v-bind="{ ...attrs, ...$attrs }" v-on="{ ...on, ...$listeners }">
<v-avatar> <v-avatar>
<v-icon> mdi-door </v-icon> <v-icon> mdi-door </v-icon>
......
<script> <script>
import { import {
activeSchoolTerm, activeSchoolTerm,
schoolTerms, schoolTermsForActiveSchoolTerm,
setActiveSchoolTerm, setActiveSchoolTerm,
} from "./activeSchoolTerm.graphql"; } from "./activeSchoolTerm.graphql";
import loadingMixin from "../../mixins/loadingMixin"; import loadingMixin from "../../mixins/loadingMixin";
...@@ -10,7 +10,7 @@ export default { ...@@ -10,7 +10,7 @@ export default {
mixins: [loadingMixin], mixins: [loadingMixin],
apollo: { apollo: {
schoolTerms: { schoolTerms: {
query: schoolTerms, query: schoolTermsForActiveSchoolTerm,
}, },
activeSchoolTerm: { activeSchoolTerm: {
query: activeSchoolTerm, query: activeSchoolTerm,
......
...@@ -10,7 +10,7 @@ query activeSchoolTerm { ...@@ -10,7 +10,7 @@ query activeSchoolTerm {
} }
} }
query schoolTerms { query schoolTermsForActiveSchoolTerm {
schoolTerms { schoolTerms {
id id
name name
......
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