From 2bfe071b384eac10eac8403ffc29cbff3dbdc4f7 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 6 Dec 2018 15:59:36 -0800 Subject: [PATCH] es6-ifies demo app --- demo/Auth/Auth.controller.js | 14 ++++++++------ demo/Auth/Auth.routes.js | 10 +++++----- demo/Page/Page.controller.js | 11 +++++------ demo/Page/Page.model.js | 6 +++--- demo/Page/Page.policy.js | 4 ++-- demo/Page/Page.routes.js | 8 ++++---- demo/User/User.controller.js | 8 +++++--- demo/User/User.model.js | 10 +++++----- demo/User/User.routes.js | 8 ++++---- demo/User/User.validate.js | 6 +++--- demo/app.js | 25 +++++++++++-------------- demo/init.js | 4 +++- 12 files changed, 58 insertions(+), 56 deletions(-) diff --git a/demo/Auth/Auth.controller.js b/demo/Auth/Auth.controller.js index f6053de9ad..2b37ca10fe 100644 --- a/demo/Auth/Auth.controller.js +++ b/demo/Auth/Auth.controller.js @@ -1,10 +1,12 @@ -const User = require('../User/User.model'); -const auth = require('../../src/auth')(User); +import User from '../User/User.model'; +import auth from '../../src/auth'; + +const Auth = auth(User); const authController = { - login: auth.login, - me: auth.me, - check: auth.check + login: Auth.login, + me: Auth.me, + check: Auth.check } -module.exports = authController; +export default authController; diff --git a/demo/Auth/Auth.routes.js b/demo/Auth/Auth.routes.js index 2c2131f12c..6b7d7d26fc 100644 --- a/demo/Auth/Auth.routes.js +++ b/demo/Auth/Auth.routes.js @@ -1,7 +1,7 @@ -const express = require('express'); -const passport = require('passport'); -const authValidate = require('../../src/auth/validate'); -const authCtrl = require('./Auth.controller'); +import express from 'express'; +import passport from 'passport'; +import authValidate from '../../src/auth/validate'; +import authCtrl from './Auth.controller'; const router = new express.Router(); @@ -9,4 +9,4 @@ router .route('/login') .post(authValidate.login, passport.authenticate('local'), authCtrl.login); -module.exports = router; +export default router; diff --git a/demo/Page/Page.controller.js b/demo/Page/Page.controller.js index 8953bb489b..da44738f4a 100644 --- a/demo/Page/Page.controller.js +++ b/demo/Page/Page.controller.js @@ -1,8 +1,7 @@ -const config = require('./Page.config'); -const Page = require('./Page.model'); -const httpStatus = require('http-status'); - -const toKebabCase = string => string.replace(/([a-z])([A-Z])/g, '$1-$2').replace(/\s+/g, '-').toLowerCase(); +import config from './Page.config'; +import Page from './Page.model'; +import httpStatus from 'http-status'; +import toKebabCase from '../../src/lib/helpers/toKebabCase'; const pageController = { query(req, res) { @@ -71,4 +70,4 @@ const pageController = { }, }; -module.exports = pageController; +export default pageController; diff --git a/demo/Page/Page.model.js b/demo/Page/Page.model.js index fef64e2f91..21f547629a 100644 --- a/demo/Page/Page.model.js +++ b/demo/Page/Page.model.js @@ -1,5 +1,5 @@ -const mongoose = require('mongoose'); -const mongooseStringQuery = require('mongoose-string-query'); +import mongoose from 'mongoose'; +import mongooseStringQuery from 'mongoose-string-query'; const PageSchema = new mongoose.Schema({ title: String, @@ -9,4 +9,4 @@ const PageSchema = new mongoose.Schema({ PageSchema.plugin(mongooseStringQuery); -module.exports = mongoose.model('Page', PageSchema); +export default mongoose.model('Page', PageSchema); diff --git a/demo/Page/Page.policy.js b/demo/Page/Page.policy.js index be88cdff4f..15fa5edd56 100644 --- a/demo/Page/Page.policy.js +++ b/demo/Page/Page.policy.js @@ -1,4 +1,4 @@ -const Page = require('./Page.model'); +import Page from './Page.model'; const pagePolicy = { @@ -24,4 +24,4 @@ const pagePolicy = { }, }; -module.exports = pagePolicy; +export default pagePolicy; diff --git a/demo/Page/Page.routes.js b/demo/Page/Page.routes.js index 546ea7df48..55c701b326 100644 --- a/demo/Page/Page.routes.js +++ b/demo/Page/Page.routes.js @@ -1,6 +1,6 @@ -const express = require('express'); -const pageController = require('./Page.controller'); -const pagePolicy = require('./Page.policy'); +import express from 'express'; +import pageController from './Page.controller'; +import pagePolicy from './Page.policy'; const router = express.Router(); // eslint-disable-line new-cap @@ -17,4 +17,4 @@ router -module.exports = router; +export default router; diff --git a/demo/User/User.controller.js b/demo/User/User.controller.js index c51e6ea647..aa797348af 100644 --- a/demo/User/User.controller.js +++ b/demo/User/User.controller.js @@ -1,8 +1,10 @@ -const User = require('./User.model'); -const user = require('../../src/user')(User); +import User from './User.model'; +import payloadUser from '../../src/user'; + +const user = payloadUser(User); const userController = { post: user.post, }; -module.exports = userController; +export default userController; diff --git a/demo/User/User.model.js b/demo/User/User.model.js index 9ec0a7c993..abe0503d6b 100644 --- a/demo/User/User.model.js +++ b/demo/User/User.model.js @@ -1,7 +1,7 @@ -const mongoose = require('mongoose'); -const httpStatus = require('http-status'); -const passportLocalMongoose = require('passport-local-mongoose'); -const APIError = require('../../src/lib/helpers/APIError'); +import mongoose from 'mongoose'; +import httpStatus from 'http-status'; +import passportLocalMongoose from 'passport-local-mongoose'; +import APIError from '../../src/lib/helpers/APIError'; /** * User Schema @@ -66,4 +66,4 @@ UserSchema.plugin(passportLocalMongoose, { usernameField: 'email' }); /** * @typedef User */ -module.exports = mongoose.model('User', UserSchema); +export default mongoose.model('User', UserSchema); diff --git a/demo/User/User.routes.js b/demo/User/User.routes.js index 43067037f5..e025dc8691 100644 --- a/demo/User/User.routes.js +++ b/demo/User/User.routes.js @@ -1,6 +1,6 @@ -const express = require('express'); -const userController = require('./User.controller'); -const userValidate = require('./User.validate'); +import express from 'express'; +import userController from './User.controller'; +import userValidate from './User.validate'; const router = express.Router(); // eslint-disable-line new-cap @@ -8,4 +8,4 @@ router .route('') // TODO: not sure how to incorporate url params like `:pageId` .post(userValidate.post, userController.post); -module.exports = router; +export default router; diff --git a/demo/User/User.validate.js b/demo/User/User.validate.js index 69fcf62bbc..be2a17d80d 100644 --- a/demo/User/User.validate.js +++ b/demo/User/User.validate.js @@ -1,7 +1,7 @@ -const validate = require('express-validation'); -const Joi = require('joi'); +import validate from 'express-validation'; +import Joi from 'joi'; -module.exports = { +export default { post: validate({ body: { email: Joi.string().email().required(), diff --git a/demo/app.js b/demo/app.js index efa790b770..ce41baa681 100644 --- a/demo/app.js +++ b/demo/app.js @@ -1,9 +1,15 @@ -const express = require('express'); -const payload = require('../src'); -const User = require('./User/User.model'); -const payloadConfig = require('./payload.config'); +import express from 'express'; +import payload from '../src'; +import User from './User/User.model'; +import payloadConfig from './payload.config'; + +import authRoutes from './Auth/Auth.routes'; +import userRoutes from './User/User.routes'; +import pageRoutes from './Page/Page.routes'; + const router = express.Router({}); // eslint-disable-line new-cap -const app = module.exports = express(); + +export const app = express(); payload.init({ config: payloadConfig, @@ -12,19 +18,10 @@ payload.init({ router: router }); -const authRoutes = require('./Auth/Auth.routes'); router.use('', authRoutes); - -const userRoutes = require('./User/User.routes'); router.use('/users', userRoutes); - -const pageRoutes = require('./Page/Page.routes'); router.use('/pages', pageRoutes); -// Not scaffolded, but this is how it works -// const orderRoutes = require('./Order/Order.routes'); -// router.use('/orders', orderRoutes); - app.listen(payloadConfig.port, () => { console.log(`listening on ${payloadConfig.port}...`); }); diff --git a/demo/init.js b/demo/init.js index b09073e899..b703b647a6 100644 --- a/demo/init.js +++ b/demo/init.js @@ -1,3 +1,5 @@ -require("@babel/register"); +require('@babel/register')({ + ignore: [ /(node_modules)/ ] +}); require('./app');