Merge branch 'master' into master

Author: nikolasburk

.gitignore

@@ -2,7 +2,7 @@
 
 # dependencies
 node_modules
-.graphcoolrd
+.graphcoolrc
 
 # testing
 /coverage

README.md

@@ -8,38 +8,73 @@ 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. Create GraphQL API with [`graphcool`](https://www.npmjs.com/package/graphcool)
-
-If you haven't already, install the Graphcool CLI:
+### 2. Deploy the Prisma database service
 
 ```sh
-# Install Graphcool CLI
-npm install -g graphcool
+cd react-apollo/server
+yarn prisma deploy
+```
+
+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
+
+From the output of the previous command, copy the `HTTP` endpoint and paste it into `server/src/index.js` where it's used to instantiate the `Prisma` binding. You need to replace the current placeholder `__PRISMA_ENDPOINT`:
+
+```js
+const server = new GraphQLServer({
+  typeDefs: './src/schema.graphql',
+  resolvers,
+  context: req => ({
+    ...req,
+    db: new Prisma({
+      typeDefs: 'src/generated/prisma.graphql',
+      endpoint: '__PRISMA_ENDPOINT__',
+      secret: 'mysecret123',
+    }),
+  }),
+})
+```
+
+For example:
+
+```js
+const server = new GraphQLServer({
+  typeDefs: './src/schema.graphql',
+  resolvers,
+  context: req => ({
+    ...req,
+    db: new Prisma({
+      typeDefs: 'src/generated/prisma.graphql',
+      endpoint: 'https://eu1.prisma.sh/public-hillcloak-flier-942261/hackernews-graphql-js/dev',
+      secret: 'mysecret123',
+    }),
+  }),
+})
 ```
 
-Once it's installed, you can deploy the Graphcool service based on the existing definition inside the [`server`](./server) directory:
+Note that the part `public-hillcloak-flier-952361` of the URL is unique to your service.
+
+### 4. Start the server
+
+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
-cd server
 yarn install
-graphcool deploy
+yarn start
 ```
 
-When prompted which cluster you want to deploy to, choose any of the **Shared Clusters** options (`shared-eu-west-1`, `shared-ap-northeast-1` or `shared-us-west-2`).
+> **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`.
 
-### 3. Connect the app with your GraphQL API
+### 5. Run the app
 
-Paste the service ID (which you find in the generated `.graphcoolrc` file inside the `server` directory or by running `graphcool info`) into `./src/index.js` replacing the current placeholder `__SERVICE_ID__`. 
-
-### 4. Install dependencies & run locally
+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
-cd ..
 yarn install
-yarn start # open http://localhost:3000 in your browser
+yarn start
 ```
 
-
+You can now open your browser and use the app on `http://localhost:3000`.

package.json

@@ -3,17 +3,19 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "apollo-client-preset": "^1.0.1",
-    "apollo-link-ws": "^1.0.0",
-    "graphql": "^0.11.7",
-    "graphql-tag": "^2.5.0",
-    "react": "^16.0.0",
-    "react-apollo": "^2.0.0",
-    "react-dom": "^16.0.0",
+    "apollo-client": "^2.2.0",
+    "apollo-client-preset": "^1.0.6",
+    "apollo-link": "^1.0.7",
+    "apollo-link-ws": "^1.0.4",
+    "graphql": "^0.12.3",
+    "graphql-tag": "^2.6.1",
+    "react": "^16.2.0",
+    "react-apollo": "^2.0.4",
+    "react-dom": "^16.2.0",
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
     "react-scripts": "1.0.17",
-    "subscriptions-transport-ws": "^0.9.4"
+    "subscriptions-transport-ws": "^0.9.5"
   },
   "scripts": {
     "start": "react-scripts start",

server/.graphqlconfig.yml

@@ -0,0 +1,10 @@
+projects:
+  app:
+    schemaPath: "src/schema.graphql"
+    extensions:
+      endpoints:
+        default: "http://localhost:4000"
+  database:
+    schemaPath: "src/generated/prisma.graphql"
+    extensions:
+      prisma: database/prisma.yml

server/database/datamodel.graphql

@@ -0,0 +1,23 @@
+type Vote {
+  id: ID! @unique
+  link: Link!  
+  user: User!
+}
+
+type Link {
+  id: ID! @unique
+  createdAt: DateTime!
+  description: String!
+  url: String!
+  postedBy: User
+  votes: [Vote!]!
+}
+
+type User {
+  id: ID! @unique
+  name: String!
+  email: String! @unique
+  password: String!
+  links: [Link!]!
+  votes: [Vote!]!
+}

server/database/prisma.yml

@@ -0,0 +1,14 @@
+# the name for the service (will be part of the service's HTTP endpoint)
+service: hackernews-graphql-js
+
+# the cluster and stage the service is deployed to
+stage: dev
+
+# to disable authentication:
+# disableAuth: true
+secret: mysecret123
+
+# the file path pointing to your data model
+datamodel: datamodel.graphql
+
+cluster: nikolas/prisma-eu1

server/graphcool.yml

@@ -1,13 +1,19 @@
 {
-  "name": "server",
-  "version": "1.0.0",
-  "description": "My Graphcool Service",
+  "name": "hackernews-graphql-js",
+  "scripts": {
+    "start": "node src/index.js",
+    "dev": "npm-run-all --parallel start playground",
+    "playground": "graphql playground",
+    "prisma": "prisma"
+  },
   "dependencies": {
-    "@types/bcryptjs": "^2.4.1",
-    "@types/validator": "^6.3.0",
     "bcryptjs": "^2.4.3",
-    "graphcool-lib": "^0.1.0",
-    "graphql-request": "^1.4.0",
-    "validator": "^9.0.0"
+    "graphql-yoga": "1.3.2",
+    "prisma-binding": "1.5.10"
+  },
+  "devDependencies": {
+    "graphql-cli": "2.14.1",
+    "npm-run-all": "4.1.2",
+    "prisma": "1.2.2"
   }
-}
+}