@@ -323,12 +369,17 @@ class ChallengeScheduleField extends Component {
Timezone: {jstz.determine().name()}
-
{
@@ -361,7 +412,11 @@ class ChallengeScheduleField extends Component {
)
}
{currentTemplate && isEdit && !readOnly && (
- Edit
-
+ )
+ }
+
-
+
-
+
+ savePhases()} />
{},
resetPhase: () => {},
+ savePhases: () => {},
onUpdateSelect: () => {},
onUpdatePhase: () => {},
onUpdateOthers: () => {},
@@ -391,10 +446,10 @@ ChallengeScheduleField.defaultProps = {
ChallengeScheduleField.propTypes = {
templates: PropTypes.arrayOf(PropTypes.shape()).isRequired,
challengePhases: PropTypes.arrayOf(PropTypes.shape()).isRequired,
- challengePhasesWithCorrectTimeline: PropTypes.arrayOf(PropTypes.shape()),
challenge: PropTypes.shape().isRequired,
removePhase: PropTypes.func,
resetPhase: PropTypes.func,
+ savePhases: PropTypes.func,
onUpdateSelect: PropTypes.func,
onUpdatePhase: PropTypes.func,
onUpdateOthers: PropTypes.func.isRequired,
diff --git a/src/components/ChallengeEditor/ChallengeView/ChallengeView.module.scss b/src/components/ChallengeEditor/ChallengeView/ChallengeView.module.scss
index 8b609d15..e2cac20d 100644
--- a/src/components/ChallengeEditor/ChallengeView/ChallengeView.module.scss
+++ b/src/components/ChallengeEditor/ChallengeView/ChallengeView.module.scss
@@ -232,6 +232,10 @@
}
}
+.actionButtons {
+ display: flex;
+}
+
.button {
height: 40px;
diff --git a/src/components/ChallengeEditor/ChallengeView/index.js b/src/components/ChallengeEditor/ChallengeView/index.js
index 26ede324..a5c7d067 100644
--- a/src/components/ChallengeEditor/ChallengeView/index.js
+++ b/src/components/ChallengeEditor/ChallengeView/index.js
@@ -50,13 +50,14 @@ const ChallengeView = ({ projectDetail, challenge, metadata, challengeResources,
const isInternal = reviewType === 'internal'
const timeLineTemplate = _.find(metadata.timelineTemplates, { id: challenge.timelineTemplateId })
if (isLoading || _.isEmpty(metadata.challengePhases) || challenge.id !== challengeId) return
View Details
-
+
@@ -122,14 +123,16 @@ const ChallengeView = ({ projectDetail, challenge, metadata, challengeResources,
Groups: {challenge.groups ? challenge.groups.join(', ') : ''}
Public specification *
diff --git a/src/components/ChallengeEditor/CheckpointPrizes-Field/index.js b/src/components/ChallengeEditor/CheckpointPrizes-Field/index.js
index 86032aeb..9afd7790 100644
--- a/src/components/ChallengeEditor/CheckpointPrizes-Field/index.js
+++ b/src/components/ChallengeEditor/CheckpointPrizes-Field/index.js
@@ -4,10 +4,10 @@ import styles from './CheckpointPrizes-Field.module.scss'
import cn from 'classnames'
import { range } from 'lodash'
import { validateValue } from '../../../util/input-check'
-import { VALIDATION_VALUE_TYPE } from '../../../config/constants'
+import { VALIDATION_VALUE_TYPE, PRIZE_SETS_TYPE } from '../../../config/constants'
const CheckpointPrizesField = ({ challenge, onUpdateOthers }) => {
- const type = 'Checkpoint prizes'
+ const type = PRIZE_SETS_TYPE.CHECKPOINT_PRIZES
const checkpointPrize = challenge.prizeSets.find(p => p.type === type) || { type, prizes: [] }
const number = checkpointPrize.prizes.length
const amount = checkpointPrize.prizes.length ? checkpointPrize.prizes[0].value : 0
diff --git a/src/components/ChallengeEditor/CopilotFee-Field/index.js b/src/components/ChallengeEditor/CopilotFee-Field/index.js
index 734eaf8b..d7d357de 100644
--- a/src/components/ChallengeEditor/CopilotFee-Field/index.js
+++ b/src/components/ChallengeEditor/CopilotFee-Field/index.js
@@ -5,10 +5,10 @@ import PropTypes from 'prop-types'
import { validateValue } from '../../../util/input-check'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { faDollarSign } from '@fortawesome/free-solid-svg-icons'
-import { VALIDATION_VALUE_TYPE } from '../../../config/constants'
+import { VALIDATION_VALUE_TYPE, PRIZE_SETS_TYPE } from '../../../config/constants'
const CopilotFeeField = ({ challenge, onUpdateOthers, readOnly }) => {
- const type = 'Copilot payment'
+ const type = PRIZE_SETS_TYPE.COPILOT_PAYMENT
const copilotFee = (challenge.prizeSets && challenge.prizeSets.find(p => p.type === type)) || { type, prizes: [{ type, value: 0 }] }
const value = copilotFee.prizes[0].value
diff --git a/src/components/ChallengeEditor/Description-Field/Description-Field.module.scss b/src/components/ChallengeEditor/Description-Field/Description-Field.module.scss
index c888e6f6..f303a246 100644
--- a/src/components/ChallengeEditor/Description-Field/Description-Field.module.scss
+++ b/src/components/ChallengeEditor/Description-Field/Description-Field.module.scss
@@ -10,6 +10,7 @@
max-height: 410px;
display: flex;
flex-direction: column;
+ overflow: auto;
&.isPrivate {
max-height: 205px;
diff --git a/src/components/ChallengeEditor/NDAField/index.js b/src/components/ChallengeEditor/NDAField/index.js
index b9cf15a5..ff6b1749 100644
--- a/src/components/ChallengeEditor/NDAField/index.js
+++ b/src/components/ChallengeEditor/NDAField/index.js
@@ -1,10 +1,11 @@
+import _ from 'lodash'
import React from 'react'
import PropTypes from 'prop-types'
import styles from './NDAField.module.scss'
import { DEFAULT_NDA_UUID } from '../../../config/constants'
const NDAField = ({ challenge, toggleNdaRequire, readOnly }) => {
- const isRequiredNda = challenge.terms && challenge.terms.indexOf(DEFAULT_NDA_UUID) >= 0
+ const isRequiredNda = challenge.terms && _.some(challenge.terms, { id: DEFAULT_NDA_UUID })
return (
diff --git a/src/components/ChallengeEditor/ReviewCost-Field/index.js b/src/components/ChallengeEditor/ReviewCost-Field/index.js
index d4b9f5a6..11f288fc 100644
--- a/src/components/ChallengeEditor/ReviewCost-Field/index.js
+++ b/src/components/ChallengeEditor/ReviewCost-Field/index.js
@@ -3,10 +3,10 @@ import PropTypes from 'prop-types'
import styles from './ReviewCost-Field.module.scss'
import cn from 'classnames'
import { validateValue } from '../../../util/input-check'
-import { VALIDATION_VALUE_TYPE } from '../../../config/constants'
+import { VALIDATION_VALUE_TYPE, PRIZE_SETS_TYPE } from '../../../config/constants'
const ReviewCostField = ({ challenge, onUpdateOthers }) => {
- const type = 'Reviewer payment'
+ const type = PRIZE_SETS_TYPE.REVIEWER_PAYMENT
const reviewCost = challenge.prizeSets.find(p => p.type === type) || { type, prizes: [{ type, value: 0 }] }
const value = reviewCost.prizes[0].value
diff --git a/src/components/ChallengeEditor/Type-Field/index.js b/src/components/ChallengeEditor/Type-Field/index.js
index f694c569..3dbd2bdc 100644
--- a/src/components/ChallengeEditor/Type-Field/index.js
+++ b/src/components/ChallengeEditor/Type-Field/index.js
@@ -1,3 +1,4 @@
+import _ from 'lodash'
import React from 'react'
import PropTypes from 'prop-types'
import Select from '../../Select'
@@ -14,7 +15,7 @@ const TypeField = ({ types, onUpdateSelect, challenge, disabled }) => {
Public specification *
@@ -1111,10 +1139,14 @@ class ChallengeEditor extends Component {
{getTitle(isNew)}
+
+
* Required
{ activateModal }
{ draftModal }
+ { savedModal }
+
+)
+
+AlertModal.propTypes = {
+ title: PropTypes.string,
+ message: PropTypes.string,
+ theme: PropTypes.shape(),
+ onClose: PropTypes.func,
+ closeText: PropTypes.string,
+ closeLink: PropTypes.string,
+ okText: PropTypes.string,
+ okLink: PropTypes.string
+}
+
+export default AlertModal
diff --git a/src/components/Modal/ConfirmationModal.js b/src/components/Modal/ConfirmationModal.js
new file mode 100644
index 00000000..60e5b23d
--- /dev/null
+++ b/src/components/Modal/ConfirmationModal.js
@@ -0,0 +1,46 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import cn from 'classnames'
+import Modal from '.'
+import styles from './ConfirmationModal.module.scss'
+import OutlineButton from '../Buttons/OutlineButton'
+import PrimaryButton from '../Buttons/PrimaryButton'
+
+const ConfirmationModal = ({ title, message, errorMessage, theme, isProcessing, onCancel, onConfirm }) => (
+
+
+)
+
+ConfirmationModal.propTypes = {
+ title: PropTypes.string,
+ message: PropTypes.string,
+ errorMessage: PropTypes.string,
+ theme: PropTypes.shape(),
+ isProcessing: PropTypes.bool,
+ onCancel: PropTypes.func,
+ onConfirm: PropTypes.func
+}
+
+export default ConfirmationModal
diff --git a/src/components/Modal/ConfirmationModal.module.scss b/src/components/Modal/ConfirmationModal.module.scss
new file mode 100644
index 00000000..fc49b22d
--- /dev/null
+++ b/src/components/Modal/ConfirmationModal.module.scss
@@ -0,0 +1,101 @@
+@import "../../styles/includes";
+
+.contentContainer {
+ box-sizing: border-box;
+ background: $white;
+ opacity: 1;
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ align-items: center;
+ border-radius: 6px;
+ margin: 0 auto;
+ width: 852px;
+ padding: 30px;
+
+ .content {
+ padding: 30px;
+ width: 100%;
+ height: 100%;
+ }
+
+ .title {
+ @include roboto-bold();
+
+ font-size: 30px;
+ line-height: 36px;
+ margin-bottom: 30px;
+ margin-top: 0;
+ }
+
+ .message {
+
+ }
+
+ .errorMessage {
+ color: #BE405E;
+ font-size: 14px;
+ }
+
+ span {
+ @include roboto;
+
+ font-size: 22px;
+ font-weight: 400;
+ line-height: 26px;
+ }
+
+ &.confirm {
+ width: 999px;
+
+ .buttonGroup {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 30px;
+
+ .buttonSizeA {
+ width: 193px;
+ height: 40px;
+ margin-right: 33px;
+
+ span {
+ font-size: 18px;
+ font-weight: 500;
+ }
+ }
+
+ .buttonSizeB{
+ width: 160px;
+ height: 40px;
+
+ span {
+ font-size: 18px;
+ font-weight: 500;
+ line-height: 22px;
+ }
+ }
+ }
+ }
+
+ .buttonGroup {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 30px;
+
+ .button {
+ width: 135px;
+ height: 40px;
+ margin-right: 66px;
+
+ span {
+ font-size: 18px;
+ font-weight: 500;
+ }
+ }
+
+ .button:last-child {
+ margin-right: 0;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/components/Sidebar/Sidebar.module.scss b/src/components/Sidebar/Sidebar.module.scss
index 3c36e57a..8b87d068 100644
--- a/src/components/Sidebar/Sidebar.module.scss
+++ b/src/components/Sidebar/Sidebar.module.scss
@@ -5,34 +5,11 @@
height: 100vh;
background-color: $dark-gray;
overflow: auto;
-
- ul {
- list-style: none;
- width: 100%;
- padding: 0;
- margin-top: 0;
-
- li {
- cursor: pointer;
- }
- }
-
- a {
- text-decoration: none;
- }
-
- .noProjects {
- @include roboto;
- font-weight: 400;
- padding-left: 30px;
- padding-right: 20px;
- color: $white;
- }
}
.logo {
width: calc(100% - 100px);
- padding: 30px 50px 42px 50px;
+ padding: 30px 50px 42px 30px;
@media screen and (max-width: 300px * 4) {
width: calc(100% - 20px);
padding: 30px 10px 42px 10px;
@@ -46,10 +23,8 @@
font-weight: 400;
line-height: 31px;
color: $white;
- display: flex;
- justify-content: center;
- align-items: center;
- margin-bottom: 37px
+ margin-bottom: 37px;
+ padding-left: 30px;
}
.homeLink {
diff --git a/src/components/Sidebar/index.js b/src/components/Sidebar/index.js
index 97bc0c76..9869e77f 100644
--- a/src/components/Sidebar/index.js
+++ b/src/components/Sidebar/index.js
@@ -5,71 +5,28 @@ import React from 'react'
import { Link } from 'react-router-dom'
import PropTypes from 'prop-types'
import cn from 'classnames'
-import _ from 'lodash'
-import ProjectCard from '../ProjectCard'
-import { DebounceInput } from 'react-debounce-input'
-import Loader from '../Loader'
import TopcoderLogo from '../../assets/images/topcoder-logo.png'
import styles from './Sidebar.module.scss'
const Sidebar = ({
- projects, isLoading, setActiveProject,
- projectId, resetSidebarActiveParams,
- updateProjectsList, searchProjectName
+ projectId, resetSidebarActiveParams
}) => {
- const projectComponents = projects.map(p => (
-
-
- ))
-
return (
updateProjectsList(e.target.value)}
- value={searchProjectName}
- />
- {
- isLoading ?
)
}
Sidebar.propTypes = {
- projects: PropTypes.arrayOf(PropTypes.shape()),
- isLoading: PropTypes.bool,
- setActiveProject: PropTypes.func,
projectId: PropTypes.string,
- resetSidebarActiveParams: PropTypes.func,
- searchProjectName: PropTypes.string,
- updateProjectsList: PropTypes.func
+ resetSidebarActiveParams: PropTypes.func
}
export default Sidebar
diff --git a/src/config/constants.js b/src/config/constants.js
index e587c2f8..1d250c0d 100644
--- a/src/config/constants.js
+++ b/src/config/constants.js
@@ -8,7 +8,8 @@ export const {
DIRECT_PROJECT_URL,
ONLINE_REVIEW_URL,
DEFAULT_TERM_UUID,
- DEFAULT_NDA_UUID
+ DEFAULT_NDA_UUID,
+ SUBMITTER_ROLE_UUID
} = process.env
// Actions
@@ -71,12 +72,12 @@ export const PHASE_STATUS = {
}
// List of prize sets types
-export const PRIZE_SETS_TYPE = [
- 'Challenge prizes',
- 'Copilot payment',
- 'Reviewer payment',
- 'Checkpoint prizes'
-]
+export const PRIZE_SETS_TYPE = {
+ CHALLENGE_PRIZES: 'placement',
+ COPILOT_PAYMENT: 'copilot',
+ REVIEWER_PAYMENT: 'reviewer',
+ CHECKPOINT_PRIZES: 'checkpoint'
+}
// List of subtracks that should be considered as Marathon Matches
export const MARATHON_MATCH_SUBTRACKS = [
diff --git a/src/containers/ChallengeEditor/index.js b/src/containers/ChallengeEditor/index.js
index 284fa820..6fe3f152 100644
--- a/src/containers/ChallengeEditor/index.js
+++ b/src/containers/ChallengeEditor/index.js
@@ -10,6 +10,7 @@ import {
loadTimelineTemplates,
loadChallengePhases,
loadChallengeTypes,
+ loadChallengeTimelines,
loadChallengeTags,
loadChallengeTerms,
loadGroups,
@@ -29,6 +30,7 @@ class ChallengeEditor extends Component {
loadTimelineTemplates,
loadChallengePhases,
loadChallengeTypes,
+ loadChallengeTimelines,
loadChallengeTags,
loadChallengeTerms,
loadGroups,
@@ -39,23 +41,24 @@ class ChallengeEditor extends Component {
loadTimelineTemplates()
loadChallengePhases()
loadChallengeTypes()
+ loadChallengeTimelines()
loadChallengeTags()
loadChallengeTerms()
loadGroups()
loadResourceRoles()
this.fetchChallengeDetails(match, loadChallengeDetails, loadResources)
- this.unlisten = this.props.history.listen(() => {
- const { isLoading } = this.props
- if (!isLoading) {
- const { match: newMatch, loadChallengeDetails, loadResources } = this.props
- this.fetchChallengeDetails(newMatch, loadChallengeDetails, loadResources)
- }
- })
+ // this.unlisten = this.props.history.listen(() => {
+ // const { isLoading } = this.props
+ // if (!isLoading) {
+ // const { match: newMatch, loadChallengeDetails, loadResources } = this.props
+ // this.fetchChallengeDetails(newMatch, loadChallengeDetails, loadResources)
+ // }
+ // })
}
componentWillUnmount () {
- this.unlisten()
+ // this.unlisten()
}
componentWillReceiveProps (nextProps) {
@@ -166,6 +169,7 @@ ChallengeEditor.propTypes = {
loadTimelineTemplates: PropTypes.func,
loadChallengePhases: PropTypes.func,
loadChallengeTypes: PropTypes.func,
+ loadChallengeTimelines: PropTypes.func,
loadChallengeTags: PropTypes.func,
loadChallengeTerms: PropTypes.func,
loadGroups: PropTypes.func,
@@ -175,7 +179,7 @@ ChallengeEditor.propTypes = {
challengeResources: PropTypes.arrayOf(PropTypes.object),
challengeDetails: PropTypes.object,
projectDetail: PropTypes.object,
- history: PropTypes.object,
+ // history: PropTypes.object,
metadata: PropTypes.shape({
challengeTypes: PropTypes.array
}),
@@ -203,6 +207,7 @@ const mapDispatchToProps = {
loadTimelineTemplates,
loadChallengePhases,
loadChallengeTypes,
+ loadChallengeTimelines,
loadChallengeTags,
loadGroups,
createAttachment,
diff --git a/src/containers/Challenges/Challenges.module.scss b/src/containers/Challenges/Challenges.module.scss
new file mode 100644
index 00000000..01cafd76
--- /dev/null
+++ b/src/containers/Challenges/Challenges.module.scss
@@ -0,0 +1,51 @@
+@import "../../styles/includes";
+
+.projectSearch {
+ padding: 20px 20px 0px;
+
+ .projectSearchHeader {
+ display: flex;
+
+ label {
+ line-height: 40px;
+ margin-right: 10px;
+ }
+ }
+
+ ul {
+ background-color: $lighter-gray;
+ list-style: none;
+ width: 100%;
+ padding: 0;
+ margin-top: 0;
+ border-radius: 3px;
+ flex: 1;
+
+ li {
+ cursor: pointer;
+ }
+ }
+
+ input[type="text"] {
+ flex: 2;
+ }
+
+ input[type="checkbox"] {
+ margin-left: 20px;
+ margin-right: 10px;
+ height: 40px;
+ }
+
+ a {
+ color: $dark-gray;
+ text-decoration: none;
+ }
+
+ .noProjects {
+ @include roboto;
+ font-weight: 400;
+ padding-left: 30px;
+ padding-right: 20px;
+ color: $white;
+ }
+}
\ No newline at end of file
diff --git a/src/containers/Challenges/index.js b/src/containers/Challenges/index.js
index f51dde62..f2ec3292 100644
--- a/src/containers/Challenges/index.js
+++ b/src/containers/Challenges/index.js
@@ -2,25 +2,40 @@
* Container to render Challenges page
*/
import _ from 'lodash'
-import React, { Component } from 'react'
+import React, { Component, Fragment } from 'react'
// import { Redirect } from 'react-router-dom'
import PropTypes from 'prop-types'
import { connect } from 'react-redux'
+import { DebounceInput } from 'react-debounce-input'
import ChallengesComponent from '../../components/ChallengesComponent'
+import ProjectCard from '../../components/ProjectCard'
+import Loader from '../../components/Loader'
import { loadChallengesByPage } from '../../actions/challenges'
import { loadProject } from '../../actions/projects'
-import { resetSidebarActiveParams } from '../../actions/sidebar'
+import { loadProjects, setActiveProject, resetSidebarActiveParams } from '../../actions/sidebar'
import {
CHALLENGE_STATUS
} from '../../config/constants'
+import styles from './Challenges.module.scss'
class Challenges extends Component {
+ constructor (props) {
+ super(props)
+ this.state = {
+ searchProjectName: '',
+ onlyMyProjects: true
+ }
+
+ this.updateProjectName = this.updateProjectName.bind(this)
+ this.toggleMyProjects = this.toggleMyProjects.bind(this)
+ }
+
componentDidMount () {
const { activeProjectId, resetSidebarActiveParams, menu, projectId } = this.props
if (menu === 'NULL' && activeProjectId !== -1) {
resetSidebarActiveParams()
} else {
- this.props.loadChallengesByPage(1, projectId ? parseInt(projectId) : -1, CHALLENGE_STATUS.ACTIVE, '')
+ // this.props.loadChallengesByPage(1, projectId ? parseInt(projectId) : -1, CHALLENGE_STATUS.ACTIVE, '')
if (projectId) {
this.props.loadProject(projectId)
}
@@ -28,7 +43,9 @@ class Challenges extends Component {
}
componentWillReceiveProps (nextProps) {
- this.reloadChallenges(nextProps)
+ if (this.props.activeProjectId !== nextProps.activeProjectId) {
+ this.reloadChallenges(nextProps)
+ }
}
reloadChallenges (props) {
@@ -43,6 +60,17 @@ class Challenges extends Component {
}
}
+ updateProjectName (val) {
+ this.setState({ searchProjectName: val })
+ this.props.loadProjects(val, this.state.onlyMyProjects)
+ }
+
+ toggleMyProjects (evt) {
+ this.setState({ onlyMyProjects: evt.target.checked }, () => {
+ this.props.loadProjects(this.state.searchProjectName, this.state.onlyMyProjects)
+ })
+ }
+
render () {
const {
challenges,
@@ -56,26 +84,70 @@ class Challenges extends Component {
loadChallengesByPage,
page,
perPage,
- totalChallenges
+ totalChallenges,
+ setActiveProject
} = this.props
+ const { searchProjectName, onlyMyProjects } = this.state
const projectInfo = _.find(projects, { id: activeProjectId }) || {}
+ const projectComponents = projects.map(p => (
+
+
+ ))
return (
-
+
)
}
}
@@ -96,7 +168,9 @@ Challenges.propTypes = {
resetSidebarActiveParams: PropTypes.func,
page: PropTypes.number.isRequired,
perPage: PropTypes.number.isRequired,
- totalChallenges: PropTypes.number.isRequired
+ totalChallenges: PropTypes.number.isRequired,
+ loadProjects: PropTypes.func.isRequired,
+ setActiveProject: PropTypes.func.isRequired
}
const mapStateToProps = ({ challenges, sidebar, projects }) => ({
@@ -111,7 +185,9 @@ const mapStateToProps = ({ challenges, sidebar, projects }) => ({
const mapDispatchToProps = {
loadChallengesByPage,
resetSidebarActiveParams,
- loadProject
+ loadProject,
+ loadProjects,
+ setActiveProject
}
export default connect(mapStateToProps, mapDispatchToProps)(Challenges)
diff --git a/src/containers/Sidebar/index.js b/src/containers/Sidebar/index.js
index b8764a94..b58b340f 100644
--- a/src/containers/Sidebar/index.js
+++ b/src/containers/Sidebar/index.js
@@ -15,15 +15,23 @@ class SidebarContainer extends Component {
}
componentDidMount () {
- this.props.loadProjects()
-
- const { projectId, activeProjectId } = this.props
+ const { projectId, activeProjectId, isLoading } = this.props
+ if (!projectId && activeProjectId === -1 && !isLoading) {
+ this.props.loadProjects()
+ }
if (projectId && activeProjectId < 0) {
this.props.setActiveProject(parseInt(projectId))
}
}
+ componentWillReceiveProps (nextProps) {
+ const { projectId, isLoading } = nextProps
+ if (this.props.projectId !== projectId && !projectId && !isLoading) {
+ this.props.loadProjects()
+ }
+ }
+
updateProjectName (val) {
this.setState({ searchProjectName: val })
this.props.loadProjects(val)
diff --git a/src/containers/TopbarContainer/index.js b/src/containers/TopbarContainer/index.js
index d56bb7a5..3533e475 100644
--- a/src/containers/TopbarContainer/index.js
+++ b/src/containers/TopbarContainer/index.js
@@ -4,12 +4,19 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { loadUser } from '../../actions/auth'
+import { setActiveProject } from '../../actions/sidebar'
import { connect } from 'react-redux'
import TopBar from '../../components/TopBar'
class TopbarContainer extends Component {
componentDidMount () {
this.props.loadUser()
+
+ const { projectId, activeProjectId } = this.props
+
+ if (projectId && activeProjectId < 0) {
+ this.props.setActiveProject(parseInt(projectId))
+ }
}
render () {
@@ -20,7 +27,10 @@ class TopbarContainer extends Component {
TopbarContainer.propTypes = {
loadUser: PropTypes.func.isRequired,
- auth: PropTypes.object.isRequired
+ setActiveProject: PropTypes.func.isRequired,
+ auth: PropTypes.object.isRequired,
+ activeProjectId: PropTypes.number,
+ projectId: PropTypes.string
}
const mapStateToProps = ({ auth }) => ({
@@ -28,7 +38,8 @@ const mapStateToProps = ({ auth }) => ({
})
const mapDispatchToProps = {
- loadUser
+ loadUser,
+ setActiveProject
}
export default connect(mapStateToProps, mapDispatchToProps)(TopbarContainer)
diff --git a/src/reducers/challenges.js b/src/reducers/challenges.js
index f494756c..5ade02c6 100644
--- a/src/reducers/challenges.js
+++ b/src/reducers/challenges.js
@@ -23,7 +23,7 @@ import {
} from '../config/constants'
const initialState = {
- isLoading: true,
+ isLoading: false,
challenges: [],
metadata: {},
challengeDetails: {},
diff --git a/src/reducers/sidebar.js b/src/reducers/sidebar.js
index 5e775474..54e2cf45 100644
--- a/src/reducers/sidebar.js
+++ b/src/reducers/sidebar.js
@@ -11,14 +11,14 @@ import {
const initialState = {
activeProjectId: -1,
- isLoading: true,
+ isLoading: false,
projects: []
}
export default function (state = initialState, action) {
switch (action.type) {
case SET_ACTIVE_PROJECT:
- return { ...state, activeProjectId: action.projectId }
+ return { ...state, activeProjectId: action.projectId, projects: [], isLoading: false }
case LOAD_PROJECTS_SUCCESS:
return { ...state, projects: action.projects, isLoading: false, isLoggedIn: true }
case LOAD_PROJECTS_PENDING:
diff --git a/src/routes.js b/src/routes.js
index 72de1741..6e83c648 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -82,7 +82,7 @@ class Routes extends React.Component {
renderApp(
{ challengeForm }
diff --git a/src/components/ChallengesComponent/ChallengeList/index.js b/src/components/ChallengesComponent/ChallengeList/index.js
index faa1d5d0..b1c2e30f 100644
--- a/src/components/ChallengesComponent/ChallengeList/index.js
+++ b/src/components/ChallengesComponent/ChallengeList/index.js
@@ -203,7 +203,11 @@ class ChallengeList extends Component {
-
{
map(challenges, (c) => {
- return
-
+
+
+ )
})
}
+
+ {title}
+ {message}
+
+
+
+ {} : onClose}
+ />
+
+
+
+
+
+ {title}
+ {message}
+
+
+ {errorMessage}
+
+
+
+
+ Challenge Editor
- {
- !isLoading && !searchProjectName && _.get(projectComponents, 'length', 0) === 0 && (
-
- You don't have any active projects yet!
-
- )
- }
Active challenges
- -
- {projectComponents}
-
+
+ { activeProjectId !== -1 &&
+
+ this.updateProjectName(e.target.value)}
+ value={searchProjectName}
+ />
+
+
+
+ {
+ activeProjectId === -1 && No project selected. Select one below
+ }
+ {
+ isLoading ? -
+ {projectComponents}
+