Task_5_Done

RisingStack · Sep 22, 2019 · 7336c75 · 7336c75
1 parent cce8655
commit 7336c75
Show file tree

Hide file tree

Showing 16 changed files with 153 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "nodemon -r dotenv/config src/server.js",
+    "start": "nodemon -r dotenv/config src/server",
     "lint": "eslint --ignore-path .gitignore ."
   },
   "husky": {
@@ -24,15 +24,18 @@
   },
   "homepage": "https://github.com/RisingStack/jsconfbp-2019-graphql#readme",
   "dependencies": {
+    "apollo-link-http": "1.5.16",
     "axios": "0.19.0",
     "bcrypt": "^3.0.6",
     "cors": "^2.8.5",
     "express": "^4.17.1",
     "express-graphql": "^0.9.0",
     "graphql": "^14.5.4",
+    "graphql-tools": "4.0.5",
     "helmet": "^3.21.0",
     "knex": "^0.19.3",
     "lodash": "^4.17.15",
+    "node-fetch": "2.6.0",
     "pg": "^7.12.1",
     "uuidv4": "^5.0.1"
   },

diff --git a/scripts/createTestData.js b/scripts/createTestData.js
@@ -3,7 +3,7 @@
 
 require('dotenv/config');
 
-const db = require('../src/db');
+const db = require('../src/server/db');
 
 Promise.all(db.createTables()).then(() => {
   Promise.all(db.createTestData()).then(() => {

diff --git a/scripts/dropTables.js b/scripts/dropTables.js
@@ -3,7 +3,7 @@
 
 require('dotenv/config');
 
-const db = require('../src/db');
+const db = require('../src/server/db');
 
 Promise.all(db.dropTables()).then(() => {
   console.log('Tables dropped.');

diff --git a/src/config.js → src/server/config.js b/src/config.js → src/server/config.js
diff --git a/src/db.js → src/server/db.js b/src/db.js → src/server/db.js
diff --git a/src/fetcher.js → src/server/fetcher.js b/src/fetcher.js → src/server/fetcher.js
diff --git a/src/gqlSchema.js → src/server/gqlSchema.js b/src/gqlSchema.js → src/server/gqlSchema.js
diff --git a/src/server.js → src/server/index.js b/src/server.js → src/server/index.js
@@ -2,6 +2,8 @@ const express = require('express');
 const graphqlHTTP = require('express-graphql');
 const helmet = require('helmet');
 const cors = require('cors');
+const { mergeSchemas } = require('graphql-tools');
+const pokemonSchema = require('./pokemonSchema');
 
 const db = require('./db');
 
@@ -25,7 +27,9 @@ app.use(cors({
 }));
 
 app.use('/graphql', graphqlHTTP(async () => ({
-  schema,
+  schema: mergeSchemas({
+    schemas: [schema, await pokemonSchema()],
+  }),
   // rootValue,
   graphiql: true,
   customFormatErrorFn: (error) => {