diff --git a/backend/package.json b/backend/package.json index c7148ee72..76f0fb09d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -134,7 +134,7 @@ "eslint-plugin-standard": "~4.0.1", "jest": "~25.3.0", "nodemon": "~2.0.2", - "prettier": "~2.2.0", + "prettier": "~2.3.2", "rosie": "^2.0.1", "supertest": "~4.0.2" }, diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js index 713a03142..7d9b5e954 100644 --- a/backend/src/db/seed.js +++ b/backend/src/db/seed.js @@ -137,100 +137,93 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] }), ]) - const [ - peterLustig, - bobDerBaumeister, - jennyRostock, - huey, - dewey, - louie, - dagobert, - ] = await Promise.all([ - Factory.build( - 'user', - { - id: 'u1', - name: 'Peter Lustig', - slug: 'peter-lustig', - role: 'admin', - }, - { - email: 'admin@example.org', - }, - ), - Factory.build( - 'user', - { - id: 'u2', - name: 'Bob der Baumeister', - slug: 'bob-der-baumeister', - role: 'moderator', - }, - { - email: 'moderator@example.org', - }, - ), - Factory.build( - 'user', - { - id: 'u3', - name: 'Jenny Rostock', - slug: 'jenny-rostock', - role: 'user', - }, - { - email: 'user@example.org', - }, - ), - Factory.build( - 'user', - { - id: 'u4', - name: 'Huey', - slug: 'huey', - role: 'user', - }, - { - email: 'huey@example.org', - }, - ), - Factory.build( - 'user', - { - id: 'u5', - name: 'Dewey', - slug: 'dewey', - role: 'user', - }, - { - email: 'dewey@example.org', - }, - ), - Factory.build( - 'user', - { - id: 'u6', - name: 'Louie', - slug: 'louie', - role: 'user', - }, - { - email: 'louie@example.org', - }, - ), - Factory.build( - 'user', - { - id: 'u7', - name: 'Dagobert', - slug: 'dagobert', - role: 'user', - }, - { - email: 'dagobert@example.org', - }, - ), - ]) + const [peterLustig, bobDerBaumeister, jennyRostock, huey, dewey, louie, dagobert] = + await Promise.all([ + Factory.build( + 'user', + { + id: 'u1', + name: 'Peter Lustig', + slug: 'peter-lustig', + role: 'admin', + }, + { + email: 'admin@example.org', + }, + ), + Factory.build( + 'user', + { + id: 'u2', + name: 'Bob der Baumeister', + slug: 'bob-der-baumeister', + role: 'moderator', + }, + { + email: 'moderator@example.org', + }, + ), + Factory.build( + 'user', + { + id: 'u3', + name: 'Jenny Rostock', + slug: 'jenny-rostock', + role: 'user', + }, + { + email: 'user@example.org', + }, + ), + Factory.build( + 'user', + { + id: 'u4', + name: 'Huey', + slug: 'huey', + role: 'user', + }, + { + email: 'huey@example.org', + }, + ), + Factory.build( + 'user', + { + id: 'u5', + name: 'Dewey', + slug: 'dewey', + role: 'user', + }, + { + email: 'dewey@example.org', + }, + ), + Factory.build( + 'user', + { + id: 'u6', + name: 'Louie', + slug: 'louie', + role: 'user', + }, + { + email: 'louie@example.org', + }, + ), + Factory.build( + 'user', + { + id: 'u7', + name: 'Dagobert', + slug: 'dagobert', + role: 'user', + }, + { + email: 'dagobert@example.org', + }, + ), + ]) await Promise.all([ peterLustig.relateTo(Berlin, 'isIn'), @@ -561,7 +554,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] const hashtagAndMention1 = 'The new physics of #QuantenFlussTheorie can explain #QuantumGravity! @peter-lustig got that already. ;-)' const createPostMutation = gql` - mutation($id: ID, $title: String!, $content: String!, $categoryIds: [ID]) { + mutation ($id: ID, $title: String!, $content: String!, $categoryIds: [ID]) { CreatePost(id: $id, title: $title, content: $content, categoryIds: $categoryIds) { id } @@ -618,7 +611,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] const mentionInComment2 = 'Did @peter-lustig tell you?' const createCommentMutation = gql` - mutation($id: ID, $postId: ID!, $content: String!) { + mutation ($id: ID, $postId: ID!, $content: String!) { CreateComment(id: $id, postId: $postId, content: $content) { id } diff --git a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js index be9039a6f..613bd6b62 100644 --- a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js +++ b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js @@ -13,7 +13,7 @@ const driver = getDriver() const neode = getNeode() const categoryIds = ['cat9'] const createPostMutation = gql` - mutation($id: ID, $title: String!, $postContent: String!, $categoryIds: [ID]!) { + mutation ($id: ID, $title: String!, $postContent: String!, $categoryIds: [ID]!) { CreatePost(id: $id, title: $title, content: $postContent, categoryIds: $categoryIds) { id title @@ -22,7 +22,7 @@ const createPostMutation = gql` } ` const updatePostMutation = gql` - mutation($id: ID!, $title: String!, $postContent: String!, $categoryIds: [ID]!) { + mutation ($id: ID!, $title: String!, $postContent: String!, $categoryIds: [ID]!) { UpdatePost(id: $id, content: $postContent, title: $title, categoryIds: $categoryIds) { title content @@ -95,7 +95,7 @@ describe('hashtags', () => {

` const postWithHastagsQuery = gql` - query($id: ID) { + query ($id: ID) { Post(id: $id) { tags { id diff --git a/backend/src/middleware/languages/languages.spec.js b/backend/src/middleware/languages/languages.spec.js index 1448e4e4b..9bba45c0c 100644 --- a/backend/src/middleware/languages/languages.spec.js +++ b/backend/src/middleware/languages/languages.spec.js @@ -29,7 +29,7 @@ afterAll(async () => { }) const createPostMutation = gql` - mutation($title: String!, $content: String!, $categoryIds: [ID]) { + mutation ($title: String!, $content: String!, $categoryIds: [ID]) { CreatePost(title: $title, content: $content, categoryIds: $categoryIds) { language } diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js index af4ed9693..7583a6727 100644 --- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js +++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js @@ -10,7 +10,7 @@ const driver = getDriver() const neode = getNeode() const categoryIds = ['cat9'] const createPostMutation = gql` - mutation($id: ID, $title: String!, $postContent: String!, $categoryIds: [ID]!) { + mutation ($id: ID, $title: String!, $postContent: String!, $categoryIds: [ID]!) { CreatePost(id: $id, title: $title, content: $postContent, categoryIds: $categoryIds) { id title @@ -19,7 +19,7 @@ const createPostMutation = gql` } ` const updatePostMutation = gql` - mutation($id: ID!, $title: String!, $postContent: String!, $categoryIds: [ID]!) { + mutation ($id: ID!, $title: String!, $postContent: String!, $categoryIds: [ID]!) { UpdatePost(id: $id, content: $postContent, title: $title, categoryIds: $categoryIds) { title content @@ -27,7 +27,7 @@ const updatePostMutation = gql` } ` const createCommentMutation = gql` - mutation($id: ID, $postId: ID!, $commentContent: String!) { + mutation ($id: ID, $postId: ID!, $commentContent: String!) { CreateComment(id: $id, postId: $postId, content: $commentContent) { id content @@ -80,7 +80,7 @@ afterEach(async () => { describe('notifications', () => { const notificationQuery = gql` - query($read: Boolean) { + query ($read: Boolean) { notifications(read: $read, orderBy: updatedAt_desc) { read reason @@ -367,7 +367,7 @@ describe('notifications', () => { describe('if the notification was marked as read earlier', () => { const markAsReadAction = async () => { const mutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { markAsRead(id: $id) { read } diff --git a/backend/src/middleware/permissionsMiddleware.spec.js b/backend/src/middleware/permissionsMiddleware.spec.js index 8f311e8c2..5fa4a8f01 100644 --- a/backend/src/middleware/permissionsMiddleware.spec.js +++ b/backend/src/middleware/permissionsMiddleware.spec.js @@ -80,7 +80,7 @@ describe('authorization', () => { describe('access email address', () => { const userQuery = gql` - query($name: String) { + query ($name: String) { User(name: $name) { email } @@ -165,7 +165,7 @@ describe('authorization', () => { describe('access Signup', () => { const signupMutation = gql` - mutation($email: String!, $inviteCode: String) { + mutation ($email: String!, $inviteCode: String) { Signup(email: $email, inviteCode: $inviteCode) { email } diff --git a/backend/src/middleware/slugifyMiddleware.spec.js b/backend/src/middleware/slugifyMiddleware.spec.js index 97503851a..1f45c29df 100644 --- a/backend/src/middleware/slugifyMiddleware.spec.js +++ b/backend/src/middleware/slugifyMiddleware.spec.js @@ -54,7 +54,7 @@ describe('slugifyMiddleware', () => { describe('CreatePost', () => { const categoryIds = ['cat9'] const createPostMutation = gql` - mutation($title: String!, $content: String!, $categoryIds: [ID]!, $slug: String) { + mutation ($title: String!, $content: String!, $categoryIds: [ID]!, $slug: String) { CreatePost(title: $title, content: $content, categoryIds: $categoryIds, slug: $slug) { slug } @@ -164,7 +164,7 @@ describe('slugifyMiddleware', () => { describe('SignupVerification', () => { const mutation = gql` - mutation( + mutation ( $password: String! $email: String! $name: String! diff --git a/backend/src/middleware/userInteractions.spec.js b/backend/src/middleware/userInteractions.spec.js index 77c9fbd1d..27bee87c8 100644 --- a/backend/src/middleware/userInteractions.spec.js +++ b/backend/src/middleware/userInteractions.spec.js @@ -10,7 +10,7 @@ const driver = getDriver() const neode = getNeode() const postQuery = gql` - query($id: ID) { + query ($id: ID) { Post(id: $id) { clickedCount } diff --git a/backend/src/middleware/validation/validationMiddleware.spec.js b/backend/src/middleware/validation/validationMiddleware.spec.js index c3d518256..530a80b1e 100644 --- a/backend/src/middleware/validation/validationMiddleware.spec.js +++ b/backend/src/middleware/validation/validationMiddleware.spec.js @@ -17,14 +17,14 @@ let authenticatedUser, commentingUser const createCommentMutation = gql` - mutation($id: ID, $postId: ID!, $content: String!) { + mutation ($id: ID, $postId: ID!, $content: String!) { CreateComment(id: $id, postId: $postId, content: $content) { id } } ` const updateCommentMutation = gql` - mutation($content: String!, $id: ID!) { + mutation ($content: String!, $id: ID!) { UpdateComment(content: $content, id: $id) { id } @@ -32,7 +32,7 @@ const updateCommentMutation = gql` ` const reportMutation = gql` - mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) { + mutation ($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) { fileReport( resourceId: $resourceId reasonCategory: $reasonCategory @@ -43,7 +43,7 @@ const reportMutation = gql` } ` const reviewMutation = gql` - mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) { + mutation ($resourceId: ID!, $disable: Boolean, $closed: Boolean) { review(resourceId: $resourceId, disable: $disable, closed: $closed) { createdAt updatedAt @@ -52,7 +52,7 @@ const reviewMutation = gql` ` const updateUserMutation = gql` - mutation($id: ID!, $name: String) { + mutation ($id: ID!, $name: String) { UpdateUser(id: $id, name: $name) { name } diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js index 9f633c8b0..63a5538d0 100644 --- a/backend/src/schema/resolvers/comments.spec.js +++ b/backend/src/schema/resolvers/comments.spec.js @@ -36,7 +36,7 @@ afterEach(async () => { }) const createCommentMutation = gql` - mutation($id: ID, $postId: ID!, $content: String!) { + mutation ($id: ID, $postId: ID!, $content: String!) { CreateComment(id: $id, postId: $postId, content: $content) { id content @@ -128,7 +128,7 @@ describe('CreateComment', () => { describe('UpdateComment', () => { const updateCommentMutation = gql` - mutation($content: String!, $id: ID!) { + mutation ($content: String!, $id: ID!) { UpdateComment(content: $content, id: $id) { id content @@ -220,7 +220,7 @@ describe('UpdateComment', () => { describe('DeleteComment', () => { const deleteCommentMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { DeleteComment(id: $id) { id content diff --git a/backend/src/schema/resolvers/donations.spec.js b/backend/src/schema/resolvers/donations.spec.js index ea5ee4e09..5bbbd60e0 100644 --- a/backend/src/schema/resolvers/donations.spec.js +++ b/backend/src/schema/resolvers/donations.spec.js @@ -9,7 +9,7 @@ const instance = getNeode() const driver = getDriver() const updateDonationsMutation = gql` - mutation($goal: Int, $progress: Int) { + mutation ($goal: Int, $progress: Int) { UpdateDonations(goal: $goal, progress: $progress) { id goal diff --git a/backend/src/schema/resolvers/emails.spec.js b/backend/src/schema/resolvers/emails.spec.js index 6b1e24d2b..c5596cc27 100644 --- a/backend/src/schema/resolvers/emails.spec.js +++ b/backend/src/schema/resolvers/emails.spec.js @@ -37,7 +37,7 @@ afterEach(async () => { describe('AddEmailAddress', () => { const mutation = gql` - mutation($email: String!) { + mutation ($email: String!) { AddEmailAddress(email: $email) { email verifiedAt @@ -142,7 +142,7 @@ describe('AddEmailAddress', () => { describe('VerifyEmailAddress', () => { const mutation = gql` - mutation($email: String!, $nonce: String!) { + mutation ($email: String!, $nonce: String!) { VerifyEmailAddress(email: $email, nonce: $nonce) { email createdAt @@ -309,7 +309,7 @@ describe('VerifyNonce', () => { }) const verifyNonceQuery = gql` - query($email: String!, $nonce: String!) { + query ($email: String!, $nonce: String!) { VerifyNonce(email: $email, nonce: $nonce) } ` diff --git a/backend/src/schema/resolvers/embeds.spec.js b/backend/src/schema/resolvers/embeds.spec.js index 6c034acf7..b7ce7ab63 100644 --- a/backend/src/schema/resolvers/embeds.spec.js +++ b/backend/src/schema/resolvers/embeds.spec.js @@ -37,8 +37,7 @@ const babyLovesCatEmbedResponse = new Response( thumbnail_height: 360, provider_url: 'https://www.youtube.com/', thumbnail_width: 480, - html: - '', + html: '', thumbnail_url: 'https://i.ytimg.com/vi/qkdXAtO40Fo/hqdefault.jpg', version: '1.0', author_name: 'Merkley Family', @@ -57,7 +56,7 @@ describe('Query', () => { }) const { query } = createTestClient(server) const embed = gql` - query($url: String!) { + query ($url: String!) { embed(url: $url) { type title @@ -204,8 +203,7 @@ Have all the information for the brand in separate config files. Set these defau video: null, lang: 'de', sources: ['resource', 'oembed'], - html: - '', + html: '', }, }, errors: undefined, diff --git a/backend/src/schema/resolvers/follow.spec.js b/backend/src/schema/resolvers/follow.spec.js index f35795991..6d8db982a 100644 --- a/backend/src/schema/resolvers/follow.spec.js +++ b/backend/src/schema/resolvers/follow.spec.js @@ -16,7 +16,7 @@ let user2 let variables const mutationFollowUser = gql` - mutation($id: ID!) { + mutation ($id: ID!) { followUser(id: $id) { name followedBy { @@ -29,7 +29,7 @@ const mutationFollowUser = gql` ` const mutationUnfollowUser = gql` - mutation($id: ID!) { + mutation ($id: ID!) { unfollowUser(id: $id) { name followedBy { @@ -42,7 +42,7 @@ const mutationUnfollowUser = gql` ` const userQuery = gql` - query($id: ID) { + query ($id: ID) { User(id: $id) { followedBy { id diff --git a/backend/src/schema/resolvers/inviteCodes.spec.js b/backend/src/schema/resolvers/inviteCodes.spec.js index 19f021437..940aa8403 100644 --- a/backend/src/schema/resolvers/inviteCodes.spec.js +++ b/backend/src/schema/resolvers/inviteCodes.spec.js @@ -11,7 +11,7 @@ let mutate const driver = getDriver() const generateInviteCodeMutation = gql` - mutation($expiresAt: String = null) { + mutation ($expiresAt: String = null) { GenerateInviteCode(expiresAt: $expiresAt) { code createdAt @@ -31,7 +31,7 @@ const myInviteCodesQuery = gql` ` const isValidInviteCodeQuery = gql` - query($code: ID!) { + query ($code: ID!) { isValidInviteCode(code: $code) } ` diff --git a/backend/src/schema/resolvers/locations.spec.js b/backend/src/schema/resolvers/locations.spec.js index 34d0f2e9d..fa562cbfd 100644 --- a/backend/src/schema/resolvers/locations.spec.js +++ b/backend/src/schema/resolvers/locations.spec.js @@ -31,7 +31,7 @@ describe('resolvers', () => { describe('custom mutation, not handled by neo4j-graphql-js', () => { let variables const updateUserMutation = gql` - mutation($id: ID!, $name: String) { + mutation ($id: ID!, $name: String) { UpdateUser(id: $id, name: $name) { name location { diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js index b62d35ee8..a579c62da 100644 --- a/backend/src/schema/resolvers/moderation.spec.js +++ b/backend/src/schema/resolvers/moderation.spec.js @@ -16,7 +16,7 @@ let mutate, closeReportVariables const reviewMutation = gql` - mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) { + mutation ($resourceId: ID!, $disable: Boolean, $closed: Boolean) { review(resourceId: $resourceId, disable: $disable, closed: $closed) { createdAt updatedAt diff --git a/backend/src/schema/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js index 9d7795dd4..f600e7d1c 100644 --- a/backend/src/schema/resolvers/notifications.spec.js +++ b/backend/src/schema/resolvers/notifications.spec.js @@ -139,7 +139,7 @@ describe('given some notifications', () => { describe('notifications', () => { const notificationQuery = gql` - query($read: Boolean, $orderBy: NotificationOrdering) { + query ($read: Boolean, $orderBy: NotificationOrdering) { notifications(read: $read, orderBy: $orderBy) { from { __typename @@ -249,7 +249,7 @@ describe('given some notifications', () => { const deletePostAction = async () => { authenticatedUser = await author.toJson() const deletePostMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { DeletePost(id: $id) { id deleted @@ -284,7 +284,7 @@ describe('given some notifications', () => { describe('markAsRead', () => { const markAsReadMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { markAsRead(id: $id) { from { __typename diff --git a/backend/src/schema/resolvers/passwordReset.spec.js b/backend/src/schema/resolvers/passwordReset.spec.js index fd1395c57..40a18f5d9 100644 --- a/backend/src/schema/resolvers/passwordReset.spec.js +++ b/backend/src/schema/resolvers/passwordReset.spec.js @@ -55,7 +55,7 @@ describe('passwordReset', () => { describe('requestPasswordReset', () => { const mutation = gql` - mutation($email: String!) { + mutation ($email: String!) { requestPasswordReset(email: $email) } ` @@ -116,7 +116,7 @@ describe('resetPassword', () => { } const mutation = gql` - mutation($nonce: String!, $email: String!, $newPassword: String!) { + mutation ($nonce: String!, $email: String!, $newPassword: String!) { resetPassword(nonce: $nonce, email: $email, newPassword: $newPassword) } ` @@ -196,7 +196,7 @@ describe('resetPassword', () => { it('updates password of the user', async () => { await mutate({ mutation, variables }) const checkLoginMutation = gql` - mutation($email: String!, $password: String!) { + mutation ($email: String!, $password: String!) { login(email: $email, password: $password) } ` diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js index 1317d7c22..20dbecfb6 100644 --- a/backend/src/schema/resolvers/posts.spec.js +++ b/backend/src/schema/resolvers/posts.spec.js @@ -16,7 +16,7 @@ const categoryIds = ['cat9', 'cat4', 'cat15'] let variables const createPostMutation = gql` - mutation($id: ID, $title: String!, $content: String!, $language: String, $categoryIds: [ID]) { + mutation ($id: ID, $title: String!, $content: String!, $language: String, $categoryIds: [ID]) { CreatePost( id: $id title: $title @@ -323,7 +323,7 @@ describe('CreatePost', () => { describe('UpdatePost', () => { let author, newlyCreatedPost const updatePostMutation = gql` - mutation($id: ID!, $title: String!, $content: String!, $image: ImageInput) { + mutation ($id: ID!, $title: String!, $content: String!, $image: ImageInput) { UpdatePost(id: $id, title: $title, content: $content, image: $image) { id title @@ -497,7 +497,7 @@ describe('UpdatePost', () => { describe('pin posts', () => { let author const pinPostMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { pinPost(id: $id) { id title @@ -773,7 +773,7 @@ describe('pin posts', () => { it('pinned post appear first even when created before other posts', async () => { const postOrderingQuery = gql` - query($orderBy: [_PostOrdering]) { + query ($orderBy: [_PostOrdering]) { Post(orderBy: $orderBy) { id pinned @@ -816,7 +816,7 @@ describe('pin posts', () => { describe('unpin posts', () => { let pinnedPost const unpinPostMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { unpinPost(id: $id) { id title @@ -928,7 +928,7 @@ describe('unpin posts', () => { describe('DeletePost', () => { let author const deletePostMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { DeletePost(id: $id) { id deleted @@ -1052,14 +1052,14 @@ describe('DeletePost', () => { describe('emotions', () => { let author, postToEmote const PostsEmotionsCountQuery = gql` - query($id: ID!) { + query ($id: ID!) { Post(id: $id) { emotionsCount } } ` const PostsEmotionsQuery = gql` - query($id: ID!) { + query ($id: ID!) { Post(id: $id) { emotions { emotion @@ -1093,7 +1093,7 @@ describe('emotions', () => { describe('AddPostEmotions', () => { const addPostEmotionsMutation = gql` - mutation($to: _PostInput!, $data: _EMOTEDInput!) { + mutation ($to: _PostInput!, $data: _EMOTEDInput!) { AddPostEmotions(to: $to, data: $data) { from { id @@ -1210,7 +1210,7 @@ describe('emotions', () => { describe('RemovePostEmotions', () => { let removePostEmotionsVariables, postsEmotionsQueryVariables const removePostEmotionsMutation = gql` - mutation($to: _PostInput!, $data: _EMOTEDInput!) { + mutation ($to: _PostInput!, $data: _EMOTEDInput!) { RemovePostEmotions(to: $to, data: $data) { from { id @@ -1309,13 +1309,13 @@ describe('emotions', () => { let PostsEmotionsByCurrentUserVariables const PostsEmotionsCountByEmotionQuery = gql` - query($postId: ID!, $data: _EMOTEDInput!) { + query ($postId: ID!, $data: _EMOTEDInput!) { PostsEmotionsCountByEmotion(postId: $postId, data: $data) } ` const PostsEmotionsByCurrentUserQuery = gql` - query($postId: ID!) { + query ($postId: ID!) { PostsEmotionsByCurrentUser(postId: $postId) } ` diff --git a/backend/src/schema/resolvers/registration.spec.js b/backend/src/schema/resolvers/registration.spec.js index c8b71deb9..25e8fd1c8 100644 --- a/backend/src/schema/resolvers/registration.spec.js +++ b/backend/src/schema/resolvers/registration.spec.js @@ -36,7 +36,7 @@ afterEach(async () => { describe('Signup', () => { const mutation = gql` - mutation($email: String!, $inviteCode: String) { + mutation ($email: String!, $inviteCode: String) { Signup(email: $email, inviteCode: $inviteCode) { email } @@ -145,7 +145,7 @@ describe('Signup', () => { describe('SignupVerification', () => { const mutation = gql` - mutation( + mutation ( $name: String! $password: String! $email: String! diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js index 2ecccfc23..1208db7fe 100644 --- a/backend/src/schema/resolvers/reports.spec.js +++ b/backend/src/schema/resolvers/reports.spec.js @@ -11,7 +11,7 @@ describe('file a report on a resource', () => { let authenticatedUser, currentUser, mutate, query, moderator, abusiveUser, otherReportingUser const categoryIds = ['cat9'] const fileReportMutation = gql` - mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) { + mutation ($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) { fileReport( resourceId: $resourceId reasonCategory: $reasonCategory @@ -42,7 +42,7 @@ describe('file a report on a resource', () => { reasonDescription: 'Violates code of conduct !!!', } const reportsQuery = gql` - query($closed: Boolean) { + query ($closed: Boolean) { reports(orderBy: createdAt_desc, closed: $closed) { id createdAt @@ -74,7 +74,7 @@ describe('file a report on a resource', () => { } ` const reviewMutation = gql` - mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) { + mutation ($resourceId: ID!, $disable: Boolean, $closed: Boolean) { review(resourceId: $resourceId, disable: $disable, closed: $closed) { createdAt resource { diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js index eaaa852ec..0f76e1ed1 100644 --- a/backend/src/schema/resolvers/rewards.spec.js +++ b/backend/src/schema/resolvers/rewards.spec.js @@ -76,7 +76,7 @@ describe('rewards', () => { describe('reward', () => { const rewardMutation = gql` - mutation($from: ID!, $to: ID!) { + mutation ($from: ID!, $to: ID!) { reward(badgeKey: $from, userId: $to) { id badges { @@ -266,7 +266,7 @@ describe('rewards', () => { } const unrewardMutation = gql` - mutation($from: ID!, $to: ID!) { + mutation ($from: ID!, $to: ID!) { unreward(badgeKey: $from, userId: $to) { id badges { diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js index a859bf296..ceb63304e 100644 --- a/backend/src/schema/resolvers/searches.spec.js +++ b/backend/src/schema/resolvers/searches.spec.js @@ -28,7 +28,7 @@ afterAll(async () => { }) const searchQuery = gql` - query($query: String!) { + query ($query: String!) { searchResults(query: $query, limit: 5) { __typename ... on Post { @@ -49,7 +49,7 @@ const searchQuery = gql` ` const searchPostQuery = gql` - query($query: String!, $firstPosts: Int, $postsOffset: Int) { + query ($query: String!, $firstPosts: Int, $postsOffset: Int) { searchPosts(query: $query, firstPosts: $firstPosts, postsOffset: $postsOffset) { postCount posts { diff --git a/backend/src/schema/resolvers/shout.spec.js b/backend/src/schema/resolvers/shout.spec.js index 574907180..383bd83f0 100644 --- a/backend/src/schema/resolvers/shout.spec.js +++ b/backend/src/schema/resolvers/shout.spec.js @@ -9,17 +9,17 @@ const instance = getNeode() const driver = getDriver() const mutationShoutPost = gql` - mutation($id: ID!) { + mutation ($id: ID!) { shout(id: $id, type: Post) } ` const mutationUnshoutPost = gql` - mutation($id: ID!) { + mutation ($id: ID!) { unshout(id: $id, type: Post) } ` const queryPost = gql` - query($id: ID!) { + query ($id: ID!) { Post(id: $id) { id shoutedBy { diff --git a/backend/src/schema/resolvers/socialMedia.spec.js b/backend/src/schema/resolvers/socialMedia.spec.js index 898174199..cff20185b 100644 --- a/backend/src/schema/resolvers/socialMedia.spec.js +++ b/backend/src/schema/resolvers/socialMedia.spec.js @@ -70,7 +70,7 @@ describe('SocialMedia', () => { beforeEach(() => { mutation = gql` - mutation($url: String!) { + mutation ($url: String!) { CreateSocialMedia(url: $url) { id url @@ -131,7 +131,7 @@ describe('SocialMedia', () => { describe('ownedBy', () => { beforeEach(() => { mutation = gql` - mutation($url: String!) { + mutation ($url: String!) { CreateSocialMedia(url: $url) { url ownedBy { @@ -162,7 +162,7 @@ describe('SocialMedia', () => { const socialMedia = await setUpSocialMedia() mutation = gql` - mutation($id: ID!, $url: String!) { + mutation ($id: ID!, $url: String!) { UpdateSocialMedia(id: $id, url: $url) { id url @@ -225,7 +225,7 @@ describe('SocialMedia', () => { const socialMedia = await setUpSocialMedia() mutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { DeleteSocialMedia(id: $id) { id url diff --git a/backend/src/schema/resolvers/userData.spec.js b/backend/src/schema/resolvers/userData.spec.js index 972248d50..0a4e54295 100644 --- a/backend/src/schema/resolvers/userData.spec.js +++ b/backend/src/schema/resolvers/userData.spec.js @@ -39,7 +39,7 @@ afterAll(async () => { }) const userDataQuery = gql` - query($id: ID!) { + query ($id: ID!) { userData(id: $id) { user { id diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js index b434ea628..57fe4a7f4 100644 --- a/backend/src/schema/resolvers/user_management.spec.js +++ b/backend/src/schema/resolvers/user_management.spec.js @@ -171,7 +171,7 @@ describe('currentUser', () => { describe('login', () => { const loginMutation = gql` - mutation($email: String!, $password: String!) { + mutation ($email: String!, $password: String!) { login(email: $email, password: $password) } ` @@ -287,7 +287,7 @@ describe('login', () => { describe('change password', () => { const changePasswordMutation = gql` - mutation($oldPassword: String!, $newPassword: String!) { + mutation ($oldPassword: String!, $newPassword: String!) { changePassword(oldPassword: $oldPassword, newPassword: $newPassword) } ` diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js index e5e818040..6fd893240 100644 --- a/backend/src/schema/resolvers/users.spec.js +++ b/backend/src/schema/resolvers/users.spec.js @@ -17,7 +17,7 @@ const driver = getDriver() const neode = getNeode() const deleteUserMutation = gql` - mutation($id: ID!, $resource: [Deletable]) { + mutation ($id: ID!, $resource: [Deletable]) { DeleteUser(id: $id, resource: $resource) { id name @@ -46,7 +46,7 @@ const deleteUserMutation = gql` ` const switchUserRoleMutation = gql` - mutation($role: UserGroup!, $id: ID!) { + mutation ($role: UserGroup!, $id: ID!) { switchUserRole(role: $role, id: $id) { name role @@ -81,7 +81,7 @@ describe('User', () => { beforeEach(async () => { userQuery = gql` - query($email: String) { + query ($email: String) { User(email: $email) { name } @@ -144,7 +144,7 @@ describe('UpdateUser', () => { beforeEach(async () => { updateUserMutation = gql` - mutation( + mutation ( $id: ID! $name: String $termsAndConditionsAgreedVersion: String diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js index 1ef427034..c966fe720 100644 --- a/backend/src/schema/resolvers/users/location.spec.js +++ b/backend/src/schema/resolvers/users/location.spec.js @@ -9,7 +9,7 @@ const driver = getDriver() let authenticatedUser, mutate, query, variables const updateUserMutation = gql` - mutation($id: ID!, $name: String!, $locationName: String) { + mutation ($id: ID!, $name: String!, $locationName: String) { UpdateUser(id: $id, name: $name, locationName: $locationName) { locationName } @@ -17,7 +17,7 @@ const updateUserMutation = gql` ` const queryLocations = gql` - query($place: String!, $lang: String!) { + query ($place: String!, $lang: String!) { queryLocations(place: $place, lang: $lang) { place_name id diff --git a/backend/src/schema/resolvers/users/mutedUsers.spec.js b/backend/src/schema/resolvers/users/mutedUsers.spec.js index 345b435f5..c86cf2eb1 100644 --- a/backend/src/schema/resolvers/users/mutedUsers.spec.js +++ b/backend/src/schema/resolvers/users/mutedUsers.spec.js @@ -93,7 +93,7 @@ describe('muteUser', () => { muteAction = (variables) => { const { mutate } = createTestClient(server) const muteUserMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { muteUser(id: $id) { id name @@ -310,7 +310,7 @@ describe('unmuteUser', () => { unmuteAction = (variables) => { const { mutate } = createTestClient(server) const unmuteUserMutation = gql` - mutation($id: ID!) { + mutation ($id: ID!) { unmuteUser(id: $id) { id name diff --git a/backend/src/schema/resolvers/viewedTeaserCount.spec.js b/backend/src/schema/resolvers/viewedTeaserCount.spec.js index c81e272ec..ceb95c0ed 100644 --- a/backend/src/schema/resolvers/viewedTeaserCount.spec.js +++ b/backend/src/schema/resolvers/viewedTeaserCount.spec.js @@ -32,7 +32,7 @@ afterAll(async () => { describe('count post teaser views', () => { let aUser, bUser const markTeaserAsViewed = gql` - mutation($id: ID!) { + mutation ($id: ID!) { markTeaserAsViewed(id: $id) { id viewedTeaserCount diff --git a/backend/yarn.lock b/backend/yarn.lock index 44f4d2dcc..834275cba 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -7833,10 +7833,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@~2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.0.tgz#8a03c7777883b29b37fb2c4348c66a78e980418b" - integrity sha512-yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw== +prettier@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d" + integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ== pretty-format@^25.3.0: version "25.3.0"