From 2741b3bcc657ceaa4f867d01a9a2dbac5679dc10 Mon Sep 17 00:00:00 2001
From: James <james@keen-studio.com>
Date: Mon, 29 Oct 2018 18:46:31 -0400
Subject: [PATCH] removes dist, moves all exporter files to /src

---
 components.js                | 30 ------------------------------
 config/webpack.dev.config.js |  2 +-
 demo/Auth/Auth.controller.js |  2 +-
 demo/Page/Page.controller.js |  8 +++-----
 demo/User/User.model.js      |  2 +-
 demo/app.js                  |  3 ---
 index.js                     |  5 -----
 package.json                 |  2 --
 redux.js                     |  7 -------
 src/components.js            | 29 +++++++++++++++++++++++++++++
 src/index.js                 |  2 +-
 src/lib/api.js               |  8 --------
 src/lib/helpers/APIError.js  |  4 ++--
 src/lib/payload.js           |  3 ---
 src/redux.js                 |  7 +++++++
 15 files changed, 45 insertions(+), 69 deletions(-)
 delete mode 100644 components.js
 delete mode 100644 index.js
 delete mode 100644 redux.js
 create mode 100644 src/components.js
 delete mode 100644 src/lib/api.js
 delete mode 100644 src/lib/payload.js
 create mode 100644 src/redux.js

diff --git a/components.js b/components.js
deleted file mode 100644
index 4770ea70a..000000000
--- a/components.js
+++ /dev/null
@@ -1,30 +0,0 @@
-export { default as App } from './src/components/App';
-export { default as Button } from './src/components/controls/Button';
-export { default as MeasureWindow } from './src/components/utilities/MeasureWindow';
-export { default as MeasureScroll } from './src/components/utilities/MeasureScroll';
-export { default as LoadContent } from './src/components/utilities/LoadContent';
-export { default as Dashboard } from './src/components/views/Dashboard';
-export { default as CollectionRoutes } from './src/components/routes/Collections';
-export { default as DefaultTemplate } from './src/components/layout/DefaultTemplate';
-export { default as Login } from './src/components/views/Login';
-export { default as AddView } from './src/components/views/collections/Add';
-export { default as ArchiveView } from './src/components/views/collections/Archive';
-export { default as HeadingButton } from './src/components/modules/HeadingButton';
-export { default as Filter } from './src/components/modules/Filter';
-export { default as EditView } from './src/components/views/collections/Edit';
-export { default as StickOnScroll } from './src/components/layout/StickOnScroll';
-export { default as APIUrl } from './src/components/modules/APIUrl';
-export { default as Form, FormContext } from './src/components/forms/Form';
-export { default as FormSubmit } from './src/components/forms/Submit';
-export { default as Group } from './src/components/field-types/Group';
-export { default as Input } from './src/components/field-types/Input';
-export { default as Textarea } from './src/components/field-types/Textarea';
-export { default as PayloadIcon } from './src/components/graphics/PayloadIcon';
-export { default as PayloadLogo } from './src/components/graphics/PayloadLogo';
-export { default as Tooltip } from './src/components/modules/Tooltip';
-export { default as Sidebar } from './src/components/layout/Sidebar';
-export { default as StepNav } from './src/components/modules/StepNav';
-export { default as Arrow } from './src/components/graphics/Arrow';
-export { default as Label } from './src/components/type/Label';
-export { default as SetStepNav } from './src/components/utilities/SetStepNav';
-export { default as ContentBlock } from './src/components/layout/ContentBlock';
diff --git a/config/webpack.dev.config.js b/config/webpack.dev.config.js
index fd9aad2ce..e530dfbbb 100644
--- a/config/webpack.dev.config.js
+++ b/config/webpack.dev.config.js
@@ -88,7 +88,7 @@ module.exports = {
   ],
   resolve: {
     alias: {
-      payload: path.resolve(__dirname, '../'),
+      payload: path.resolve(__dirname, '../src/'),
       local: path.resolve(__dirname, '../demo')
     }
   }
diff --git a/demo/Auth/Auth.controller.js b/demo/Auth/Auth.controller.js
index e5ad5b621..c397dae5b 100644
--- a/demo/Auth/Auth.controller.js
+++ b/demo/Auth/Auth.controller.js
@@ -1,6 +1,6 @@
 const httpStatus = require('http-status');
 const passport = require('passport');
-const APIError = require('../../dist/lib/helpers/APIError');
+const APIError = require('../../src/lib/helpers/APIError');
 const User = require('../User/User.model');
 
 /**
diff --git a/demo/Page/Page.controller.js b/demo/Page/Page.controller.js
index 12b76e0d7..b2f2148b5 100644
--- a/demo/Page/Page.controller.js
+++ b/demo/Page/Page.controller.js
@@ -1,8 +1,8 @@
 const Page = require('./Page.model');
 
 const pageController = {
-  get: (req, res, next) => {
-    page.find((err, pages, next) => {
+  get: (req, res) => {
+    Page.find((err, pages, next) => {
       if (err) {
         return next(err);
       }
@@ -10,10 +10,8 @@ const pageController = {
     });
   },
 
-  post: (req, res, next) => {
-
+  post: (req, res) => {
     const newPage = new Page(req.body);
-
     newPage.save((err, page, next) => {
       if (err) {
         return next(err);
diff --git a/demo/User/User.model.js b/demo/User/User.model.js
index 9d0d765eb..0c7a3edbc 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('../../dist/lib/helpers/APIError');
+const APIError = require('../../src/lib/helpers/APIError');
 
 /**
  * User Schema
diff --git a/demo/app.js b/demo/app.js
index d9a7ae719..f6437acfb 100644
--- a/demo/app.js
+++ b/demo/app.js
@@ -1,4 +1,3 @@
-const payload = require('../dist');
 const mongoose = require('mongoose');
 const express = require('express');
 const payloadConfig = require('./payload.config');
@@ -33,8 +32,6 @@ app.use((req, res, next) => {
   next();
 });
 
-payload.init(app);
-
 app.listen(payloadConfig.port, () => {
   console.log(`listening on ${payloadConfig.port}...`);
 });
diff --git a/index.js b/index.js
deleted file mode 100644
index 1d847103f..000000000
--- a/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import ajax from './src/ajax';
-
-export {
-  ajax
-};
diff --git a/package.json b/package.json
index 9625f9d84..1b35d05c8 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,6 @@
   "scripts": {
     "test": "node ./node_modules/jest/bin/jest.js src/tests",
     "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/scss demo/ -o demo/",
     "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/scss src/ -o src/",
diff --git a/redux.js b/redux.js
deleted file mode 100644
index c2db1217c..000000000
--- a/redux.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import common from './src/reducers/common';
-import collections from './src/reducers/collections';
-
-export {
-  common,
-  collections
-};
diff --git a/src/components.js b/src/components.js
new file mode 100644
index 000000000..6ce9698e0
--- /dev/null
+++ b/src/components.js
@@ -0,0 +1,29 @@
+export { default as App } from './components/App';
+export { default as Button } from './components/controls/Button';
+export { default as MeasureWindow } from './components/utilities/MeasureWindow';
+export { default as MeasureScroll } from './components/utilities/MeasureScroll';
+export { default as Dashboard } from './components/views/Dashboard';
+export { default as CollectionRoutes } from './components/routes/Collections';
+export { default as DefaultTemplate } from './components/layout/DefaultTemplate';
+export { default as Login } from './components/views/Login';
+export { default as AddView } from './components/views/collections/Add';
+export { default as ArchiveView } from './components/views/collections/Archive';
+export { default as HeadingButton } from './components/modules/HeadingButton';
+export { default as Filter } from './components/modules/Filter';
+export { default as EditView } from './components/views/collections/Edit';
+export { default as StickOnScroll } from './components/layout/StickOnScroll';
+export { default as APIUrl } from './components/modules/APIUrl';
+export { default as Form, FormContext } from './components/forms/Form';
+export { default as FormSubmit } from './components/forms/Submit';
+export { default as Group } from './components/field-types/Group';
+export { default as Input } from './components/field-types/Input';
+export { default as Textarea } from './components/field-types/Textarea';
+export { default as PayloadIcon } from './components/graphics/PayloadIcon';
+export { default as PayloadLogo } from './components/graphics/PayloadLogo';
+export { default as Tooltip } from './components/modules/Tooltip';
+export { default as Sidebar } from './components/layout/Sidebar';
+export { default as StepNav } from './components/modules/StepNav';
+export { default as Arrow } from './components/graphics/Arrow';
+export { default as Label } from './components/type/Label';
+export { default as SetStepNav } from './components/utilities/SetStepNav';
+export { default as ContentBlock } from './components/layout/ContentBlock';
diff --git a/src/index.js b/src/index.js
index 708e6abdc..f290bd4cc 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1 +1 @@
-export { init } from './lib/payload';
+export { default as ajax } from './ajax';
diff --git a/src/lib/api.js b/src/lib/api.js
deleted file mode 100644
index 3e45c51e9..000000000
--- a/src/lib/api.js
+++ /dev/null
@@ -1,8 +0,0 @@
-class api {
-  constructor(express, mongoose) {
-    this.express = express;
-    this.mongoose = mongoose;
-  }
-}
-
-module.exports = api;
diff --git a/src/lib/helpers/APIError.js b/src/lib/helpers/APIError.js
index 13bb3a6da..a74317418 100644
--- a/src/lib/helpers/APIError.js
+++ b/src/lib/helpers/APIError.js
@@ -1,4 +1,4 @@
-import httpStatus from 'http-status';
+const httpStatus = require('http-status');
 
 /**
  * @extends Error
@@ -31,4 +31,4 @@ class APIError extends ExtendableError {
   }
 }
 
-export default APIError;
+module.exports = APIError;
diff --git a/src/lib/payload.js b/src/lib/payload.js
deleted file mode 100644
index d0ee667c5..000000000
--- a/src/lib/payload.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export function init(app) {
-  console.log('initialized')
-}
diff --git a/src/redux.js b/src/redux.js
new file mode 100644
index 000000000..23e7adabd
--- /dev/null
+++ b/src/redux.js
@@ -0,0 +1,7 @@
+import common from './reducers/common';
+import collections from './reducers/collections';
+
+export {
+  common,
+  collections
+};