feat(client/curriclum): make C# live (#51354)

freeCodeCamp · Aug 27, 2023 · 4ed9597 · 4ed9597
1 parent f1ccccf
commit 4ed9597
Show file tree

Hide file tree

Showing 35 changed files with 158 additions and 106 deletions.
diff --git a/api-server/src/server/boot/certificate.js b/api-server/src/server/boot/certificate.js
@@ -41,7 +41,7 @@ const {
   machineLearningPyV7Id,
   relationalDatabaseV8Id,
   collegeAlgebraPyV8Id,
-  foundationalCSharpId
+  foundationalCSharpV8Id
 } = certIds;
 
 const log = debug('fcc:certification');
@@ -134,8 +134,8 @@ function createCertTypeIds(allChallenges) {
       collegeAlgebraPyV8Id,
       allChallenges
     ),
-    [certTypes.foundationalCSharp]: getCertById(
-      foundationalCSharpId,
+    [certTypes.foundationalCSharpV8]: getCertById(
+      foundationalCSharpV8Id,
       allChallenges
     )
   };
@@ -174,7 +174,8 @@ function sendCertifiedEmail(
     isDataAnalysisPyCertV7,
     isMachineLearningPyCertV7,
     isRelationalDatabaseCertV8,
-    isCollegeAlgebraPyCertV8
+    isCollegeAlgebraPyCertV8,
+    isFoundationalCSharpCertV8
   },
   send$
 ) {
@@ -191,7 +192,8 @@ function sendCertifiedEmail(
     !isDataAnalysisPyCertV7 ||
     !isMachineLearningPyCertV7 ||
     !isRelationalDatabaseCertV8 ||
-    !isCollegeAlgebraPyCertV8
+    !isCollegeAlgebraPyCertV8 ||
+    !isFoundationalCSharpCertV8
   ) {
     return Observable.just(false);
   }

diff --git a/api-server/src/server/boot/user.js b/api-server/src/server/boot/user.js
@@ -366,6 +366,7 @@ function postResetProgress(req, res, next) {
       isMachineLearningPyCertV7: false,
       isRelationalDatabaseCertV8: false,
       isCollegeAlgebraPyCertV8: false,
+      isFoundationalCSharpCertV8: false,
       completedChallenges: [],
       completedExams: [],
       savedChallenges: [],

diff --git a/api-server/src/server/utils/certTypes.json b/api-server/src/server/utils/certTypes.json
@@ -15,5 +15,6 @@
   "machineLearningPyV7": "isMachineLearningPyCertV7",
   "fullStack": "isFullStackCert",
   "relationalDatabaseV8": "isRelationalDatabaseV8",
-  "collegeAlgebraPyV8": "isCollegeAlgebraPyCertV8"
+  "collegeAlgebraPyV8": "isCollegeAlgebraPyCertV8",
+  "foundationalCSharpV8": "isFoundationalCSharpCertV8"
 }
diff --git a/client/config/cert-and-project-map.ts b/client/config/cert-and-project-map.ts
@@ -747,7 +747,6 @@ const allStandardCerts = [
       }
     ]
   },
-  // Upcoming Certifications
   {
     id: '647e3159823e0ef219c7359b',
     title: 'Foundational C# with Microsoft',
@@ -761,6 +760,7 @@ const allStandardCerts = [
       }
     ]
   },
+  // Upcoming Certifications
   {
     id: '64514fda6c245de4d11eb7bb',
     title: 'Example Certification',

diff --git a/client/i18n/locales/english/intro.json b/client/i18n/locales/english/intro.json
@@ -1017,7 +1017,7 @@
     }
   },
   "foundational-c-sharp-with-microsoft": {
-    "title": "Foundational C# with Microsoft",
+    "title": "(New) Foundational C# with Microsoft",
     "intro": [
       "This course offers a comprehensive introduction to C# programming, covering its core concepts, syntax, and practical application in software development.",
       "Through hands-on exercises and projects, you will learn the fundamentals of C#, including variables, data types, control structures, and object-oriented programming principles.",

diff --git a/client/i18n/locales/english/translations.json b/client/i18n/locales/english/translations.json
@@ -116,6 +116,9 @@
       }
     },
     "certification-heading": "Earn free verified certifications in:",
+    "core-certs-heading": "Earn free verified certifications with freeCodeCamp's core curriculum:",
+    "professional-certs-heading": "Earn free professional certifications:",
+    "interview-prep-heading": "Prepare for the developer interview job search:",
     "faq": "Frequently asked questions:",
     "faqs": [
       {

diff --git a/client/src/client-only-routes/show-certification.tsx b/client/src/client-only-routes/show-certification.tsx
@@ -303,7 +303,7 @@ const ShowCertification = (props: ShowCertificationProps): JSX.Element => {
   );
 
   const isMicrosoftCert =
-    certTitle === certTypeTitleMap[certTypes.foundationalCSharp];
+    certTitle === certTypeTitleMap[certTypes.foundationalCSharpV8];
 
   return (
     <Container className='certificate-outer-wrapper'>

diff --git a/client/src/client-only-routes/show-settings.tsx b/client/src/client-only-routes/show-settings.tsx
@@ -213,6 +213,7 @@ export function ShowSettings(props: ShowSettingsProps): JSX.Element {
             isDataAnalysisPyCertV7={isDataAnalysisPyCertV7}
             isDataVisCert={isDataVisCert}
             isCollegeAlgebraPyCertV8={isCollegeAlgebraPyCertV8}
+            isFoundationalCSharpCertV8={isFoundationalCSharpCertV8}
             isFrontEndCert={isFrontEndCert}
             isFrontEndLibsCert={isFrontEndLibsCert}
             isFullStackCert={isFullStackCert}
@@ -225,7 +226,6 @@ export function ShowSettings(props: ShowSettingsProps): JSX.Element {
             isRelationalDatabaseCertV8={isRelationalDatabaseCertV8}
             isRespWebDesignCert={isRespWebDesignCert}
             isSciCompPyCertV7={isSciCompPyCertV7}
-            isFoundationalCSharpCertV8={isFoundationalCSharpCertV8}
             username={username}
             verifyCert={verifyCert}
           />

diff --git a/client/src/components/Map/index.tsx b/client/src/components/Map/index.tsx
@@ -1,10 +1,12 @@
 import i18next from 'i18next';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
+  SuperBlockStages,
   SuperBlocks,
-  createFlatSuperBlockMap,
-  getFirstNotAuditedSuperBlock
+  getFirstNotAuditedSuperBlock,
+  superBlockOrder
 } from '../../../../config/superblocks';
 import { generateIconComponent } from '../../assets/icons';
 import LinkButton from '../../assets/icons/link-button';
@@ -29,16 +31,18 @@ const linkSpacingStyle = {
   gap: '15px'
 };
 
-const flatSuperBlockMap = createFlatSuperBlockMap({
-  showNewCurriculum,
-  showUpcomingChanges
-});
 const firstNotAuditedSuperBlock = getFirstNotAuditedSuperBlock({
   language: curriculumLocale,
   showNewCurriculum,
   showUpcomingChanges
 });
 
+const coreCurriculum = [
+  ...superBlockOrder[SuperBlockStages.FrontEnd],
+  ...superBlockOrder[SuperBlockStages.Backend],
+  ...superBlockOrder[SuperBlockStages.Python]
+];
+
 function MapLi({
   superBlock,
   landing = false
@@ -81,10 +85,33 @@ function MapLi({
 }
 
 function Map({ forLanding = false }: MapProps): React.ReactElement {
+  const { t } = useTranslation();
+
   return (
     <div className='map-ui' data-test-label='curriculum-map'>
+      <h1 className={forLanding ? 'big-heading' : ''}>
+        {t('landing.core-certs-heading')}
+      </h1>
+      <ul>
+        {coreCurriculum.map((superBlock, i) => (
+          <MapLi key={i} superBlock={superBlock} landing={forLanding} />
+        ))}
+      </ul>
+      <Spacer size='medium' />
+      <h1 className={forLanding ? 'big-heading' : ''}>
+        {t('landing.professional-certs-heading')}
+      </h1>
+      <ul>
+        {superBlockOrder[SuperBlockStages.Professional].map((superBlock, i) => (
+          <MapLi key={i} superBlock={superBlock} landing={forLanding} />
+        ))}
+      </ul>
+      <Spacer size='medium' />
+      <h1 className={forLanding ? 'big-heading' : ''}>
+        {t('landing.interview-prep-heading')}
+      </h1>
       <ul>
-        {flatSuperBlockMap.map((superBlock, i) => (
+        {superBlockOrder[SuperBlockStages.Extra].map((superBlock, i) => (
           <MapLi key={i} superBlock={superBlock} landing={forLanding} />
         ))}
       </ul>

diff --git a/client/src/components/landing/components/certifications.tsx b/client/src/components/landing/components/certifications.tsx
@@ -1,13 +1,10 @@
 import { Col } from '@freecodecamp/react-bootstrap';
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 import Map from '../../Map/index';
 import { Spacer } from '../../helpers';
 import BigCallToAction from './big-call-to-action';
 
 const Certifications = (): JSX.Element => {
-  const { t } = useTranslation();
-
   return (
     <Col
       className='certification-section'
@@ -17,7 +14,6 @@ const Certifications = (): JSX.Element => {
       smOffset={1}
       xs={12}
     >
-      <h1 className='big-heading'>{t('landing.certification-heading')}</h1>
       <Map forLanding={true} />
       <Spacer size='medium' />
       <BigCallToAction />

diff --git a/client/src/components/profile/profile.test.tsx b/client/src/components/profile/profile.test.tsx
@@ -66,7 +66,8 @@ const userProps = {
     isDataAnalysisPyCertV7: true,
     isMachineLearningPyCertV7: true,
     isRelationalDatabaseCertV8: true,
-    isCollegeAlgebraPyCertV8: true
+    isCollegeAlgebraPyCertV8: true,
+    isFoundationalCSharpVertV8: true
   },
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   navigate: () => {}

diff --git a/client/src/components/settings/certification.test.tsx b/client/src/components/settings/certification.test.tsx
@@ -276,6 +276,7 @@ const defaultTestProps = {
   isMachineLearningPyCertV7: false,
   isRelationalDatabaseCertV8: false,
   isCollegeAlgebraPyCertV8: false,
+  isFoundationalCSharpCertV8: false,
   username: 'developmentuser',
   verifyCert: verifyCert,
   isEmailVerified: false

diff --git a/client/src/components/settings/certification.tsx b/client/src/components/settings/certification.tsx
@@ -122,11 +122,11 @@ const isCertMapSelector = createSelector(
     'Machine Learning with Python': isMachineLearningPyCertV7,
     'Relational Database': isRelationalDatabaseCertV8,
     'College Algebra with Python': isCollegeAlgebraPyCertV8,
+    'Foundational C# with Microsoft': isFoundationalCSharpCertV8,
     'Legacy Front End': isFrontEndCert,
     'Legacy Data Visualization': isDataVisCert,
     'Legacy Back End': isBackEndCert,
     'Legacy Information Security and Quality Assurance': isInfosecQaCert,
-    'Foundational C# with Microsoft': isFoundationalCSharpCertV8,
     // TODO: remove Example Certification? Also, include Upcoming Python
     // Certification.
     'Example Certification': false,

diff --git a/client/src/pages/certification.css b/client/src/pages/certification.css
@@ -125,14 +125,15 @@
 
 .certification-namespace .dual-logo svg {
   max-width: 70%;
+  height: auto;
 }
 
 .certification-namespace .fcc-logo svg {
-  max-width: 350px;
+  width: 350px;
 }
 
 .certification-namespace .ms-logo svg {
-  max-width: 300px;
+  width: 300px;
 }
 
 .certification-namespace .information {

diff --git a/client/src/redux/index.js b/client/src/redux/index.js
@@ -317,26 +317,38 @@ export const reducer = handleActions(
         submittedchallenges = submittedChallenge.challArray;
       }
       const { appUsername } = state;
-      return {
-        ...state,
-        completionCount: state.completionCount + 1,
-        user: {
-          ...state.user,
-          [appUsername]: {
-            ...state.user[appUsername],
-            completedChallenges: uniqBy(
-              [
-                ...submittedchallenges,
-                ...state.user[appUsername].completedChallenges
-              ],
-              'id'
-            ),
-            savedChallenges:
-              savedChallenges ?? savedChallengesSelector(state[MainApp]),
-            examResults
+
+      return examResults && !examResults.passed
+        ? {
+            ...state,
+            user: {
+              ...state.user,
+              [appUsername]: {
+                ...state.user[appUsername],
+                examResults
+              }
+            }
           }
-        }
-      };
+        : {
+            ...state,
+            completionCount: state.completionCount + 1,
+            user: {
+              ...state.user,
+              [appUsername]: {
+                ...state.user[appUsername],
+                completedChallenges: uniqBy(
+                  [
+                    ...submittedchallenges,
+                    ...state.user[appUsername].completedChallenges
+                  ],
+                  'id'
+                ),
+                savedChallenges:
+                  savedChallenges ?? savedChallengesSelector(state[MainApp]),
+                examResults
+              }
+            }
+          };
     },
     [actionTypes.setMsUsername]: (state, { payload }) => {
       const { appUsername } = state;

diff --git a/client/src/redux/prop-types.ts b/client/src/redux/prop-types.ts
@@ -253,6 +253,7 @@ export type ClaimedCertifications = {
   isDataVisCert: boolean;
   isEmailVerified: boolean;
   isCollegeAlgebraPyCertV8: boolean;
+  isFoundationalCSharpCertV8: boolean;
   isFrontEndCert: boolean;
   isFrontEndLibsCert: boolean;
   isFullStackCert: boolean;
@@ -265,7 +266,6 @@ export type ClaimedCertifications = {
   isSciCompPyCertV7: boolean;
   isDataAnalysisPyCertV7: boolean;
   isMachineLearningPyCertV7: boolean;
-  isFoundationalCSharpCertV8: boolean;
 };
 
 type SavedChallenges = SavedChallenge[];

diff --git a/client/src/redux/selectors.js b/client/src/redux/selectors.js
@@ -124,7 +124,8 @@ export const certificatesByNameSelector = username => state => {
     isDataAnalysisPyCertV7,
     isMachineLearningPyCertV7,
     isRelationalDatabaseCertV8,
-    isCollegeAlgebraPyCertV8
+    isCollegeAlgebraPyCertV8,
+    isFoundationalCSharpCertV8
   } = userByNameSelector(username)(state);
   return {
     hasModernCert:
@@ -140,7 +141,8 @@ export const certificatesByNameSelector = username => state => {
       isDataAnalysisPyCertV7 ||
       isMachineLearningPyCertV7 ||
       isRelationalDatabaseCertV8 ||
-      isCollegeAlgebraPyCertV8,
+      isCollegeAlgebraPyCertV8 ||
+      isFoundationalCSharpCertV8,
     hasLegacyCert:
       isFrontEndCert || isBackEndCert || isDataVisCert || isInfosecQaCert,
     isFullStackCert,
@@ -204,6 +206,11 @@ export const certificatesByNameSelector = username => state => {
         show: isCollegeAlgebraPyCertV8,
         title: 'College Algebra with Python Certification',
         certSlug: Certification.CollegeAlgebraPy
+      },
+      {
+        show: isFoundationalCSharpCertV8,
+        title: 'Foundational C# with Microsoft Certification',
+        certSlug: Certification.FoundationalCSharp
       }
     ],
     legacyCerts: [