spaces to tabs

Author: lannonbr

index.js

@@ -1,8 +1,8 @@
 var express = require('express'),
-  bodyParser = require('body-parser'),
-  talksCtrl = require('./talks-ctrl.js'),
-  morgan = require('morgan'),
-  requestIp = require('request-ip');
+	bodyParser = require('body-parser'),
+	talksCtrl = require('./talks-ctrl.js'),
+	morgan = require('morgan'),
+	requestIp = require('request-ip');
 
 var app = express();
 
@@ -45,5 +45,5 @@ app.post('/api/unhideTalk', talksCtrl.updateTalk);
 
 // start the server
 app.listen(3000, () => {
-  console.log('Server listening on port 3000, press ctrl-C to quit...');
+	console.log('Server listening on port 3000, press ctrl-C to quit...');
 });

package.json

@@ -1,26 +1,26 @@
 {
-  "name": "node-talks",
-  "version": "1.0.0",
-  "description": "A clone of the COSI talks flask app",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Benjamin Lannon",
-  "license": "MIT",
-  "dependencies": {
-    "body-parser": "^1.15.0",
-    "express": "^4.13.4",
-    "gulp": "^3.9.1",
-    "gulp-jshint": "^2.0.0",
-    "insubnet": "0.0.8",
-    "jshint": "^2.9.1",
-    "jshint-stylish": "^2.1.0",
-    "morgan": "^1.7.0",
-    "promise": "^7.1.1",
-    "pug": "^2.0.0-alpha7",
-    "request-ip": "^1.2.2",
-    "sequelize": "^3.19.3",
-    "sqlite3": "^3.1.1"
-  }
+	"name": "node-talks",
+	"version": "1.0.0",
+	"description": "A clone of the COSI talks flask app",
+	"main": "index.js",
+	"scripts": {
+		"test": "echo \"Error: no test specified\" && exit 1"
+	},
+	"author": "Benjamin Lannon",
+	"license": "MIT",
+	"dependencies": {
+		"body-parser": "^1.15.0",
+		"express": "^4.13.4",
+		"gulp": "^3.9.1",
+		"gulp-jshint": "^2.0.0",
+		"insubnet": "0.0.8",
+		"jshint": "^2.9.1",
+		"jshint-stylish": "^2.1.0",
+		"morgan": "^1.7.0",
+		"promise": "^7.1.1",
+		"pug": "^2.0.0-alpha7",
+		"request-ip": "^1.2.2",
+		"sequelize": "^3.19.3",
+		"sqlite3": "^3.1.1"
+	}
 }

public/css/app.css

@@ -1,7 +1,7 @@
 @import url("https://fonts.googleapis.com/css?family=Open+Sans");
 
 body {
-  font-family: "Open Sans";
+	font-family: "Open Sans";
 	background-color: #78909c;
 	color: white;
 	margin: 0;
@@ -12,25 +12,25 @@ body {
 h1 {
 	font-size: 48px;
 	text-align: center;
-  margin-bottom: 0px;
+	margin-bottom: 0px;
 }
 
 td.hides {
-  clear: both;
+	clear: both;
 }
 
 td.hides button {
-  display: inline;
-  float: left;
-  background: 0;
-  /*border: 0;
-  outline: 0;*/
-  color: white;
+	display: inline;
+	float: left;
+	background: 0;
+	/*border: 0;
+	outline: 0;*/
+	color: white;
 
-  &:hover {
-    background: white;
-    color: #78909c;
-  }
+	&:hover {
+		background: white;
+		color: #78909c;
+	}
 }
 
 h3 {
@@ -39,9 +39,9 @@ h3 {
 }
 
 h5 {
-  font-size: 16px;
-  font-weight: bolder;
-  text-align: center;
+	font-size: 16px;
+	font-weight: bolder;
+	text-align: center;
 }
 
 #nav {
@@ -70,6 +70,7 @@ h5 {
 }
 
 #talks-table {
+	color: white;
 	width: 80%;
 	margin: 0 auto;
 	font-size: 120%;

public/js/app.js

@@ -1,69 +1,69 @@
 var app = angular.module('talksApp', []);
 
 function getTalks($scope, $http) {
-  // send the GET request
-  $http.get("/api/talks").success(data => {
-    $scope.talks = data; // Set the scope's talks to be the output of the api call
-  });
+	// send the GET request
+	$http.get("/api/talks").success(data => {
+		$scope.talks = data; // Set the scope's talks to be the output of the api call
+	});
 }
 
 function postTalk($scope, $http) {
-  // Set the data to be sent through the request to be the newTalk object
-  var data = $scope.newTalk;
+	// Set the data to be sent through the request to be the newTalk object
+	var data = $scope.newTalk;
 
-  // Send the POST request
-  $http.post("/api/postTalk", data).then(response => {
-      $scope.talks = response.data; // Set the scope's talks to be the output of the api call
-  }, error => {
-    alert("Talk submissions are only allowed in the 128.153.0.0/16 subnet");
-  });
+	// Send the POST request
+	$http.post("/api/postTalk", data).then(response => {
+			$scope.talks = response.data; // Set the scope's talks to be the output of the api call
+	}, error => {
+		alert("Talk submissions are only allowed in the 128.153.0.0/16 subnet");
+	});
 }
 
 function hideTalk($scope, $http) {
-  var data = {
-    talkId: $scope.id,
-    hiddenStatus: true
-  };
+	var data = {
+		talkId: $scope.id,
+		hiddenStatus: true
+	};
 
-  $http.post("/api/hideTalk", data).then(response => {
-    $scope.talks = response.data;
-  }, error => {
-    alert("Talk modifications are only allowed in the 128.153.0.0/16 subnet");
-  });
+	$http.post("/api/hideTalk", data).then(response => {
+		$scope.talks = response.data;
+	}, error => {
+		alert("Talk modifications are only allowed in the 128.153.0.0/16 subnet");
+	});
 }
 
 function unhideTalk($scope, $http) {
-  var data = {
-    talkId: $scope.id,
-    hiddenStatus: false
-  };
+	var data = {
+		talkId: $scope.id,
+		hiddenStatus: false
+	};
 
-  $http.post("/api/unhideTalk", data).then(response => {
-    $scope.talks = response.data;
-  }, error => {
-    alert("Talk modifications are only allowed in the 128.153.0.0/16 subnet");
-  });
+	$http.post("/api/unhideTalk", data).then(response => {
+		$scope.talks = response.data;
+	}, error => {
+		alert("Talk modifications are only allowed in the 128.153.0.0/16 subnet");
+	});
 }
 
 // The main controller for the page
 app.controller('talksController', ($scope, $http) => {
-  getTalks($scope, $http); // Always load in talks at startup
+	getTalks($scope, $http); // Always load in talks at startup
 
-  // Send a http POST request to create a new talk
-  $scope.createTalk = () => {
-    postTalk($scope, $http);
-    $scope.newTalk = {}; // Clear out the input boxes
-  };
+	// Send a http POST request to create a new talk
+	$scope.createTalk = () => {
+		postTalk($scope, $http);
+		$scope.newTalk = {}; // Clear out the input boxes
+	};
 
-  // Hide a certain talk
-  $scope.hide = (id) => {
-    $scope.id = id;
-    hideTalk($scope, $http);
-  };
+	// Hide a certain talk
+	$scope.hide = (id) => {
+		$scope.id = id;
+		hideTalk($scope, $http);
+	};
 
-  // unhide a certain talk
-  $scope.unhide = (id) => {
-    $scope.id = id;
-    unhideTalk($scope, $http);
-  };
+	// unhide a certain talk
+	$scope.unhide = (id) => {
+		$scope.id = id;
+		unhideTalk($scope, $http);
+	};
 });

talks-ctrl.js

@@ -2,78 +2,78 @@ var Sequelize = require('sequelize');
 var inSubnet = require('insubnet');
 
 module.exports.getTalks = (req, res) => {
-  let sequelize = connectToServer();
-  let talksModel = sequelize.import(__dirname + "/talks-model.js");
-  loadTalks(talksModel, res);
+	let sequelize = connectToServer();
+	let talksModel = sequelize.import(__dirname + "/talks-model.js");
+	loadTalks(talksModel, res);
 };
 
 module.exports.getVisibleTalks = (req, res) => {
-  let sequelize = connectToServer();
-  let talksModel = sequelize.import(__dirname + "/talks-model.js");
-  loadVisibleTalks(talksModel, res);
+	let sequelize = connectToServer();
+	let talksModel = sequelize.import(__dirname + "/talks-model.js");
+	loadVisibleTalks(talksModel, res);
 }
 
 module.exports.createTalk = (req, res) => {
-  if(!inSubnet.IPv4(req.clientIp, '128.153.0.0/16')) {
-    res.sendStatus(500);
-    return;
-  }
+	if(!inSubnet.IPv4(req.clientIp, '128.153.0.0/16')) {
+		res.sendStatus(500);
+		return;
+	}
 
-  let sequelize = connectToServer();
-  let talksModel = sequelize.import(__dirname + "/talks-model.js");
+	let sequelize = connectToServer();
+	let talksModel = sequelize.import(__dirname + "/talks-model.js");
 
-  // write the new talk to the server
-  return talksModel.sync().then(() => {
-    // create an instance of the model and save to the db
-    talksModel.create({name: req.body.name, type: req.body.type, desc: req.body.desc}, {
-      fields: ['id', 'name', 'type', 'desc']
-    }).then(data => {
-      // reload the talks
-      loadTalks(talksModel, res);
-    });
-  });
+	// write the new talk to the server
+	return talksModel.sync().then(() => {
+		// create an instance of the model and save to the db
+		talksModel.create({name: req.body.name, type: req.body.type, desc: req.body.desc}, {
+			fields: ['id', 'name', 'type', 'desc']
+		}).then(data => {
+			// reload the talks
+			loadTalks(talksModel, res);
+		});
+	});
 };
 
 module.exports.updateTalk = (req, res) => {
-  if(!inSubnet.IPv4(req.clientIp, '128.153.0.0/16')) {
-    res.sendStatus(500);
-    return;
-  }
+	if(!inSubnet.IPv4(req.clientIp, '128.153.0.0/16')) {
+		res.sendStatus(500);
+		return;
+	}
 
-  let sequelize = connectToServer();
-  let talksModel = sequelize.import(__dirname + "/talks-model.js");
+	let sequelize = connectToServer();
+	let talksModel = sequelize.import(__dirname + "/talks-model.js");
 
-  return talksModel.sync().then(() => {
-    return talksModel.update(
-      { hidden: req.body.hiddenStatus },
-      { where: { id: req.body.talkId }}
-    );
-  }).then(() => {
-    loadTalks(talksModel, res);
-  });
+	return talksModel.sync().then(() => {
+		return talksModel.update(
+			{ hidden: req.body.hiddenStatus },
+			{ where: { id: req.body.talkId }}
+		);
+	}).then(() => {
+		loadTalks(talksModel, res);
+	});
 };
 
 // Send a SELECT query to the database and return the response as JSON
 function loadTalks(model, res) {
-  return model.findAll({
-    attributes: ['id', 'name', 'type', 'desc', 'hidden']
-  }).then(result => {
-    return res.json(result);
-  });
+	return model.findAll({
+		attributes: ['id', 'name', 'type', 'desc', 'hidden']
+	}).then(result => {
+		return res.json(result);
+	});
 }
 
 function loadVisibleTalks(model, res) {
-  return model.findAll({
-    attributes: ['id', 'name', 'type', 'desc', 'hidden'],
-    where: {hidden: false}
-  }).then(result => {
-    return res.json(result);
-  });
+	return model.findAll({
+		attributes: ['id', 'name', 'type', 'desc', 'hidden'],
+		where: {hidden: false}
+	}).then(result => {
+		return res.json(result);
+	});
 }
 
 function connectToServer() {
-  return new Sequelize('database', 'username', 'password', {
-    dialect: 'sqlite',
-    storage: './talks.db'
-  });
+	return new Sequelize('database', 'username', 'password', {
+		dialect: 'sqlite',
+		storage: './talks.db'
+	});
 }