Merge from upstream and resolve conflicts

Author: YuriGor

book/2-end/package.json

@@ -7,12 +7,9 @@
     "start": "next start",
     "dev": "next",
     "lint": "eslint components pages lib server",
-    "dev-express": "nodemon server/app.js --watch server --exec babel-node --presets=@babel/preset-env"
+    "dev-express": "nodemon server/app.js --watch server"
   },
   "dependencies": {
-    "@babel/core": "^7.1.2",
-    "@babel/node": "^7.0.0",
-    "@babel/preset-env": "^7.1.0",
     "@material-ui/core": "^3.3.1",
     "connect-mongo": "^2.0.1",
     "dotenv": "^6.1.0",

book/2-end/server/app.js

@@ -1,16 +1,14 @@
-import dotenv from 'dotenv';
+const express = require('express');
+const next = require('next');
 
-import express from 'express';
-import next from 'next';
+const mongoose = require('mongoose');
 
-import mongoose from 'mongoose';
+const session = require('express-session');
+const mongoSessionStore = require('connect-mongo');
 
-import session from 'express-session';
-import mongoSessionStore from 'connect-mongo';
+const User = require('./models/User');
 
-import User from './models/User';
-
-dotenv.config();
+require('dotenv').config();
 
 const dev = process.env.NODE_ENV !== 'production';
 const MONGO_URL = process.env.MONGO_URL_TEST;

book/2-end/server/models/User.js

@@ -1,4 +1,4 @@
-import mongoose from 'mongoose';
+const mongoose = require('mongoose');
 
 const { Schema } = mongoose;
 
@@ -46,4 +46,4 @@ const mongoSchema = new Schema({
 
 const User = mongoose.model('User', mongoSchema);
 
-export default User;
+module.exports = User;

book/2-end/yarn.lock

@@ -9,9 +9,6 @@
     "lint": "eslint components pages lib"
   },
   "dependencies": {
-    "@babel/core": "^7.1.2",
-    "@babel/node": "^7.0.0",
-    "@babel/preset-env": "^7.1.0",
     "@material-ui/core": "^3.3.1",
     "connect-mongo": "^2.0.1",
     "dotenv": "^6.1.0",

book/2-start/package.json

@@ -5,13 +5,10 @@
   "scripts": {
     "build": "next build",
     "start": "next start",
-    "dev": "nodemon server/app.js --watch server --exec babel-node --presets=@babel/preset-env",
+    "dev": "nodemon server/app.js --watch server",
     "lint": "eslint components pages lib server"
   },
   "dependencies": {
-    "@babel/core": "^7.1.2",
-    "@babel/node": "^7.0.0",
-    "@babel/preset-env": "^7.1.0",
     "@material-ui/core": "^3.3.1",
     "connect-mongo": "^2.0.1",
     "dotenv": "^6.1.0",

book/2-start/yarn.lock

@@ -1,10 +1,10 @@
-import express from 'express';
-import session from 'express-session';
-import mongoSessionStore from 'connect-mongo';
-import next from 'next';
-import mongoose from 'mongoose';
+const express = require('express');
+const session = require('express-session');
+const mongoSessionStore = require('connect-mongo');
+const next = require('next');
+const mongoose = require('mongoose');
 
-import auth from './google';
+const auth = require('./google');
 
 require('dotenv').config();
 

book/3-end/package.json

@@ -1,9 +1,8 @@
-import passport from 'passport';
-import { OAuth2Strategy as Strategy } from 'passport-google-oauth';
+const passport = require('passport');
+const Strategy = require('passport-google-oauth').OAuth2Strategy;
+const User = require('./models/User');
 
-import User from './models/User';
-
-export default function auth({ ROOT_URL, server }) {
+function auth({ ROOT_URL, server }) {
   const verify = async (accessToken, refreshToken, profile, verified) => {
     let email;
     let avatarUrl;
@@ -30,14 +29,16 @@ export default function auth({ ROOT_URL, server }) {
       console.log(err); // eslint-disable-line
     }
   };
-  passport.use(new Strategy(
-    {
-      clientID: process.env.Google_clientID,
-      clientSecret: process.env.Google_clientSecret,
-      callbackURL: `${ROOT_URL}/oauth2callback`,
-    },
-    verify,
-  ));
+  passport.use(
+    new Strategy(
+      {
+        clientID: process.env.Google_clientID,
+        clientSecret: process.env.Google_clientSecret,
+        callbackURL: `${ROOT_URL}/oauth2callback`,
+      },
+      verify,
+    ),
+  );
 
   passport.serializeUser((user, done) => {
     done(null, user.id);
@@ -52,10 +53,13 @@ export default function auth({ ROOT_URL, server }) {
   server.use(passport.initialize());
   server.use(passport.session());
 
-  server.get('/auth/google', passport.authenticate('google', {
-    scope: ['profile', 'email'],
-    prompt: 'select_account',
-  }));
+  server.get(
+    '/auth/google',
+    passport.authenticate('google', {
+      scope: ['profile', 'email'],
+      prompt: 'select_account',
+    }),
+  );
 
   server.get(
     '/oauth2callback',
@@ -72,3 +76,5 @@ export default function auth({ ROOT_URL, server }) {
     res.redirect('/login');
   });
 }
+
+module.exports = auth;

book/3-end/server/app.js

@@ -1,7 +1,6 @@
-import mongoose from 'mongoose';
-import _ from 'lodash';
-
-import generateSlug from '../utils/slugify';
+const mongoose = require('mongoose');
+const _ = require('lodash');
+const generateSlug = require('../utils/slugify');
 
 const { Schema } = mongoose;
 
@@ -57,14 +56,12 @@ class UserClass {
     return ['id', 'displayName', 'email', 'avatarUrl', 'slug', 'isAdmin', 'isGithubConnected'];
   }
 
-  static async signInOrSignUp({
-    googleId, email, googleToken, displayName, avatarUrl,
-  }) {
+  static async signInOrSignUp({ googleId, email, googleToken, displayName, avatarUrl }) {
     const user = await this.findOne({ googleId }).select(UserClass.publicFields().join(' '));
 
     if (user) {
       const modifier = {};
-      
+
       if (googleToken.accessToken) {
         modifier.access_token = googleToken.accessToken;
       }
@@ -104,4 +101,4 @@ mongoSchema.loadClass(UserClass);
 
 const User = mongoose.model('User', mongoSchema);
 
-export default User;
+module.exports = User;