Merge branch 'master' into locations

This commit is contained in:
Grzegorz Leoniec 2019-01-09 13:37:04 +01:00 committed by GitHub
commit 3765f5d046
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 26 deletions

View File

@ -27,6 +27,9 @@ Connect with other developers over [Discord](https://discord.gg/6ub73U3)
## Quick Start
### Forking the repository
Before you start, fork the repository using the fork button above, then clone it to your local machine using `git clone https://github.com/your-username/Nitro-Backend.git`
### Installation with Docker
Run:

View File

@ -25,7 +25,7 @@
"license": "MIT",
"dependencies": {
"apollo-cache-inmemory": "~1.3.11",
"apollo-client": "~2.4.7",
"apollo-client": "~2.4.8",
"apollo-link-http": "~1.5.9",
"apollo-server": "~2.3.1",
"bcryptjs": "~2.4.3",
@ -46,7 +46,7 @@
"lodash": "~4.17.11",
"ms": "~2.1.1",
"neo4j-driver": "~1.7.2",
"neo4j-graphql-js": "~2.1.1",
"neo4j-graphql-js": "~2.2.0",
"node-fetch": "~2.3.0",
"npm-run-all": "~4.1.5",
"passport": "~0.4.0",

View File

@ -19,7 +19,7 @@ afterEach(async () => {
await app.close()
})
describe.only('login', () => {
describe('login', () => {
const mutation = (params) => {
const { email, password } = params
return `

View File

@ -36,5 +36,5 @@ export default async function (client) {
}
})
/* eslint-disable-next-line no-console */
console.log('Seeded Data', data)
console.log('Seeded Data...')
}

View File

@ -28,6 +28,7 @@ let schema = makeExecutableSchema({
})
const driver = neo4j().getDriver()
const debug = process.env.NODE_ENV !== 'production' && process.env.DEBUG === 'true'
schema = augmentSchema(schema, {
query: {
@ -35,7 +36,8 @@ schema = augmentSchema(schema, {
},
mutation: {
exclude: ['Statistics', 'LoggedInUser']
}
},
debug: debug
})
schema = applyScalars(applyDirectives(schema))
@ -57,8 +59,8 @@ const createServer = (options) => {
return payload
},
schema: schema,
tracing: true,
debug: process.env.NODE_ENV !== 'production',
debug: debug,
tracing: debug,
middlewares: middleware(schema),
mocks: (process.env.MOCK === 'true') ? mocks : false
}

View File

@ -1023,23 +1023,23 @@ apollo-cache-inmemory@~1.3.11:
apollo-utilities "^1.0.26"
optimism "^0.6.6"
apollo-cache@1.1.21, apollo-cache@^1.1.21:
version "1.1.21"
resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.21.tgz#950025e2272741ba8e5064419906e3ac4072925d"
integrity sha512-5ErNb78KHtrJNimkDBTEigcvHkIqUmS7QJIk4lpZZ+XLVVgvk2fD+GhD1PLP+s8vHfAKVbO6vdbRxCCjGGrh5w==
apollo-cache@1.1.22, apollo-cache@^1.1.21:
version "1.1.22"
resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.22.tgz#d4682ea6e8b2508a934f61c2fd9e36b4a65041d9"
integrity sha512-8PoxhQLISj2oHwT7i/r4l+ly4y3RKZls+dtXzAewu3U77P9dNZKhYkRNAhx9iEfsrNoHgXBV8vMp64hb1uYh+g==
dependencies:
apollo-utilities "^1.0.26"
apollo-utilities "^1.0.27"
apollo-client@~2.4.7:
version "2.4.7"
resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.4.7.tgz#b6712fd4c9ba346e3c44cfec7e6868e532b6a957"
integrity sha512-6aAm+16AFBYZhJF8eKxrup6AbYni01InDiwTfZhMMTP2xaXQWjsQnfaHbI2oE+hd3+AZFy1drkse8RZKghR/WQ==
apollo-client@~2.4.8:
version "2.4.8"
resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.4.8.tgz#3a798f1076243465a59061d44d11bd030b68deb9"
integrity sha512-OAFbCTnGPtaIv0j+EZYzY20d+MD2JNbJ/YXZ4s0/oZlSg87bb0gjcIbccw2lnytipymZcZNr5ArFFeh0saGEwA==
dependencies:
"@types/zen-observable" "^0.8.0"
apollo-cache "1.1.21"
apollo-cache "1.1.22"
apollo-link "^1.0.0"
apollo-link-dedup "^1.0.0"
apollo-utilities "1.0.26"
apollo-utilities "1.0.27"
symbol-observable "^1.0.2"
zen-observable "^0.8.0"
optionalDependencies:
@ -1307,10 +1307,10 @@ apollo-upload-server@^5.0.0:
busboy "^0.2.14"
object-path "^0.11.4"
apollo-utilities@1.0.26, apollo-utilities@^1.0.0, apollo-utilities@^1.0.1, apollo-utilities@^1.0.26:
version "1.0.26"
resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.26.tgz#589c66bf4d16223531351cf667a230c787def1da"
integrity sha512-URw7o3phymliqYCYatcird2YRPUU2eWCNvip64U9gQrX56mEfK4m99yBIDCMTpmcvOFsKLii1sIEZsHIs/bvnw==
apollo-utilities@1.0.27, apollo-utilities@^1.0.0, apollo-utilities@^1.0.1, apollo-utilities@^1.0.26, apollo-utilities@^1.0.27:
version "1.0.27"
resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.27.tgz#77c550f9086552376eca3a48e234a1466b5b057e"
integrity sha512-nzrMQ89JMpNmYnVGJ4t8zN75gQbql27UDhlxNi+3OModp0Masx5g+fQmQJ5B4w2dpRuYOsdwFLmj3lQbwOKV1Q==
dependencies:
fast-json-stable-stringify "^2.0.0"
@ -5393,10 +5393,10 @@ neo4j-driver@^1.7.2, neo4j-driver@~1.7.2:
text-encoding "^0.6.4"
uri-js "^4.2.1"
neo4j-graphql-js@~2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/neo4j-graphql-js/-/neo4j-graphql-js-2.1.1.tgz#bdb1af2fb45d1058492852ed9307586f6deab37d"
integrity sha512-OcDaFIfOKZF02jmxnWWTLQr64mu79RGAtDULfciwElW59GjRF425M2Yf4gLJuQFscnh7d+Qk/+Ng+jVbz+V4lA==
neo4j-graphql-js@~2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/neo4j-graphql-js/-/neo4j-graphql-js-2.2.0.tgz#f0d934b376e9476ef2aa1600e86eb1f8a74c10a2"
integrity sha512-DyYRE6wAVPKxDAHkRwiZmNYx+Vv3KVFQp2Ul1Ay4f2ahW52mWzwMFe/Rlbau3phFYSZZAeaRCT7XLBy++sg/cQ==
dependencies:
graphql "^14.0.2"
lodash "^4.17.11"