Skip to content

Community Fixes January 2021 #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Jan 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f5f0062
add favicon
nursoltan-s Jan 9, 2021
20aff2a
added assign to me button
nursoltan-s Jan 9, 2021
b9ae916
add Iterative Reviewer for First2Finish and Task type challenges
akumar1503 Jan 9, 2021
2b5f8c2
Fixed issue #1007
dashu-baba Jan 9, 2021
598a625
groups filter from api
SleepyZenitsu Jan 9, 2021
5a282ba
react-select new version changes
SleepyZenitsu Jan 10, 2021
bfc9d56
Merge pull request #1026 from nursoltan-s/nursoltan-874
maxceem Jan 11, 2021
62c81c1
change button to href
nursoltan-s Jan 11, 2021
283b9d9
add prevent Default
nursoltan-s Jan 11, 2021
7dc52df
chore: don't use "local.topcoder-dev.com" anymore
maxceem Jan 11, 2021
f35be7f
show only edit
nursoltan-s Jan 11, 2021
05b9eb8
fix: fix isssue #986
yoution Jan 11, 2021
38bf8ef
Merge pull request #1027 from nursoltan-s/nursoltan-1017
maxceem Jan 11, 2021
eaf1abd
Fix initial reviewer field and do not re-post resource to server
akumar1503 Jan 11, 2021
6597d74
Merge pull request #1028 from yoution/yoution-issue-986
maxceem Jan 11, 2021
a4a603c
Updated properties and related backend call location for task type …
dashu-baba Jan 12, 2021
a000be0
Merge branch 'cf-jan-2021' into fixes-#927
mark-nakachon Jan 12, 2021
f2408b2
Merge pull request #1034 from mark-nakachon/fixes-#927
maxceem Jan 12, 2021
329cd32
Merge branch 'cf-jan-2021' into issue-1007
dashu-baba Jan 12, 2021
5653cc6
console log removed
dashu-baba Jan 12, 2021
cb57a78
Merge pull request #1031 from dashu-baba/issue-1007
maxceem Jan 12, 2021
84b4ed0
fix undefined bug
akumar1503 Jan 12, 2021
4ca163b
Merge pull request #1029 from kodar007/fix-issue-1008
maxceem Jan 12, 2021
3e113c9
fix: reviewer role during creating tasks
maxceem Jan 12, 2021
311bcb1
requested changes in pull request
SleepyZenitsu Jan 13, 2021
ca73946
Merge pull request #1032 from CDharmateja/develop
maxceem Jan 13, 2021
ce7f7cf
Merge branch 'develop' into cf-jan-2021
maxceem Jan 13, 2021
ab2d4cf
Revert "Merge branch 'develop' into cf-jan-2021"
maxceem Jan 13, 2021
b2a15b4
fix: delete button small fixes
maxceem Jan 13, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ npm install

1. copy the environment file in docs/dev.env to /.env

1. add `127.0.0.1 local.topcoder-dev.com` to your /etc/hosts file

1. If you are using local instances of the API's, change the DEV_API_HOSTNAME in configs/constants/development.js to match your local api endpoint.
- For example change it to 'http://localhost:3000/',

Expand All @@ -50,7 +48,7 @@ npm install
npm run dev
```

You can access the app from [http://local.topcoder-dev.com:3001/](http://local.topcoder-dev.com:3001/)
You can access the app from [http://localhost:3000/](http://localhost:3000/)

The page will reload if you make edits.

Expand Down
1 change: 0 additions & 1 deletion config/constants/development.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module.exports = {
COMMUNITY_APP_URL: `https://www.${DOMAIN}`,
MEMBER_API_URL: `${DEV_API_HOSTNAME}/v4/members`,
MEMBER_API_V3_URL: `${DEV_API_HOSTNAME}/v3/members`,
DEV_APP_URL: `http://local.${DOMAIN}`,
CHALLENGE_API_URL: `${DEV_API_HOSTNAME}/v5/challenges`,
CHALLENGE_TIMELINE_TEMPLATES_URL: `${DEV_API_HOSTNAME}/v5/timeline-templates`,
CHALLENGE_TYPES_URL: `${DEV_API_HOSTNAME}/v5/challenge-types`,
Expand Down
1 change: 0 additions & 1 deletion config/constants/production.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module.exports = {
COMMUNITY_APP_URL: `https://www.${DOMAIN}`,
MEMBER_API_URL: `${PROD_API_HOSTNAME}/v4/members`,
MEMBER_API_V3_URL: `${PROD_API_HOSTNAME}/v3/members`,
DEV_APP_URL: `https://submission-review.${DOMAIN}`,
CHALLENGE_API_URL: `${PROD_API_HOSTNAME}/v5/challenges`,
CHALLENGE_TIMELINE_TEMPLATES_URL: `${PROD_API_HOSTNAME}/v5/timeline-templates`,
CHALLENGE_TYPES_URL: `${PROD_API_HOSTNAME}/v5/challenge-types`,
Expand Down
166 changes: 155 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"react-redux": "^6.0.0",
"react-redux-toastr": "^7.5.1",
"react-router-dom": "^4.3.1",
"react-select": "^1.2.0",
"react-select": "^3.1.1",
"react-stickynode": "^2.1.1",
"react-svg": "^4.1.1",
"react-tabs": "^3.0.0",
Expand Down
Binary file added public/favicon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion scripts/start.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ checkBrowsers(paths.appPath, isInteractive)
clearConsole()
}
console.log(chalk.cyan('Starting the development server...\n'))
openBrowser(constants.DEV_APP_URL ? `${constants.DEV_APP_URL}:${process.env.PORT || 3000}` : urls.localUrlForBrowser)
openBrowser(urls.localUrlForBrowser)
})

const SIGNALS = ['SIGINT', 'SIGTERM']
Expand Down
33 changes: 33 additions & 0 deletions src/actions/challenges.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ import {
fetchResourceRoles,
fetchChallengeTimelines,
fetchChallengeTracks,
fetchGroupDetail,
updateChallenge,
patchChallenge,
deleteChallenge as deleteChallengeAPI,
createChallenge as createChallengeAPI,
createResource as createResourceAPI,
deleteResource as deleteResourceAPI
Expand All @@ -38,6 +40,9 @@ import {
CREATE_CHALLENGE_PENDING,
CREATE_CHALLENGE_SUCCESS,
CREATE_CHALLENGE_FAILURE,
DELETE_CHALLENGE_PENDING,
DELETE_CHALLENGE_SUCCESS,
DELETE_CHALLENGE_FAILURE,
LOAD_CHALLENGE_RESOURCES
} from '../config/constants'
import { loadProject } from './projects'
Expand Down Expand Up @@ -182,6 +187,14 @@ export function loadChallengeDetails (projectId, challengeId) {
}
}

/**
* Loads group details
*/
export function loadGroupDetails (groupIds) {
const promiseAll = groupIds.map(id => fetchGroupDetail(id))
return Promise.all(promiseAll)
}

/**
* Update challenge details
*
Expand Down Expand Up @@ -267,6 +280,26 @@ export function partiallyUpdateChallengeDetails (challengeId, partialChallengeDe
}
}

export function deleteChallenge (challengeId) {
return async (dispatch) => {
dispatch({
type: DELETE_CHALLENGE_PENDING
})

return deleteChallengeAPI(challengeId).then((challenge) => {
return dispatch({
type: DELETE_CHALLENGE_SUCCESS,
challengeDetails: challenge
})
}).catch((error) => {
dispatch({
type: DELETE_CHALLENGE_FAILURE
})
throw error
})
}
}

export function loadTimelineTemplates () {
return async (dispatch) => {
const timelineTemplates = await fetchTimelineTemplates()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,10 @@
.readOnlyValue {
margin-bottom: 0.5rem; // the same like `label` to be aligned
}

.assignSelfField {
margin-left: 20px;
padding-top: 6px;
}
}

Loading