From 9bcc882bf4c06adfef0b06e124638d68ea9ee372 Mon Sep 17 00:00:00 2001 From: "Luiz R. Rodrigues" Date: Wed, 5 Aug 2020 20:34:11 -0300 Subject: [PATCH 1/4] Added QA to track filter --- __tests__/__snapshots__/index.js.snap | 2 ++ src/shared/components/tags/event/qa.scss | 21 +++++++++++++++++++++ src/shared/components/tags/index.jsx | 5 +++++ src/shared/components/tags/primary/qa.scss | 21 +++++++++++++++++++++ 4 files changed, 49 insertions(+) create mode 100644 src/shared/components/tags/event/qa.scss create mode 100644 src/shared/components/tags/primary/qa.scss diff --git a/__tests__/__snapshots__/index.js.snap b/__tests__/__snapshots__/index.js.snap index f57ecae..9c0926f 100644 --- a/__tests__/__snapshots__/index.js.snap +++ b/__tests__/__snapshots__/index.js.snap @@ -15,6 +15,8 @@ Object { "GhostButton": [Function], "Modal": [Function], "PrimaryButton": [Function], + "QATrackEventTag": [Function], + "QATrackTag": [Function], "SecondaryButton": [Function], "Tag": [Function], } diff --git a/src/shared/components/tags/event/qa.scss b/src/shared/components/tags/event/qa.scss new file mode 100644 index 0000000..08abf13 --- /dev/null +++ b/src/shared/components/tags/event/qa.scss @@ -0,0 +1,21 @@ +/** + * Event tag, colored with colors of qa track (purple). + */ + +@import "../default"; + +.button { + color: $tc-purple; + background-color: $tc-purple-10; + + &:active, + &:focus, + &:hover { + color: $tc-purple; + background-color: $tc-purple-10; + } + + &:visited { + color: $tc-purple; + } +} diff --git a/src/shared/components/tags/index.jsx b/src/shared/components/tags/index.jsx index 27be7df..4c5ac01 100644 --- a/src/shared/components/tags/index.jsx +++ b/src/shared/components/tags/index.jsx @@ -6,10 +6,12 @@ import defaultTag from './default.scss'; import dataScienceTrackTag from './primary/data-science.scss'; import designTrackTag from './primary/design.scss'; import developmentTrackTag from './primary/development.scss'; +import qaTrackTag from './primary/qa.scss'; import dataScienceTrackEventTag from './event/data-science.scss'; import designTrackEventTag from './event/design.scss'; import developmentTrackEventTag from './event/development.scss'; +import qaTrackEventTag from './event/qa.scss'; export const Tag = themr('Tag', defaultTag)(GenericButton); @@ -21,3 +23,6 @@ export const DesignTrackEventTag = themr('DesignTrackEventTag', designTrackEvent export const DevelopmentTrackTag = themr('DevelopmentTrackTag', developmentTrackTag)(GenericButton); export const DevelopmentTrackEventTag = themr('DevelopmentTrackEventTag', developmentTrackEventTag)(GenericButton); + +export const QATrackTag = themr('QATrackTag', qaTrackTag)(GenericButton); +export const QATrackEventTag = themr('QATrackEventTag', qaTrackEventTag)(GenericButton); diff --git a/src/shared/components/tags/primary/qa.scss b/src/shared/components/tags/primary/qa.scss new file mode 100644 index 0000000..f1aa871 --- /dev/null +++ b/src/shared/components/tags/primary/qa.scss @@ -0,0 +1,21 @@ +/** + * Primary tag, colored with colors of qa track (purple). + */ + +@import "../default"; + +.button { + background-color: $tc-purple; + color: $tc-white; + + &:active, + &:focus, + &:hover { + color: $tc-white; + background-color: $tc-purple; + } + + &:visited { + color: $tc-white; + } +} From 67a03104f8603886417d20c36e2f46522fbab91f Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Thu, 6 Aug 2020 12:29:15 +0530 Subject: [PATCH 2/4] fix: for #4706 https://github.com/topcoder-platform/community-app/issues/4706 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f681e1a..79413fa 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "lint:scss": "./node_modules/.bin/stylelint **/*.scss --syntax scss", "test": "npm run lint && npm run jest" }, - "version": "1.0.12", + "version": "1000.0.1", "dependencies": { "prop-types": "^15.6.2", "react": "^16.4.1", From eb13bd48eb9e9f1dfb960712496b8bfd6f290d99 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Thu, 6 Aug 2020 12:34:35 +0530 Subject: [PATCH 3/4] change dist tag --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a4a0730..18bf313 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: - attach_workspace: at: . - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc - - run: npm publish --tag=qa-accessibility + - run: npm publish --tag=test-release workflows: version: 2 @@ -48,4 +48,4 @@ workflows: tags: only: /v[0-9]+(\.[0-9]+)*/ requires: - - test \ No newline at end of file + - test From c728e1df15a5449c2c86f501b9dd3bd27a470b8e Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Thu, 6 Aug 2020 12:46:47 +0530 Subject: [PATCH 4/4] fix: for #4706 https://github.com/topcoder-platform/community-app/issues/4706 luiz https://github.com/topcoder-platform/community-app/pull/4711 https://github.com/topcoder-platform/topcoder-react-lib/pull/216 1000.19.41 https://github.com/topcoder-platform/topcoder-react-ui-kit/pull/27 1000.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 79413fa..ca05820 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "lint:scss": "./node_modules/.bin/stylelint **/*.scss --syntax scss", "test": "npm run lint && npm run jest" }, - "version": "1000.0.1", + "version": "1000.0.2", "dependencies": { "prop-types": "^15.6.2", "react": "^16.4.1",