Added Roles, User Management, fixed bugs, added FlexTable component (should be renamed to GridTable), other table components and test code should be removed down the line, added admin function to fix broken data structures.

server/main.js

@@ -1,40 +1,35 @@
+
+import './DataCollection.js';
 import '../imports/api/';
 import './google-oauth.js';
 import '/imports/startup/accounts-config.js';
+import './logging';
 
-import url from 'url';
-//import './google-oauth.js';
-import connectRoute from 'connect-route';
 
-/* Did not work at all.. not sure why.
-let WebSocketServer = require("ws").Server;
-//var wss = new WebSocketServer({ port: env.PORT });
-let wss = new WebSocketServer({host: '192.168.3.101', port: 3001});
 
-console.log("Starting WS");
 
-wss.on("connection", function (ws) {
-	console.log("WS Open");
-
-	ws.on("message", function(data) {
-		console.log(data);
-		ws.send("Pong");
-	}).on("error", (err) => {
-		console.log(err);
-	})
-}).on('error', (err) => {
-	console.error(err);
-});
-
-// const net = require('net');
+//Some basic testing of detecting which mode the app is running under...
 //
-// const server = net.createServer((socket) => {
-// 	socket.on('data', (data) => {
-// 		console.log(data.toString());
-// 		socket.write("Pong");
-// 	});
-// }).on('error', (err) => {
-// 	console.error(err);
-// });
+// if(process.env.NODE_ENV === "development") {
+// 	console.log("In Dev Mode");
+// }
+// else if(process.env.NODE_ENV === "production") {
+// 	console.log("In Prod Mode");
+// }
+// else {
+// 	console.log("No idea what mode we are in!");
+// }
+
+
+//TEST LOG OUTPUT...
+// let obj = {test: 'abc'};
+// console.log("Test Output");
+// console.log(obj);
+//
+// try {
+// 	throw Exception("Error!!");
+// }
+// catch(err) {
+// 	console.error(err);
+// }
 
- */