Add buttons when upload is complete and change routes to handle different tracks

Author: Nick Litwin

README.md

@@ -58,6 +58,8 @@ Spec files live alongside the code they are testing. For example, in peer-review
 ## UI-Router and States
 See any *.routes.js file as an example.
 
+**Important** Make sure the url in your routes files ends with a /
+
 ## Contributing
 
 ### Style Guide and Naming Conventions
@@ -78,9 +80,9 @@ Jade Files
 ```
     .wrapper
       h1 Lorem ipsum
-      
+
       p Sibling tag
-      
+
     .wrapper2
       p Child
 ```
@@ -99,7 +101,7 @@ SCSS Files
       height: 100px;
       width: 100px;
     }
-    
+
     .inside-box {
       font-size: 14px;
       @media screen and (min-width: 768px) {

app/index.jade

@@ -335,8 +335,7 @@ html
     script(src="submissions/submissions.module.js")
     script(src="submissions/submissions.controller.js")
     script(src="submissions/submissions.routes.js")
-    script(src="submissions/submit-file/submit-file.controller.js")
-    script(src="submissions/submit-file/submit-file-completed.controller.js")
+    script(src="submissions/submit-design-files/submit-design-files.controller.js")
     script(src="topcoder.constants.js")
     script(src="topcoder.controller.js")
     script(src="topcoder.interceptors.js")

app/submissions/submissions.controller.js

@@ -3,9 +3,10 @@
 
   angular.module('tc.submissions').controller('SubmissionsController', SubmissionsController);
 
-  SubmissionsController.$inject = ['challengeToSubmitTo'];
+  SubmissionsController.$inject = ['challengeToSubmitTo', '$state'];
+
+  function SubmissionsController(challengeToSubmitTo, $state) {
 
-  function SubmissionsController(challengeToSubmitTo) {
     var vm = this;
 
     var challenge = challengeToSubmitTo.challenge;
@@ -15,6 +16,14 @@
 
     activate();
 
-    function activate() {}
+    function activate() {
+      var track = challengeToSubmitTo.challenge.track;
+
+      if (track === 'DESIGN') {
+        $state.go('submissions.file.design');
+      } else if (track === 'DEVELOP') {
+        $state.go('submissions.file.develop')
+      }
+    }
   }
 })();

app/submissions/submissions.routes.js

@@ -18,9 +18,7 @@
         controllerAs: 'submissions',
         data: {
           authRequired: true,
-
-          // TODO: Get title from PMs
-          title: 'Submit'
+          title: 'Challenge Submission'
         },
         resolve: {
           challengeToSubmitTo: ['ChallengeService', '$stateParams', 'UserService', function(ChallengeService, $stateParams, UserService) {
@@ -36,10 +34,9 @@
                 challenge = challenge[0];
 
                 if (!challenge) {
-                  // There should be a challenge, redirect?
+                  // TODO: There should be a challenge, redirect?
                   alert('User is not associated with this challenge.');
                 }
-
                 var phaseType;
                 var phaseId;
 
@@ -84,17 +81,22 @@
         }
       },
       'submissions.file': {
-        url: '?method',
-        templateUrl: 'submissions/submit-file/submit-file.html',
-        controller: 'SubmitFileController',
+        url:'file/',
+        abstract: true,
+        template: '<ui-view/>'
+      },
+      'submissions.file.design': {
+        url:'',
+        templateUrl: 'submissions/submit-design-files/submit-design-files.html',
+        controller: 'SubmitDesignFilesController',
+        controllerAs: 'vm',
+      },
+      'submissions.file.develop': {
+        url:'',
+        templateUrl: 'submissions/submit-develop-files/submit-develop-files.html',
+        controller: 'SubmitDevelopFilesController',
         controllerAs: 'vm',
       },
-      'submissions.completed': {
-        url: 'completed',
-        templateUrl: 'submissions/submit-file-completed/submit-file-completed.html',
-        controller: 'SubmitFileCompletedController',
-        controllerAs: 'vm'
-      }
     };
 
     for (var name in states) {

app/submissions/submit-file/submit-file.controller.js renamed to app/submissions/submit-design-files/submit-design-files.controller.js

@@ -1,13 +1,13 @@
 (function () {
   'use strict';
 
-  angular.module('tc.submissions').controller('SubmitFileController', SubmitFileController);
+  angular.module('tc.submissions').controller('SubmitDesignFilesController', SubmitDesignFilesController);
 
-  SubmitFileController.$inject = ['$scope','$state', '$stateParams', '$log', 'UserService', 'SubmissionsService', 'challengeToSubmitTo'];
+  SubmitDesignFilesController.$inject = ['$scope','$window', '$stateParams', '$log', 'UserService', 'SubmissionsService', 'challengeToSubmitTo'];
 
-  function SubmitFileController($scope, $state, $stateParams, $log, UserService, SubmissionsService, challengeToSubmitTo) {
+  function SubmitDesignFilesController($scope, $window, $stateParams, $log, UserService, SubmissionsService, challengeToSubmitTo) {
     var vm = this;
-    $log = $log.getInstance('SubmitFileController');
+    $log = $log.getInstance('SubmitDesignFilesController');
     var files = {};
     var fileUploadProgress = {};
     vm.urlRegEx = new RegExp(/^(http(s?):\/\/)?(www\.)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,3})+(\/[a-zA-Z0-9\_\-\s\.\/\?\%\#\&\=]*)?$/);
@@ -39,18 +39,14 @@
 
     vm.submissionsBody = {
       reference: {
-
-        // type dynamic or static?
         type: 'CHALLENGE',
         id: $stateParams.challengeId,
         phaseType: challengeToSubmitTo.phaseType,
         phaseId: challengeToSubmitTo.phaseId
       },
       userId: userId,
       data: {
-
-        // Dynamic or static?
-        method: 'DESIGN_CHALLENGE_ZIP_FILE',
+        method: challengeToSubmitTo.challenge.track.toUpperCase() + '_CHALLENGE_ZIP_FILE',
 
         // Can delete below since they are processed and added later?
         files: [],
@@ -64,6 +60,7 @@
     vm.setRankTo1 = setRankTo1;
     vm.setFileReference = setFileReference;
     vm.uploadSubmission = uploadSubmission;
+    vm.refreshPage = refreshPage;
     vm.cancelRetry = cancelRetry;
 
     activate();
@@ -194,11 +191,13 @@
             count++;
           }
           vm.uploadProgress = total / count;
+
           // initiate digest cycle because this event (xhr event) is caused outside angular
           $scope.$apply();
         } else { // typeof args === 'number', mainly used a s fallback to mark completion of the UPLOAD phase
           vm.uploadProgress = args;
         }
+
         // start next phase when UPLOAD is done
         if (vm.uploadProgress == 100) {
           $log.debug('Uploaded files.');
@@ -209,20 +208,20 @@
         // we are concerned only for completion of the phase
         if (args === 100) {
           $log.debug('Finished upload.');
-          vm.finishing = false;
-          vm.showProgress = false;
-
-          $state.go('submissions.completed');
         }
-      } else { // assume it to be error condition
+      } else {
+        // assume it to be error condition
         $log.debug("Error Condition: " + phase);
         vm.errorInUpload = true;
       }
     }
 
+    function refreshPage() {
+      $window.location.reload(true);
+    }
+
     function cancelRetry() {
       vm.showProgress = false;
-      // TODO redirect to submission listing / challenge details page
     }
   }
 })();

app/submissions/submit-file/submit-file.jade renamed to app/submissions/submit-design-files/submit-design-files.jade

@@ -151,25 +151,32 @@
 
       button.tc-btn.tc-btn-secondary(type="submit", ng-disabled="submissionForm.$invalid") Submit
 
-modal.transition(show="vm.showProgress", background-click-close="true", style="background-color:white;")
+modal.transition(show="vm.showProgress", background-click-close="false", style="background-color:white;")
   .upload-progress(ng-class="{'upload-progress--error': vm.errorInUpload}")
     .upload-progress__title
       p Uploading submission for
 
       p.upload-progress-title__challenge-name [Challenge name]
 
     img.upload-progress__image(src="/images/robot.svg", ng-hide="vm.errorInUpload")
-
     img.upload-progress__image--error(src="/images/robot-embarresed.svg", ng-show="vm.errorInUpload")
 
-    p.upload-progress__message(ng-hide="vm.errorInUpload") Hey, your work is AWESOME! Please don’t close the window while I’m working, you’ll loose all files!
+    p.upload-progress__message(ng-hide="vm.errorInUpload") Hey, your work is AWESOME! Please don’t close the window while I’m working or you’ll loose all files!
 
-    p.upload-progress__message--error(ng-show="vm.errorInUpload") Oh, that’s embarrassing! The file couldn’t be uploaded, I’m so sorry.
+    p.upload-progress__message--error(ng-show="vm.errorInUpload") Oh, that’s embarrassing! One of the files couldn’t be uploaded, I’m so sorry.
 
     progress-bar.upload-progress__progress-bar(completed="vm.uploadProgress", message="of 3 files uploaded")
 
     .upload-progress__preparing(ng-show="vm.preparing && !vm.errorInUpload") #[span Preparing...]
-    .upload-progress__finishing(ng-show="vm.finishing && !vm.errorInUpload") #[span Finishing...]
+    .upload-progress__finishing(ng-show="vm.finishing && !vm.errorInUpload")
+      p Finished!
+
+      .upload-progess__links
+        a.tc-btn.tc-btn-s(ng-href="https://www.{{DOMAIN}}/challenge-details/{{submissions.challengeId}}/?type={{submissions.track}}") Back to the challenge
+
+        a.tc-btn.tc-btn-s.tc-btn-ghost(ng-click="vm.refreshPage()") Submit another
+
+
     .upload-progress__error(ng-show="vm.errorInUpload") #[span File upload failed]
 
     .upload-progress__error-action(ng-show="vm.errorInUpload")

app/submissions/submit-file/submit-file.spec.js renamed to app/submissions/submit-design-files/submit-design-files.spec.js

@@ -1,5 +1,5 @@
 /* jshint -W117, -W030 */
-describe('Submit File Controller', function() {
+describe('Submit Design Files Controller', function() {
   var controller, vm, scope;
 
   var mockChallenge = {
@@ -22,6 +22,12 @@ describe('Submit File Controller', function() {
     getPresignedURL: function() {}
   };
 
+  var mockWindow = {
+    location: {
+      reload: function(val) { return val; }
+    }
+  };
+
   beforeEach(function() {
     bard.appModule('tc.submissions');
     bard.inject(this, '$controller', '$rootScope');
@@ -32,11 +38,12 @@ describe('Submit File Controller', function() {
   bard.verifyNoOutstandingHttpRequests();
 
   beforeEach(function() {
-    controller = $controller('SubmitFileController', {
+    controller = $controller('SubmitDesignFilesController', {
       $scope: scope,
       UserService: userService,
       challengeToSubmitTo: mockChallenge,
-      SubmissionsService: submissionsService
+      SubmissionsService: submissionsService,
+      $window: mockWindow
     });
     vm = controller;
   });
@@ -265,6 +272,18 @@ describe('Submit File Controller', function() {
     });
   });
 
+  describe('refreshPage', function() {
+    it('reloads the page', function() {
+      var mockRefresh = sinon.spy(mockWindow.location, 'reload');
+
+      vm.refreshPage();
+      scope.$digest();
+
+      expect(mockRefresh).calledWith(true);
+      expect(mockRefresh).calledOnce;
+    });
+  });
+
   describe('cancelRetry', function() {
     it('sets showProgress to false', function() {
       vm.showProgress = true;

app/submissions/submit-file/submit-file-completed.controller.js

@@ -42,10 +42,8 @@
           window.location.href = CONSTANTS.MAIN_URL + '/404/';
         }]
       },
-      /**
-       * Base state that all other routes should inherit from.
-       * Child routes can override any of the specified regions
-       */
+      // Base state that all other routes should inherit from.
+      // Child routes can override any of the specified regions
       'root': {
         url: '',
         abstract: true,
@@ -70,10 +68,8 @@
         }
       },
       'home': {
-        // TODO - set new home page
         parent: 'root',
         url: '/',
-        // template: 'This is the home page',
         controller: ['$state', function($state) {
           $state.go('dashboard');
         }]

app/submissions/submit-file/submit-file-completed.jade

@@ -112,11 +112,8 @@ tc-form-fonts, tc-form-stockart {
 }
 
 modal {
-  .close {
-    .icon.cross {
-      background-image: url(/images/x-mark-gray.svg);
-      background-size: 25px;
-    }
+  > button {
+    display: none;
   }
 }
 .upload-progress {
@@ -162,6 +159,7 @@ modal {
     font-size: 12px;
     line-height: 14px;
     color: $accent-gray-dark;
+    text-align: center;
   }
 
   .upload-progress__error {
@@ -180,3 +178,15 @@ modal {
     }
   }
 }
+
+.upload-progess__links {
+  margin-top: 40px;
+
+  a {
+    display: inline-block;
+
+    &:first-child {
+      margin-right: 10px;
+    }
+  }
+}