Commit 9d157e38 authored by Antek Grzanka's avatar Antek Grzanka

Door squeaking, removed console logs, some flags maybe? lol

parent 66566964
body { body {
background: url('/statics/img/bkg.jpg'); background: url('/statics/img/bkg.jpg');
color: white; color: white;
background-position: bottom right;
height: 100vh;
}
#background {
position: absolute;
/*top: 69%;*/
bottom: 0;
/*left: 81%;*/
right: 252px;
height: 286px;
width: 134px;
z-index:10;
background-repeat: no-repeat;
} }
nav { nav {
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
$scope.logout = function(){ $scope.logout = function(){
NavbarService.setGuest(); NavbarService.setGuest();
AuthenticationService.logout(function(data){ AuthenticationService.logout(function(data){
$location.path(''); $location.path('/login');
}); }.bind(this));
}; };
$scope.$watch(function(){ $scope.$watch(function(){
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
function viewGraph(){ function viewGraph(){
$('.column').css('height','0'); $('.column').css('height','0');
console.log($scope.teamsScores); // console.log($scope.teamsScores);
setTimeout(function(){ setTimeout(function(){
$('.column').each(function(){ $('.column').each(function(){
$(this).animate({width: 150*$(this).attr('data-score')}, 1500); $(this).animate({width: 150*$(this).attr('data-score')}, 1500);
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
APIProvider.getScores(function(data){ APIProvider.getScores(function(data){
console.log('Data from server', data); // console.log('Data from server', data);
$scope.teamsScores = calculatePerTeam(data); $scope.teamsScores = calculatePerTeam(data);
console.log('Teams scores', $scope.teamsScores); // console.log('Teams scores', $scope.teamsScores);
viewGraph(); viewGraph();
}); });
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
$scope.submitUnknown = false; $scope.submitUnknown = false;
$scope.apiAddress = 'http://' + AppSettings.apiAddress; $scope.apiAddress = 'http://' + AppSettings.apiAddress;
$scope.selectedTaskId = $stateParams.taskLevel; $scope.selectedTaskId = $stateParams.taskLevel;
console.log('SELECTED TASK ID', $scope.selectedTaskId); // console.log('SELECTED TASK ID', $scope.selectedTaskId);
APIProvider.getTaskById($scope.selectedTaskId, function(data){ APIProvider.getTaskById($scope.selectedTaskId, function(data){
console.log(data); // console.log(data);
$scope.task = data; $scope.task = data;
}); });
$scope.submitFlag = function(){ $scope.submitFlag = function(){
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
Materialize.toast('Poprawna flaga! :)', 5000, 'toast-success'); Materialize.toast('Poprawna flaga! :)', 5000, 'toast-success');
$scope.submitUnknown = false; $scope.submitUnknown = false;
}).error(function(){ }).error(function(){
console.log("Flaga zla!"); // console.log("Flaga zla!");
Materialize.toast('Błędna flaga! :(', 5000 ,'toast-error'); Materialize.toast('Błędna flaga! :(', 5000 ,'toast-error');
$scope.submitUnknown = false; $scope.submitUnknown = false;
}); });
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
angular.module('ctfApp').controller('TasksController', ['$scope', '$http', 'APIProvider', 'AppSettings', function($scope, $http, APIProvider, AppSettings) { angular.module('ctfApp').controller('TasksController', ['$scope', '$http', 'APIProvider', 'AppSettings', function($scope, $http, APIProvider, AppSettings) {
$scope.apiAddress = AppSettings.apiAddress; $scope.apiAddress = AppSettings.apiAddress;
APIProvider.getTasks(function(data){ APIProvider.getTasks(function(data){
console.log(data); // console.log(data);
APIProvider.getMyCompletedLevelsList(function(completed){ APIProvider.getMyCompletedLevelsList(function(completed){
$.each(data, function(key, task){ $.each(data, function(key, task){
if (completed.indexOf(task.level) !== -1){ if (completed.indexOf(task.level) !== -1){
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment