flattens /src and moves Auth, User into /demo

components.js

@@ -1,30 +1,30 @@
-export { default as App } from './src/client/components/App';
+export { default as App } from './src/components/App';
-export { default as Button } from './src/client/components/controls/Button';
+export { default as Button } from './src/components/controls/Button';
-export { default as MeasureWindow } from './src/client/components/utilities/MeasureWindow';
+export { default as MeasureWindow } from './src/components/utilities/MeasureWindow';
-export { default as MeasureScroll } from './src/client/components/utilities/MeasureScroll';
+export { default as MeasureScroll } from './src/components/utilities/MeasureScroll';
-export { default as LoadContent } from './src/client/components/utilities/LoadContent';
+export { default as LoadContent } from './src/components/utilities/LoadContent';
-export { default as Dashboard } from './src/client/components/views/Dashboard';
+export { default as Dashboard } from './src/components/views/Dashboard';
-export { default as CollectionRoutes } from './src/client/components/routes/Collections';
+export { default as CollectionRoutes } from './src/components/routes/Collections';
-export { default as DefaultTemplate } from './src/client/components/layout/DefaultTemplate';
+export { default as DefaultTemplate } from './src/components/layout/DefaultTemplate';
-export { default as Login } from './src/client/components/views/Login';
+export { default as Login } from './src/components/views/Login';
-export { default as AddView } from './src/client/components/views/collections/Add';
+export { default as AddView } from './src/components/views/collections/Add';
-export { default as ArchiveView } from './src/client/components/views/collections/Archive';
+export { default as ArchiveView } from './src/components/views/collections/Archive';
-export { default as HeadingButton } from './src/client/components/modules/HeadingButton';
+export { default as HeadingButton } from './src/components/modules/HeadingButton';
-export { default as Filter } from './src/client/components/modules/Filter';
+export { default as Filter } from './src/components/modules/Filter';
-export { default as EditView } from './src/client/components/views/collections/Edit';
+export { default as EditView } from './src/components/views/collections/Edit';
-export { default as StickOnScroll } from './src/client/components/layout/StickOnScroll';
+export { default as StickOnScroll } from './src/components/layout/StickOnScroll';
-export { default as APIUrl } from './src/client/components/modules/APIUrl';
+export { default as APIUrl } from './src/components/modules/APIUrl';
-export { default as Form, FormContext } from './src/client/components/forms/Form';
+export { default as Form, FormContext } from './src/components/forms/Form';
-export { default as FormSubmit } from './src/client/components/forms/Submit';
+export { default as FormSubmit } from './src/components/forms/Submit';
-export { default as Group } from './src/client/components/field-types/Group';
+export { default as Group } from './src/components/field-types/Group';
-export { default as Input } from './src/client/components/field-types/Input';
+export { default as Input } from './src/components/field-types/Input';
-export { default as Textarea } from './src/client/components/field-types/Textarea';
+export { default as Textarea } from './src/components/field-types/Textarea';
-export { default as PayloadIcon } from './src/client/components/graphics/PayloadIcon';
+export { default as PayloadIcon } from './src/components/graphics/PayloadIcon';
-export { default as PayloadLogo } from './src/client/components/graphics/PayloadLogo';
+export { default as PayloadLogo } from './src/components/graphics/PayloadLogo';
-export { default as Tooltip } from './src/client/components/modules/Tooltip';
+export { default as Tooltip } from './src/components/modules/Tooltip';
-export { default as Sidebar } from './src/client/components/layout/Sidebar';
+export { default as Sidebar } from './src/components/layout/Sidebar';
-export { default as StepNav } from './src/client/components/modules/StepNav';
+export { default as StepNav } from './src/components/modules/StepNav';
-export { default as Arrow } from './src/client/components/graphics/Arrow';
+export { default as Arrow } from './src/components/graphics/Arrow';
-export { default as Label } from './src/client/components/type/Label';
+export { default as Label } from './src/components/type/Label';
-export { default as SetStepNav } from './src/client/components/utilities/SetStepNav';
+export { default as SetStepNav } from './src/components/utilities/SetStepNav';
-export { default as ContentBlock } from './src/client/components/layout/ContentBlock';
+export { default as ContentBlock } from './src/components/layout/ContentBlock';

demo/Auth/Auth.controller.js

@@ -1,7 +1,7 @@
-import httpStatus from 'http-status';
+const httpStatus = require('http-status');
-import passport from 'passport';
+const passport = require('passport');
-import APIError from '../helpers/APIError';
+const APIError = require('../../dist/lib/helpers/APIError');
-import User from '../models/user.model';
+const User = require('../User/User.model');
 
 /**
  * Returns passport login response (cookie) when valid username and password is provided
@@ -65,4 +65,9 @@ function checkAuth(req, res, next) {
   next();
 }
 
-export default { login, register, me, checkAuth };
+module.exports = {
+  login,
+  register,
+  me,
+  checkAuth
+};

demo/Auth/Auth.routes.js

@@ -1,8 +1,8 @@
-import express from 'express';
+const express = require('express');
-import validate from 'express-validation';
+const validate = require('express-validation');
-import passport from 'passport';
+const passport = require('passport');
-import paramValidation from './auth.validations';
+const paramValidation = require('./Auth.validations');
-import authCtrl from '../../controllers/auth.controller';
+const authCtrl = require('./Auth.controller');
 
 const router = express.Router(); // eslint-disable-line new-cap
 

demo/Auth/Auth.validations.js

@@ -1,6 +1,6 @@
-import Joi from 'joi';
+const Joi = require('joi');
 
-export default {
+module.exports = {
   // POST /auth/register
   register: {
     body: {

demo/User/User.model.js

@@ -1,7 +1,7 @@
-import mongoose from 'mongoose';
+const mongoose = require('mongoose');
-import httpStatus from 'http-status';
+const httpStatus = require('http-status');
-import passportLocalMongoose from 'passport-local-mongoose';
+const passportLocalMongoose = require('passport-local-mongoose');
-import APIError from '../helpers/APIError';
+const APIError = require('../../dist/lib/helpers/APIError');
 
 /**
  * User Schema
@@ -67,4 +67,4 @@ UserSchema.plugin(passportLocalMongoose, { usernameField: 'email' });
 /**
  * @typedef User
  */
-export default mongoose.model('User', UserSchema);
+module.exports = mongoose.model('User', UserSchema);

demo/app.js

@@ -13,9 +13,16 @@ mongoose.connect(payloadConfig.mongoURL, { useNewUrlParser: true }, (err) => {
   }
 });
 
+const authRoutes = require('./Auth/Auth.routes');
+router.use('', authRoutes);
+
 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.use(express.json());
 app.use(express.urlencoded({extended: true}));
 app.use(router);

demo/client/modelViews.js

@@ -1,21 +0,0 @@
-import PagesAdd from '../Page/components/Add';
-import PagesArchive from '../Page/components/Archive';
-import PagesEdit from '../Page/components/Edit';
-
-import OrdersAdd from '../Order/components/Add';
-import OrdersArchive from '../Order/components/Archive';
-import OrdersEdit from '../Order/components/Edit';
-
-export default {
-  orders: {
-    Add: OrdersAdd,
-    Archive: OrdersArchive,
-    Edit: OrdersEdit
-  },
-
-  pages: {
-    Add: PagesAdd,
-    Archive: PagesArchive,
-    Edit: PagesEdit
-  }
-};

index.js

@@ -1,4 +1,4 @@
-import ajax from './src/client/ajax';
+import ajax from './src/ajax';
 
 export {
   ajax

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "nodemonConfig": {
     "ignore": [
-      "src/client/*",
+      "src/*",
       "demo/client/*"
     ]
   },
@@ -14,10 +14,10 @@
     "cov": "npm run core:build && node ./node_modules/jest/bin/jest.js src/tests --coverage",
     "core:watch": "./node_modules/.bin/babel src --out-dir dist --source-maps --watch",
     "core:build": "./node_modules/.bin/babel src --out-dir dist --source-maps",
-    "build-demo-css": "node-sass-chokidar --include-path ./src/client/scss demo/ -o demo/",
+    "build-demo-css": "node-sass-chokidar --include-path ./src/scss demo/ -o demo/",
-    "watch-demo-css": "npm run build-demo-css && node-sass-chokidar --include-path ./src/client/scss demo/ -o demo/ --watch --recursive",
+    "watch-demo-css": "npm run build-demo-css && node-sass-chokidar --include-path ./src/scss demo/ -o demo/ --watch --recursive",
-    "build-module-css": "node-sass-chokidar --include-path ./src/client/scss src/ -o src/",
+    "build-module-css": "node-sass-chokidar --include-path ./src/scss src/ -o src/",
-    "watch-module-css": "npm run build-demo-css && node-sass-chokidar --include-path ./src/client/scss src/ -o src/ --watch --recursive",
+    "watch-module-css": "npm run build-demo-css && node-sass-chokidar --include-path ./src/scss src/ -o src/ --watch --recursive",
     "webpack": "webpack-dev-server --mode development --config config/webpack.dev.config.js --open --hot --history-api-fallback",
     "demo-server": "nodemon demo/app.js",
     "dev": "npm-run-all -p watch-module-css watch-demo-css webpack demo-server"

redux.js

@@ -1,5 +1,5 @@
-import common from './src/client/reducers/common';
+import common from './src/reducers/common';
-import collections from './src/client/reducers/collections';
+import collections from './src/reducers/collections';
 
 export {
   common,

src/lib/payload.js

@@ -1,14 +1,3 @@
-import routes from './routes/index.route';
-import passport from 'passport';
-import User from './models/user.model';
-
 export function init(app) {
-  app.use(passport.initialize());
+  console.log('initialized')
-  app.use(passport.session());
-
-  passport.use(User.createStrategy());
-  passport.serializeUser(User.serializeUser());
-  passport.deserializeUser(User.deserializeUser());
-
-  app.use(routes);
 }

src/lib/routes/index.route.js

@@ -1,10 +0,0 @@
-const express = require('express');
-const authRoutes = require('./auth/auth.route');
-
-const router = express.Router({}); // eslint-disable-line new-cap
-
-/** GET /health-check - Check service health */
-router.get('/health-check', (req, res) => res.send('OK'));
-router.use('', authRoutes);
-
-module.exports = router;

src/lib/routes/page/page.route.js

@@ -1,11 +0,0 @@
-const express = require('express');
-const pageController = require('../../controllers/page.controller');
-
-const router = express.Router(); // eslint-disable-line new-cap
-
-router
-  .route('') // TODO: not sure how to incorporate url params like `:pageId`
-  .get(pageController.get)
-  .post(pageController.post);
-
-module.exports = router;