ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups

Browse Source
This commit is contained in:
Wolfgang Huß 2022-08-29 09:58:55 +02:00
commit 6beb69052f
42 changed files with 102 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -1,13 +1,15 @@
## 🍰 Pullrequest
## 🍰 Pull Request
<!-- Describe the Pullrequest. Use Screenshots if possible. -->
XXX
### Issues
<!-- Which Issues does this fix, which are related?
<!-- Which Issues does this fix, which are related? -->
- fixes #XXX
- relates #XXX
-->
- None
### Todo
<!-- In case some parts are still missing, list them here. -->
- [X] None
- [ ] XXX list here …

4
backend/package.json
View File

@ -110,7 +110,7 @@
"npm-run-all": "~4.1.5",
"request": "~2.88.2",
"sanitize-html": "~1.22.0",
"slug": "~4.0.2",
"slug": "~6.0.0",
"subscriptions-transport-ws": "^0.9.19",
"trunc-html": "~1.1.2",
"uuid": "~8.3.2",
@ -129,7 +129,7 @@
"eslint-plugin-import": "~2.20.2",
"eslint-plugin-jest": "~23.8.2",
"eslint-plugin-node": "~11.1.0",
"eslint-plugin-prettier": "~3.1.2",
"eslint-plugin-prettier": "~3.4.1",
"eslint-plugin-promise": "~4.3.1",
"eslint-plugin-standard": "~4.0.1",
"jest": "~25.3.0",

16
backend/yarn.lock
View File

@ -4266,10 +4266,10 @@ eslint-plugin-node@~11.1.0:
resolve "^1.10.1"
semver "^6.1.0"
eslint-plugin-prettier@~3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz#432e5a667666ab84ce72f945c72f77d996a5c9ba"
integrity sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==
eslint-plugin-prettier@~3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5"
integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==
dependencies:
prettier-linter-helpers "^1.0.0"
@ -9281,10 +9281,10 @@ slug@^0.9.2:
dependencies:
unicode ">= 0.3.1"
slug@~4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/slug/-/slug-4.0.2.tgz#35a62b4e71582778ac08bb30a1bf439fd0a43ea7"
integrity sha512-c5XbWkwxHU13gAdSvBHQgnGy2sxv/REMz0ugcM0SOSBCO/N4wfU0TDBC3pgdOwVGjZwGnLBTRljXzdVYE+KYNw==
slug@~6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/slug/-/slug-6.0.0.tgz#39637b32e5a873bc692812a630842880499ed6c9"
integrity sha512-0MpNLyCSUSf0G1nAZmp9gY1cvesPP35a1Live25vZ23gWQ5SAopF0N+0hk9KI4ytNuTebJrHGNrgTnxboofcSg==
smart-buffer@^4.1.0:
version "4.1.0"

3
webapp/components/CommentCard/CommentCard.story.js
View File

@ -18,8 +18,7 @@ const comment = {
author: {
id: '1',
avatar: {
url:
'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
url: 'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
},
slug: 'jenny-rostock',
name: 'Rainer Unsinn',

2
webapp/components/DeleteData/DeleteData.vue
View File

@ -103,7 +103,7 @@ export default {
this.$apollo
.mutate({
mutation: gql`
mutation($id: ID!, $resource: [Deletable]) {
mutation ($id: ID!, $resource: [Deletable]) {
DeleteUser(id: $id, resource: $resource) {
id
}

3
webapp/components/Editor/Editor.story.js
View File

@ -9,8 +9,7 @@ const embed = {
title: 'Video Titel',
// html: null,
description: 'Video Description',
html:
'<iframe width="auto" height="250" src="https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
html: '<iframe width="auto" height="250" src="https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
}
const plugins = [

3
webapp/components/Editor/nodes/Embed.spec.js
View File

@ -33,8 +33,7 @@ describe('Embed.vue', () => {
video: null,
lang: 'de',
sources: ['resource', 'oembed'],
html:
'<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
html: '<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
}),
}
})

3
webapp/components/Embed/EmbedComponent.spec.js
View File

@ -114,8 +114,7 @@ describe('EmbedComponent.vue', () => {
video: null,
lang: 'de',
sources: ['resource', 'oembed'],
html:
'<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen=""></iframe>',
html: '<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen=""></iframe>',
}
wrapper = Wrapper()
})

2
webapp/components/Emotions/Emotions.vue
View File

@ -83,7 +83,7 @@ export default {
this.$apollo
.query({
query: gql`
query($postId: ID!, $data: _EMOTEDInput!) {
query ($postId: ID!, $data: _EMOTEDInput!) {
PostsEmotionsCountByEmotion(postId: $postId, data: $data)
}
`,

2
webapp/components/LocaleSwitch/LocaleSwitch.vue
View File

@ -82,7 +82,7 @@ export default {
try {
await this.$apollo.mutate({
mutation: gql`
mutation($id: ID!, $locale: String) {
mutation ($id: ID!, $locale: String) {
UpdateUser(id: $id, locale: $locale) {
id
locale

2
webapp/components/Modal/DeleteUserModal.vue
View File

@ -127,7 +127,7 @@ export default {
this.$apollo
.mutate({
mutation: gql`
mutation($id: ID!, $resource: [Deletable]) {
mutation ($id: ID!, $resource: [Deletable]) {
DeleteUser(id: $id, resource: $resource) {
id
}

2
webapp/components/Modal/DisableModal.vue
View File

@ -53,7 +53,7 @@ export default {
// await this.modalData.buttons.confirm.callback()
await this.$apollo.mutate({
mutation: gql`
mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
mutation ($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
review(resourceId: $resourceId, disable: $disable, closed: $closed) {
disable
}

2
webapp/components/Password/Change.vue
View File

@ -65,7 +65,7 @@ export default {
async handleSubmit(data) {
this.loading = true
const mutation = gql`
mutation($oldPassword: String!, $password: String!) {
mutation ($oldPassword: String!, $password: String!) {
changePassword(oldPassword: $oldPassword, newPassword: $password)
}
`

2
webapp/components/PasswordReset/ChangePassword.vue
View File

@ -93,7 +93,7 @@ export default {
methods: {
async handleSubmitPassword() {
const mutation = gql`
mutation($nonce: String!, $email: String!, $password: String!) {
mutation ($nonce: String!, $email: String!, $password: String!) {
resetPassword(nonce: $nonce, email: $email, newPassword: $password)
}
`

2
webapp/components/PasswordReset/Request.vue
View File

@ -85,7 +85,7 @@ export default {
},
async handleSubmit() {
const mutation = gql`
mutation($email: String!) {
mutation ($email: String!) {
requestPasswordReset(email: $email)
}
`

3
webapp/components/PostTeaser/PostTeaser.story.js
View File

@ -17,8 +17,7 @@ export const post = {
author: {
id: 'u3',
avatar: {
url:
'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
url: 'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
},
slug: 'jenny-rostock',
name: 'Rainer Unsinn',

7
webapp/components/Registration/RegistrationSlideEmail.vue
View File

@ -35,7 +35,7 @@ import normalizeEmail from '~/components/utils/NormalizeEmail'
import translateErrorMessage from '~/components/utils/TranslateErrorMessage'
export const SignupMutation = gql`
mutation($email: String!, $inviteCode: String) {
mutation ($email: String!, $inviteCode: String) {
Signup(email: $email, inviteCode: $inviteCode) {
email
}
@ -165,9 +165,8 @@ export default {
})
this.setButtonValues()
const { email: responseEmail } = this.sliderData.sliders[
this.sliderIndex
].data.response.Signup
const { email: responseEmail } =
this.sliderData.sliders[this.sliderIndex].data.response.Signup
this.$toast.success(
this.$t('components.registration.email.form.success', { email: responseEmail }),
)

2
webapp/components/Registration/RegistrationSlideInvite.vue
View File

@ -25,7 +25,7 @@ import gql from 'graphql-tag'
import CONSTANTS_REGISTRATION from './../../constants/registration'
export const isValidInviteCodeQuery = gql`
query($code: ID!) {
query ($code: ID!) {
isValidInviteCode(code: $code)
}
`

2
webapp/components/Registration/RegistrationSlideNonce.vue
View File

@ -30,7 +30,7 @@ import CONSTANTS_REGISTRATION from './../../constants/registration'
import EmailDisplayAndVerify from './EmailDisplayAndVerify'
export const verifyNonceQuery = gql`
query($email: String!, $nonce: String!) {
query ($email: String!, $nonce: String!) {
VerifyNonce(email: $email, nonce: $nonce)
}
`

2
webapp/components/Registration/Signup.vue
View File

@ -70,7 +70,7 @@ import { SweetalertIcon } from 'vue-sweetalert-icons'
import translateErrorMessage from '~/components/utils/TranslateErrorMessage'
export const SignupMutation = gql`
mutation($email: String!, $inviteCode: String) {
mutation ($email: String!, $inviteCode: String) {
Signup(email: $email, inviteCode: $inviteCode) {
email
}

2
webapp/components/ReleaseModal/ReleaseModal.vue
View File

@ -52,7 +52,7 @@ export default {
// await this.modalData.buttons.confirm.callback()
await this.$apollo.mutate({
mutation: gql`
mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
mutation ($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
review(resourceId: $resourceId, disable: $disable, closed: $closed) {
disable
}

12
webapp/components/generic/SearchableInput/SearchableInput.story.js
View File

@ -78,8 +78,7 @@ export const searchResults = [
id: 'u1',
__typename: 'User',
avatar: {
url:
'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
url: 'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
},
name: 'Peter Lustig',
slug: 'peter-lustig',
@ -88,8 +87,7 @@ export const searchResults = [
id: 'cdbca762-0632-4564-b646-415a0c42d8b8',
__typename: 'User',
avatar: {
url:
'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
url: 'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
},
name: 'Herbert Schultz',
slug: 'herbert-schultz',
@ -98,8 +96,7 @@ export const searchResults = [
id: 'u2',
__typename: 'User',
avatar: {
url:
'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
url: 'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
},
name: 'Bob der Baumeister',
slug: 'bob-der-baumeister',
@ -108,8 +105,7 @@ export const searchResults = [
id: '7b654f72-f4da-4315-8bed-39de0859754b',
__typename: 'User',
avatar: {
url:
'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
url: 'https://steamcdn-a.akamaihd.net/steamcommunity/public/images/avatars/db/dbc9e03ebcc384b920c31542af2d27dd8eea9dc2_full.jpg',
},
name: 'Tonya Mohr',
slug: 'tonya-mohr',

4
webapp/graphql/CommentMutations.js
View File

@ -4,7 +4,7 @@ export default (i18n) => {
const lang = i18n.locale().toUpperCase()
return {
CreateComment: gql`
mutation($postId: ID!, $content: String!) {
mutation ($postId: ID!, $content: String!) {
CreateComment(postId: $postId, content: $content) {
id
contentExcerpt
@ -36,7 +36,7 @@ export default (i18n) => {
}
`,
UpdateComment: gql`
mutation($content: String!, $id: ID!) {
mutation ($content: String!, $id: ID!) {
UpdateComment(content: $content, id: $id) {
id
contentExcerpt

2
webapp/graphql/Donations.js
View File

@ -13,7 +13,7 @@ export const DonationsQuery = () => gql`
export const UpdateDonations = () => {
return gql`
mutation($showDonations: Boolean, $goal: Int, $progress: Int) {
mutation ($showDonations: Boolean, $goal: Int, $progress: Int) {
UpdateDonations(showDonations: $showDonations, goal: $goal, progress: $progress) {
id
showDonations

4
webapp/graphql/EmailAddress.js
View File

@ -1,7 +1,7 @@
import gql from 'graphql-tag'
export const AddEmailAddressMutation = gql`
mutation($email: String!) {
mutation ($email: String!) {
AddEmailAddress(email: $email) {
email
createdAt
@ -10,7 +10,7 @@ export const AddEmailAddressMutation = gql`
`
export const VerifyEmailAddressMutation = gql`
mutation($email: String!, $nonce: String!) {
mutation ($email: String!, $nonce: String!) {
VerifyEmailAddress(email: $email, nonce: $nonce) {
email
verifiedAt

2
webapp/graphql/EmbedQuery.js
View File

@ -2,7 +2,7 @@ import gql from 'graphql-tag'
export default function () {
return gql`
query($url: String!) {
query ($url: String!) {
embed(url: $url) {
type
title

6
webapp/graphql/Moderation.js
View File

@ -3,7 +3,7 @@ import gql from 'graphql-tag'
export const reportsListQuery = () => {
// no limit for the moment like before: "reports(first: 20, orderBy: createdAt_desc)"
return gql`
query(
query (
$orderBy: ReportOrdering
$first: Int
$offset: Int
@ -94,7 +94,7 @@ export const reportsListQuery = () => {
export const reportMutation = () => {
return gql`
mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
mutation ($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
fileReport(
resourceId: $resourceId
reasonCategory: $reasonCategory
@ -108,7 +108,7 @@ export const reportMutation = () => {
export const reviewMutation = () => {
return gql`
mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
mutation ($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
review(resourceId: $resourceId, disable: $disable, closed: $closed) {
disable
}

16
webapp/graphql/PostMutations.js
View File

@ -3,7 +3,7 @@ import gql from 'graphql-tag'
export default () => {
return {
CreatePost: gql`
mutation($title: String!, $content: String!, $categoryIds: [ID], $image: ImageInput) {
mutation ($title: String!, $content: String!, $categoryIds: [ID], $image: ImageInput) {
CreatePost(title: $title, content: $content, categoryIds: $categoryIds, image: $image) {
title
slug
@ -18,7 +18,7 @@ export default () => {
}
`,
UpdatePost: gql`
mutation(
mutation (
$id: ID!
$title: String!
$content: String!
@ -52,14 +52,14 @@ export default () => {
}
`,
DeletePost: gql`
mutation($id: ID!) {
mutation ($id: ID!) {
DeletePost(id: $id) {
id
}
}
`,
AddPostEmotionsMutation: gql`
mutation($to: _PostInput!, $data: _EMOTEDInput!) {
mutation ($to: _PostInput!, $data: _EMOTEDInput!) {
AddPostEmotions(to: $to, data: $data) {
emotion
from {
@ -72,7 +72,7 @@ export default () => {
}
`,
RemovePostEmotionsMutation: gql`
mutation($to: _PostInput!, $data: _EMOTEDInput!) {
mutation ($to: _PostInput!, $data: _EMOTEDInput!) {
RemovePostEmotions(to: $to, data: $data) {
emotion
from {
@ -85,7 +85,7 @@ export default () => {
}
`,
pinPost: gql`
mutation($id: ID!) {
mutation ($id: ID!) {
pinPost(id: $id) {
id
title
@ -102,7 +102,7 @@ export default () => {
}
`,
unpinPost: gql`
mutation($id: ID!) {
mutation ($id: ID!) {
unpinPost(id: $id) {
id
title
@ -119,7 +119,7 @@ export default () => {
}
`,
markTeaserAsViewed: gql`
mutation($id: ID!) {
mutation ($id: ID!) {
markTeaserAsViewed(id: $id) {
id
}

2
webapp/graphql/Registration.js
View File

@ -1,6 +1,6 @@
import gql from 'graphql-tag'
export const SignupVerificationMutation = gql`
mutation(
mutation (
$nonce: String!
$name: String!
$email: String!

8
webapp/graphql/Search.js
View File

@ -5,7 +5,7 @@ export const searchQuery = gql`
${userFragment}
${postFragment}
query($query: String!) {
query ($query: String!) {
searchResults(query: $query, limit: 5) {
__typename
... on Post {
@ -33,7 +33,7 @@ export const searchPosts = gql`
${postFragment}
${tagsCategoriesAndPinnedFragment}
query($query: String!, $firstPosts: Int, $postsOffset: Int) {
query ($query: String!, $firstPosts: Int, $postsOffset: Int) {
searchPosts(query: $query, firstPosts: $firstPosts, postsOffset: $postsOffset) {
postCount
posts {
@ -55,7 +55,7 @@ export const searchPosts = gql`
export const searchUsers = gql`
${userFragment}
query($query: String!, $firstUsers: Int, $usersOffset: Int) {
query ($query: String!, $firstUsers: Int, $usersOffset: Int) {
searchUsers(query: $query, firstUsers: $firstUsers, usersOffset: $usersOffset) {
userCount
users {
@ -67,7 +67,7 @@ export const searchUsers = gql`
`
export const searchHashtags = gql`
query($query: String!, $firstHashtags: Int, $hashtagsOffset: Int) {
query ($query: String!, $firstHashtags: Int, $hashtagsOffset: Int) {
searchHashtags(query: $query, firstHashtags: $firstHashtags, hashtagsOffset: $hashtagsOffset) {
hashtagCount
hashtags {

14
webapp/graphql/User.js
View File

@ -68,7 +68,7 @@ export const notificationQuery = (i18n) => {
${commentFragment}
${postFragment}
query($read: Boolean, $orderBy: NotificationOrdering, $first: Int, $offset: Int) {
query ($read: Boolean, $orderBy: NotificationOrdering, $first: Int, $offset: Int) {
notifications(read: $read, orderBy: $orderBy, first: $first, offset: $offset) {
id
read
@ -107,7 +107,7 @@ export const markAsReadMutation = (i18n) => {
${commentFragment}
${postFragment}
mutation($id: ID!) {
mutation ($id: ID!) {
markAsRead(id: $id) {
id
read
@ -180,7 +180,7 @@ export const followUserMutation = (i18n) => {
${userFragment}
${userCountsFragment}
mutation($id: ID!) {
mutation ($id: ID!) {
followUser(id: $id) {
...user
...userCounts
@ -200,7 +200,7 @@ export const unfollowUserMutation = (i18n) => {
${userFragment}
${userCountsFragment}
mutation($id: ID!) {
mutation ($id: ID!) {
unfollowUser(id: $id) {
...user
...userCounts
@ -217,7 +217,7 @@ export const unfollowUserMutation = (i18n) => {
export const updateUserMutation = () => {
return gql`
mutation(
mutation (
$id: ID!
$slug: String
$name: String
@ -260,7 +260,7 @@ export const updateUserMutation = () => {
}
export const checkSlugAvailableQuery = gql`
query($slug: String!) {
query ($slug: String!) {
User(slug: $slug) {
slug
}
@ -303,7 +303,7 @@ export const userDataQuery = (i18n) => {
${userFragment}
${postFragment}
${commentFragment}
query($id: ID!) {
query ($id: ID!) {
userData(id: $id) {
user {
...user

2
webapp/graphql/admin/Roles.js
View File

@ -10,7 +10,7 @@ export const FetchAllRoles = () => {
export const updateUserRole = (role, id) => {
return gql`
mutation($role: UserRole!, $id: ID!) {
mutation ($role: UserRole!, $id: ID!) {
switchUserRole(role: $role, id: $id) {
name
role

2
webapp/graphql/location.js
View File

@ -1,7 +1,7 @@
import gql from 'graphql-tag'
export const queryLocations = () => gql`
query($place: String!, $lang: String!) {
query ($place: String!, $lang: String!) {
queryLocations(place: $place, lang: $lang) {
place_name
id

4
webapp/graphql/settings/BlockedUsers.js
View File

@ -20,7 +20,7 @@ export const blockedUsers = () => {
export const blockUser = () => {
return gql`
mutation($id: ID!) {
mutation ($id: ID!) {
blockUser(id: $id) {
id
name
@ -33,7 +33,7 @@ export const blockUser = () => {
export const unblockUser = () => {
return gql`
mutation($id: ID!) {
mutation ($id: ID!) {
unblockUser(id: $id) {
id
name

4
webapp/graphql/settings/MutedUsers.js
View File

@ -20,7 +20,7 @@ export const mutedUsers = () => {
export const muteUser = () => {
return gql`
mutation($id: ID!) {
mutation ($id: ID!) {
muteUser(id: $id) {
id
name
@ -33,7 +33,7 @@ export const muteUser = () => {
export const unmuteUser = () => {
return gql`
mutation($id: ID!) {
mutation ($id: ID!) {
unmuteUser(id: $id) {
id
name

4
webapp/package.json
View File

@ -73,7 +73,7 @@
"accounting": "~0.4.1",
"apollo-cache-inmemory": "~1.6.6",
"apollo-client": "~2.6.8",
"cookie-universal-nuxt": "~2.1.5",
"cookie-universal-nuxt": "~2.2.2",
"cropperjs": "^1.5.5",
"cross-env": "~7.0.3",
"date-fns": "2.22.1",
@ -141,7 +141,7 @@
"identity-obj-proxy": "^3.0.0",
"jest": "~26.6.3",
"mutation-observer": "^1.0.3",
"prettier": "~2.2.1",
"prettier": "~2.7.1",
"sass-loader": "~10.1.1",
"storybook-design-token": "^0.8.1",
"storybook-vue-router": "^1.0.7",

2
webapp/pages/admin/users.vue
View File

@ -139,7 +139,7 @@ export default {
User: {
query() {
return gql`
query($filter: _UserFilter, $first: Int, $offset: Int, $email: String) {
query ($filter: _UserFilter, $first: Int, $offset: Int, $email: String) {
User(
email: $email
filter: $filter

4
webapp/pages/password-reset/change-password.spec.js
View File

@ -1,9 +1,9 @@
import { mount } from '@vue/test-utils'
import changePassword from './change-password.vue'
import changePassword from './change-password'
const localVue = global.localVue
describe('enter-nonce.vue', () => {
describe('change-password', () => {
let wrapper
let mocks

4
webapp/pages/post/_id.vue
View File

@ -19,7 +19,7 @@ import PersistentLinks from '~/mixins/persistentLinks.js'
const options = {
queryId: gql`
query($idOrSlug: ID) {
query ($idOrSlug: ID) {
Post(id: $idOrSlug) {
id
slug
@ -27,7 +27,7 @@ const options = {
}
`,
querySlug: gql`
query($idOrSlug: String) {
query ($idOrSlug: String) {
Post(slug: $idOrSlug) {
id
slug

4
webapp/pages/profile/_id.vue
View File

@ -8,7 +8,7 @@ import PersistentLinks from '~/mixins/persistentLinks.js'
const options = {
queryId: gql`
query($idOrSlug: ID) {
query ($idOrSlug: ID) {
User(id: $idOrSlug) {
id
slug
@ -16,7 +16,7 @@ const options = {
}
`,
querySlug: gql`
query($idOrSlug: String) {
query ($idOrSlug: String) {
User(slug: $idOrSlug) {
id
slug

6
webapp/pages/settings/my-social-media.vue
View File

@ -112,7 +112,7 @@ export default {
let mutation, variables, successMessage
if (isCreation) {
mutation = gql`
mutation($url: String!) {
mutation ($url: String!) {
CreateSocialMedia(url: $url) {
id
url
@ -123,7 +123,7 @@ export default {
successMessage = thisList.$t('settings.social-media.successAdd')
} else {
mutation = gql`
mutation($id: ID!, $url: String!) {
mutation ($id: ID!, $url: String!) {
UpdateSocialMedia(id: $id, url: $url) {
id
url
@ -160,7 +160,7 @@ export default {
try {
await thisList.$apollo.mutate({
mutation: gql`
mutation($id: ID!) {
mutation ($id: ID!) {
DeleteSocialMedia(id: $id) {
id
url

23
webapp/yarn.lock
View File

@ -8254,18 +8254,18 @@ cookie-signature@1.0.6:
resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
cookie-universal-nuxt@~2.1.5:
version "2.1.5"
resolved "https://registry.yarnpkg.com/cookie-universal-nuxt/-/cookie-universal-nuxt-2.1.5.tgz#669f2ff95b1bc1962c86edd69c954f60729e71e5"
integrity sha512-P0WCTKIyemWNtHi9lxrS5cxZmieOIEjt28B7Alu6cdSB9RqtUtpkqYyV9PRK6oJrT5eIPDYjHsJQlh6SUrFJOg==
cookie-universal-nuxt@~2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/cookie-universal-nuxt/-/cookie-universal-nuxt-2.2.2.tgz#107815f03f5b769de7018670d6370368205387bb"
integrity sha512-Pr6P5UCzl1EAvPh7z7jFkknBw0KTdykm6gFmPHrH4LV9s3flVmAH0ZP/ZqUXcp6b0SKZfizkn+XR1cO+QinGhQ==
dependencies:
"@types/cookie" "^0.3.3"
cookie-universal "^2.1.5"
cookie-universal "^2.2.2"
cookie-universal@^2.1.5:
version "2.1.5"
resolved "https://registry.yarnpkg.com/cookie-universal/-/cookie-universal-2.1.5.tgz#9a6cefbfb61c750a1b8ee2610bf71566bd719544"
integrity sha512-nqOOmEkovCQxNYGIyzhcwsmh4c7xnxe7RWdiYFOoml9MP4L32IlU3LdPC7r7nQEnnM+9Uxlk/UhtvBl5is6M/w==
cookie-universal@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/cookie-universal/-/cookie-universal-2.2.2.tgz#415a4d67b6f7f0819c4914cd69b8c2f496111d30"
integrity sha512-nUXF6HH2YKbn8vGcdSzWJhjRkDHbnbekuVu2nsRu00zYsX7o/H3xGJRlPVoM4wX/8cpJYpyi9nDt+boER0Wjug==
dependencies:
"@types/cookie" "^0.3.3"
cookie "^0.4.0"
@ -16422,6 +16422,11 @@ prettier@~2.2.1:
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
prettier@~2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
pretty-bytes@^5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"