diff --git a/.circleci/config.yml b/.circleci/config.yml index fe0d237748..ce0d746057 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -372,7 +372,7 @@ workflows: filters: branches: only: - - footer-update + - social-share-updates # This is stage env for production QA releases - "build-prod-staging": context : org-global diff --git a/src/assets/images/open-graph/challenges/02-Design-Preview.png b/src/assets/images/open-graph/challenges/02-Design-Preview.png index 50c5f6e6d1..18ddf6c075 100644 Binary files a/src/assets/images/open-graph/challenges/02-Design-Preview.png and b/src/assets/images/open-graph/challenges/02-Design-Preview.png differ diff --git a/src/assets/images/open-graph/challenges/03-Development.png b/src/assets/images/open-graph/challenges/03-Development.png index 7dde49ad25..11d31928dd 100644 Binary files a/src/assets/images/open-graph/challenges/03-Development.png and b/src/assets/images/open-graph/challenges/03-Development.png differ diff --git a/src/assets/images/open-graph/challenges/04-Data-Science.png b/src/assets/images/open-graph/challenges/04-Data-Science.png index 5524755e25..5f58f3e148 100644 Binary files a/src/assets/images/open-graph/challenges/04-Data-Science.png and b/src/assets/images/open-graph/challenges/04-Data-Science.png differ diff --git a/src/assets/images/open-graph/challenges/05-QA.png b/src/assets/images/open-graph/challenges/05-QA.png index acd6712a26..a476e36c80 100644 Binary files a/src/assets/images/open-graph/challenges/05-QA.png and b/src/assets/images/open-graph/challenges/05-QA.png differ diff --git a/src/assets/images/open-graph/challenges/06-Big-Prize.png b/src/assets/images/open-graph/challenges/06-Big-Prize.png index 8fedf92a11..c791267b3e 100644 Binary files a/src/assets/images/open-graph/challenges/06-Big-Prize.png and b/src/assets/images/open-graph/challenges/06-Big-Prize.png differ diff --git a/src/assets/images/open-graph/challenges/09-First2Finish.png b/src/assets/images/open-graph/challenges/09-First2Finish.png deleted file mode 100644 index 07993a41a3..0000000000 Binary files a/src/assets/images/open-graph/challenges/09-First2Finish.png and /dev/null differ diff --git a/src/assets/images/open-graph/challenges/Design-First2Finish.png b/src/assets/images/open-graph/challenges/Design-First2Finish.png new file mode 100644 index 0000000000..8878001201 Binary files /dev/null and b/src/assets/images/open-graph/challenges/Design-First2Finish.png differ diff --git a/src/assets/images/open-graph/challenges/Design-Task.png b/src/assets/images/open-graph/challenges/Design-Task.png new file mode 100644 index 0000000000..f2e2fb18e8 Binary files /dev/null and b/src/assets/images/open-graph/challenges/Design-Task.png differ diff --git a/src/assets/images/open-graph/challenges/Development-First2Finish.png b/src/assets/images/open-graph/challenges/Development-First2Finish.png new file mode 100644 index 0000000000..f3f2ceee88 Binary files /dev/null and b/src/assets/images/open-graph/challenges/Development-First2Finish.png differ diff --git a/src/assets/images/open-graph/challenges/Development-Task.png b/src/assets/images/open-graph/challenges/Development-Task.png new file mode 100644 index 0000000000..20cbac13fe Binary files /dev/null and b/src/assets/images/open-graph/challenges/Development-Task.png differ diff --git a/src/assets/images/open-graph/challenges/MM-Challenge.png b/src/assets/images/open-graph/challenges/MM-Challenge.png new file mode 100644 index 0000000000..b747546dfd Binary files /dev/null and b/src/assets/images/open-graph/challenges/MM-Challenge.png differ diff --git a/src/assets/images/open-graph/challenges/QA-First2Finish.png b/src/assets/images/open-graph/challenges/QA-First2Finish.png new file mode 100644 index 0000000000..e3d4392888 Binary files /dev/null and b/src/assets/images/open-graph/challenges/QA-First2Finish.png differ diff --git a/src/assets/images/open-graph/challenges/QA-Task.png b/src/assets/images/open-graph/challenges/QA-Task.png new file mode 100644 index 0000000000..0c94fdc201 Binary files /dev/null and b/src/assets/images/open-graph/challenges/QA-Task.png differ diff --git a/src/assets/images/social.png b/src/assets/images/social.png index f64e599238..d64b1be113 100644 Binary files a/src/assets/images/social.png and b/src/assets/images/social.png differ diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx index 79630fe3f2..8209691178 100644 --- a/src/shared/containers/challenge-detail/index.jsx +++ b/src/shared/containers/challenge-detail/index.jsx @@ -53,8 +53,18 @@ import { getService } from 'services/contentful'; import ogUiDesign from '../../../assets/images/open-graph/challenges/02-Design-Preview.png'; -import ogFirst2Finish from - '../../../assets/images/open-graph/challenges/09-First2Finish.png'; +import ogFirst2FinishDEV from + '../../../assets/images/open-graph/challenges/Development-First2Finish.png'; +import ogFirst2FinishDESIGN from + '../../../assets/images/open-graph/challenges/Design-First2Finish.png'; +import ogFirst2FinishQA from + '../../../assets/images/open-graph/challenges/QA-First2Finish.png'; +import ogDEVTask from + '../../../assets/images/open-graph/challenges/Development-Task.png'; +import ogDESIGNTask from + '../../../assets/images/open-graph/challenges/Design-Task.png'; +import ogQATask from + '../../../assets/images/open-graph/challenges/QA-Task.png'; import ogDevelopment from '../../../assets/images/open-graph/challenges/03-Development.png'; import ogBigPrizesChallenge from @@ -63,6 +73,8 @@ import ogQAChallenge from '../../../assets/images/open-graph/challenges/05-QA.png'; import ogDSChallenge from '../../../assets/images/open-graph/challenges/04-Data-Science.png'; +import ogMMChallenge from + '../../../assets/images/open-graph/challenges/MM-Challenge.png'; /* A fallback image, just in case we missed some corner case. */ import ogImage from @@ -91,7 +103,19 @@ function getOgImage(challenge) { } switch (subTrack) { - case SUBTRACKS.FIRST_2_FINISH: return ogFirst2Finish; + case SUBTRACKS.FIRST_2_FINISH: + switch (challenge.track) { + case COMPETITION_TRACKS_V3.DEVELOP: return challenge.type === 'Task' ? ogDEVTask : ogFirst2FinishDEV; + case COMPETITION_TRACKS_V3.QA: return challenge.type === 'Task' ? ogQATask : ogFirst2FinishQA; + default: return ogFirst2FinishDEV; + } + + case SUBTRACKS.DESIGN_FIRST_2_FINISH: + switch (challenge.track) { + case COMPETITION_TRACKS_V3.DESIGN: return challenge.type === 'Task' ? ogDESIGNTask : ogFirst2FinishDESIGN; + default: return ogUiDesign; + } + case SUBTRACKS.UI_PROTOTYPE_COMPETITION: { const submission = (challenge.phases || []) .find(p => p.name === CHALLENGE_PHASE_TYPES.SUBMISSION); @@ -105,13 +129,19 @@ function getOgImage(challenge) { case SUBTRACKS.QA: case SUBTRACKS.TEST_SUITES: return ogQAChallenge; - case SUBTRACKS.DS: return ogDSChallenge; + case SUBTRACKS.MM: + if (challenge.tags && challenge.tags.indexOf(COMPETITION_TRACKS_V3.DS) !== -1) { + return ogDSChallenge; + } + return ogMMChallenge; default: } + switch (challenge.track) { case COMPETITION_TRACKS_V3.DEVELOP: return ogDevelopment; - case COMPETITION_TRACKS_V3.DESIGN: return ogUiDesign; + case COMPETITION_TRACKS_V3.DESIGN: return challenge.type === 'Task' ? ogDESIGNTask : ogUiDesign; case COMPETITION_TRACKS_V3.DS: return ogDSChallenge; + case COMPETITION_TRACKS_V3.QA: return challenge.type === 'Task' ? ogQATask : ogQAChallenge; default: return ogImage; } } diff --git a/src/shared/utils/tc.js b/src/shared/utils/tc.js index e9ab88addd..e584cc9bde 100644 --- a/src/shared/utils/tc.js +++ b/src/shared/utils/tc.js @@ -34,6 +34,7 @@ export const COMPETITION_TRACKS_V3 = { DESIGN: 'Design', DEVELOP: 'Development', DS: 'Data Science', + QA: 'Quality Assurance', }; /* Holds valid subtracks (only some of possible values are included into this @@ -44,7 +45,8 @@ export const SUBTRACKS = { WIREFRAMES: 'WIREFRAMES', QA: 'BUG_HUNT', TEST_SUITES: 'TEST_SUITES', - DS: 'DEVELOP_MARATHON_MATCH', + MM: 'DEVELOP_MARATHON_MATCH', + DESIGN_FIRST_2_FINISH: 'DESIGN_FIRST_2_FINISH', }; /**