Merge pull request #247 from hydrotik/feature/install-config-cleanup

Feature/install config cleanup

Author: dhsaks

src/global/server/config.example renamed to config.example

@@ -55,7 +55,7 @@ function ConfigPages() {
             },
             webpack: {
                 id: 'home',
-                src: path.join(__dirname, '../client/pages/home/index')
+                src: './src/global/client/pages/home/index'
             }
         },
         // %END PAGE%
@@ -72,7 +72,7 @@ function ConfigPages() {
             },
             webpack: {
                 id: 'about',
-                src: path.join(__dirname, '../client/pages/about/index')
+                src: './src/global/client/pages/about/index'
             }
         },
         // %END PAGE%
@@ -89,7 +89,7 @@ function ConfigPages() {
             },
             webpack: {
                 id: 'contact',
-                src: path.join(__dirname, '../client/pages/contact/index')
+                src: './src/global/client/pages/contact/index'
             }
         },
         // %END PAGE%
@@ -106,7 +106,7 @@ function ConfigPages() {
             },
             webpack: {
                 id: 'signup',
-                src: path.join(__dirname, '../client/pages/signup/index')
+                src: './src/global/client/pages/signup/index'
             }
         },
         // %END PAGE%
@@ -123,7 +123,7 @@ function ConfigPages() {
             },
             webpack: {
                 id: 'account',
-                src: path.join(__dirname, '../client/pages/account/index')
+                src: './src/global/client/pages/account/index'
             }
         },
         // %END PAGE%
@@ -140,7 +140,7 @@ function ConfigPages() {
             },
             webpack: {
                 id: 'admin',
-                src: path.join(__dirname, '../client/pages/admin/index')
+                src: './src/global/client/pages/admin/index'
             }
         },
         // %END PAGE%
@@ -157,7 +157,7 @@ function ConfigPages() {
             },
             webpack: {
                 id: 'login',
-                src: path.join(__dirname, '../client/pages/login/index')
+                src: './src/global/client/pages/login/index'
             }
         },
         // %END PAGE%
@@ -174,7 +174,7 @@ function ConfigPages() {
             },
             webpack: {
                 id: 'dashboard',
-                src: path.join(__dirname, '../client/pages/dashboard/index')
+                src: './src/global/client/pages/dashboard/index'
             }
         }
         // %END PAGE%

src/global/server/config.pages.js renamed to config.pages.js

@@ -4,7 +4,6 @@
   "description": "Webpack, Typescript, React, Redux, Hapi, Sass, Node, MongoDB, Falcor, Mongoose, Susy, Breakpoint",
   "main": "./src/global/server/server.js",
   "directories": {
-    "clientBuild": "./www",
     "doc": "docs"
   },
   "engines": {
@@ -14,7 +13,7 @@
   "engineStrict": true,
   "scripts": {
     "build-client": "NODE_ENV=production bash -c 'npm run clean; npm run lint-es; npm run typings-install; ./node_modules/.bin/webpack -p --verbose --colors --display-error-details --config webpack.config.client-hot.js'",
-    "clean": "bash -c 'rm -rf ./www'",
+    "clean": "node ./script/clean.js",
     "lint-ts": "tslint --config tslint.json --ext .ts,.tsx",
     "lint-jsc": "jscs . --config .jscsrc",
     "lint-es": "./node_modules/.bin/eslint --config .eslintrc --ignore-path .eslintignore --ext .js,.jsx,.es6 .",
@@ -47,6 +46,7 @@
     "animate.css": "^3.4.0",
     "async": "^1.5.2",
     "autotrace": "0.0.1",
+    "babel-polyfill": "^6.9.1",
     "bcrypt": "^0.8.5",
     "boom": "^3.1.2",
     "bootstrap": "^4.0.0-alpha.2",
@@ -199,7 +199,7 @@
     "redux-thunk": "^1.0.0",
     "require-dir": "^0.3.0",
     "resolve-url-loader": "^1.4.3",
-    "rimraf": "^2.4.3",
+    "rimraf": "^2.5.2",
     "rx-lite": "^4.0.7",
     "sass-loader": "^3.1.2",
     "sinon": "^1.17.2",

package.json

@@ -0,0 +1,9 @@
+var rimraf = require('rimraf');
+var Config = require('../config');
+
+console.log('Deleting ' + Config.get('/buildDir'));
+rimraf(Config.get('/buildDir'), function(err) {
+    if (err) {
+        console.log('Could not delete ' + Config.get('/buildDir'));
+    }
+});

script/clean.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const Joi = require('joi');
-const Config = require('../config');
+const Config = require('../config').Config;
 
 
 const internals = {};

script/copyfiles.sh

@@ -4,7 +4,7 @@ const Boom = require('boom');
 const Joi = require('joi');
 const Async = require('async');
 const Bcrypt = require('bcrypt');
-const Config = require('../config');
+const Config = require('../config').Config;
 
 
 const internals = {};

src/global/server/api/contact.js

@@ -3,7 +3,7 @@
 const Boom = require('boom');
 const Joi = require('joi');
 const Async = require('async');
-const Config = require('../config');
+const Config = require('../config').Config;
 
 
 const internals = {};

src/global/server/api/login.js

@@ -1,5 +1,5 @@
 const Async = require('async');
-const Config = require('./config');
+const Config = require('./config').Config;
 
 
 exports.register = function (server, options, next) {

src/global/server/api/signup.js

@@ -1,94 +1,4 @@
-var Confidence = require('confidence');
-var pkg = require('../../../package.json');
-var criteria = {
-    env: process.env.NODE_ENV
-};
-
-
-var config = {
-    $meta: 'This file configures the plot device.',
-    projectName: 'WattsProject',
-    buildDir: pkg.directories.clientBuild,
-    buildDirTests: '../../../build_tests',
-    devHost: 'localhost',
-    devPort: 8000,
-    webpackPort: 8080,
-    port: {
-        web: {
-            $filter: 'env',
-            test: 9000,
-            production: process.env.PORT,
-            $default: 8000
-        }
-    },
-    baseUrl: {
-        $filter: 'env',
-        $meta: 'values should not end in "/"',
-        production: 'https://wattsproject.herokuapp.com',
-        $default: 'http://localhost:8000'
-    },
-    authAttempts: {
-        forIp: 50,
-        forIpAndUser: 7
-    },
-    cookieSecret: {
-        $filter: 'env',
-        production: process.env.COOKIE_SECRET,
-        $default: 'sezEhj(@#05Jxgnd5CTCGktuiXldIae3'
-    },
-    hapiMongoModels: {
-        $filter: 'env',
-        production: {
-            mongodb: {
-                url: process.env.MONGOLAB_URI
-            },
-            autoIndex: false
-        },
-        test: {
-            mongodb: {
-                url: 'mongodb://localhost:27017/wattsproject-test'
-            },
-            autoIndex: true
-        },
-        $default: {
-            mongodb: {
-                url: 'mongodb://localhost:27017/wattsproject'
-            },
-            autoIndex: true
-        }
-    },
-    nodemailer: {
-        host: 'smtp.gmail.com',
-        port: 465,
-        secure: true,
-        auth: {
-            user: '[email protected]',
-            pass: ''
-        }
-    },
-    system: {
-        fromAddress: {
-            name: 'WattsProject',
-            address: '[email protected]'
-        },
-        toAddress: {
-            name: 'WattsProject',
-            address: '[email protected]'
-        }
-    }
-};
-
-
-var store = new Confidence.Store(config);
-
-
-exports.get = function (key) {
-
-    return store.get(key, criteria);
-};
-
-
-exports.meta = function (key) {
-
-    return store.meta(key, criteria);
-};
+// All necessary config from outside this folder should be referenced here
+module.exports.Config = require('../../../config');
+module.exports.Pages = require('../../../config.pages').getConfig();
+module.exports.Pkg = require('../../../package');