From d7505e9833faa134768b72071cd35c326e444683 Mon Sep 17 00:00:00 2001 From: Tom <20648924+moT01@users.noreply.github.com> Date: Tue, 30 Sep 2025 01:47:38 -0500 Subject: [PATCH] chore(client): remove daily challenge env variables (#62105) --- .github/workflows/deploy-client.yml | 1 - .../show-daily-coding-challenge.tsx | 7 +------ client/src/components/Map/index.tsx | 18 +++++++----------- .../learn/daily-coding-challenge/archive.tsx | 6 ------ client/tools/create-env.ts | 3 +-- client/tools/read-env.ts | 2 -- sample.env | 1 - 7 files changed, 9 insertions(+), 29 deletions(-) diff --git a/.github/workflows/deploy-client.yml b/.github/workflows/deploy-client.yml index da09e8571b6..ee6a662e2ba 100644 --- a/.github/workflows/deploy-client.yml +++ b/.github/workflows/deploy-client.yml @@ -196,7 +196,6 @@ jobs: PAYPAL_CLIENT_ID: ${{ secrets.PAYPAL_CLIENT_ID }} STRIPE_PUBLIC_KEY: ${{ secrets.STRIPE_PUBLIC_KEY }} SHOW_UPCOMING_CHANGES: ${{ vars.SHOW_UPCOMING_CHANGES || 'false' }} - SHOW_DAILY_CODING_CHALLENGES: ${{ vars.SHOW_DAILY_CODING_CHALLENGES || 'false' }} FREECODECAMP_NODE_ENV: production # The below is used in ecosystem.config.js file for the API -- to be removed later DEPLOYMENT_ENV: ${{ needs.setup-jobs.outputs.tgt_env_long }} diff --git a/client/src/client-only-routes/show-daily-coding-challenge.tsx b/client/src/client-only-routes/show-daily-coding-challenge.tsx index d00454eda27..f9605069375 100644 --- a/client/src/client-only-routes/show-daily-coding-challenge.tsx +++ b/client/src/client-only-routes/show-daily-coding-challenge.tsx @@ -9,8 +9,7 @@ import { DailyCodingChallengePageContext } from '../redux/prop-types'; import DailyCodingChallengeNotFound from '../components/daily-coding-challenge/not-found'; -import FourOhFour from '../components/FourOhFour'; -import { apiLocation, showDailyCodingChallenges } from '../../config/env.json'; +import { apiLocation } from '../../config/env.json'; import { isValidDateString } from '../components/daily-coding-challenge/helpers'; import { validateDailyCodingChallengeSchema, @@ -208,10 +207,6 @@ function ShowDailyCodingChallenge(): JSX.Element { void fetchChallenge(date); }, [date]); - if (!showDailyCodingChallenges) { - return ; - } - if (isLoading) return ; if (!challengeFound || !challengeProps) diff --git a/client/src/components/Map/index.tsx b/client/src/components/Map/index.tsx index d8669a544df..024226a4e2a 100644 --- a/client/src/components/Map/index.tsx +++ b/client/src/components/Map/index.tsx @@ -12,10 +12,7 @@ import { import { SuperBlockIcon } from '../../assets/superblock-icon'; import LinkButton from '../../assets/icons/link-button'; import { ButtonLink } from '../helpers'; -import { - showUpcomingChanges, - showDailyCodingChallenges -} from '../../../config/env.json'; +import { showUpcomingChanges } from '../../../config/env.json'; import DailyCodingChallengeWidget from '../daily-coding-challenge/widget'; import './map.css'; @@ -88,13 +85,12 @@ function Map({ forLanding = false }: MapProps) { { /* Show the daily coding challenge before the "English" curriculum */ - showDailyCodingChallenges && - stage === SuperBlockStage.English && ( - <> - - - - ) + stage === SuperBlockStage.English && ( + <> + + + + ) }

{t(superBlockHeadings[stage])} diff --git a/client/src/pages/learn/daily-coding-challenge/archive.tsx b/client/src/pages/learn/daily-coding-challenge/archive.tsx index a1fedda6a2d..3c98fa0995c 100644 --- a/client/src/pages/learn/daily-coding-challenge/archive.tsx +++ b/client/src/pages/learn/daily-coding-challenge/archive.tsx @@ -4,16 +4,10 @@ import { Container, Col, Row, Spacer } from '@freecodecamp/ui'; import Map from '../../../components/Map'; import DailyCodingChallengeCalendar from '../../../components/daily-coding-challenge/calendar'; import DailyCodingChallengeIcon from '../../../assets/icons/daily-coding-challenge'; -import FourOhFour from '../../../components/FourOhFour'; -import { showDailyCodingChallenges } from '../../../../config/env.json'; function Archive(): JSX.Element { const { t } = useTranslation(); - if (!showDailyCodingChallenges) { - return ; - } - return ( diff --git a/client/tools/create-env.ts b/client/tools/create-env.ts index 881e7509e6a..60d7cd81a94 100644 --- a/client/tools/create-env.ts +++ b/client/tools/create-env.ts @@ -64,8 +64,7 @@ if (FREECODECAMP_NODE_ENV !== 'development') { 'curriculumLocale', 'deploymentEnv', 'environment', - 'showUpcomingChanges', - 'showDailyCodingChallenges' + 'showUpcomingChanges' ]; const searchKeys = ['algoliaAppId', 'algoliaAPIKey']; const donationKeys = ['stripePublicKey', 'paypalClientId', 'patreonClientId']; diff --git a/client/tools/read-env.ts b/client/tools/read-env.ts index f4fb369714c..85407e5271f 100644 --- a/client/tools/read-env.ts +++ b/client/tools/read-env.ts @@ -32,7 +32,6 @@ const { PATREON_CLIENT_ID: patreonClientId, DEPLOYMENT_ENV: deploymentEnv, SHOW_UPCOMING_CHANGES: showUpcomingChanges, - SHOW_DAILY_CODING_CHALLENGES: showDailyCodingChallenges, GROWTHBOOK_URI: growthbookUri } = process.env; @@ -72,7 +71,6 @@ export default Object.assign(locations, { ? null : patreonClientId, showUpcomingChanges: showUpcomingChanges === 'true', - showDailyCodingChallenges: showDailyCodingChallenges === 'true', growthbookUri: !growthbookUri || growthbookUri === 'api_URI_from_Growthbook_dashboard' ? null diff --git a/sample.env b/sample.env index 5b192f3df42..cff91831e55 100644 --- a/sample.env +++ b/sample.env @@ -54,7 +54,6 @@ CURRICULUM_LOCALE=english # Show or hide WIP in progress challenges SHOW_UPCOMING_CHANGES=false -SHOW_DAILY_CODING_CHALLENGES=true # --------------------- # New API