Fix Upstream Master Rebase conflict

server/src/index.js

@@ -9,6 +9,7 @@ import axios from 'axios'
 
 import { createTransformedRemoteSchema } from './createRemoteSchema'
 import { teams, events } from './links'
+import { typeDef as masterSchema } from './schema'
 import logger from './logger'
 
 async function getUserId (authId) {
@@ -58,7 +59,7 @@ async function run () {
     process.env.KEYVAULT_API_URL,
     process.env.KEYVAULT_API_PRESHARED)
 
-  var schemas = []
+  var schemas = [masterSchema]
   var resolvers = {}
 
   if (transformedTeamsSchema) {

server/src/resolvers/index.js

@@ -0,0 +1 @@
+export { default as Mutation } from './mutations'

server/src/resolvers/mutation/index.js

@@ -0,0 +1,2 @@
+import { mergeDirectoryModules } from '../../utils'
+export default mergeDirectoryModules(__dirname)

server/src/resolvers/mutation/sendgrid.js

@@ -0,0 +1,21 @@
+import axios from 'axios'
+import jwt from 'jsonwebtoken')
+
+const API_KEY = process.env.SG_APIKEY
+
+const dev = process.env.NODE_ENV === 'development' ? true : false
+let origin = 'https://app.advancedalgos.net'
+if (dev){
+  origin = 'http://localhost:3100'
+}
+
+export default {
+  async sgSendNewsletterVerify(parent, { email }, ctx, info){
+
+  },
+  async sgNewsletterSignup(parent, { token }, ctx, info) {
+  },
+
+  async sgContact(parent, { email, subject, message }, ctx, info) {
+  },
+}

server/src/schema/index.js

@@ -0,0 +1,11 @@
+export const typeDef = `
+  type Mutation {
+    sgSendNewsletterVerify(email: String!): String
+    sgNewsletterSignup(email: String!): String
+    sgContact(email: String!, subject: String!, Message: String!): String
+  }
+
+  schema {
+    mutation: Mutation
+  }
+`

server/src/utils.js

@@ -1,3 +1,18 @@
+import fs from 'fs'
+import path from 'path'
+
+export const mergeDirectoryModules = dirpath =>
+  fs
+    .readdirSync(dirpath, 'utf8')
+    .filter(filename => !/^[_|index.]/.test(filename))
+    .reduce(
+      (acc, filename) => ({
+        ...acc,
+        ...require(path.resolve(dirpath, filename)).default,
+      }),
+      {}
+    )
+
 export const capitalize = (string) => {
   return (string).charAt(0).toUpperCase() + (string).slice(1)
 }