Skip to content

Commit

Permalink
Added CRNA Frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
myhendry committed May 6, 2018
1 parent 776dce0 commit ed6ad6a
Show file tree
Hide file tree
Showing 10 changed files with 11,220 additions and 21 deletions.
Binary file added .DS_Store
Binary file not shown.
11,154 changes: 11,154 additions & 0 deletions client/package-lock.json

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"apollo-boost": "^0.1.6",
"graphql": "^0.13.2",
"graphql-tag": "^2.9.2",
"react": "^16.3.2",
"react-apollo": "^2.1.4",
"react-dom": "^16.3.2",
"react-scripts": "1.1.4"
},
Expand All @@ -13,4 +17,4 @@
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
}
}
}
15 changes: 11 additions & 4 deletions client/src/App.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
import React, { Component } from 'react';
import logo from './logo.svg';
import './App.css';
import React, { Component } from "react";
import { compose, graphql } from "react-apollo";

import { GET_TWEETS } from "./graphql/queries";
import logo from "./logo.svg";
import "./App.css";

class App extends Component {
render() {
console.log(this.props);
const { loading, data: { getTweets } } = this.props;
console.log(getTweets);
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<h1 className="App-title">Welcome to React</h1>
<h2>hey there!</h2>
</header>
<p className="App-intro">
To get started, edit <code>src/App.js</code> and save to reload.
Expand All @@ -18,4 +25,4 @@ class App extends Component {
}
}

export default App;
export default compose(graphql(GET_TWEETS))(App);
11 changes: 11 additions & 0 deletions client/src/graphql/queries.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { gql } from "apollo-boost";

export const GET_TWEETS = gql`
{
getTweets {
text
_id
createdAt
}
}
`;
24 changes: 18 additions & 6 deletions client/src/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
import registerServiceWorker from './registerServiceWorker';
import React from "react";
import ReactDOM from "react-dom";
import ApolloClient from "apollo-boost";
import { ApolloProvider } from "react-apollo";

ReactDOM.render(<App />, document.getElementById('root'));
import "./index.css";
import App from "./App";
import registerServiceWorker from "./registerServiceWorker";

const client = new ApolloClient({
uri: "http://localhost:5000/graphql"
});

ReactDOM.render(
<ApolloProvider client={client}>
<App />
</ApolloProvider>,
document.getElementById("root")
);
registerServiceWorker();
9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
{
"private": true,
"main": "./src/server.js",
"main": "./src/index.js",
"scripts": {
"start": "babel-node ./src/server.js",
"start": "babel-node ./src/index.js",
"client": "npm run start --prefix client",
"server":
"cross-env NODE_ENV=dev nodemon --exec babel-node ./src/server.js",
"server": "cross-env NODE_ENV=dev nodemon --exec babel-node ./src/index.js",
"dev": "concurrently \"npm run server\" \"npm run client\"",
"prettier":
"prettier --single-quote --print-width 80 --trailing-comma all --write 'src/**/*.js'"
"prettier": "prettier --single-quote --print-width 80 --trailing-comma all --write 'src/**/*.js'"
},
"dependencies": {
"apollo-engine": "^1.0.1",
"apollo-server-express": "1.3.2",
"bcrypt-nodejs": "0.0.3",
"body-parser": "^1.17.1",
"concurrently": "^3.5.1",
"cors": "^2.8.4",
"cross-env": "^5.1.4",
"dotenv": "^5.0.1",
"express": "^4.15.2",
Expand Down
5 changes: 3 additions & 2 deletions src/graphql/resolvers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ const resolveFilms = person => {
export const resolvers = {
Date: GraphQLDate,
Query: {
getTweets: async (root, args, { user }) => {
getTweets: async (root, args, { user, secrets }) => {
try {
await requireAuth(user);
// console.log("USER", user);
// console.log("secrets", secrets);
// await requireAuth(user);
const tweets = Tweet.find({}).sort({ createdAt: -1 });
return tweets;
} catch (error) {
Expand Down
6 changes: 4 additions & 2 deletions src/server.js → src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { graphqlExpress, graphiqlExpress } from "apollo-server-express";
import bodyParser from "body-parser";
import { ApolloEngine } from "apollo-engine";
import { makeExecutableSchema } from "graphql-tools";
import cors from "cors";

import "./config/db";
import constants from "../src/config/constants";
Expand All @@ -12,6 +13,7 @@ import middlewares from "../src/config/middlewares";

const app = express();

app.use(cors());
middlewares(app);

require("dotenv").config();
Expand Down Expand Up @@ -53,7 +55,7 @@ app.post(
const gql = String.raw;

// Using Route Handlers
app.get("/thank", (req, res) => {
app.get("/thanks", (req, res) => {
res.send({ greeting: "Hey friend!" });
});

Expand Down Expand Up @@ -110,7 +112,7 @@ const engine = new ApolloEngine({
}
});

// Start the app
// // Start the app
engine.listen(
{
port: constants.PORT,
Expand Down

0 comments on commit ed6ad6a

Please sign in to comment.