Fixes for URL issues

ryanoshea · May 6, 2015 · a0f8b4c · a0f8b4c
1 parent 2ee3e38
commit a0f8b4c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -18,7 +18,7 @@ <h1 class="page-head">My Polls</h1>
           <a class="vote-submit downvote" ng-click="downVote(poll.pollData.pid, $index)" ng-class="{chosen: poll.userVote == false, unchosen: poll.userVote == true}">bad poll</a>
         </div>
         <div class="poll-content" ng-click="goToPoll(poll.pollData.pid)">
-          <a class="poll-content" href="{{'http://' + rootUrl + '#/poll?p=' + poll.pollData.pid}}">
+          <a class="poll-content" href="{{rootUrl + '#/poll?p=' + poll.pollData.pid}}">
           <p class="poll-question">{{poll.pollData.question}}</p>
           <p class="poll-choices-preview">Vote: &#8216;{{poll.pollData.choices[0]}}&#8217;<span ng-show="poll.pollData.choices.length > 2">, </span><span ng-show="poll.pollData.choices.length == 2"> vs. </span>&#8216;{{poll.pollData.choices[1]}}&#8217;<span ng-show="poll.pollData.choices.length > 2">, <i class="fa fa-ellipsis-h"></i></span></p>
           <div class="poll-meta">