Merge commit '0ce72b8197e4b3ee5f0d1e3388581baa921eaffe' into HEAD

Jenkins Continuous Integration Server · Jenkins Continuous Integration Server · commit 52ae4557fb45 · 2016-07-07T23:48:02.000Z
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ styleguide
 .project
 .awspublish-app.topcoder-dev.com
 npm-debug.log
+*.swp
diff --git a/app/directives/tc-fp-file-input/tc-fp-file-input.directive.js b/app/directives/tc-fp-file-input/tc-fp-file-input.directive.js
@@ -32,17 +32,30 @@ import _ from 'lodash'
           scope.filePath += _.join([userId, scope.fieldId, (new Date()).valueOf()], '-') + '.zip'
         }
         var dragAreaClasses = 'tc-fp-file-drag-drop'
-        // set extensions
+        var dragText = ''
+        // set mimeTypes
         if (scope.fieldId.indexOf('ZIP') > -1) {
-          scope.extensions = '.zip'
+          scope.mimeTypes = _.join([
+            'application/x-download',
+            'application/download',
+            'application/zip',
+            'application/x-zip',
+            'application/x-zip-compressed',
+            'application/octet-stream',
+            'application/x-compress',
+            'application/x-compressed',
+            'multipart/x-zip'
+          ], ',')
+          dragText = 'Drag and drop your .zip file here (500MB max) <br> or'
         } else if (scope.fieldId.indexOf('DESIGN_COVER') > -1) {
-          scope.extensions = '.png,.jpeg,.jpg,.bmp'
+          scope.mimeTypes = 'image/png,image/jpeg,image/bmp'
           dragAreaClasses += ' tc-fp-file-drag-drop-image'
+          dragText = 'Drag and drop your .png or .jpg file here <br> or'
         }
 
         // set default services
         scope.fpServices = scope.fpServices || 'COMPUTER,GOOGLE_DRIVE,BOX,DROPBOX'
-        scope.fpContainer = CONSTANTS.FILE_PICKER_SUBMISSION_CONTAINER_NAME || 'submission-staging-dev'
+        scope.fpContainer = CONSTANTS.FILE_PICKER_SUBMISSION_CONTAINER_NAME
 
         // set max size
         scope.maxSize = 500 * 1024 * 1024
@@ -63,8 +76,9 @@ import _ from 'lodash'
         input.setAttribute('data-fp-services', scope.fpServices)
         input.setAttribute('data-fp-button-class', 'tc-btn')
         input.setAttribute('data-fp-drag-class', dragAreaClasses)
+        input.setAttribute('data-fp-drag-text', dragText)
         input.setAttribute('data-fp-multiple', false)
-        input.setAttribute('data-fp-extensions', scope.extensions)
+        input.setAttribute('data-fp-mimetypes', scope.mimeTypes)
         input.setAttribute('data-fp-store-location', 's3')
         input.setAttribute('data-fp-store-container', scope.fpContainer)
         input.setAttribute('data-fp-store-path', scope.filePath)
diff --git a/app/directives/tc-fp-file-input/tc-fp-file-input.jade b/app/directives/tc-fp-file-input/tc-fp-file-input.jade
@@ -1,6 +1,6 @@
 .tc-file-field__label
   label.tc-label {{labelText}}
-    span.lowercase(ng-if="showFileType") {{ ' *(.' + fileType + ')'}}
+    //- span.lowercase(ng-if="showFileType") {{ ' *(.' + fileType + ')'}}
 
 .tc-file-field__inputs
   .tc-label__wrapper
@@ -11,6 +11,5 @@
       ng-model="ngModel",
       ng-required="mandatory",
       data-fp-button-text="Pick A File",
-      data-fp-drag-text="&nbsp;",
       on-success="onFileSeleted(event.fpfile)"
     )
diff --git a/app/services/api.service.js b/app/services/api.service.js
@@ -60,7 +60,7 @@ import _ from 'lodash'
             case 500: // SERVER ERROR
             case 503: // HTTP_503_SERVICE_UNAVAILABLE
             default:
-              logger.error('Restangular Error Interceptor', response)
+              logger.debug('Restangular Error Interceptor', response)
               return true // error not handled
             }
           })
@@ -146,7 +146,7 @@ import _ from 'lodash'
             case 500: // SERVER ERROR
             case 503: // HTTP_503_SERVICE_UNAVAILABLE
             default:
-              logger.error('Restangular Error Interceptor ', response)
+              logger.debug('Restangular Error Interceptor ', response)
               return true // error not handled
             }
           })
diff --git a/app/services/tcAuth.service.js b/app/services/tcAuth.service.js
@@ -19,6 +19,8 @@ import { getCurrentUser, logout as doLogout } from './userv3.service.js'
       // logout of all browsers
       return doLogout().then(function() {
         $rootScope.$broadcast(CONSTANTS.EVENT_USER_LOGGED_OUT)
+        // resolve the promise
+        return true
       })
     }
 
diff --git a/app/submissions/submissions.module.js b/app/submissions/submissions.module.js
@@ -15,7 +15,7 @@ import angular from 'angular'
   angular.module('tc.submissions', dependencies)
   .config(['filepickerProvider', 'CONSTANTS',
     function (filepickerProvider, CONSTANTS) {
-      filepickerProvider.setKey(CONSTANTS.FILE_PICKER_API_KEY || 'AzFINuQoqTmqw0QEoaw9az')
+      filepickerProvider.setKey(CONSTANTS.FILE_PICKER_API_KEY)
     }
   ])
 
diff --git a/app/submissions/submit-design-files/submit-design-files.controller.js b/app/submissions/submit-design-files/submit-design-files.controller.js
@@ -10,6 +10,7 @@ import _ from 'lodash'
 
   function SubmitDesignFilesController($scope, $window, $stateParams, logger, UserService, SubmissionsService, challengeToSubmitTo) {
     if (!challengeToSubmitTo.challenge) { return }
+    var challengeTitle = challengeToSubmitTo.challenge.name
 
     var vm = this
     vm.urlRegEx = new RegExp(/^(http(s?):\/\/)?(www\.)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,3})+(\/[a-zA-Z0-9\_\-\s\.\/\?\%\#\&\=]*)?$/)
@@ -36,6 +37,7 @@ import _ from 'lodash'
       stockArts: [],
       hasAgreedToTerms: false
     }
+    vm.progressTitle = ''
 
     var userId = parseInt(UserService.getUserIdentity().userId)
 
@@ -114,6 +116,8 @@ import _ from 'lodash'
       vm.errorInUpload = false
       vm.uploadProgress = 0
       vm.showProgress = true
+      vm.progressTitle = 'Uploading submission for "' + challengeTitle + '"'
+      vm.uploadProgressMessage = 'Hey, your work is AWESOME! Please don’t close the window while the upload is in progress, or you’ll lose all files!'
       vm.preparing = true
       vm.finishing = false
       vm.finished = false
@@ -178,6 +182,8 @@ import _ from 'lodash'
           vm.preparing = false
           vm.finishing = false
           vm.finished = true
+          vm.progressTitle = 'Submission completed for "' + challengeTitle + '"'
+          vm.uploadProgressMessage = 'Thanks for participating! We\'ve received your submission and will send you an email shortly to confirm and explain what happens next.'
         }
       } else {
         // assume it to be error condition
diff --git a/app/submissions/submit-design-files/submit-design-files.jade b/app/submissions/submit-design-files/submit-design-files.jade
@@ -23,7 +23,7 @@
 
           p Please be sure to double-check that you have submitted the correct files and that your JPG files (if applicable) are in RGB color mode.
 
-          a(ng-href="https://help.{{DOMAIN}}/hc/en-us/articles/219122667-Formatting-Your-Submission-for-Design-Challenges") Learn more about formatting your submission file
+          a(ng-href="https://help.{{DOMAIN}}/hc/en-us/articles/219122667-Formatting-Your-Submission-for-Design-Challenges") Learn more about formatting your submission file.
 
       .form-block__fields
         .fieldset.files
@@ -161,12 +161,12 @@
 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 "{{submissions.challengeTitle}}"
+      p {{ vm.progressTitle }}
 
     img.upload-progress__image(src=require("../../../assets/images/skills/id-180.svg"), ng-hide="vm.errorInUpload")
     img.upload-progress__image--error(src=require("../../../assets/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 the upload is in progress, or you’ll lose all files!
+    p.upload-progress__message(ng-hide="vm.errorInUpload") {{ vm.uploadProgressMessage}}
 
     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.
 
@@ -177,7 +177,6 @@ modal.transition(show="vm.showProgress", background-click-close="false", style="
       p Finishing...
       
     .upload-progress__finished(ng-show="vm.finished && !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
diff --git a/app/topcoder.constants.js b/app/topcoder.constants.js
@@ -21,6 +21,8 @@ angular.module('CONSTANTS', []).constant('CONSTANTS', {
   'SWIFT_PROGRAM_URL'       : process.env.SWIFT_PROGRAM_URL,
   'TCO16_URL'               : process.env.TCO16_URL,
   'ACCOUNTS_APP_URL'        : process.env.ACCOUNTS_APP_URL,
+  'FILE_PICKER_API_KEY'     : process.env.FILE_PICKER_API_KEY,
+  'FILE_PICKER_SUBMISSION_CONTAINER_NAME': process.env.FILE_PICKER_SUBMISSION_CONTAINER_NAME,
 
   'NEW_CHALLENGES_URL'     : 'https://www.topcoder.com/challenges/develop/upcoming/',
   'SWIFT_PROGRAM_ID'       : 3445,
diff --git a/assets/css/directives/badge-tooltip.scss b/assets/css/directives/badge-tooltip.scss
@@ -20,7 +20,6 @@
     float: left;
 }
 
-
 .subBadge {
     height: 48px;
     float: left;
diff --git a/assets/css/directives/tc-fp-file-input.directive.scss b/assets/css/directives/tc-fp-file-input.directive.scss
@@ -18,17 +18,6 @@ tc-fp-file-input {
     width: 240px;
   }
 
-  .tc-file-field__input::after {
-    content: 'or';
-    font-size: 12px;
-    line-height: 15px;
-    color: $tc-gray-30;
-    bottom: 85px;
-    position: absolute;
-    left: 50%;
-    transform: translateX(-50%)
-  }
-
   .tc-btn {
     margin-bottom: 5px;
     position: absolute;
@@ -38,37 +27,37 @@ tc-fp-file-input {
     z-index: 1;
   }
 
+  .tc-label__asterisk {
+    right: 0px;
+  }
+
   .tc-fp-file-drag-drop {
     width: calc(100% - 4px);
-    position: absolute;
     left: 0;
     top: 0;
     height: 190px;
     width: 240px;
     position: relative;
+    color: $tc-gray-50 !important;
+    padding: 25px !important;
+    margin-left: 0px !important;
+    text-align: center;
+
+    // div used to show progress bar for drop upload
+    > div {
+      position: absolute;
+      left: 0;
+      top: 0;
+    }
 
+    // span used for showing remove button
     > span {
       position: absolute;
       top: 0px;
       right: 0px;
     }
   }
 
-  .tc-fp-file-drag-drop::after {
-    content: 'Drag and drop your .zip file here (500MB max)';
-    color: $tc-gray-50;
-    top: 25px;
-    position: absolute;
-    width: 198px;
-    text-align: center;
-    left: 50%;
-    transform: translateX(-50%)
-  }
-
-  .tc-fp-file-drag-drop-image::after {
-    content: 'Drag and Drop your PNG or JPG file here';
-  }
-
   &.file-uploaded {
     .tc-file-field__input::after,
     .tc-fp-file-drag-drop::after {
diff --git a/assets/css/submissions/submit-file.scss b/assets/css/submissions/submit-file.scss
@@ -79,7 +79,7 @@ tc-fp-file-input {
   flex-wrap: wrap;
   justify-content: space-around;
 
-  @media screen and (min-width: 1000px) {
+  @media screen and (min-width: 875px) {
     justify-content: space-between;
   }
 }
@@ -158,6 +158,8 @@ modal {
     line-height: 19px;
     color: $accent-gray;
     margin-top: 40px;
+    padding: 0px 40px;
+    text-align: center;
   }
 
   .upload-progress__progress-bar {
@@ -193,6 +195,12 @@ modal {
       }
     }
   }
+
+  .upload-progress__error-action {
+    button:not(:first-child) {
+      margin-left: 10px;
+    }
+  }
 }
 
 .upload-progess__links {
diff --git a/assets/images/badge.grid.large.png b/assets/images/badge.grid.large.png
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "angular-mocks": "^1.4.9",
-    "appirio-tech-webpack-config": "^0.3.6",
+    "appirio-tech-webpack-config": "^0.3.8",
     "babel-polyfill": "^6.7.2",
     "bardjs": "^0.1.8",
     "bower": "^1.6.8",

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ import { getCurrentUser, logout as doLogout } from './userv3.service.js'`
`19`	`19`	`// logout of all browsers`
`20`	`20`	`return doLogout().then(function() {`
`21`	`21`	`$rootScope.$broadcast(CONSTANTS.EVENT_USER_LOGGED_OUT)`
	`22`	`+ // resolve the promise`
	`23`	`+ return true`
`22`	`24`	`})`
`23`	`25`	`}`
`24`	`26`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import angular from 'angular'`
`15`	`15`	`angular.module('tc.submissions', dependencies)`
`16`	`16`	`.config(['filepickerProvider', 'CONSTANTS',`
`17`	`17`	`function (filepickerProvider, CONSTANTS) {`
`18`		`- filepickerProvider.setKey(CONSTANTS.FILE_PICKER_API_KEY \|\| 'AzFINuQoqTmqw0QEoaw9az')`
	`18`	`+ filepickerProvider.setKey(CONSTANTS.FILE_PICKER_API_KEY)`
`19`	`19`	`}`
`20`	`20`	`])`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`float: left;`
`21`	`21`	`}`
`22`	`22`
`23`		`-`
`24`	`23`	`.subBadge {`
`25`	`24`	`height: 48px;`
`26`	`25`	`float: left;`