From b2cf20cf453a2fa2791236d9d5330b64c708c26b Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Wed, 15 Jul 2020 09:40:11 +0300 Subject: [PATCH 1/2] ci: topgear-to-contentful on dev --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b0ff4a40b..c70179ce1b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -231,7 +231,7 @@ workflows: branches: only: - develop - - feature-contentful + - topgear-to-contentful # This is alternate dev env for parallel testing - "build-test": context : org-global From be4606f45d79c4031084a8a44624432d0f93a33f Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Thu, 16 Jul 2020 11:31:19 +0300 Subject: [PATCH 2/2] Integration #4101 --- .../communities/wipro/FAQ/index.jsx | 305 ------------------ .../communities/wipro/FAQ/style.scss | 151 --------- .../wipro/Home/themes/articleCardStyles.scss | 79 ----- .../wipro/Home/themes/newsSectionStyles.scss | 18 -- .../wipro/Home/themes/newsletter_signup.scss | 86 ----- .../wipro/Home/themes/resourceCardStyles.scss | 84 ----- src/shared/containers/Leaderboard/index.jsx | 6 - .../routes/Communities/Wipro/Routes.jsx | 31 +- 8 files changed, 6 insertions(+), 754 deletions(-) delete mode 100644 src/shared/components/tc-communities/communities/wipro/FAQ/index.jsx delete mode 100644 src/shared/components/tc-communities/communities/wipro/FAQ/style.scss delete mode 100644 src/shared/components/tc-communities/communities/wipro/Home/themes/articleCardStyles.scss delete mode 100644 src/shared/components/tc-communities/communities/wipro/Home/themes/newsSectionStyles.scss delete mode 100644 src/shared/components/tc-communities/communities/wipro/Home/themes/newsletter_signup.scss delete mode 100644 src/shared/components/tc-communities/communities/wipro/Home/themes/resourceCardStyles.scss diff --git a/src/shared/components/tc-communities/communities/wipro/FAQ/index.jsx b/src/shared/components/tc-communities/communities/wipro/FAQ/index.jsx deleted file mode 100644 index 622fe7056f..0000000000 --- a/src/shared/components/tc-communities/communities/wipro/FAQ/index.jsx +++ /dev/null @@ -1,305 +0,0 @@ -/** - * Static implementation of Learn page for Wipro 2 community - * - * It hardcodes data which is passed to dummy components, - * thus we disable max-len eslint rule for this file - */ -/* eslint-disable max-len */ - -import React from 'react'; -// import { Link } from 'react-router-dom'; -import Section from 'components/tc-communities/Section'; -import VideoCard from 'components/tc-communities/VideoCard'; -/* -import Accordion from 'components/tc-communities/Accordion/Accordion'; -import AccordionItem from 'components/tc-communities/Accordion/AccordionItem'; -*/ -import Banner from 'components/tc-communities/Banner'; -/* -import NewsletterSignup from 'components/tc-communities/NewsletterSignup'; -import ArticleCard from 'components/tc-communities/ArticleCard'; -import LinksCard from 'components/tc-communities/LinksCard'; -import Text from 'components/tc-communities/Text'; -*/ - -import Accordion from 'components/tc-communities/Accordion/Accordion'; -import AccordionItem from 'components/tc-communities/Accordion/AccordionItem'; -import Text from 'components/tc-communities/Text'; -import { ThemeProvider } from 'react-css-super-themr'; - -import theme from '../theme'; -import style from './style.scss'; - -export default function Learn() { - return ( - -
- -
- - - - - -
-
- - - -

- If you are new to Topcoder challenges, learn more about the overall concepts of challenges by watching this - - video - - . -

- - - - -

- Follow the instructions in this - - video - - . -

- - - - -

- Find a challenge that interests you on the - - challenge listings page - - . You can filter by challenge types, prizes, deadlines, etc. Look for challenges that are still open for registration. If you see something that interests you, click it and then you can read the details and register for the challenge. Watch the - - video - - . -

- - - - -

- Do all of your coding/design work offline, or as specified in the challenge spec. When you are ready to submit, come back to the challenge page and click the Submit button. The Submit page will give instructions to upload your submission. Watch the - - video - - . -

- - - - -

- If you are a reviewer or copilot and need information about managing projects and challenges, please visit the - - Help Center - - . -

- - - - -

- No role restrictions or band restrictions for participating in challenges. -

- - - - -

- In Home page click on Challenges; Look for challenges that are still open for registration. Click on the Challenge to see skills/technology involved and other details; Register to participate in the challenge OR go through video -

- - - - -

- Yes you can participate in more than one challenge simultaneously -

- - - - -

- Each challenge details will have details about winner prize and TopGear points associated -

- - - - -

- You can use Challenge Forum to get clarifications for your queries -

- - - - -

- On the Home page click on Learning; Navigate to communities to see skills available on platform. -

- - - - -

- In Home page click on Learning; Navigate to communities; Join a community where you want to enhance your skills; Join training/case study projects and complete the same. -

- - - - -

- Yes. The resume gets updated automatically after approval of submissions corresponding to training/case study and challenge. -

- - - - -

- No. Contribution time in participating will not be considered for over-time benefits. -

- - - - -

- TopGear points can be earned by completing training/case study projects and by participating and submitting qualified submission in a challenge. -

- - - - -

- TopGear points accumulated by the employees after redemption post periodic contest/promotion shall be valid till the last working day of the employee. Beyond this period the points shall lapse. -

- - - - -

- No, the reward points cannot be exchanged for any other benefits. -

- - - - -

- If you are eligible for periodic contest – spot awards and you are exiting prior to contest/promotion scheduled date, the points get lapsed. -

- - - - -

- TopGear contribution credits are considered under Organization Contribution category of TrendNxt. -

- - - - -

- TopGear points earned may be considered for periodic contests. -

- - - - -

- TopGear points earned may be considered for periodic contests. -

- - - - -

- Send a mail to ask.topgear@wipro.com and TopGear team will get back to you with details and process. -

- - - - -

- Send a mail to ask.topgear@wipro.com and TopGear team will get back to you with details. a. User could also register on link - ‌ - - https://topgear-app.wipro.com/topcoder_reviewer/registration - -

- - - - -

- On Home Page select ‘Initiate Project’ and provide initial information about projects OR send a mail to ask.topgear@wipro.com and TopGear team will get back to you with details OR go through video. -

- - - - -

- Submit a request at - - https://help.topcoder.com/hc/en-us/requests/new?ticket_form_id=779747 - - {' '} - and a TopGear team member will help get it setup. -

- - - - -

- Please write to ask.topgear@wipro.com -

- - - -
- -
- - ); -} diff --git a/src/shared/components/tc-communities/communities/wipro/FAQ/style.scss b/src/shared/components/tc-communities/communities/wipro/FAQ/style.scss deleted file mode 100644 index 66f8df0f29..0000000000 --- a/src/shared/components/tc-communities/communities/wipro/FAQ/style.scss +++ /dev/null @@ -1,151 +0,0 @@ -@import '~styles/mixins'; - -.continueButton { - display: block; - margin: auto; -} - -.coursesContainer { - padding-bottom: 60px; -} - -.faqContainer { - padding-top: 0; -} - -.faqTitle { - padding-top: 0; -} - -.highlighted { - background: #ffc; -} - -.ddashUnderline { - border-bottom: 1px dashed #333; -} - -.resourcesTitle { - padding-bottom: 50px; - padding-top: 0; - - @include xs-to-sm { - font-size: 36px; - padding-bottom: 30px; - } -} - -.resourcesContainer { - padding-bottom: 60px; - - @include xs-to-sm { - padding-bottom: 50px; - } -} - -.bannerContainer { - height: 252px; - - @include xs-to-sm { - height: 300px; - } -} - -.bannerContent { - bottom: 0; - top: 0; - transform: none; - width: 600px; - - @include xs-to-sm { - top: auto; - width: 100%; - } -} - -.bannerContentInner { - @include xs-to-sm { - padding-bottom: 20px; - padding-top: 48px; - } -} - -.learnBasicsContainer { - padding-bottom: 0; -} - -.joinnowWrap { - margin-top: 10px; - - @include xs-to-sm { - margin-top: 20px; - text-align: center; - } -} - -.joinnow { - color: #0092ff; - display: inline-block; - border: 1px solid #0092ff; - border-radius: 20px; - font: 700 14px/40px 'Open Sans', sans-serif; - height: 40px; - text-align: center; - text-transform: uppercase; - width: 171px; - - &:hover, - &:active, - &:focus, - &:visited { - color: #0092ff; - outline: none; - text-decoration: none; - } -} - -.message { - color: #333; - font: 16px/22px 'Akkurat regular', sans-serif; - opacity: 0.7; - - a { - &, - &:hover, - &:active, - &:focus, - &:visited { - color: #0092ff; - font-family: 'Times New Roman', Times, serif; - outline: none; - text-decoration: underline; - } - } - - em { - font-family: 'Times New Roman', Times, serif; - font-style: italic; - } - - ol { - list-style: decimal inside; - padding-left: 24px; - } - - p { - margin-bottom: 24px; - } - - strong { - font-weight: bold; - } -} - -.tutorialsTitle { - padding-top: 0; -} - -.tutorialsContent { - flex-wrap: wrap; - justify-content: center; -} diff --git a/src/shared/components/tc-communities/communities/wipro/Home/themes/articleCardStyles.scss b/src/shared/components/tc-communities/communities/wipro/Home/themes/articleCardStyles.scss deleted file mode 100644 index 34cc9d6bd6..0000000000 --- a/src/shared/components/tc-communities/communities/wipro/Home/themes/articleCardStyles.scss +++ /dev/null @@ -1,79 +0,0 @@ -@import '~styles/mixins'; - -.container { - background: rgba(#f2f2f2, 0.5); - border-radius: 0; - box-shadow: none; - border: 1px solid #00a2e0; - height: 400px; - width: 300px; - - @include md { - width: 220px; - } - - @include xs-to-sm { - height: auto; - margin: 0 15px; - padding-bottom: 30px; - width: auto; - - & + & { - margin-top: 30px; - } - } -} - -.image { - background: no-repeat center; - background-size: cover; - display: block; - height: 150px; - - @include xs-to-sm { - height: auto; - min-height: 205px; - - &::after { - content: ''; - display: block; - height: 0; - padding-bottom: 59.42%; /* fixed aspect ration 205 / 345 */ - } - } -} - -.content { - padding: 0 12px; - text-align: left; -} - -.title { - color: #00a2e0; - font-family: 'Akkurat mono', sans-serif; - font-weight: normal; - font-size: 16px; - text-decoration: underline; - margin-top: 10px; - max-height: 75px; - overflow: hidden; - text-overflow: ellipsis; - - @include md { - font-size: 16px; - } -} - -.text { - color: #333; - font-family: 'Akkurat regular', sans-serif; - font-size: 14px; - margin-top: 10px; - max-height: 84px; - overflow: hidden; - text-overflow: ellipsis; -} - -.linkWrap { - display: none; -} diff --git a/src/shared/components/tc-communities/communities/wipro/Home/themes/newsSectionStyles.scss b/src/shared/components/tc-communities/communities/wipro/Home/themes/newsSectionStyles.scss deleted file mode 100644 index 643a4638bb..0000000000 --- a/src/shared/components/tc-communities/communities/wipro/Home/themes/newsSectionStyles.scss +++ /dev/null @@ -1,18 +0,0 @@ -@import '~styles/mixins'; - -.container { - padding: 50px 0; - padding-bottom: 50px; -} - -.title { - color: #646363; - font-family: 'Akkurat bold', sans-serif; - font-size: 21px; - padding-top: 0; - - @include xs-to-sm { - font-size: 18px; - padding-top: 0; - } -} diff --git a/src/shared/components/tc-communities/communities/wipro/Home/themes/newsletter_signup.scss b/src/shared/components/tc-communities/communities/wipro/Home/themes/newsletter_signup.scss deleted file mode 100644 index c3e68c235b..0000000000 --- a/src/shared/components/tc-communities/communities/wipro/Home/themes/newsletter_signup.scss +++ /dev/null @@ -1,86 +0,0 @@ -@import '~styles/mixins'; - -.container { - height: 180px; - - &::before { - background-color: #f8f8f8; - } -} - -.content { - padding: 20px; -} - -.title { - color: #333; - font-family: 'Akkurat bold', sans-serif; - font-size: 21px; - - @include xs-to-sm { - font-size: 18px; - } -} - -.text { - color: #646363; - font-family: 'Akkurat bold', sans-serif; - font-size: 16px; - margin-top: 20px; -} - -.form { - display: inline-block; - margin-top: 20px; - overflow: visible; -} - -input:not([type="checkbox"]).formEmail { - background-color: #fff; - border: 1px solid #00a2e0; - border-radius: 40px; - border-bottom-right-radius: 0; - border-top-right-radius: 0; - color: #646363; - font-family: 'Akkurat light', sans-serif; - font-size: 16px; - line-height: 40px; - height: 40px; - - @include xs-to-sm { - width: 50%; - } - - @include placeholder { - color: #646363; - font-family: 'Akkurat light', sans-serif; - font-size: 16px; - line-height: 40px; - text-transform: none; - } - - &:hover, - &:active, - &:focus { - border: 1px solid #00a2e0; - } -} - -.formButton { - background: #00a2e0; - font-family: 'Akkurat regular', sans-serif; - font-size: 16px; - line-height: 40px; - color: #fff; - border: 0; - border-radius: 40px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - text-transform: none; - width: auto; - padding: 0 30px 0 20px; - - @include xs-to-sm { - width: 135px; - } -} diff --git a/src/shared/components/tc-communities/communities/wipro/Home/themes/resourceCardStyles.scss b/src/shared/components/tc-communities/communities/wipro/Home/themes/resourceCardStyles.scss deleted file mode 100644 index 46ec6a1835..0000000000 --- a/src/shared/components/tc-communities/communities/wipro/Home/themes/resourceCardStyles.scss +++ /dev/null @@ -1,84 +0,0 @@ -@import '~styles/mixins'; - -.container { - text-align: left; - width: 280px; - - @include md { - width: 200px; - } - - @include xs-to-sm { - padding: 0 15px; - width: auto; - - & + & { - padding-top: 50px; - } - } -} - -.icon { - display: none; -} - -.title { - font-family: 'Akkurat mono', sans-serif; - font-size: 16px; - color: #00a2e0; - margin-top: 0; - position: relative; - text-decoration: underline; - - &::before { - content: ''; - background-color: #00a2e0; - position: absolute; - width: 2px; - height: 70px; - left: -10px; - top: 0; - } - - @include xs-to-sm { - font-size: 16px; - } -} - -.text { - color: #333; - font-family: 'Akkurat regular', sans-serif; - font-size: 14px; - margin-top: 10px; -} - -.linkWrap { - margin-top: 30px; -} - -.link { - color: #00a2e0; - display: inline-block; - border: 1px solid #00a2e0; - border-radius: 40px; - font-family: 'Akkurat regular', sans-serif; - font-size: 16px; - height: 40px; - text-align: center; - text-transform: none; - min-width: 220px; - padding: 0 24px; - - &:hover, - &:active, - &:focus, - &:visited { - color: #00a2e0; - outline: none; - text-decoration: none; - } - - @include md { - width: 200px; - } -} diff --git a/src/shared/containers/Leaderboard/index.jsx b/src/shared/containers/Leaderboard/index.jsx index 1f6e9a8245..bb97062b91 100644 --- a/src/shared/containers/Leaderboard/index.jsx +++ b/src/shared/containers/Leaderboard/index.jsx @@ -10,7 +10,6 @@ import actions from 'actions/leaderboard'; import LeaderboardTable from 'components/Leaderboard/LeaderboardTable'; import Podium from 'components/Leaderboard/Podium'; import Banner from 'components/tc-communities/Banner'; -import NewsletterSignup from 'components/tc-communities/NewsletterSignup'; import style from './styles.scss'; @@ -59,11 +58,6 @@ class LeaderboardPageContainer extends React.Component { - ); } diff --git a/src/shared/routes/Communities/Wipro/Routes.jsx b/src/shared/routes/Communities/Wipro/Routes.jsx index af38119988..a0db978ac6 100644 --- a/src/shared/routes/Communities/Wipro/Routes.jsx +++ b/src/shared/routes/Communities/Wipro/Routes.jsx @@ -6,12 +6,8 @@ import ChallengeDetails from 'routes/ChallengeDetails'; import ChallengeListing from 'routes/Communities/ChallengeListing'; import ChallengeListingBanner from 'components/tc-communities/communities/wipro/ChallengeListingBanner'; import ContentfulRoute from 'components/Contentful/Route'; -import FAQ from 'components/tc-communities/communities/wipro/FAQ'; -import Footer from 'components/tc-communities/communities/wipro/Footer'; import Header from 'containers/tc-communities/Header'; -import Home from 'containers/tc-communities/wipro/Home'; import LeaderboardBanner from 'components/tc-communities/communities/wipro/LeaderboardBanner'; -import Learn from 'components/tc-communities/communities/wipro/Learn'; import PT from 'prop-types'; import React from 'react'; import Submission from 'routes/Submission'; @@ -20,6 +16,7 @@ import TermsDetail from 'routes/TermsDetail'; import Profile from 'routes/Profile'; import ProfileStats from 'routes/ProfileStats'; import Settings from 'routes/Settings'; +import Viewport from 'components/Contentful/Viewport'; import theme from 'components/tc-communities/communities/wipro/theme'; import { ThemeProvider } from 'react-css-super-themr'; import { Route, Switch } from 'react-router-dom'; @@ -91,11 +88,6 @@ export default function Wipro({ base, meta }) { exact path={`${base}/challenges/terms/detail/:termId`} /> - ( - - - -