From d9f18a63394bebceb71d3c1a033fc26e1b96f7c5 Mon Sep 17 00:00:00 2001
From: Vikas Agarwal <vikas.agarwal@topcoder.com>
Date: Fri, 29 Sep 2017 17:08:21 +0530
Subject: [PATCH 1/3] =?UTF-8?q?Github=20issue#1208,=20Real=20World=20Testi?=
 =?UTF-8?q?ng=20project=20missing=20tag=20on=20list=20view=20=E2=80=94=20F?=
 =?UTF-8?q?ixed=20with=20assumptions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/projects/create/components/ProjectWizard.jsx |  1 -
 .../list/components/Projects/ProjectsView.jsx    | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/projects/create/components/ProjectWizard.jsx b/src/projects/create/components/ProjectWizard.jsx
index e6f6a98a2..f191b19af 100644
--- a/src/projects/create/components/ProjectWizard.jsx
+++ b/src/projects/create/components/ProjectWizard.jsx
@@ -161,7 +161,6 @@ class ProjectWizard extends Component {
     window.scrollTo(0, 0)
     const { onStepChange, onProjectUpdate } = this.props
     const products = findProductsOfCategory(projectType)
-    console.log(products, 'products')
     const updateQuery = { }
     // restore common fields from dirty project
     // this.restoreCommonDetails(products, updateQuery, detailsQuery)
diff --git a/src/projects/list/components/Projects/ProjectsView.jsx b/src/projects/list/components/Projects/ProjectsView.jsx
index 8d2448b9e..fac465db5 100644
--- a/src/projects/list/components/Projects/ProjectsView.jsx
+++ b/src/projects/list/components/Projects/ProjectsView.jsx
@@ -10,6 +10,7 @@ import Walkthrough from '../Walkthrough/Walkthrough'
 
 import UserWithName from '../../../../components/User/UserWithName'
 import CoderBot from '../../../../components/CoderBot/CoderBot'
+import { findCategory } from '../../../../config/projectWizard'
 import { ROLE_CONNECT_MANAGER, ROLE_CONNECT_COPILOT, PROJECT_STATUS } from '../../../../config/constants'
 
 // This handles showing a spinner while the state is being loaded async
@@ -39,10 +40,14 @@ const projectTypeMap = {
   'app_dev': 'Full App'
 }
 const projectTypeClassMap = {
-  'generic': 'purple-block',
-  'visual_design': 'blue-block',
-  'visual_prototype': 'blue-block',
-  'app_dev': 'green-block'
+  'generic'             : 'purple-block',
+  'visual_design'       : 'blue-block',
+  'visual_prototype'    : 'blue-block',
+  'app_dev'             : 'green-block',
+  'app'                 : 'green-block',
+  'website'             : 'green-block',
+  'chatbot'             : 'green-block',
+  'quality_assurance'   : 'green-block',
 }
 /*eslint-enable */
 
@@ -79,11 +84,12 @@ const ProjectsView = props => {
         const url = `/projects/${item.id}`
         const code = _.get(item, 'details.utm.code', '')
         const projectTypeClass = projectTypeClassMap[item.type]
+        const projectType = _.get(findCategory(item.type), 'name', '')
         return (
           <div className="spacing">
             <Link to={url} className="link-title">{item.name}</Link>
             <div className="project-metadata">
-              <span className={ projectTypeClass }>{projectTypeMap[item.type]}</span>
+              <span className={ projectTypeClass }>{ projectType }</span>
               { code && <span className="item-ref-code txt-gray-md">Ref: {code}</span> }
               <span className="txt-time">{moment(item.createdAt).format('DD MMM YYYY')}</span>
             </div>

From a71fdae77afbd3c1a9ce15d45c27cced4abd83e1 Mon Sep 17 00:00:00 2001
From: Vikas Agarwal <vikas.agarwal@topcoder.com>
Date: Fri, 29 Sep 2017 17:36:07 +0530
Subject: [PATCH 2/3] Fixed lint error

---
 src/projects/list/components/Projects/ProjectsView.jsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/projects/list/components/Projects/ProjectsView.jsx b/src/projects/list/components/Projects/ProjectsView.jsx
index fac465db5..58e60891b 100644
--- a/src/projects/list/components/Projects/ProjectsView.jsx
+++ b/src/projects/list/components/Projects/ProjectsView.jsx
@@ -33,12 +33,6 @@ const EnhancedGrid = enhance(GridView)
 require('./ProjectsView.scss')
 
 /*eslint-disable quote-props */
-const projectTypeMap = {
-  'generic': 'Work Project',
-  'visual_design': 'Design',
-  'visual_prototype': 'Design & Prototype',
-  'app_dev': 'Full App'
-}
 const projectTypeClassMap = {
   'generic'             : 'purple-block',
   'visual_design'       : 'blue-block',

From 73231aa5b5c54046353326e1d3f1b863b3368deb Mon Sep 17 00:00:00 2001
From: Vikas Agarwal <vikas.agarwal@topcoder.com>
Date: Fri, 29 Sep 2017 17:57:08 +0530
Subject: [PATCH 3/3] =?UTF-8?q?Github=20issue#1206,=20Main=20page/product?=
 =?UTF-8?q?=20select=20logo=20to=20be=20a=20link=20=E2=80=94=20Converted?=
 =?UTF-8?q?=20logo=20to=20be=20link=20for=20non=20logged=20in=20user?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/projects/create/components/FillProjectDetails.js     | 9 +++++----
 .../create/components/IncompleteProjectConfirmation.js   | 8 +++++---
 src/projects/create/components/ProjectWizard.jsx         | 2 ++
 src/projects/create/components/SelectProduct.js          | 7 +++++--
 src/projects/create/components/SelectProjectType.jsx     | 5 ++++-
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/projects/create/components/FillProjectDetails.js b/src/projects/create/components/FillProjectDetails.js
index dcb6d4a7d..50c8812fb 100644
--- a/src/projects/create/components/FillProjectDetails.js
+++ b/src/projects/create/components/FillProjectDetails.js
@@ -1,5 +1,6 @@
 import _ from 'lodash'
 import React, { PropTypes as PT, Component } from 'react'
+import { Link } from 'react-router'
 import Sticky from 'react-stickynode'
 
 import config from '../../../config/projectWizard'
@@ -34,9 +35,9 @@ class FillProjectDetails extends Component  {
 
   render() {
     const { project, dirtyProject, processing, submitBtnText, userRoles } = this.props
+    const isLoggedIn = userRoles && userRoles.length
+    const logoTargetUrl = isLoggedIn ? '/projects' : '/'
     const product = _.get(project, 'details.products[0]')
-    // const projectName = _.get(project, 'name')
-    // const projectRef = _.get(project, 'details.utm.code', '')
     const projectTypeId = _.get(project, 'type')
     const subConfig = config[_.findKey(config, {id : projectTypeId})]
     const productName = _.findKey(subConfig.subtypes, {id : product})
@@ -48,8 +49,8 @@ class FillProjectDetails extends Component  {
     return (
       <div className="FillProjectDetailsWrapper">
         <div className="header headerFillProjectDetails">
-          { (!userRoles || !userRoles.length) && <SVGIconImage filePath="connect-logo-mono" className="connectLogo" />}
-          { (!userRoles || !userRoles.length) && <button className="tc-btn tc-btn-default tc-btn-sm" onClick={ this.props.onChangeProjectType }><SVGIconImage filePath="arrows-undo" />Change project type</button> }
+          { !isLoggedIn && <Link className="logo" to={logoTargetUrl} target="_self"><SVGIconImage filePath="connect-logo-mono" className="connectLogo"/></Link>}
+          { !isLoggedIn && <button className="tc-btn tc-btn-default tc-btn-sm" onClick={ this.props.onChangeProjectType }><SVGIconImage filePath="arrows-undo" />Change project type</button> }
         </div>
         <div className="FillProjectDetails">
           <div className="header">
diff --git a/src/projects/create/components/IncompleteProjectConfirmation.js b/src/projects/create/components/IncompleteProjectConfirmation.js
index 67cdd5032..def957993 100644
--- a/src/projects/create/components/IncompleteProjectConfirmation.js
+++ b/src/projects/create/components/IncompleteProjectConfirmation.js
@@ -1,13 +1,15 @@
 import React, { PropTypes as PT } from 'react'
+import { Link } from 'react-router'
 import SVGIconImage from '../../../components/SVGIconImage'
 import './IncompleteProjectConfirmation.scss'
 
-function IncompleteProjectConfirmation({ loadIncompleteProject, removeIncompleteProject }) {
-  
+function IncompleteProjectConfirmation({ loadIncompleteProject, removeIncompleteProject, userRoles }) {
+  const isLoggedIn = userRoles && userRoles.length
+  const logoTargetUrl = isLoggedIn ? '/projects' : '/'
   return (
     <div className="IncompleteProjectConfirmation">
       <div className="header">
-        <SVGIconImage filePath="connect-logo-mono" />
+        { !isLoggedIn && <Link className="logo" to={logoTargetUrl} target="_self"><SVGIconImage filePath="connect-logo-mono" className="connectLogo"/></Link>}
       </div>
       <h3>Welcome back!</h3>
       <h5>You started a project with us recently.</h5>
diff --git a/src/projects/create/components/ProjectWizard.jsx b/src/projects/create/components/ProjectWizard.jsx
index f191b19af..8b6847ce8 100644
--- a/src/projects/create/components/ProjectWizard.jsx
+++ b/src/projects/create/components/ProjectWizard.jsx
@@ -324,9 +324,11 @@ class ProjectWizard extends Component {
         <IncompleteProjectConfirmation
           loadIncompleteProject={ this.loadIncompleteProject }
           removeIncompleteProject={ this.removeIncompleteProject }
+          userRoles={ userRoles }
         />
         <SelectProjectType
           onProjectTypeChange={ this.updateProjectType }
+          userRoles={ userRoles }
         />
         <SelectProduct
           onProductChange={ this.updateProducts }
diff --git a/src/projects/create/components/SelectProduct.js b/src/projects/create/components/SelectProduct.js
index 9bce73d48..03965f20d 100644
--- a/src/projects/create/components/SelectProduct.js
+++ b/src/projects/create/components/SelectProduct.js
@@ -1,4 +1,5 @@
 import React, { PropTypes as PT } from 'react'
+import { Link } from 'react-router'
 import config from '../../../config/projectWizard'
 import ProductCard from './ProductCard'
 import SVGIconImage from '../../../components/SVGIconImage'
@@ -7,6 +8,8 @@ import './SelectProduct.scss'
 
 function SelectProduct(props) {
   const { userRoles, projectType, onChangeProjectType } = props
+  const isLoggedIn = userRoles && userRoles.length
+  const logoTargetUrl = isLoggedIn ? '/projects' : '/'
   const cards = []
   for (const key in config) {
     const type = config[key]
@@ -33,8 +36,8 @@ function SelectProduct(props) {
   return (
     <div>
       <div className="header headerSelectProduct">
-        { (!userRoles || !userRoles.length) && <SVGIconImage filePath="connect-logo-mono" />}
-        { (!userRoles || !userRoles.length) && <button className="tc-btn tc-btn-default tc-btn-sm" onClick={ onChangeProjectType }><SVGIconImage filePath="arrows-undo" />Change project type</button> }
+        { !isLoggedIn && <Link className="logo" to={logoTargetUrl} target="_self"><SVGIconImage filePath="connect-logo-mono" className="connectLogo"/></Link>}
+        { !isLoggedIn && <button className="tc-btn tc-btn-default tc-btn-sm" onClick={ onChangeProjectType }><SVGIconImage filePath="arrows-undo" />Change project type</button> }
       </div>
       <div className="SelectProduct">
         <h1> { projectCategory.name } projects </h1>
diff --git a/src/projects/create/components/SelectProjectType.jsx b/src/projects/create/components/SelectProjectType.jsx
index 4f870757f..fcd756b87 100644
--- a/src/projects/create/components/SelectProjectType.jsx
+++ b/src/projects/create/components/SelectProjectType.jsx
@@ -1,4 +1,5 @@
 import React, { PropTypes as PT } from 'react'
+import { Link } from 'react-router'
 import config from '../../../config/projectWizard'
 import ProjectTypeCard from './ProjectTypeCard'
 import SVGIconImage from '../../../components/SVGIconImage'
@@ -7,6 +8,8 @@ import './SelectProjectType.scss'
 
 function SelectProjectType(props) {
   const { userRoles } = props
+  const isLoggedIn = userRoles && userRoles.length
+  const logoTargetUrl = isLoggedIn ? '/projects' : '/'
   const cards = []
   for (const key in config) {
     const item = config[key]
@@ -26,7 +29,7 @@ function SelectProjectType(props) {
   return (
     <div>
       <div className="header headerSelectProjectType">
-        { (!userRoles || !userRoles.length) && <SVGIconImage filePath="connect-logo-mono" className="connectLogo"/>}
+        { !isLoggedIn && <Link className="logo" to={logoTargetUrl} target="_self"><SVGIconImage filePath="connect-logo-mono" className="connectLogo"/></Link>}
       </div>
       <div className="SelectProjectType">
         <h1>Create a new project</h1>