asmer@controller 4 years ago
parent
commit
a2f86efc24
3 changed files with 20 additions and 19 deletions
  1. 6 6
      index.js
  2. 12 11
      package-lock.json
  3. 2 2
      package.json

+ 6 - 6
index.js

@@ -74,7 +74,7 @@ const upload  = require('multer')({ dest: uploadPath })
 
         input AdInput {
             _id: ID,
-            images: [Image]
+            images: [ImageInput]
 
             title: String
             description: String,
@@ -99,7 +99,7 @@ const upload  = require('multer')({ dest: uploadPath })
             _id: ID,
             text: String
 
-            ad: Ad
+            ad: AdInput
             answerTo: CommentInput
         }
 
@@ -115,12 +115,10 @@ const upload  = require('multer')({ dest: uploadPath })
 
         input MessageInput {
             _id: ID,
-            owner: User
-            createdAt: String
 
-            to: User
+            to: UserInput
             text: String
-            image: Image
+            image: ImageInput
         }
     `);
 
@@ -128,6 +126,8 @@ const upload  = require('multer')({ dest: uploadPath })
     console.log(printSchema(schema))
 
     const app = express();
+
+    app.use(require('cors')())
     app.use(express.static('public'));
     app.use('/graphql', express_graphql(jwtGQL({anonSchema, anonResolvers, schema, createContext: getModels, graphiql: true, secret: jwtSecret})))
 

+ 12 - 11
package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "hipstagram",
+  "name": "marketplace",
   "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -137,6 +137,15 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
+    "cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "requires": {
+        "object-assign": "^4",
+        "vary": "^1"
+      }
+    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -481,11 +490,11 @@
         "express-graphql": "^0.9.0",
         "graphql": "^14.4.2",
         "jsonwebtoken": "^8.5.1",
-        "mm": "git+ssh://git@gitlab.a-level.com.ua:gitgod/mm.git#5d34f0c91cbf3acb9cdc59bdbeadee041758cea9"
+        "mm": "git+ssh://git@gitlab.a-level.com.ua:gitgod/mm.git"
       },
       "dependencies": {
         "mm": {
-          "version": "git+ssh://git@gitlab.a-level.com.ua:gitgod/mm.git#5d34f0c91cbf3acb9cdc59bdbeadee041758cea9",
+          "version": "git+ssh://git@gitlab.a-level.com.ua:gitgod/mm.git#8ae3c69780bf9cb25097a4c0a0a0ad01efc02327",
           "from": "git+ssh://git@gitlab.a-level.com.ua:gitgod/mm.git",
           "requires": {
             "mongodb": "^3.2.2"
@@ -528,14 +537,6 @@
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
       "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
     },
-    "node-id3": {
-      "version": "0.1.11",
-      "resolved": "https://registry.npmjs.org/node-id3/-/node-id3-0.1.11.tgz",
-      "integrity": "sha512-lNBa5k0oxLyWaRBsMABJcctDHoK7T2qGg44c3KbAZiH/7IHx7a2Uo4f2RFBqeC0XvD1dIQrJjjtb49iE0MQ8dA==",
-      "requires": {
-        "iconv-lite": "^0.4.15"
-      }
-    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",

+ 2 - 2
package.json

@@ -21,13 +21,13 @@
   "author": "Ivan Grynkin",
   "license": "MIT",
   "dependencies": {
+    "cors": "^2.8.5",
     "express": "^4.17.1",
     "express-graphql": "^0.9.0",
     "graphql": "^14.4.2",
     "jsonwebtoken": "^8.5.1",
     "mm": "git+ssh://git@gitlab.a-level.com.ua:gitgod/mm.git",
     "mm-graphql": "git+ssh://git@gitlab.a-level.com.ua:gitgod/mm-graphql.git",
-    "multer": "^1.4.2",
-    "node-id3": "^0.1.11"
+    "multer": "^1.4.2"
   }
 }