Fix merge conflicts

Author: Nick Litwin

app/directives/challenge-links/challenge-links.jade

@@ -4,7 +4,7 @@
     p(ng-switch-when="MARATHON_MATCH") {{challenge.numRegistrants[0]}}
     p(ng-switch-default) {{challenge.numRegistrants}}
 
-  a.submissions(ng-hide="challenge.track === 'DATA_SCIENCE'", ng-href="{{challenge|challengeLinks:'registrants'}}")
+  a.submissions(ng-hide="challenge.track === 'DATA_SCIENCE'", ng-href="{{challenge|challengeLinks:'submissions'}}")
     .icon.submissions-icon
     p {{challenge.numSubmissions}}
 

app/directives/ios-card/ios-card.jade

@@ -14,7 +14,7 @@
 
           p {{challenge.numRegistrants}}
 
-        a.submissions(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#viewRegistrant")
+        a.submissions(ng-href="https://www.{{DOMAIN}}/challenge-details/{{challenge.id}}/?type={{challenge.track}}#submissions")
           .submissions-icon
 
           p {{challenge.numSubmissions}}

app/filters/challengeLinks.filter.js

@@ -29,7 +29,7 @@
         };
         switch (type) {
           case 'forums':
-            switch (challenge.track) {
+            switch (challenge.track.toLowerCase()) {
               case 'develop':
                 return String.supplant('https://apps.{domain}/forums/?module=Category&categoryID={forumId}', data);
               case 'data':
@@ -39,6 +39,7 @@
             }
 
           case 'submissions':
+            return String.supplant('https://www.{domain}/challenge-details/{id}/?type={track}#submissions', data);
           case 'registrants':
             return String.supplant('https://www.{domain}/challenge-details/{id}/?type={track}#viewRegistrant', data);
           case 'detail':

app/filters/filters.spec.js

@@ -70,7 +70,7 @@ describe('filters', function() {
       expect(challengeLinksFilter(_ch, 'detail')).to.be.equal('https://www.'+domain+'/challenge-details/1/?type=develop');
       expect(challengeLinksFilter(_ch, 'forums')).to.be.equal('https://apps.'+domain+'/forums/?module=Category&categoryID=2');
       expect(challengeLinksFilter(_ch, 'registrants')).to.be.equal('https://www.'+domain+'/challenge-details/1/?type=develop#viewRegistrant');
-      expect(challengeLinksFilter(_ch, 'submissions')).to.be.equal('https://www.'+domain+'/challenge-details/1/?type=develop#viewRegistrant');
+      expect(challengeLinksFilter(_ch, 'submissions')).to.be.equal('https://www.'+domain+'/challenge-details/1/?type=develop#submissions');
     });
 
     it ('should have the correct links for DESIGN challenge', function() {
@@ -83,7 +83,7 @@ describe('filters', function() {
       expect(challengeLinksFilter(_ch, 'detail')).to.be.equal('https://www.'+domain+'/challenge-details/1/?type=design');
       expect(challengeLinksFilter(_ch, 'forums')).to.be.equal('https://apps.'+domain+'/forums/?module=ThreadList&forumId=2');
       expect(challengeLinksFilter(_ch, 'registrants')).to.be.equal('https://www.'+domain+'/challenge-details/1/?type=design#viewRegistrant');
-      expect(challengeLinksFilter(_ch, 'submissions')).to.be.equal('https://www.'+domain+'/challenge-details/1/?type=design#viewRegistrant');
+      expect(challengeLinksFilter(_ch, 'submissions')).to.be.equal('https://www.'+domain+'/challenge-details/1/?type=design#submissions');
     });
 
     it ('should have the correct links for DATA_SCIENCE challenge', function() {

app/services/api.service.js

@@ -71,6 +71,7 @@ import _ from 'lodash'
     function getApiServiceProvider(type) {
       switch (type.toUpperCase()) {
       case 'AUTH':
+      case 'SUBMISSIONS':
       case 'USER':
         return _getRestangularV3(CONSTANTS.AUTH_API_URL)
       default:

app/services/submissions.service.js

@@ -6,7 +6,7 @@
   SubmissionsService.$inject = ['CONSTANTS', 'ApiService', '$q', '$log', 'toaster'];
 
   function SubmissionsService(CONSTANTS, ApiService, $q, $log, toaster) {
-    var api = ApiService.restangularV3;
+    var api = ApiService.getApiServiceProvider('SUBMISSIONS');
 
     var service = {
       getPresignedURL: getPresignedURL,

app/submissions/submissions.spec.js

@@ -12,7 +12,7 @@ describe('Submissions Controller', function() {
 
   var state = {
     go: sinon.spy()
-  }
+  };
 
   beforeEach(function() {
     bard.appModule('tc.submissions')
@@ -60,7 +60,6 @@ describe('Submissions Controller', function() {
 
   describe('routes to the correct child state for', function() {
     it('design challenges', function() {
-
       expect(state.go).calledWith('submissions.file-design')
     })