From 65d5cee2bb2914c6b83a460e2bdd81e0299abd9a Mon Sep 17 00:00:00 2001 From: RandomUser27 Date: Sun, 22 Sep 2019 13:14:37 +0200 Subject: [PATCH 1/2] package.json --- package-lock.json | 33 +++++++++++++++++++-------------- package.json | 1 + 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 212f9d3..c35e90d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -939,9 +939,9 @@ } }, "chokidar": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", - "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", "dev": true, "requires": { "anymatch": "^2.0.0", @@ -1723,9 +1723,9 @@ } }, "es5-ext": { - "version": "0.10.50", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz", - "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==", + "version": "0.10.51", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz", + "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==", "dev": true, "requires": { "es6-iterator": "~2.0.3", @@ -1745,13 +1745,13 @@ } }, "es6-symbol": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz", + "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "d": "^1.0.1", + "es5-ext": "^0.10.51" } }, "es6-weak-map": { @@ -2893,6 +2893,11 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "g": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/g/-/g-2.0.1.tgz", + "integrity": "sha1-C1lj69DKcOO8jGdmk0oCGCHIuFc=" + }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -6625,9 +6630,9 @@ } }, "upath": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", - "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", "dev": true }, "uri-js": { diff --git a/package.json b/package.json index ae3c9f0..242fe85 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "express-session": "^1.16.2", "express-socket.io-session": "^1.3.5", "fs-extra": "^8.1.0", + "g": "^2.0.1", "graphql": "^14.4.2", "graphql-import": "^0.7.1", "js-yaml": "^3.13.1", From b623018f76d61ab951924a4847bc8f6c2723b233 Mon Sep 17 00:00:00 2001 From: RandomUser27 Date: Sun, 22 Sep 2019 13:36:17 +0200 Subject: [PATCH 2/2] schema.graphql added: send reqest; deny request; post the post; sender and reciverid from request; --- src/public/graphql/schema.graphql | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/public/graphql/schema.graphql b/src/public/graphql/schema.graphql index fb04f53..e4705d6 100644 --- a/src/public/graphql/schema.graphql +++ b/src/public/graphql/schema.graphql @@ -25,13 +25,23 @@ type Mutation { "Report the post" report(postId: ID!): Boolean + "send a request" + sendRequest(request: Request!): Boolean + "lets you accept a request for a given request id" acceptRequest(requestId: ID!): Boolean + "lets you deny a request for a given request id" + denyRequest(requestId: ID!): Boolean + "send a message in a Chatroom" sendMessage(chatId: ID!, content: String!): Boolean - # TODO: createPost, deletePost, sendRequest, denyRequest + "create the post" + createPost(post: Post!): Boolean + + "delete the post for a given post id" + deletePost(postId: ID!): Boolean } "represents a single user account" @@ -99,6 +109,12 @@ type Request { "id of the request" id: ID! + "Id of the user who sended the request" + sender: User! + + "Id of the user who received the request" + receiver: User! + "type of the request" requestType: RequestType! }