Skip to content

Commit d7505e9

Browse files
authored
chore(client): remove daily challenge env variables (freeCodeCamp#62105)
1 parent 6e01904 commit d7505e9

File tree

7 files changed

+9
-29
lines changed

7 files changed

+9
-29
lines changed

.github/workflows/deploy-client.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ jobs:
196196
PAYPAL_CLIENT_ID: ${{ secrets.PAYPAL_CLIENT_ID }}
197197
STRIPE_PUBLIC_KEY: ${{ secrets.STRIPE_PUBLIC_KEY }}
198198
SHOW_UPCOMING_CHANGES: ${{ vars.SHOW_UPCOMING_CHANGES || 'false' }}
199-
SHOW_DAILY_CODING_CHALLENGES: ${{ vars.SHOW_DAILY_CODING_CHALLENGES || 'false' }}
200199
FREECODECAMP_NODE_ENV: production
201200
# The below is used in ecosystem.config.js file for the API -- to be removed later
202201
DEPLOYMENT_ENV: ${{ needs.setup-jobs.outputs.tgt_env_long }}

client/src/client-only-routes/show-daily-coding-challenge.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import {
99
DailyCodingChallengePageContext
1010
} from '../redux/prop-types';
1111
import DailyCodingChallengeNotFound from '../components/daily-coding-challenge/not-found';
12-
import FourOhFour from '../components/FourOhFour';
13-
import { apiLocation, showDailyCodingChallenges } from '../../config/env.json';
12+
import { apiLocation } from '../../config/env.json';
1413
import { isValidDateString } from '../components/daily-coding-challenge/helpers';
1514
import {
1615
validateDailyCodingChallengeSchema,
@@ -208,10 +207,6 @@ function ShowDailyCodingChallenge(): JSX.Element {
208207
void fetchChallenge(date);
209208
}, [date]);
210209

211-
if (!showDailyCodingChallenges) {
212-
return <FourOhFour />;
213-
}
214-
215210
if (isLoading) return <Loader />;
216211

217212
if (!challengeFound || !challengeProps)

client/src/components/Map/index.tsx

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ import {
1212
import { SuperBlockIcon } from '../../assets/superblock-icon';
1313
import LinkButton from '../../assets/icons/link-button';
1414
import { ButtonLink } from '../helpers';
15-
import {
16-
showUpcomingChanges,
17-
showDailyCodingChallenges
18-
} from '../../../config/env.json';
15+
import { showUpcomingChanges } from '../../../config/env.json';
1916
import DailyCodingChallengeWidget from '../daily-coding-challenge/widget';
2017

2118
import './map.css';
@@ -88,13 +85,12 @@ function Map({ forLanding = false }: MapProps) {
8885
<Fragment key={stage}>
8986
{
9087
/* Show the daily coding challenge before the "English" curriculum */
91-
showDailyCodingChallenges &&
92-
stage === SuperBlockStage.English && (
93-
<>
94-
<DailyCodingChallengeWidget forLanding={forLanding} />
95-
<Spacer size='m' />
96-
</>
97-
)
88+
stage === SuperBlockStage.English && (
89+
<>
90+
<DailyCodingChallengeWidget forLanding={forLanding} />
91+
<Spacer size='m' />
92+
</>
93+
)
9894
}
9995
<h2 className={forLanding ? 'big-heading' : ''}>
10096
{t(superBlockHeadings[stage])}

client/src/pages/learn/daily-coding-challenge/archive.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@ import { Container, Col, Row, Spacer } from '@freecodecamp/ui';
44
import Map from '../../../components/Map';
55
import DailyCodingChallengeCalendar from '../../../components/daily-coding-challenge/calendar';
66
import DailyCodingChallengeIcon from '../../../assets/icons/daily-coding-challenge';
7-
import FourOhFour from '../../../components/FourOhFour';
8-
import { showDailyCodingChallenges } from '../../../../config/env.json';
97

108
function Archive(): JSX.Element {
119
const { t } = useTranslation();
1210

13-
if (!showDailyCodingChallenges) {
14-
return <FourOhFour />;
15-
}
16-
1711
return (
1812
<Container>
1913
<Row>

client/tools/create-env.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ if (FREECODECAMP_NODE_ENV !== 'development') {
6464
'curriculumLocale',
6565
'deploymentEnv',
6666
'environment',
67-
'showUpcomingChanges',
68-
'showDailyCodingChallenges'
67+
'showUpcomingChanges'
6968
];
7069
const searchKeys = ['algoliaAppId', 'algoliaAPIKey'];
7170
const donationKeys = ['stripePublicKey', 'paypalClientId', 'patreonClientId'];

client/tools/read-env.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ const {
3232
PATREON_CLIENT_ID: patreonClientId,
3333
DEPLOYMENT_ENV: deploymentEnv,
3434
SHOW_UPCOMING_CHANGES: showUpcomingChanges,
35-
SHOW_DAILY_CODING_CHALLENGES: showDailyCodingChallenges,
3635
GROWTHBOOK_URI: growthbookUri
3736
} = process.env;
3837

@@ -72,7 +71,6 @@ export default Object.assign(locations, {
7271
? null
7372
: patreonClientId,
7473
showUpcomingChanges: showUpcomingChanges === 'true',
75-
showDailyCodingChallenges: showDailyCodingChallenges === 'true',
7674
growthbookUri:
7775
!growthbookUri || growthbookUri === 'api_URI_from_Growthbook_dashboard'
7876
? null

sample.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ CURRICULUM_LOCALE=english
5454

5555
# Show or hide WIP in progress challenges
5656
SHOW_UPCOMING_CHANGES=false
57-
SHOW_DAILY_CODING_CHALLENGES=true
5857

5958
# ---------------------
6059
# New API

0 commit comments

Comments
 (0)