Fix warnings from cra, add dotenv, use mlab

elevenpassin · Jan 8, 2018 · 80fd0a9 · 80fd0a9
1 parent 40a657d
commit 80fd0a9
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@ yarn.lock
 
 # misc
 .DS_Store
+.env
 .env.local
 .env.development.local
 .env.test.local

diff --git a/app.js b/app.js
@@ -1,3 +1,4 @@
+require('dotenv').config();
 const { find, filter, truncate } = require('lodash');
 const express = require('express');
 const mongoose = require('mongoose');
@@ -9,7 +10,7 @@ const { makeExecutableSchema } = require('graphql-tools');
 
 const typeDefs = require('./typeDefs.gql');
 
-const CONNECTION_URL = 'mongodb://localhost:27017/blog';
+const CONNECTION_URL = `mongodb://${process.env.dbuser}:${process.env.dbpassword}@${process.env.dbhost}:46377/graphblog`;
 
 mongoose.connect(CONNECTION_URL, {
   useMongoClient: true
@@ -46,7 +47,9 @@ const resolvers = {
     addPost: async (_, { title, userid, content }) => {
       const newPost = new Post({ title, userid, content })
       return newPost.save((err, post) => {
-        if (err) return console.error(err);
+        if (err) {
+          console.error(err);
+        }
         return post;
       })
     },
@@ -91,11 +94,11 @@ app.use('/graphql', bodyParser.json(), graphqlExpress({ schema }));
 
 app.use('/graphiql', graphiqlExpress({ endpointURL: '/graphql' }));
 
-app.listen(3001, () => {
+app.listen(3003, () => {
   console.log(`
     =====
-    Server running at http://localhost:3001/
-    GraphiQL running at http://localhost:3001/graphiql/
+    Server running at http://localhost:3003/
+    GraphiQL running at http://localhost:3003/graphiql/
     =====
   `)
 });

diff --git a/client/package.json b/client/package.json
@@ -14,10 +14,10 @@
     "react-scripts": "1.0.17"
   },
   "scripts": {
-    "start": "react-scripts start",
+    "start": "set PORT=3002 && react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
   },
-  "proxy": "http://localhost:3001/"
+  "proxy": "http://localhost:3003/"
 }
diff --git a/client/src/App.js b/client/src/App.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import 'antd/dist/antd.css';
 import logo from './logo.svg';
 import './App.css';

diff --git a/client/src/components/BlogpostContainer.jsx b/client/src/components/BlogpostContainer.jsx
@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import { graphql } from 'react-apollo';
 import gql from 'graphql-tag';
-import { Alert, Card } from 'antd';
 
 import Blogpost from './Blogpost.jsx';
 

diff --git a/client/src/components/Navbar.jsx b/client/src/components/Navbar.jsx
@@ -7,7 +7,7 @@ import {
 } from 'react-router-dom';
 
 const SubMenu = Menu.SubMenu;
-const MenuItemGroup = Menu.ItemGroup;
+
 
 export default class Navbar extends Component {
 

diff --git a/client/src/components/ShortBlogpost.jsx b/client/src/components/ShortBlogpost.jsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import { List, Row, Button, Icon, Col } from 'antd';
 const Item = List.Item;
 
@@ -19,7 +19,7 @@ export default ({ item }) => (
   </Col>)]}>
     <Row>
       <Item.Meta
-        title={<a href="#">{item.title}</a>}
+        title={<a href="/">{item.title}</a>}
         description={item.truncatedcontent}
       />
     </Row>

diff --git a/client/src/pages/Dashboard.jsx b/client/src/pages/Dashboard.jsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Card, Icon, Button, Col, Row, List } from 'antd';
+import { Col, Row } from 'antd';
 
 import ShortBlogpostContainer from '../components/ShortBlogpostContainer.jsx';
 

diff --git a/client/src/pages/Signin.jsx b/client/src/pages/Signin.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Form, Icon, Input, Button, Checkbox, Row, Col } from 'antd';
+import { Form, Icon, Input, Button } from 'antd';
 const FormItem = Form.Item;
 
 class NormalLoginForm extends React.Component {

diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
   "dependencies": {
     "apollo-server-express": "^1.3.2",
     "body-parser": "^1.18.2",
+    "dotenv": "^4.0.0",
     "express": "^4.16.2",
     "graphql": "^0.12.3",
     "graphql-tools": "^2.14.1",