update dependencies and other improvements

Author: nikolasburk

README.md

@@ -8,19 +8,15 @@ This is the sample project that belongs to the [React & Apollo Tutorial](https:/
 
 ```sh
 git clone https://github.com/howtographql/react-apollo/
-cd react-apollo
 ```
 
 ### 2. Deploy the Prisma database service
 
 ```sh
-cd server
-yarn install
-prisma deploy
+cd react-apollo/server
+yarn prisma deploy
 ```
 
-> You can use the `prisma` CLI without having it globally installed because it's listed as a _development dependency_ in `package.json`.
-
 When prompted where (i.e. to which _cluster_) you want to deploy your service, choose any of the public clusters, e.g. `public-us1` or `public-eu1`. (If you have Docker installed, you can also deploy locally.)
 
 ### 3. Set the Prisma service endpoint
@@ -35,7 +31,7 @@ const server = new GraphQLServer({
     ...req,
     db: new Prisma({
       typeDefs: 'src/generated/prisma.graphql',
-      endpoint: "__PRISMA_ENDPOINT__",
+      endpoint: '__PRISMA_ENDPOINT__',
       secret: 'mysecret123',
     }),
   }),
@@ -52,7 +48,7 @@ const server = new GraphQLServer({
     ...req,
     db: new Prisma({
       typeDefs: 'src/generated/prisma.graphql',
-      endpoint: "https://eu1.prisma.sh/public-hillcloak-flier-942261/hackernews-graphql-js/dev",
+      endpoint: 'https://eu1.prisma.sh/public-hillcloak-flier-942261/hackernews-graphql-js/dev',
       secret: 'mysecret123',
     }),
   }),
@@ -63,18 +59,21 @@ Note that the part `public-hillcloak-flier-952361` of the URL is unique to your
 
 ### 4. Start the server
 
-To start the server, all you need to do is execute the `start` script by running the following command inside the `server` directory:
+To start the server, all you need to do is install the the dependencies execute the `start` script by running the following command inside the `server` directory:
 
 ```sh
 yarn install
 yarn start
 ```
 
+> **Note**: If you want to interact with the GraphQL APIs inside a [GraphQL Playground](https://github.com/graphcool/graphql-playground), you can also run `yarn dev`.
+
 ### 5. Run the app
 
-Now that the server is running, you can run the app as well (the command needs to be run in a new terminal tab/window inside the root directory `react-apollo`):
+Now that the server is running, you can start the app as well. The commands need to be run in a new terminal tab/window inside the root directory `react-apollo` (because the current tab is blocked by the process running the server):
 
 ```sh
+yarn install
 yarn start
 ```
 

server/README.md

@@ -9,4 +9,6 @@ stage: dev
 secret: mysecret123
 
 # the file path pointing to your data model
-datamodel: datamodel.graphql
+datamodel: datamodel.graphql
+
+cluster: nikolas/prisma-eu1

server/database/prisma.yml

@@ -7,12 +7,12 @@
   },
   "dependencies": {
     "bcryptjs": "^2.4.3",
-    "graphql-yoga": "1.2.0",
-    "prisma-binding": "1.4.0"
+    "graphql-yoga": "1.3.2",
+    "prisma-binding": "1.5.10"
   },
   "devDependencies": {
-    "graphql-cli": "2.12.4",
+    "graphql-cli": "2.14.1",
     "npm-run-all": "4.1.2",
-    "prisma-cli": "1.0.0"
+    "prisma": "1.2.2"
   }
 }

server/package.json

@@ -1,4 +1,4 @@
-# THIS FILE HAS BEEN AUTO-GENERATED BY "GRAPHCOOL DEPLOY"
+# THIS FILE HAS BEEN AUTO-GENERATED BY "PRISMA DEPLOY"
 # DO NOT EDIT THIS FILE DIRECTLY
 
 #

server/src/generated/prisma.graphql

@@ -19,10 +19,11 @@ const server = new GraphQLServer({
     ...req,
     db: new Prisma({
       typeDefs: 'src/generated/prisma.graphql',
-      endpoint: "__PRISMA_ENDPOINT__",
+      endpoint: '__PRISMA_ENDPOINT__',
       secret: 'mysecret123',
+      debug: true
     }),
   }),
 })
 
-server.start(() => console.log('Server is running on http://localhost:4000'))
+server.start(() => console.log('Server is running on http://localhost:4000'))

server/src/index.js

@@ -1,7 +1,9 @@
 const newLink = {
   subscribe: (parent, args, ctx, info) => {
     return ctx.db.subscription.link(
-      { where: { mutation_in: ['CREATED'] } },
+      // https://github.com/graphcool/prisma/issues/1734
+      // { where: { mutation_in: ['CREATED'] } },
+      { },
       info,
     )
   },
@@ -10,7 +12,9 @@ const newLink = {
 const newVote = {
   subscribe: (parent, args, ctx, info) => {
     return ctx.db.subscription.vote(
-      { where: { mutation_in: ['CREATED'] } },
+      // https://github.com/graphcool/prisma/issues/1734
+      // { where: { mutation_in: ['CREATED'] } },
+      { },
       info,
     )
   },

server/src/resolvers/Subscription.js

@@ -4,24 +4,18 @@ type Query {
   feed(filter: String, skip: Int, first: Int, orderBy: LinkOrderByInput): Feed!
 }
 
+type Feed {
+  links: [Link!]!
+  count: Int!
+}
+
 type Mutation {
   post(url: String!, description: String!): Link!
   signup(email: String!, password: String!, name: String!): AuthPayload
   login(email: String!, password: String!): AuthPayload
   vote(linkId: ID!): Vote
 }
 
-type Subscription {
-  newLink: LinkSubscriptionPayload
-  newVote: VoteSubscriptionPayload
-}
-
-type Feed {
-  links: [Link!]!
-  count: Int!
-}
-
-
 type AuthPayload {
   token: String
   user: User
@@ -32,3 +26,8 @@ type User {
   name: String!
   email: String!
 }
+
+type Subscription {
+  newLink: LinkSubscriptionPayload
+  newVote: VoteSubscriptionPayload
+}