Added .editorconfig and fixed indentation

oriuminc · Aug 15, 2015 · bc88126 · bc88126
1 parent 4d43522
commit bc88126
Show file tree

Hide file tree

Showing 2 changed files with 90 additions and 82 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*]
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
diff --git a/server.js b/server.js
@@ -1,102 +1,102 @@
 var express = require('express'),
-	bodyParser = require('body-parser');
+    bodyParser = require('body-parser');
 
 var app = express();
 
 // parse application/x-www-form-urlencoded
 app.use(bodyParser.urlencoded({ extended: false }));
 
 var stationMap = {
-	'0800280179b7': {
-		name: 'Death Star'
-	}
+    '0800280179b7': {
+        name: 'Death Star'
+    }
 };
 
 var userMap = {
-	'fe5754a5': {
-		name: 'Ates'
-	},
-	'fbfb8a34': {
-		name: 'Erin'
-	}
+    'fe5754a5': {
+        name: 'Ates'
+    },
+    'fbfb8a34': {
+        name: 'Erin'
+    }
 };
 
 var assetMap = {
-	'5e8c07db': {
-		name: 'Bartending for Dummies'
-	}
+    '5e8c07db': {
+        name: 'Bartending for Dummies'
+    }
 };
 
 app.use(function (req, res) {
-	console.log('Mac:', req.body.mac, 'ID:', req.body.id);
-
-	var station = stationMap[req.body.mac];
-
-	if (station) {
-		console.log('Station: ' + station.name);
-
-		switch (req.body.id) {
-		case 'HELLO':
-			res.send('Welcome back\r\n' + station.name + '!');
-			break;
-		default:
-			var user = userMap[req.body.id];
-
-			if (user) {
-				console.log('User: ' + user.name);
-
-				var now = new Date();
-
-				if (now - user.sessionStartDate < 10 * 1000) {
-					if (user.sessionStation === station) {
-						console.log('Session ended');
-						res.send('Bye\r\n' + user.name + '!');
-						user.sessionStartDate = null;
-					} else {
-						console.log('Session started');
-						res.send('Hello\r\n' + user.name + '!');
-						user.sessionStartDate = now;
-						user.sessionStation = station;
-					}
-				} else {
-					console.log('Session started');
-					res.send('Hello\r\n' + user.name + '!');
-					user.sessionStartDate = now;
-					user.sessionStation = station;
-				}
-			} else {
-				var asset = assetMap[req.body.id];
-
-				if (asset) {
-					console.log('Asset: ' + asset.name);
-
-					for (var userId in userMap) {
-						var user = userMap[userId];
-
-						var now = new Date();
-						
-						if (now - user.sessionStartDate < 10 * 1000) {
-							if (user.sessionStation === station) {
-								console.log('Checked out');
-								res.send('Checked out\r\n' + asset.name);
-								user.sessionStartDate = null;
-								return;
-							}
-						}
-					}
-
-					res.send(asset.name);
-				} else {
-					console.log('Unknown user/asset');
-					res.send('Unkown user\r\nor asset');
-				}
-			}
-			break;
-		}
-	} else {
-		console.log('Unknown station: ' + req.body.mac);
-		res.send('Unknown station');
-	}
+    console.log('Mac:', req.body.mac, 'ID:', req.body.id);
+
+    var station = stationMap[req.body.mac];
+
+    if (station) {
+        console.log('Station: ' + station.name);
+
+        switch (req.body.id) {
+        case 'HELLO':
+            res.send('Welcome back\r\n' + station.name + '!');
+            break;
+        default:
+            var user = userMap[req.body.id];
+
+            if (user) {
+                console.log('User: ' + user.name);
+
+                var now = new Date();
+
+                if (now - user.sessionStartDate < 10 * 1000) {
+                    if (user.sessionStation === station) {
+                        console.log('Session ended');
+                        res.send('Bye\r\n' + user.name + '!');
+                        user.sessionStartDate = null;
+                    } else {
+                        console.log('Session started');
+                        res.send('Hello\r\n' + user.name + '!');
+                        user.sessionStartDate = now;
+                        user.sessionStation = station;
+                    }
+                } else {
+                    console.log('Session started');
+                    res.send('Hello\r\n' + user.name + '!');
+                    user.sessionStartDate = now;
+                    user.sessionStation = station;
+                }
+            } else {
+                var asset = assetMap[req.body.id];
+
+                if (asset) {
+                    console.log('Asset: ' + asset.name);
+
+                    for (var userId in userMap) {
+                        var user = userMap[userId];
+
+                        var now = new Date();
+
+                        if (now - user.sessionStartDate < 10 * 1000) {
+                            if (user.sessionStation === station) {
+                                console.log('Checked out');
+                                res.send('Checked out\r\n' + asset.name);
+                                user.sessionStartDate = null;
+                                return;
+                            }
+                        }
+                    }
+
+                    res.send(asset.name);
+                } else {
+                    console.log('Unknown user/asset');
+                    res.send('Unkown user\r\nor asset');
+                }
+            }
+            break;
+        }
+    } else {
+        console.log('Unknown station: ' + req.body.mac);
+        res.send('Unknown station');
+    }
 });
 
 app.listen(8088);