chore(materialize): clean up materialize references

client/actions/adminActions.js

@@ -2,6 +2,8 @@ import axios from 'axios';
 import actionTypes from '../actions/actionTypes';
 import API from './api';
 
+const Materialize = window.Materialize;
+
 
 /**
  * @param {Object} book - book
@@ -71,7 +73,7 @@ export const addBookCategory = category => dispatch => (
       Materialize.toast(response.data.message, 2500, 'teal darken-4');
     })
     .catch(() => {
-      Materialize.toast(`Something went wrong. Ensure you\'re not adding
+      Materialize.toast(`Something went wrong. Ensure you're not adding
         an existing category`, 2500, 'red darken-4'
       );
     })

client/actions/borrowedBooks.js

@@ -2,6 +2,8 @@ import axios from 'axios';
 import actionTypes from '../actions/actionTypes';
 import API from './api';
 
+const Materialize = window.Materialize;
+
 
 /**
  * @param {Array} borrowedBooks - array of books borrowed by user

client/actions/library.js

@@ -3,6 +3,8 @@ import axios from 'axios';
 import actionTypes from '../actions/actionTypes';
 import API from './api';
 
+const Materialize = window.Materialize;
+
 
 /**
  * action creator for getting books

client/actions/viewBook.js

@@ -2,6 +2,7 @@ import axios from 'axios';
 import actionTypes from '../actions/actionTypes';
 import API from './api';
 
+const Materialize = window.Materialize;
 
 /**
  * @param {Object} book - book

client/components/auth/Login.js

@@ -3,11 +3,16 @@ import PropTypes from 'prop-types';
 import { Link, Redirect } from 'react-router-dom';
 import { connect } from 'react-redux';
 import { Row } from 'react-materialize';
+import GoogleLogin from 'react-google-login';
+import FaGoogle from 'react-icons/lib/fa/google';
 
 import Header from '../header/Header';
 import { login } from '../../actions/login';
 import Loading from '../Loading';
 
+
+const Materialize = window.Materialize;
+
 /*
   eslint-disable
  */
@@ -20,6 +25,12 @@ class Login extends Component {
     };
     this.handleLogin = this.handleLogin.bind(this);
     this.handleChange = this.handleChange.bind(this);
+    this.responseGoogle = this.responseGoogle.bind(this);
+  }
+
+  responseGoogle(response) {
+    // const loginProfile = response.getBasicProfile();
+    console.log(response);
   }
 
   handleLogin(event) {
@@ -40,9 +51,8 @@ class Login extends Component {
       }
     )
     .catch((err) => {
-      console.log(err);
       Materialize.toast(
-        'Ouch! Something went awry. It\'s probably our fault',
+        `Ouch! Something went awry. It's probably our fault`,
         2500,
         'red darken-4'
       );
@@ -113,13 +123,36 @@ class Login extends Component {
                               name="submit"
                               value="LOGIN"
                               className="btn waves-effect waves-light"
+                              style={{ width: '100%' }}
                             />
                           </div>
+                          <div className="input-field">
+                            <GoogleLogin
+                              clientId={GOOGLE_CLIENT_ID}
+                              onSuccess={this.responseGoogle}
+                              onFailure={this.responseGoogle}
+                              className="btn red darken-4"
+                              style={{ width: '100%' }}
+                            >
+                              <FaGoogle
+                                style={{
+                                  color: '#032442',
+                                  fontSize: '2rem',
+                                }}
+                              />
+                              <span> Login with Google</span>
+                            </GoogleLogin>
+                          </div>
                           <div>
                             <p className="center">Don&apos;t have an account?
                               <Link to="/signup"> Sign up</Link>
                             </p>
                           </div>
+                          <div>
+                            <p className="center">Forgot password? &nbsp; &nbsp;
+                              <Link to="/forgot-password"> Click here</Link>
+                            </p>
+                          </div>
                         </div>
                       </div>
                     </form>

client/components/auth/SignUp.js

@@ -7,6 +7,9 @@ import Header from '../header/Header';
 import { signUp } from '../../actions/signup';
 import Loading from '../Loading';
 
+const Materialize = window.Materialize;
+
+
 /*
  eslint-disable
  */
@@ -162,6 +165,7 @@ class SignUp extends Component {
                               name="submit"
                               value="Sign Up"
                               className="btn waves-effect waves-light"
+                              style={{ width: '100%' }}
                             />
                           </div>
                           <div className="">

client/components/dashboard/Dashboard.js

@@ -10,6 +10,8 @@ import SuggestedBooks from './SuggestedBooks';
 
 import { fetchBorrowedBooks, returnBook } from '../../actions/borrowedBooks';
 
+const Materialize = window.Materialize;
+
 /*
  eslint-disable
  */
@@ -23,7 +25,7 @@ class Dashboard extends Component {
 
   componentDidMount () {
     if (this.props.user) {
-    this.handleFetchBorrowedBooks();
+      this.handleFetchBorrowedBooks();
     }
   }
 
@@ -41,7 +43,7 @@ class Dashboard extends Component {
   }
 
   readBook (id) {
-
+    // TODO: implement readBook
   }
 
   render() {
@@ -59,7 +61,9 @@ class Dashboard extends Component {
         <main>
           <Row>
             <Col s={12}>
-              <ProfileInfo name={fullname}/>
+              <ProfileInfo
+                name={fullname}
+              />
               <Borrowed
                 borrowedBooks={this.props.borrowedBooks}
                 readBook={this.readBook}

client/components/library/BookDetail.js

@@ -8,6 +8,8 @@ import Header from '../header/Header';
 import { borrowBook, deleteBook } from '../../actions/library';
 import { viewBookDetails } from '../../actions/viewBook';
 
+const Materialize = window.Materialize;
+
 
 /*
 eslint-disable
@@ -20,9 +22,9 @@ class BookDetail extends React.Component {
     this.handleEditClick = this.handleEditClick.bind(this);
     this.handleDelete = this.handleDelete.bind(this);
   }
+
   componentDidMount() {
-    this.props.viewBookDetails(this.props.match.params.id)
-      .catch(err => Materialize.toast())
+    this.props.viewBookDetails(this.props.match.params.id);
   }
 
   handleBorrow() {

client/static/index.scss

@@ -16,7 +16,7 @@ html, body {
 body {
   background-color: $theme-blue;
   color: $white;
-  font: sans-serif;
+  font: 1rem sans-serif;
 }
 
 #sidenav-overlay {
@@ -174,3 +174,7 @@ main {
 .action-btn {
   margin: 5px;
 }
+
+.borrowed-list {
+  font: small-caps 1.3rem sans-serif;
+}

package.json

@@ -15,7 +15,7 @@
     "coverage": "NODE_ENV=test nyc report --reporter=text-lcov | coveralls",
     "seed:tables": "cross-env NODE_ENV=test babel-node server/seeders/user.js && babel-node server/seeders/bookCategory.js && babel-node server/seeders/book.js",
     "seed:join": "cross-env NODE_ENV=test babel-node server/seeders/borrowedBook.js",
-    "build": "rm -rf dist && babel server -d dist/server && webpack --config ./webpack.prod.config.js --progress --colors",
+    "build": "rm -rf dist && babel server -d dist/server && webpack --config ./webpack.prod.config.js --progress --colors && cp client/sw.js dist/client",
     "heroku-postbuild": "npm run build"
   },
   "nyc": {

server/bin/www.js

@@ -2,7 +2,7 @@ import http from 'http';
 
 import app from '../app';
 
-const port = parseInt(process.env.PORT, 10) || 3000;
+const port = parseInt(process.env.PORT, 10) || 5000;
 
 const server = http.createServer(app);
 

server/controllers/users.js

@@ -16,7 +16,7 @@ export default {
    * @method
    * @param  {object} req - express http request object
    * @param  {object} res - express http response object
-   * @return {Undefined}
+   * @return {mixed}      - sends an http response
    */
 
   createUser(req, res) {
@@ -69,7 +69,7 @@ export default {
    * @method
    * @param  {object} req - express http request object
    * @param  {object} res - express http response object
-   * @return {undefined}
+   * @return {mixed}      - sends an http response
    */
   updateUserInfo(req, res) {
     User.findById(req.user.id)
@@ -100,7 +100,7 @@ export default {
    * @method
    * @param  {object} req - express http request object
    * @param  {object} res - express http response object
-   * @return {undefined}
+   * @return {mixed}      - sends an http response
    */
 
   getUser(req, res) {
@@ -151,7 +151,7 @@ export default {
    * @method
    * @param  {object} req - express http request object
    * @param  {object} res - express http response object
-   * @return {undefined}
+   * @return {mixed}      - sends an http rresponse
    */
   getBorrowedBooks(req, res) {
     const id = req.params.id;

webpack.dev.config.js

@@ -2,6 +2,7 @@ const path = require('path');
 const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
+
 const HtmlWebpackPluginConfig = new HtmlWebpackPlugin({
   template: './client/index.html',
   filename: 'index.html',
@@ -12,8 +13,6 @@ const HtmlWebpackPluginConfig = new HtmlWebpackPlugin({
 module.exports = {
   devtool: 'inline-source-map',
   entry: [
-    // reload the page if hot module reloading fails.
-    // 'webpack-hot-middleware/client?reload=true',
     path.resolve(__dirname, 'client/index.js')
   ],
   output: {
@@ -65,5 +64,12 @@ module.exports = {
   plugins: [
     HtmlWebpackPluginConfig,
     new webpack.HotModuleReplacementPlugin(),
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: JSON.stringify('development')
+      },
+      GOOGLE_CLIENT_SECRET: JSON.stringify('VenazYqo1V-41a8pAocf7a9H'),
+      GOOGLE_CLIENT_ID: JSON.stringify('701806023399-vgqondt26qh10vcuei77r7nsbcd8oa8k.apps.googleusercontent.com')
+    })
   ],
 };

webpack.prod.config.js

@@ -66,7 +66,9 @@ module.exports = {
     new webpack.DefinePlugin({
       'process.env': {
         NODE_ENV: JSON.stringify('production')
-      }
+      },
+      GOOGLE_CLIENT_SECRET: JSON.stringify('VenazYqo1V-41a8pAocf7a9H'),
+      GOOGLE_CLIENT_ID: JSON.stringify('701806023399-vgqondt26qh10vcuei77r7nsbcd8oa8k.apps.googleusercontent.com')
     })
   ],
 };