Skip to content

Commit 331b191

Browse files
committed
up to chapter 5-end
1 parent 05dceab commit 331b191

38 files changed

+3854
-40580
lines changed

book/4-end/server/google.js

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,16 @@ function auth({ ROOT_URL, server }) {
2929
console.log(err); // eslint-disable-line
3030
}
3131
};
32-
passport.use(new Strategy(
33-
{
34-
clientID: process.env.Google_clientID,
35-
clientSecret: process.env.Google_clientSecret,
36-
callbackURL: `${ROOT_URL}/oauth2callback`,
37-
},
38-
verify,
39-
));
32+
passport.use(
33+
new Strategy(
34+
{
35+
clientID: process.env.Google_clientID,
36+
clientSecret: process.env.Google_clientSecret,
37+
callbackURL: `${ROOT_URL}/oauth2callback`,
38+
},
39+
verify,
40+
),
41+
);
4042

4143
passport.serializeUser((user, done) => {
4244
done(null, user.id);
@@ -51,10 +53,13 @@ function auth({ ROOT_URL, server }) {
5153
server.use(passport.initialize());
5254
server.use(passport.session());
5355

54-
server.get('/auth/google', passport.authenticate('google', {
55-
scope: ['profile', 'email'],
56-
prompt: 'select_account',
57-
}));
56+
server.get(
57+
'/auth/google',
58+
passport.authenticate('google', {
59+
scope: ['profile', 'email'],
60+
prompt: 'select_account',
61+
}),
62+
);
5863

5964
server.get(
6065
'/oauth2callback',

book/4-end/server/models/EmailTemplate.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@ function insertTemplates() {
4545
return;
4646
}
4747

48-
EmailTemplate
49-
.create(template)
50-
.catch((error) => {
51-
logger.error('EmailTemplate insertion error:', error);
52-
});
48+
EmailTemplate.create(template).catch((error) => {
49+
logger.error('EmailTemplate insertion error:', error);
50+
});
5351
});
5452
}
5553

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ class UserClass {
5555
return ['id', 'displayName', 'email', 'avatarUrl', 'slug', 'isAdmin', 'isGithubConnected'];
5656
}
5757

58-
static async signInOrSignUp({
59-
googleId, email, googleToken, displayName, avatarUrl,
60-
}) {
58+
static async signInOrSignUp({ googleId, email, googleToken, displayName, avatarUrl }) {
6159
const user = await this.findOne({ googleId }).select(UserClass.publicFields().join(' '));
6260

6361
if (user) {

book/5-end/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@
55
"scripts": {
66
"build": "next build",
77
"start": "next start",
8-
"dev": "nodemon server/app.js --watch server --exec babel-node --presets=@babel/preset-env",
8+
"dev": "nodemon server/app.js --watch server",
99
"lint": "eslint components pages lib server",
1010
"test": "jest --coverage"
1111
},
1212
"jest": {
1313
"coverageDirectory": "./.coverage"
1414
},
1515
"dependencies": {
16-
"@babel/core": "^7.0.0-beta.51",
17-
"@babel/node": "^7.0.0-beta.51",
18-
"@babel/preset-env": "^7.0.0-beta.51",
1916
"@material-ui/core": "^3.3.1",
2017
"aws-sdk": "^2.342.0",
2118
"connect-mongo": "^2.0.1",

book/5-end/server/api/admin.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import express from 'express';
2-
3-
import Book from '../models/Book';
4-
import logger from '../logs';
1+
const express = require('express');
2+
const Book = require('../models/Book');
3+
const logger = require('../logs');
54

65
const router = express.Router();
76

@@ -51,4 +50,4 @@ router.get('/books/detail/:slug', async (req, res) => {
5150
}
5251
});
5352

54-
export default router;
53+
module.exports = router;

book/5-end/server/api/customer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import express from 'express';
1+
const express = require('express');
22

33
const router = express.Router();
44

@@ -15,4 +15,4 @@ router.use((req, res, next) => {
1515
// 1. /buy-book
1616
// 2. /my-books
1717

18-
export default router;
18+
module.exports = router;

book/5-end/server/api/index.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
import publicApi from './public';
2-
import customerApi from './customer';
3-
import adminApi from './admin';
1+
const publicApi = require('./public');
2+
const customerApi = require('./customer');
3+
const adminApi = require('./admin');
44

5-
export default function api(server) {
5+
function api(server) {
66
server.use('/api/v1/public', publicApi);
77
server.use('/api/v1/customer', customerApi);
88
server.use('/api/v1/admin', adminApi);
99
}
10+
11+
module.exports = api;

book/5-end/server/api/public.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
import express from 'express';
2-
3-
import Book from '../models/Book';
4-
import Chapter from '../models/Chapter';
5-
// import User from '../models/User';
1+
const express = require('express');
2+
const Book = require('../models/Book');
3+
const Chapter = require('../models/Chapter');
64

75
const router = express.Router();
86

@@ -39,4 +37,4 @@ router.get('/get-chapter-detail', async (req, res) => {
3937
}
4038
});
4139

42-
export default router;
40+
module.exports = router;

book/5-end/server/app.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import express from 'express';
2-
import session from 'express-session';
3-
import mongoSessionStore from 'connect-mongo';
4-
import next from 'next';
5-
import mongoose from 'mongoose';
6-
7-
import auth from './google';
8-
import api from './api';
9-
10-
import logger from './logs';
1+
const express = require('express');
2+
const session = require('express-session');
3+
const mongoSessionStore = require('connect-mongo');
4+
const next = require('next');
5+
const mongoose = require('mongoose');
6+
7+
const auth = require('./google');
8+
const api = require('./api');
9+
const logger = require('./logs');
1110

1211
require('dotenv').config();
1312

book/5-end/server/aws.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import aws from 'aws-sdk';
1+
const aws = require('aws-sdk');
22

3-
export default function sendEmail(options) {
3+
function sendEmail(options) {
44
aws.config.update({
55
region: process.env.Amazon_region,
66
accessKeyId: process.env.Amazon_accessKeyId,
@@ -39,3 +39,6 @@ export default function sendEmail(options) {
3939
);
4040
});
4141
}
42+
43+
module.exports = sendEmail;
44+

0 commit comments

Comments
 (0)