diff --git a/frontend/app/controllers/accountController.js b/frontend/app/controllers/accountController.js index 28bdf41..88d2dba 100644 --- a/frontend/app/controllers/accountController.js +++ b/frontend/app/controllers/accountController.js @@ -77,7 +77,7 @@ cont.controller('accountController', function ($scope, $filter, $http, $location if (user == null || ticket == null) { setTimeout($scope.fetchNext10Best, 2000); } - $http.get('http://' + $scope.hostname + '/ppapi/polls/get/best/' + $http.get('/ppapi/polls/get/best/' + user + '/' + ticket + '/' + $scope.currentPolls + onlyUser) .success(function (data, status, headers, config) { $scope.fetching = false; @@ -105,7 +105,7 @@ cont.controller('accountController', function ($scope, $filter, $http, $location if (user == null || ticket == null) { setTimeout($scope.fetch10New, 2000); } - $http.get('http://' + $scope.hostname + '/ppapi/polls/get/newest/' + $http.get('/ppapi/polls/get/newest/' + user + '/' + ticket + '/' + $scope.currentPolls + onlyUser).success(function (data, status, headers, config) { $scope.fetching = false; if (data.err) { @@ -131,7 +131,7 @@ cont.controller('accountController', function ($scope, $filter, $http, $location if ($scope.currentPolls == 0) return; var user = localStorage.getItem('netid'); var ticket = localStorage.getItem('ticket'); - $http.get('http://' + $scope.hostname + '/ppapi/polls/get/newest/' + $http.get('/ppapi/polls/get/newest/' + user + '/' + ticket + '/' + $scope.currentPolls + onlyUser) .success(function (data, status, headers, config) { $scope.fetching = false; diff --git a/frontend/app/controllers/feedController.js b/frontend/app/controllers/feedController.js index 5d13bef..3ce8b7a 100755 --- a/frontend/app/controllers/feedController.js +++ b/frontend/app/controllers/feedController.js @@ -54,7 +54,7 @@ cont.controller('feedController', function ($scope, $filter, $http, $location) { if (user == null || ticket == null) { setTimeout($scope.fetch10Popular, 1000); } - $http.get('http://' + $scope.hostname + '/ppapi/polls/get/popular/' + $http.get('/ppapi/polls/get/popular/' + user + '/' + ticket + '/' + $scope.currentPolls + onlyUser).success(function (data, status, headers, config) { $scope.fetching = false; if (data.err) { @@ -83,7 +83,7 @@ cont.controller('feedController', function ($scope, $filter, $http, $location) { if (user == null || ticket == null) { setTimeout($scope.fetchNext10Popular, 1000); } - $http.get('http://' + $scope.hostname + '/ppapi/polls/get/popular/' + $http.get('/ppapi/polls/get/popular/' + user + '/' + ticket + '/' + $scope.currentPolls + onlyUser) .success(function (data, status, headers, config) { $scope.fetching = false; @@ -111,7 +111,7 @@ cont.controller('feedController', function ($scope, $filter, $http, $location) { if (user == null || ticket == null) { setTimeout($scope.fetch10Best, 1000); } - $http.get('http://' + $scope.hostname + '/ppapi/polls/get/best/' + $http.get('/ppapi/polls/get/best/' + user + '/' + ticket + '/' + $scope.currentPolls + onlyUser).success(function (data, status, headers, config) { $scope.fetching = false; if (data.err) { @@ -140,7 +140,7 @@ cont.controller('feedController', function ($scope, $filter, $http, $location) { if (user == null || ticket == null) { setTimeout($scope.fetchNext10Best, 1000); } - $http.get('http://' + $scope.hostname + '/ppapi/polls/get/best/' + $http.get('/ppapi/polls/get/best/' + user + '/' + ticket + '/' + $scope.currentPolls + onlyUser) .success(function (data, status, headers, config) { $scope.fetching = false; @@ -168,7 +168,7 @@ cont.controller('feedController', function ($scope, $filter, $http, $location) { if (user == null || ticket == null) { setTimeout($scope.fetch10New, 1000); } - $http.get('http://' + $scope.hostname + '/ppapi/polls/get/newest/' + $http.get('/ppapi/polls/get/newest/' + user + '/' + ticket + '/' + $scope.currentPolls + onlyUser).success(function (data, status, headers, config) { $scope.fetching = false; if (data.err) { @@ -198,7 +198,7 @@ cont.controller('feedController', function ($scope, $filter, $http, $location) { setTimeout($scope.fetchNext10New, 1000); } var user = localStorage.getItem('netid'); - $http.get('http://' + $scope.hostname + '/ppapi/polls/get/newest/' + $http.get('/ppapi/polls/get/newest/' + user + '/' + ticket + '/' + $scope.currentPolls + onlyUser) .success(function (data, status, headers, config) { $scope.fetching = false; diff --git a/frontend/app/partials/account.html b/frontend/app/partials/account.html index e0ca497..00d9d1d 100644 --- a/frontend/app/partials/account.html +++ b/frontend/app/partials/account.html @@ -18,7 +18,7 @@

My Polls

bad poll
- +

{{poll.pollData.question}}

Vote: ‘{{poll.pollData.choices[0]}}’, vs. ‘{{poll.pollData.choices[1]}}’,