Skip to content

Feature contentful #4816

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 23 commits into from
Aug 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
aef3374
Merge pull request #4703 from topcoder-platform/develop
sushilshinde Aug 4, 2020
c462fa2
ci: no deploy
kkartunov Aug 12, 2020
c8ca197
recruitCRM API integration
kkartunov Aug 13, 2020
53cb80e
Merge pull request #4779 from topcoder-platform/develop
sushilshinde Aug 19, 2020
60a2ad0
Merge branch 'master' into feature-contentful
kkartunov Aug 19, 2020
629b777
#4722 fixed data loading issues
kkartunov Aug 20, 2020
679175b
Merge branch 'rcrm-integration' into feature-contentful
kkartunov Aug 20, 2020
8091bbb
ci: on test
kkartunov Aug 25, 2020
730628b
Intial code #4788
kkartunov Aug 25, 2020
16be1cb
Env support for gig work APIs
kkartunov Aug 25, 2020
ed8b31b
Error handling on recruitAPI calls
kkartunov Aug 25, 2020
eac7d77
url in error rsp
kkartunov Aug 25, 2020
32c155f
relative API url
kkartunov Aug 25, 2020
e0e8257
Docker file for env update
kkartunov Aug 25, 2020
f3c76dc
ci: deploy on staging
sushilshinde Aug 26, 2020
982783d
Team fixes 1 for #4788
kkartunov Aug 26, 2020
e6bddf4
Merge branch 'feature-contentful' of https://github.com/topcoder-plat…
kkartunov Aug 26, 2020
1b9f6de
Team fixes 2
kkartunov Aug 26, 2020
0f553b5
Remove h/week from listing
kkartunov Aug 26, 2020
630726a
ci: deploy on dev
sushilshinde Aug 26, 2020
7d332fb
fix: for gigs work on prod
sushilshinde Aug 27, 2020
b2eda6d
Merge remote-tracking branch 'origin/develop' into contentful-develop…
sushilshinde Aug 27, 2020
3eb6cec
Merge pull request #4818 from topcoder-platform/contentful-develop-27Aug
sushilshinde Aug 27, 2020
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: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,14 @@ workflows:
filters:
branches:
only:
- develop
- feature-contentful
# This is alternate dev env for parallel testing
- "build-test":
context : org-global
filters:
branches:
only:
- feature-contentful
- hot-fix
# This is alternate dev env for parallel testing
- "build-qa":
Expand All @@ -258,6 +259,7 @@ workflows:
filters:
branches:
only:
- feature-contentful
- develop
# Production builds are exectuted
# when PR is merged to the master
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ ARG CONTENTFUL_EDU_PREVIEW_API_KEY

ARG FILESTACK_API_KEY
ARG FILESTACK_SUBMISSION_CONTAINER
ARG RECRUITCRM_API_KEY

# Credentials for Mailchimp service
ARG MAILCHIMP_API_KEY
Expand Down Expand Up @@ -115,6 +116,7 @@ ENV CONTENTFUL_MANAGEMENT_TOKEN=$CONTENTFUL_MANAGEMENT_TOKEN
ENV CONTENTFUL_EDU_SPACE_ID=$CONTENTFUL_EDU_SPACE_ID
ENV CONTENTFUL_EDU_CDN_API_KEY=$CONTENTFUL_EDU_CDN_API_KEY
ENV CONTENTFUL_EDU_PREVIEW_API_KEY=$CONTENTFUL_EDU_PREVIEW_API_KEY
ENV RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY

################################################################################
# Testing and build of the application inside the container.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ exports[`Default render 1`] = `
"title": "Competitive Programming",
},
Object {
"href": "/community/taas",
"href": "/gigs",
"title": "Gig Work",
},
Object {
Expand Down
3 changes: 2 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ docker build -t $TAG \
--build-arg TC_M2M_GRANT_TYPE=$TC_M2M_GRANT_TYPE \
--build-arg CONTENTFUL_COMCAST_SPACE_ID=$CONTENTFUL_COMCAST_SPACE_ID \
--build-arg CONTENTFUL_COMCAST_CDN_API_KEY=$CONTENTFUL_COMCAST_CDN_API_KEY \
--build-arg CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY .
--build-arg CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY \
--build-arg RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY .

# Copies "node_modules" from the created image, if necessary for caching.
docker create --name app $TAG
Expand Down
2 changes: 2 additions & 0 deletions config/custom-environment-variables.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ module.exports = {
AUTH0_PROXY_SERVER_URL: 'TC_M2M_AUTH0_PROXY_SERVER_URL',
TOKEN_CACHE_TIME: 'TOKEN_CACHE_TIME',
},

RECRUITCRM_API_KEY: 'RECRUITCRM_API_KEY',
},
AUTH_CONFIG: {
AUTH0_URL: 'TC_M2M_AUTH0_URL',
Expand Down
5 changes: 4 additions & 1 deletion config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@ module.exports = {
AUTH0_URL: '',
TOKEN_CACHE_TIME: '',
},

RECRUITCRM_API_KEY: '',
},

AUTH_CONFIG: {
Expand Down Expand Up @@ -312,7 +314,7 @@ module.exports = {
},
{
title: 'Gig Work',
href: '/community/taas',
href: '/gigs',
},
{
title: 'Practice',
Expand Down Expand Up @@ -406,4 +408,5 @@ module.exports = {
TC_EDU_SEARCH_PATH: '/search',
TC_EDU_SEARCH_BAR_MAX_RESULTS_EACH_GROUP: 3,
POLICY_PAGES_PATH: '/policy',
GIGS_PAGES_PATH: '/gigs',
};
2 changes: 1 addition & 1 deletion config/production.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ module.exports = {
},
{
title: 'Gig Work',
href: '/community/taas',
href: '/gigs',
},
{
title: 'Practice',
Expand Down
20 changes: 14 additions & 6 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
"react-infinite-scroller": "^1.1.4",
"react-inlinesvg": "^0.8.4",
"react-markdown": "^4.3.1",
"react-paginate": "^6.3.2",
"react-player": "^0.24.1",
"react-redux": "^5.0.7",
"react-redux-toastr": "^7.2.6",
Expand Down
36 changes: 36 additions & 0 deletions src/assets/images/icon-black-calendar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions src/assets/images/icon-black-duration.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions src/assets/images/icon-black-location.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions src/assets/images/icon-black-payment.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions src/assets/images/icon-calendar-gig.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading