diff --git a/client/src/components/Intro/learn-alert.tsx b/client/src/components/Intro/learn-alert.tsx index 3d0a9b1bb44..7487b376e04 100644 --- a/client/src/components/Intro/learn-alert.tsx +++ b/client/src/components/Intro/learn-alert.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Alert, Spacer } from '@freecodecamp/ui'; +import { Callout, Spacer } from '@freecodecamp/ui'; import { useFeature } from '@growthbook/growthbook-react'; import { useTranslation } from 'react-i18next'; import { Link } from '../helpers'; @@ -19,7 +19,7 @@ const LearnAlert = ({ const progressAlertFlag2024 = useFeature('progress-alert-2024'); const createUniversityFlag = useFeature('university-alert'); const progressAlertDefault = (text: string, value?: number) => ( - + {value && ( <>
@@ -47,11 +47,11 @@ const LearnAlert = ({ {t('buttons.donate')}
-
+ ); const seasonalAlertFlagAlert = ( - +

{t('learn.season-greetings-fcc')}

@@ -68,7 +68,7 @@ const LearnAlert = ({ {t('buttons.donate')}

-
+ ); const progressAlert2024 = progressAlertDefault( @@ -77,7 +77,7 @@ const LearnAlert = ({ ); const universityAlert = ( - +

{t('learn.building-a-university')}

@@ -94,7 +94,7 @@ const LearnAlert = ({ {t('buttons.donate')}

-
+ ); if (!isDonating) { diff --git a/client/src/components/growth-book/codeally-down.tsx b/client/src/components/growth-book/codeally-down.tsx index 6fc37d1622a..a7403a3e81f 100644 --- a/client/src/components/growth-book/codeally-down.tsx +++ b/client/src/components/growth-book/codeally-down.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { Trans, useTranslation } from 'react-i18next'; -import { Alert, Spacer } from '@freecodecamp/ui'; +import { Callout, Spacer } from '@freecodecamp/ui'; import { useFeature } from '@growthbook/growthbook-react'; const Down = () => { const { t } = useTranslation(); return ( - +

{

{t('intro:misc-text.progress-wont-save')}

-
+ ); }; const Disabled = () => { const { t } = useTranslation(); return ( - +

{

{t('intro:misc-text.progress-wont-save')}

- + ); }; diff --git a/client/src/components/growth-book/ona-note.tsx b/client/src/components/growth-book/ona-note.tsx index 9404136a298..7d3f700f5fa 100644 --- a/client/src/components/growth-book/ona-note.tsx +++ b/client/src/components/growth-book/ona-note.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; -import { Alert } from '@freecodecamp/ui'; +import { Callout } from '@freecodecamp/ui'; import { useFeatureValue } from '@growthbook/growthbook-react'; import { SuperBlocks } from '../../../../shared-dist/config/curriculum'; import { Link } from '../helpers'; @@ -16,7 +16,7 @@ export function OnaNote({ superBlock }: OnaNoteProps): JSX.Element | null { const { t } = useTranslation(); return onaNoteFeature.superblocks.includes(superBlock) ? ( - +

-
+ ) : null; } diff --git a/client/src/components/profile/profile.tsx b/client/src/components/profile/profile.tsx index 6d492f4229e..18776b72492 100644 --- a/client/src/components/profile/profile.tsx +++ b/client/src/components/profile/profile.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import Helmet from 'react-helmet'; import type { TFunction } from 'i18next'; import { useTranslation } from 'react-i18next'; -import { Alert, Container, Modal, Row, Spacer } from '@freecodecamp/ui'; +import { Callout, Container, Modal, Row, Spacer } from '@freecodecamp/ui'; import { FullWidthRow, Link } from '../helpers'; import Portfolio from './components/portfolio'; @@ -38,7 +38,7 @@ interface MessageProps { const UserMessage = ({ t }: Pick) => { return ( - {t('profile.you-change-privacy')} + {t('profile.you-change-privacy')} ); @@ -69,9 +69,9 @@ const VisitorMessage = ({ }: Omit) => { return ( - + {t('profile.username-change-privacy', { username })} - + ); diff --git a/client/src/components/settings/email.tsx b/client/src/components/settings/email.tsx index 485d75cae47..6073aae028c 100644 --- a/client/src/components/settings/email.tsx +++ b/client/src/components/settings/email.tsx @@ -1,6 +1,6 @@ import { HelpBlock, - Alert, + Callout, FormGroup, FormGroupProps, FormControl, @@ -168,7 +168,7 @@ function EmailSettings({ {isEmailVerified ? null : ( - - + )} diff --git a/client/src/templates/Challenges/codeally/rdb-local-logout-alert.tsx b/client/src/templates/Challenges/codeally/rdb-local-logout-alert.tsx index 60edc7f4992..d3502ba183b 100644 --- a/client/src/templates/Challenges/codeally/rdb-local-logout-alert.tsx +++ b/client/src/templates/Challenges/codeally/rdb-local-logout-alert.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; -import { Alert } from '@freecodecamp/ui'; +import { Callout } from '@freecodecamp/ui'; interface RdbLocalLogoutAlertProps { course: string; @@ -12,9 +12,9 @@ function RdbLocalLogoutAlert({ const { t } = useTranslation(); return ( - + {t('learn.local.logout-warning', { course })} - + ); } diff --git a/client/src/templates/Challenges/codeally/rdb-ona-continue-alert.tsx b/client/src/templates/Challenges/codeally/rdb-ona-continue-alert.tsx index eba66f0f7d0..1c2f9c01e7a 100644 --- a/client/src/templates/Challenges/codeally/rdb-ona-continue-alert.tsx +++ b/client/src/templates/Challenges/codeally/rdb-ona-continue-alert.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Trans } from 'react-i18next'; -import { Alert, Spacer } from '@freecodecamp/ui'; +import { Callout, Spacer } from '@freecodecamp/ui'; interface RdbOnaContinueAlertProps { course: string; @@ -10,7 +10,7 @@ function RdbOnaContinueAlert({ course }: RdbOnaContinueAlertProps): JSX.Element { return ( - +
placeholder @@ -26,7 +26,7 @@ function RdbOnaContinueAlert({ placeholder - + ); } diff --git a/client/src/templates/Challenges/codeally/rdb-ona-logout-alert.tsx b/client/src/templates/Challenges/codeally/rdb-ona-logout-alert.tsx index 64e69830fd5..042823dd38f 100644 --- a/client/src/templates/Challenges/codeally/rdb-ona-logout-alert.tsx +++ b/client/src/templates/Challenges/codeally/rdb-ona-logout-alert.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; -import { Alert } from '@freecodecamp/ui'; +import { Callout } from '@freecodecamp/ui'; interface RdbOnaLogoutAlertProps { course: string; @@ -10,7 +10,9 @@ function RdbOnaLogoutAlert({ course }: RdbOnaLogoutAlertProps): JSX.Element { const { t } = useTranslation(); return ( - {t('learn.ona.logout-warning', { course })} + + {t('learn.ona.logout-warning', { course })} + ); } diff --git a/client/src/templates/Challenges/exam/components/missing-prerequisites.tsx b/client/src/templates/Challenges/exam/components/missing-prerequisites.tsx index d8bf6bd77e5..76256d9d44c 100644 --- a/client/src/templates/Challenges/exam/components/missing-prerequisites.tsx +++ b/client/src/templates/Challenges/exam/components/missing-prerequisites.tsx @@ -1,7 +1,7 @@ import { useStaticQuery, graphql } from 'gatsby'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { Alert, Spacer } from '@freecodecamp/ui'; +import { Callout, Spacer } from '@freecodecamp/ui'; import { AllChallengeNode, @@ -36,7 +36,7 @@ function MissingPrerequisites({ }); return ( - +

{t('learn.exam.not-qualified')}

    @@ -50,7 +50,7 @@ function MissingPrerequisites({ ) )}
-
+ ); } diff --git a/client/src/templates/Challenges/exam/show.tsx b/client/src/templates/Challenges/exam/show.tsx index b57de2e37b5..b96b3c2752d 100644 --- a/client/src/templates/Challenges/exam/show.tsx +++ b/client/src/templates/Challenges/exam/show.tsx @@ -9,7 +9,7 @@ import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import type { Dispatch } from 'redux'; import { createSelector } from 'reselect'; -import { Container, Col, Alert, Row, Button, Spacer } from '@freecodecamp/ui'; +import { Container, Col, Callout, Row, Button, Spacer } from '@freecodecamp/ui'; import { micromark } from 'micromark'; // Local Utilities @@ -502,9 +502,9 @@ function ShowExam(props: ShowExamProps) { {qualifiedForExam ? ( - +

{t('learn.exam.qualified')}

-
+ ) : !prerequisitesComplete ? ( {clientLocale != 'english' && ( - +

{t('intro:misc-text.english-only')}

-
+ )} ); } else if (isExamCert(superBlock) && clientLocale != 'english') { return ( - +

{t('intro:misc-text.exam-english-only')}

-
+ ); } else { return ; diff --git a/client/src/templates/Introduction/components/super-block-intro.tsx b/client/src/templates/Introduction/components/super-block-intro.tsx index c9e30e641ee..1e627feca2d 100644 --- a/client/src/templates/Introduction/components/super-block-intro.tsx +++ b/client/src/templates/Introduction/components/super-block-intro.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { graphql, useStaticQuery } from 'gatsby'; import { useTranslation, Trans } from 'react-i18next'; -import { Alert, Spacer, Container, Row, Col, Callout } from '@freecodecamp/ui'; +import { Callout, Spacer, Container, Row, Col } from '@freecodecamp/ui'; import { ConnectedProps, connect } from 'react-redux'; import { useFeatureIsOn } from '@growthbook/growthbook-react'; import { @@ -68,7 +68,7 @@ export const ConditionalDonationAlert = ({ if (!isDonating && betaCertifications.includes(superBlock)) return ( - +

{t('donate.beta-certification')}


@@ -82,12 +82,12 @@ export const ConditionalDonationAlert = ({ {t('buttons.donate-now')}

-
+ ); if (!isDonating && unfinishedCertifications.includes(superBlock)) return ( - +

@@ -95,7 +95,7 @@ export const ConditionalDonationAlert = ({

-
+ ); return null;