Merge pull request #1265 from appirio-tech/dev

Promoting changes to production for release

Author: vikasrohit

circle.yml

@@ -19,7 +19,7 @@ compile:
 
 deployment:
   development:
-    branch: [dev, 'feature/back-forward-button-project-wizard']
+    branch: dev
     owner: appirio-tech
     commands:
       - ./deploy.sh DEV
@@ -28,6 +28,11 @@ deployment:
     owner: appirio-tech
     commands:
       - ./deploy.sh TEST01
+  test02:
+    branch: test02
+    owner: appirio-tech
+    commands:
+      - ./deploy.sh TEST02
   qa:
     branch: qa
     owner: appirio-tech

src/components/ActionCard/ActionCard.jsx

@@ -75,7 +75,7 @@ class Header extends React.Component{
         <div className="portrait">
           &nbsp;
         </div>
-        <div className="object">
+        <div className="object topicBody">
           <div className="card-header">
             <div className="card-title">
               <div>{this.props.title}</div>

src/components/ActionCard/ActionCard.scss

@@ -124,6 +124,10 @@
       &::before {
         content: " · ";
       }
+      
+      a {
+        color: $tc-gray-70;
+      }
     }
 
     .card-status {
@@ -132,13 +136,18 @@
     }
   }
 
+  .topicBody{
+    width: calc(100% - 40px);
+  }
+
   .card-body {
     @include roboto;
     font-size: $tc-label-lg;
     color: $tc-gray-70;
     line-height: $base-unit*5;
     padding: 10px 0;
     word-break: break-word;
+    overflow-x:auto;
 
     &.comment-section {
       margin-bottom: -50px;

src/components/Feed/Feed.jsx

@@ -77,7 +77,7 @@ class Feed extends React.Component {
           <div className="portrait">
             <Avatar avatarUrl={user.photoURL} userName={authorName} />
           </div>
-          <div className="object">
+          <div className="object topicBody">
             <div className="card-title">
               <div>{title}</div>
               {self && (

src/components/Home/Home.scss

@@ -70,6 +70,7 @@
 			padding-bottom: $base-unit*6;
 		}
 		.tc-btn{
+			color: #cfe6ff;
 			height:$base-unit*8;
 			width: $base-unit*50;
 			text-align: center;
@@ -79,6 +80,14 @@
 			font-size: $tc-label-lg;
 			display: block;
 			margin-bottom: $base-unit * 4;
+			&:hover {
+				color:#ffffff;
+				background-image: linear-gradient(#3996FF 0%, #127BF3 100%) !important;				
+			}			
+			&:active {
+				color:#ffffff;
+				background-image: linear-gradient(#3996FF 0%, #127BF3 100%) !important;
+			}
 		}
 	}
 }

src/components/LoadingIndicator/LoadingIndicator.scss

@@ -1,6 +1,8 @@
 .loading-indicator {
   height: 80%;
   width: 100%;
+  min-height: 70px;
+  min-width: 70px;
   background: 50% 50% no-repeat;
   background-size: 70px 70px;
 }

src/components/TopBar/ProjectsToolBar.js

@@ -1,25 +1,18 @@
 require('./ProjectsToolBar.scss')
 
 import React, {PropTypes, Component} from 'react'
+import { Link } from 'react-router'
 import { connect } from 'react-redux'
 import cn from 'classnames'
 import _ from 'lodash'
-import Modal from 'react-modal'
 import { SearchBar } from 'appirio-tech-react-components'
 import Filters from './Filters'
 
-import ModalControl from '../ModalControl'
-import SVGIconImage from '../SVGIconImage'
-import CoderBot from '../CoderBot/CoderBot'
-import ProjectWizard from '../../projects/create/components/ProjectWizard'
-
-import { createProjectWithStatus as createProjectAction } from '../../projects/actions/project'
 import { projectSuggestions, loadProjects } from '../../projects/actions/loadProjects'
 import {
   ROLE_CONNECT_COPILOT,
   ROLE_CONNECT_MANAGER,
-  ROLE_ADMINISTRATOR,
-  PROJECT_STATUS_IN_REVIEW
+  ROLE_ADMINISTRATOR
 } from '../../config/constants'
 
 
@@ -28,18 +21,14 @@ class ProjectsToolBar extends Component {
   constructor(props) {
     super(props)
     this.state = {
-      isCreateProjectModalVisible : false,
       errorCreatingProject: false,
       isFilterVisible: false
     }
     this.applyFilters = this.applyFilters.bind(this)
     this.toggleFilter = this.toggleFilter.bind(this)
-    this.showCreateProjectDialog = this.showCreateProjectDialog.bind(this)
-    this.hideCreateProjectDialog = this.hideCreateProjectDialog.bind(this)
     this.handleTermChange = this.handleTermChange.bind(this)
     this.handleSearch = this.handleSearch.bind(this)
     this.handleMyProjectsFilter = this.handleMyProjectsFilter.bind(this)
-    this.createProject = this.createProject.bind(this)
     this.onLeave = this.onLeave.bind(this)
   }
 
@@ -51,7 +40,6 @@ class ProjectsToolBar extends Component {
         this.setState({
           isProjectDirty : false
         }, () => {
-          this.hideCreateProjectDialog()
           this.props.router.push('/projects/' + nextProps.project.id)
         })
       } else {
@@ -103,26 +91,6 @@ class ProjectsToolBar extends Component {
     this.applyFilters({memberOnly: event.target.checked})
   }
 
-  showCreateProjectDialog() {
-    this.setState({
-      isCreateProjectModalVisible : true
-    })
-  }
-
-  hideCreateProjectDialog() {
-    let confirm = true
-    if (this.state.isProjectDirty) {
-      confirm = window.confirm('You have unsaved changes. Are you sure you want to leave?')
-    }
-    if (confirm === true) {
-      this.setState({
-        isProjectDirty: false,
-        isCreateProjectModalVisible : false,
-        errorCreatingProject: false
-      })
-    }
-  }
-
   applyFilters(filter) {
     const criteria = _.assign({}, this.props.criteria, filter)
     if (criteria && criteria.keyword) {
@@ -155,62 +123,27 @@ class ProjectsToolBar extends Component {
     this.props.loadProjects(criteria, page)
   }
 
-  createProject(project) {
-    this.props.createProjectAction(project, PROJECT_STATUS_IN_REVIEW)
-  }
-
   shouldComponentUpdate(nextProps, nextState) {
     const { user, criteria, creatingProject, projectCreationError, searchTermTag } = this.props
-    const { isCreateProjectModalVisible, errorCreatingProject, isFilterVisible } = this.state
+    const { errorCreatingProject, isFilterVisible } = this.state
     return nextProps.user.handle !== user.handle
     || JSON.stringify(nextProps.criteria) !== JSON.stringify(criteria)
     || nextProps.creatingProject !== creatingProject
     || nextProps.projectCreationError !== projectCreationError
     || nextProps.searchTermTag !== searchTermTag
-    || nextState.isCreateProjectModalVisible !== isCreateProjectModalVisible
     || nextState.errorCreatingProject !== errorCreatingProject
     || nextState.isFilterVisible !== isFilterVisible
   }
 
   render() {
     const { logo, userMenu, userRoles, criteria, isPowerUser } = this.props
-    const { isCreateProjectModalVisible, errorCreatingProject, isFilterVisible } = this.state
+    const { isFilterVisible } = this.state
     const isLoggedIn = userRoles && userRoles.length
 
     const noOfFilters = _.keys(criteria).length - 1 // -1 for default sort criteria
 
     return (
       <div className="ProjectsToolBar">
-        <Modal
-          isOpen={ isCreateProjectModalVisible }
-          className="project-creation-dialog"
-          overlayClassName="project-creation-dialog-overlay"
-          onRequestClose={ this.hideCreateProjectDialog }
-          contentLabel=""
-        >
-          <ModalControl
-            className="escape-button"
-            icon={<SVGIconImage filePath="x-mark" />}
-            label="esc"
-            onClick={ this.hideCreateProjectDialog }
-          />
-          { !errorCreatingProject &&
-            <ProjectWizard
-              showModal={ false }
-              processing={ this.props.creatingProject }
-              createProject={ this.createProject }
-              closeModal={ this.hideCreateProjectDialog }
-              userRoles={ userRoles }
-              onProjectUpdate={ (updatedProject, dirty=true) => {
-                this.setState({
-                  isProjectDirty: dirty
-                })
-              }
-              }
-            />
-          }
-          { errorCreatingProject && <CoderBot code={ 500 } message="Unable to create project" />}
-        </Modal>
         <div className="primary-toolbar">
           { logo }
           {
@@ -240,7 +173,7 @@ class ProjectsToolBar extends Component {
           {
             !!isLoggedIn &&
             <div>
-              <a onClick={ this.showCreateProjectDialog } href="javascript:" className="tc-btn tc-btn-sm tc-btn-primary">+ New Project</a>
+              <Link to="/new-project" className="tc-btn tc-btn-sm tc-btn-primary">+ New Project</Link>
             </div>
           }
           { userMenu }
@@ -289,6 +222,6 @@ const mapStateToProps = ({ projectSearchSuggestions, searchTerm, projectSearch,
   }
 }
 
-const actionsToBind = { projectSuggestions, loadProjects, createProjectAction }
+const actionsToBind = { projectSuggestions, loadProjects }
 
 export default connect(mapStateToProps, actionsToBind)(ProjectsToolBar)

src/config/projectWizard/index.js

@@ -116,7 +116,7 @@ const products = {
         details: 'Translate designs to a web (HTML/CSS/JavaScript) or mobile prototype',
         icon: 'product-dev-prototype',
         id: 'visual_prototype',
-        aliases: ['visual-prototype','visual_prototype'],
+        aliases: ['visual-prototype', 'visual_prototype'],
         disabled: true
       },
       'Front-end': {

src/projects/create/components/FillProjectDetails.js

@@ -1,10 +1,8 @@
 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'
-import SVGIconImage from '../../../components/SVGIconImage'
 import './FillProjectDetails.scss'
 import ProjectBasicDetailsForm from '../components/ProjectBasicDetailsForm'
 import ProjectOutline from '../components/ProjectOutline'
@@ -34,9 +32,7 @@ class FillProjectDetails extends Component  {
   }
 
   render() {
-    const { project, dirtyProject, processing, submitBtnText, userRoles } = this.props
-    const isLoggedIn = userRoles && userRoles.length
-    const logoTargetUrl = isLoggedIn ? '/projects' : '/'
+    const { project, dirtyProject, processing, submitBtnText } = this.props
     const product = _.get(project, 'details.products[0]')
     const projectTypeId = _.get(project, 'type')
     const subConfig = config[_.findKey(config, {id : projectTypeId})]
@@ -49,8 +45,6 @@ class FillProjectDetails extends Component  {
     return (
       <div className="FillProjectDetailsWrapper">
         <div className="header headerFillProjectDetails">
-          { !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">

src/projects/create/components/IncompleteProjectConfirmation.js

@@ -1,15 +1,13 @@
 import React, { PropTypes as PT } from 'react'
-import { Link } from 'react-router'
 import SVGIconImage from '../../../components/SVGIconImage'
 import './IncompleteProjectConfirmation.scss'
 
-function IncompleteProjectConfirmation({ loadIncompleteProject, removeIncompleteProject, userRoles }) {
-  const isLoggedIn = userRoles && userRoles.length
-  const logoTargetUrl = isLoggedIn ? '/projects' : '/'
+function IncompleteProjectConfirmation({ loadIncompleteProject, removeIncompleteProject }) {
+  // const isLoggedIn = userRoles && userRoles.length
   return (
     <div className="IncompleteProjectConfirmation">
       <div className="header">
-        { !isLoggedIn && <Link className="logo" to={logoTargetUrl} target="_self"><SVGIconImage filePath="connect-logo-mono" className="connectLogo"/></Link>}
+        <SVGIconImage filePath="connect-logo-mono" className="connectLogo"/>
       </div>
       <h3>Welcome back!</h3>
       <h5>You started a project with us recently.</h5>