Finally finished the massive refactor... transitions still broke but it's fine for now.

private/api/methods/TestMethod.js

@@ -1,39 +0,0 @@
-// Copyright (c) 2018 Dominic Masters
-//
-// MIT License
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-const APIHandler = require('./../APIHandler');
-
-class TestMethod extends APIHandler {
-  constructor(api) {
-    super(api, 'GET', '/test');
-  }
-
-  handle(request) {
-    return {
-      ok: true,
-      data: "Hello World"
-    };
-  }
-}
-
-module.exports = TestMethod;

private/app/App.js

@@ -25,27 +25,21 @@
 const
   Configuration = require('./../config/Configuration'),
   DatabaseConnection = require('./../database/DatabaseConnection'),
-  Server = require('./../server/Server'),
+  Server = require('./../server/Server')
-  Email = require('./../email/Email')
 ;
 
-//Constants
-const PUBLIC_PATH = path.join(__dirname, '..', '..', 'dist');
-
 class App {
   constructor() {
     this.config = new Configuration(this);
     this.database = new DatabaseConnection(this);
     this.server = new Server(this);
-    this.email = new Email(this);
   }
 
   getConfig() { return this.config; }
+  getDiscord() { return this.discord; }
   getDatabase() { return this.database; }
-  getServer() { return this.server; }
+  getPalaise() { return this.palaise; }
-  getEmail() {return this.email;}
 
-  //Primary Functions
   async init() {
     this.log('Starting App...');
 
@@ -69,26 +63,17 @@ class App {
       return;
     }
 
-    //Connect to our SMTP Host (For sending mail)
+    //Start the server
+    this.log('Starting Server...');
     try {
-      this.log('Connecting to SMTP Server');
+      await this.server.init();
-      await this.email.connect();
-      console.log('...Done');
     } catch(e) {
-      console.error("Failed to setup emails!");
+      this.error('Failed to start server!');
-      throw new Error(e);
+      this.error(e);
+      return;
     }
 
-    //Now we need to start the server. This provides both a nice interface, as
+    this.log('App ready');
-    //well as our API Handler (including 2auth callback urls)
-    try {
-      this.log("Starting Server...");
-      await this.server.start();
-      console.log("...Done!");
-    } catch(e) {
-      console.error("Failed to start the server!");
-      throw new Error(e);
-    }
   }
 
   // Logging Functions //

private/config/Configuration.js

@@ -36,14 +36,10 @@ class Configuration {
   async loadConfig(path) {
     //First we need to check if this is Heroku or not...
     let processVariabels = process.env;
-    this.isHeroku = false;
+    this.isHeroku = (
-    if(
+      processVariabels && processVariabels.NODE_HOME &&
-      processVariabels !== typeof undefined &&
-      typeof processVariabels.NODE_HOME !== typeof undefined &&
       processVariabels.NODE_HOME.indexOf("heroku") !== -1
-    ) {
+    );
-      this.isHeroku = true;
-    }
 
     //Read config data
     if(this.isHeroku) {

private/database/DatabaseConnection.js

@@ -44,17 +44,16 @@ class DatabaseConnection {
 
     //Load queries into cache
     let queries = {};
-    let types = fs.readdirSync(__dirname + '/' + QUERIES_DIRECTORY);
+    let queryDir = `${__dirname}/${QUERIES_DIRECTORY}`
+    let types = fs.readdirSync(queryDir);
     for(let i = 0; i < types.length; i++) {
       //Now Scan each file in this directory
-      let dir = __dirname + '/' + QUERIES_DIRECTORY + '/' + types[i];
+      let dir = `${queryDir}/${types[i]}`;
       let dirContents = fs.readdirSync(dir);
       for(let x = 0; x < dirContents.length; x++) {
         //Now read each file within this dir..
-        let filePath = dir + '/' + dirContents[x];
+        let filePath = `${dir}/${dirContents[x]}`;
-        console.log(filePath);
         let query = fs.readFileSync(filePath, 'utf8');
-
         //Now Save our query as filename minus extension.
         queries[dirContents[x].split('.')[0]] = query;
       }

private/database/queries/create/CreateFormatsTable.sql

@@ -0,0 +1,5 @@
+CREATE TABLE IF NOT EXISTS "Formats" (
+  "id" BIGSERIAL NOT NULL PRIMARY KEY,
+  "name" TEXT NOT NULL,
+  "gameId" BIGSERIAL NOT NULL
+);

private/database/queries/create/CreateGamesTable.sql

@@ -0,0 +1,4 @@
+CREATE TABLE IF NOT EXISTS "Games" (
+  "id" BIGSERIAL NOT NULL PRIMARY KEY,
+  "name" TEXT NOT NULL UNIQUE
+);

private/database/queries/create/CreateSeasonsTable.sql

@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS "Seasons" (
+  "id" BIGSERIAL NOT NULL PRIMARY KEY,
+  "name" TEXT NOT NULL,
+  "formatId" BIGSERIAL NOT NULL,
+  "startDate" TIMESTAMP NOT NULL,
+  "endDate" TIMESTAMP NOT NULL
+);

private/database/queries/create/CreateTeamUsersSeasonsTable.sql

@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS "TeamUsersSeasons" (
+  "teamId" BIGSERIAL NOT NULL,
+  "userId" BIGSERIAL NOT NULL,
+  "seasonId" BIGSERIAL NOT NULL,
+  "registered" TIMESTAMP NOT NULL,
+  PRIMARY KEY("teamId", "userId", "seasonId")
+);

private/database/queries/create/CreateTeamsTable.sql

@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS "Teams" (
+  "id" BIGSERIAL NOT NULL PRIMARY KEY,
+  "name" varchar(32) NOT NULL UNIQUE,
+  "motto" text NULL,
+  "image" text NULL,
+  "registered" TIMESTAMP NOT NULL
+);

private/database/queries/create/CreateUsersTable.sql

@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS "Users" (
+  "id" BIGSERIAL NOT NULL PRIMARY KEY,
+  "discordId" text NULL UNIQUE,
+  "steamId" text NULL UNIQUE,
+  "email" text NULL UNIQUE
+);

private/database/queries/format/AddFormat.sql

@@ -0,0 +1 @@
+INSERT INTO "Formats" ("name", "gameId") VALUES (${name}, ${gameId}) RETURNING *;

private/database/queries/format/GetFormatsByGame.sql

@@ -0,0 +1 @@
+SELECT * FROM "Formats" WHERE "gameId"=${gameId};

private/database/queries/game/AddGame.sql

@@ -0,0 +1 @@
+INSERT INTO "Games" (name) VALUES (${name}) RETURNING *;

private/database/queries/game/GetGameByName.sql

@@ -0,0 +1 @@
+SELECT * FROM "Games" WHERE LOWER("name") = LOWER(${name}) LIMIT 1;

private/database/queries/season/GetSeasonById.sql

@@ -0,0 +1 @@
+SELECT * FROM "Season" WHERE id = ${id} LIMIT 1;

private/database/queries/season/GetSeasonForDate.sql

@@ -0,0 +1,5 @@
+SELECT * FROM "Seasons"
+WHERE
+  "startDate" <= ${date} AND
+  "endDate" >= ${date}
+LIMIT 1;

private/database/queries/team/AddTeam.sql

@@ -0,0 +1,5 @@
+INSERT INTO "Teams" (
+  "name", "motto", "image", "registered"
+) VALUES (
+  ${name}, ${motto}, ${image}, ${registered}
+) RETURNING *;

private/database/queries/team/AddTeamUserSeason.sql

@@ -0,0 +1,5 @@
+INSERT INTO "TeamUsersSeasons" (
+  "teamId", "userId", "seasonId", "registered"
+) VALUES (
+  ${teamId}, ${userId}, ${seasonId}, ${registered}
+) RETURNING *;

private/database/queries/team/GetTeamById.sql

@@ -0,0 +1 @@
+SELECT * FROM "Teams" WHERE "id"=${id} LIMIT 1;

private/database/queries/team/GetTeamByName.sql

@@ -0,0 +1 @@
+SELECT * FROM "Teams" WHERE LOWER("name") = LOWER(${name}) LIMIT 1;

private/database/queries/team/GetTeamBySeasonAndUser.sql

@@ -0,0 +1,10 @@
+SELECT
+  *
+FROM
+  "Teams"
+INNER JOIN
+  "TeamUsersSeasons" ON "TeamUsersSeasons"."teamId" = "Teams"."id"
+WHERE
+  "TeamUsersSeasons"."userId" = ${userId} AND
+  "TeamUsersSeasons"."seasonId" = ${seasonId}
+LIMIT 1;

private/database/queries/team/GetTeamUsersBySeason.sql

@@ -0,0 +1 @@
+SELECT * FROM "TeamUsersSeasons" WHERE "teamId" = ${teamId};

private/database/queries/team/GetTeamsBySeason.sql

@@ -0,0 +1,11 @@
+SELECT
+  "Teams".*
+FROM
+  "Teams"
+INNER JOIN
+  "TeamUsersSeasons" ON "TeamUsersSeasons"."teamId" = "Teams"."id"
+WHERE
+  "TeamUsersSeasons"."seasonId" = ${seasonId}
+GROUP BY
+  "Teams"."id"
+;

private/database/queries/user/AddUser.sql

@@ -0,0 +1,9 @@
+INSERT INTO "Users" (
+  "discordId",
+  "steamId",
+  "email"
+) VALUES (
+  ${discordId},
+  ${steamId},
+  ${email}
+) RETURNING *;

private/database/queries/user/GetUserByDiscordId.sql

@@ -0,0 +1 @@
+SELECT * FROM "Users" WHERE "discordId" = ${discordId} LIMIT 1;

private/database/queries/user/GetUserById.sql

@@ -0,0 +1 @@
+SELECT * FROM "Users" WHERE "id"=${id} LIMIT 1;

private/index.js

@@ -21,8 +21,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-'use strict';
-
 const App = require('./app/App');
 
 //Attempt to make a global "Async Handler" for the app itself

private/server/Server.js

@@ -21,21 +21,18 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-//Imports
 const
   http = require('http'),
-  https = require('https'),
   express = require('express'),
   bodyParser = require('body-parser'),
   fs = require('fs'),
   path = require('path'),
   webpack = require('webpack'),
-  CompilerOptions = require('./WebpackCompilerOptions'),
+  WebpackCompiler = require('./../webpack/WebpackCompiler'),
-  API = require('./../api/API')
+  API = require('./api/API')
 ;
 
-//Constants
+const SERVE_FOLDER = path.resolve(`${__dirname}/../../dist`);
-const LANDING_FILE = 'index.html';
 
 class Server {
   constructor(app) {
@@ -43,48 +40,22 @@ class Server {
 
     //Server settings
     this.ip =
-      app.getConfig().getValueOf("IP") ||
+      app.getConfig().get("IP") ||
-      app.getConfig().getValueOf("ip") ||
+      app.getConfig().get("server.ip") ||
-      app.getConfig().getValueOf("server.ip") ||
-      app.getConfig().ip ||
       process.env.ip ||
       process.env.IP ||
       null
     ;
+
     this.port =
-      app.getConfig().getValueOf("PORT") ||
+      app.getConfig().get("PORT") ||
-      app.getConfig().getValueOf("port") ||
+      app.getConfig().get("port") ||
-      app.getConfig().getValueOf("server.port") ||
+      app.getConfig().get("server.port") ||
-      app.getConfig().port ||
       process.env.port ||
       process.env.PORT ||
       80
     ;
 
-    this.useHTTPS = app.getConfig().getValueOf("ssl") && app.getConfig().getValueOf("ssl.enable")
-    if(this.useHTTPS) {
-      this.portHTTPS = this.config.ssl.port || 443;
-      if(!this.config.ssl.key) {
-        throw new Error("Invalid SSL Key in Server Configuration");
-      }
-      if(!this.config.ssl.cert) {
-        throw new Error("Invalid SSL Cert in Server Configuration");
-      }
-
-      //TODO: Clean this up, don't use static files (use path.join etc) and should these be flat files?
-      let keyFile = __dirname+'./../'+this.config.ssl.key;
-      let certFile = __dirname+'./../'+this.config.ssl.cert;
-      if(!fs.existsSync(keyFile)) {
-        throw new Error("Key file \"" + keyFile + "\" doesn't exist!");
-      }
-      if(!fs.existsSync(certFile)) {
-        throw new Error("Key file \"" + certFile + "\" doesn't exist!");
-      }
-
-      this.key = fs.readFileSync(keyFile, 'utf8');
-      this.cert = fs.readFileSync(certFile, 'utf8');
-    }
-
     //Setup the express wrapper.
     this.express = express();
 
@@ -92,160 +63,65 @@ class Server {
     this.express.use(bodyParser.json({
       type:'application/json' // to support JSON-encoded bodies
     }));
+
     this.express.use(bodyParser.urlencoded({
       extended: true
     }));
 
     //Serve Static Files
-    this.express.use(express.static('./dist'));
+    this.express.use(express.static(SERVE_FOLDER));
 
-    //API Handler
+    //Register API Handlers
     this.api = new API(this);
     this.api.loadHandlers();
 
-    //Finally our catcher for all other enquiries
+    //Setup fallback GET request
-    this.express.get('*', this.onGetRequest.bind(this));
+    this.express.get('*', (req,res) => this.onGetRequest(req,res));
 
+    //Setup our webpack compiler
+    this.compiler = webpack(WebpackCompiler());
+  }
+
+  getExpress() {return this.express;}
+  getApp() {return this.app;}
+  getHTTP() {return this.http;}
+
+  async init() {
     //Create our HTTP and (if needed HTTPS) server(s)
     this.http = http.createServer(this.express);
-    this.http.on('error', this.onServerError.bind(this));
+    this.http.on('error', e => this.onServerError(e));
 
-    if(this.isHTTPS()) {
+    //Start the compiler watching
-      if(!this.key) throw new Error("Can't start server, missing SSL Key");
+    this.watcher = this.compiler.watch({}, (e,s) => this.onWatchChange(e,s));
-      if(!this.cert) throw new Error("Can't start server, missing SSL Cert");
 
-      this.https = https.createServer({
+    //Start Listening
-        key: this.key,
+    this.http.listen({
-        cert: this.cert
-      }, this.express);
-      this.https.on('error', this.onServerError.bind(this));
-    }
-
-    //Create our bundler
-    this.compiler = webpack(CompilerOptions(this, this.app));
-  }
-
-  getConfig() {return this.config;}
-  getIP() {return this.ip; }
-  getPort() {return this.port;}
-  isHTTPS() {return this.useHTTPS;}
-  getHTTPSPort() {return this.portHTTPS;}
-  getKey() {return this.key;}
-  getCertificate() {return this.cert;}
-  getLandingFile() {return path.join(this.app.getPublicDirectory(), LANDING_FILE);}
-  getExpress() {return this.express;}
-  getAPI() {return this.api;}
-  getApp() {return this.app;}
-
-  isRunning() {
-    if(typeof this.http !== typeof undefined) {
-      return this.http.listening;
-    }
-    return false;
-  }
-
-  async start() {
-    if(typeof this.startPromise !== typeof undefined) {
-      await this.startPromise();
-      return;
-    }
-    this.startPromise = new Promise(this.startServerPromise.bind(this));//Lazy Programming FTW
-    await this.startPromise;
-  }
-
-  startServerPromise(resolve, reject) {
-    this.startResolve = resolve;
-    this.startReject = reject;
-
-    let options = {
       host: this.ip,
       port: this.port
-    };
+    }, e => this.onServerStart(e));
-
-    //Create our webpack watcher
-    this.watcher = this.compiler.watch({
-
-    }, this.onWatchChange.bind(this));
-
-    //Start the HTTP Server
-    this.http.listen(options, this.onServerStart.bind(this));
-
-    //HTTPS?
-    if(this.https) {
-      this.https.listen(options, this.portHTTPS);
-    }
   }
 
-  onServerStart() {
+  //Events
-    this.bound = this.http.address();
+  onServerStart(e) {
-    this.startResolve(this);
+    this.boundAddress = this.http.address();
   }
 
   onServerError(e) {
-    console.log("A Server Error occured!");
+    console.error('Error');
-    this.startReject(e);
+    console.error(e);
-    this.stop();
-    throw new Error(e);
-  }
-
-
-  async stop() {
-    if(typeof this.stopPromise !== typeof undefined) {
-      await this.stopPromise;
-      return;
-    }
-    this.stopPromise = new Promse(this.stopPromise.bind(this));
-    await this.stopPromise;
-    delete this.http;
-    delete this.https;
-    delete this.stopPromise;
-    delete this.watcher;
-  }
-
-  stopPromise(resolve, reject) {
-    this.stopResolve = resolve;
-    this.stopReject = reject;
-
-    if(typeof this.watcher !== typeof undefined) {
-      this.watcher.close(() => {
-      });
-    }
-
-    try {
-      this.http.close(this.onHTTPClosed.bind(this));
-    } catch(e) {
-      this.stopReject(e);
-    }
-  }
-
-  onHTTPClosed() {
-    if(typeof this.https === typeof undefined) {
-      this.resolve();
-      return;
-    }
-
-    try {
-      this.https.close(this.onHTTPSClosed.bind(this));
-    } catch(e) {
-      this.stopReject(e);
-    }
-  }
-
-  onHTTPSClosed() {
-    this.resolve();
-  }
-
-  onWatchChange(error, stats) {
-    if(error || (stats.compilation.errors && stats.compilation.errors.length)) {
-      console.error(error || stats.compilation.errors);
-    } else {
-      console.log("Server compiled!");
-    }
   }
 
   onGetRequest(req, res) {
-    //Used as our "catch all get requests"
+    let file = path.resolve(`${SERVE_FOLDER}/index.html`);
-    res.sendFile(this.getLandingFile());
+    res.sendFile(file);
+  }
+
+  onWatchChange(error,stats) {
+    if(error || (stats.compilation.errors && stats.compilation.errors.length)) {
+      return this.app.error(error || stats.compilation.errors);
+    }
+
+    this.app.log("Server Compiled!");
   }
 }
 

private/server/WebpackCompilerOptions.js

@@ -1,151 +0,0 @@
-// Copyright (c) 2018 Dominic Masters
-//
-// MIT License
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-//Includes
-const
-  path = require('path'),
-  webpack = require('webpack'),
-  HtmlWebpackPlugin = require('html-webpack-plugin'),
-  CompressionPlugin = require("compression-webpack-plugin"),
-  UglifyJsPlugin = require('uglifyjs-webpack-plugin'),
-  MiniCssExtractPlugin = require("mini-css-extract-plugin"),
-  OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin"),
-  SharpLoader = require('responsive-loader/sharp')
-;
-
-//Constants
-const SOURCE_DIRECTORY = './public';
-const ENTRY_FILE = 'index.jsx';
-const ENTRY_WRAPPER = 'index.html';
-
-module.exports = function(server, app) {
-  //Create our dirs
-  let entryDir = path.join(app.getPublicDirectory(), '..', 'public');
-
-  //Create our output
-  let output = {};
-
-  //Set the entry point
-  output.entry = path.join(entryDir, ENTRY_FILE);
-
-  //Set the output
-  output.output = {
-    path: app.getPublicDirectory(),
-    filename: "app.js"
-  }
-
-  //Set Resolves
-  output.resolve = {
-    modules: ['node_modules', SOURCE_DIRECTORY],
-    extensions: ['.js', '.jsx', '.css', '.scss' ]
-  };
-
-  //Setup Modules
-  output.module = {
-    rules: [
-      {
-        test: /\.jsx?$|\.js?$/,
-        exclude: /node_modules/,
-        use: {
-          loader: 'babel-loader'
-        }
-      },
-      {
-        test: /\.scss$|\.css$/i,
-        use: [
-          MiniCssExtractPlugin.loader,
-          "css-loader",
-          'sass-loader',
-        ]
-      },
-
-      {
-        test: /\.svg|\.webm|\.mp4$/i,
-        use: [{
-          loader: "file-loader",
-          options: {
-            name: "[path][name].[ext]",
-            context: 'public'
-          }
-        }]
-      },
-
-      {
-        test: /\.jpe?g$|\.gif$|\.png$/i,
-        use: [{
-          loader: "responsive-loader",
-          options: {
-            adapter: SharpLoader,
-            sizes: [250, 500, 1000, 1500, 2000, 2500],
-            name: "[path][name]_[width]x.[ext]",
-            context: 'public'
-          }
-        }]
-      },
-
-      {
-        test: /\.(eot|ttf|woff(2)?)(\?v=\d+\.\d+\.\d+)?/,
-        loader: 'url-loader'
-      }
-    ]
-  };
-
-  //Setup the Plugins
-  let HTMLWebpackPluginConfig = new HtmlWebpackPlugin({
-    template: path.join(SOURCE_DIRECTORY, ENTRY_WRAPPER),
-    filename: ENTRY_WRAPPER,
-    inject: true
-  });
-
-  let UglifyPluginConfig = new UglifyJsPlugin({
-    test: /\.js($|\?)/i
-  });
-
-  let MiniCssExtractConfig = new MiniCssExtractPlugin({
-    filename: "[name].css",
-    chunkFilename: "[id].css"
-  })
-
-  //Set the plugins
-  output.plugins = [
-    new webpack.DefinePlugin({
-      'process.env.NODE_ENV': JSON.stringify('production')
-    }),
-    MiniCssExtractConfig,
-    HTMLWebpackPluginConfig
-  ];
-
-  //Minimization
-  output.optimization = {
-    minimize: true,
-    minimizer: [
-      UglifyPluginConfig,
-      new OptimizeCSSAssetsPlugin({})
-    ]
-   };
-
-  //Now setup the production values
-  output.devtool = 'source-map';
-
-  return output;
-}

private/server/api/API.js

@@ -26,9 +26,10 @@ const
   fs = require('fs')
 ;
 
-const API_BASE = '/api';
+const API_BASE = path.resolve(__dirname, 'methods');
+const API_URL_BASE = '/api';
 
-class API {
+module.exports = class API {
   constructor(server) {
     this.server = server;
     this.handlers = [];
@@ -44,49 +45,42 @@ class API {
   addHandler(handler) {this.handlers.push(handler);}
 
   registerHandlers() {
-    for(let i = 0; i < this.handlers.length; i++) {
+    this.handlers.forEach(handler => {
-      let handler = this.handlers[i];
+      handler.getMethods().forEach(method => {
+        method = method.toLowerCase();
 
-      //Now we  need to register each of the paths to each of the methods!
-      for(let x = 0; x < handler.getMethods().length; x++) {
-        let method = handler.getMethods()[x].toLowerCase();
         //For each method, there's perhaps multiple paths (e.g. post /test, get /test, post /ayy, get /ayy)
-        for(let y = 0; y < handler.getPaths().length; y++) {
+        handler.getPaths().forEach(path => {
-          let path = handler.getPaths()[y];
+          let url = API_URL_BASE;
-          let url = API_BASE;
           if(!path.startsWith('/')) url += '/';
           url += path;
 
           this.getExpress()[method](url, handler.onMethod.bind(handler));
           console.log('Registering ' + url + '...');
-        }
+        });
-      }
+      });
-    }
+    });
   }
 
   loadHandlers() {
-    let dir = path.join(__dirname, 'methods');
+    this.loadHandlersInDirectory(API_BASE);
-    this.loadHandlersInDirectory(dir);
     this.registerHandlers();
   }
 
   loadHandlersInDirectory(dir) {
     let assets = fs.readdirSync(dir);
-    for(let i = 0; i < assets.length; i++) {
+    assets.forEach(asset => {
-      let asset = assets[i];
       let assetPath = path.join(dir, asset);
       let stats = fs.statSync(assetPath);
       if(stats.isDirectory()) {
         this.loadHandlersInDirectory(assetPath  );
-        continue;
+        return;
       }
 
       let method = require(assetPath);
       let instance = new method(this);
 
       this.addHandler(instance);
-    }
+    });
   }
 }
-
-module.exports = API;

private/server/api/APIRequest.js

@@ -21,7 +21,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-const Forms = require('./../../common/Forms');
+const Forms = require('./../../../common/Forms.js');
 
 class APIRequest {
   constructor(handler, req, res) {

private/server/api/methods/contact/send.js

@@ -35,7 +35,7 @@ const ERRORS = {
 
 module.exports = class Send extends APIHandler {
   constructor(api) {
-    super(api, ['POST'], '/contact/send');
+    super(api, ['GET', 'POST'], '/contact/send');
   }
 
   async handle(request) {

private/webpack/WebpackCompiler.js

@@ -0,0 +1,203 @@
+// Copyright (c) 2018 Dominic Masters
+//
+// MIT License
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// Copyright (c) 2018 Dominic Masters
+//
+// MIT License
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+const
+  path = require('path'),
+  fs = require('fs'),
+
+  webpack = require('webpack'),
+  SharpLoader = require('responsive-loader/sharp'),
+  HtmlWebpackPlugin = require('html-webpack-plugin'),
+  CompressionPlugin = require("compression-webpack-plugin"),
+  UglifyJsPlugin = require('uglifyjs-webpack-plugin'),
+  MiniCssExtractPlugin = require("mini-css-extract-plugin"),
+  OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin")
+;
+
+const base = path.resolve(`${__dirname}/../..`);
+
+// export webpack config
+module.exports = (isDev) => {
+  if(typeof isDev === typeof undefined) isDev = false;
+
+  //Base (Production) Configuration.
+  let config = {
+    devtool: 'source-map',
+    entry: [ `${base}/public/index.jsx` ],
+    output: { path: `${base}/dist`, filename: "app.js" },
+    mode: isDev ? 'development' : 'production',
+    resolve: {
+      modules: [`${base}/node_modules`, `${base}/public`],
+      extensions: ['.js', '.jsx', '.css', '.scss' ],
+      alias: {
+        '@public':  `${base}/public`,
+        '@objects': `${base}/public/objects`,
+        '@components': `${base}/public/components`,
+        '@assets': `${base}/public/assets`,
+        '@pages': `${base}/public/pages`,
+        '@common': `${base}/common`,
+        '@styles': `${base}/public/styles`
+      }
+    },
+
+    module: {
+      rules: [
+        {
+          test: /\.jsx?$/,
+          exclude: /node_modules/,
+          use: {
+            loader: 'babel-loader',
+            options: {
+              presets: [
+                [
+                  "@babel/preset-env",
+                  {
+                    "targets": {
+                      "node": "current",
+                      "browsers": [ "Chrome >= 41", "FireFox >= 44", "Safari >= 7", "Explorer 11", "last 4 Edge versions" ]
+                    },
+                    "useBuiltIns": false
+                  }
+                ],
+                "@babel/preset-react"
+              ],
+              "plugins": [ '@babel/plugin-syntax-dynamic-import' ]
+            }
+          }
+        },
+
+        {
+          test: /\.scss$|\.css$/i,
+          use: isDev ? (
+            [ "style-loader", "css-loader", 'sass-loader' ]
+          ) : (
+            [ MiniCssExtractPlugin.loader, "css-loader", 'sass-loader' ]
+          )
+        },
+
+        {
+          test: /\.svg$|\.webm$|\.mp4$/i,
+          use: [{
+            loader: "file-loader",
+            options: { name: "[path][name].[ext]", context: 'public' }
+          }]
+        },
+
+        {
+          test: /\.jpe?g$|\.gif$|\.png$/i,
+          use: [{
+            loader: "responsive-loader",
+            options: {
+              adapter: SharpLoader,
+              sizes: [250, 500, 1000, 1500, 2000, 2500],
+              name: "[path][name]_[width]x.[ext]",
+              context: 'public'
+            }
+          }]
+        },
+
+        {
+          test: /\.(eot|ttf|woff(2)?)(\?v=\d+\.\d+\.\d+)?/,
+          loader: 'url-loader'
+        }
+      ]
+    },
+
+    plugins: []
+  };
+
+  //Setup the Plugins
+  let HTMLWebpackPluginConfig = new HtmlWebpackPlugin({
+    template: `${base}/public/index.html`,
+    filename: 'index.html',
+    inject: true
+  });
+
+  config.plugins = [
+    ...config.plugins,
+    HTMLWebpackPluginConfig
+  ]
+
+  //Dev Setting Overrides
+  if(isDev) {
+    config = {
+      ...config,
+      devtool: 'cheap-module-eval-source-map',
+      plugins: [
+        ...config.plugins,
+        new webpack.HotModuleReplacementPlugin()
+      ]
+    };
+  } else {
+    let UglifyPluginConfig = new UglifyJsPlugin({
+      test: /\.js($|\?)/i
+    });
+
+    let MiniCssExtractConfig = new MiniCssExtractPlugin({
+      filename: "[name].css",
+      chunkFilename: "[id].css"
+    });
+
+    config = {
+      ...config,
+      plugins: [
+        ...config.plugins,
+        MiniCssExtractConfig,
+        HTMLWebpackPluginConfig
+      ],
+      optimization: {
+        minimize: true,
+        minimizer: [
+          UglifyPluginConfig,
+          MiniCssExtractConfig,
+          new OptimizeCSSAssetsPlugin({}),
+        ]
+      }
+    };
+  }
+
+  return config;
+};

public/components/App.jsx

@@ -72,6 +72,7 @@ class App extends React.Component {
 
     //For testing you can switch the router type
     let RouterType = BrowserRouter;
+    console.log(process.env.NODE_ENV);
     if(true) RouterType = HashRouter;
 
     return (

webpack.config.js

@@ -1,113 +1,26 @@
-const
+// Copyright (c) 2018 Dominic Masters
-  webpack = require('webpack'),
+//
-  HtmlWebpackPlugin = require('html-webpack-plugin'),
+// MIT License
-  SharpLoader = require('responsive-loader/sharp'),
+//
-  path = require('path')
+// Permission is hereby granted, free of charge, to any person obtaining
-;
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-const HTMLWebpackPluginConfig = new HtmlWebpackPlugin({
+const WebpackCompiler = require('./private/webpack/WebpackCompiler.js');
-  template: __dirname + '/public/index.html',
-  filename: 'index.html',
-  inject: 'body'
-});
 
-// export webpack config
+module.exports = WebpackCompiler(true);
-module.exports = {
-  devtool: 'cheap-module-eval-source-map',
-  entry: [
-    './public/index.jsx'
-  ],
-
-  output: {
-    path: '/dist',
-    filename: "app.js"
-  },
-
-  mode: 'development',
-
-  resolve: {
-    modules: ['node_modules', './public'],
-    extensions: ['.js', '.jsx', '.css', '.scss' ],
-    alias: {
-      '@public':  path.resolve(__dirname, './public'),
-      '@objects': path.resolve(__dirname, './public/objects'),
-      '@components': path.resolve(__dirname, './public/components'),
-      '@assets': path.resolve(__dirname, './public/assets'),
-      '@pages': path.resolve(__dirname, './public/pages'),
-      '@common': path.resolve(__dirname, './common/'),
-      '@styles': path.resolve(__dirname, './public/styles')
-    }
-  },
-
-  // declare loaders to be used in webpack
-  module: {
-    rules: [
-      {
-        test: /\.jsx?$/,
-        exclude: /node_modules/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            presets: [
-              [
-                "@babel/preset-env",
-                {
-                  "targets": {
-                    "node": "current",
-                    "browsers": [ "Chrome >= 41", "FireFox >= 44", "Safari >= 7", "Explorer 11", "last 4 Edge versions" ]
-                  },
-                  "useBuiltIns": false
-                }
-              ],
-              "@babel/preset-react"
-            ],
-            "plugins": [ '@babel/plugin-syntax-dynamic-import' ]
-          }
-        }
-      },
-
-      {
-        test: /\.scss$|\.css$/i,
-        loaders: ["style-loader", "css-loader", "sass-loader"]
-      },
-
-      {
-        test: /\.svg$|\.webm$|\.mp4$/i,
-        use: [{
-          loader: "file-loader",
-          options: {
-            name: "[path][name].[ext]",
-            context: 'public'
-          }
-        }]
-      },
-
-      {
-        test: /\.jpe?g$|\.gif$|\.png$/i,
-        use: [{
-          loader: "responsive-loader",
-          options: {
-            adapter: SharpLoader,
-            sizes: [250, 500, 1000, 1500, 2000, 2500],
-            name: "[path][name]_[width]x.[ext]",
-            context: 'public'
-          }
-        }]
-      },
-
-      {
-        test: /\.(eot|ttf|woff(2)?)(\?v=\d+\.\d+\.\d+)?/,
-        loader: 'url-loader'
-      }
-    ]
-  },
-
-  // initialize the added webpack plugins
-  plugins: [
-    HTMLWebpackPluginConfig,
-    new webpack.HotModuleReplacementPlugin(),
-    new webpack.DefinePlugin({
-      DEVELOPMENT: JSON.stringify(true)
-    })
-  ]
-};