adding travis prod keys, fix for project progress

Author: Parth Shah

.travis.yml

@@ -33,6 +33,16 @@ deploy:
   local_dir: dist
   on:
     branch: qa
+- provider: s3
+  cache_control: private, no-store, no-cache, must-revalidate, max-age=0
+  detect_encoding: true
+  access_key_id: $MASTER_AWS_KEY
+  secret_access_key: $MASTER_AWS_SECRET
+  bucket: connectv2.topcoder.com
+  skip_cleanup: true
+  local_dir: dist
+  on:
+    branch: master
 env:
   matrix:
   - CXX=g++-4.8
@@ -41,6 +51,10 @@ env:
   - secure: PG2eUElqRRmuskRQAsFxHggyj7Ci2KQh82x/ke/QKPcL6VyCQRYCVuMmfFnmmqzdIzCXPGA7QN+g2p1TPufBunLjoszsaq4nSJs0OZyH6viUqQHGjnnzr2+hORuqPS0nKiKTYEjrB+iiVV//E4axtJD0DuqUJODPS8C5MqdLpClSn2TWySiINa5pGTlVn1QqbnxmabltVIgiZhiOtU2hqIRsSQD21GljM7lj9y3ZsXIYHhEgaEUY6s7nWVkTy0nsVByZshzf6mtoGh9eZLzxILQ50GsKAVJLUzanzBQO55u916nmIHmcMxPXNPkUpMwlG0AWSxzTHMMLOQbnVTcD0MWSyEtsYR/vpWu5kxN7RDVBDtFtyO1hYHP8ggW+mIFEaPgpHFTIb8tMZWQ0jGAM2AoMP3aN4XoL9IGYKNw9/LkV+7lLWEZtgcehIxg7Lwdp4hINoNQ4cfY937+2ThxiaiwAyB2Xvoi7ER4zXUZyiXdHqPFP4EV368QeQXjzGyHoDhXNNO9AzgQTWfk7iq3B7RPSP5uQLv7Z61AkyAK78F0f3jo529gp0fB7J84NCMkZtvJnN40u4DXfQP/zJVJHfaJ1nRiim5egNtdzoHHnTL1kQrJpp/+yaf7ZghCJpIYymEoy5Es6H8UCQJoDKHiXlWqZBxPsrJkFAvMxe3qmXTE=
   - secure: Q+cczazPHfMFPTh3EUYElozt+UkOMKC3tHlRbiBKVHkJpgxxH03Bqs+vgWc2XDo/6Ge9xFGOCT28CJf1Q4Gs7Dm0N0TlME5RlVrZjS78h+85K/ZwTSo4Bu70Wk1hm2wZ9EJtumrzoKEXy+L/8XSTzMIjkhkDqbjp9GZuYxrbQrJSPvYntWMNBP6hht1H/MtLlZVGtcRTFkOy/2u+hy1ELgvHSRAqWqLJfP+CdjtkryllGKWrZ1JXtiCuSEkp1jB9QVDLV1cNGVFqfWwPPU+DbhZNEN/H3jdztWmBVdXuIl9SZUBsq2//CEAUf4wX4mzzuGjl/Y8sXni39yTCpFdjWwywxWPFHbg+qog9gOOayaQ7vSeCuARn+mJqoVtGiLAQJWHiIa+QeXo6lABlXBBI3KohnFd7qi4v89P/fJrzRXd5wAnsstkSNJoVdC2+E8XPl95QHDOaVoDubxZMaexmUleXO68sczEZcs1zutkFEMudt0iS1HuTpTislY8bWQwyU9rW0VsWc0PrlDgQZBZuZUCAH8fx3QlIghGN9wUqM3x1JMW9fH389B6i8FmZrkxSwhGlg/zpAFEr6xg3mnuZvV/SDIy6URUwjWY/DKca0Gk2P8+KQEXR7627pFc4Os86LQhoO1oNFPVHDHvvn5MWdNcXqkMf9isTb24JzAzuFUs=
   - secure: FQN6bnwY2uIhV7IxF/JrvFXErefhox+yhKZ/97q2yB+l+k4032RSOsJl0MdX4Khi0DR8Dqex8nR0emMX245Yj+zcjkfn3MLuTR454xERQiYqZ4ULJqQAbkdHQ4XHHU2JQeD2gLbXHSsbu6EXXWPEsTpoW4xAwcI3O9S14kmbN172CCIi54Ac8RQ6Z3oJ3LKGnToyXov/cMXstV3PCXBMrZVLMDQP5UEvbP+Ze+HrAIx4OnF9CMlWfa0SRFltjmNA5Lkg9iL+LRcjZMa+2F1U/uuMLXO4KLkUK1YgVf5pY8LKDZUVajdlyoTsLVdffrAutKiEvwsBMq4FXgJzr5aFs+xdA4dcRYM8WzwzMo8Wk8sMtLoW8An0fzDDBYD+gP+k+iL+XdriGtPOi0u/wIDguglLehMtsKwnnawS8eQ6cwgSa4jW3NPcvJuTmVgQWUvAez71ZZ0KC/WQVBsUUerMDnpmSsnPpnekJDNFBJmzS7hLF/ERuDG2yZsu1/yXPC0bVHz09WDVR7GA5ajQpSXBREXmf080fdDE20zA6gFKHYPnQvP4J6aJwDJ/VX63B0idI1DXXMMTitjuebDff9tP7AWwv+M1gkCTof6x+eJ84Zd80B9TO7nFcYCXQQHVXt9BMpOoov2iPv5lEFykh4qAwy0Mqv5IYwuvSAq6A6oh1as=
+  # $MASTER_AWS_KEY
+  - secure: C3NYP6gj6w6cWGBQYrgT1tioSfaYpRzBf5PWVW2RG2pfzcWduB9x1GYWGhYWe3nSGKt9eao1JVTKph3HQW2oVS8U5GjwuT8opfC4k+xzrydiX9xplTC74gcigGTg3MIRuKPB8IhCNxvtKCllCTuVoVfVjScVB22zgwM6b3OArbSXFpBQEHjL3tcwTcjXy82s0u4wl4gIDvwbnZkUO01sCA+Yk7dYQfE+R0sSrozdexjkR/6ska++s+LzdNgGLUtDvKdf8VtF5z/htaqBWCIYNIrQEz6yClEEb7fW+4f7fK5KcGgCsocLPaUZPZc0mypsFiFxLLFdu+yBDNItXcEfKBuUhTSZV0z/l/dBrGLrY+rbjrr3YsQvnmco9JbUyMh6Or4JYuf2ofvw31SXuf9lrmUHaul7Yu+ibdfuoYJ9xTgZs1AKaGbyhhF+hxOM4YMkVB7byWacqiVE2G9RKqD02HxOL0UYnRZUisyt7oSXDBMEXvhzr2zfD43NgngSHhxpy6vzFCsGsXBEoYZD4DFrV6dym60kGmXd/24d6t8cXiRq+6xsWH7aU61fu8AppKAZJeMv/qHxxtM9lXJ1LaHKsiav/leTVcy1OXLPNNDOK20I99FEqVSNKvJ79uagR6xbcDnI4LRlw+uDKaY6AMSLIw9M5tWdAc6LNR9Wcyzop6E=
+  # $MASTER_AWS_SECRET
+  - secure: QTbD+n84Eg1QRZs7yjLl2yRdKmesr/yTTvSSX77xiKJB3kcI6UivJDoaWkIKq2WaxxA6ewf7UGdvGiM/q6PSpHmP9khNdxj3qXCn3OpUKZ+wVCz6JZ6JWWBBIBnKhTgFLz8O9jpxMRsXB0ZbF0k2JE6n/2qD96+rF0UmjfsJs7havOuHPNI4LwrRYSP8KzdbGRbcAUWesASTyq8nktv+kF93NomNaaRyyHBWCQMpEGS67B536IfFjypR919SIv+Qu4sqDATelQlSZWZm1jzupz3cAo8GNB6v1vYGNRMnM56R0rgDpOIqN6b6Y6hmHodSBMYp52sxFvcTuDDLuLvyGRQ/ErINmdcaXqgMh5Gl3tDwHezT5s32B+rOsSIkZF8fnrNB74dMpuKp7g2XCVfPeqlnEttY/uGbuQBe3be0g3kGtK9MFRw75X6oQxESaO2NvkCqPNZl1TacDv1s46bz3Y+en4gTmJ1UXKwmWf7fOekYozNBnOtcWQZqJ0g3d1DU1Pul4QSFuszL6y0uH5ohWDjk0mOERuFIQXKCrTVsMzUogeGp3Z7rDAynwFYGbJWgeoclbH2fQpbCLFSZxfvbYzzkpYbWD3eMLcpuKjSjTew8KEiYk2uYEjW9Kaj1wWkAkIGDAawbMGw5XVS/3a/scAcVMkyYb9VVy1wDAHudiRI=
 # enable once travis supports branch specific builds
 # notifications:
 #   slack:

src/components/ProjectInfo/ProjectInfo.jsx

@@ -30,6 +30,7 @@ class ProjectInfo extends Component {
   render() {
     const { type, directLinks, devices, currentMemberRole, status, onChangeStatus, duration, canDeleteProject } = this.props
     const { showDeleteConfirm } = this.state
+    const displayProgress = status !== 'cancelled'
     return (
       <Panel>
         <Panel.Title>Project</Panel.Title>
@@ -44,9 +45,9 @@ class ProjectInfo extends Component {
         }
         <ProjectType type={type} devices={devices} />
         <ProjectStatus directLinks={directLinks} currentMemberRole={currentMemberRole} status={status} onChangeStatus={onChangeStatus} />
-        <ProjectProgress title="Duration" percent={duration.percent} type="completed">
+        {displayProgress && <ProjectProgress {...duration}>
           {duration.text}
-        </ProjectProgress>
+        </ProjectProgress>}
         {/* <ProjectProgress title="Budget" percent={budget.percent} type="working">
           {budget.text}
         </ProjectProgress> */}

src/projects/detail/containers/ProjectInfoContainer.js

@@ -15,10 +15,7 @@ class ProjectInfoContainer extends React.Component {
   constructor(props) {
     super(props)
     this.state = {
-      duration: {
-        percent: 0,
-        text: 'Complete specification to get estimate'
-      },
+      duration: {},
       budget: { // FIXME
         percent: 80,
         text: '$1000 remaining'
@@ -34,16 +31,58 @@ class ProjectInfoContainer extends React.Component {
     return !_.isEqual(nextProps.project, this.props.project)
   }
 
-  componentWillReceiveProps({project}) {
-    if (project.duration) {
-      const percent = project.duration.actualDuration / project.duration.plannedDuration * 100
-      this.setState({
-        duration: {
-          percent,
-          text: percent === 0 ? 'Complete specification to get estimate' : ''
+  setDuration({duration, status}) {
+    let percent =''
+    let title = ''
+    let text = ''
+    let type = ''
+    if (duration) {
+      const {actualDuration, plannedDuration} = duration
+      if (status === 'draft') {
+        title = 'Duration'
+        percent = 0
+        text = 'Complete specification to get estimate'
+      } else if (status === 'in_review') {
+        title = 'Duration'
+        percent = 0
+        text = 'Pending review'
+      } else if (status === 'reviewed') {
+        title = `${plannedDuration} days (projected)`
+        percent = 0
+        text = `${plannedDuration} days remaining`
+      } else if (status === 'completed') {
+        title = 'Completed'
+        percent = 100
+        text = ''
+        type = 'completed'
+      } else {
+        text = `Day ${actualDuration} of ${plannedDuration}`
+        percent = actualDuration / plannedDuration * 100
+        if (0 <= percent && percent < 100) {
+          const diff = plannedDuration - actualDuration
+          title = `${diff} ${diff > 1 ? 'days' : 'day'} remaining`
+          type = 'working'
+        } else {
+          percent = 100
+          type = 'error'
+          const diff = actualDuration - plannedDuration
+          title = `${diff} ${diff > 1 ? 'days' : 'day'} over`
         }
-      })
+      }
+    } else {
+      title = 'Duration'
+      percent = 0
+      text = 'Complete specification to get estimate'
     }
+    this.setState({duration: { title, text, percent, type }})
+  }
+
+  componentWillMount() {
+    this.setDuration(this.props.project)
+  }
+
+  componentWillReceiveProps({project}) {
+    this.setDuration(project)
   }
 
   onChangeStatus(status) {