@blaasvaer/frmwrk 0.3.0 → 0.3.1

package/index.js

@@ -10,11 +10,8 @@
  * Native modules
  */
 const http = require('http');
-const { Server } = require('socket.io');
 
 let port;
-let _config;
-let _io;
 
 /**
  * Custom modules
@@ -25,7 +22,8 @@ const Utils = require('./utils');
 /**
  * Define variables
  */
-let hostname;
+let hostname,
+server;
 
 /**
  * If port number is passed in as first (custom) parameter, set port
@@ -48,9 +46,12 @@ if ( process.env.NODE_ENV !== 'production') {
  * @return {Node}        Node
  */
 FW = function ( config ) {
-	_config = config || {};
+	let _this = this;
 
-	hostname = _config.hostname ? _config.hostname : '0.0.0.0';
+	hostname = config.hostname ? config.hostname : '0.0.0.0';
+
+	controllers = {};
+	models = {};
 
 	/**
 	 * Set the Controller
@@ -113,10 +114,6 @@ console.log("Authorize - check credentials:", credentials);
 		// return true;
 	}
 
-	getSocketIO = () => {
-		return _io;
-	}
-
 	/**
 	 * Install framework components and start the server
 	 */
@@ -130,19 +127,13 @@ console.log("Authorize - check credentials:", credentials);
 		 * Create and start the server
 		 * @return {function} Server instance
 		 */
-		const server = http.createServer( handleRequest ).listen(port, hostname, () => {
+		http.createServer( handleRequest ).listen(port, hostname, () => {
 			console.log(`Server running at http://${hostname}:${port}`);
 		});
-
-		if ( config.enable_socket_io ) {
-			_io = new Server( server );
-		}
 	})
 	.catch(function( err ) {
 console.log("Install Error:", err);
-	});
-
-	return this;
+	});;
 };
 
 /**
@@ -151,18 +142,19 @@ console.log("Install Error:", err);
  * Installs the components of the framework like; controllers, models, views, users etc.
  * @param {Object} config Config object
  */
-global.Install = () => {
-	global.publicPath = _config.root + '/themes/' + _config.theme;
+global.Install = function Install ( config ) {
+	// global.publicPath = config.root + '/themes/' + config.theme + '/' + 'public/';
+	global.publicPath = config.root + '/themes/' + config.theme;
 
 	/**
 	 * Installation processes to run
 	 * @type {Array}
 	 */
 	let install_processes = [
-		require('./controllers')( _config ),
-		require('./models')( _config ),
-		require('./views')( _config ),
-		require('./connections')( _config ),
+		require('./controllers')( config ),
+		require('./models')( config ),
+		require('./views')( config ),
+		require('./connections')( config ),
 		// require('./users')( config )
 	];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaasvaer/frmwrk",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "My personal Node framework",
   "main": "index.js",
   "scripts": {