From 118bf713ae5e03f0c95aa4241ac03a66ad6fdf75 Mon Sep 17 00:00:00 2001 From: "Nicholas Carrigan (he/him)" Date: Tue, 7 Dec 2021 11:35:32 -0800 Subject: [PATCH] fix(client): remove broken current challenge button (#44405) --- client/src/components/Intro/index.tsx | 13 +------ .../helpers/current-challenge-link.tsx | 35 ------------------- client/src/components/helpers/index.js | 1 - client/src/components/profile/profile.tsx | 6 +--- 4 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 client/src/components/helpers/current-challenge-link.tsx diff --git a/client/src/components/Intro/index.tsx b/client/src/components/Intro/index.tsx index 954f564581..87e1a9d1f9 100644 --- a/client/src/components/Intro/index.tsx +++ b/client/src/components/Intro/index.tsx @@ -4,8 +4,7 @@ import { Trans, useTranslation } from 'react-i18next'; import { emailToABVariant } from '../../utils/A-B-tester'; import { randomQuote } from '../../utils/get-words'; import Login from '../Header/components/Login'; -import { Link, Spacer, Loader, FullWidthRow } from '../helpers'; -import CurrentChallengeLink from '../helpers/current-challenge-link'; +import { Link, Spacer, Loader } from '../helpers'; import IntroDescription from './components/IntroDescription'; import './intro.css'; @@ -57,16 +56,6 @@ const Intro = ({ : `${t('learn.welcome-2')}`} - - {completedChallengeCount && completedChallengeCount > 0 ? ( - - {t('buttons.current-challenge')} - - ) : ( - '' - )} - -
diff --git a/client/src/components/helpers/current-challenge-link.tsx b/client/src/components/helpers/current-challenge-link.tsx deleted file mode 100644 index 176bfcceda..0000000000 --- a/client/src/components/helpers/current-challenge-link.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import React from 'react'; - -import envData from '../../../../config/env.json'; - -interface EnvData { - apiLocation: string; -} - -const { apiLocation } = envData as EnvData; - -const currentChallengeApi = '/challenges/current-challenge'; - -function CurrentChallengeLink({ - children, - isLargeBtn -}: { - children?: JSX.ElementChildrenAttribute; - isLargeBtn?: boolean; -}): JSX.Element { - let classNames; - if (isLargeBtn) { - classNames = 'btn btn-lg btn-primary btn-block'; - } else { - classNames = 'btn btn-primary btn-block'; - } - return ( - - {children} - - ); -} - -CurrentChallengeLink.displayName = 'CurrentChallengeLink'; - -export default CurrentChallengeLink; diff --git a/client/src/components/helpers/index.js b/client/src/components/helpers/index.js index a501903a0b..b37f6d89ed 100644 --- a/client/src/components/helpers/index.js +++ b/client/src/components/helpers/index.js @@ -5,7 +5,6 @@ export { default as Loader } from './loader'; export { default as SkeletonSprite } from './skeleton-sprite'; export { default as Spacer } from './spacer'; export { default as Link } from './link'; -export { default as CurrentChallengeLink } from './current-challenge-link'; export { default as ImageLoader } from './image-loader'; export { default as AvatarRenderer } from './avatar-renderer'; export { default as borderColorPicker } from './border-color-picker'; diff --git a/client/src/components/profile/profile.tsx b/client/src/components/profile/profile.tsx index 23ef7d7ded..e042111618 100644 --- a/client/src/components/profile/profile.tsx +++ b/client/src/components/profile/profile.tsx @@ -3,7 +3,7 @@ import React from 'react'; import Helmet from 'react-helmet'; import { TFunction, useTranslation } from 'react-i18next'; -import { CurrentChallengeLink, FullWidthRow, Link, Spacer } from '../helpers'; +import { FullWidthRow, Link, Spacer } from '../helpers'; import { User } from './../../redux/prop-types'; import Timeline from './components/TimeLine'; import Camper from './components/camper'; @@ -44,10 +44,6 @@ function renderMessage(

- - {t('buttons.take-me')} - - ); }