From 7fa4377fe2d59bb88c52994bf85932aaa3621759 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Wed, 5 Aug 2020 07:51:50 +0300 Subject: [PATCH 1/2] ci: on dev --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa18367f07..8dd9b186d5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -231,7 +231,7 @@ workflows: branches: only: - develop - - feature-contentful + - oanh-kiril-tasks # This is alternate dev env for parallel testing - "build-test": context : org-global @@ -252,8 +252,7 @@ workflows: filters: branches: only: - - develop - - feature-contentful + - integration-v5-challenge-api # This is stage env for production QA releases - "build-prod-staging": context : org-global From 1533fcdd690b1585a59566bac4aae9385d4a1176 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Wed, 5 Aug 2020 08:08:14 +0300 Subject: [PATCH 2/2] Fixes #4683 --- .../cognitive/GetStarted/index.jsx | 3 -- .../communities/cognitive/Home/index.jsx | 3 -- .../cognitive/IbmCloudPage/index.jsx | 3 -- .../cognitive/NewsSignup/index.jsx | 21 --------- .../cognitive/NewsSignup/theme.scss | 46 ------------------- .../communities/cognitive/Resources/index.jsx | 2 - 6 files changed, 78 deletions(-) delete mode 100644 src/shared/components/tc-communities/communities/cognitive/NewsSignup/index.jsx delete mode 100644 src/shared/components/tc-communities/communities/cognitive/NewsSignup/theme.scss diff --git a/src/shared/components/tc-communities/communities/cognitive/GetStarted/index.jsx b/src/shared/components/tc-communities/communities/cognitive/GetStarted/index.jsx index 06a89d98e4..02ae891b1c 100644 --- a/src/shared/components/tc-communities/communities/cognitive/GetStarted/index.jsx +++ b/src/shared/components/tc-communities/communities/cognitive/GetStarted/index.jsx @@ -20,8 +20,6 @@ import cardImg02 from import MarchMadnessBanner from '../MarchMadnessBanner'; -import NewsSignup from '../NewsSignup'; - import style from './style.scss'; export default function GetStarted({ baseUrl }) { @@ -88,7 +86,6 @@ export default function GetStarted({ baseUrl }) { /> - ); } diff --git a/src/shared/components/tc-communities/communities/cognitive/Home/index.jsx b/src/shared/components/tc-communities/communities/cognitive/Home/index.jsx index 58ff7af8ba..3ff47f6eb3 100644 --- a/src/shared/components/tc-communities/communities/cognitive/Home/index.jsx +++ b/src/shared/components/tc-communities/communities/cognitive/Home/index.jsx @@ -16,7 +16,6 @@ import { config, Link } from 'topcoder-react-utils'; import davePhotoUrl from 'assets/images/communities/cognitive/home/dave.jpg'; import IbmCloudBanner from '../IbmCloudBanner'; -import NewsletterSignup from '../NewsSignup'; import style from './style.scss'; @@ -317,8 +316,6 @@ export default function Home({ - - ); } diff --git a/src/shared/components/tc-communities/communities/cognitive/IbmCloudPage/index.jsx b/src/shared/components/tc-communities/communities/cognitive/IbmCloudPage/index.jsx index d0f62893df..5c0aa6c7ad 100644 --- a/src/shared/components/tc-communities/communities/cognitive/IbmCloudPage/index.jsx +++ b/src/shared/components/tc-communities/communities/cognitive/IbmCloudPage/index.jsx @@ -4,7 +4,6 @@ import React from 'react'; import Differences from './Differences'; import HeadBanner from './HeadBanner'; import JoinBlock from './JoinBlock'; -import NewsSignup from '../NewsSignup'; export default function IbmCloudPage() { return ( @@ -16,8 +15,6 @@ export default function IbmCloudPage() { {/* Hidden by the request from Trevor: the transition process won't start * until Feb 12. */} {/* */} - - ); } diff --git a/src/shared/components/tc-communities/communities/cognitive/NewsSignup/index.jsx b/src/shared/components/tc-communities/communities/cognitive/NewsSignup/index.jsx deleted file mode 100644 index 1f7b3f820a..0000000000 --- a/src/shared/components/tc-communities/communities/cognitive/NewsSignup/index.jsx +++ /dev/null @@ -1,21 +0,0 @@ -import NewsletterSignup from 'components/tc-communities/NewsletterSignup'; -import React from 'react'; -import { config } from 'topcoder-react-utils'; - -import newsletterImg from - 'assets/images/communities/cognitive/newsletter.jpg'; - -import theme from './theme.scss'; - -export default function NewsSignup() { - return ( - - ); -} diff --git a/src/shared/components/tc-communities/communities/cognitive/NewsSignup/theme.scss b/src/shared/components/tc-communities/communities/cognitive/NewsSignup/theme.scss deleted file mode 100644 index f2eea78697..0000000000 --- a/src/shared/components/tc-communities/communities/cognitive/NewsSignup/theme.scss +++ /dev/null @@ -1,46 +0,0 @@ -@import "../themes/mixins"; - -.container { - @include container; - - &::before { - background: none !important; - } -} - -.content { - align-items: flex-end; - display: flex; - flex-direction: column; - position: relative; - margin: auto !important; - max-width: $screen-lg !important; - width: 100%; -} - -.form { - border-radius: 0 !important; - height: 40px !important; -} - -.formButton { - min-width: 125px; -} - -.formEmail { - border-radius: 4px !important; - height: 40px !important; - margin-right: 10px !important; -} - -.text { - @include tc-body-md; - - color: white !important; -} - -.title { - @include tc-heading-lg; - - color: white !important; -} diff --git a/src/shared/components/tc-communities/communities/cognitive/Resources/index.jsx b/src/shared/components/tc-communities/communities/cognitive/Resources/index.jsx index a5615de19b..7f1b6c5dd1 100644 --- a/src/shared/components/tc-communities/communities/cognitive/Resources/index.jsx +++ b/src/shared/components/tc-communities/communities/cognitive/Resources/index.jsx @@ -24,7 +24,6 @@ import MsgsSvg from import { Button, PrimaryButton } from 'topcoder-react-ui-kit'; import FaqItem from './FaqItem'; -import NewsSignup from '../NewsSignup'; import style from './style.scss'; @@ -324,7 +323,6 @@ export default function Resources({ - ); }