added stuff

Author: mzhang28

.travis.yml

@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - "0.11"
+  - "0.10"

app/pages/account.html

@@ -35,32 +35,32 @@ <h1>Account Settings</h1>
 
 				<div id="update_msg"></div>
 
-				<div class="well col-lg-7">
+				<div class="well col-lg-8">
 					<form action="javascript:updateInfo()" class="form-horizontal">
 						<fieldset>
 							<legend>Basic Account Info</legend>
 							<div class="form-group">
-								<label for="account-name" class="col-lg-3 control-label">Team Name</label>
+								<label for="account-name" class="col-lg-4 control-label">Team Name</label>
 								<div class="col-lg-8">
 									<input id="account-name" type="text" name="account-name" placeholder="Team Name" class="form-control">
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-lg-3 control-label">Email
+								<label class="col-lg-4 control-label">Email
 									<br /><small>Sorry, can't change this.</small>
 								</label>
 								<div class="col-lg-8">
 									<input id="account-email" type="text" disabled placeholder="Email" class="form-control">
 								</div>
 							</div>
 							<div class="form-group">
-								<label for="account-school" class="col-lg-3 control-label">School / Affiliation</label>
+								<label for="account-school" class="col-lg-4 control-label">School / Affiliation</label>
 								<div class="col-lg-8">
 									<input id="account-school" type="text" name="account-school" placeholder="School / Affiliation" class="form-control">
 								</div>
 							</div>
 							<div class="form-group">
-								<label for="account-password" class="col-lg-3 control-label">New Password
+								<label for="account-password" class="col-lg-4 control-label">New Password
 									<br /><small>Leave blank to leave unchanged.</small>
 								</label>
 								<div class="col-lg-8">
@@ -71,13 +71,13 @@ <h1>Account Settings</h1>
 						<fieldset>
 							<legend>Type your Password to Confirm</legend>
 							<div class="form-group">
-								<label for="account-confirm" class="col-lg-3 control-label">Confirm Changes</label>
+								<label for="account-confirm" class="col-lg-4 control-label">Confirm Changes</label>
 								<div class="col-lg-8">
 									<input id="account-confirm" type="password" name="account-confirm" placeholder="Confirm changes" class="form-control">
 								</div>
 							</div>
 							<div class="form-group">
-								<label for="account-submit" class="col-lg-3 control-label"></label>
+								<label for="account-submit" class="col-lg-4 control-label"></label>
 								<div class="col-lg-8">
 									<input id="account-submit" type="submit" name="account-submit" value="Update Account" class="btn btn-primary">
 								</div>
@@ -96,6 +96,8 @@ <h1>Account Settings</h1>
 		<script type="text/javascript">
 			$(function() {
 				display_navbar();
+				redirect_if_not_logged_in();
+				load_account_info();
 				load_footer();
 			});
 		</script>

app/pages/problems.html

@@ -43,6 +43,7 @@ <h1>Problems</h1>
 		<script type="text/javascript">
 			$(function() {
 				display_navbar();
+				redirect_if_not_logged_in();
 				load_footer();
 			});
 		</script>

app/router.js

@@ -46,7 +46,7 @@ module.exports = function(app) {
 						res.redirect(301, "/login");
 						return;
 					} else {
-						if (moment().isBefore(common.startDate)) {
+						if (!(moment().isAfter(common.startDate) || req.session.group == 3)) {
 							console.log("[app/router.js] competition hasn't started yet!");
 							res.redirect(301, "/account");
 							return;

web/js/account.js

@@ -0,0 +1,51 @@
+(function() {
+	window.load_account_info = function() {
+		$.ajax({
+			type: "GET",
+			dataType: "json",
+			url: "/api/account/info"
+		}).done(function(data) {
+			if (data.success == 1) {
+				$("#account-name").val(data.name);
+				$("#account-email").val(data.email);
+				$("#account-school").val(data.school);
+			} else {
+				// why
+			}
+		});
+	}
+
+	window.updateInfo = function() {
+		$("[id^=account-]").attr("disabled", "disabled");
+		$.ajax({
+			url: "/api/account/update",
+			type: "POST",
+			dataType: "json",
+			data: {
+				teamname: $("#account-name").val(),
+				school: $("#account-school").val(),
+				password: $("#account-password").val(),
+				confirm: $("#account-confirm").val(),
+			}
+		}).done(function(data) {
+			console.dir(data);
+			if (data.success !== 1) {
+				$("#update_msg").hide().html("<div class='alert alert-danger'>" + data.message + "</div>").slideDown("normal");
+				setTimeout(function() {
+					return $("#update_msg").slideUp("normal", function() {
+						return $("#update_msg").html("").show();
+					});
+				}, 2000);
+				$("[id^=account-]").removeAttr("disabled");
+			} else {
+				$("#update_msg").hide().html("<div class='alert alert-success'>" + data.message + "</div>").slideDown("normal");
+				return setTimeout(function() {
+					return $("#update_msg").slideUp("normal", function() {
+						$("#update_msg").html("").show();
+						window.location.reload(true);
+					});
+				}, 2000);
+			}
+		});
+	};
+}).call(this);

web/js/dependencies.js

@@ -73,15 +73,17 @@ function display_navbar () {
 	$.ajax({
 		url: "/api/auth/loggedin",
 		method: "GET",
-		dataType: "json"
+		dataType: "json",
+		cache: false
 	}).done(function(data) {
-		console.dir(data);
+		// console.dir(data);
 		build_navbar(2);
 		if (data.success === 1) {
 			$.ajax({
 				url: "/api/auth/authorized",
 				method: "GET",
-				dataType: "json"
+				dataType: "json",
+				cache: false
 			}).done(function(data2) {
 				if (data2.success === 1) {
 					build_navbar(0);
@@ -103,4 +105,17 @@ function load_footer() {
 	}).done(function(data) {
 		$("#footer").html(data);
 	});
+}
+
+function redirect_if_not_logged_in() {
+    $.ajax({
+        type: "GET",
+        url: "/api/auth/loggedin",
+        cache: false
+    }).done(function (data) {
+		if (data['success'] == 0)
+			window.location.href = '/login';
+	}).fail(function () {
+		window.location.href = '/';
+	});
 }

web/js/scoreboard.js

@@ -7,6 +7,7 @@
 			cache: false,
 			async: true
 		}).done(function(board) {
+			console.log(board);
 			$("#public_scoreboard_container").html(board);
 		});
 	};