From f558e93bb55a2d15db5f584cfbefecb678445c4c Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <muhammed@freecodecamp.org>
Date: Tue, 7 Feb 2023 11:17:49 +0200
Subject: [PATCH 01/52] refactor(tools): fix selector type error in the
 footer.ts (#49259)

---
 .../e2e/default/learn/common-components/footer.ts  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/cypress/e2e/default/learn/common-components/footer.ts b/cypress/e2e/default/learn/common-components/footer.ts
index e191e8d9a14..137a2ff70dc 100644
--- a/cypress/e2e/default/learn/common-components/footer.ts
+++ b/cypress/e2e/default/learn/common-components/footer.ts
@@ -1,29 +1,27 @@
-const selectors = {
-  footer: '.site-footer'
-};
+const footer = '.site-footer';
 
 describe('Footer', () => {
   it('Should render on landing page', () => {
     cy.visit('/');
-    cy.get(selectors.footer).should('be.visible');
+    cy.get(footer).should('be.visible');
   });
 
   it('Should render on learn page', () => {
     cy.visit('/learn');
-    cy.get(selectors.footer).should('be.visible');
+    cy.get(footer).should('be.visible');
     cy.visit('/learn/');
-    cy.get(selectors.footer).should('be.visible');
+    cy.get(footer).should('be.visible');
   });
 
   it('Should render on superblock page', () => {
     cy.visit('/learn/responsive-web-design/');
-    cy.get(selectors.footer).should('be.visible');
+    cy.get(footer).should('be.visible');
   });
 
   it('Should not render on challenge page', () => {
     cy.visit(
       '/learn/responsive-web-design/basic-html-and-html5/say-hello-to-html-elements'
     );
-    cy.get(selectors.footer).should('not.exist');
+    cy.get(footer).should('not.exist');
   });
 });

From c3855d011e433a6884367fceb672f80e14239180 Mon Sep 17 00:00:00 2001
From: Sriparno Roy <89148144+Sriparno08@users.noreply.github.com>
Date: Tue, 7 Feb 2023 21:23:55 +0530
Subject: [PATCH 02/52] fix(curriculum): make step 43 of learn typography
 project easier to read (#49250)

---
 .../615f6b2d164f81809efd9bdc.md                                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/curriculum/challenges/english/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md b/curriculum/challenges/english/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
index 0d8c69723b0..c843342439d 100644
--- a/curriculum/challenges/english/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
+++ b/curriculum/challenges/english/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
@@ -7,7 +7,7 @@ dashedName: step-43
 
 # --description--
 
-After your last `.divider` element, create a `p` element and give it the text `Total Fat 8g 10%`. Wrap `Total Fat` in a `span` element with the `class` set to `bold`. Wrap `10%` in another `span` element with the `class` set to `bold`. Finally, nest the `Total Fat` `span` element and the text `8g` in an additional `span` element for alignment.
+After your last `.divider` element, create a `p` element and give it the text `Total Fat 8g 10%`. Wrap the text `Total Fat` in a `span` element with the `class` of `bold`. Wrap the text `10%` in another `span` element with the `class` of `bold`. Finally, nest the `Total Fat` `span` element and the text `8g` in an additional `span` element for alignment.
 
 # --hints--
 

From 0e538a926d6f0fb5ba9ca15fa135f032ca06d36b Mon Sep 17 00:00:00 2001
From: "@DiegoCascavita" <72409256+DiegoCascavita@users.noreply.github.com>
Date: Wed, 8 Feb 2023 02:08:06 -0500
Subject: [PATCH 03/52] fix(curriculum): renaming tabs for uniformity in
 responsive design (#49286)

renaming tabs for uniformity in responsive design
---
 client/src/templates/Challenges/classic/mobile-layout.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/templates/Challenges/classic/mobile-layout.tsx b/client/src/templates/Challenges/classic/mobile-layout.tsx
index efa5a2c2c8f..c79b86f9871 100644
--- a/client/src/templates/Challenges/classic/mobile-layout.tsx
+++ b/client/src/templates/Challenges/classic/mobile-layout.tsx
@@ -87,7 +87,7 @@ class MobileLayout extends Component<MobileLayoutProps, MobileLayoutState> {
           {!hasEditableBoundaries && (
             <TabPane
               eventKey={Tab.Instructions}
-              title={i18next.t('learn.editor-tabs.info')}
+              title={i18next.t('learn.editor-tabs.instructions')}
               tabIndex={0}
             >
               {instructions}
@@ -103,7 +103,7 @@ class MobileLayout extends Component<MobileLayoutProps, MobileLayoutState> {
           </TabPane>
           <TabPane
             eventKey={Tab.Console}
-            title={i18next.t('learn.editor-tabs.tests')}
+            title={i18next.t('learn.editor-tabs.console')}
             {...editorTabPaneProps}
           >
             {testOutput}

From 94f48cc587fe32e0317ddc39e92bdfcdbaa87efa Mon Sep 17 00:00:00 2001
From: camperbot <camperbot@users.noreply.github.com>
Date: Wed, 8 Feb 2023 13:23:51 +0530
Subject: [PATCH 04/52] chore(i18n,learn): processed translations (#49280)

---
 .../data-visualization-certification.yml      |  2 +-
 ...egacy-data-visualization-certification.yml |  2 +-
 ...ges-for-visually-impaired-accessibility.md |  2 +-
 .../add-an-accessible-date-picker.md          | 10 +++----
 ...choosing-colors-that-convey-information.md |  2 +-
 ...ess-issues-by-using-sufficient-contrast.md |  2 +-
 ...-meaning-by-using-descriptive-link-text.md |  2 +-
 ...of-audio-content-with-the-audio-element.md |  2 +-
 ...t-accessibility-with-the-figure-element.md |  2 +-
 ...ld-accessibility-with-the-label-element.md |  2 +-
 ...ove-readability-with-high-contrast-text.md |  2 +-
 ...t-to-the-content-using-the-main-element.md |  2 +-
 ...know-when-alt-text-should-be-left-blank.md |  2 +-
 ...-to-a-screen-reader-by-using-custom-css.md |  2 +-
 ...e-links-navigable-with-html-access-keys.md |  2 +-
 ...igation-easier-with-the-footer-landmark.md |  2 +-
 ...igation-easier-with-the-header-landmark.md |  8 +++---
 ...navigation-easier-with-the-nav-landmark.md |  2 +-
 ...times-with-the-html5-datetime-attribute.md |  2 +-
 ...w-hierarchical-relationships-of-content.md |  2 +-
 ...dex-to-add-keyboard-focus-to-an-element.md |  2 +-
 .../wrap-content-in-the-article-element.md    |  8 +++---
 ...eldset-element-for-better-accessibility.md | 22 +++++++--------
 .../create-a-set-of-checkboxes.md             |  2 +-
 ...-to-external-pages-with-anchor-elements.md | 10 +++----
 ...he-flex-shrink-property-to-shrink-items.md |  6 ++--
 .../create-decimal-numbers-with-javascript.md |  6 ++--
 .../decrement-a-number-with-javascript.md     |  2 +-
 .../increment-a-number-with-javascript.md     |  2 +-
 ...ap-method-to-extract-data-from-an-array.md |  2 +-
 .../use-the-reduce-method-to-analyze-data.md  |  2 +-
 .../visualize-data-with-a-bar-chart.md        | 10 +++----
 ...visualize-data-with-a-scatterplot-graph.md | 28 +++++++++----------
 .../add-a-hover-effect-to-a-d3-element.md     |  4 +--
 .../add-attributes-to-the-circle-elements.md  | 10 +++----
 .../add-document-elements-with-d3.md          |  4 +--
 .../change-the-presentation-of-a-bar-chart.md | 12 ++++----
 .../create-a-linear-scale-with-d3.md          | 16 +++++------
 ...ically-set-the-coordinates-for-each-bar.md | 16 +++++------
 ...h-javascript-using-the-onclick-property.md |  8 +++---
 .../budget-app.md                             |  4 +--
 .../5dfa30b9eacea3f48c6300ad.md               | 20 ++++++-------
 .../5ef9b03c81a63668521804d2.md               |  2 +-
 .../5ef9b03c81a63668521804e5.md               |  2 +-
 .../5efc4f528d6a74d05e68af74.md               |  2 +-
 .../615f7de4487b64919bb4aa5e.md               |  2 +-
 ...project-with-external-packages-from-npm.md |  2 +-
 ...e-of-any-node.js-project-or-npm-package.md |  8 +++---
 ...he-latest-minor-version-of-a-dependency.md |  4 +--
 ...he-latest-patch-version-of-a-dependency.md |  4 +--
 .../6148da157cc0bd0d06df5c0a.md               |  2 +-
 .../5dfa30b9eacea3f48c6300ad.md               | 20 ++++++-------
 .../5ef9b03c81a63668521804d2.md               |  2 +-
 .../5ef9b03c81a63668521804e5.md               |  2 +-
 .../5efc4f528d6a74d05e68af74.md               |  2 +-
 .../615f7de4487b64919bb4aa5e.md               |  2 +-
 .../check-for-mixed-grouping-of-characters.md |  2 +-
 .../using-the-test-method.md                  |  4 +--
 58 files changed, 156 insertions(+), 156 deletions(-)

diff --git a/curriculum/challenges/arabic/00-certifications/data-visualization-certification/data-visualization-certification.yml b/curriculum/challenges/arabic/00-certifications/data-visualization-certification/data-visualization-certification.yml
index 1a22cbbd33d..d77cefc4226 100644
--- a/curriculum/challenges/arabic/00-certifications/data-visualization-certification/data-visualization-certification.yml
+++ b/curriculum/challenges/arabic/00-certifications/data-visualization-certification/data-visualization-certification.yml
@@ -7,7 +7,7 @@ isPrivate: true
 tests:
   - 
     id: bd7168d8c242eddfaeb5bd13
-    title: التصوير المرئي للبيانات باستخدام مخطط بياني للأعمدة
+    title: التصوير المرئي للبيانات باستخدام مخطط الأعمدة
   - 
     id: bd7178d8c242eddfaeb5bd13
     title: التصوير المرئي للبيانات باستخدام مخطط التشتت
diff --git a/curriculum/challenges/arabic/00-certifications/legacy-data-visualization-certification/legacy-data-visualization-certification.yml b/curriculum/challenges/arabic/00-certifications/legacy-data-visualization-certification/legacy-data-visualization-certification.yml
index 04ac3369a4f..19885830ef3 100644
--- a/curriculum/challenges/arabic/00-certifications/legacy-data-visualization-certification/legacy-data-visualization-certification.yml
+++ b/curriculum/challenges/arabic/00-certifications/legacy-data-visualization-certification/legacy-data-visualization-certification.yml
@@ -22,7 +22,7 @@ tests:
     title: بناء لعبة Roguelike Dungeon Crawler
   - 
     id: bd7168d8c242eddfaeb5bd13
-    title: التصوير المرئي للبيانات باستخدام مخطط بياني للأعمدة
+    title: التصوير المرئي للبيانات باستخدام مخطط الأعمدة
   - 
     id: bd7178d8c242eddfaeb5bd13
     title: التصوير المرئي للبيانات باستخدام مخطط التشتت
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/add-a-text-alternative-to-images-for-visually-impaired-accessibility.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/add-a-text-alternative-to-images-for-visually-impaired-accessibility.md
index 27f9c91bb75..a957e919b1a 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/add-a-text-alternative-to-images-for-visually-impaired-accessibility.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/add-a-text-alternative-to-images-for-visually-impaired-accessibility.md
@@ -21,7 +21,7 @@ dashedName: add-a-text-alternative-to-images-for-visually-impaired-accessibility
 
 # --instructions--
 
-كامبر القط هو نينجا في البرمجة وهو أيضا نينجا حقيقي، يقوم ببناء صفحة ويب لمشاركة معرفتة. الصورة الشخصية التي يريد استخدامها تظهر مهاراته ويجب أن تحظي بتقدير جميع زوار الموقع. أضف خاصية (attribute) `alt` في الوسم (tag) `img` لتظهر أن كامبر القط يجيد لعبة الكاراتية. (خاصية الصورة `src` لا ترتبط بملف فعلي، لذا يجب أن ترى نص `alt` في العرض.)
+Camper Cat هو نينجا في البرمجة وهو أيضا نينجا حقيقي، يقوم ببناء صفحة ويب لمشاركة معرفتة. الصورة الشخصية التي يريد استخدامها تظهر مهاراته ويجب أن تحظي بتقدير جميع زوار الموقع. أضف خاصية (attribute) `alt` في الوسم (tag) `img` لتظهر أن Camper Cat يجيد لعبة الكاراتية. (خاصية الصورة `src` لا ترتبط بملف فعلي، لذا يجب أن ترى نص `alt` في العرض.)
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/add-an-accessible-date-picker.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/add-an-accessible-date-picker.md
index f54b40bdd31..e434da4f1de 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/add-an-accessible-date-picker.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/add-an-accessible-date-picker.md
@@ -24,29 +24,29 @@ dashedName: add-an-accessible-date-picker
 
 # --instructions--
 
-يقوم Camper Cat بإعداد بطولة Mortal Kombat ويريد أن يطلب من منافسيه معرفة التاريخ الأفضل. أضف وسم `input` مع سمة `type` من نوع `date` ، وسمة `id` بقيمة `pickdate`، و سمة `name` بقيمة `date`.
+يقوم Camper Cat بإعداد بطولة Mortal Kombat ويريد أن يطلب من منافسيه معرفة التاريخ الأفضل. أضف علامة `input` مع سمة `type` من نوع `date`، و مع سمة `id` بقيمة `pickdate`، و أيضا سمة `name` بقيمة `date`.
 
 # --hints--
 
-يجب أن يحتوي الكود علي وسم `input` واحد لحقل محدد التاريخ.
+يجب أن يحتوي الكود علي علامة `input` واحد لخانة محدد التاريخ.
 
 ```js
 assert($('input').length == 2);
 ```
 
-يجب أن يحتوي وسم `input` على سمة `type` بقيمة `date`.
+يجب أن يحتوي علامة `input` على سمة `type` بقيمة `date`.
 
 ```js
 assert($('input').attr('type') == 'date');
 ```
 
-يجب أن يحتوي وسم `input` على سمة `id` بقيمة `pickdate`.
+يجب أن يحتوي علامة `input` على سمة `id` بقيمة `pickdate`.
 
 ```js
 assert($('input').attr('id') == 'pickdate');
 ```
 
-يجب أن يحتوي وسم `input` على سمة `name` بقيمة `date`.
+يجب أن يحتوي علامة `input` على سمة `name` بقيمة `date`.
 
 ```js
 assert($('input').attr('name') == 'date');
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/avoid-colorblindness-issues-by-carefully-choosing-colors-that-convey-information.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/avoid-colorblindness-issues-by-carefully-choosing-colors-that-convey-information.md
index 2f21941dc92..ee510da38e3 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/avoid-colorblindness-issues-by-carefully-choosing-colors-that-convey-information.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/avoid-colorblindness-issues-by-carefully-choosing-colors-that-convey-information.md
@@ -19,7 +19,7 @@ dashedName: >-
 
 # --instructions--
 
-تختبر Camper Cat أنماطًا مختلفة لزر مهم ، ولكن اللون الأصفر للخلفة (`#FFFF33`) `background-color` و الاخضر (`#33FF33`) `color`لون النص هي درجات مجاورة على عجلة الألوان ولا يمكن تمييزها فعليًا عند بعض المصابين بعمى الألوان. (خفتهم المتشابهة تفشل أيضًا في فحص نسبة التباين). غيّر لون النص `color` إلى اللون الأزرق المظلم (`#003366`) لحل كلتا المشكلتين.
+يختبر Camper Cat أنماطًا مختلفة لزر مهم، ولكن اللون الأصفر (`#FFFF33`) للخلفية (`background-color`) و الاخضر (`#33FF33`) للون النص (`color`) هي درجات مجاورة على عجلة الألوان ولا يمكن لبعض المصابين بعمى الألوان التمييز ببنهم. (خفتهم المتشابهة تفشل أيضًا في فحص نسبة التباين). غيّر لون النص `color` إلى اللون الأزرق المظلم (`#003366`) لحل كلتا المشكلتين.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/avoid-colorblindness-issues-by-using-sufficient-contrast.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/avoid-colorblindness-issues-by-using-sufficient-contrast.md
index 133f49e990f..afad525b088 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/avoid-colorblindness-issues-by-using-sufficient-contrast.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/avoid-colorblindness-issues-by-using-sufficient-contrast.md
@@ -19,7 +19,7 @@ dashedName: avoid-colorblindness-issues-by-using-sufficient-contrast
 
 # --instructions--
 
-يقوم Camper Cat بتجربة استخدام الألوان لنص مدونته وخلفيتها ، ولكن دمجة الحالي لللون الأخضر للخلفية `background-color` مع لون النص الماروني `color` له نسبة تباين 2.5:1. يمكنك بسهولة ضبط إضاءة الألوان بما اته عرفها، باستخدام خاصية في الـ CSS و هي `hsl()` (التي تمثل hue بمعني التدرج و saturation بمعني التشبع و lightness بمعني الخفة) بتغيير الوسيطة (argument) الثالثة. زيادة قيمة الخفة lightness للون الخلفية `background-color` من 35% إلى 55%، وتقليل قيمة الخفة لـ `color` من 20% إلى 15%. وهذا ما يحسّن التباين إلى 5.9:1.
+يقوم Camper Cat بتجربة استخدام الألوان لنص مدونته وخلفيتها، ولكن دمجة لألون الأخضر للخلفية `background-color` مع لون النص الماروني (maroon) الحالي `color` له نسبة تباين 2.5:1. يمكنك بسهولة ضبط إضاءة الألوان بما اته عرفها، باستخدام خاصية في الـ CSS و هي `hsl()` (التي تمثل hue بمعني التدرج و saturation بمعني التشبع و lightness بمعني الخفة) بتغيير الوسيطة (argument) الثالثة. زيادة قيمة الخفة lightness للون الخلفية `background-color` من 35% إلى 55%، وتقليل قيمة الخفة لـ `color` من 20% إلى 15%. وهذا ما يحسّن التباين إلى 5.9:1.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/give-links-meaning-by-using-descriptive-link-text.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/give-links-meaning-by-using-descriptive-link-text.md
index f282a55ad02..6da59306862 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/give-links-meaning-by-using-descriptive-link-text.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/give-links-meaning-by-using-descriptive-link-text.md
@@ -15,7 +15,7 @@ Screen reader users have various options for what type of content their device r
 
 # --instructions--
 
-The link text that Camper Cat is using is not very descriptive without the surrounding context. انقل علامات الرابط (`a`) بحيث تلتف حول النص `information about batteries` بدلاً من `Click here`.
+نص الرابط الذي يستخدمه Camper Cat ليس وصفياً جداً بدون السياق المحيط. انقل علامات الرابط (`a`) بحيث تلتف حول النص `information about batteries` بدلاً من `Click here`.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-accessibility-of-audio-content-with-the-audio-element.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-accessibility-of-audio-content-with-the-audio-element.md
index 8e5ff50fc46..0a9674923a4 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-accessibility-of-audio-content-with-the-audio-element.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-accessibility-of-audio-content-with-the-audio-element.md
@@ -26,7 +26,7 @@ Here's an example:
 
 # --instructions--
 
-Time to take a break from Camper Cat and meet fellow camper Zersiax (@zersiax), a champion of accessibility and a screen reader user. To hear a clip of his screen reader in action, add an `audio` element after the `p`. Include the `controls` attribute. Then place a `source` tag inside the `audio` tags with the `src` attribute set to `https://s3.amazonaws.com/freecodecamp/screen-reader.mp3` and `type` attribute set to `"audio/mpeg"`.
+حان الوقت لأخذ استراحة من Camper Cat و مقابلة الزميل camper Zersiax (@zersiax), بطل ال accessibility و مستخدم لتقنية قارئ الشاشة (screen reader). To hear a clip of his screen reader in action, add an `audio` element after the `p`. Include the `controls` attribute. Then place a `source` tag inside the `audio` tags with the `src` attribute set to `https://s3.amazonaws.com/freecodecamp/screen-reader.mp3` and `type` attribute set to `"audio/mpeg"`.
 
 **Note:** The audio clip may sound fast and be difficult to understand, but that is a normal speed for screen reader users.
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-chart-accessibility-with-the-figure-element.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-chart-accessibility-with-the-figure-element.md
index d677e66b940..168b6351e7e 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-chart-accessibility-with-the-figure-element.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-chart-accessibility-with-the-figure-element.md
@@ -27,7 +27,7 @@ Here's an example - note that the `figcaption` goes inside the `figure` tags and
 
 # --instructions--
 
-Camper Cat is hard at work creating a stacked bar chart showing the amount of time per week to spend training in stealth, combat, and weapons. Help him structure his page better by changing the `div` tag he used to a `figure` tag, and the `p` tag that surrounds the caption to a `figcaption` tag.
+Camper Cat شاق في العمل لإنشاء مخطط أعمدة مكدسة يبين مقدار الوقت في الأسبوع لقضاء التدريب على السرقة، القتال والأسلحة. Help him structure his page better by changing the `div` tag he used to a `figure` tag, and the `p` tag that surrounds the caption to a `figcaption` tag.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-form-field-accessibility-with-the-label-element.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-form-field-accessibility-with-the-label-element.md
index 55492a9a50e..8348eb4e910 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-form-field-accessibility-with-the-label-element.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-form-field-accessibility-with-the-label-element.md
@@ -26,7 +26,7 @@ The value of the `for` attribute must be the same as the value of the `id` attri
 
 # --instructions--
 
-Camper Cat expects a lot of interest in his thoughtful blog posts and wants to include an email sign up form. Add a `for` attribute on the email `label` that matches the `id` on its `input` field.
+تنتظر Camper Cat الكثير من الاهتمام في مشاركاته المدونة المدروسة وترغب في تضمين نموذج تسجيل البريد الإلكتروني. Add a `for` attribute on the email `label` that matches the `id` on its `input` field.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-readability-with-high-contrast-text.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-readability-with-high-contrast-text.md
index 8bf9b62cf57..b3d9a57f918 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-readability-with-high-contrast-text.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/improve-readability-with-high-contrast-text.md
@@ -15,7 +15,7 @@ The Web Content Accessibility Guidelines (WCAG) recommend at least a 4.5 to 1 co
 
 # --instructions--
 
-Camper Cat's choice of light gray text on a white background for his recent blog post has a 1.5:1 contrast ratio, making it hard to read. Change the `color` of the text from the current gray (`#D3D3D3`) to a darker gray (`#636363`) to improve the contrast ratio to 6:1.
+اختيار Camper Cat للنص الرمادي الخفيف على خلفية بيضاء لمشاركته الأخيرة يحتوي على 1.5:1 نسبة التباين، مما يجعل من الصعب قراءتها. Change the `color` of the text from the current gray (`#D3D3D3`) to a darker gray (`#636363`) to improve the contrast ratio to 6:1.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/jump-straight-to-the-content-using-the-main-element.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/jump-straight-to-the-content-using-the-main-element.md
index 83031edde59..02ebc2ac766 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/jump-straight-to-the-content-using-the-main-element.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/jump-straight-to-the-content-using-the-main-element.md
@@ -19,7 +19,7 @@ The `main` tag also has an embedded landmark feature that assistive technology c
 
 # --instructions--
 
-Camper Cat has some big ideas for his ninja weapons page. Help him set up his markup by adding opening and closing `main` tags between the `header` and `footer` (covered in other challenges). Keep the `main` tags empty for now.
+Camper Cat لديه بعض الأفكار الكبيرة لصفحة أسلحة النينجا. Help him set up his markup by adding opening and closing `main` tags between the `header` and `footer` (covered in other challenges). Keep the `main` tags empty for now.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/know-when-alt-text-should-be-left-blank.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/know-when-alt-text-should-be-left-blank.md
index 695445ea37e..7b46cb25d31 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/know-when-alt-text-should-be-left-blank.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/know-when-alt-text-should-be-left-blank.md
@@ -23,7 +23,7 @@ Background images usually fall under the 'decorative' label as well. However, th
 
 # --instructions--
 
-Camper Cat has coded a skeleton page for the blog part of his website. He's planning to add a visual break between his two articles with a decorative image of a samurai sword. Add an `alt` attribute to the `img` tag and set it to an empty string. (Note that the image `src` doesn't link to an actual file - don't worry that there are no swords showing in the display.)
+قام Camper Cat ببرمجة هيكل الصفحة لمدونة موقعه. He's planning to add a visual break between his two articles with a decorative image of a samurai sword. Add an `alt` attribute to the `img` tag and set it to an empty string. (Note that the image `src` doesn't link to an actual file - don't worry that there are no swords showing in the display.)
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-elements-only-visible-to-a-screen-reader-by-using-custom-css.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-elements-only-visible-to-a-screen-reader-by-using-custom-css.md
index 63bfea4b75c..f3c52234204 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-elements-only-visible-to-a-screen-reader-by-using-custom-css.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-elements-only-visible-to-a-screen-reader-by-using-custom-css.md
@@ -35,7 +35,7 @@ Here's an example of the CSS rules that accomplish this:
 
 # --instructions--
 
-Camper Cat created a really cool stacked bar chart for his training page, and put the data into a table for his visually impaired users. The table already has an `sr-only` class, but the CSS rules aren't filled in yet. Give the `position` an `absolute` value, the `left` a `-10000px` value, and the `width` and `height` both `1px` values.
+أنشأ Camper Cat مخطط أعمدة مكدسة رائع جدا لصفحة التدريب، و وضع البيانات في جدول لمستخدميه ذوي الإعاقة البصرية. The table already has an `sr-only` class, but the CSS rules aren't filled in yet. Give the `position` an `absolute` value, the `left` a `-10000px` value, and the `width` and `height` both `1px` values.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-links-navigable-with-html-access-keys.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-links-navigable-with-html-access-keys.md
index ba72f6d7976..a738ee9f87e 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-links-navigable-with-html-access-keys.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-links-navigable-with-html-access-keys.md
@@ -21,7 +21,7 @@ Here's an example:
 
 # --instructions--
 
-Camper Cat wants the links around the two blog article titles to have keyboard shortcuts so his site's users can quickly navigate to the full story. Add an `accesskey` attribute to both links and set the first one to `g` (for Garfield) and the second one to `c` (for Chuck Norris).
+يريد Camper Cat أن يكون للرابطان حول عنوان مقالات المدونة اختصارات لوحة المفاتيح (keyboard shortcuts) حتى يتمكن مستخدمو موقعه من الانتقال بسرعة إلى القصة الكاملة. Add an `accesskey` attribute to both links and set the first one to `g` (for Garfield) and the second one to `c` (for Chuck Norris).
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-screen-reader-navigation-easier-with-the-footer-landmark.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-screen-reader-navigation-easier-with-the-footer-landmark.md
index 3330ea186d7..f536b53a165 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-screen-reader-navigation-easier-with-the-footer-landmark.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-screen-reader-navigation-easier-with-the-footer-landmark.md
@@ -13,7 +13,7 @@ Similar to `header` and `nav`, the `footer` element has a built-in landmark feat
 
 # --instructions--
 
-Camper Cat's training page is making good progress. Change the `div` he used to wrap his copyright information at the bottom of the page to a `footer` element.
+صفحة تدريب Camper Cat تحرز تقدما جيدا. Change the `div` he used to wrap his copyright information at the bottom of the page to a `footer` element.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-screen-reader-navigation-easier-with-the-header-landmark.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-screen-reader-navigation-easier-with-the-header-landmark.md
index babce017089..5c4b0840354 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-screen-reader-navigation-easier-with-the-header-landmark.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-screen-reader-navigation-easier-with-the-header-landmark.md
@@ -9,11 +9,11 @@ dashedName: make-screen-reader-navigation-easier-with-the-header-landmark
 
 # --description--
 
-عنصر الـ HTML5 التالي الذي يضيف المعنى الدلالي ويحسن إمكانية الوصول هو عنصر الـ `header`. يستخدم لإحتواء المعلومات التمهيدية أو روابط التنقل لعنصره الاساسي ويعمل بشكل جيد مع المحتوى المتكرر في الأعلى على الصفحات متعددة.
+عنصر الـ HTML5 التالي الذي يضيف المعنى الدلالي ويحسن إمكانية الوصول هو عنصر `header`. يستخدم لاحتواء المعلومات التمهيدية أو روابط التنقل لعنصره آلأساسي ويعمل بشكل جيد مع المحتوى المتكرر في الأعلى على الصفحات متعددة.
 
 `header` يشاركك الميزة البارزة المدمجة التي رأيتها مع `main`، مما يسمح للتكنولوجيات المساعدة بالانتقال بسرعة إلى ذلك المحتوى.
 
-**ملاحظة:** عنصر الـ `header` يستخدم في عنصر `body` بمستند HTML الخاص بك. وهذا يختلف عن عن عنصر الـ `head` الذي يحتوي على عنوان الصفحة، معلومات تعريفية، و الخ.
+**ملاحظة:** عنصر `header` يستخدم في عنصر `body` بمستند HTML الخاص بك. وهذا يختلف عن عن عنصر الـ `head` الذي يحتوي على عنوان الصفحة، معلومات تعريفية، و الخ.
 
 # --instructions--
 
@@ -21,13 +21,13 @@ dashedName: make-screen-reader-navigation-easier-with-the-header-landmark
 
 # --hints--
 
-يجب أن يحتوي الكود الخاص بك على `header` واحد فقط.
+يجب أن يحتوي الكود الخاص بك على علامة `header` واحدة فقط.
 
 ```js
 assert($('header').length == 1);
 ```
 
-يجب أن يحتوي عنصر `header` عنصر الـ `h1`.
+يجب أن يحتوي عنصر `header` على عنصر `h1`.
 
 ```js
 assert($('header').children('h1').length == 1);
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-screen-reader-navigation-easier-with-the-nav-landmark.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-screen-reader-navigation-easier-with-the-nav-landmark.md
index 906d7dd5c83..f7386921714 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-screen-reader-navigation-easier-with-the-nav-landmark.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/make-screen-reader-navigation-easier-with-the-nav-landmark.md
@@ -15,7 +15,7 @@ If there are repeated site links at the bottom of the page, it isn't necessary t
 
 # --instructions--
 
-Camper Cat included navigation links at the top of his training page, but wrapped them in a `div`. Change the `div` to a `nav` tag to improve the accessibility on his page.
+تضمن Camper Cat وصلات تنقل من الجزء العلوي من صفحة التدريب، لكنه لفها في `div`. Change the `div` to a `nav` tag to improve the accessibility on his page.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/standardize-times-with-the-html5-datetime-attribute.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/standardize-times-with-the-html5-datetime-attribute.md
index d9318d50f7b..3892d3ff1bc 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/standardize-times-with-the-html5-datetime-attribute.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/standardize-times-with-the-html5-datetime-attribute.md
@@ -19,7 +19,7 @@ Here's an example:
 
 # --instructions--
 
-Camper Cat's Mortal Kombat survey results are in! Wrap a `time` tag around the text `Thursday, September 15<sup>th</sup>` and add a `datetime` attribute to it set to `2016-09-15`.
+صدرت نتائج استقصاء Camper Cat في Mortal Kombat! Wrap a `time` tag around the text `Thursday, September 15<sup>th</sup>` and add a `datetime` attribute to it set to `2016-09-15`.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/use-headings-to-show-hierarchical-relationships-of-content.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/use-headings-to-show-hierarchical-relationships-of-content.md
index fbb95eaf6b1..4feaf983881 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/use-headings-to-show-hierarchical-relationships-of-content.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/use-headings-to-show-hierarchical-relationships-of-content.md
@@ -23,7 +23,7 @@ One final point, each page should always have one (and only one) `h1` element, w
 
 # --instructions--
 
-Camper Cat wants a page on his site dedicated to becoming a ninja. Help him fix the headings so his markup gives semantic meaning to the content, and shows the proper parent-child relationships of his sections. Change all the `h5` tags to the proper heading level to indicate they are subsections of the `h2` ones. Use `h3` tags for the purpose.
+يريد Camper Cat صفحة مخصصة على موقعه الإلكتروني لتعليم النينجا. Help him fix the headings so his markup gives semantic meaning to the content, and shows the proper parent-child relationships of his sections. Change all the `h5` tags to the proper heading level to indicate they are subsections of the `h2` ones. Use `h3` tags for the purpose.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/use-tabindex-to-add-keyboard-focus-to-an-element.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/use-tabindex-to-add-keyboard-focus-to-an-element.md
index 0ae730fc94b..cfd48fbd829 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/use-tabindex-to-add-keyboard-focus-to-an-element.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/use-tabindex-to-add-keyboard-focus-to-an-element.md
@@ -21,7 +21,7 @@ Certain elements, such as links and form controls, automatically receive keyboar
 
 # --instructions--
 
-Camper Cat created a new survey to collect information about his users. He knows input fields automatically get keyboard focus, but he wants to make sure his keyboard users pause at the instructions while tabbing through the items. Add a `tabindex` attribute to the `p` tag and set its value to `0`. Bonus - using `tabindex` also enables the CSS pseudo-class `:focus` to work on the `p` tag.
+أنشأ Camper Cat استبيانا جديدا لجمع المعلومات عن مستخدمي موقعه. He knows input fields automatically get keyboard focus, but he wants to make sure his keyboard users pause at the instructions while tabbing through the items. Add a `tabindex` attribute to the `p` tag and set its value to `0`. Bonus - using `tabindex` also enables the CSS pseudo-class `:focus` to work on the `p` tag.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/wrap-content-in-the-article-element.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/wrap-content-in-the-article-element.md
index f6eaf6e3697..0ec49e8d271 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/wrap-content-in-the-article-element.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/wrap-content-in-the-article-element.md
@@ -9,7 +9,7 @@ dashedName: wrap-content-in-the-article-element
 
 # --description--
 
-`article` هو عنصر آخر من عناصر HTML5 الجديدة التي تضيف المعنى الدلالي الي الـ markup. `article` هو عنصر تقسيم ويستخدم لتغليف المحتوي القائم بذاته. يعمل الوسم بشكل جيد مع إدخالات المدونة أو مشاركات المنتدى أو المقالات الإخبارية.
+`article` هو عنصر آخر من عناصر HTML5 الجديدة التي تضيف المعنى الدلالي الي الـ markup. `article` هو عنصر تقسيم ويستخدم لتغليف المحتوي القائم بذاته. يعمل العلامة بشكل جيد مع إدخالات المدونة أو مشاركات المنتدى أو المقالات الإخبارية.
 
 تحديد فيما إذا كان المحتوى يستطيع أن يكون مستقلا هو عادة حكم شخصي، ولكن هناك عدة اختبارات بسيطة يمكنك استخدامها. اسأل نفسك إذا كنت قد قمت بإزالة كل السياق المحيط، هل سيظل المحتوى منطقياً؟ وبالمثل بالنسبة للنص، هل سيظل المحتوى صحيحا إذا كان في RSS feed ؟
 
@@ -21,17 +21,17 @@ dashedName: wrap-content-in-the-article-element
 
 # --instructions--
 
-استخدم Camper Cat وسوم `article` لتغليف المشاركات على صفحة مدونته، لكنه نسي استخدامها حول المشاركة العلوية. قم بتغيير وسم `div` لاستخدام وسم `article` بدلاً منه.
+استخدم Camper Cat علامات `article` لتغليف المشاركات على صفحة مدونته، لكنه نسي استخدامها حول المشاركة العلوية. قم بتغيير علامة `div` لاستخدام علامة `article` بدلاً منه.
 
 # --hints--
 
-الكود الخاص بك يجب أن يحتوي على ثلاث وسوم `article`.
+الكود الخاص بك يجب أن يحتوي على ثلاث علامات `article`.
 
 ```js
 assert($('article').length == 3);
 ```
 
-يجب ألا يحتوي الكود الخاص بك علي اي وسوم `div`.
+يجب ألا يحتوي الكود الخاص بك على أي علامة `div`.
 
 ```js
 assert($('div').length == 0);
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/wrap-radio-buttons-in-a-fieldset-element-for-better-accessibility.md b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/wrap-radio-buttons-in-a-fieldset-element-for-better-accessibility.md
index dab2077c235..794a8db4a3d 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/wrap-radio-buttons-in-a-fieldset-element-for-better-accessibility.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/applied-accessibility/wrap-radio-buttons-in-a-fieldset-element-for-better-accessibility.md
@@ -1,6 +1,6 @@
 ---
 id: 587d778b367417b2b2512aa7
-title: Wrap Radio Buttons in a fieldset Element for Better Accessibility
+title: تغليف Radio Buttons داخل fieldset لتحسينا لإمكانيه الوصول
 challengeType: 0
 videoUrl: 'https://scrimba.com/c/cVJVefw'
 forumTopicId: 301030
@@ -9,13 +9,13 @@ dashedName: wrap-radio-buttons-in-a-fieldset-element-for-better-accessibility
 
 # --description--
 
-The next form topic covers the accessibility of radio buttons. Each choice is given a `label` with a `for` attribute tying to the `id` of the corresponding item as covered in the last challenge. Since radio buttons often come in a group where the user must choose one, there's a way to semantically show the choices are part of a set.
+يغطي الموضوع التالي إمكانية الوصول إلى أزرار الاختيار في النموذج. كل اختيار يعطى `label` وله سمة `for` مرتبطة بـسمة `id` في العنصر المقابل, كما هو مشمول في التحدي الأخير. نظرًا لأن أزرار الراديو (radio buttons) غالبا ما تأتي في مجموعات حيث يجب على المستخدم أن يختار زر واحد فقط من المجموعة، هناك طريقة لإظهار الخيارات بشكل لُغَوي أنها فعلا جزء من نفس المجموعة.
 
-The `fieldset` tag surrounds the entire grouping of radio buttons to achieve this. It often uses a `legend` tag to provide a description for the grouping, which screen readers read for each choice in the `fieldset` element.
+يحيط علامة (tag) `fieldset` بكامل مجموعة الأزرار الراديو ( radio buttons) لتحقيق ذلك. غالبا ما تستخدم علامة (tag) `legend` لتقديم وصف للمجموعة، أي قارئ الشاشة (screen readers) سيقرأ كل اختيار في عنصر `fieldset`.
 
-The `fieldset` wrapper and `legend` tag are not necessary when the choices are self-explanatory, like a gender selection. Using a `label` with the `for` attribute for each radio button is sufficient.
+العلامة `fieldset` و `legend` ليست ضرورية عندما تكون الاختيارات غنية عن التفسير، مثل اختيار نوع الجنس. استخدام `label` مع سمة `for` لكل زر راديو هو كاف.
 
-Here's an example:
+إليك مثال:
 
 ```html
 <form>
@@ -33,17 +33,17 @@ Here's an example:
 
 # --instructions--
 
-Camper Cat wants information about the ninja level of his users when they sign up for his email list. He's added a set of radio buttons and learned from our last lesson to use `label` tags with `for` attributes for each choice. Go Camper Cat! However, his code still needs some help. Change the `div` tag surrounding the radio buttons to a `fieldset` tag, and change the `p` tag inside it to a `legend`.
+يريد Camper Cat معلومات عن مستوى النينجا لمستخدميه عند تسجيلهم لقائمة بريده الإلكتروني. لقد أضاف مجموعة من أزرار الراديو وتعلمنا من درسنا الأخير استخدام علامات `label` مع سمات `for` لكل اختيار. اذهب يا Camper Cat! However, his code still needs some help. تغيير علامة `div` الذي يحيط بأزرار الراديو إلى علامة `fieldset`، و قم بتغيير علامة `p` بداخلها إلى `legend`.
 
 # --hints--
 
-Your code should have a `fieldset` tag around the radio button set.
+يجب أن يكون الكود الخاص بك فيه علامة `fieldset` حول مجموعة أزرار الراديو.
 
 ```js
 assert($('fieldset').length == 1);
 ```
 
-The `fieldset` element should have a closing tag.
+يجب أن يكون لعلامة `fieldset` علامة اغلاق أيضا.
 
 ```js
 assert(
@@ -52,19 +52,19 @@ assert(
 );
 ```
 
-Your code should have a `legend` tag around the text asking what level ninja a user is.
+يجب أن يحتوي الكود الخاصة بك على علامة `legend` حول النص الذي يسأل عن مستوى النينجا للمستخدم.
 
 ```js
 assert($('legend').length == 1);
 ```
 
-Your code should not have any `div` tags.
+يجب ألا يحتوي الكود الخاص بك على أي علامة `div`.
 
 ```js
 assert($('div').length == 0);
 ```
 
-Your code should no longer have a `p` tag around the text asking what level ninja a user is.
+يجب ألا يحتوي الكود الخاصة بك على علامة `p` حول النص الذي يسأل عن مستوى النينجا للمستخدم.
 
 ```js
 assert($('p').length == 4);
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/basic-html-and-html5/create-a-set-of-checkboxes.md b/curriculum/challenges/arabic/01-responsive-web-design/basic-html-and-html5/create-a-set-of-checkboxes.md
index 43bc88a6169..6c0f2f8caeb 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/basic-html-and-html5/create-a-set-of-checkboxes.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/basic-html-and-html5/create-a-set-of-checkboxes.md
@@ -43,7 +43,7 @@ Each of your three checkbox elements should be nested in its own `label` element
 assert($('label > input[type="checkbox"]:only-child').length > 2);
 ```
 
-Make sure each of your `label` elements has a closing tag.
+تأكد أن كل `label` له علامة إغلاق.
 
 ```js
 assert(
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/basic-html-and-html5/link-to-external-pages-with-anchor-elements.md b/curriculum/challenges/arabic/01-responsive-web-design/basic-html-and-html5/link-to-external-pages-with-anchor-elements.md
index b9d927d2707..80bdf98afd4 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/basic-html-and-html5/link-to-external-pages-with-anchor-elements.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/basic-html-and-html5/link-to-external-pages-with-anchor-elements.md
@@ -17,27 +17,27 @@ You can use `a` (*anchor*) elements to link to content outside of your web page.
 <a href="https://www.freecodecamp.org">this links to freecodecamp.org</a>
 ```
 
-Then your browser will display the text `this links to freecodecamp.org` as a link you can click. And that link will take you to the web address `https://www.freecodecamp.org`.
+ثم يعرض متصفّحك نص: `this links to freecodecamp.org` على هيئة رابط يمكنك النقر عليه. And that link will take you to the web address `https://www.freecodecamp.org`.
 
 # --instructions--
 
-قم بإنشاء عنصر `a` الذي يربط بـ `https://www.freecatphotoapp.com` والذي يحتوي على "صور قطط" كنص الرابط.
+Create an `a` element that links to `https://www.freecatphotoapp.com` and has "cat photos" as its anchor text.
 
 # --hints--
 
-يجب أن يحتوي عنصر `a` الخاص بك على نص الرابط `cat photos`.
+Your `a` element should have the anchor text of `cat photos`.
 
 ```js
 assert(/cat photos/gi.test($('a').text()));
 ```
 
-You need an `a` element that links to `https://www.freecatphotoapp.com`
+تحتاج إلى عنصر `a` يربط بـعنوان `https://www.freecatphotoapp.com`
 
 ```js
 assert(/^https?:\/\/(www\.)?freecatphotoapp\.com\/?$/i.test($('a').attr('href')));
 ```
 
-Your `a` element should have a closing tag.
+عنصر `a` الخاص بك لا بد أن يكون له علامة إغلاق (closing tag).
 
 ```js
 assert(
diff --git a/curriculum/challenges/arabic/01-responsive-web-design/css-flexbox/use-the-flex-shrink-property-to-shrink-items.md b/curriculum/challenges/arabic/01-responsive-web-design/css-flexbox/use-the-flex-shrink-property-to-shrink-items.md
index fc9b59ab23f..5541b9cc8fe 100644
--- a/curriculum/challenges/arabic/01-responsive-web-design/css-flexbox/use-the-flex-shrink-property-to-shrink-items.md
+++ b/curriculum/challenges/arabic/01-responsive-web-design/css-flexbox/use-the-flex-shrink-property-to-shrink-items.md
@@ -1,6 +1,6 @@
 ---
 id: 587d78ad367417b2b2512afb
-title: Use the flex-shrink Property to Shrink Items
+title: استعمال خاصية flex-shrink لتقليص الأصناف
 challengeType: 0
 videoUrl: 'https://scrimba.com/p/pVaDAv/cd3PBfr'
 forumTopicId: 301113
@@ -9,11 +9,11 @@ dashedName: use-the-flex-shrink-property-to-shrink-items
 
 # --description--
 
-So far, all the properties in the challenges apply to the flex container (the parent of the flex items). However, there are several useful properties for the flex items.
+وتنطبق حتى الآن جميع الخواص في التحديات على الحاوية المرنة ( flex container وهو أصل الأصناف المرنة). غير أن هناك عدة خصائص مفيدة للأصناف المرنة (flex items).
 
 The first is the `flex-shrink` property. When it's used, it allows an item to shrink if the flex container is too small. Items shrink when the width of the parent container is smaller than the combined widths of all the flex items within it.
 
-The `flex-shrink` property takes numbers as values. The higher the number, the more it will shrink compared to the other items in the container. For example, if one item has a `flex-shrink` value of `1` and the other has a `flex-shrink` value of `3`, the one with the value of `3` will shrink three times as much as the other.
+الخاصية `flex-shrink` تأخذ الأرقام كقيم. وكلما ارتفع العدد، سيتقلص العدد مقارنة بالاصناف الأخرى في الحاوية. For example, if one item has a `flex-shrink` value of `1` and the other has a `flex-shrink` value of `3`, the one with the value of `3` will shrink three times as much as the other.
 
 # --instructions--
 
diff --git a/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/basic-javascript/create-decimal-numbers-with-javascript.md b/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/basic-javascript/create-decimal-numbers-with-javascript.md
index aa074aa8881..20160798630 100644
--- a/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/basic-javascript/create-decimal-numbers-with-javascript.md
+++ b/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/basic-javascript/create-decimal-numbers-with-javascript.md
@@ -11,11 +11,11 @@ dashedName: create-decimal-numbers-with-javascript
 
 يمكننا تخزين أرقام عشرية في المتغيرات أيضا. يشار أحياناً إلى الأرقام العشرية على أنها أرقام <dfn>نُقَط عائمة (floating point)</dfn> أو <dfn>عائمات (floats)</dfn>.
 
-**ملاحظة:** عندما حساب الأرقام، يتم حسابها بدقة محدودة. وقد تؤدي العمليات التي تستخدم نُقَط عائمة إلى نتائج مختلفة عن النتائج المرجوة. إذا حصلت على واحدة من هذه النتائج، أفتح موضوع في <a href="https://forum.freecodecamp.org/" target="_blank" rel="noopener noreferrer nofollow">منتدى freeCodeCamp</a>.
+**ملاحظة:** عندما تحسب الأرقام، يتم حسابها بدقة محدودة. وقد تؤدي العمليات التي تستخدم نُقَط عائمة إلى نتائج مختلفة عن النتائج المرغوبة. إذا حصلت على واحدة من هذه النتائج، أفتح موضوع في <a href="https://forum.freecodecamp.org/" target="_blank" rel="noopener noreferrer nofollow">منتدى freeCodeCamp</a>.
 
 # --instructions--
 
-أنشئ متغير `myDecimal` وإعطائه قيمة عشرية بجزء كسري (على سبيل المثال `5.7`).
+أنشئ متغير `myDecimal` واعطه قيمة عشرية بجزء كسري (على سبيل المثال `5.7`).
 
 # --hints--
 
@@ -25,7 +25,7 @@ dashedName: create-decimal-numbers-with-javascript
 assert(typeof myDecimal === 'number');
 ```
 
-يجب أن يحتوي `myDecimal` على نقطة عشرية
+يجب أن يحتوي `myDecimal` على نقطة عشرية (decimal point)
 
 ```js
 assert(myDecimal % 1 != 0);
diff --git a/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/basic-javascript/decrement-a-number-with-javascript.md b/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/basic-javascript/decrement-a-number-with-javascript.md
index ea0af524bf3..b17352c4795 100644
--- a/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/basic-javascript/decrement-a-number-with-javascript.md
+++ b/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/basic-javascript/decrement-a-number-with-javascript.md
@@ -21,7 +21,7 @@ i--;
 i = i - 1;
 ```
 
-**ملاحظة:** السطر بِرُمَّته يصبح `i--;`، وإلغاء الحاجة إلى علامة المساواة.
+**ملاحظة:** السطر بكامله يصبح `i--;`، مما يزيل الحاجة إلى علامة المساواة.
 
 # --instructions--
 
diff --git a/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/basic-javascript/increment-a-number-with-javascript.md b/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/basic-javascript/increment-a-number-with-javascript.md
index cc741af7a36..d5cea9e9c23 100644
--- a/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/basic-javascript/increment-a-number-with-javascript.md
+++ b/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/basic-javascript/increment-a-number-with-javascript.md
@@ -21,7 +21,7 @@ i++;
 i = i + 1;
 ```
 
-**ملاحظة:** السطر بأكمله يصبح `i++;`، مما يزيل الحاجة إلى علامة المساواة (equal sign).
+**ملاحظة:** السطر بالأكمل يصبح `i++;`، مما يزيل الحاجة إلى علامة المساواة (equal sign).
 
 # --instructions--
 
diff --git a/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/functional-programming/use-the-map-method-to-extract-data-from-an-array.md b/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/functional-programming/use-the-map-method-to-extract-data-from-an-array.md
index 82e08157c9b..788d4ee7593 100644
--- a/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/functional-programming/use-the-map-method-to-extract-data-from-an-array.md
+++ b/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/functional-programming/use-the-map-method-to-extract-data-from-an-array.md
@@ -33,7 +33,7 @@ const names = users.map(user => user.name);
 console.log(names);
 ```
 
-ستعرض وحدة التحكم القيمة `[ 'John', 'Amy', 'camperCat' ]`.
+سيعرض الكونسول القيمة `[ 'John', 'Amy', 'camperCat' ]`.
 
 # --instructions--
 
diff --git a/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/functional-programming/use-the-reduce-method-to-analyze-data.md b/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/functional-programming/use-the-reduce-method-to-analyze-data.md
index 048e3aae50c..7d563d8038c 100644
--- a/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/functional-programming/use-the-reduce-method-to-analyze-data.md
+++ b/curriculum/challenges/arabic/02-javascript-algorithms-and-data-structures/functional-programming/use-the-reduce-method-to-analyze-data.md
@@ -47,7 +47,7 @@ const usersObj = users.reduce((obj, user) => {
 console.log(usersObj);
 ```
 
-ستعرض وحدة التحكم القيمة `{ John: 34, Amy: 20, camperCat: 10 }`.
+سيعرض الكونسول القيمة `{ John: 34, Amy: 20, camperCat: 10 }`.
 
 # --instructions--
 
diff --git a/curriculum/challenges/arabic/04-data-visualization/data-visualization-projects/visualize-data-with-a-bar-chart.md b/curriculum/challenges/arabic/04-data-visualization/data-visualization-projects/visualize-data-with-a-bar-chart.md
index 4e648ec9b72..2c19676c986 100644
--- a/curriculum/challenges/arabic/04-data-visualization/data-visualization-projects/visualize-data-with-a-bar-chart.md
+++ b/curriculum/challenges/arabic/04-data-visualization/data-visualization-projects/visualize-data-with-a-bar-chart.md
@@ -1,6 +1,6 @@
 ---
 id: bd7168d8c242eddfaeb5bd13
-title: Visualize Data with a Bar Chart
+title: التمثيل البياني باستخدام مخطط الأعمدة
 challengeType: 3
 forumTopicId: 301464
 dashedName: visualize-data-with-a-bar-chart
@@ -8,7 +8,7 @@ dashedName: visualize-data-with-a-bar-chart
 
 # --description--
 
-**Objective:** Build an app that is functionally similar to this: <a href="https://bar-chart.freecodecamp.rocks" target="_blank" rel="noopener noreferrer nofollow">https://bar-chart.freecodecamp.rocks</a>.
+**متطلبات:** قم ببناء تطبيق يُشبه في وظيفته <a href="https://bar-chart.freecodecamp.rocks" target="_blank" rel="noopener noreferrer nofollow">https://bar-chart.freecodecamp.rocks</a>.
 
 Fulfill the below user stories and get all of the tests to pass. Use whichever libraries or APIs you need. Give it your own personal style.
 
@@ -16,13 +16,13 @@ You can use HTML, JavaScript, CSS, and the D3 svg-based visualization library. T
 
 **User Story #1:** My chart should have a title with a corresponding `id="title"`.
 
-**User Story #2:** My chart should have a `g` element x-axis with a corresponding `id="x-axis"`.
+**قصة المستخدم الثانية 2#:**: يجب أن يحتوي المخطط علي عنصر `g` علي المحور x (الأفقي) مع `id="x-axis"`.
 
-**User Story #3:** My chart should have a `g` element y-axis with a corresponding `id="y-axis"`.
+**قصة المُستخدم الثالثة 3#:** يجب أن يحتوى المخطط علي عُنصر `g` علي المحور y (العمودي) مع `id="y-axis"`.
 
 **User Story #4:** Both axes should contain multiple tick labels, each with a corresponding `class="tick"`.
 
-**User Story #5:** My chart should have a `rect` element for each data point with a corresponding `class="bar"` displaying the data.
+**قصة المٌستخدم الخامسة 5#:** يَجب أن يحتوي المخطط على عُنصر من نوع `rect` لكل معلومة مع عرض للبيانات بواسطة سمة `class="bar"`.
 
 **User Story #6:** Each bar should have the properties `data-date` and `data-gdp` containing `date` and `GDP` values.
 
diff --git a/curriculum/challenges/arabic/04-data-visualization/data-visualization-projects/visualize-data-with-a-scatterplot-graph.md b/curriculum/challenges/arabic/04-data-visualization/data-visualization-projects/visualize-data-with-a-scatterplot-graph.md
index 7f1d00bb3d0..b6dbb4fad07 100644
--- a/curriculum/challenges/arabic/04-data-visualization/data-visualization-projects/visualize-data-with-a-scatterplot-graph.md
+++ b/curriculum/challenges/arabic/04-data-visualization/data-visualization-projects/visualize-data-with-a-scatterplot-graph.md
@@ -8,19 +8,19 @@ dashedName: visualize-data-with-a-scatterplot-graph
 
 # --description--
 
-**Objective:** Build an app that is functionally similar to this: <a href="https://scatterplot-graph.freecodecamp.rocks" target="_blank" rel="noopener noreferrer nofollow">https://scatterplot-graph.freecodecamp.rocks</a>.
+**متطلبات:** كم ببناء تطبيق يشبه في وظيفته <a href="https://scatterplot-graph.freecodecamp.rocks" target="_blank" rel="noopener noreferrer nofollow">https://scatterplot-graph.freecodecamp.rocks</a>.
 
 Fulfill the below user stories and get all of the tests to pass. Use whichever libraries or APIs you need. Give it your own personal style.
 
-يمكنك استخدام HTML و JavaScript و CSS و مكتبة التصوير المستندة D3. تطلب الاختبارات إنشاء محاور (axes) باستخدام خاصية المحور في D3، الذي يؤدي تِلْقائيًا إلى وضع علامات على طول المحور. وهذه العلامات لازمة لاجتياز اختبارات D3, لأن تُستخدم مواقعها لتحديد محاذاة العناصر المرسومة بيانيٍ. ستجد معلومات حول إنشاء محاور في <https://github.com/d3/d3/blob/master/API.md#axes-d3-axis>. يتم الاستفسار عن العناصر المطلوبة DOM (غير متغيرة) في لحظة إجراء كل اختبار. إذا كنت تستخدم framework (مثل Vue على سبيل المثال)، قد تكون نتائج الاختبار غير دقيقة للمحتوى الديناميكي. ونأمل أن نستوعبها في المستقبل، ولكن هذه frameworks غير مدعومة حاليا لمشاريع D3.
+يمكنك استخدام HTML و JavaScript و CSS و مكتبة التصوير المستندة D3. تطلب الاختبارات إنشاء المحاور (axes) باستخدام خاصية axis في D3، الذي يؤدي تِلْقائيًا إلى وضع علامات (ticks) على طول المحور. وهذه العلامات لازمة لاجتياز اختبارات D3, لأن مواقعها تُستخدم لتحديد محاذاة العناصر المرسومة بيانيٍ. ستجد معلومات حول إنشاء المحاور في <https://github.com/d3/d3/blob/master/API.md#axes-d3-axis>. يتم الاستفسار عن العناصر المطلوبة DOM (non-virtual) في لحظة إجراء كل اختبار. إذا كنت تستخدم framework (مثل Vue على سبيل المثال)، قد تكون نتائج الاختبار غير دقيقة للمحتوى الديناميكي. ونأمل أن نستوعبها في المستقبل، ولكن هذه frameworks غير مدعومة حاليا لمشاريع D3.
 
 **قصة المستخدم 1:** يمكنني أن أرى عنصر title مع موافقه `id="title"`.
 
-**قصة المستخدم 2:** يمكنني رؤية محور أفقي (x-axis) يوافق بمتغير يحتوي على `id="x-axis"`.
+**قصة المستخدم 2:** يمكنني رؤية محور أفقي (x-axis) يحتوي على سمة `id="x-axis"`.
 
-**قصة المستخدم 3:** يمكنني رؤية محور رئسي (y-axis) يوافق بمتغير يحتوي على `id="y-axis"`.
+**قصة المستخدم 3:** يمكنني رؤية محور رئسي (y-axis) يحتوي على `id="y-axis"`.
 
-**قصة المستخدم 4:** يمكنني أن أرى نقاط (dots) ولكل منها فئة (class) يسمى `dot`، التي تمثل البيانات التي يتم تخطيطها.
+**قصة المستخدم 4:** يمكنني أن أرى نقاط (dots) ولكل منها فئة (class) `dot`، التي تمثل البيانات التي يتم رسمها.
 
 **قصة المستخدم 5:** كل نقطة يجب أن تحتوي على الخصائص `data-xvalue` و `data-yvalue` التي توافق القيم `x` و `y`.
 
@@ -30,25 +30,25 @@ Fulfill the below user stories and get all of the tests to pass. Use whichever l
 
 **قصة المستخدم 8:** يجب أن توافق `data-yvalue` ونقطتها الموافقة مع النقطة/القيمة الموافقة على محور أفقي (y-axis).
 
-**قصة المستخدم 9:** يمكننك رأيه تسميات علامة (tick) متعددة على المحور الرأسي (y-axis) مع تنسيق الوقت `%M:%S`.
+**قصة المستخدم 9:** يمكننك رؤية تسميات علامة (tick) متعددة على المحور الرأسي (y-axis) مع تنسيق الوقت `%M:%S`.
 
-**قصة المستخدم 10:** يمكننك رأيه تسميات علامة (tick) متعددة على المحور الأفقي (x-axis) الذي يظهر السنة.
+**قصة المستخدم 10:** يمكننك رؤية تسميات علامة (tick) متعددة على المحور الأفقي (x-axis) الذي يظهر السنة.
 
-**قصة المستخدم 11:** يمكننك رأيه نطاق (range) تسميات (labels) المحور الأفقي (x-axis) يقع ضمن نطاق بيانات المحور الأفقي (x-axis) فعلاً.
+**قصة المستخدم 11:** يمكننك رؤية نطاق (range) تسميات (labels) المحور الأفقي (x-axis) يقع ضمن نطاق بيانات المحور الأفقي (x-axis) فعلاً.
 
-**قصة المستخدم 12:** يمكننك رأيه نطاق (range) تسميات (labels) المحور الرأسي (y-axis) تقع ضمن نطاق بيانات المحور الرأسي (y-axis) فعلاً.
+**قصة المستخدم 12:** يمكننك رؤية نطاق (range) تسميات (labels) المحور الرأسي (y-axis) تقع ضمن نطاق بيانات المحور الرأسي (y-axis) فعلاً.
 
-**قصة المستخدم 13:** يمكننك رؤية legend تحتوي على نص وصفي يحتوي على `id="legend"`.
+**قصة المستخدم 13:** يمكننك رؤية legend تحتوي على نص وصفي وله سمة `id="legend"`.
 
-**قصة المستخدم 14:** يمكننك تحريك الفأرة (mouse) فوق منطقة ورأيه أدوات نصيحة (tooltip) موافق `id="tooltip"`، التي تعرض المزيد من المعلومات حول المنطقة.
+**قصة المستخدم 14:** عند تحريك الفأر (mouse) فوق منطقة سترى أدوات نصيحة (tooltip) لها سمة `id="tooltip"`، وهي تعرض المزيد من المعلومات عن المنطقة.
 
 **قصة المستخدم 15:** يجب أن تحتوي تلميح أدواتك (tooltip) على خاصية `data-year` التي تتوافق مع `data-xvalue` في المنطقة النشطة.
 
-إليك مجموعة البيانات التي ستحتاج إلى إكمال هذا المشروع: `https://raw.githubusercontent.com/freeCodeCamp/ProjectReferenceData/master/cyclist-data.json`
+إليك مجموعة البيانات التي ستحتاج لإكمال هذا المشروع: `https://raw.githubusercontent.com/freeCodeCamp/ProjectReferenceData/master/cyclist-data.json`
 
-You can build your project by <a href='https://codepen.io/pen?template=MJjpwO' target="_blank" rel="noopener noreferrer nofollow">using this CodePen template</a> and clicking `Save` to create your own pen. Or you can use this CDN link to run the tests in any environment you like: `https://cdn.freecodecamp.org/testable-projects-fcc/v1/bundle.js`
+يمكنك بناء مشروعك عن طريق <a href='https://codepen.io/pen?template=MJjpwO' target="_blank" rel="noopener noreferrer nofollow">استخدام هذا نموذج CodePen</a> والنقر على `Save` لإنشاء pen خاص بك. Or you can use this CDN link to run the tests in any environment you like: `https://cdn.freecodecamp.org/testable-projects-fcc/v1/bundle.js`
 
-Once you're done, submit the URL to your working project with all its tests passing.
+بمجرد أن تنتهي، ارسل عنوان URL لمشروعك مع اجتياز جميع الاختبارات.
 
 # --solutions--
 
diff --git a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-a-hover-effect-to-a-d3-element.md b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-a-hover-effect-to-a-d3-element.md
index 5e51c08ff03..2162ce83531 100644
--- a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-a-hover-effect-to-a-d3-element.md
+++ b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-a-hover-effect-to-a-d3-element.md
@@ -1,6 +1,6 @@
 ---
 id: 587d7faa367417b2b2512bd4
-title: أضف تأثير عند تحرك المستخدم فوق عنصر (Hover Effect) إلى عنصر D3
+title: أضف تأثير عندما يحوم الماوس فوق عنصر (Hover Effect) D3
 challengeType: 6
 forumTopicId: 301469
 dashedName: add-a-hover-effect-to-a-d3-element
@@ -8,7 +8,7 @@ dashedName: add-a-hover-effect-to-a-d3-element
 
 # --description--
 
-من الممكن إضافة التأثيرات (effects) التي توضح العمود (bar) عندما يتحرك المستخدم فوقه (hovers) بالفأرة. حتى الآن، طبقت تصميم (style) لمستطيلات بواسطة طرق (methods) في D3 و SVG الموجودة داخلهم، ولكن يمكنك استعمال CSS أيضا.
+من الممكن إضافة التأثيرات (effects) التي توضح العمود (bar) عندما يحوم الماوس فوقه (hovers). حتى الآن، طبقت تصميم (style) المستطيلات بواسطة طرق مدمجة (built-in methods) في D3 و SVG، ولكن يمكنك استعمال CSS أيضا.
 
 يمكنك تعيين فئة (class) من CSS إلى عناصر SVG مع طريقة (method) تسمى `attr()`. ثم تحتوي فئة الزائفة (pseudo-class) المسمى `:hover` على قواعد التصميم (style) الجديدة لأي تأثيرات عند تحرك المستخدم فوق عنصر (hover).
 
diff --git a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-attributes-to-the-circle-elements.md b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-attributes-to-the-circle-elements.md
index 0412b2cc619..458f8ae61cd 100644
--- a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-attributes-to-the-circle-elements.md
+++ b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-attributes-to-the-circle-elements.md
@@ -8,17 +8,17 @@ dashedName: add-attributes-to-the-circle-elements
 
 # --description--
 
-أنشئت في التحدي السابق عناصر `circle` لكل نقطة في `dataset`، وربطهم بلوحة (canvas) في SVG. لكن D3 يحتاج إلى مزيد من المعلومات حول موضع (position) وحجم (size) كل `circle` لعرضها بشكل صحيح.
+أنشئت في التحدي السابق عناصر `circle` لكل نقطة في `dataset`، وربطهم بلوحة (canvas) SVG. لكن D3 يحتاج إلى مزيد من المعلومات حول موقع (position) وحجم (size) كل `circle` لعرضها بشكل صحيح.
 
-لدي `circle` في SVG ثلاث سمات (attributes) رئيسية. تكون السمات (attributes) المسمى `cx` و `cy` إحداثيات. ويخبروا D3 أين يضع (position) *مركز (center)* للشكل على اللوحة (canvas) من SVG. تغير سمة (attribute) نصف قطر (radius) (تكتب مثل: `r`) يأثر على حجم `circle`.
+لدي `circle` في SVG ثلاث سمات (attributes) رئيسية. تكون السمات (attributes) المسمى `cx` و `cy` إحداثيات. ويخبروا D3 أين موقع (position) *مركز (center)* للشكل على لوحة (canvas) SVG. تغير سمة (attribute) نصف قطر (radius) (تكتب مثل: `r`) يأثر على حجم `circle`.
 
-مثل مقياس الإحداثيات `y` داخل `rect`، تقاس `cy` داخل `circle` من الجزء العلوي للوحة (canvas) في SVG، ليس من الأسفل.
+مثل مقياس الإحداثيات `rect` داخل `y`، تقاس `cy` داخل `circle` من الجزء العلوي للوحة (canvas) SVG، ليس من الأسفل.
 
-تقدر السمات (attributes) الثلاث جميعها استخدام وظيفة تعيد تفعيل (callback function) لتحديد قيمها بشكل ديناميكي. تذكر أن جميع الطرق (methods) مرتبطة بوظيفة `data(dataset)` تفعّل مرة واحدة لكل عنصر في `dataset`. The `d` parameter in the callback function refers to the current item in `dataset`, which is an array for each point. You use bracket notation, like `d[0]`, to access the values in that array.
+تستطيع جميع السمات (attributes) الثلاث باستخدام وظيفة لإعادة التفعيل (callback function) لتحديد قيمها بشكل ديناميكي. تذكر أن جميع الطرق (methods) المسلسلة بعد وظيفة `data(dataset)` تفعّل مرة واحدة لكل عنصر في `dataset`. تشير `d` في وظيفة إعادة التفعيل إلى العنصر الحالي في `dataset`، وهو قائمة لكل نقطة. استخدم رمز الأقواس، مثل `d[0]`، للوصول إلى القيم في تلك القائمة.
 
 # --instructions--
 
-Add `cx`, `cy`, and `r` attributes to the `circle` elements. The `cx` value should be the first number in the array for each item in `dataset`. The `cy` value should be based off the second number in the array, but make sure to show the chart right-side-up and not inverted. The `r` value should be `5` for all circles.
+أضف السمات `cx` و `cy` و `r` إلى العناصر المسمى `circle`. The `cx` value should be the first number in the array for each item in `dataset`. The `cy` value should be based off the second number in the array, but make sure to show the chart right-side-up and not inverted. The `r` value should be `5` for all circles.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-document-elements-with-d3.md b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-document-elements-with-d3.md
index 56bcac531c5..3b425d7ffd5 100644
--- a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-document-elements-with-d3.md
+++ b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-document-elements-with-d3.md
@@ -10,13 +10,13 @@ dashedName: add-document-elements-with-d3
 
 يحتوي D3 على عدة طرق (methods) التي تسمح لك بإضافة وتغيير العناصر في وثيقتك.
 
-تختار طريقة (method) تسمى `select()` عنصراً واحداً من الوثيقة. إنها تأخذ وسيط (argument) كاسم العنصر الذي تريده وتنتج نقطة لتواصل (node) من HTML للعنصر الأول في المستند الذي يطابق الاسم. Here's an example:
+تختار طريقة (method) `select()` عنصراً واحداً من الوثيقة. إنها تأخذ اسم العنصر الذي تريده كمعطى (argument)، وتنتج node HTML لأول عنصر في المستند يطابق الاسم. Here's an example:
 
 ```js
 const anchor = d3.select("a");
 ```
 
-يجد المثال السابق أول علامة رابط (anchor) في الصفحة ويحفظ نقطتها لتواصل (node) من HTML في المتغير `anchor`. يمكنك استخدام طريقة الاختيار (select) مع الطرق (methods) أخرى. The `d3` part of the example is a reference to the D3 object, which is how you access D3 methods.
+يجد المثال السابق أول علامة رابط (anchor) في الصفحة ويحفظ HTML node لها في المتغير `anchor`. يمكنك استخدام طريقة الاختيار (selection) مع طرق (methods) أخرى. The `d3` part of the example is a reference to the D3 object, which is how you access D3 methods.
 
 Two other useful methods are `append()` and `text()`.
 
diff --git a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/change-the-presentation-of-a-bar-chart.md b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/change-the-presentation-of-a-bar-chart.md
index dd3fa7ae7aa..28e459bccdf 100644
--- a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/change-the-presentation-of-a-bar-chart.md
+++ b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/change-the-presentation-of-a-bar-chart.md
@@ -1,6 +1,6 @@
 ---
 id: 587d7fa8367417b2b2512bca
-title: تغيير مخطط بياني شريطي (Bar Chart)
+title: تغيير التقديم لمخطط الأعمدة (Bar Chart)
 challengeType: 6
 forumTopicId: 301481
 dashedName: change-the-presentation-of-a-bar-chart
@@ -8,17 +8,17 @@ dashedName: change-the-presentation-of-a-bar-chart
 
 # --description--
 
-وأنشأ التحدي السابق مخطط بياني شريطي (bar chart)، ولكن هناك بعض التغييرات في التنسيق الذي يمكن أن تحسن:
+وأنشأ التحدي السابق مخطط أعمدة (bar chart)، ولكن هناك بعض التغييرات في التنسيق الذي يمكن أن تحسنه:
 
-1) إضافة مساحة بين كل شريط لفصله بصرياً، عن طريق إضافة هامش (margin) إلى CSS لفئة تسمى `bar`
+1) إضافة مساحة بين كل عمود لفصله بصرياً، عن طريق إضافة هامش (margin) إلى CSS لفئة `bar`
 
-2) زيادة ارتفاع (height) الأشرطة لإظهار الفرق في القيم بشكل أفضل، عن طريق ضرب (multiplying) القيمة في عدد لزيادة الارتفاع
+2) زيادة ارتفاع (height) الأعمدة لإظهار الفرق في القيم بشكل أفضل، عن طريق ضرب (multiplying) القيمة في عدد لزيادة الارتفاع
 
 # --instructions--
 
-أولاً، أضف `margin` بقيمة `2px` إلى قئة `bar` في علامة `style`. بعد ذلك، غيّر وظيفة تعيد تفعيل في `style()` بحيث تنتج `10` أضعاف قيمة البيانات الأصلية (بالإضافة إلى `px`).
+أولاً، أضف `margin` بقيمة `2px` إلى فئة `bar` في علامة `style`. بعد ذلك، غيّر وظيفة إعادة التفعيل في طريقة `style()` بحيث تنتج `10` أضعاف قيمة البيانات الأصلية (بالإضافة إلى نص `px`).
 
-**ملاحظة:** ضرب كل نقطة بيانات *بنفس* الثابت فقط يغيّر الحجم. إنه مثل تكبير الصورة، الذي لا يغير المقصود من البيانات الأساسية.
+**ملاحظة:** ضرب كل نقطة بيانات *بنفس* الرَّقَم الثابت يغيّر المقياس فقط. إنه مثل تكبير الصورة، الذي لا يغير المقصود من البيانات الأساسية.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/create-a-linear-scale-with-d3.md b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/create-a-linear-scale-with-d3.md
index a5f0ad3b674..8430009c519 100644
--- a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/create-a-linear-scale-with-d3.md
+++ b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/create-a-linear-scale-with-d3.md
@@ -8,13 +8,13 @@ dashedName: create-a-linear-scale-with-d3
 
 # --description--
 
-يملأ البيانات المرسومة كل من مخطط بياني شريطي وانسياب (النِّقَاط المبعثرة) على لوحة SVG قاصدًا. بيد أنه إذا كان ارتفاع الشريط أو إحدى نِقَاط البيانات أكبر من الارتفاع أو العرض SVG، ستذهب خارج نطاق SVG.
+رَسَم البيانات كلا من المخطوطان, أعمدة وانسياب (النِّقَاط المبعثرة), مباشرا على لوحة SVG. ولكن إذا كان ارتفاع العمود أو إحدى نِقَاط البيانات أكبر من ارتفاع أو عرض مساحة SVG، سيقع خارج نطاق منطقة SVG.
 
-في D3، هناك مقاييس للمساعدة في ملأ البيانات. تكون `scales` وظائف (functions) تخبر البرنامَج كيفية ملأ مجموعة من نِقَاط البيانات الخام على البكسلات (px) في لوحة SVG.
+في D3، هناك مقاييس (scales) للمساعدة في تخطيط البيانات. تكون `scales` وظائف (functions) تخبر البرنامَج كيفية ملأ مجموعة من نِقَاط البيانات الخام على عدد البكسلس (pixels) في لوحة SVG.
 
-على سبيل المثال، قل أن لديك لوحة SVG بحجم 100x500، وأنت تريد ملأ الناتج إجمال المحلي (Gross Domestic Product) لعدد من الدول. ومجموعة الأعداد ستكون في حدود المليار أو تريليون دولار. يمكنك توفير D3 من المقياس لمعرفة كيفية وضع قيم الناتج المحلي الإجمالي الكبيرة في تلك المساحة 100x500.
+على سبيل المثال، قل أن لديك لوحة SVG بحجم 100x500، وتريد رسم الناتج المحلي الإجمالي (Gross Domestic Product) لعدد من الدول. ومجموعة الأعداد ستكون في حدود المليار أو تريليون دولار. يمكنك توفير D3 من مقياس (scale) لمعرفة كيف توضع قيم الناتج المحلي الإجمالي (GDP) الكبيرة في تلك المساحة 100x500.
 
-من غير المحتمل أن تملأ البيانات الخام كما هي. قبل الملأ، عيّن المقياس لكامل مجموعتك للبيانات. بحيث أن قيم `x` و `y` تتناسب مع عرض وطول اللوحة.
+من غير المحتمل أن ترسم البيانات الخام كما هي. قبل الرسم، عيّن المقياس لكامل مجموعة البيانات. بحيث أن قيم `x` و `y` تتناسب مع عرض وطول اللوحة.
 
 ولدى D3 عدة أنواع من المقاييس. للحصول على مقياس خطي (linear scale) (يستخدم عادة مع البيانات الكمية (quantitative data))، هناك طريقة في D3 تسمى `scaleLinear()`:
 
@@ -22,11 +22,11 @@ dashedName: create-a-linear-scale-with-d3
 const scale = d3.scaleLinear()
 ```
 
-بشكل افتراضي، يستخدم المقياس عَلاقة الهُوِيَّة (identity relationship). تطابق قيمة المدخل (Input) قيمة المخرج (output). يشمل تحد أخر كيفية تغيير ذلك.
+بشكل افتراضي، يستخدم المقياس عَلاقة الهُوِيَّة (identity relationship). تطابق قيمة المدخل (input) قيمة المخرج (output). يشمل تحدي أخر كيفية تغيير ذلك.
 
 # --instructions--
 
-تغيير متغير (variable) مسمى `scale` لإنشاء مقياس خطي (linear scale). ثم عيّن متغير (variable) مسمى `output` إلى scale, الذي فعلته بالإدخال وسيط بقيمة `50`.
+غيّر المتغير `scale` لإنشاء مقياس خطي (linear scale). ثم عيّن متغير `output` إلى وظيفة scale, الذي فعَِلت بإدخال معطى بقيمة `50`.
 
 # --hints--
 
@@ -36,13 +36,13 @@ const scale = d3.scaleLinear()
 assert($('h2').text() == '50');
 ```
 
-يجب أن يستخدم كودك طريقة (method) تسمى `scaleLinear()`.
+يجب أن يستخدم كودك طريقة `scaleLinear()`.
 
 ```js
 assert(code.match(/\.scaleLinear/g));
 ```
 
-يجب أن يُفاعِل متغير `output` وظيفة `scale` مع وسيط `50`.
+يجب أن يُفعَِل متغير `output` وظيفة `scale` مع معطى `50`.
 
 ```js
 assert(output == 50 && code.match(/scale\(\s*?50\s*?\)/g));
diff --git a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/dynamically-set-the-coordinates-for-each-bar.md b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/dynamically-set-the-coordinates-for-each-bar.md
index 01bdb04afa2..aea916fbe20 100644
--- a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/dynamically-set-the-coordinates-for-each-bar.md
+++ b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/dynamically-set-the-coordinates-for-each-bar.md
@@ -1,6 +1,6 @@
 ---
 id: 587d7fa9367417b2b2512bce
-title: تعيين الإحداثيات ديناميكيا لكل شريط
+title: تعيين الإحداثيات ديناميكيا لكل عمود
 challengeType: 6
 forumTopicId: 301487
 dashedName: dynamically-set-the-coordinates-for-each-bar
@@ -8,13 +8,13 @@ dashedName: dynamically-set-the-coordinates-for-each-bar
 
 # --description--
 
-التحدي السابق أنشئت وألحقت مستطيل بعنصر `svg` لكل نقطة في `dataset` لتستعرض شريط. لسوء الحظ، كانوا مكدسين بعضَهم فوق بعض.
+The last challenge created and appended a rectangle to the `svg` element for each point in `dataset` to represent a bar. لسوء الحظ، كانوا مكدسين بعضَهم فوق بعض.
 
-يمكنك تحكم في موضع المستطيل بواسطة أستخدام سمات (attributes) تسمى `x` و `y`. لتخبر D3 أين يبدأ في رسم الشكل في منطقة `svg`. قام التحدي السابق بتحديدهم إلى صفر، لذلك تم وضع كل عمود (bar) في الزاوية العلوية اليسرى.
+التحكم في موقع المستطيل يكون بواسطة سمات (attributes) `x` و `y`. فانهم يخبرون D3 أين يبدأ في رسم الشكل في منطقة `svg`. قام التحدي السابق بتحديدهم إلى صفر، لذلك تم وضع كل عمود (bar) في الزاوية العلوية اليسرى.
 
-للحصول على مخطط بياني شريطي (bar chart)، يجب أن تجلس جميع الشريط على نفس المستوى العمودي، مما يعني أن قيمة `y` تبقى هي نفسها (عند 0) لجميع الأشرطة. ومع ذلك، تحتاج قيمة `x` إلى التغيير عند إضافة الشريط جديد. تذكر أن أكبر قيم من `x` تدفع العناصر إلى أقصى اليمين. عندما تمر عبر عناصر القائمة في `dataset`، يجب أن تزيد قيمة `x`.
+للحصول على مخطط أعمدة (bar chart)، يجب أن تجلس جميع الأعمدة على نفس المستوى العمودي، مما يعني أن قيمة `y` تبقى هي نفسها (عند 0) لجميع الأعمدة. أما قيمة `x` عليها أن نتغير عندما تضيف أعمدة جديدة. تذكر أن القيم الأكبر في `x` تدفع العناصر أبعد إلى اليمين. عندما تمر عبر عناصر القائمة في `dataset`، يجب أن تزيد قيمة `x`.
 
-تقبل طريقة (method) تسمى `attr()` في D3 الوظيفة تعيد تفعيل (callback functon) التي تعيين تلك السمة ديناميكيا. وظيفة تعيد تفعيل (callback functon) تأخذ حجيتين (arguments)، واحد لنقطة البيانات نفسها (عادة `d`) وواحد لترتيب نقطة البيانات في القائمة (array). أما الحِجَّة (argument) الثانية تدل على الترتيب فهي حِجَّة اختيارية. إليك التنسيق:
+تقبل طريقة (method) `attr()` في D3 وظيفة إعادة التفعيل (callback functon) التي تعيين تلك السمة ديناميكيا. تأخذ وظيفة إعادة التفعيل (callback functon) معطيين (arguments)، واحد لنقطة البيانات نفسها (عادة `d`) وواحد لرقم ترتيب (index) نقطة البيانات في القائمة (array). أما المعطى (argument) الثاني لرقم الترتيب فهو معطى اختياري. إليك التنسيق:
 
 ```js
 selection.attr("property", (d, i) => {
@@ -22,13 +22,13 @@ selection.attr("property", (d, i) => {
 })
 ```
 
-من المهم مُراعاةٌ أنك لا تحتاج إلى كتابة حلقة (loop) نوعها `for` أو استخدام `forEach()` لتكرار العناصر في مجموعة البيانات (data set). تذكر أن طريقة `data()` تحلل مجموعة البيانات (data set), وأي طريقة تتبع `data()` يتم تشغيلها مرة واحدة لكل عنصر في مجموعة البيانات.
+من المهم ملاحظة أنك لن تحتاج إلى كتابة حلقة (loop) نوعها `for` أو `forEach()` لتعيد على العناصر في مجموعة البيانات (data set). تذكر أن طريقة `data()` تحلل مجموعة البيانات (data set), وأي طريقة مسلسة تتبع `data()` سيتم تشغيلها مرة واحدة لكل عنصر في مجموعة البيانات.
 
 # --instructions--
 
-غيّر سمة `x` في وظيفة تعيد تفعيل بحيث ترجع الترتيب 30 مرة.
+غيّر وظيفة إعادة التفعيل لسمة `x` بحيث تنتج رَقَم الترتيب 30 مرة.
 
-**ملاحظة:** كل عمود له عرض (width) بقيمة 25، لذا زيادة كل قيمة `x` بمقدار 30 تضيف بعض المساحة بين الأشرطة. أي قيمة أكبر من 25 ستنجح في هذا المثال.
+**ملاحظة:** كل عمود له عرض (width) بقيمة 25، لذا زيادة كل قيمة `x` بمقدار 30 ستضيف بعض المساحة بين الأشرطة. أي قيمة أكبر من 25 ستنجح في هذا المثال.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/04-data-visualization/json-apis-and-ajax/handle-click-events-with-javascript-using-the-onclick-property.md b/curriculum/challenges/arabic/04-data-visualization/json-apis-and-ajax/handle-click-events-with-javascript-using-the-onclick-property.md
index b2bf1b3f2de..479f3844675 100644
--- a/curriculum/challenges/arabic/04-data-visualization/json-apis-and-ajax/handle-click-events-with-javascript-using-the-onclick-property.md
+++ b/curriculum/challenges/arabic/04-data-visualization/json-apis-and-ajax/handle-click-events-with-javascript-using-the-onclick-property.md
@@ -1,6 +1,6 @@
 ---
 id: 587d7fad367417b2b2512be1
-title: التعامل مع أحداث النقر (Handle Click Events) مع JavaScript باستخدام خاصية عند النقر (onclick)
+title: التعامل مع أحداث النقر (Handle Click Events) مع JavaScript باستخدام خاصية onclick عند النقر
 challengeType: 6
 forumTopicId: 301503
 dashedName: handle-click-events-with-javascript-using-the-onclick-property
@@ -8,7 +8,7 @@ dashedName: handle-click-events-with-javascript-using-the-onclick-property
 
 # --description--
 
-تريد تنفذ كودك بمجرد الانتهاء من تحميل الصفحة, مرة واحدة فقط. لهذا الغرض، يمكنك إرفاق حدث (event) من JavaScript لمستند مسمى `DOMContentLoaded`. إليك كود الذي يفعل ذلك:
+تريد أن ينفذ كودك فقط عندما ينتهي تحميل الصفحة. لهذا الغرض، يمكنك إرفاق حدث (event) من JavaScript لمستند مسمى `DOMContentLoaded`. إليك الكود الذي يفعل ذلك:
 
 ```js
 document.addEventListener('DOMContentLoaded', function() {
@@ -24,11 +24,11 @@ document.getElementById('getMessage').onclick = function(){};
 
 # --instructions--
 
-أضف معالج أحداث النقر داخل وظيفة `DOMContentLoaded` للعنصر مع معرف `getMessage`.
+أضف معالج الأحداث (event handler) داخل وظيفة `DOMContentLoaded` للعنصر الذي له id قيمته `getMessage`.
 
 # --hints--
 
-يجب أن تستخدم كودك طريقة `document.getElementById` لتحديد عنصر `getMessage`.
+يجب أن يستخدم كودك طريقة `document.getElementById` لتحديد عنصر `getMessage`.
 
 ```js
 assert(code.match(/document\s*\.getElementById\(\s*?('|")getMessage\1\s*?\)/g));
diff --git a/curriculum/challenges/arabic/07-scientific-computing-with-python/scientific-computing-with-python-projects/budget-app.md b/curriculum/challenges/arabic/07-scientific-computing-with-python/scientific-computing-with-python-projects/budget-app.md
index 85a86b395a9..a233fad342e 100644
--- a/curriculum/challenges/arabic/07-scientific-computing-with-python/scientific-computing-with-python-projects/budget-app.md
+++ b/curriculum/challenges/arabic/07-scientific-computing-with-python/scientific-computing-with-python-projects/budget-app.md
@@ -42,9 +42,9 @@ Transfer to Clothing    -50.00
 Total: 923.96
 ```
 
-Besides the `Category` class, create a function (outside of the class) called `create_spend_chart` that takes a list of categories as an argument. يجب أن تنتج مخطط بياني للأعمدة بصيغة string.
+Besides the `Category` class, create a function (outside of the class) called `create_spend_chart` that takes a list of categories as an argument. يجب أن تنتج مخطط أعمدة بصيغة string.
 
-The chart should show the percentage spent in each category passed in to the function. The percentage spent should be calculated only with withdrawals and not with deposits. Down the left side of the chart should be labels 0 - 100. كل عمود من مخطط بياني للأعمدة يتكون من رمز " o". The height of each bar should be rounded down to the nearest 10. The horizontal line below the bars should go two spaces past the final bar. Each category name should be written vertically below the bar. There should be a title at the top that says "Percentage spent by category".
+The chart should show the percentage spent in each category passed in to the function. The percentage spent should be calculated only with withdrawals and not with deposits. Down the left side of the chart should be labels 0 - 100. يتكون كل عمود من مخطط ألأعمدة من الحرف " o". The height of each bar should be rounded down to the nearest 10. The horizontal line below the bars should go two spaces past the final bar. Each category name should be written vertically below the bar. There should be a title at the top that says "Percentage spent by category".
 
 This function will be tested with up to four categories.
 
diff --git a/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5dfa30b9eacea3f48c6300ad.md b/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5dfa30b9eacea3f48c6300ad.md
index dc1c868f2ae..07e756d1788 100644
--- a/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5dfa30b9eacea3f48c6300ad.md
+++ b/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5dfa30b9eacea3f48c6300ad.md
@@ -7,13 +7,13 @@ dashedName: step-15
 
 # --description--
 
-In previous steps you used an anchor element to turn text into a link. Other types of content can also be turned into a link by wrapping it in anchor tags.
+في الخطوات السابقة كنت تستخدم عنصر الرابط لتحويل النص إلى رابط. ويمكن أيضا تحويل أنواع أخرى من المحتوى إلى رابط عن طريق وضعه بداخل عنصر الرابط.
 
-Turn the image into a link by surrounding it with necessary element tags. Use `https://freecatphotoapp.com` as the anchor's `href` attribute value.
+حول الصورة إلى رابط عن طريق إحاطتها بعلامات العنصر المناسب. استخدم `https://freecatphotoapp.com` كقيمة السمة `href`.
 
 # --hints--
 
-You should have an `img` element with an `src` value of `https://cdn.freecodecamp.org/curriculum/cat-photo-app/relaxing-cat.jpg`. You may have accidentally deleted it.
+يجب أن يكون لديك عنصر `img` بقيمة `src` من `https://cdn.freecodecamp.org/curriculum/cat-photo-app/relaxing-cat.jpg`. ربما حذفتها عن طريق الخطأ.
 
 ```js
 assert(
@@ -23,37 +23,37 @@ assert(
 );
 ```
 
-Your anchor (`a`) element should have an opening tag. Opening tags have this syntax: `<elementName>`.
+يجب أن يحتوي العنصر (`a`) على علامة الفتح. تكتب علامات الفتح هكذا: `<elementName>`.
 
 ```js
 assert(document.querySelectorAll('a').length >= 2);
 ```
 
-You should only add one opening anchor (`a`) tag. Please remove any extras.
+يجب عليك إضافة علامة فتح واحد فقط لـ (`a`). الرجاء إزالة أي زيادات.
 
 ```js
 assert(document.querySelectorAll('a').length === 2);
 ```
 
-Your anchor (`a`) element should have a closing tag. Closing tags have a `/` just after the `<` character.
+يجب أن يحتوي العنصر (`a`) على علامة غلق. يجب أن تأتي علامات الغلق بـ `/` بعد رمز `<` مباشرة.
 
 ```js
 assert(code.match(/<\/a>/g).length >= 2);
 ```
 
-You should only add one closing anchor (`a`) tag. Please remove any extras.
+يجب عليك إضافة علامة غلق واحد فقط لـ (`a`). الرجاء إزالة أي زيادات.
 
 ```js
 assert(code.match(/<\/a>/g).length === 2);
 ```
 
-Your anchor (`a`) element does not have an `href` attribute. Check that there is a space after the opening tag's name and/or there are spaces before all attribute names.
+ليس لدي عنصرك (`a`) سمة `href`. تيقن من وجود مسافة بعد اسم علامة الفتح و/أو أن هناك مسافات قبل جميع أسماء السمات.
 
 ```js
 assert(document.querySelector('a').hasAttribute('href'));
 ```
 
-Your anchor (`a`) element should link to `https://freecatphotoapp.com`. You have either omitted the URL or have a typo.
+يجب أن يربط عنصرك (`a`) إلى `https://freecatphotoapp.com`. إما أنك حذفت الرابط (URL) أو لديك خطأ إملائي.
 
 ```js
 assert(
@@ -62,7 +62,7 @@ assert(
 );
 ```
 
-Your `img` element should be nested within the anchor (`a`) element. The entire `img` element should be inside the opening and closing tags of the anchor (`a`) element.
+يجب أن يدخل عنصرك `img` داخل عنصر الرابط (`a`). يجب أن يكون عنصر `img` كله داخل العلامات فتح و العلامات غلق لعنصر الرابط (`a`).
 
 ```js
 assert(document.querySelector('img').parentNode.nodeName === 'A');
diff --git a/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804d2.md b/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804d2.md
index d55f677627d..e43c148527e 100644
--- a/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804d2.md
+++ b/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804d2.md
@@ -55,7 +55,7 @@ assert.deepStrictEqual(
 );
 ```
 
-You should only have one `ol` element.
+يجب أن يكون لديك عنصر `ol` واحد فقط.
 
 ```js 
 assert([...document.querySelectorAll('ol')].length == 1);
diff --git a/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804e5.md b/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804e5.md
index d8ddc5519a8..f648de78ef9 100644
--- a/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804e5.md
+++ b/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804e5.md
@@ -22,7 +22,7 @@ assert(
 );
 ```
 
-Your first radio button, with the `id` set to `indoor`, should have the `checked` attribute.
+زرك الراديو الأول، مع `id` بقيمة `indoor`، يجب أن يكون `checked`.
 
 ```js
 assert($('input[type="radio"]')[0].hasAttribute('checked'));
diff --git a/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5efc4f528d6a74d05e68af74.md b/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5efc4f528d6a74d05e68af74.md
index d36e2c1257a..7042c4ca854 100644
--- a/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5efc4f528d6a74d05e68af74.md
+++ b/curriculum/challenges/arabic/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5efc4f528d6a74d05e68af74.md
@@ -9,7 +9,7 @@ dashedName: step-56
 
 هناك طريقة أخرى لربط نص عنصر `input` بالعنصر نفسه. يمكنك دمج النص ضمن عنصر `label` وإضافة سمة `for` بنفس القيمة كسمة `id` لعنصر `input`.
 
-Associate the text `Loving` with the checkbox by nesting only the text `Loving` in a `label` element and giving it an appropriate `for` attribute.
+اربط النص `Loving` مع checkbox بواسطة إدخال النص `Loving` فقط في عنصر `label` وإعطائه السمة `for`.
 
 # --hints--
 
diff --git a/curriculum/challenges/arabic/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f7de4487b64919bb4aa5e.md b/curriculum/challenges/arabic/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f7de4487b64919bb4aa5e.md
index bbafe28bd97..dc8634ecfa5 100644
--- a/curriculum/challenges/arabic/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f7de4487b64919bb4aa5e.md
+++ b/curriculum/challenges/arabic/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f7de4487b64919bb4aa5e.md
@@ -7,7 +7,7 @@ dashedName: step-53
 
 # --description--
 
-بعد آخر `.divider`، قم بإنشاء عنصر `p` آخر مع النص `Cholesterol 0mg 0%`. قم بتغليف النص `Cholesterol` في عنصر `span`، واعطي عنصر `span` هذا السمة `class` بقيمة `bold`. غلف نص `0%` داخل `span` أخرى، مع `class` بقيمة `bold`. Finally, nest the `Cholesterol` and `0mg` `span` elements inside an additional `span` element for alignment.
+بعد آخر `.divider`، قم بإنشاء عنصر `p` آخر مع النص `Cholesterol 0mg 0%`. قم بتغليف النص `Cholesterol` في عنصر `span`، واعطي عنصر `span` هذا السمة `class` بقيمة `bold`. غلف نص `0%` داخل `span` أخرى، مع `class` بقيمة `bold`. أخيرا، أدخل عناصر `span` التي تحتوي على `Cholesterol` و `0mg` داخل عنصر `span` إضافي للمحاذاة.
 
 # --hints--
 
diff --git a/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/expand-your-project-with-external-packages-from-npm.md b/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/expand-your-project-with-external-packages-from-npm.md
index 3edd72d2910..cf503cd449a 100644
--- a/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/expand-your-project-with-external-packages-from-npm.md
+++ b/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/expand-your-project-with-external-packages-from-npm.md
@@ -22,7 +22,7 @@ In questa sezione, i pacchetti richiesti dal progetto vengono memorizzati nel se
 
 # --instructions--
 
-Add version `1.1.0` of the `@freecodecamp/example` package to the `dependencies` field of your `package.json` file.
+Aggiungi la versione `1.1.0` del pacchetto `@freecodecamp/example` al campo `dependencies` del tuo file `package.json`.
 
 **Nota:** `@freecodecamp/example` è un pacchetto fasullo utilizzato come strumento di apprendimento.
 
diff --git a/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/how-to-use-package.json-the-core-of-any-node.js-project-or-npm-package.md b/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/how-to-use-package.json-the-core-of-any-node.js-project-or-npm-package.md
index 2899eb8daae..2bad1871a58 100644
--- a/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/how-to-use-package.json-the-core-of-any-node.js-project-or-npm-package.md
+++ b/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/how-to-use-package.json-the-core-of-any-node.js-project-or-npm-package.md
@@ -22,9 +22,9 @@ Se utilizzi Replit, segui questi passaggi per impostare il progetto:
 
 Quando hai finito, assicurati che una demo funzionante del tuo progetto sia ospitata in qualche percorso pubblico. Quindi invia l'URL nel campo Link alla soluzione.
 
-Il file `package.json` è il centro di qualsiasi progetto Node.js o pacchetto npm. It stores information about your project, similar to how the `head` section of an HTML document describes the content of a webpage. Consiste di un singolo oggetto JSON dove le informazioni sono memorizzate in coppie chiave-valore. There are only two required fields; `name` and `version`, but it’s good practice to provide additional information about your project that could be useful to future users or maintainers.
+Il file `package.json` è il centro di qualsiasi progetto Node.js o pacchetto npm. Memorizza informazioni sul tuo progetto, in modo simile a come la sezione `head` di un documento HTML descrive il contenuto di una pagina web. Consiste di un singolo oggetto JSON dove le informazioni sono memorizzate in coppie chiave-valore. Ci sono solo due campi obbligatori: `name` e `version`, ma è buona pratica fornire ulteriori informazioni sul tuo progetto che potrebbero essere utili per futuri utenti o manutentori.
 
-If you look at the file tree of your project, you will find the `package.json` file on the top level of the tree. Questo è il file che andremo a migliorare nelle prossime due sfide.
+Se guardi l'albero dei file del tuo progetto, troverai il file `package.json` al livello superiore dell'albero. Questo è il file che andremo a migliorare nelle prossime due sfide.
 
 Una delle informazioni più comuni in questo file è il campo `author`. Specifica chi ha creato il progetto e può consistere in una stringa o un oggetto con informazioni di contatto o altri dettagli. Un oggetto è consigliato per progetti più grandi, ma una semplice stringa come l'esempio seguente farà al caso nostro per questo progetto.
 
@@ -34,13 +34,13 @@ Una delle informazioni più comuni in questo file è il campo `author`. Specific
 
 # --instructions--
 
-Add your name as the `author` of the project in the `package.json` file.
+Aggiungi il tuo nome come `author` del progetto nel file `package.json`.
 
 **Nota:** Ricorda che stai scrivendo JSON, quindi tutti i nomi dei campi devono usare virgolette doppie (") ed essere separati con una virgola (,).
 
 # --hints--
 
-`package.json` should have a valid "author" key
+`package.json` dovrebbe avere una chiave "author" valida
 
 ```js
 (getUserInput) =>
diff --git a/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/use-the-caret-character-to-use-the-latest-minor-version-of-a-dependency.md b/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/use-the-caret-character-to-use-the-latest-minor-version-of-a-dependency.md
index 134353fd9f9..8cab45a2940 100644
--- a/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/use-the-caret-character-to-use-the-latest-minor-version-of-a-dependency.md
+++ b/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/use-the-caret-character-to-use-the-latest-minor-version-of-a-dependency.md
@@ -10,13 +10,13 @@ dashedName: use-the-caret-character-to-use-the-latest-minor-version-of-a-depende
 
 Simile a come la tilde vista nell'ultima sfida permette a npm di installare l'ultima PATCH per una dipendenza, l'accento circonflesso (caret, `^`) permette a npm di installare anche aggiornamenti futuri. La differenza è che l'accento circonflesso permette sia aggiornamenti di versione minore che di Patch.
 
-Your current version of `@freecodecamp/example` should be `~1.2.13` which allows npm to install to the latest `1.2.x` version. If you were to use the caret (^) as a version prefix instead, npm would be allowed to update to any `1.x.x` version.
+La versione attuale di `@freecodecamp/example` dovrebbe essere `~1.2.13` che permette a npm di installare l'ultima versione `1.2.x`. Se invece dovessi usare il caret (^) come prefisso di versione, npm avrebbe il permesso di aggiornare a qualsiasi versione `1.x.x`.
 
 ```json
 "package": "^1.3.8"
 ```
 
-This would allow updates to any `1.x.x` version of the package.
+Questo permetterebbe di aggiornare qualsiasi versione `1.x.x` del pacchetto.
 
 # --instructions--
 
diff --git a/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/use-the-tilde-character-to-always-use-the-latest-patch-version-of-a-dependency.md b/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/use-the-tilde-character-to-always-use-the-latest-patch-version-of-a-dependency.md
index b326de9d8ed..51a321b5d06 100644
--- a/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/use-the-tilde-character-to-always-use-the-latest-patch-version-of-a-dependency.md
+++ b/curriculum/challenges/italian/05-back-end-development-and-apis/managing-packages-with-npm/use-the-tilde-character-to-always-use-the-latest-patch-version-of-a-dependency.md
@@ -10,7 +10,7 @@ dashedName: use-the-tilde-character-to-always-use-the-latest-patch-version-of-a-
 
 Nell'ultima sfida, hai detto a npm di includere solo una versione specifica di un pacchetto. Questo è un modo utile per congelare le tue dipendenze, se hai bisogno di assicurarti che diverse parti del tuo progetto rimangano compatibili tra loro. Ma nella maggior parte dei casi d'uso, non vuoi perdere le correzioni di bug dal momento che spesso includono importanti patch di sicurezza e (si spera) non rompono le cose nel farlo.
 
-Per consentire a una dipendenza npm di aggiornare all'ultima versione PATCH, è possibile prefissare la versione della dipendenza con il carattere tilde (`~`). Here's an example of how to allow updates to any `1.3.x` version.
+Per consentire a una dipendenza npm di aggiornare all'ultima versione PATCH, è possibile prefissare la versione della dipendenza con il carattere tilde (`~`). Ecco un esempio di come consentire gli aggiornamenti di qualsiasi versione `1.3.x`.
 
 ```json
 "package": "~1.3.8"
@@ -18,7 +18,7 @@ Per consentire a una dipendenza npm di aggiornare all'ultima versione PATCH, è
 
 # --instructions--
 
-In the package.json file, your current rule for how npm may upgrade `@freecodecamp/example` is to use a specific version (`1.2.13`). But now, you want to allow the latest `1.2.x` version.
+Nel file package.json, la regola con cui npm aggiorna `@freecodecamp/example` si basa su una specifica versione (`1.2.13`). Ma ora desideriamo consentire l'ultima versione `1.2.x`.
 
 Usa il carattere tilde (`~`) come prefisso di versione per `@freecodecamp/example` nelle tue dipendenze e permetti ad npm di aggiornare ad ogni nuova versione di _patch_.
 
diff --git a/curriculum/challenges/italian/14-responsive-web-design-22/learn-accessibility-by-building-a-quiz/6148da157cc0bd0d06df5c0a.md b/curriculum/challenges/italian/14-responsive-web-design-22/learn-accessibility-by-building-a-quiz/6148da157cc0bd0d06df5c0a.md
index 54659e23189..c70339a5a7c 100644
--- a/curriculum/challenges/italian/14-responsive-web-design-22/learn-accessibility-by-building-a-quiz/6148da157cc0bd0d06df5c0a.md
+++ b/curriculum/challenges/italian/14-responsive-web-design-22/learn-accessibility-by-building-a-quiz/6148da157cc0bd0d06df5c0a.md
@@ -7,7 +7,7 @@ dashedName: step-57
 
 # --description--
 
-To align the input boxes with each other, create a new ruleset that targets all `input` and `label` elements within an `.info` element and set the `display` property to `inline-block`.
+Per allineare le caselle di input tra loro, crea un nuovo set di regole che seleziona tutti gli elementi `input` e `label` all'interno di un elemento `.info` e imposta la proprietà `display` su `inline-block`.
 
 Inoltre allinea il testo dell'elemento `label` sulla destra.
 
diff --git a/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5dfa30b9eacea3f48c6300ad.md b/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5dfa30b9eacea3f48c6300ad.md
index 0bc192c1cbc..4ddf50cc08f 100644
--- a/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5dfa30b9eacea3f48c6300ad.md
+++ b/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5dfa30b9eacea3f48c6300ad.md
@@ -7,13 +7,13 @@ dashedName: step-15
 
 # --description--
 
-In previous steps you used an anchor element to turn text into a link. Other types of content can also be turned into a link by wrapping it in anchor tags.
+Nei passaggi precedenti hai usato un elemento di ancoraggio per trasformare il testo in un link. Anche altri tipi di contenuto possono essere trasformati in un link racchiudendoli in tag di ancoraggio.
 
-Turn the image into a link by surrounding it with necessary element tags. Use `https://freecatphotoapp.com` as the anchor's `href` attribute value.
+Trasforma l'immagine in un link circondandola con i tag necessari. Usa `https://freecatphotoapp.com` come valore dell'attributo dell'elemento di ancoraggio `href`.
 
 # --hints--
 
-You should have an `img` element with an `src` value of `https://cdn.freecodecamp.org/curriculum/cat-photo-app/relaxing-cat.jpg`. You may have accidentally deleted it.
+Dovresti avere un elemento `img` con un valore `src` di `https://cdn.freecodecamp.org/curriculum/cat-photo-app/relaxing-cat.jpg`. Potresti averlo eliminato accidentalmente.
 
 ```js
 assert(
@@ -23,37 +23,37 @@ assert(
 );
 ```
 
-Your anchor (`a`) element should have an opening tag. Opening tags have this syntax: `<elementName>`.
+L'elemento di ancoraggio (`a`) dovrebbe avere un tag di apertura. I tag di apertura hanno questa sintassi: `<elementName>`.
 
 ```js
 assert(document.querySelectorAll('a').length >= 2);
 ```
 
-You should only add one opening anchor (`a`) tag. Please remove any extras.
+Dovresti aggiungere un solo tag di apertura di ancoraggio (`a`). Rimuovi quelli di troppo.
 
 ```js
 assert(document.querySelectorAll('a').length === 2);
 ```
 
-Your anchor (`a`) element should have a closing tag. Closing tags have a `/` just after the `<` character.
+L'elemento di ancoraggio (`a`) dovrebbe avere un tag di chiusura. I tag di chiusura hanno un carattere `/` subito dopo il carattere `<`.
 
 ```js
 assert(code.match(/<\/a>/g).length >= 2);
 ```
 
-You should only add one closing anchor (`a`) tag. Please remove any extras.
+Dovresti aggiungere un solo tag di chiusura di ancoraggio (`a`). Rimuovi quelli di troppo.
 
 ```js
 assert(code.match(/<\/a>/g).length === 2);
 ```
 
-Your anchor (`a`) element does not have an `href` attribute. Check that there is a space after the opening tag's name and/or there are spaces before all attribute names.
+L'elemento di ancoraggio (`a`) non ha un attributo `href`. Verifica che ci sia uno spazio dopo il nome del tag di apertura e/o che ci siano spazi prima di tutti i nomi degli attributi.
 
 ```js
 assert(document.querySelector('a').hasAttribute('href'));
 ```
 
-Your anchor (`a`) element should link to `https://freecatphotoapp.com`. You have either omitted the URL or have a typo.
+L'elemento di ancoraggio (`a`) dovrebbe contenere il link `https://freecatphotoapp.com`. Hai omesso l'URL o hai un refuso.
 
 ```js
 assert(
@@ -62,7 +62,7 @@ assert(
 );
 ```
 
-Your `img` element should be nested within the anchor (`a`) element. The entire `img` element should be inside the opening and closing tags of the anchor (`a`) element.
+L'elemento `img` dovrebbe essere annidato all'interno dell'elemento di ancoraggio (`a`). L'intero elemento `img` dovrebbe essere all'interno dei tag di apertura e chiusura dell'elemento di ancoraggio (`a`).
 
 ```js
 assert(document.querySelector('img').parentNode.nodeName === 'A');
diff --git a/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804d2.md b/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804d2.md
index 1a1508836a3..8db73986b49 100644
--- a/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804d2.md
+++ b/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804d2.md
@@ -55,7 +55,7 @@ assert.deepStrictEqual(
 );
 ```
 
-You should only have one `ol` element.
+Dovresti avere un solo elemento `ol`.
 
 ```js 
 assert([...document.querySelectorAll('ol')].length == 1);
diff --git a/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804e5.md b/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804e5.md
index d9704e6be8f..39cb3d81e86 100644
--- a/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804e5.md
+++ b/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5ef9b03c81a63668521804e5.md
@@ -22,7 +22,7 @@ assert(
 );
 ```
 
-Your first radio button, with the `id` set to `indoor`, should have the `checked` attribute.
+Il primo pulsante di opzione con l'`id` impostato su `indoor` dovrebbe avere l'attributo `checked`.
 
 ```js
 assert($('input[type="radio"]')[0].hasAttribute('checked'));
diff --git a/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5efc4f528d6a74d05e68af74.md b/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5efc4f528d6a74d05e68af74.md
index a55d67d8d15..3eb264c5838 100644
--- a/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5efc4f528d6a74d05e68af74.md
+++ b/curriculum/challenges/italian/14-responsive-web-design-22/learn-html-by-building-a-cat-photo-app/5efc4f528d6a74d05e68af74.md
@@ -9,7 +9,7 @@ dashedName: step-56
 
 C'è un altro modo per associare il testo di un elemento `input` con l'elemento stesso. Puoi annidare il testo all'interno di un elemento `label` e aggiungere un attributo `for` con lo stesso valore dell'attributo `id` dell'elemento `input`.
 
-Associate the text `Loving` with the checkbox by nesting only the text `Loving` in a `label` element and giving it an appropriate `for` attribute.
+Associa il testo `Loving` alla casella di spunta annidando solo il testo `Loving` in un elemento `label` e dandogli un attributo `for` appropriato.
 
 # --hints--
 
diff --git a/curriculum/challenges/italian/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f7de4487b64919bb4aa5e.md b/curriculum/challenges/italian/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f7de4487b64919bb4aa5e.md
index 897c5bc84bb..815e839e1f3 100644
--- a/curriculum/challenges/italian/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f7de4487b64919bb4aa5e.md
+++ b/curriculum/challenges/italian/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f7de4487b64919bb4aa5e.md
@@ -7,7 +7,7 @@ dashedName: step-53
 
 # --description--
 
-Dopo l'ultimo elemento `.divider`, crea un elemento `p` e dagli il testo `Cholesterol 0mg 0%`. Inserisci il testo `Cholesterol` in un elemento `span` e assegna a quest'elemento `span` un attributo `class` con il valore `bold`. Annida il testo `0%` in un altro elemento `span` con l'attributo `class` impostato su `bold`. Finally, nest the `Cholesterol` and `0mg` `span` elements inside an additional `span` element for alignment.
+Dopo l'ultimo elemento `.divider`, crea un elemento `p` e dagli il testo `Cholesterol 0mg 0%`. Inserisci il testo `Cholesterol` in un elemento `span` e assegna a quest'elemento `span` un attributo `class` con il valore `bold`. Annida il testo `0%` in un altro elemento `span` con l'attributo `class` impostato su `bold`. Infine annida gli elementi `span` `Cholesterol` e `0mg` all'interno di un altro elemento `span` per l'allineamento.
 
 # --hints--
 
diff --git a/curriculum/challenges/ukrainian/02-javascript-algorithms-and-data-structures/regular-expressions/check-for-mixed-grouping-of-characters.md b/curriculum/challenges/ukrainian/02-javascript-algorithms-and-data-structures/regular-expressions/check-for-mixed-grouping-of-characters.md
index a052410c3b6..e3dce1b3584 100644
--- a/curriculum/challenges/ukrainian/02-javascript-algorithms-and-data-structures/regular-expressions/check-for-mixed-grouping-of-characters.md
+++ b/curriculum/challenges/ukrainian/02-javascript-algorithms-and-data-structures/regular-expressions/check-for-mixed-grouping-of-characters.md
@@ -78,7 +78,7 @@ You should use `.test()` to test the regex.
 assert(code.match(/myRegex.test\(\s*myString\s*\)/));
 ```
 
-Your result should return `true`.
+У результаті ви повинні отримати `true`.
 
 ```js
 assert(result === true);
diff --git a/curriculum/challenges/ukrainian/02-javascript-algorithms-and-data-structures/regular-expressions/using-the-test-method.md b/curriculum/challenges/ukrainian/02-javascript-algorithms-and-data-structures/regular-expressions/using-the-test-method.md
index 90808dbfbff..1f5e81b2198 100644
--- a/curriculum/challenges/ukrainian/02-javascript-algorithms-and-data-structures/regular-expressions/using-the-test-method.md
+++ b/curriculum/challenges/ukrainian/02-javascript-algorithms-and-data-structures/regular-expressions/using-the-test-method.md
@@ -12,7 +12,7 @@ dashedName: using-the-test-method
 
 Якщо ви хочете знайти слово `the` у рядку `The dog chased the cat`, то можете використати наступний регулярний вираз: `/the/`. Зверніть увагу на те, що лапки в регулярному виразі не потрібні.
 
-JavaScript має декілька способів використання регулярних виразів. Один із способів тестування регулярного виразу - це використання методу `.test()`. Метод `.test()` приймає регулярний вираз, застосовує його до рядка (який розміщений всередині дужок), і видає `true` чи `false`, якщо ваш шаблон знаходить щось або ні.
+JavaScript має декілька способів використання регулярних виразів. Один зі способів тестування регулярного виразу – це використання методу `.test()`. Метод `.test()` приймає регулярний вираз, застосовує його до рядка (який розміщений всередині дужок), і видає `true` чи `false`, якщо ваш шаблон знаходить щось або ні.
 
 ```js
 let testStr = "freeCodeCamp";
@@ -24,7 +24,7 @@ testRegex.test(testStr);
 
 # --instructions--
 
-Застосуйте регулярний вираз `myRegex` до рядка `myString` за допомогою методу `.test()` method.
+Застосуйте регулярний вираз `myRegex` до рядка `myString`, використавши метод `.test()`.
 
 # --hints--
 

From 919c1d8c206cf6e98e0c39263365fd23c67244fd Mon Sep 17 00:00:00 2001
From: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
Date: Wed, 8 Feb 2023 14:53:04 +0100
Subject: [PATCH 05/52] chore: remove info key (#49290)

---
 client/i18n/locales/english/translations.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/i18n/locales/english/translations.json b/client/i18n/locales/english/translations.json
index aba33f47e8e..ce97b267a1f 100644
--- a/client/i18n/locales/english/translations.json
+++ b/client/i18n/locales/english/translations.json
@@ -302,7 +302,6 @@
       "certs": "{{title}} Certification"
     },
     "editor-tabs": {
-      "info": "Info",
       "code": "Code",
       "tests": "Tests",
       "restart": "Restart",

From 928dcbe08c547f02f4b8e516c823014eb21fe822 Mon Sep 17 00:00:00 2001
From: Sem Bauke <semboot699@gmail.com>
Date: Wed, 8 Feb 2023 15:21:03 +0100
Subject: [PATCH 06/52] feat: transfer The Odin Project to its own superblock
 (#49202)

* feat: the odin-project superblock

* feat: break everything

* fix: correct meta names

* fix: meta again

* fix: tests

* fix: help category and external curriculum test

* fix: file names again

* fix: help category

* fix: remove console log

---------

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
---
 client/i18n/locales/english/intro.json        | 26 ++++++---
 client/src/assets/icons/index.tsx             |  4 +-
 client/src/assets/icons/viking-helmet.tsx     | 17 ++++++
 .../src/pages/learn/the-odin-project/index.md |  9 ++++
 .../top-build-a-recipe-page-project/index.md  |  9 ++++
 .../top-learn-html-foundations/index.md       |  9 ++++
 .../Introduction/super-block-intro.tsx        | 21 ++++----
 client/src/utils/superblock-map-titles.ts     |  5 +-
 client/utils/help-category-map.json           |  4 +-
 config/certification-settings.ts              |  3 +-
 config/superblock-order.test.ts               |  4 +-
 config/superblock-order.ts                    | 53 +++++++++++++++----
 .../meta.json                                 |  7 ++-
 .../meta.json                                 |  7 ++-
 .../top-build-a-recipe-project.md}            |  2 +-
 .../elements-and-tags-question-a.md           |  0
 .../elements-and-tags-question-b.md           |  0
 .../html-boilerplate-question-a.md            |  0
 .../html-boilerplate-question-b.md            |  0
 .../html-boilerplate-question-c.md            |  0
 .../html-boilerplate-question-d.md            |  0
 .../introduction-to-html-css-question-a.md    |  0
 .../introduction-to-html-css-question-b.md    |  0
 .../introduction-to-html-css-question-c.md    |  0
 .../introduction-to-html-css-question-d.md    |  0
 .../links-and-images-question-a.md            |  0
 .../links-and-images-question-b.md            |  0
 .../links-and-images-question-c.md            |  0
 .../links-and-images-question-d.md            |  0
 .../links-and-images-question-e.md            |  0
 .../links-and-images-question-f.md            |  0
 .../links-and-images-question-g.md            |  0
 .../links-and-images-question-h.md            |  0
 ...d-ordered-and-unordered-list-question-a.md |  0
 ...d-ordered-and-unordered-list-question-b.md |  0
 ...d-ordered-and-unordered-list-question-c.md |  0
 .../working-with-text-question-a.md           |  0
 .../working-with-text-question-b.md           |  0
 .../working-with-text-question-c.md           |  0
 .../working-with-text-question-d.md           |  0
 .../working-with-text-question-e.md           |  0
 .../working-with-text-question-f.md           |  0
 .../working-with-text-question-g.md           |  0
 curriculum/utils.js                           |  3 +-
 curriculum/utils.test.ts                      | 12 +++--
 tools/challenge-auditor/index.ts              |  3 +-
 .../api/configs/super-block-list.ts           |  4 ++
 tools/challenge-helper-scripts/fs-utils.ts    |  3 +-
 .../build-external-curricula-data.test.ts     |  8 ++-
 49 files changed, 160 insertions(+), 53 deletions(-)
 create mode 100644 client/src/assets/icons/viking-helmet.tsx
 create mode 100644 client/src/pages/learn/the-odin-project/index.md
 create mode 100644 client/src/pages/learn/the-odin-project/top-build-a-recipe-page-project/index.md
 create mode 100644 client/src/pages/learn/the-odin-project/top-learn-html-foundations/index.md
 rename curriculum/challenges/_meta/{the-odin-project-projects => top-build-a-recipe-project}/meta.json (60%)
 rename curriculum/challenges/_meta/{the-odin-project => top-learn-html-foundations}/meta.json (95%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project-projects/project-create-a-recipe-page.md => 16-the-odin-project/top-build-a-recipe-project/top-build-a-recipe-project.md} (99%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/elements-and-tags-question-a.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/elements-and-tags-question-b.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/html-boilerplate-question-a.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/html-boilerplate-question-b.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/html-boilerplate-question-c.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/html-boilerplate-question-d.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/introduction-to-html-css-question-a.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/introduction-to-html-css-question-b.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/introduction-to-html-css-question-c.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/introduction-to-html-css-question-d.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/links-and-images-question-a.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/links-and-images-question-b.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/links-and-images-question-c.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/links-and-images-question-d.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/links-and-images-question-e.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/links-and-images-question-f.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/links-and-images-question-g.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/links-and-images-question-h.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/understand-ordered-and-unordered-list-question-a.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/understand-ordered-and-unordered-list-question-b.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/understand-ordered-and-unordered-list-question-c.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/working-with-text-question-a.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/working-with-text-question-b.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/working-with-text-question-c.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/working-with-text-question-d.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/working-with-text-question-e.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/working-with-text-question-f.md (100%)
 rename curriculum/challenges/english/{10-coding-interview-prep/the-odin-project => 16-the-odin-project/top-learn-html-foundations}/working-with-text-question-g.md (100%)

diff --git a/client/i18n/locales/english/intro.json b/client/i18n/locales/english/intro.json
index 17926a60efb..c1d679e160e 100644
--- a/client/i18n/locales/english/intro.json
+++ b/client/i18n/locales/english/intro.json
@@ -778,14 +778,6 @@
           "<a href='https://rosettacode.org/wiki/Rosetta_Code' target='_blank' rel='noopener noreferrer nofollow'>Attribute: Rosetta Code</a>"
         ]
       },
-      "the-odin-project": {
-        "title": "The Odin Project",
-        "intro": ["A description is to be determined"]
-      },
-      "the-odin-project-projects": {
-        "title": "The Odin Project Projects",
-        "intro": ["A description is to be determined"]
-      },
       "project-euler": {
         "title": "Project Euler",
         "intro": [
@@ -795,6 +787,24 @@
       }
     }
   },
+  "the-odin-project": {
+    "title": "The Odin Project",
+    "intro": [
+      "The Odin Project is one of those \"What I wish I had when I was learning\" resources. ",
+      "Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway.",
+      "This project is designed to fill in the gap for people who are trying to hack it on their own but still want a high quality education."
+    ],
+    "blocks": {
+      "top-learn-html-foundations": {
+        "title": "Learn HTML Foundations",
+        "intro": ["A description is to be determined"]
+      },
+      "top-build-a-recipe-project": {
+        "title": "Learn HTML Foundations by Building a Recipe Page",
+        "intro": ["A description is to be determined"]
+      }
+    }
+  },
   "misc-text": {
     "certification": "{{cert}} Certification",
     "browse-other": "Browse our other free certifications\n(we recommend doing these in order)",
diff --git a/client/src/assets/icons/index.tsx b/client/src/assets/icons/index.tsx
index 4adcec517a3..ae851d8eeb7 100644
--- a/client/src/assets/icons/index.tsx
+++ b/client/src/assets/icons/index.tsx
@@ -12,6 +12,7 @@ import Clipboard from './clipboard';
 import PythonIcon from './python-icon';
 import ResponsiveDesign from './responsive-design';
 import Shield from './shield';
+import VikingHelmet from './viking-helmet';
 
 const iconMap = {
   [SuperBlocks.RespWebDesignNew]: ResponsiveDesign,
@@ -27,7 +28,8 @@ const iconMap = {
   [SuperBlocks.DataAnalysisPy]: Analytics,
   [SuperBlocks.InfoSec]: Shield,
   [SuperBlocks.MachineLearningPy]: TensorflowIcon,
-  [SuperBlocks.CodingInterviewPrep]: Algorithm
+  [SuperBlocks.CodingInterviewPrep]: Algorithm,
+  [SuperBlocks.TheOdinProject]: VikingHelmet
 };
 
 const generateIconComponent = (
diff --git a/client/src/assets/icons/viking-helmet.tsx b/client/src/assets/icons/viking-helmet.tsx
new file mode 100644
index 00000000000..ab29caa29f3
--- /dev/null
+++ b/client/src/assets/icons/viking-helmet.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+
+function VikingHelmet(
+  props: JSX.IntrinsicAttributes & React.SVGProps<SVGSVGElement>
+): JSX.Element {
+  return (
+    <>
+      <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' {...props}>
+        <path d='M52.441 53.88c-35.103 34.696-41.31 73.89-33.228 117.837 6.29 34.202 22.079 70.807 40.892 107.767 17.738-27.114 41.117-56.824 68.676-78.517-20.7-17.164-38.261-35.891-51.367-56.447-17.29-27.12-26.504-57.61-24.973-90.64zm407.118 0c1.531 33.03-7.683 63.52-24.973 90.64-13.106 20.556-30.667 39.283-51.367 56.447 27.559 21.693 50.938 51.403 68.676 78.517 18.813-36.96 34.603-73.565 40.892-107.767 8.082-43.947 1.875-83.141-33.228-117.836zM256 179c-8.702 0-17.061 2.757-23 7.316v22.38c6.7-2.648 14.535-4.016 23-4.016s16.3 1.368 23 4.015v-22.379c-5.939-4.559-14.298-7.316-23-7.316zm-41 30.053c-30.485 11.577-60.043 34.66-84.166 62.804C98.718 309.326 76.784 355.501 73.482 391H215V209.053zm82 0V391h141.518c-3.301-35.499-25.236-81.674-57.352-119.143-24.123-28.143-53.681-51.227-84.166-62.804zm-153.502 3.49c-29.097 22.175-55.189 56.212-73.732 85.506a2034.036 2034.036 0 0 0 9.447 17.562c10.162-19.226 23.088-38.126 37.953-55.468 11.983-13.98 25.289-26.965 39.557-38.155a416.25 416.25 0 0 1-13.225-9.445zm225.004 0a416.25 416.25 0 0 1-13.225 9.445c14.268 11.19 27.574 24.175 39.557 38.155 14.865 17.342 27.79 36.242 37.953 55.468 3.179-5.85 6.339-11.705 9.447-17.562-18.543-29.294-44.635-63.33-73.732-85.506zM256 222.68c-7.62 0-14.449 1.66-18.602 3.736-3.262 1.631-4.103 2.973-4.318 3.264.215.29 1.056 1.632 4.318 3.263 4.153 2.077 10.981 3.737 18.602 3.737 7.62 0 14.449-1.66 18.602-3.737 3.262-1.63 4.103-2.972 4.318-3.263-.215-.291-1.056-1.633-4.318-3.264-4.153-2.077-10.981-3.736-18.602-3.736zm22.92 7c.059.08.08.095.08 0 0-.096-.021-.08-.08 0zm-45.84 0c-.059-.08-.08-.096-.08 0 0 .095.021.08.08 0zm-.08 20.984v48.352c6.7-2.648 14.535-4.016 23-4.016s16.3 1.368 23 4.016v-48.352c-6.7 2.648-14.535 4.016-23 4.016s-16.3-1.368-23-4.016zM256 313c-7.62 0-14.449 1.66-18.602 3.736-3.262 1.632-4.103 2.973-4.318 3.264.215.291 1.056 1.632 4.318 3.264C241.551 325.34 248.38 327 256 327c7.62 0 14.449-1.66 18.602-3.736 3.262-1.632 4.103-2.973 4.318-3.264-.215-.291-1.056-1.632-4.318-3.264C270.449 314.66 263.62 313 256 313zm22.92 7c.059.08.08.096.08 0s-.021-.08-.08 0zm-45.84 0c-.059-.08-.08-.096-.08 0s.021.08.08 0zm-.08 20.984v45.87c6.7-2.649 14.535-4.016 23-4.016s16.3 1.367 23 4.016v-45.87c-6.7 2.648-14.535 4.016-23 4.016s-16.3-1.368-23-4.016zm23 59.854c-7.62 0-14.449 1.66-18.602 3.736-3.262 1.631-4.103 2.973-4.318 3.264.215.29 1.056 1.632 4.318 3.264 4.153 2.076 10.981 3.736 18.602 3.736 7.62 0 14.449-1.66 18.602-3.736 3.262-1.632 4.103-2.973 4.318-3.264-.215-.291-1.056-1.633-4.318-3.264-4.153-2.076-10.981-3.736-18.602-3.736zm22.92 7c.059.08.08.095.08 0 0-.096-.021-.08-.08 0zm-45.84 0c-.059-.08-.08-.096-.08 0 0 .095.021.08.08 0zM73 409v30h18.455c-2.78-4.422-4.455-9.52-4.455-15s1.676-10.578 4.455-15H73zm55 0c-7.013 0-13.194 2.204-17.227 5.229C106.74 417.253 105 420.615 105 424c0 3.385 1.74 6.747 5.773 9.771C114.806 436.796 120.987 439 128 439s13.194-2.204 17.227-5.229C149.26 430.747 151 427.385 151 424c0-3.385-1.74-6.747-5.773-9.771C141.194 411.204 135.013 409 128 409zm36.545 0c2.78 4.422 4.455 9.52 4.455 15s-1.676 10.578-4.455 15H215v-30h-50.455zM297 409v30h50.455c-2.78-4.422-4.455-9.52-4.455-15s1.676-10.578 4.455-15H297zm87 0c-7.013 0-13.194 2.204-17.227 5.229C362.74 417.253 361 420.615 361 424c0 3.385 1.74 6.747 5.773 9.771C370.806 436.796 376.987 439 384 439s13.194-2.204 17.227-5.229C405.26 430.747 407 427.385 407 424c0-3.385-1.74-6.747-5.773-9.771C397.194 411.204 391.013 409 384 409zm36.545 0c2.78 4.422 4.455 9.52 4.455 15s-1.676 10.578-4.455 15H439v-30h-18.455zM233 428.822v16.453l23 34.5 23-34.5v-16.453c-6.7 2.648-14.535 4.016-23 4.016s-16.3-1.368-23-4.016z' />
+      </svg>
+    </>
+  );
+}
+
+VikingHelmet.displayName = 'VikingHelmet';
+
+export default VikingHelmet;
diff --git a/client/src/pages/learn/the-odin-project/index.md b/client/src/pages/learn/the-odin-project/index.md
new file mode 100644
index 00000000000..e600d4a7334
--- /dev/null
+++ b/client/src/pages/learn/the-odin-project/index.md
@@ -0,0 +1,9 @@
+---
+title: The Odin Project
+superBlock: the-odin-project
+certification: the-odin-project
+---
+
+## The Odin project
+
+The Odin Project is one of those "What I wish I had when I was learning" resources. Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway. This project is designed to fill in the gap for people who are trying to hack it on their own but still want a high quality education.
diff --git a/client/src/pages/learn/the-odin-project/top-build-a-recipe-page-project/index.md b/client/src/pages/learn/the-odin-project/top-build-a-recipe-page-project/index.md
new file mode 100644
index 00000000000..39bc4dc70b8
--- /dev/null
+++ b/client/src/pages/learn/the-odin-project/top-build-a-recipe-page-project/index.md
@@ -0,0 +1,9 @@
+---
+title: The Odin Project
+superBlock: the-odin-project
+certification: the-odin-project
+---
+
+## The Odin project
+
+Description is to be determined
diff --git a/client/src/pages/learn/the-odin-project/top-learn-html-foundations/index.md b/client/src/pages/learn/the-odin-project/top-learn-html-foundations/index.md
new file mode 100644
index 00000000000..39bc4dc70b8
--- /dev/null
+++ b/client/src/pages/learn/the-odin-project/top-learn-html-foundations/index.md
@@ -0,0 +1,9 @@
+---
+title: The Odin Project
+superBlock: the-odin-project
+certification: the-odin-project
+---
+
+## The Odin project
+
+Description is to be determined
diff --git a/client/src/templates/Introduction/super-block-intro.tsx b/client/src/templates/Introduction/super-block-intro.tsx
index e48882d03ad..e9ecc075298 100644
--- a/client/src/templates/Introduction/super-block-intro.tsx
+++ b/client/src/templates/Introduction/super-block-intro.tsx
@@ -210,16 +210,17 @@ const SuperBlockIntroductionPage = (props: SuperBlockProp) => {
                     />
                   </Fragment>
                 ))}
-                {superBlock !== SuperBlocks.CodingInterviewPrep && (
-                  <div>
-                    <CertChallenge
-                      certification={certification}
-                      superBlock={superBlock}
-                      title={title}
-                      user={user}
-                    />
-                  </div>
-                )}
+                {superBlock !== SuperBlocks.CodingInterviewPrep &&
+                  superBlock !== SuperBlocks.TheOdinProject && (
+                    <div>
+                      <CertChallenge
+                        certification={certification}
+                        superBlock={superBlock}
+                        title={title}
+                        user={user}
+                      />
+                    </div>
+                  )}
               </div>
               {!isSignedIn && !signInLoading && (
                 <div>
diff --git a/client/src/utils/superblock-map-titles.ts b/client/src/utils/superblock-map-titles.ts
index fa2ec32c994..1615bc2f5e8 100644
--- a/client/src/utils/superblock-map-titles.ts
+++ b/client/src/utils/superblock-map-titles.ts
@@ -9,7 +9,10 @@ enum SuperBlockI18nKeys {
 // the key above is used to create the last word for superBlock titles used on
 // the map and window. e.g. 'Certification' in Responsive Web Design
 // Certification
-const superBlocksWithoutLastWord = [SuperBlocks.CodingInterviewPrep];
+const superBlocksWithoutLastWord = [
+  SuperBlocks.CodingInterviewPrep,
+  SuperBlocks.TheOdinProject
+];
 
 export function getSuperBlockTitleForMap(superBlock: SuperBlocks) {
   const i18nSuperBlock = i18next.t(`intro:${superBlock}.title`);
diff --git a/client/utils/help-category-map.json b/client/utils/help-category-map.json
index f4f141c7b83..40ea39ab04e 100644
--- a/client/utils/help-category-map.json
+++ b/client/utils/help-category-map.json
@@ -42,8 +42,8 @@
   "algorithms": "JavaScript",
   "data-structures": "JavaScript",
   "take-home-projects": "JavaScript",
-  "the-odin-project": "HTML-CSS",
-  "the-odin-project-projects": "HTML-CSS",
+  "top-learn-html-foundations": "HTML-CSS",
+  "top-build-a-recipe-project": "HTML-CSS",
   "rosetta-code": "JavaScript",
   "project-euler": "JavaScript",
   "scientific-computing-with-python": "Python",
diff --git a/config/certification-settings.ts b/config/certification-settings.ts
index aea15811b79..dd7f943c707 100644
--- a/config/certification-settings.ts
+++ b/config/certification-settings.ts
@@ -31,7 +31,8 @@ export enum SuperBlocks {
   DataAnalysisPy = 'data-analysis-with-python',
   InfoSec = 'information-security',
   MachineLearningPy = 'machine-learning-with-python',
-  CodingInterviewPrep = 'coding-interview-prep'
+  CodingInterviewPrep = 'coding-interview-prep',
+  TheOdinProject = 'the-odin-project'
 }
 
 export const certIds = {
diff --git a/config/superblock-order.test.ts b/config/superblock-order.test.ts
index 233f7c4d60c..cf21825a48b 100644
--- a/config/superblock-order.test.ts
+++ b/config/superblock-order.test.ts
@@ -150,6 +150,7 @@ describe("'superBlockOrder' helper functions", () => {
       SuperBlocks.MachineLearningPy,
       SuperBlocks.CodingInterviewPrep,
       SuperBlocks.JsAlgoDataStructNew,
+      SuperBlocks.TheOdinProject,
       SuperBlocks.RespWebDesign
     ];
     expect(learnSuperBlocks).toStrictEqual(test);
@@ -188,7 +189,8 @@ describe("'superBlockOrder' helper functions", () => {
       SuperBlocks.InfoSec,
       SuperBlocks.MachineLearningPy,
       SuperBlocks.CodingInterviewPrep,
-      SuperBlocks.JsAlgoDataStructNew
+      SuperBlocks.JsAlgoDataStructNew,
+      SuperBlocks.TheOdinProject
     ];
     expect(notAuditedSuperBlocks).toStrictEqual(test);
     expect(notAuditedSuperBlocks.length).toEqual(test.length);
diff --git a/config/superblock-order.ts b/config/superblock-order.ts
index 8be124ca9e5..a7ba0346a0a 100644
--- a/config/superblock-order.ts
+++ b/config/superblock-order.ts
@@ -78,7 +78,8 @@ export const defaultSuperBlockOrder: SuperBlocks[] = [
   SuperBlocks.DataAnalysisPy,
   SuperBlocks.InfoSec,
   SuperBlocks.MachineLearningPy,
-  SuperBlocks.CodingInterviewPrep
+  SuperBlocks.CodingInterviewPrep,
+  SuperBlocks.TheOdinProject
 ];
 
 /*
@@ -124,7 +125,10 @@ export const superBlockOrder: SuperBlockOrder = {
           SuperBlocks.CodingInterviewPrep
         ],
         [SuperBlockStates.New]: [],
-        [SuperBlockStates.Upcoming]: [SuperBlocks.JsAlgoDataStructNew],
+        [SuperBlockStates.Upcoming]: [
+          SuperBlocks.JsAlgoDataStructNew,
+          SuperBlocks.TheOdinProject
+        ],
         [SuperBlockStates.Legacy]: [SuperBlocks.RespWebDesign]
       },
       [TranslationStates.NotAudited]: {
@@ -173,7 +177,10 @@ export const superBlockOrder: SuperBlockOrder = {
           SuperBlocks.CodingInterviewPrep
         ],
         [SuperBlockStates.New]: [],
-        [SuperBlockStates.Upcoming]: [SuperBlocks.JsAlgoDataStructNew],
+        [SuperBlockStates.Upcoming]: [
+          SuperBlocks.JsAlgoDataStructNew,
+          SuperBlocks.TheOdinProject
+        ],
         [SuperBlockStates.Legacy]: []
       }
     }
@@ -216,7 +223,10 @@ export const superBlockOrder: SuperBlockOrder = {
           SuperBlocks.CodingInterviewPrep
         ],
         [SuperBlockStates.New]: [],
-        [SuperBlockStates.Upcoming]: [SuperBlocks.JsAlgoDataStructNew],
+        [SuperBlockStates.Upcoming]: [
+          SuperBlocks.JsAlgoDataStructNew,
+          SuperBlocks.TheOdinProject
+        ],
         [SuperBlockStates.Legacy]: []
       }
     }
@@ -259,7 +269,10 @@ export const superBlockOrder: SuperBlockOrder = {
           SuperBlocks.CodingInterviewPrep
         ],
         [SuperBlockStates.New]: [],
-        [SuperBlockStates.Upcoming]: [SuperBlocks.JsAlgoDataStructNew],
+        [SuperBlockStates.Upcoming]: [
+          SuperBlocks.JsAlgoDataStructNew,
+          SuperBlocks.TheOdinProject
+        ],
         [SuperBlockStates.Legacy]: []
       }
     }
@@ -301,7 +314,10 @@ export const superBlockOrder: SuperBlockOrder = {
       [TranslationStates.NotAudited]: {
         [SuperBlockStates.Current]: [],
         [SuperBlockStates.New]: [],
-        [SuperBlockStates.Upcoming]: [SuperBlocks.JsAlgoDataStructNew],
+        [SuperBlockStates.Upcoming]: [
+          SuperBlocks.JsAlgoDataStructNew,
+          SuperBlocks.TheOdinProject
+        ],
         [SuperBlockStates.Legacy]: []
       }
     }
@@ -343,7 +359,10 @@ export const superBlockOrder: SuperBlockOrder = {
       [TranslationStates.NotAudited]: {
         [SuperBlockStates.Current]: [],
         [SuperBlockStates.New]: [],
-        [SuperBlockStates.Upcoming]: [SuperBlocks.JsAlgoDataStructNew],
+        [SuperBlockStates.Upcoming]: [
+          SuperBlocks.JsAlgoDataStructNew,
+          SuperBlocks.TheOdinProject
+        ],
         [SuperBlockStates.Legacy]: []
       }
     }
@@ -384,7 +403,10 @@ export const superBlockOrder: SuperBlockOrder = {
       [TranslationStates.NotAudited]: {
         [SuperBlockStates.Current]: [SuperBlocks.CodingInterviewPrep],
         [SuperBlockStates.New]: [],
-        [SuperBlockStates.Upcoming]: [SuperBlocks.JsAlgoDataStructNew],
+        [SuperBlockStates.Upcoming]: [
+          SuperBlocks.JsAlgoDataStructNew,
+          SuperBlocks.TheOdinProject
+        ],
         [SuperBlockStates.Legacy]: []
       }
     }
@@ -427,7 +449,10 @@ export const superBlockOrder: SuperBlockOrder = {
       [TranslationStates.NotAudited]: {
         [SuperBlockStates.Current]: [],
         [SuperBlockStates.New]: [],
-        [SuperBlockStates.Upcoming]: [SuperBlocks.JsAlgoDataStructNew],
+        [SuperBlockStates.Upcoming]: [
+          SuperBlocks.JsAlgoDataStructNew,
+          SuperBlocks.TheOdinProject
+        ],
         [SuperBlockStates.Legacy]: []
       }
     }
@@ -471,7 +496,10 @@ export const superBlockOrder: SuperBlockOrder = {
           SuperBlocks.CodingInterviewPrep
         ],
         [SuperBlockStates.New]: [],
-        [SuperBlockStates.Upcoming]: [SuperBlocks.JsAlgoDataStructNew],
+        [SuperBlockStates.Upcoming]: [
+          SuperBlocks.JsAlgoDataStructNew,
+          SuperBlocks.TheOdinProject
+        ],
         [SuperBlockStates.Legacy]: []
       }
     }
@@ -514,7 +542,10 @@ export const superBlockOrder: SuperBlockOrder = {
           SuperBlocks.CodingInterviewPrep
         ],
         [SuperBlockStates.New]: [],
-        [SuperBlockStates.Upcoming]: [SuperBlocks.JsAlgoDataStructNew],
+        [SuperBlockStates.Upcoming]: [
+          SuperBlocks.JsAlgoDataStructNew,
+          SuperBlocks.TheOdinProject
+        ],
         [SuperBlockStates.Legacy]: [SuperBlocks.RespWebDesign]
       }
     }
diff --git a/curriculum/challenges/_meta/the-odin-project-projects/meta.json b/curriculum/challenges/_meta/top-build-a-recipe-project/meta.json
similarity index 60%
rename from curriculum/challenges/_meta/the-odin-project-projects/meta.json
rename to curriculum/challenges/_meta/top-build-a-recipe-project/meta.json
index edd3de40ae3..df2b93d2096 100644
--- a/curriculum/challenges/_meta/the-odin-project-projects/meta.json
+++ b/curriculum/challenges/_meta/top-build-a-recipe-project/meta.json
@@ -1,12 +1,11 @@
 {
-    "name": "The Odin Project Projects",
+    "name": "TOP build a recipe project",
     "isUpcomingChange": true,
-    "dashedName": "the-odin-project-projects",
-    "order": 6,
+    "order": 1,
     "time": "",
     "template": "",
     "required": [],
-    "superBlock": "coding-interview-prep",
+    "superBlock": "the-odin-project",
     "challengeOrder": [
         [
             "6391d1a4f7ac71efd0621380",
diff --git a/curriculum/challenges/_meta/the-odin-project/meta.json b/curriculum/challenges/_meta/top-learn-html-foundations/meta.json
similarity index 95%
rename from curriculum/challenges/_meta/the-odin-project/meta.json
rename to curriculum/challenges/_meta/top-learn-html-foundations/meta.json
index 44d7f47d50b..b15490e569c 100644
--- a/curriculum/challenges/_meta/the-odin-project/meta.json
+++ b/curriculum/challenges/_meta/top-learn-html-foundations/meta.json
@@ -1,12 +1,11 @@
 {
-    "name": "The Odin Project",
+    "name": "TOP Learn HTML Foundations",
     "isUpcomingChange": true,
-    "dashedName": "the-odin-project",
-    "order": 5,
+    "order": 0,
     "time": "",
     "template": "",
     "required": [],
-    "superBlock": "coding-interview-prep",
+    "superBlock": "the-odin-project",
     "challengeOrder": [
         [
             "6374f208de18c50e48ba767b",
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project-projects/project-create-a-recipe-page.md b/curriculum/challenges/english/16-the-odin-project/top-build-a-recipe-project/top-build-a-recipe-project.md
similarity index 99%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project-projects/project-create-a-recipe-page.md
rename to curriculum/challenges/english/16-the-odin-project/top-build-a-recipe-project/top-build-a-recipe-project.md
index 7f7926e3df6..d810de57171 100644
--- a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project-projects/project-create-a-recipe-page.md
+++ b/curriculum/challenges/english/16-the-odin-project/top-build-a-recipe-project/top-build-a-recipe-project.md
@@ -2,7 +2,7 @@
 id: 6391d1a4f7ac71efd0621380
 title: Build a Recipe Page Project
 challengeType: 14
-dashedName: project-create-a-recipe-page
+dashedName: top-build-a-recipe-project
 ---
 
 # --description--
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/elements-and-tags-question-a.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/elements-and-tags-question-a.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/elements-and-tags-question-a.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/elements-and-tags-question-a.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/elements-and-tags-question-b.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/elements-and-tags-question-b.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/elements-and-tags-question-b.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/elements-and-tags-question-b.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/html-boilerplate-question-a.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/html-boilerplate-question-a.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/html-boilerplate-question-a.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/html-boilerplate-question-a.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/html-boilerplate-question-b.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/html-boilerplate-question-b.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/html-boilerplate-question-b.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/html-boilerplate-question-b.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/html-boilerplate-question-c.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/html-boilerplate-question-c.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/html-boilerplate-question-c.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/html-boilerplate-question-c.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/html-boilerplate-question-d.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/html-boilerplate-question-d.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/html-boilerplate-question-d.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/html-boilerplate-question-d.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/introduction-to-html-css-question-a.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/introduction-to-html-css-question-a.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/introduction-to-html-css-question-a.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/introduction-to-html-css-question-a.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/introduction-to-html-css-question-b.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/introduction-to-html-css-question-b.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/introduction-to-html-css-question-b.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/introduction-to-html-css-question-b.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/introduction-to-html-css-question-c.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/introduction-to-html-css-question-c.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/introduction-to-html-css-question-c.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/introduction-to-html-css-question-c.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/introduction-to-html-css-question-d.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/introduction-to-html-css-question-d.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/introduction-to-html-css-question-d.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/introduction-to-html-css-question-d.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-a.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-a.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-a.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-a.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-b.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-b.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-b.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-b.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-c.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-c.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-c.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-c.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-d.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-d.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-d.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-d.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-e.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-e.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-e.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-e.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-f.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-f.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-f.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-f.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-g.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-g.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-g.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-g.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-h.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-h.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/links-and-images-question-h.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-h.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/understand-ordered-and-unordered-list-question-a.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/understand-ordered-and-unordered-list-question-a.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/understand-ordered-and-unordered-list-question-a.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/understand-ordered-and-unordered-list-question-a.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/understand-ordered-and-unordered-list-question-b.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/understand-ordered-and-unordered-list-question-b.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/understand-ordered-and-unordered-list-question-b.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/understand-ordered-and-unordered-list-question-b.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/understand-ordered-and-unordered-list-question-c.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/understand-ordered-and-unordered-list-question-c.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/understand-ordered-and-unordered-list-question-c.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/understand-ordered-and-unordered-list-question-c.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-a.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-a.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-a.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-a.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-b.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-b.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-b.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-b.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-c.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-c.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-c.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-c.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-d.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-d.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-d.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-d.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-e.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-e.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-e.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-e.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-f.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-f.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-f.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-f.md
diff --git a/curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-g.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-g.md
similarity index 100%
rename from curriculum/challenges/english/10-coding-interview-prep/the-odin-project/working-with-text-question-g.md
rename to curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/working-with-text-question-g.md
diff --git a/curriculum/utils.js b/curriculum/utils.js
index 16b0beba57f..c9f18d45ee8 100644
--- a/curriculum/utils.js
+++ b/curriculum/utils.js
@@ -120,7 +120,8 @@ const directoryToSuperblock = {
   '13-relational-databases': 'relational-database',
   '14-responsive-web-design-22': '2022/responsive-web-design',
   '15-javascript-algorithms-and-data-structures-22':
-    '2022/javascript-algorithms-and-data-structures'
+    '2022/javascript-algorithms-and-data-structures',
+  '16-the-odin-project': 'the-odin-project'
 };
 
 function getSuperBlockFromDir(dir) {
diff --git a/curriculum/utils.test.ts b/curriculum/utils.test.ts
index 28a817a688c..8f27689c9ac 100644
--- a/curriculum/utils.test.ts
+++ b/curriculum/utils.test.ts
@@ -39,7 +39,8 @@ const upcomingTest = {
   [SuperBlocks.MachineLearningPy]: 10,
   [SuperBlocks.CodingInterviewPrep]: 11,
   [SuperBlocks.JsAlgoDataStructNew]: 12,
-  [SuperBlocks.RespWebDesign]: 13
+  [SuperBlocks.TheOdinProject]: 13,
+  [SuperBlocks.RespWebDesign]: 14
 };
 
 const espanolTest = {
@@ -144,7 +145,7 @@ describe('getSuperOrder', () => {
     if (process.env.SHOW_UPCOMING_CHANGES !== 'true') {
       expect.assertions(13);
     } else {
-      expect.assertions(14);
+      expect.assertions(15);
     }
 
     expect(getSuperOrder(SuperBlocks.RespWebDesignNew)).toBe(0);
@@ -162,7 +163,8 @@ describe('getSuperOrder', () => {
 
     if (process.env.SHOW_UPCOMING_CHANGES === 'true') {
       expect(getSuperOrder(SuperBlocks.JsAlgoDataStructNew)).toBe(12);
-      expect(getSuperOrder(SuperBlocks.RespWebDesign)).toBe(13);
+      expect(getSuperOrder(SuperBlocks.TheOdinProject)).toBe(13);
+      expect(getSuperOrder(SuperBlocks.RespWebDesign)).toBe(14);
     } else {
       expect(getSuperOrder(SuperBlocks.RespWebDesign)).toBe(12);
     }
@@ -175,7 +177,7 @@ describe('getSuperBlockFromPath', () => {
   );
 
   it('handles all the directories in ./challenges/english', () => {
-    expect.assertions(15);
+    expect.assertions(16);
 
     for (const directory of directories) {
       expect(() => getSuperBlockFromDir(directory)).not.toThrow();
@@ -183,7 +185,7 @@ describe('getSuperBlockFromPath', () => {
   });
 
   it("returns valid superblocks (or 'certifications') for all valid arguments", () => {
-    expect.assertions(15);
+    expect.assertions(16);
 
     const superBlockPaths = directories.filter(x => x !== '00-certifications');
 
diff --git a/tools/challenge-auditor/index.ts b/tools/challenge-auditor/index.ts
index 564deb5a72a..4fa66ce5936 100644
--- a/tools/challenge-auditor/index.ts
+++ b/tools/challenge-auditor/index.ts
@@ -29,7 +29,8 @@ const superBlockFolderMap = {
   'relational-database': '13-relational-database',
   '2022/responsive-web-design': '14-responsive-web-design-22',
   '2022/javascript-algorithms-and-data-structures':
-    '15-javascript-algorithms-and-data-structures-22'
+    '15-javascript-algorithms-and-data-structures-22',
+  'the-odin-project': '16-the-odin-project'
 };
 
 // These blocks are in the incorrect superblock. They should be moved but, for
diff --git a/tools/challenge-editor/api/configs/super-block-list.ts b/tools/challenge-editor/api/configs/super-block-list.ts
index 28b0d6eb7ad..d5655f8f9a4 100644
--- a/tools/challenge-editor/api/configs/super-block-list.ts
+++ b/tools/challenge-editor/api/configs/super-block-list.ts
@@ -54,5 +54,9 @@ export const superBlockList = [
   {
     name: 'JavaScript Algorithms and Data Structures (Beta)',
     path: '15-javascript-algorithms-and-data-structures-22'
+  },
+  {
+    name: 'The Odin Project',
+    path: '16-the-odin-project'
   }
 ];
diff --git a/tools/challenge-helper-scripts/fs-utils.ts b/tools/challenge-helper-scripts/fs-utils.ts
index 410f98deb5f..ad479a27177 100644
--- a/tools/challenge-helper-scripts/fs-utils.ts
+++ b/tools/challenge-helper-scripts/fs-utils.ts
@@ -17,7 +17,8 @@ export function getSuperBlockSubPath(superBlock: SuperBlocks): string {
     [SuperBlocks.RelationalDb]: '13-relational-databases',
     [SuperBlocks.RespWebDesignNew]: '14-responsive-web-design-22',
     [SuperBlocks.JsAlgoDataStructNew]:
-      '15-javascript-algorithms-and-data-structures-22'
+      '15-javascript-algorithms-and-data-structures-22',
+    [SuperBlocks.TheOdinProject]: '16-the-odin-project'
   };
   return pathMap[superBlock];
 }
diff --git a/tools/scripts/build/build-external-curricula-data.test.ts b/tools/scripts/build/build-external-curricula-data.test.ts
index 9ff08d2e8a7..737260af2e6 100644
--- a/tools/scripts/build/build-external-curricula-data.test.ts
+++ b/tools/scripts/build/build-external-curricula-data.test.ts
@@ -82,10 +82,16 @@ if (envData.clientLocale == 'english' && !envData.showUpcomingChanges) {
       const dashedNames = orderedSuperBlockInfo.map(
         ({ dashedName }) => dashedName
       );
+
+      const isUpcoming = [
+        '2022/javascript-algorithms-and-data-structures',
+        'the-odin-project'
+      ];
+
       // TODO: this is a hack, we should have a single source of truth for the
       // list of superblocks that are available.
       const publicSuperBlockNames = Object.values(SuperBlocks).filter(
-        x => x !== '2022/javascript-algorithms-and-data-structures'
+        x => !isUpcoming.includes(x)
       );
 
       expect(dashedNames).toEqual(

From 9472a8c912982f525cb6e4bef088a2adc1230880 Mon Sep 17 00:00:00 2001
From: Sriparno Roy <89148144+Sriparno08@users.noreply.github.com>
Date: Wed, 8 Feb 2023 21:45:45 +0530
Subject: [PATCH 07/52] fix(curriculum): make step 16 of learn accessibility
 project easier to read (#49251)

* Fix sentence construction

* Fix sentence construction
---
 .../614202874ca576084fca625f.md                               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/curriculum/challenges/english/14-responsive-web-design-22/learn-accessibility-by-building-a-quiz/614202874ca576084fca625f.md b/curriculum/challenges/english/14-responsive-web-design-22/learn-accessibility-by-building-a-quiz/614202874ca576084fca625f.md
index 98425cf93a9..1c61c6f1a5b 100644
--- a/curriculum/challenges/english/14-responsive-web-design-22/learn-accessibility-by-building-a-quiz/614202874ca576084fca625f.md
+++ b/curriculum/challenges/english/14-responsive-web-design-22/learn-accessibility-by-building-a-quiz/614202874ca576084fca625f.md
@@ -7,9 +7,9 @@ dashedName: step-16
 
 # --description--
 
-Every `region` role requires a visible label, which should be referenced by the `aria-labelledby` attribute.
+Every `region` role requires a label, which helps screen reader users understand the purpose of the region. One method for adding a label is to add a heading element inside the region and then reference it with the `aria-labelledby` attribute.
 
-To the `section` elements, give the following `aria-labelledby` attributes:
+Add the following `aria-labelledby` attributes to the `section` elements:
 
 - `student-info`
 - `html-questions`

From a9f292f5dabd9b44848c503bae0d80c7b4c77f51 Mon Sep 17 00:00:00 2001
From: camperbot <camperbot@users.noreply.github.com>
Date: Thu, 9 Feb 2023 02:49:30 +0530
Subject: [PATCH 08/52] chore(i18n,learn): processed translations (#49292)

---
 .../render-a-class-component-to-the-dom.md    |  2 +-
 .../react/render-html-elements-to-the-dom.md  |  6 +-
 .../add-a-tooltip-to-a-d3-element.md          | 22 +++----
 .../add-attributes-to-the-circle-elements.md  |  4 +-
 .../add-document-elements-with-d3.md          |  2 +-
 .../615f6b2d164f81809efd9bdc.md               |  2 +-
 .../615f6b2d164f81809efd9bdc.md               |  2 +-
 .../615f6b2d164f81809efd9bdc.md               |  2 +-
 .../615f6b2d164f81809efd9bdc.md               |  2 +-
 .../615f6b2d164f81809efd9bdc.md               |  2 +-
 .../615f6b2d164f81809efd9bdc.md               |  2 +-
 .../615f6b2d164f81809efd9bdc.md               |  2 +-
 .../project-create-a-recipe-page.md           | 62 +++++++++----------
 .../615f6b2d164f81809efd9bdc.md               |  2 +-
 .../615f6b2d164f81809efd9bdc.md               |  2 +-
 15 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/curriculum/challenges/arabic/03-front-end-development-libraries/react/render-a-class-component-to-the-dom.md b/curriculum/challenges/arabic/03-front-end-development-libraries/react/render-a-class-component-to-the-dom.md
index d34c6fdd953..5a74017ecd3 100644
--- a/curriculum/challenges/arabic/03-front-end-development-libraries/react/render-a-class-component-to-the-dom.md
+++ b/curriculum/challenges/arabic/03-front-end-development-libraries/react/render-a-class-component-to-the-dom.md
@@ -10,7 +10,7 @@ dashedName: render-a-class-component-to-the-dom
 
 يمكنك تذكر استخدام API ReactDOM في تحدي سابق لإضافة عناصر JSX إلى DOM. وستبدو عملية تقديم مكونات React متشابهة جدا. لقد ركزت التحديات القليلة الماضية على المكونات (components) والتكوين (composition)، لذلك تم التقديم لك خلف الكواليس. ومع ذلك، لن يقدم أي من رمز React الذي تكتبه إلى DOM دون أستدعاء API ReactDOM.
 
-إليك تذكير بكفية كتابة الصيغة: `ReactDOM.render(componentToRender, targetNode)`. الحَجَّة الأولى هي عنصر React الذي تريد أنتاجه. الحجة الثانية هي نقطة التواصل DOM التي تريد أن تجعل ذلك المكون داخلها.
+إليك تذكير بكفية كتابة الصيغة: `ReactDOM.render(componentToRender, targetNode)`. الحَجَّة الأولى هي عنصر React الذي تريد أنتاجه. الحجة الثانية هي DOM node التي تريد أن تجعل ذلك المكون داخلها.
 
 يتم تمرير مكونات React إلى `ReactDOM.render()` بشكل مختلف قليلا عن عناصر JSX. بالنسبة لعناصر JSX ، يمكنك تمرير اسم العنصر الذي تريد أنتاجه. لكن، بالنسبة لمكونات React، تحتاج إلى استخدام نفس الجملة كما لو كنت تقدم مكوناً متداخلاً، على سبيل المثال `ReactDOM.render(<ComponentToRender />, targetNode)`. أنت تستخدم هذه الجملة لكل من مكونات فئة ES6 والمكونات الوظيفية ES6.
 
diff --git a/curriculum/challenges/arabic/03-front-end-development-libraries/react/render-html-elements-to-the-dom.md b/curriculum/challenges/arabic/03-front-end-development-libraries/react/render-html-elements-to-the-dom.md
index 092b3ab7208..80f52e03146 100644
--- a/curriculum/challenges/arabic/03-front-end-development-libraries/react/render-html-elements-to-the-dom.md
+++ b/curriculum/challenges/arabic/03-front-end-development-libraries/react/render-html-elements-to-the-dom.md
@@ -10,13 +10,13 @@ dashedName: render-html-elements-to-the-dom
 
 حتى الآن، تعلمت أن JSX أداة مناسبة لكتابة HTML مقروءة داخل JavaScript. مع React، يمكننا تقديم JSX قاصدًا إلى HTML DOM باستخدام React الذي يقدم API المعروف باسم ReactDOM.
 
-ReactDOM يوفر طريقة بسيطة لتقديم عناصر React إلى DOM التي تبدو مثل: `ReactDOM.render(componentToRender, targetNode)`, حيث الحَجَّة الأولى هي عنصر React أو المكون الذي تريد أن تنتجه، والحجة الثانية هي نقطة التواصل DOM التي تريد تقديم المكون إليها.
+ReactDOM يوفر طريقة بسيطة لتقديم عناصر React إلى DOM التي تبدو مثل: `ReactDOM.render(componentToRender, targetNode)`, حيث الحَجَّة الأولى هي عنصر React أو المكون الذي تريد أن تنتجه، والحجة الثانية هي node DOM التي تريد تقديم المكون إليها.
 
 كما تتوقع، `ReactDOM.render()` يجب أن يستدعى بعد إعلانات عناصر JSX، تماما مثل كيفية الإعلان عن المتغيرات قبل استخدامها.
 
 # --instructions--
 
-يحتوي محرر التعليمات البرمجية على مكون JSX بسيط. استخدم طريقة `ReactDOM.render()` لإضافة هذا المكون إلى الصفحة. يمكنك تمرير عناصر JSX المحددة قاصدًا كالحجة الأولى واستخدام `document.getElementById()` لتحديد نقطة التواصل DOM لتقديمها إليها. هناك `div` مع `id='challenge-node'` متاح لك للاستخدام. تيقن من عدم تغيير ثابت `JSX`.
+يحتوي محرر التعليمات البرمجية على مكون JSX بسيط. استخدم طريقة `ReactDOM.render()` لإضافة هذا المكون إلى الصفحة. يمكنك تمرير عناصر JSX المحددة قاصدًا كالحجة الأولى واستخدام `document.getElementById()` لتحديد DOM node لتقديمها إليها. هناك `div` مع `id='challenge-node'` متاح لك للاستخدام. تيقن من عدم تغيير ثابت `JSX`.
 
 # --hints--
 
@@ -38,7 +38,7 @@ assert(JSX.props.children[0].type === 'h1');
 assert(JSX.props.children[1].type === 'p');
 ```
 
-يجب أن ينتج عنصر JSX المقدم إلى نقطة التواصل DOM مع معرف `challenge-node`.
+يجب أن ينتج عنصر JSX المقدم إلى DOM node مع معرف `challenge-node`.
 
 ```js
 assert(
diff --git a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-a-tooltip-to-a-d3-element.md b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-a-tooltip-to-a-d3-element.md
index 4cca0a103d8..784787f50a1 100644
--- a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-a-tooltip-to-a-d3-element.md
+++ b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-a-tooltip-to-a-d3-element.md
@@ -8,13 +8,13 @@ dashedName: add-a-tooltip-to-a-d3-element
 
 # --description--
 
-يظهر أداة لتلميح (tooltip) المزيد من معلومات العنصر في صفحة عندما ينتقل المستخدم فوق (hovers) هذا العنصر. هناك عدة طرق لإضافة أداة لتلميح (tooltip) لعرض بيانات، هذا التحدي يستخدم عنصر `title` في SVG.
+يظهر أداة لتلميح (tooltip) المزيد من معلومات العنصر في صفحة عندما ينتقل المستخدم فوق (hovers) هذا العنصر. هناك عدة طرق لإضافة تلميح لعرض البيانات. هذا التحدي يستخدم عنصر `title` في SVG.
 
 يرافق `title` الطريقة (method) المسمى `text()` لإضافة البيانات بشكل ديناميكي إلى الأعمدة (bars).
 
 # --instructions--
 
-أربط عنصر `title` تحت كل نقطة التواصل (node) المسمى `rect`. ثم فعّيل الطريقة (method) المسمى `text()` مع وظيفة تعيد تفعيل (callback function) بحيث يعرض النص قيمة البيانات.
+أربط عنصر `title` تحت كل node المسمى `rect`. ثم فعّيل الطريقة (method) المسمى `text()` مع وظيفة تعيد تفعيل (callback function) بحيث يعرض النص قيمة البيانات.
 
 # --hints--
 
@@ -24,55 +24,55 @@ dashedName: add-a-tooltip-to-a-d3-element
 assert($('title').length == 9);
 ```
 
-يجب أن يحتوي أول عنصر `title` على أداة لتلميح (tooltip) بنص `12`.
+يجب أن يحتوي أول عنصر `title` على تلميح بنص `12`.
 
 ```js
 assert($('title').eq(0).text() == '12');
 ```
 
-يجب أن يحتوي ثاني عنصر `title` على أداة لتلميح (tooltip) بنص `31`.
+يجب أن يحتوي ثاني عنصر `title` على تلميح بنص `31`.
 
 ```js
 assert($('title').eq(1).text() == '31');
 ```
 
-يجب أن يحتوي ثالث عنصر `title` على أداة لتلميح (tooltip) بنص `22`.
+يجب أن يحتوي ثالث عنصر `title` على تلميح بنص `22`.
 
 ```js
 assert($('title').eq(2).text() == '22');
 ```
 
-يجب أن يحتوي رابع عنصر `title` على أداة لتلميح (tooltip) بنص `17`.
+يجب أن يحتوي رابع عنصر `title` على تلميح بنص `17`.
 
 ```js
 assert($('title').eq(3).text() == '17');
 ```
 
-يجب أن يحتوي خامس عنصر `title` على أداة لتلميح (tooltip) بنص `25`.
+يجب أن يحتوي خامس عنصر `title` على تلميح بنص `25`.
 
 ```js
 assert($('title').eq(4).text() == '25');
 ```
 
-يجب أن يحتوي سادس عنصر `title` على أداة لتلميح (tooltip) بنص `18`.
+يجب أن يحتوي سادس عنصر `title` على تلميح بنص `18`.
 
 ```js
 assert($('title').eq(5).text() == '18');
 ```
 
-يجب أن يحتوي سابع عنصر `title` على أداة لتلميح (tooltip) بنص `29`.
+يجب أن يحتوي سابع عنصر `title` على تلميح بنص `29`.
 
 ```js
 assert($('title').eq(6).text() == '29');
 ```
 
-يجب أن يحتوي ثامن عنصر `title` على أداة لتلميح (tooltip) بنص `14`.
+يجب أن يحتوي ثامن عنصر `title` على تلميح بنص `14`.
 
 ```js
 assert($('title').eq(7).text() == '14');
 ```
 
-يجب أن يحتوي تاسع عنصر `title` على أداة لتلميح (tooltip) بنص `9`.
+يجب أن يحتوي تاسع عنصر `title` على تلميح بنص `9`.
 
 ```js
 assert($('title').eq(8).text() == '9');
diff --git a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-attributes-to-the-circle-elements.md b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-attributes-to-the-circle-elements.md
index 458f8ae61cd..42b50539688 100644
--- a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-attributes-to-the-circle-elements.md
+++ b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-attributes-to-the-circle-elements.md
@@ -8,9 +8,9 @@ dashedName: add-attributes-to-the-circle-elements
 
 # --description--
 
-أنشئت في التحدي السابق عناصر `circle` لكل نقطة في `dataset`، وربطهم بلوحة (canvas) SVG. لكن D3 يحتاج إلى مزيد من المعلومات حول موقع (position) وحجم (size) كل `circle` لعرضها بشكل صحيح.
+أنشئت في التحدي السابق عناصر `circle` لكل نقطة في `dataset`، وأضفتهم بلوحة (canvas) SVG. لكن D3 يحتاج إلى مزيد من المعلومات حول موقع (position) وحجم (size) كل `circle` لعرضها بشكل صحيح.
 
-لدي `circle` في SVG ثلاث سمات (attributes) رئيسية. تكون السمات (attributes) المسمى `cx` و `cy` إحداثيات. ويخبروا D3 أين موقع (position) *مركز (center)* للشكل على لوحة (canvas) SVG. تغير سمة (attribute) نصف قطر (radius) (تكتب مثل: `r`) يأثر على حجم `circle`.
+لدي `circle` في SVG ثلاث سمات (attributes) رئيسية. تكون السمات (attributes) المسمى `cx` و `cy` إحداثيات. ويخبروا D3 أين تضع *وَسَط (center)* الشكل على لوحة SVG. تحدد سمة نصف قطر (radius) (وتكتب: `r`) حجم الدائرة (`circle`).
 
 مثل مقياس الإحداثيات `rect` داخل `y`، تقاس `cy` داخل `circle` من الجزء العلوي للوحة (canvas) SVG، ليس من الأسفل.
 
diff --git a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-document-elements-with-d3.md b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-document-elements-with-d3.md
index 3b425d7ffd5..2cf381b4368 100644
--- a/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-document-elements-with-d3.md
+++ b/curriculum/challenges/arabic/04-data-visualization/data-visualization-with-d3/add-document-elements-with-d3.md
@@ -10,7 +10,7 @@ dashedName: add-document-elements-with-d3
 
 يحتوي D3 على عدة طرق (methods) التي تسمح لك بإضافة وتغيير العناصر في وثيقتك.
 
-تختار طريقة (method) `select()` عنصراً واحداً من الوثيقة. إنها تأخذ اسم العنصر الذي تريده كمعطى (argument)، وتنتج node HTML لأول عنصر في المستند يطابق الاسم. Here's an example:
+تختار طريقة (method) `select()` عنصراً واحداً من الوثيقة. إنها تأخذ اسم العنصر الذي تريده كمعطى (argument)، وتنتج HTML node لأول عنصر في المستند يطابق الاسم. Here's an example:
 
 ```js
 const anchor = d3.select("a");
diff --git a/curriculum/challenges/arabic/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md b/curriculum/challenges/arabic/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
index 984e967ff1c..47fae3090d3 100644
--- a/curriculum/challenges/arabic/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
+++ b/curriculum/challenges/arabic/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
@@ -7,7 +7,7 @@ dashedName: step-43
 
 # --description--
 
-بعد آخر عنصر `.divider`، أنشئ عنصر `p` وأعطيه النص `Total Fat 8g 10%`. قم بتغليف `Total Fat` في `span` مع `class` تم تعيينه إلى `bold`. غلف `10%` داخل عنصر `span` مع `class` بقيمة `bold`. أخيراً، أدخل عنصر `span` الذي يحتوي على نص `Total Fat` مع نص `8g` في عنصر `span` إضافي للمحاذاة.
+بعد آخر عنصر `.divider`، أنشئ عنصر `p` وأعطيه النص `Total Fat 8g 10%`. Wrap the text `Total Fat` in a `span` element with the `class` of `bold`. Wrap the text `10%` in another `span` element with the `class` of `bold`. أخيراً، أدخل عنصر `span` الذي يحتوي على نص `Total Fat` مع نص `8g` في عنصر `span` إضافي للمحاذاة.
 
 # --hints--
 
diff --git a/curriculum/challenges/chinese-traditional/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md b/curriculum/challenges/chinese-traditional/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
index fc6a81f51f8..980f0672685 100644
--- a/curriculum/challenges/chinese-traditional/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
+++ b/curriculum/challenges/chinese-traditional/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
@@ -7,7 +7,7 @@ dashedName: step-43
 
 # --description--
 
-在最後一個 `.divider` 元素之後，創建一個 `p` 元素併爲其指定文本 `Total Fat 8g 10%`。 將 `Total Fat` 包裹在 `span` 元素中，並將 `class` 設置爲 `bold`。 將 `10%` 包裹在另一個 `span` 元素中，並將 `class` 設置爲 `bold`。 最後：嵌套 `Total Fat` `span` 元素和文本 `8g` 在另一個 `span` 元素中，以實現對齊。
+在最後一個 `.divider` 元素之後，創建一個 `p` 元素併爲其指定文本 `Total Fat 8g 10%`。 Wrap the text `Total Fat` in a `span` element with the `class` of `bold`. Wrap the text `10%` in another `span` element with the `class` of `bold`. 最後：嵌套 `Total Fat` `span` 元素和文本 `8g` 在另一個 `span` 元素中，以實現對齊。
 
 # --hints--
 
diff --git a/curriculum/challenges/chinese/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md b/curriculum/challenges/chinese/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
index 3c5555b0ce1..c1c455124b8 100644
--- a/curriculum/challenges/chinese/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
+++ b/curriculum/challenges/chinese/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
@@ -7,7 +7,7 @@ dashedName: step-43
 
 # --description--
 
-在最后一个 `.divider` 元素之后，创建一个 `p` 元素并为其指定文本 `Total Fat 8g 10%`。 将 `Total Fat` 包裹在 `span` 元素中，并将 `class` 设置为 `bold`。 将 `10%` 包裹在另一个 `span` 元素中，并将 `class` 设置为 `bold`。 最后：嵌套 `Total Fat` `span` 元素和文本 `8g` 在另一个 `span` 元素中，以实现对齐。
+在最后一个 `.divider` 元素之后，创建一个 `p` 元素并为其指定文本 `Total Fat 8g 10%`。 Wrap the text `Total Fat` in a `span` element with the `class` of `bold`. Wrap the text `10%` in another `span` element with the `class` of `bold`. 最后：嵌套 `Total Fat` `span` 元素和文本 `8g` 在另一个 `span` 元素中，以实现对齐。
 
 # --hints--
 
diff --git a/curriculum/challenges/espanol/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md b/curriculum/challenges/espanol/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
index 384cf16d4b9..fbfed9937c9 100644
--- a/curriculum/challenges/espanol/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
+++ b/curriculum/challenges/espanol/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
@@ -7,7 +7,7 @@ dashedName: step-43
 
 # --description--
 
-Después de su último elemento `.divider`, cree un elemento `p` y asígnele el texto `Total Fat 8g 10%`. Envuelva `Total Fat` en un elemento `span` con la `class` configurada en `bold`. Envuelva `10%` en otro elemento `span` con el atributo `class` establecido a `bold`. Por último, anide el elemento `span` `Total Fat` y el texto `8g` en un elemento `span` adicional para alineamiento.
+Después de su último elemento `.divider`, cree un elemento `p` y asígnele el texto `Total Fat 8g 10%`. Wrap the text `Total Fat` in a `span` element with the `class` of `bold`. Wrap the text `10%` in another `span` element with the `class` of `bold`. Por último, anide el elemento `span` `Total Fat` y el texto `8g` en un elemento `span` adicional para alineamiento.
 
 # --hints--
 
diff --git a/curriculum/challenges/german/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md b/curriculum/challenges/german/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
index 0d8c69723b0..c843342439d 100644
--- a/curriculum/challenges/german/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
+++ b/curriculum/challenges/german/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
@@ -7,7 +7,7 @@ dashedName: step-43
 
 # --description--
 
-After your last `.divider` element, create a `p` element and give it the text `Total Fat 8g 10%`. Wrap `Total Fat` in a `span` element with the `class` set to `bold`. Wrap `10%` in another `span` element with the `class` set to `bold`. Finally, nest the `Total Fat` `span` element and the text `8g` in an additional `span` element for alignment.
+After your last `.divider` element, create a `p` element and give it the text `Total Fat 8g 10%`. Wrap the text `Total Fat` in a `span` element with the `class` of `bold`. Wrap the text `10%` in another `span` element with the `class` of `bold`. Finally, nest the `Total Fat` `span` element and the text `8g` in an additional `span` element for alignment.
 
 # --hints--
 
diff --git a/curriculum/challenges/italian/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md b/curriculum/challenges/italian/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
index 92a8c2d67ae..d53b8338403 100644
--- a/curriculum/challenges/italian/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
+++ b/curriculum/challenges/italian/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
@@ -7,7 +7,7 @@ dashedName: step-43
 
 # --description--
 
-Dopo l'ultimo elemento `.divider`, crea un elemento `p` e assegnagli il testo `Total Fat 8g 10%`. Avvolgi `Total Fat` in un elemento `span` con l'attributo `class` con il valore `bold`. Racchiudi `10%` in un altro elemento `span` con `class` impostata su `bold`. Infine annida l'elemento `span` `Total Fat` e il testo `8g` in un altro elemento `span` per l'allineamento.
+Dopo l'ultimo elemento `.divider`, crea un elemento `p` e assegnagli il testo `Total Fat 8g 10%`. Wrap the text `Total Fat` in a `span` element with the `class` of `bold`. Wrap the text `10%` in another `span` element with the `class` of `bold`. Infine annida l'elemento `span` `Total Fat` e il testo `8g` in un altro elemento `span` per l'allineamento.
 
 # --hints--
 
diff --git a/curriculum/challenges/japanese/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md b/curriculum/challenges/japanese/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
index 5a82f434392..e98d6b36d96 100644
--- a/curriculum/challenges/japanese/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
+++ b/curriculum/challenges/japanese/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
@@ -7,7 +7,7 @@ dashedName: step-43
 
 # --description--
 
-最後の `.divider` 要素の下に、`p` 要素を作成してテキストを `Total Fat 8g 10%` にしてください。 `Total Fat` の部分を `span` 要素で囲み、`class` を `bold` に設定してください。 Wrap `10%` in another `span` element with the `class` set to `bold`. Finally, nest the `Total Fat` `span` element and the text `8g` in an additional `span` element for alignment.
+最後の `.divider` 要素の下に、`p` 要素を作成してテキストを `Total Fat 8g 10%` にしてください。 Wrap the text `Total Fat` in a `span` element with the `class` of `bold`. Wrap the text `10%` in another `span` element with the `class` of `bold`. Finally, nest the `Total Fat` `span` element and the text `8g` in an additional `span` element for alignment.
 
 # --hints--
 
diff --git a/curriculum/challenges/portuguese/10-coding-interview-prep/the-odin-project-projects/project-create-a-recipe-page.md b/curriculum/challenges/portuguese/10-coding-interview-prep/the-odin-project-projects/project-create-a-recipe-page.md
index 657a3f6e32d..e1563646d8c 100644
--- a/curriculum/challenges/portuguese/10-coding-interview-prep/the-odin-project-projects/project-create-a-recipe-page.md
+++ b/curriculum/challenges/portuguese/10-coding-interview-prep/the-odin-project-projects/project-create-a-recipe-page.md
@@ -1,40 +1,40 @@
 ---
 id: 6391d1a4f7ac71efd0621380
-title: Build a Recipe Page Project
+title: Projeto de criação de uma página de receitas
 challengeType: 14
 dashedName: project-create-a-recipe-page
 ---
 
 # --description--
 
-The website will consist of a main index page which will have links to a few recipes. The website won’t look very pretty by the time you’ve finished.
+O site consistirá em uma página index principal com links para algumas receitas. O site não ficará muito bonito quando terminar.
 
-**User Stories:**
+**Histórias de usuário:**
 
-1. Your recipe page should contain a `DOCTYPE` tag.
-1. Your recipe page should include an `html` element with a `head` and `body` element as children.
-1. You should have a `title` element within the `head` element with the text `The Odin Recipes`.
-1. You should see an `h1` element that has the text `Creamy Chocolate Fudge`.
-1. You should see an image with the url `*placeholder-fcc-cdn*` with a fitting `alt` text.
-1. There should be an `h2` element with the text `Description` under the image.
-1. You should see a couple of paragraphs under `Description` that describe the recipe.
-1. There should be an `h2` element with the text `Ingredients`
-1. Under the `Ingredients` heading there should be an unordered list with the ingredients needed for the recipe.
-1. Under the list of ingredients add another heading called `Steps`.
-1. You should see an ordered list with a couple of steps needed to complete the recipe.
-1. Under the steps there should be an `h2` element with the text `More Recipes`
-1. You should see a couple of links to other recipes inside an unordered list which has a couple of list items with anchor elements within.
-1. These anchor elements should have `href` attribute with the value set to `#`
+1. A página de receita deve conter uma tag `DOCTYPE`.
+1. A página de receita deve incluir um elemento `html` com os elementos `head` e `body` como filhos.
+1. Você deve ter um elemento `title` dentro do elemento `head` com o texto `The Odin Recipes`.
+1. Você deve ver um elemento `h1` com o texto `Creamy Chocolate Fudge`.
+1. Você deve ver uma imagem com o url `*placeholder-fcc-cdn*` com um texto `alt` adequado.
+1. Deve haver um elemento `h2` com o texto `Description` sob a imagem.
+1. Você deve ver alguns parágrafos sob `Description` que descrevam a receita.
+1. Deve haver um elemento `h2` com o texto `Ingredients`
+1. Sob o título `Ingredients`, deve haver uma lista não ordenada com os ingredientes necessários para a receita.
+1. Sob a lista de ingredientes, adicione outro título chamado `Steps`.
+1. Você deve ver uma lista ordenada com alguns passos necessários para completar a receita.
+1. Abaixo dos passos, deve haver um elemento `h2` com o texto `More Recipes`
+1. Você deve ver alguns links para outras receitas dentro de uma lista não ordenada com alguns itens na lista com elementos de âncora dentro deles.
+1. O elemento de âncora (a) deve ter o atributo `href` com o valor `#`
 
 # --hints--
 
-You should have a `DOCTYPE` tag.
+Você deve ter uma tag `DOCTYPE`.
 
 ```js
 assert(code.match(/<!DOCTYPE\s+?html\s*?>/gi));
 ```
 
-You should have a `html` element with `head` and `body` element.
+Você precisa de um elemento `html` e, dentro dele, um elemento `head` e um elemento `body`.
 
 ```js
 const html = document.querySelectorAll('html')[0];
@@ -44,19 +44,19 @@ const body = document.querySelectorAll('html > body')[0];
 assert(html && head && body);
 ```
 
-You should have a `title` element within the `head` element that contains the text `The Odin Recipes`.
+Você deve ter um elemento `title` dentro do elemento `head` com o texto `The Odin Recipes`.
 
 ```js
 assert(document.querySelectorAll('HEAD > TITLE')[0].innerText == 'The Odin Recipes');
 ```
 
-You should have a `h1` element within your `body` element that contains the text `Creamy Chocolate Fudge`.
+Você deve ter um elemento `h1` dentro do elemento `body` com o texto `Creamy Chocolate Fudge`.
 
 ```js
 assert(document.querySelectorAll('BODY > H1')[0].innerText == 'Creamy Chocolate Fudge');
 ```
 
-You should have an image with the url `*placeholder-fcc-cdn*` with an `alt` attribute that has a fitting text.
+Você deve ter uma imagem com o url `*placeholder-fcc-cdn*` com um atributo `alt` que tenha um texto adequado.
 
 ```js
 const img = document.querySelectorAll('IMG')[0];
@@ -64,7 +64,7 @@ const img = document.querySelectorAll('IMG')[0];
 assert(img && img.alt !='' && img.src === 'https://i.imgur.com/p0J5baJ.jpg')
 ```
 
-You should have an `h2` element with the text `Description`.
+Deve haver um elemento `h2` com o texto `Description`.
 
 ```js
 const h2 = document.querySelectorAll('H2')[0];
@@ -72,7 +72,7 @@ const h2 = document.querySelectorAll('H2')[0];
 assert(h2.innerText == 'Description');
 ```
 
-You should have at least two `p` elements describing the recipe.
+Você deve ter pelo menos dois elementos `p` que descrevam a receita.
 
 ```js
 const paragraphs = document.querySelectorAll('P');
@@ -80,7 +80,7 @@ const paragraphs = document.querySelectorAll('P');
 assert(paragraphs.length > 1);
 ```
 
-You should have an `h2` element with the text `Ingredients`.
+Você deve ter um elemento `h2` com o texto `Ingredients`.
 
 ```js
 const h2 = document.querySelectorAll('H2')[1];
@@ -88,7 +88,7 @@ const h2 = document.querySelectorAll('H2')[1];
 assert(h2.innerText == 'Ingredients');
 ```
 
-You should have an unordered list `<ul>` with some ingredients as the list items `<li>`.
+Você deve ter uma lista não ordenada `<ul>` com alguns ingredientes como itens da lista `<li>`.
 
 ```js
 const unorderedList = document.querySelectorAll('UL')[0];
@@ -97,7 +97,7 @@ const listItems = document.querySelectorAll('UL > LI');
 assert(unorderedList && listItems && listItems.length > 1);
 ```
 
-You should have an `h2` element with the text `Steps`.
+Você deve ter um elemento `h2` com o texto `Steps`.
 
 ```js
 const h2 = document.querySelectorAll('H2')[2];
@@ -105,7 +105,7 @@ const h2 = document.querySelectorAll('H2')[2];
 assert(h2.innerText == 'Steps');
 ```
 
-You should have a `<ol>` with the the steps as the list items `<li>`.
+Você deve ter uma lista ordenada `<ol>` com alguns passos como itens da lista `<li>`.
 
 ```js
 const orderedList = document.querySelectorAll('OL')[0];
@@ -114,7 +114,7 @@ const listItems = document.querySelectorAll('OL > LI');
 assert(orderedList && listItems && listItems.length > 1);
 ```
 
-You should have an `h2` element with the text `More Recipes`.
+Você deve ter um elemento `h2` com o texto `More Recipes`.
 
 ```js
 const h2 = document.querySelectorAll('H2')[3];
@@ -122,7 +122,7 @@ const h2 = document.querySelectorAll('H2')[3];
 assert(h2.innerText == 'More Recipes');
 ```
 
-You should have an unordered list `<ul>` element with list items `<li>` that contain `<a>` tags which lead to other recipes.
+Você deve ter um elemento de lista não ordenada `<ul>` com itens de lista `<li>` que contenham tags `<a>` que levem a outras receitas.
 
 ```js
 const unorderedList = document.querySelectorAll('UL')[1];
@@ -137,7 +137,7 @@ const containsAnchors =  [...listItems].every(function(listItem) {
 assert(unorderedList && allAreListItems && containsAnchors && listItems.length > 1);
 ```
 
-Your anchor tags linking to the recipes should have a `href` attribute with the value set to `#`
+Os elementos de âncora (a) que estiverem associados a receitas devem ter o atributo `href` com o valor `#`.
 
 ```js
 const anchorTags = document.querySelectorAll("a");
diff --git a/curriculum/challenges/portuguese/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md b/curriculum/challenges/portuguese/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
index 1ecaccf66ad..591e5cd4d2a 100644
--- a/curriculum/challenges/portuguese/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
+++ b/curriculum/challenges/portuguese/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
@@ -7,7 +7,7 @@ dashedName: step-43
 
 # --description--
 
-Após o último elemento `.divider`, crie um elemento `p` e dê a ele o texto `Total Fat 8g 10%`. Encapsule `Total Fat` em um elemento `span` com a `class` definida como `bold`. Encapsule `10%` em outro elemento `span` com a `class` definida como `bold`. Por fim, coloque o elemento de `span` `Total Fat` e o texto `8g` dentro de um elemento de `span` adicional para realizar o alinhamento.
+Após o último elemento `.divider`, crie um elemento `p` e dê a ele o texto `Total Fat 8g 10%`. Coloque o texto `Total Fat` dentro de um elemento `span` com a `class` definida como `bold`. Coloque o texto `10%` dentro de outro elemento `span`, com a `class` definida como `bold`. Por fim, coloque o elemento de `span` `Total Fat` e o texto `8g` dentro de um elemento de `span` adicional para realizar o alinhamento.
 
 # --hints--
 
diff --git a/curriculum/challenges/ukrainian/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md b/curriculum/challenges/ukrainian/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
index b827007312c..86ce469d92d 100644
--- a/curriculum/challenges/ukrainian/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
+++ b/curriculum/challenges/ukrainian/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f6b2d164f81809efd9bdc.md
@@ -7,7 +7,7 @@ dashedName: step-43
 
 # --description--
 
-Після останнього елемента `.divider` створіть елемент `p` та надайте йому текст `Total Fat 8g 10%`. Обгорніть `Total Fat` в елемент `span` з `class`, встановленим на `bold`. Обгорніть `10%` в інший елемент `span` із `class` зі значенням `bold`. Наприкінці вкладіть елемент `span` (`Total Fat`) та текст `8g` у додатковий елемент `span` для вирівнювання.
+Після останнього елемента `.divider` створіть елемент `p` та надайте йому текст `Total Fat 8g 10%`. Wrap the text `Total Fat` in a `span` element with the `class` of `bold`. Wrap the text `10%` in another `span` element with the `class` of `bold`. Наприкінці вкладіть елемент `span` (`Total Fat`) та текст `8g` у додатковий елемент `span` для вирівнювання.
 
 # --hints--
 

From 6c97591ca6a8a0fe96127d609fd8919e447f67eb Mon Sep 17 00:00:00 2001
From: Ahmad Abdolsaheb <ahmad.abdolsaheb@gmail.com>
Date: Thu, 9 Feb 2023 00:28:26 +0300
Subject: [PATCH 09/52] feat(client): turn default layout to a functional
 component (#49289)

---
 client/src/components/layouts/default.tsx | 79 +++++++++++------------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/client/src/components/layouts/default.tsx b/client/src/components/layouts/default.tsx
index 071611f499d..ad865472aec 100644
--- a/client/src/components/layouts/default.tsx
+++ b/client/src/components/layouts/default.tsx
@@ -1,7 +1,6 @@
-import React, { Component, ReactNode } from 'react';
+import React, { ReactNode, useEffect } from 'react';
 import Helmet from 'react-helmet';
 import { TFunction, withTranslation } from 'react-i18next';
-// import TagManager from 'react-gtm-module';
 import { connect } from 'react-redux';
 import { bindActionCreators, Dispatch } from 'redux';
 import { createSelector } from 'reselect';
@@ -26,6 +25,7 @@ import {
   isServerOnlineSelector,
   userFetchStateSelector
 } from '../../redux/selectors';
+
 import { UserFetchState, User } from '../../redux/prop-types';
 import BreadCrumb from '../../templates/Challenges/components/bread-crumb';
 import Flash from '../Flash';
@@ -41,6 +41,7 @@ import './fonts.css';
 import './global.css';
 import './variables.css';
 import './rtl-layout.css';
+import { Themes } from '../settings/theme';
 
 const mapStateToProps = createSelector(
   isSignedInSelector,
@@ -100,55 +101,51 @@ const getSystemTheme = () =>
       : 'light-palette'
   }`;
 
-class DefaultLayout extends Component<DefaultLayoutProps> {
-  static displayName = 'DefaultLayout';
-
-  componentDidMount() {
-    const { isSignedIn, fetchUser } = this.props;
+function DefaultLayout({
+  children,
+  hasMessage,
+  fetchState,
+  flashMessage,
+  isOnline,
+  isServerOnline,
+  isSignedIn,
+  removeFlashMessage,
+  showFooter = true,
+  isChallenge = false,
+  block,
+  superBlock,
+  t,
+  theme = Themes.Default,
+  user,
+  fetchUser
+}: DefaultLayoutProps): JSX.Element {
+  useEffect(() => {
+    // componentDidMount
     if (!isSignedIn) {
       fetchUser();
     }
-    window.addEventListener('online', this.updateOnlineStatus);
-    window.addEventListener('offline', this.updateOnlineStatus);
-  }
+    window.addEventListener('online', updateOnlineStatus);
+    window.addEventListener('offline', updateOnlineStatus);
 
-  componentWillUnmount() {
-    window.removeEventListener('online', this.updateOnlineStatus);
-    window.removeEventListener('offline', this.updateOnlineStatus);
-  }
+    return () => {
+      // componentWillUnmount.
+      window.removeEventListener('online', updateOnlineStatus);
+      window.removeEventListener('offline', updateOnlineStatus);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
-  updateOnlineStatus = () => {
-    const { onlineStatusChange } = this.props;
+  const updateOnlineStatus = () => {
     const isOnline =
       isBrowser() && 'navigator' in window ? window.navigator.onLine : null;
     return typeof isOnline === 'boolean' ? onlineStatusChange(isOnline) : null;
   };
 
-  render() {
-    const {
-      children,
-      hasMessage,
-      fetchState,
-      flashMessage,
-      isOnline,
-      isServerOnline,
-      isSignedIn,
-      removeFlashMessage,
-      showFooter = true,
-      isChallenge = false,
-      block,
-      superBlock,
-      t,
-      theme = 'default',
-      user
-    } = this.props;
-
-    const useSystemTheme = fetchState.complete && isSignedIn === false;
-
-    if (fetchState.pending) {
-      return <Loader fullScreen={true} messageDelay={5000} />;
-    }
+  const useSystemTheme = fetchState.complete && isSignedIn === false;
 
+  if (fetchState.pending) {
+    return <Loader fullScreen={true} messageDelay={5000} />;
+  } else {
     return (
       <div className='page-wrapper'>
         <Helmet
@@ -240,6 +237,8 @@ class DefaultLayout extends Component<DefaultLayoutProps> {
   }
 }
 
+DefaultLayout.displayName = 'DefaultLayout';
+
 export default connect(
   mapStateToProps,
   mapDispatchToProps

From 9191bd987a10a2aa76c7897f7665c4c6076f4358 Mon Sep 17 00:00:00 2001
From: Shaun Hamilton <shauhami020@gmail.com>
Date: Wed, 8 Feb 2023 21:41:12 +0000
Subject: [PATCH 10/52] fix(curriculum): soften regex test ad-node (#49240)

---
 .../implementation-of-social-authentication-iii.md              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/curriculum/challenges/english/06-quality-assurance/advanced-node-and-express/implementation-of-social-authentication-iii.md b/curriculum/challenges/english/06-quality-assurance/advanced-node-and-express/implementation-of-social-authentication-iii.md
index aef68751990..10be5ceeb48 100644
--- a/curriculum/challenges/english/06-quality-assurance/advanced-node-and-express/implementation-of-social-authentication-iii.md
+++ b/curriculum/challenges/english/06-quality-assurance/advanced-node-and-express/implementation-of-social-authentication-iii.md
@@ -61,7 +61,7 @@ async (getUserInput) => {
   );
   assert.match(
     data,
-    /GitHubStrategy[^]*return cb/gi,
+    /GitHubStrategy[^]*cb/gi,
     'Strategy should return the callback function "cb"'
   );
 }

From 335044fecef6271cf0eeac4b28b9d64a4e777b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20B=C4=85ba?= <maciek2baba2@gmail.com>
Date: Thu, 9 Feb 2023 05:59:05 +0100
Subject: [PATCH 11/52] fix(curriculum): delete repeated sentence on data
 visualization with D3 project (#49275)

delete repeated sentence
---
 .../data-visualization-with-d3/change-styles-based-on-data.md  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/curriculum/challenges/english/04-data-visualization/data-visualization-with-d3/change-styles-based-on-data.md b/curriculum/challenges/english/04-data-visualization/data-visualization-with-d3/change-styles-based-on-data.md
index 1ed6ae7d5e2..8e2005e381f 100644
--- a/curriculum/challenges/english/04-data-visualization/data-visualization-with-d3/change-styles-based-on-data.md
+++ b/curriculum/challenges/english/04-data-visualization/data-visualization-with-d3/change-styles-based-on-data.md
@@ -8,8 +8,7 @@ dashedName: change-styles-based-on-data
 
 # --description--
 
-D3 is about visualization and presentation of data. It's likely you'll want to change the styling of elements based on the data. You can use a callback function in the `style()` method to change the styling for different elements.
-
+D3 is about visualization and presentation of data. It's likely you'll want to change the styling of elements based on the data.
 For example, you may want to color a data point blue if it has a value less than 20, and red otherwise. You can use a callback function in the `style()` method and include the conditional logic. The callback function uses the `d` parameter to represent the data point:
 
 ```js

From 9b6042e44de8f4464247cce36bbb5e8b04238bdd Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Date: Thu, 9 Feb 2023 14:01:13 +0530
Subject: [PATCH 12/52] feat: enable mobile auth endpoints (#49298

Reverts #49212
---
 api-server/package.json                       |  3 +
 api-server/src/common/models/user.js          | 17 +++++
 api-server/src/server/boot/authentication.js  | 62 +++++++++++++++++-
 api-server/src/server/middleware.json         |  5 +-
 .../src/server/middlewares/rate-limit.js      | 19 ++++++
 .../middlewares/request-authorization.js      |  4 +-
 api-server/src/server/utils/middleware.js     | 14 ++++
 package-lock.json                             | 65 +++++++++++++++++++
 8 files changed, 184 insertions(+), 5 deletions(-)
 create mode 100644 api-server/src/server/middlewares/rate-limit.js

diff --git a/api-server/package.json b/api-server/package.json
index 7be433231a7..8b2b9214fea 100644
--- a/api-server/package.json
+++ b/api-server/package.json
@@ -45,6 +45,7 @@
     "dedent": "0.7.0",
     "dotenv": "6.2.0",
     "express-flash": "0.0.2",
+    "express-rate-limit": "^6.7.0",
     "express-session": "1.17.3",
     "express-validator": "6.14.1",
     "helmet": "3.23.3",
@@ -60,12 +61,14 @@
     "mongodb": "3.6.9",
     "morgan": "1.10.0",
     "nanoid": "3.3.4",
+    "node-fetch": "^2.6.7",
     "nodemailer-ses-transport": "1.5.1",
     "passport": "0.4.1",
     "passport-auth0": "1.4.2",
     "passport-local": "1.0.0",
     "passport-mock-strategy": "2.0.0",
     "query-string": "6.14.0",
+    "rate-limit-mongo": "^2.3.2",
     "rx": "4.1.0",
     "stripe": "8.205.0",
     "uuid": "3.4.0",
diff --git a/api-server/src/common/models/user.js b/api-server/src/common/models/user.js
index 31efb6a04d5..028ffcc7dc9 100644
--- a/api-server/src/common/models/user.js
+++ b/api-server/src/common/models/user.js
@@ -162,6 +162,8 @@ export default function initializeUser(User) {
   User.definition.properties.rand.default = getRandomNumber;
   // increase user accessToken ttl to 900 days
   User.settings.ttl = 900 * 24 * 60 * 60 * 1000;
+  // Sets ttl to 900 days for mobile login created access tokens
+  User.settings.maxTTL = 900 * 24 * 60 * 60 * 1000;
 
   // username should not be in blocklist
   User.validatesExclusionOf('username', {
@@ -341,6 +343,21 @@ export default function initializeUser(User) {
     );
   };
 
+  User.prototype.mobileLoginByRequest = function mobileLoginByRequest(
+    req,
+    res
+  ) {
+    return new Promise((resolve, reject) =>
+      this.createAccessToken({}, (err, accessToken) => {
+        if (err) {
+          return reject(err);
+        }
+        setAccessTokenToResponse({ accessToken }, req, res);
+        return resolve(accessToken);
+      })
+    );
+  };
+
   User.afterRemote('logout', function ({ req, res }, result, next) {
     removeCookies(req, res);
     next();
diff --git a/api-server/src/server/boot/authentication.js b/api-server/src/server/boot/authentication.js
index b55a90cdc49..c7589da53ce 100644
--- a/api-server/src/server/boot/authentication.js
+++ b/api-server/src/server/boot/authentication.js
@@ -2,10 +2,9 @@ import dedent from 'dedent';
 import { check } from 'express-validator';
 import jwt from 'jsonwebtoken';
 import passport from 'passport';
+import fetch from 'node-fetch';
 import { isEmail } from 'validator';
-
 import { jwtSecret } from '../../../../config/secrets';
-
 import { decodeEmail } from '../../common/utils';
 import {
   createPassportCallbackAuthenticator,
@@ -14,7 +13,11 @@ import {
 } from '../component-passport';
 import { wrapHandledError } from '../utils/create-handled-error.js';
 import { removeCookies } from '../utils/getSetAccessToken';
-import { ifUserRedirectTo, ifNoUserRedirectHome } from '../utils/middleware';
+import {
+  ifUserRedirectTo,
+  ifNoUserRedirectHome,
+  ifNotMobileRedirect
+} from '../utils/middleware';
 import { getRedirectParams } from '../utils/redirection';
 import { createDeleteUserToken } from '../middlewares/user-token';
 
@@ -34,6 +37,7 @@ module.exports = function enableAuthentication(app) {
   // enable loopback access control authentication. see:
   // loopback.io/doc/en/lb2/Authentication-authorization-and-permissions.html
   app.enableAuth();
+  const ifNotMobile = ifNotMobileRedirect();
   const ifUserRedirect = ifUserRedirectTo();
   const ifNoUserRedirect = ifNoUserRedirectHome();
   const devSaveAuthCookies = devSaveResponseAuthCookies();
@@ -87,6 +91,8 @@ module.exports = function enableAuthentication(app) {
     createGetPasswordlessAuth(app)
   );
 
+  api.get('/mobile-login', ifNotMobile, ifUserRedirect, mobileLogin(app));
+
   app.use(api);
 };
 
@@ -188,3 +194,53 @@ function createGetPasswordlessAuth(app) {
     );
   };
 }
+
+function mobileLogin(app) {
+  const {
+    models: { User }
+  } = app;
+  return async function getPasswordlessAuth(req, res, next) {
+    try {
+      const auth0Res = await fetch(
+        `https://${process.env.AUTH0_DOMAIN}/userinfo`,
+        {
+          headers: { Authorization: req.headers.authorization }
+        }
+      );
+
+      if (!auth0Res.ok) {
+        return next(
+          wrapHandledError(new Error('Invalid Auth0 token'), {
+            type: 'danger',
+            message: 'We could not log you in, please try again in a moment.',
+            status: auth0Res.status
+          })
+        );
+      }
+
+      const { email } = await auth0Res.json();
+
+      if (!isEmail(email)) {
+        return next(
+          wrapHandledError(new TypeError('decoded email is invalid'), {
+            type: 'danger',
+            message: 'The email is incorrectly formatted',
+            status: 400
+          })
+        );
+      }
+
+      User.findOne$({ where: { email } })
+        .do(async user => {
+          if (!user) {
+            user = await User.create({ email });
+          }
+          await user.mobileLoginByRequest(req, res);
+          res.end();
+        })
+        .subscribe(() => {}, next);
+    } catch (err) {
+      next(err);
+    }
+  };
+}
diff --git a/api-server/src/server/middleware.json b/api-server/src/server/middleware.json
index 69a47f44021..df8d4ae9ff8 100644
--- a/api-server/src/server/middleware.json
+++ b/api-server/src/server/middleware.json
@@ -39,7 +39,10 @@
     "./middlewares/constant-headers": {},
     "./middlewares/csp": {},
     "./middlewares/flash-cheaters": {},
-    "./middlewares/passport-login": {}
+    "./middlewares/passport-login": {},
+    "./middlewares/rate-limit": {
+      "paths": ["/mobile-login"]
+    }
   },
   "files": {},
   "final:after": {
diff --git a/api-server/src/server/middlewares/rate-limit.js b/api-server/src/server/middlewares/rate-limit.js
new file mode 100644
index 00000000000..08f7b8e0d29
--- /dev/null
+++ b/api-server/src/server/middlewares/rate-limit.js
@@ -0,0 +1,19 @@
+import rateLimit from 'express-rate-limit';
+import MongoStore from 'rate-limit-mongo';
+
+const url = process.env.MONGODB || process.env.MONGOHQ_URL;
+
+// Rate limit for mobile login
+// 10 requests per 15 minute windows
+export default function rateLimitMiddleware() {
+  return rateLimit({
+    windowMs: 15 * 60 * 1000,
+    max: 10,
+    standardHeaders: true,
+    legacyHeaders: false,
+    store: new MongoStore({
+      uri: url,
+      expireTimeMs: 15 * 60 * 1000
+    })
+  });
+}
diff --git a/api-server/src/server/middlewares/request-authorization.js b/api-server/src/server/middlewares/request-authorization.js
index b12858222bf..60aedcdb936 100644
--- a/api-server/src/server/middlewares/request-authorization.js
+++ b/api-server/src/server/middlewares/request-authorization.js
@@ -26,6 +26,7 @@ const updateHooksRE = /^\/hooks\/update-paypal$/;
 // note: this would be replaced by webhooks later
 const donateRE = /^\/donate\/charge-stripe$/;
 const submitCoderoadChallengeRE = /^\/coderoad-challenge-completed$/;
+const mobileLoginRE = /^\/mobile-login\/?$/;
 
 const _pathsAllowedREs = [
   authRE,
@@ -41,7 +42,8 @@ const _pathsAllowedREs = [
   unsubscribeRE,
   updateHooksRE,
   donateRE,
-  submitCoderoadChallengeRE
+  submitCoderoadChallengeRE,
+  mobileLoginRE
 ];
 
 export function isAllowedPath(path, pathsAllowedREs = _pathsAllowedREs) {
diff --git a/api-server/src/server/utils/middleware.js b/api-server/src/server/utils/middleware.js
index 52f5551fc85..61144fae64b 100644
--- a/api-server/src/server/utils/middleware.js
+++ b/api-server/src/server/utils/middleware.js
@@ -77,6 +77,20 @@ export function ifUserRedirectTo(status) {
   };
 }
 
+export function ifNotMobileRedirect() {
+  return (req, res, next) => {
+    //
+    // Todo: Use the below check once we have done more research on usage
+    //
+    // const isMobile = /(iPhone|iPad|Android)/.test(req.headers['user-agent']);
+    // if (!isMobile) {
+    //  res.json({ error: 'not from mobile' });
+    // } else {
+    //  next();
+    // }
+    next();
+  };
+}
 // for use with express-validator error formatter
 export const createValidatorErrorHandler =
   (...args) =>
diff --git a/package-lock.json b/package-lock.json
index 6f0f4f68bac..a675d5ace56 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -131,6 +131,7 @@
         "dedent": "0.7.0",
         "dotenv": "6.2.0",
         "express-flash": "0.0.2",
+        "express-rate-limit": "^6.7.0",
         "express-session": "1.17.3",
         "express-validator": "6.14.1",
         "helmet": "3.23.3",
@@ -146,12 +147,14 @@
         "mongodb": "3.6.9",
         "morgan": "1.10.0",
         "nanoid": "3.3.4",
+        "node-fetch": "^2.6.7",
         "nodemailer-ses-transport": "1.5.1",
         "passport": "0.4.1",
         "passport-auth0": "1.4.2",
         "passport-local": "1.0.0",
         "passport-mock-strategy": "2.0.0",
         "query-string": "6.14.0",
+        "rate-limit-mongo": "^2.3.2",
         "rx": "4.1.0",
         "stripe": "8.205.0",
         "uuid": "3.4.0",
@@ -24594,6 +24597,17 @@
       "version": "1.2.0",
       "license": "ISC"
     },
+    "node_modules/express-rate-limit": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-6.7.0.tgz",
+      "integrity": "sha512-vhwIdRoqcYB/72TK3tRZI+0ttS8Ytrk24GfmsxDXK9o9IhHNO5bXRiXQSExPQ4GbaE5tvIS7j1SGrxsuWs+sGA==",
+      "engines": {
+        "node": ">= 12.9.0"
+      },
+      "peerDependencies": {
+        "express": "^4 || ^5"
+      }
+    },
     "node_modules/express-session": {
       "version": "1.17.3",
       "license": "MIT",
@@ -42419,6 +42433,21 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/rate-limit-mongo": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/rate-limit-mongo/-/rate-limit-mongo-2.3.2.tgz",
+      "integrity": "sha512-dLck0j5N/AX9ycVHn5lX9Ti2Wrrwi1LfbXitu/mMBZOo2nC26RgYKJVbcb2mYgb9VMaPI2IwJVzIa2hAQrMaDA==",
+      "dependencies": {
+        "mongodb": "^3.6.7",
+        "twostep": "0.4.2",
+        "underscore": "1.12.1"
+      }
+    },
+    "node_modules/rate-limit-mongo/node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="
+    },
     "node_modules/raw-body": {
       "version": "2.5.1",
       "license": "MIT",
@@ -50191,6 +50220,11 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/twostep": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/twostep/-/twostep-0.4.2.tgz",
+      "integrity": "sha512-O/wdPYk9ey04qcCiw8AQN74DbvLFZLAgnryrNTpV7T/sxB4lcGkCMHynx5xCcA6fCh739ZAqp3HcGhy770X1qA=="
+    },
     "node_modules/type": {
       "version": "1.2.0",
       "license": "ISC"
@@ -55889,6 +55923,7 @@
         "dedent": "0.7.0",
         "dotenv": "6.2.0",
         "express-flash": "0.0.2",
+        "express-rate-limit": "^6.7.0",
         "express-session": "1.17.3",
         "express-validator": "6.14.1",
         "helmet": "3.23.3",
@@ -55905,6 +55940,7 @@
         "mongodb": "3.6.9",
         "morgan": "1.10.0",
         "nanoid": "3.3.4",
+        "node-fetch": "^2.6.7",
         "nodemailer-ses-transport": "1.5.1",
         "nodemon": "2.0.16",
         "passport": "0.4.1",
@@ -55912,6 +55948,7 @@
         "passport-local": "1.0.0",
         "passport-mock-strategy": "2.0.0",
         "query-string": "6.14.0",
+        "rate-limit-mongo": "^2.3.2",
         "rx": "4.1.0",
         "smee-client": "1.2.3",
         "stripe": "8.205.0",
@@ -71687,6 +71724,12 @@
         }
       }
     },
+    "express-rate-limit": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-6.7.0.tgz",
+      "integrity": "sha512-vhwIdRoqcYB/72TK3tRZI+0ttS8Ytrk24GfmsxDXK9o9IhHNO5bXRiXQSExPQ4GbaE5tvIS7j1SGrxsuWs+sGA==",
+      "requires": {}
+    },
     "express-session": {
       "version": "1.17.3",
       "requires": {
@@ -83153,6 +83196,23 @@
     "range-parser": {
       "version": "1.2.1"
     },
+    "rate-limit-mongo": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/rate-limit-mongo/-/rate-limit-mongo-2.3.2.tgz",
+      "integrity": "sha512-dLck0j5N/AX9ycVHn5lX9Ti2Wrrwi1LfbXitu/mMBZOo2nC26RgYKJVbcb2mYgb9VMaPI2IwJVzIa2hAQrMaDA==",
+      "requires": {
+        "mongodb": "^3.6.7",
+        "twostep": "0.4.2",
+        "underscore": "1.12.1"
+      },
+      "dependencies": {
+        "underscore": {
+          "version": "1.12.1",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+          "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="
+        }
+      }
+    },
     "raw-body": {
       "version": "2.5.1",
       "requires": {
@@ -88146,6 +88206,11 @@
       "version": "1.5.0",
       "dev": true
     },
+    "twostep": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/twostep/-/twostep-0.4.2.tgz",
+      "integrity": "sha512-O/wdPYk9ey04qcCiw8AQN74DbvLFZLAgnryrNTpV7T/sxB4lcGkCMHynx5xCcA6fCh739ZAqp3HcGhy770X1qA=="
+    },
     "type": {
       "version": "1.2.0"
     },

From 2b6ac6f7316fb7d12dbb956ef2720b33bb691e7c Mon Sep 17 00:00:00 2001
From: Balaji Sivasakthi <65065614+balaji-sivasakthi@users.noreply.github.com>
Date: Thu, 9 Feb 2023 16:42:47 +0530
Subject: [PATCH 13/52] fix(curriculum): fix bad use of comma in d3 course "add
 a tooltip to a d3 element step" (#49296)

---
 .../data-visualization-with-d3/add-a-tooltip-to-a-d3-element.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/curriculum/challenges/english/04-data-visualization/data-visualization-with-d3/add-a-tooltip-to-a-d3-element.md b/curriculum/challenges/english/04-data-visualization/data-visualization-with-d3/add-a-tooltip-to-a-d3-element.md
index 28ee20400f9..e16937cbff9 100644
--- a/curriculum/challenges/english/04-data-visualization/data-visualization-with-d3/add-a-tooltip-to-a-d3-element.md
+++ b/curriculum/challenges/english/04-data-visualization/data-visualization-with-d3/add-a-tooltip-to-a-d3-element.md
@@ -8,7 +8,7 @@ dashedName: add-a-tooltip-to-a-d3-element
 
 # --description--
 
-A tooltip shows more information about an item on a page when the user hovers over that item. There are several ways to add a tooltip to a visualization, this challenge uses the SVG `title` element.
+A tooltip shows more information about an item on a page when the user hovers over that item. There are several ways to add a tooltip to a visualization. This challenge uses the SVG `title` element.
 
 `title` pairs with the `text()` method to dynamically add data to the bars.
 

From 1ce707bb923d991bae1cbfa7308b275f86280dd4 Mon Sep 17 00:00:00 2001
From: Jeremy L Thompson <jeremy@jeremylt.org>
Date: Thu, 9 Feb 2023 04:45:57 -0700
Subject: [PATCH 14/52] Fix(curriculum) better order of tests for Nutrition
 Step 33 (#49299)

* fix - better order of tests for Nutrition Step 33
---
 .../615f5486b8fd4b71633f69b0.md                    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/curriculum/challenges/english/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f5486b8fd4b71633f69b0.md b/curriculum/challenges/english/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f5486b8fd4b71633f69b0.md
index 78579fdb8b3..deabca353ff 100644
--- a/curriculum/challenges/english/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f5486b8fd4b71633f69b0.md
+++ b/curriculum/challenges/english/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f5486b8fd4b71633f69b0.md
@@ -29,22 +29,22 @@ Your `p` element should come after your `.small-text` element.
 assert(document.querySelector('.small-text')?.nextElementSibling?.localName === 'p');
 ```
 
-Your `p` element should have the text `Calories`.
-
-```js
-assert(document.querySelector('.left-container')?.lastElementChild?.innerText === 'Calories');
-```
-
 Your `span` element should come after your `.left-container` element.
 
 ```js
 assert(document.querySelector('.left-container')?.nextElementSibling?.localName ==='span');
 ```
 
+Your `p` element should have the text `Calories`.
+
+```js
+assert(document.querySelector('.small-text')?.nextElementSibling?.innerText === 'Calories');
+```
+
 Your `span` element should have the text `230`.
 
 ```js
-assert(document.querySelector('.calories-info')?.lastElementChild?.innerText === '230');
+assert(document.querySelector('.left-container')?.nextElementSibling?.innerText === '230');
 ```
 
 # --seed--

From f17a7a266bec964ba1ce89a820752b8eef1ef42f Mon Sep 17 00:00:00 2001
From: camperbot <camperbot@users.noreply.github.com>
Date: Thu, 9 Feb 2023 19:21:09 +0530
Subject: [PATCH 15/52] chore(i18n,client): processed translations (#49307)

---
 client/i18n/locales/arabic/intro.json         | 26 +++++++++++++------
 client/i18n/locales/arabic/translations.json  |  1 -
 .../locales/chinese-traditional/intro.json    | 26 +++++++++++++------
 .../chinese-traditional/translations.json     |  1 -
 client/i18n/locales/chinese/intro.json        | 26 +++++++++++++------
 client/i18n/locales/chinese/translations.json |  1 -
 client/i18n/locales/espanol/intro.json        | 26 +++++++++++++------
 client/i18n/locales/espanol/translations.json |  1 -
 client/i18n/locales/german/intro.json         | 26 +++++++++++++------
 client/i18n/locales/german/translations.json  |  1 -
 client/i18n/locales/italian/intro.json        | 26 +++++++++++++------
 client/i18n/locales/italian/translations.json |  1 -
 client/i18n/locales/japanese/intro.json       | 26 +++++++++++++------
 .../i18n/locales/japanese/translations.json   |  1 -
 client/i18n/locales/portuguese/intro.json     | 26 +++++++++++++------
 .../i18n/locales/portuguese/translations.json |  1 -
 client/i18n/locales/ukrainian/intro.json      | 26 +++++++++++++------
 .../i18n/locales/ukrainian/translations.json  |  1 -
 18 files changed, 162 insertions(+), 81 deletions(-)

diff --git a/client/i18n/locales/arabic/intro.json b/client/i18n/locales/arabic/intro.json
index 7bd66b174b1..10bb7b668ca 100644
--- a/client/i18n/locales/arabic/intro.json
+++ b/client/i18n/locales/arabic/intro.json
@@ -778,14 +778,6 @@
           "<a href='https://rosettacode.org/wiki/Rosetta_Code' target='_blank' rel='noopener noreferrer nofollow'>أسناد: Rosetta Code</a>"
         ]
       },
-      "the-odin-project": {
-        "title": "مشروع أودين",
-        "intro": ["A description is to be determined"]
-      },
-      "the-odin-project-projects": {
-        "title": "The Odin Project Projects",
-        "intro": ["A description is to be determined"]
-      },
       "project-euler": {
         "title": "مشروع Euler",
         "intro": [
@@ -795,6 +787,24 @@
       }
     }
   },
+  "the-odin-project": {
+    "title": "The Odin Project",
+    "intro": [
+      "The Odin Project is one of those \"What I wish I had when I was learning\" resources. ",
+      "Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway.",
+      "This project is designed to fill in the gap for people who are trying to hack it on their own but still want a high quality education."
+    ],
+    "blocks": {
+      "top-learn-html-foundations": {
+        "title": "Learn HTML Foundations",
+        "intro": ["A description is to be determined"]
+      },
+      "top-build-a-recipe-project": {
+        "title": "Learn HTML Foundations by Building a Recipe Page",
+        "intro": ["A description is to be determined"]
+      }
+    }
+  },
   "misc-text": {
     "certification": "شهادة {{cert}}",
     "browse-other": "تصفح الشهادات المجانية الأخرى\n(نوصي بالقيام بها بالترتيب)",
diff --git a/client/i18n/locales/arabic/translations.json b/client/i18n/locales/arabic/translations.json
index a6f2db3f8b3..c8e03f6e144 100644
--- a/client/i18n/locales/arabic/translations.json
+++ b/client/i18n/locales/arabic/translations.json
@@ -302,7 +302,6 @@
       "certs": "شهادة {{title}}"
     },
     "editor-tabs": {
-      "info": "معلومات",
       "code": "الكود",
       "tests": "الاختبارات",
       "restart": "أعد التشغيل",
diff --git a/client/i18n/locales/chinese-traditional/intro.json b/client/i18n/locales/chinese-traditional/intro.json
index 3c4f393dd4b..6ee34449b97 100644
--- a/client/i18n/locales/chinese-traditional/intro.json
+++ b/client/i18n/locales/chinese-traditional/intro.json
@@ -778,14 +778,6 @@
           "<a href='https://rosettacode.org/wiki/Rosetta_Code' target='_blank' rel='noopener noreferrer nofollow'>屬性：Rosetta 代碼</a>"
         ]
       },
-      "the-odin-project": {
-        "title": "The Odin Project",
-        "intro": ["A description is to be determined"]
-      },
-      "the-odin-project-projects": {
-        "title": "The Odin Project Projects",
-        "intro": ["A description is to be determined"]
-      },
       "project-euler": {
         "title": "歐拉計劃",
         "intro": [
@@ -795,6 +787,24 @@
       }
     }
   },
+  "the-odin-project": {
+    "title": "The Odin Project",
+    "intro": [
+      "The Odin Project is one of those \"What I wish I had when I was learning\" resources. ",
+      "Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway.",
+      "This project is designed to fill in the gap for people who are trying to hack it on their own but still want a high quality education."
+    ],
+    "blocks": {
+      "top-learn-html-foundations": {
+        "title": "Learn HTML Foundations",
+        "intro": ["A description is to be determined"]
+      },
+      "top-build-a-recipe-project": {
+        "title": "Learn HTML Foundations by Building a Recipe Page",
+        "intro": ["A description is to be determined"]
+      }
+    }
+  },
   "misc-text": {
     "certification": "{{cert}} 認證",
     "browse-other": "瀏覽我們的其他免費認證\n（我們建議你按順序學習）",
diff --git a/client/i18n/locales/chinese-traditional/translations.json b/client/i18n/locales/chinese-traditional/translations.json
index 0be7fdf3146..cc2d192fe41 100644
--- a/client/i18n/locales/chinese-traditional/translations.json
+++ b/client/i18n/locales/chinese-traditional/translations.json
@@ -302,7 +302,6 @@
       "certs": "{{title}} 認證"
     },
     "editor-tabs": {
-      "info": "信息",
       "code": "編程",
       "tests": "測試",
       "restart": "重啓",
diff --git a/client/i18n/locales/chinese/intro.json b/client/i18n/locales/chinese/intro.json
index fcb1167338d..ce8beea0d5b 100644
--- a/client/i18n/locales/chinese/intro.json
+++ b/client/i18n/locales/chinese/intro.json
@@ -778,14 +778,6 @@
           "<a href='https://rosettacode.org/wiki/Rosetta_Code' target='_blank' rel='noopener noreferrer nofollow'>属性：Rosetta 代码</a>"
         ]
       },
-      "the-odin-project": {
-        "title": "The Odin Project",
-        "intro": ["A description is to be determined"]
-      },
-      "the-odin-project-projects": {
-        "title": "The Odin Project Projects",
-        "intro": ["A description is to be determined"]
-      },
       "project-euler": {
         "title": "欧拉计划",
         "intro": [
@@ -795,6 +787,24 @@
       }
     }
   },
+  "the-odin-project": {
+    "title": "The Odin Project",
+    "intro": [
+      "The Odin Project is one of those \"What I wish I had when I was learning\" resources. ",
+      "Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway.",
+      "This project is designed to fill in the gap for people who are trying to hack it on their own but still want a high quality education."
+    ],
+    "blocks": {
+      "top-learn-html-foundations": {
+        "title": "Learn HTML Foundations",
+        "intro": ["A description is to be determined"]
+      },
+      "top-build-a-recipe-project": {
+        "title": "Learn HTML Foundations by Building a Recipe Page",
+        "intro": ["A description is to be determined"]
+      }
+    }
+  },
   "misc-text": {
     "certification": "{{cert}} 认证",
     "browse-other": "浏览我们的其他免费认证\n（我们建议你按顺序学习）",
diff --git a/client/i18n/locales/chinese/translations.json b/client/i18n/locales/chinese/translations.json
index 2a0ae67e97f..363620e436c 100644
--- a/client/i18n/locales/chinese/translations.json
+++ b/client/i18n/locales/chinese/translations.json
@@ -302,7 +302,6 @@
       "certs": "{{title}} 认证"
     },
     "editor-tabs": {
-      "info": "信息",
       "code": "编程",
       "tests": "测试",
       "restart": "重启",
diff --git a/client/i18n/locales/espanol/intro.json b/client/i18n/locales/espanol/intro.json
index 325a88b33da..6779cf07a7f 100644
--- a/client/i18n/locales/espanol/intro.json
+++ b/client/i18n/locales/espanol/intro.json
@@ -778,14 +778,6 @@
           "<a href='https://rosettacode.org/wiki/Rosetta_Code' target='_blank' rel='noopener noreferrer nofollow'>Atributo: Código Rosetta</a>"
         ]
       },
-      "the-odin-project": {
-        "title": "The Odin Project",
-        "intro": ["A description is to be determined"]
-      },
-      "the-odin-project-projects": {
-        "title": "The Odin Project Projects",
-        "intro": ["A description is to be determined"]
-      },
       "project-euler": {
         "title": "Project Euler",
         "intro": [
@@ -795,6 +787,24 @@
       }
     }
   },
+  "the-odin-project": {
+    "title": "The Odin Project",
+    "intro": [
+      "The Odin Project is one of those \"What I wish I had when I was learning\" resources. ",
+      "Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway.",
+      "This project is designed to fill in the gap for people who are trying to hack it on their own but still want a high quality education."
+    ],
+    "blocks": {
+      "top-learn-html-foundations": {
+        "title": "Learn HTML Foundations",
+        "intro": ["A description is to be determined"]
+      },
+      "top-build-a-recipe-project": {
+        "title": "Learn HTML Foundations by Building a Recipe Page",
+        "intro": ["A description is to be determined"]
+      }
+    }
+  },
   "misc-text": {
     "certification": "Certificación de {{cert}}",
     "browse-other": "Navega por nuestras otras certificaciones gratuitas\n(recomendamos hacerlo en orden)",
diff --git a/client/i18n/locales/espanol/translations.json b/client/i18n/locales/espanol/translations.json
index 969ab8661f6..73a90666766 100644
--- a/client/i18n/locales/espanol/translations.json
+++ b/client/i18n/locales/espanol/translations.json
@@ -302,7 +302,6 @@
       "certs": "Certificación {{title}}"
     },
     "editor-tabs": {
-      "info": "Info",
       "code": "Código",
       "tests": "Pruebas",
       "restart": "Reiniciar",
diff --git a/client/i18n/locales/german/intro.json b/client/i18n/locales/german/intro.json
index 8a6cdac58c2..bfd275257ae 100644
--- a/client/i18n/locales/german/intro.json
+++ b/client/i18n/locales/german/intro.json
@@ -778,14 +778,6 @@
           "<a href='https://rosettacode.org/wiki/Rosetta_Code' target='_blank' rel='noopener noreferrer nofollow'>Attribut: Rosetta Code</a>"
         ]
       },
-      "the-odin-project": {
-        "title": "The Odin Project",
-        "intro": ["A description is to be determined"]
-      },
-      "the-odin-project-projects": {
-        "title": "The Odin Project Projects",
-        "intro": ["A description is to be determined"]
-      },
       "project-euler": {
         "title": "Projekt Euler",
         "intro": [
@@ -795,6 +787,24 @@
       }
     }
   },
+  "the-odin-project": {
+    "title": "The Odin Project",
+    "intro": [
+      "The Odin Project is one of those \"What I wish I had when I was learning\" resources. ",
+      "Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway.",
+      "This project is designed to fill in the gap for people who are trying to hack it on their own but still want a high quality education."
+    ],
+    "blocks": {
+      "top-learn-html-foundations": {
+        "title": "Learn HTML Foundations",
+        "intro": ["A description is to be determined"]
+      },
+      "top-build-a-recipe-project": {
+        "title": "Learn HTML Foundations by Building a Recipe Page",
+        "intro": ["A description is to be determined"]
+      }
+    }
+  },
   "misc-text": {
     "certification": "{{cert}} Zertifikat",
     "browse-other": "Stöbere in unseren anderen kostenlosen Zertifizierungen\n(Wir empfehlen, diese der Reihe nach zu erledigen)",
diff --git a/client/i18n/locales/german/translations.json b/client/i18n/locales/german/translations.json
index 6026281a64f..2d78036c031 100644
--- a/client/i18n/locales/german/translations.json
+++ b/client/i18n/locales/german/translations.json
@@ -302,7 +302,6 @@
       "certs": "{{title}} Zertifizierung"
     },
     "editor-tabs": {
-      "info": "Informationen",
       "code": "Code",
       "tests": "Tests",
       "restart": "Neustart",
diff --git a/client/i18n/locales/italian/intro.json b/client/i18n/locales/italian/intro.json
index b5b1cfa3350..8a5f63f04c5 100644
--- a/client/i18n/locales/italian/intro.json
+++ b/client/i18n/locales/italian/intro.json
@@ -778,14 +778,6 @@
           "<a href='https://rosettacode.org/wiki/Rosetta_Code' target='_blank' rel='noopener noreferrer nofollow'>Fonte: Codice Rosetta</a>"
         ]
       },
-      "the-odin-project": {
-        "title": "The Odin Project",
-        "intro": ["A description is to be determined"]
-      },
-      "the-odin-project-projects": {
-        "title": "The Odin Project Projects",
-        "intro": ["A description is to be determined"]
-      },
       "project-euler": {
         "title": "Progetto Eulero",
         "intro": [
@@ -795,6 +787,24 @@
       }
     }
   },
+  "the-odin-project": {
+    "title": "The Odin Project",
+    "intro": [
+      "The Odin Project is one of those \"What I wish I had when I was learning\" resources. ",
+      "Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway.",
+      "This project is designed to fill in the gap for people who are trying to hack it on their own but still want a high quality education."
+    ],
+    "blocks": {
+      "top-learn-html-foundations": {
+        "title": "Learn HTML Foundations",
+        "intro": ["A description is to be determined"]
+      },
+      "top-build-a-recipe-project": {
+        "title": "Learn HTML Foundations by Building a Recipe Page",
+        "intro": ["A description is to be determined"]
+      }
+    }
+  },
   "misc-text": {
     "certification": "Certificazione {{cert}}",
     "browse-other": "Sfoglia le altre nostre certificazioni gratuite\n(consigliamo di seguirle in ordine)",
diff --git a/client/i18n/locales/italian/translations.json b/client/i18n/locales/italian/translations.json
index 5a582964c31..18007266443 100644
--- a/client/i18n/locales/italian/translations.json
+++ b/client/i18n/locales/italian/translations.json
@@ -302,7 +302,6 @@
       "certs": "Certificazione {{title}}"
     },
     "editor-tabs": {
-      "info": "Informazioni",
       "code": "Codice",
       "tests": "Test",
       "restart": "Inizia da capo",
diff --git a/client/i18n/locales/japanese/intro.json b/client/i18n/locales/japanese/intro.json
index 9af30b573f4..140caa5a7d9 100644
--- a/client/i18n/locales/japanese/intro.json
+++ b/client/i18n/locales/japanese/intro.json
@@ -778,14 +778,6 @@
           "<a href='https://rosettacode.org/wiki/Rosetta_Code' target='_blank' rel='noopener noreferrer nofollow'>作: Rosetta Code</a>"
         ]
       },
-      "the-odin-project": {
-        "title": "The Odin Project",
-        "intro": ["A description is to be determined"]
-      },
-      "the-odin-project-projects": {
-        "title": "The Odin Project Projects",
-        "intro": ["A description is to be determined"]
-      },
       "project-euler": {
         "title": "プロジェクト・オイラー",
         "intro": [
@@ -795,6 +787,24 @@
       }
     }
   },
+  "the-odin-project": {
+    "title": "The Odin Project",
+    "intro": [
+      "The Odin Project is one of those \"What I wish I had when I was learning\" resources. ",
+      "Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway.",
+      "This project is designed to fill in the gap for people who are trying to hack it on their own but still want a high quality education."
+    ],
+    "blocks": {
+      "top-learn-html-foundations": {
+        "title": "Learn HTML Foundations",
+        "intro": ["A description is to be determined"]
+      },
+      "top-build-a-recipe-project": {
+        "title": "Learn HTML Foundations by Building a Recipe Page",
+        "intro": ["A description is to be determined"]
+      }
+    }
+  },
   "misc-text": {
     "certification": "{{cert}} 認定",
     "browse-other": "他の無料の認定講座を閲覧する\n(上から順に受講することをお勧めします)",
diff --git a/client/i18n/locales/japanese/translations.json b/client/i18n/locales/japanese/translations.json
index 778950dbae5..a0aa273780a 100644
--- a/client/i18n/locales/japanese/translations.json
+++ b/client/i18n/locales/japanese/translations.json
@@ -302,7 +302,6 @@
       "certs": "{{title}} 認定講座"
     },
     "editor-tabs": {
-      "info": "詳細",
       "code": "コード",
       "tests": "テスト",
       "restart": "リスタート",
diff --git a/client/i18n/locales/portuguese/intro.json b/client/i18n/locales/portuguese/intro.json
index 230c7ef5be1..ea6ec4d33e3 100644
--- a/client/i18n/locales/portuguese/intro.json
+++ b/client/i18n/locales/portuguese/intro.json
@@ -778,14 +778,6 @@
           "<a href='https://rosettacode.org/wiki/Rosetta_Code' target='_blank' rel='noopener noreferrer nofollow'>Attribute: Rosetta Code</a>"
         ]
       },
-      "the-odin-project": {
-        "title": "The Odin Project",
-        "intro": ["Uma descrição deve ser determinada"]
-      },
-      "the-odin-project-projects": {
-        "title": "Os projetos do The Odin Project",
-        "intro": ["Uma descrição deve ser determinada"]
-      },
       "project-euler": {
         "title": "Projeto Euler",
         "intro": [
@@ -795,6 +787,24 @@
       }
     }
   },
+  "the-odin-project": {
+    "title": "The Odin Project",
+    "intro": [
+      "The Odin Project is one of those \"What I wish I had when I was learning\" resources. ",
+      "Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway.",
+      "This project is designed to fill in the gap for people who are trying to hack it on their own but still want a high quality education."
+    ],
+    "blocks": {
+      "top-learn-html-foundations": {
+        "title": "Learn HTML Foundations",
+        "intro": ["A description is to be determined"]
+      },
+      "top-build-a-recipe-project": {
+        "title": "Learn HTML Foundations by Building a Recipe Page",
+        "intro": ["A description is to be determined"]
+      }
+    }
+  },
   "misc-text": {
     "certification": "Certificação {{cert}}",
     "browse-other": "Navegue por nossas outras certificações gratuitas\n(recomendamos fazer isto em sequência)",
diff --git a/client/i18n/locales/portuguese/translations.json b/client/i18n/locales/portuguese/translations.json
index 1d3aaf2d105..1471ae2b7ad 100644
--- a/client/i18n/locales/portuguese/translations.json
+++ b/client/i18n/locales/portuguese/translations.json
@@ -302,7 +302,6 @@
       "certs": "Certificação {{title}}"
     },
     "editor-tabs": {
-      "info": "Informações",
       "code": "Código",
       "tests": "Testes",
       "restart": "Reiniciar",
diff --git a/client/i18n/locales/ukrainian/intro.json b/client/i18n/locales/ukrainian/intro.json
index 8ebbe1516d3..d6f04eaa4e3 100644
--- a/client/i18n/locales/ukrainian/intro.json
+++ b/client/i18n/locales/ukrainian/intro.json
@@ -778,14 +778,6 @@
           "<a href='https://rosettacode.org/wiki/Rosetta_Code' target='_blank' rel='noopener noreferrer nofollow'>Атрибут: Rosetta Code</a>"
         ]
       },
-      "the-odin-project": {
-        "title": "Проєкт «Odin»",
-        "intro": ["Опис буде надано пізніше"]
-      },
-      "the-odin-project-projects": {
-        "title": "Проєкти «Odin»",
-        "intro": ["Опис буде надано пізніше"]
-      },
       "project-euler": {
         "title": "Проєкт «Ейлер»",
         "intro": [
@@ -795,6 +787,24 @@
       }
     }
   },
+  "the-odin-project": {
+    "title": "The Odin Project",
+    "intro": [
+      "The Odin Project is one of those \"What I wish I had when I was learning\" resources. ",
+      "Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway.",
+      "This project is designed to fill in the gap for people who are trying to hack it on their own but still want a high quality education."
+    ],
+    "blocks": {
+      "top-learn-html-foundations": {
+        "title": "Learn HTML Foundations",
+        "intro": ["A description is to be determined"]
+      },
+      "top-build-a-recipe-project": {
+        "title": "Learn HTML Foundations by Building a Recipe Page",
+        "intro": ["A description is to be determined"]
+      }
+    }
+  },
   "misc-text": {
     "certification": "Сертифікація «{{cert}}»",
     "browse-other": "Перегляньте інші безоплатні сертифікації\n(ми рекомендуємо виконувати їх послідовно)",
diff --git a/client/i18n/locales/ukrainian/translations.json b/client/i18n/locales/ukrainian/translations.json
index 8f33c528b3c..4bb4a7e7e92 100644
--- a/client/i18n/locales/ukrainian/translations.json
+++ b/client/i18n/locales/ukrainian/translations.json
@@ -302,7 +302,6 @@
       "certs": "Сертифікація «{{title}}»"
     },
     "editor-tabs": {
-      "info": "Інформація",
       "code": "Код",
       "tests": "Тести",
       "restart": "Перезапустити",

From 77c8809b00324f13f00733b16fdce6031692c4bd Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <muhammed@freecodecamp.org>
Date: Thu, 9 Feb 2023 21:37:22 +0200
Subject: [PATCH 16/52] refactor(client): cleanup honesty policy section
 (#49003)

Co-authored-by: Bruce B <bbsmooth@gmail.com>
Co-authored-by: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Co-authored-by: sidemt <25644062+sidemt@users.noreply.github.com>
Co-authored-by: Mrugesh Mohapatra <hi@mrugesh.dev>
Co-authored-by: Quincy Larson <QuincyLarson@users.noreply.github.com>
---
 client/i18n/locales/english/translations.json |  6 ++--
 .../__snapshots__/Honesty.test.tsx.snap       | 16 ++++-----
 client/src/components/settings/honesty.css    | 16 ++++++---
 client/src/components/settings/honesty.tsx    | 34 +++++++------------
 client/src/resources/honesty-policy.tsx       |  2 +-
 .../e2e/default/settings/certifications.ts    |  8 ++---
 cypress/support/commands.ts                   |  2 +-
 7 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/client/i18n/locales/english/translations.json b/client/i18n/locales/english/translations.json
index ce97b267a1f..9ce112fd71e 100644
--- a/client/i18n/locales/english/translations.json
+++ b/client/i18n/locales/english/translations.json
@@ -15,8 +15,8 @@
     "show-cert": "Show Certification",
     "claim-cert": "Claim Certification",
     "save-progress": "Save Progress",
-    "accepted-honesty": "You have accepted our Academic Honesty Policy.",
-    "agree": "Agree",
+    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
+    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
     "save-portfolio": "Save this portfolio item",
     "remove-portfolio": "Remove this portfolio item",
     "add-portfolio": "Add a new portfolio Item",
@@ -517,7 +517,7 @@
     "opens-new-window": "Opens in new window"
   },
   "flash": {
-    "honest-first": "To claim a certification, you must first accept our academic honesty policy",
+    "honest-first": "To claim a certification, you must first agree to our academic honesty policy",
     "really-weird": "Something really weird happened, if it happens again, please consider raising an issue on https://github.com/freeCodeCamp/freeCodeCamp/issues/new",
     "not-right": "Something is not quite right. A report has been generated and the freeCodeCamp.org team have been notified",
     "went-wrong": "Something went wrong, please check and try again",
diff --git a/client/src/components/settings/__snapshots__/Honesty.test.tsx.snap b/client/src/components/settings/__snapshots__/Honesty.test.tsx.snap
index 9e6d5accbde..86dcb3e0089 100644
--- a/client/src/components/settings/__snapshots__/Honesty.test.tsx.snap
+++ b/client/src/components/settings/__snapshots__/Honesty.test.tsx.snap
@@ -2,7 +2,6 @@
 
 exports[`<Honesty /> <Honesty /> snapshot when isHonest is false: Honesty 1`] = `
 <section
-  className="honesty-policy"
   id="honesty-policy"
 >
   <SectionHeader>
@@ -14,16 +13,16 @@ exports[`<Honesty /> <Honesty /> snapshot when isHonest is false: Honesty 1`] =
     >
       <HonestyPolicy />
     </Uncontrolled(Panel)>
-    <br />
     <Button
       active={false}
+      aria-disabled={false}
       block={true}
       bsClass="btn"
       bsStyle="primary"
       disabled={false}
       onClick={[Function]}
     >
-      buttons.agree
+      buttons.agree-honesty
     </Button>
   </FullWidthRow>
 </section>
@@ -31,7 +30,6 @@ exports[`<Honesty /> <Honesty /> snapshot when isHonest is false: Honesty 1`] =
 
 exports[`<Honesty /> <Honesty /> snapshot when isHonest is true: HonestyAccepted 1`] = `
 <section
-  className="honesty-policy"
   id="honesty-policy"
 >
   <SectionHeader>
@@ -43,18 +41,16 @@ exports[`<Honesty /> <Honesty /> snapshot when isHonest is true: HonestyAccepted
     >
       <HonestyPolicy />
     </Uncontrolled(Panel)>
-    <br />
     <Button
       active={false}
+      aria-disabled={true}
       block={true}
       bsClass="btn"
       bsStyle="primary"
-      className="disabled-agreed"
-      disabled={true}
+      disabled={false}
+      onClick={[Function]}
     >
-      <p>
-        buttons.accepted-honesty
-      </p>
+      buttons.accepted-honesty
     </Button>
   </FullWidthRow>
 </section>
diff --git a/client/src/components/settings/honesty.css b/client/src/components/settings/honesty.css
index 4eab7d1efad..979df5c6c86 100644
--- a/client/src/components/settings/honesty.css
+++ b/client/src/components/settings/honesty.css
@@ -1,3 +1,14 @@
+#honesty-policy
+  :is(
+    button[aria-disabled='true'],
+    button[aria-disabled='true']:is(:focus, :hover)
+  ) {
+  background-color: var(--quaternary-background);
+  color: var(--secondary-color);
+  opacity: 0.65;
+  cursor: not-allowed;
+}
+
 .honesty-panel p {
   margin-inline: 10px;
   font-family: 'Lato', sans-serif;
@@ -7,11 +18,6 @@
   padding-top: 15px;
 }
 
-.honesty-policy .disabled-agreed p {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
 .honesty-panel .btn-invert {
   color: var(--primary-background);
 }
diff --git a/client/src/components/settings/honesty.tsx b/client/src/components/settings/honesty.tsx
index c8db8c62c9d..b8c54e31d96 100644
--- a/client/src/components/settings/honesty.tsx
+++ b/client/src/components/settings/honesty.tsx
@@ -15,33 +15,25 @@ type HonestyProps = {
 
 const Honesty = ({ isHonest, updateIsHonest }: HonestyProps): JSX.Element => {
   const { t } = useTranslation();
-  const button = isHonest ? (
-    <Button
-      block={true}
-      bsStyle='primary'
-      className='disabled-agreed'
-      disabled={true}
-    >
-      <p>{t('buttons.accepted-honesty')}</p>
-    </Button>
-  ) : (
-    <Button
-      block={true}
-      bsStyle='primary'
-      onClick={() => updateIsHonest({ isHonest: true })}
-    >
-      {t('buttons.agree')}
-    </Button>
-  );
+  const buttonText = isHonest
+    ? t('buttons.accepted-honesty')
+    : t('buttons.agree-honesty');
+
   return (
-    <section className='honesty-policy' id='honesty-policy'>
+    <section id='honesty-policy'>
       <SectionHeader>{t('settings.headings.honesty')}</SectionHeader>
       <FullWidthRow>
         <Panel className='honesty-panel'>
           <HonestyPolicy />
         </Panel>
-        <br />
-        {button}
+        <Button
+          block={true}
+          bsStyle='primary'
+          aria-disabled={isHonest}
+          onClick={() => !isHonest && updateIsHonest({ isHonest: true })}
+        >
+          {buttonText}
+        </Button>
       </FullWidthRow>
     </section>
   );
diff --git a/client/src/resources/honesty-policy.tsx b/client/src/resources/honesty-policy.tsx
index dea6b82c460..2a3a3f489ed 100644
--- a/client/src/resources/honesty-policy.tsx
+++ b/client/src/resources/honesty-policy.tsx
@@ -3,7 +3,7 @@ import { Trans, useTranslation } from 'react-i18next';
 
 const HonestyPolicy = (): JSX.Element => {
   const { t } = useTranslation();
-  const email = 'team@freecodecamp.org';
+  const email = 'support@freecodecamp.org';
 
   return (
     <>
diff --git a/cypress/e2e/default/settings/certifications.ts b/cypress/e2e/default/settings/certifications.ts
index ad242e24f09..02611708b68 100644
--- a/cypress/e2e/default/settings/certifications.ts
+++ b/cypress/e2e/default/settings/certifications.ts
@@ -13,10 +13,10 @@ describe('Settings certifications area', () => {
         expect($btns).to.have.length(16);
       });
       cy.findByText('Show Certification').should('not.exist');
-      cy.contains('Agree');
+      cy.contains(`I agree to freeCodeCamp's Academic Honesty Policy.`);
       cy.contains('Claim Certification').click();
       cy.contains(
-        'To claim a certification, you must first accept our academic honesty policy'
+        'To claim a certification, you must first agree to our academic honesty policy'
       );
     });
   });
@@ -29,8 +29,8 @@ describe('Settings certifications area', () => {
 
     it('Should update the user as they try to claim their certifications', () => {
       cy.visit('/settings');
-      cy.contains('Agree').click();
-      cy.contains('You have accepted our Academic Honesty Policy.');
+      cy.contains(`I agree to freeCodeCamp's Academic Honesty Policy.`).click();
+      cy.contains('You have agreed to our Academic Honesty Policy.');
       cy.contains('Claim Certification').click();
       cy.contains(
         'It looks like you have not completed the necessary steps. Please complete the required projects to claim the Responsive Web Design Certification'
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 8087b69f2c7..e1121adf333 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -21,7 +21,7 @@ const setPrivacyTogglesToPublic = () => {
     });
   cy.get('[data-cy=save-privacy-settings]').click();
   cy.get('#honesty-policy').find('button').click();
-  cy.contains('You have accepted our Academic Honesty Policy');
+  cy.contains('You have agreed to our Academic Honesty Policy');
 };
 
 const goToSettings = () => {

From eff2166262bdc6c49b25bf6817912264c78bf957 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Date: Fri, 10 Feb 2023 17:34:17 +0530
Subject: [PATCH 17/52] chore: rename redux actions (#49320)

---
 client/gatsby-browser.js                               |  2 +-
 client/gatsby-ssr.js                                   |  2 +-
 client/src/components/Intro/intro.test.tsx             |  2 +-
 client/src/components/app-mount-notifier.test.tsx      |  2 +-
 .../components/profile/components/time-line.test.tsx   |  2 +-
 .../profile/components/timeline-buttons.test.js        |  2 +-
 client/src/components/settings/certification.test.tsx  |  2 +-
 client/src/redux/{cookieValues.js => cookie-values.js} |  0
 client/src/redux/{createStore.js => create-store.js}   | 10 +++++-----
 client/src/redux/fetch-user-saga.js                    |  2 +-
 client/src/redux/{rootEpic.js => root-epic.js}         |  2 +-
 client/src/redux/{rootReducer.js => root-reducer.js}   |  2 +-
 client/src/redux/{rootSaga.js => root-saga.js}         |  2 +-
 client/utils/gatsby/layout-selector.test.tsx           |  2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)
 rename client/src/redux/{cookieValues.js => cookie-values.js} (100%)
 rename client/src/redux/{createStore.js => create-store.js} (86%)
 rename client/src/redux/{rootEpic.js => root-epic.js} (84%)
 rename client/src/redux/{rootReducer.js => root-reducer.js} (95%)
 rename client/src/redux/{rootSaga.js => root-saga.js} (89%)

diff --git a/client/gatsby-browser.js b/client/gatsby-browser.js
index 513cc8d8a55..f93c9c10a26 100644
--- a/client/gatsby-browser.js
+++ b/client/gatsby-browser.js
@@ -6,7 +6,7 @@ import { Provider } from 'react-redux';
 
 import i18n from './i18n/config';
 import AppMountNotifier from './src/components/app-mount-notifier';
-import { createStore } from './src/redux/createStore';
+import { createStore } from './src/redux/create-store';
 import layoutSelector from './utils/gatsby/layout-selector';
 import GrowthBookProvider from './src/components/growth-book/growth-book-wrapper';
 
diff --git a/client/gatsby-ssr.js b/client/gatsby-ssr.js
index e7995a365d0..c0f6e4237c6 100644
--- a/client/gatsby-ssr.js
+++ b/client/gatsby-ssr.js
@@ -4,7 +4,7 @@ import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';
 
 import i18n from './i18n/config';
-import { createStore } from './src/redux/createStore';
+import { createStore } from './src/redux/create-store';
 import layoutSelector from './utils/gatsby/layout-selector';
 import { getheadTagComponents, getPostBodyComponents } from './utils/tags';
 import GrowthBookProvider from './src/components/growth-book/growth-book-wrapper';
diff --git a/client/src/components/Intro/intro.test.tsx b/client/src/components/Intro/intro.test.tsx
index d1000de9fa0..61a55fe76f0 100644
--- a/client/src/components/Intro/intro.test.tsx
+++ b/client/src/components/Intro/intro.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 import renderer from 'react-test-renderer';
-import { createStore } from '../../redux/createStore';
+import { createStore } from '../../redux/create-store';
 
 import Intro from '.';
 
diff --git a/client/src/components/app-mount-notifier.test.tsx b/client/src/components/app-mount-notifier.test.tsx
index 94121daba6c..215d99c94c0 100644
--- a/client/src/components/app-mount-notifier.test.tsx
+++ b/client/src/components/app-mount-notifier.test.tsx
@@ -5,7 +5,7 @@ import { Provider } from 'react-redux';
 
 import { i18nextCodes } from '../../../config/i18n';
 import i18nTestConfig from '../../i18n/config-for-tests';
-import { createStore } from '../redux/createStore';
+import { createStore } from '../redux/create-store';
 import AppMountNotifier from './app-mount-notifier';
 
 jest.unmock('react-i18next');
diff --git a/client/src/components/profile/components/time-line.test.tsx b/client/src/components/profile/components/time-line.test.tsx
index 5d0dd9a1da1..2fb3e4c8669 100644
--- a/client/src/components/profile/components/time-line.test.tsx
+++ b/client/src/components/profile/components/time-line.test.tsx
@@ -4,7 +4,7 @@ import { useStaticQuery } from 'gatsby';
 import React from 'react';
 
 import { render, screen } from '../../../../utils/test-utils';
-import { createStore } from '../../../redux/createStore';
+import { createStore } from '../../../redux/create-store';
 import TimeLine from './time-line';
 
 const store = createStore();
diff --git a/client/src/components/profile/components/timeline-buttons.test.js b/client/src/components/profile/components/timeline-buttons.test.js
index 33337e2aa7b..6a4b619bb1b 100644
--- a/client/src/components/profile/components/timeline-buttons.test.js
+++ b/client/src/components/profile/components/timeline-buttons.test.js
@@ -3,7 +3,7 @@ import React from 'react';
 import renderer from 'react-test-renderer';
 import { Provider } from 'react-redux';
 
-import { createStore } from '../../../redux/createStore';
+import { createStore } from '../../../redux/create-store';
 import completedChallenges from '../../../__mocks__/completed-challenges.json';
 import Timeline from './time-line';
 
diff --git a/client/src/components/settings/certification.test.tsx b/client/src/components/settings/certification.test.tsx
index 195b64dd920..2c6e033ace1 100644
--- a/client/src/components/settings/certification.test.tsx
+++ b/client/src/components/settings/certification.test.tsx
@@ -2,7 +2,7 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { Provider } from 'react-redux';
-import { createStore } from '../../redux/createStore';
+import { createStore } from '../../redux/create-store';
 
 import { CertificationSettings } from './certification';
 
diff --git a/client/src/redux/cookieValues.js b/client/src/redux/cookie-values.js
similarity index 100%
rename from client/src/redux/cookieValues.js
rename to client/src/redux/cookie-values.js
diff --git a/client/src/redux/createStore.js b/client/src/redux/create-store.js
similarity index 86%
rename from client/src/redux/createStore.js
rename to client/src/redux/create-store.js
index 75e19ea5017..93918f35dea 100644
--- a/client/src/redux/createStore.js
+++ b/client/src/redux/create-store.js
@@ -5,9 +5,9 @@ import createSagaMiddleware from 'redux-saga';
 
 import envData from '../../../config/env.json';
 import { isBrowser } from '../../utils';
-import rootEpic from './rootEpic';
-import rootReducer from './rootReducer';
-import rootSaga from './rootSaga';
+import rootEpic from './root-epic';
+import rootReducer from './root-reducer';
+import rootSaga from './root-saga';
 
 const { environment } = envData;
 
@@ -47,8 +47,8 @@ export const createStore = () => {
   epicMiddleware.run(rootEpic);
   if (module.hot) {
     // Enable Webpack hot module replacement for reducers
-    module.hot.accept('./rootReducer', () => {
-      const nextRootReducer = require('./rootReducer');
+    module.hot.accept('./root-reducer', () => {
+      const nextRootReducer = require('./root-reducer');
       store.replaceReducer(nextRootReducer);
     });
   }
diff --git a/client/src/redux/fetch-user-saga.js b/client/src/redux/fetch-user-saga.js
index 20b4d65ddae..826cccc0697 100644
--- a/client/src/redux/fetch-user-saga.js
+++ b/client/src/redux/fetch-user-saga.js
@@ -7,7 +7,7 @@ import {
   fetchUserComplete,
   fetchUserError
 } from './actions';
-import { jwt } from './cookieValues';
+import { jwt } from './cookie-values';
 
 function* fetchSessionUser() {
   if (!jwt) {
diff --git a/client/src/redux/rootEpic.js b/client/src/redux/root-epic.js
similarity index 84%
rename from client/src/redux/rootEpic.js
rename to client/src/redux/root-epic.js
index dd956348596..81a0a6d7712 100644
--- a/client/src/redux/rootEpic.js
+++ b/client/src/redux/root-epic.js
@@ -1,7 +1,7 @@
 import { combineEpics } from 'redux-observable';
 
 import { epics as challengeEpics } from '../templates/Challenges/redux';
-import { epics as appEpics } from './';
+import { epics as appEpics } from '.';
 
 const rootEpic = combineEpics(...appEpics, ...challengeEpics);
 
diff --git a/client/src/redux/rootReducer.js b/client/src/redux/root-reducer.js
similarity index 95%
rename from client/src/redux/rootReducer.js
rename to client/src/redux/root-reducer.js
index 6c20a0672dd..056083926f1 100644
--- a/client/src/redux/rootReducer.js
+++ b/client/src/redux/root-reducer.js
@@ -16,7 +16,7 @@ import {
 import { ns as appNameSpace } from './action-types';
 import { ns as settingsNameSpace, reducer as settings } from './settings';
 import { FlashApp as flashNameSpace } from './types';
-import { reducer as app } from './';
+import { reducer as app } from '.';
 
 export default combineReducers({
   [appNameSpace]: app,
diff --git a/client/src/redux/rootSaga.js b/client/src/redux/root-saga.js
similarity index 89%
rename from client/src/redux/rootSaga.js
rename to client/src/redux/root-saga.js
index ec83d4a5b6e..f2d293bebd3 100644
--- a/client/src/redux/rootSaga.js
+++ b/client/src/redux/root-saga.js
@@ -3,7 +3,7 @@ import { all } from 'redux-saga/effects';
 import { sagas as challengeSagas } from '../templates/Challenges/redux';
 import errorSagas from './error-saga';
 import { sagas as settingsSagas } from './settings';
-import { sagas as appSagas } from './';
+import { sagas as appSagas } from '.';
 
 export default function* rootSaga() {
   yield all([...errorSagas, ...appSagas, ...challengeSagas, ...settingsSagas]);
diff --git a/client/utils/gatsby/layout-selector.test.tsx b/client/utils/gatsby/layout-selector.test.tsx
index ac769f44d1a..f56a25a68fb 100644
--- a/client/utils/gatsby/layout-selector.test.tsx
+++ b/client/utils/gatsby/layout-selector.test.tsx
@@ -6,7 +6,7 @@ import ShallowRenderer from 'react-test-renderer/shallow';
 import FourOhFourPage from '../../src/pages/404';
 import Certification from '../../src/pages/certification';
 import Learn from '../../src/pages/learn';
-import { createStore } from '../../src/redux/createStore';
+import { createStore } from '../../src/redux/create-store';
 import layoutSelector from './layout-selector';
 
 jest.mock('../../src/analytics');

From 96a5699c39c9671b36269d2b22e608f7130748ba Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Date: Fri, 10 Feb 2023 18:41:16 +0530
Subject: [PATCH 18/52] chore: rename icons (#49319)

---
 client/src/assets/icons/{API-icon.tsx => api.tsx}  |  0
 .../{certification-icon.tsx => certification.tsx}  |  0
 client/src/assets/icons/{D3-icon.tsx => d3.tsx}    |  0
 .../icons/{Database-icon.tsx => database.tsx}      |  0
 .../{FreeCodeCamp-logo.tsx => freecodecamp.tsx}    |  0
 client/src/assets/icons/index.tsx                  | 14 +++++++-------
 .../icons/{inputReset.tsx => input-reset.tsx}      |  0
 .../icons/{JavaScript-icon.tsx => javascript.tsx}  |  0
 .../assets/icons/{Magnifier.tsx => magnifier.tsx}  |  0
 .../assets/icons/{python-icon.tsx => python.tsx}   |  0
 .../src/assets/icons/{React-icon.tsx => react.tsx} |  0
 .../icons/{Tensorflow-icon.tsx => tensorflow.tsx}  |  0
 .../src/client-only-routes/show-certification.tsx  |  2 +-
 .../src/components/Header/components/nav-logo.tsx  |  2 +-
 .../components/profile/components/time-line.tsx    |  2 +-
 .../search/searchBar/search-bar-optimized.tsx      |  4 ++--
 16 files changed, 12 insertions(+), 12 deletions(-)
 rename client/src/assets/icons/{API-icon.tsx => api.tsx} (100%)
 rename client/src/assets/icons/{certification-icon.tsx => certification.tsx} (100%)
 rename client/src/assets/icons/{D3-icon.tsx => d3.tsx} (100%)
 rename client/src/assets/icons/{Database-icon.tsx => database.tsx} (100%)
 rename client/src/assets/icons/{FreeCodeCamp-logo.tsx => freecodecamp.tsx} (100%)
 rename client/src/assets/icons/{inputReset.tsx => input-reset.tsx} (100%)
 rename client/src/assets/icons/{JavaScript-icon.tsx => javascript.tsx} (100%)
 rename client/src/assets/icons/{Magnifier.tsx => magnifier.tsx} (100%)
 rename client/src/assets/icons/{python-icon.tsx => python.tsx} (100%)
 rename client/src/assets/icons/{React-icon.tsx => react.tsx} (100%)
 rename client/src/assets/icons/{Tensorflow-icon.tsx => tensorflow.tsx} (100%)

diff --git a/client/src/assets/icons/API-icon.tsx b/client/src/assets/icons/api.tsx
similarity index 100%
rename from client/src/assets/icons/API-icon.tsx
rename to client/src/assets/icons/api.tsx
diff --git a/client/src/assets/icons/certification-icon.tsx b/client/src/assets/icons/certification.tsx
similarity index 100%
rename from client/src/assets/icons/certification-icon.tsx
rename to client/src/assets/icons/certification.tsx
diff --git a/client/src/assets/icons/D3-icon.tsx b/client/src/assets/icons/d3.tsx
similarity index 100%
rename from client/src/assets/icons/D3-icon.tsx
rename to client/src/assets/icons/d3.tsx
diff --git a/client/src/assets/icons/Database-icon.tsx b/client/src/assets/icons/database.tsx
similarity index 100%
rename from client/src/assets/icons/Database-icon.tsx
rename to client/src/assets/icons/database.tsx
diff --git a/client/src/assets/icons/FreeCodeCamp-logo.tsx b/client/src/assets/icons/freecodecamp.tsx
similarity index 100%
rename from client/src/assets/icons/FreeCodeCamp-logo.tsx
rename to client/src/assets/icons/freecodecamp.tsx
diff --git a/client/src/assets/icons/index.tsx b/client/src/assets/icons/index.tsx
index ae851d8eeb7..839f2090965 100644
--- a/client/src/assets/icons/index.tsx
+++ b/client/src/assets/icons/index.tsx
@@ -1,15 +1,15 @@
 import React from 'react';
 import { SuperBlocks } from '../../../../config/certification-settings';
-import APIIcon from './API-icon';
-import D3Icon from './D3-icon';
-import DatabaseIcon from './Database-icon';
-import JavaScriptIcon from './JavaScript-icon';
-import ReactIcon from './React-icon';
-import TensorflowIcon from './Tensorflow-icon';
+import APIIcon from './api';
+import D3Icon from './d3';
+import DatabaseIcon from './database';
+import JavaScriptIcon from './javascript';
+import ReactIcon from './react';
+import TensorflowIcon from './tensorflow';
 import Algorithm from './algorithm';
 import Analytics from './analytics';
 import Clipboard from './clipboard';
-import PythonIcon from './python-icon';
+import PythonIcon from './python';
 import ResponsiveDesign from './responsive-design';
 import Shield from './shield';
 import VikingHelmet from './viking-helmet';
diff --git a/client/src/assets/icons/inputReset.tsx b/client/src/assets/icons/input-reset.tsx
similarity index 100%
rename from client/src/assets/icons/inputReset.tsx
rename to client/src/assets/icons/input-reset.tsx
diff --git a/client/src/assets/icons/JavaScript-icon.tsx b/client/src/assets/icons/javascript.tsx
similarity index 100%
rename from client/src/assets/icons/JavaScript-icon.tsx
rename to client/src/assets/icons/javascript.tsx
diff --git a/client/src/assets/icons/Magnifier.tsx b/client/src/assets/icons/magnifier.tsx
similarity index 100%
rename from client/src/assets/icons/Magnifier.tsx
rename to client/src/assets/icons/magnifier.tsx
diff --git a/client/src/assets/icons/python-icon.tsx b/client/src/assets/icons/python.tsx
similarity index 100%
rename from client/src/assets/icons/python-icon.tsx
rename to client/src/assets/icons/python.tsx
diff --git a/client/src/assets/icons/React-icon.tsx b/client/src/assets/icons/react.tsx
similarity index 100%
rename from client/src/assets/icons/React-icon.tsx
rename to client/src/assets/icons/react.tsx
diff --git a/client/src/assets/icons/Tensorflow-icon.tsx b/client/src/assets/icons/tensorflow.tsx
similarity index 100%
rename from client/src/assets/icons/Tensorflow-icon.tsx
rename to client/src/assets/icons/tensorflow.tsx
diff --git a/client/src/client-only-routes/show-certification.tsx b/client/src/client-only-routes/show-certification.tsx
index 6ac89c242ed..6edff2f96a5 100644
--- a/client/src/client-only-routes/show-certification.tsx
+++ b/client/src/client-only-routes/show-certification.tsx
@@ -9,7 +9,7 @@ import { createSelector } from 'reselect';
 
 import envData from '../../../config/env.json';
 import { getLangCode } from '../../../config/i18n';
-import FreeCodeCampLogo from '../assets/icons/FreeCodeCamp-logo';
+import FreeCodeCampLogo from '../assets/icons/freecodecamp';
 import DonateForm from '../components/Donation/donate-form';
 
 import { createFlashMessage } from '../components/Flash/redux';
diff --git a/client/src/components/Header/components/nav-logo.tsx b/client/src/components/Header/components/nav-logo.tsx
index 94111b149c7..393b8f32df0 100644
--- a/client/src/components/Header/components/nav-logo.tsx
+++ b/client/src/components/Header/components/nav-logo.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import FreeCodeCampLogo from '../../../assets/icons/FreeCodeCamp-logo';
+import FreeCodeCampLogo from '../../../assets/icons/freecodecamp';
 
 const NavLogo = (): JSX.Element => {
   const { t } = useTranslation();
diff --git a/client/src/components/profile/components/time-line.tsx b/client/src/components/profile/components/time-line.tsx
index b9c19a0d426..38f65146227 100644
--- a/client/src/components/profile/components/time-line.tsx
+++ b/client/src/components/profile/components/time-line.tsx
@@ -14,7 +14,7 @@ import {
   getTitleFromId
 } from '../../../../../utils';
 import { regeneratePathAndHistory } from '../../../../../utils/polyvinyl';
-import CertificationIcon from '../../../assets/icons/certification-icon';
+import CertificationIcon from '../../../assets/icons/certification';
 import { CompletedChallenge } from '../../../redux/prop-types';
 import ProjectPreviewModal from '../../../templates/Challenges/components/project-preview-modal';
 import { openModal } from '../../../templates/Challenges/redux/actions';
diff --git a/client/src/components/search/searchBar/search-bar-optimized.tsx b/client/src/components/search/searchBar/search-bar-optimized.tsx
index b7464973424..68be861c940 100644
--- a/client/src/components/search/searchBar/search-bar-optimized.tsx
+++ b/client/src/components/search/searchBar/search-bar-optimized.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
-import Magnifier from '../../../assets/icons/Magnifier';
-import InputReset from '../../../assets/icons/inputReset';
+import Magnifier from '../../../assets/icons/magnifier';
+import InputReset from '../../../assets/icons/input-reset';
 import { searchPageUrl } from '../../../utils/algolia-locale-setup';
 
 type Props = {

From 0f4fd9d57b6465b3299ceb5e6f8f6d92910d2839 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Date: Fri, 10 Feb 2023 18:42:02 +0530
Subject: [PATCH 19/52] chore: rename mockfiles in jest config (#49318)

---
 client/src/__mocks__/{fileMock.ts => file-mock.ts}   | 0
 client/src/__mocks__/{styleMock.ts => style-mock.ts} | 0
 jest.config.js                                       | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename client/src/__mocks__/{fileMock.ts => file-mock.ts} (100%)
 rename client/src/__mocks__/{styleMock.ts => style-mock.ts} (100%)

diff --git a/client/src/__mocks__/fileMock.ts b/client/src/__mocks__/file-mock.ts
similarity index 100%
rename from client/src/__mocks__/fileMock.ts
rename to client/src/__mocks__/file-mock.ts
diff --git a/client/src/__mocks__/styleMock.ts b/client/src/__mocks__/style-mock.ts
similarity index 100%
rename from client/src/__mocks__/styleMock.ts
rename to client/src/__mocks__/style-mock.ts
diff --git a/jest.config.js b/jest.config.js
index 20a49f14a3e..84689f41854 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -2,11 +2,11 @@ module.exports = {
   testPathIgnorePatterns: ['/node_modules/'],
   moduleNameMapper: {
     '\\.(jpg|jpeg|png|svg|woff|woff2)$':
-      '<rootDir>/client/src/__mocks__/fileMock.ts',
+      '<rootDir>/client/src/__mocks__/file-mock.ts',
     // Plain CSS - match css files that don't end with
     // '.module.css' https://regex101.com/r/VzwrKH/4
     '^(?!.*\\.module\\.css$).*\\.css$':
-      '<rootDir>/client/src/__mocks__/styleMock.ts',
+      '<rootDir>/client/src/__mocks__/style-mock.ts',
     // CSS Modules - match files that end with 'module.css'
     '\\.module\\.css$': 'identity-obj-proxy',
     '^lodash-es$': 'lodash'

From ffc97f15d1ea3c3f956ef745ff4377ed7de41cf6 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Date: Fri, 10 Feb 2023 18:43:54 +0530
Subject: [PATCH 20/52] fix(api): update mobile-auth ratelimit config (#49194)

* fix(api): use proper name for collection

* fix(api): use the x-forwarded-for ip address
---
 api-server/src/server/middlewares/rate-limit.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/api-server/src/server/middlewares/rate-limit.js b/api-server/src/server/middlewares/rate-limit.js
index 08f7b8e0d29..b461039a12c 100644
--- a/api-server/src/server/middlewares/rate-limit.js
+++ b/api-server/src/server/middlewares/rate-limit.js
@@ -11,7 +11,11 @@ export default function rateLimitMiddleware() {
     max: 10,
     standardHeaders: true,
     legacyHeaders: false,
+    keyGenerator: req => {
+      return req.headers['x-forwarded-for'] || 'localhost';
+    },
     store: new MongoStore({
+      collectionName: 'UserRateLimit',
       uri: url,
       expireTimeMs: 15 * 60 * 1000
     })

From 6e53c852de3f2ce2b6fd6117c1903d4c3d41368b Mon Sep 17 00:00:00 2001
From: Ahmad Abdolsaheb <ahmad.abdolsaheb@gmail.com>
Date: Fri, 10 Feb 2023 16:16:11 +0300
Subject: [PATCH 21/52] feat(client): pull percentage challenge data from redux
 (#49308)

* feat(client): pull percentage challenge data from redux

* Apply suggestions from code review

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
Co-authored-by: Tom <20648924+moT01@users.noreply.github.com>

* feat: update updateAllChallengesInfo name

---------

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
Co-authored-by: Tom <20648924+moT01@users.noreply.github.com>
---
 client/src/components/layouts/default.tsx     | 63 +++++++++++++++++--
 client/src/redux/action-types.js              |  1 +
 client/src/redux/actions.js                   |  4 ++
 client/src/redux/index.js                     |  9 ++-
 client/src/redux/prop-types.ts                | 13 ++++
 client/src/redux/selectors.js                 |  2 +
 .../components/completion-modal.tsx           | 62 ++++--------------
 7 files changed, 99 insertions(+), 55 deletions(-)

diff --git a/client/src/components/layouts/default.tsx b/client/src/components/layouts/default.tsx
index ad865472aec..a86eae022a8 100644
--- a/client/src/components/layouts/default.tsx
+++ b/client/src/components/layouts/default.tsx
@@ -4,6 +4,7 @@ import { TFunction, withTranslation } from 'react-i18next';
 import { connect } from 'react-redux';
 import { bindActionCreators, Dispatch } from 'redux';
 import { createSelector } from 'reselect';
+import { useStaticQuery, graphql } from 'gatsby';
 
 import latoBoldURL from '../../../static/fonts/lato/Lato-Bold.woff';
 import latoLightURL from '../../../static/fonts/lato/Lato-Light.woff';
@@ -16,7 +17,8 @@ import { isBrowser } from '../../../utils';
 import {
   fetchUser,
   onlineStatusChange,
-  serverStatusChange
+  serverStatusChange,
+  updateAllChallengesInfo
 } from '../../redux/actions';
 import {
   isSignedInSelector,
@@ -26,7 +28,12 @@ import {
   userFetchStateSelector
 } from '../../redux/selectors';
 
-import { UserFetchState, User } from '../../redux/prop-types';
+import {
+  UserFetchState,
+  User,
+  AllChallengeNode,
+  CertificateNode
+} from '../../redux/prop-types';
 import BreadCrumb from '../../templates/Challenges/components/bread-crumb';
 import Flash from '../Flash';
 import { flashMessageSelector, removeFlashMessage } from '../Flash/redux';
@@ -77,7 +84,8 @@ const mapDispatchToProps = (dispatch: Dispatch) =>
       fetchUser,
       removeFlashMessage,
       onlineStatusChange,
-      serverStatusChange
+      serverStatusChange,
+      updateAllChallengesInfo
     },
     dispatch
   );
@@ -117,10 +125,13 @@ function DefaultLayout({
   t,
   theme = Themes.Default,
   user,
-  fetchUser
+  fetchUser,
+  updateAllChallengesInfo
 }: DefaultLayoutProps): JSX.Element {
+  const { challengeEdges, certificateNodes } = useGetAllBlockIds();
   useEffect(() => {
     // componentDidMount
+    updateAllChallengesInfo({ challengeEdges, certificateNodes });
     if (!isSignedIn) {
       fetchUser();
     }
@@ -237,6 +248,50 @@ function DefaultLayout({
   }
 }
 
+// TODO: get challenge nodes directly rather than wrapped in edges
+const useGetAllBlockIds = () => {
+  const {
+    allChallengeNode: { edges: challengeEdges },
+    allCertificateNode: { nodes: certificateNodes }
+  }: {
+    allChallengeNode: AllChallengeNode;
+    allCertificateNode: { nodes: CertificateNode[] };
+  } = useStaticQuery(graphql`
+    query getBlockNode {
+      allChallengeNode(
+        sort: {
+          fields: [
+            challenge___superOrder
+            challenge___order
+            challenge___challengeOrder
+          ]
+        }
+      ) {
+        edges {
+          node {
+            challenge {
+              block
+              id
+            }
+          }
+        }
+      }
+      allCertificateNode {
+        nodes {
+          challenge {
+            certification
+            tests {
+              id
+            }
+          }
+        }
+      }
+    }
+  `);
+
+  return { challengeEdges, certificateNodes };
+};
+
 DefaultLayout.displayName = 'DefaultLayout';
 
 export default connect(
diff --git a/client/src/redux/action-types.js b/client/src/redux/action-types.js
index 7aa77c37257..c4c3e7b12c5 100644
--- a/client/src/redux/action-types.js
+++ b/client/src/redux/action-types.js
@@ -27,6 +27,7 @@ export const actionTypes = createTypes(
     'updateDonationFormState',
     'updateUserToken',
     'postChargeProcessing',
+    'updateAllChallengesInfo',
     ...createAsyncTypes('fetchUser'),
     ...createAsyncTypes('postCharge'),
     ...createAsyncTypes('fetchProfileForUser'),
diff --git a/client/src/redux/actions.js b/client/src/redux/actions.js
index 43c1d3923b9..38608a046bc 100644
--- a/client/src/redux/actions.js
+++ b/client/src/redux/actions.js
@@ -53,6 +53,10 @@ export const fetchUser = createAction(actionTypes.fetchUser);
 export const fetchUserComplete = createAction(actionTypes.fetchUserComplete);
 export const fetchUserError = createAction(actionTypes.fetchUserError);
 
+export const updateAllChallengesInfo = createAction(
+  actionTypes.updateAllChallengesInfo
+);
+
 export const postCharge = createAction(actionTypes.postCharge);
 export const postChargeProcessing = createAction(
   actionTypes.postChargeProcessing
diff --git a/client/src/redux/index.js b/client/src/redux/index.js
index 9dbaf84a81e..a6328ee5980 100644
--- a/client/src/redux/index.js
+++ b/client/src/redux/index.js
@@ -56,6 +56,10 @@ const initialState = {
   userFetchState: {
     ...defaultFetchState
   },
+  allChallengesInfo: {
+    challengeEdges: [],
+    certificateNodes: []
+  },
   userProfileFetchState: {
     ...defaultFetchState
   },
@@ -153,7 +157,10 @@ export const reducer = handleActions(
       ...state,
       donationFormState: { ...defaultDonationFormState, error: payload }
     }),
-
+    [actionTypes.updateAllChallengesInfo]: (state, { payload }) => ({
+      ...state,
+      allChallengesInfo: { ...payload }
+    }),
     [actionTypes.fetchUser]: state => ({
       ...state,
       userFetchState: { ...defaultFetchState }
diff --git a/client/src/redux/prop-types.ts b/client/src/redux/prop-types.ts
index e7444fcb018..062b201a3eb 100644
--- a/client/src/redux/prop-types.ts
+++ b/client/src/redux/prop-types.ts
@@ -142,6 +142,19 @@ export type ChallengeNode = {
   };
 };
 
+export type CertificateNode = {
+  challenge: {
+    // TODO: use enum
+    certification: string;
+    tests: { id: string }[];
+  };
+};
+
+export type AllChallengesInfo = {
+  challengeEdges: { node: ChallengeNode }[];
+  certificateNodes: CertificateNode[];
+};
+
 export type AllChallengeNode = {
   edges: [
     {
diff --git a/client/src/redux/selectors.js b/client/src/redux/selectors.js
index 9faca5b8eab..eb6c71697c5 100644
--- a/client/src/redux/selectors.js
+++ b/client/src/redux/selectors.js
@@ -202,6 +202,8 @@ export const certificatesByNameSelector = username => state => {
 };
 
 export const userFetchStateSelector = state => state[MainApp].userFetchState;
+export const allChallengesInfoSelector = state =>
+  state[MainApp].allChallengesInfo;
 export const userProfileFetchStateSelector = state =>
   state[MainApp].userProfileFetchState;
 export const usernameSelector = state => state[MainApp].appUsername;
diff --git a/client/src/templates/Challenges/components/completion-modal.tsx b/client/src/templates/Challenges/components/completion-modal.tsx
index 95e64be8f98..de8c7076b8c 100644
--- a/client/src/templates/Challenges/components/completion-modal.tsx
+++ b/client/src/templates/Challenges/components/completion-modal.tsx
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 import { Button, Modal } from '@freecodecamp/react-bootstrap';
-import { useStaticQuery, graphql } from 'gatsby';
 import { noop } from 'lodash-es';
 import React, { Component } from 'react';
 import { TFunction, withTranslation } from 'react-i18next';
@@ -13,8 +12,11 @@ import { dasherize } from '../../../../../utils/slugs';
 import { isFinalProject } from '../../../../utils/challenge-types';
 import Login from '../../../components/Header/components/Login';
 import { executeGA, allowBlockDonationRequests } from '../../../redux/actions';
-import { isSignedInSelector } from '../../../redux/selectors';
-import { AllChallengeNode, ChallengeFiles } from '../../../redux/prop-types';
+import {
+  isSignedInSelector,
+  allChallengesInfoSelector
+} from '../../../redux/selectors';
+import { AllChallengesInfo, ChallengeFiles } from '../../../redux/prop-types';
 
 import { closeModal, submitChallenge } from '../redux/actions';
 import {
@@ -34,6 +36,7 @@ const mapStateToProps = createSelector(
   completedChallengesIds,
   isCompletionModalOpenSelector,
   isSignedInSelector,
+  allChallengesInfoSelector,
   successMessageSelector,
   (
     challengeFiles: ChallengeFiles,
@@ -45,6 +48,7 @@ const mapStateToProps = createSelector(
     completedChallengesIds: string[],
     isOpen: boolean,
     isSignedIn: boolean,
+    allChallengesInfo: AllChallengesInfo,
     message: string
   ) => ({
     challengeFiles,
@@ -54,6 +58,7 @@ const mapStateToProps = createSelector(
     completedChallengesIds,
     isOpen,
     isSignedIn,
+    allChallengesInfo,
     message
   })
 );
@@ -118,6 +123,7 @@ interface CompletionModalsProps {
   id: string;
   isOpen: boolean;
   isSignedIn: boolean;
+  allChallengesInfo: AllChallengesInfo;
   message: string;
   submitChallenge: () => void;
   superBlock: string;
@@ -324,58 +330,13 @@ interface Options {
   isFinalProjectBlock: boolean;
 }
 
-interface CertificateNode {
-  challenge: {
-    // TODO: use enum
-    certification: string;
-    tests: { id: string }[];
-  };
-}
-
 const useCurrentBlockIds = (
+  allChallengesInfo: AllChallengesInfo,
   block: string,
   certification: string,
   options?: Options
 ) => {
-  const {
-    allChallengeNode: { edges: challengeEdges },
-    allCertificateNode: { nodes: certificateNodes }
-  }: {
-    allChallengeNode: AllChallengeNode;
-    allCertificateNode: { nodes: CertificateNode[] };
-  } = useStaticQuery(graphql`
-    query getCurrentBlockNodes {
-      allChallengeNode(
-        sort: {
-          fields: [
-            challenge___superOrder
-            challenge___order
-            challenge___challengeOrder
-          ]
-        }
-      ) {
-        edges {
-          node {
-            challenge {
-              block
-              id
-            }
-          }
-        }
-      }
-      allCertificateNode {
-        nodes {
-          challenge {
-            certification
-            tests {
-              id
-            }
-          }
-        }
-      }
-    }
-  `);
-
+  const { challengeEdges, certificateNodes } = allChallengesInfo;
   const currentCertificateIds = certificateNodes
     .filter(
       node => dasherize(node.challenge.certification) === certification
@@ -390,6 +351,7 @@ const useCurrentBlockIds = (
 
 const CompletionModal = (props: CompletionModalsProps) => {
   const currentBlockIds = useCurrentBlockIds(
+    props.allChallengesInfo,
     props.block || '',
     props.certification || '',
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call

From 47ffd20f74cebe779308a1f8d526c1b074e92590 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <muhammed@freecodecamp.org>
Date: Fri, 10 Feb 2023 15:24:23 +0200
Subject: [PATCH 22/52] fix(client): add type to warn misuse of attributes in
 formControl (#48696)

* feat: add type to warn miss usage of attributes in formControl

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

* refactor the value type

Co-authored-by: sembauke <semboot699@gmail.com>

* add condition type for readyonly and onchange types

* warn when using readonly and onchange props together

Co-authored-by: Ahmad Abdolsaheb <ahmad.abdolsaheb@gmail.com>

* allow value to be undefined

* Make read-only undefined

Co-authored-by: Ahmad Abdolsaheb <ahmad.abdolsaheb@gmail.com>

---------

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
Co-authored-by: sembauke <semboot699@gmail.com>
Co-authored-by: Ahmad Abdolsaheb <ahmad.abdolsaheb@gmail.com>
---
 tools/ui-components/src/form-control/types.ts | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/tools/ui-components/src/form-control/types.ts b/tools/ui-components/src/form-control/types.ts
index d26f2c1b1d6..41c77d5d169 100644
--- a/tools/ui-components/src/form-control/types.ts
+++ b/tools/ui-components/src/form-control/types.ts
@@ -2,20 +2,34 @@ import React from 'react';
 
 export type FormControlElement = HTMLInputElement | HTMLTextAreaElement;
 
-export interface FormControlProps
-  extends React.HTMLAttributes<FormControlElement> {
+type ChangibleValues =
+  | {
+      value?: never;
+      onChange?: never;
+      readonly?: never;
+    }
+  | {
+      value: string;
+      onChange?: never;
+      readonly: boolean;
+    }
+  | {
+      value: string;
+      onChange: (event: React.ChangeEvent<FormControlElement>) => void;
+      readonly?: never;
+    };
+
+export type FormControlProps = React.HTMLAttributes<FormControlElement> & {
   className?: string;
   id?: string;
   testId?: string;
-  onChange?: React.ChangeEventHandler<FormControlElement>;
-  value?: string;
   componentClass?: typeof React.Component;
   placeholder?: string;
   name?: string;
   required?: boolean;
   rows?: number;
   type?: 'text' | 'email' | 'url';
-}
+} & ChangibleValues;
 
 export interface FormControlVariationProps {
   className?: string;

From 8a66f2967dae5e68073d41d7f1eed9217e6cb47b Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Date: Fri, 10 Feb 2023 21:51:43 +0530
Subject: [PATCH 23/52] chore: rename curriculum tooling (#49333)

---
 curriculum/test/test-challenges.js                            | 4 ++--
 .../test/utils/{challengeTitles.js => challenge-titles.js}    | 0
 curriculum/test/utils/{mongoIds.js => mongo-ids.js}           | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename curriculum/test/utils/{challengeTitles.js => challenge-titles.js} (100%)
 rename curriculum/test/utils/{mongoIds.js => mongo-ids.js} (100%)

diff --git a/curriculum/test/test-challenges.js b/curriculum/test/test-challenges.js
index 115e0915170..65eb5aa005b 100644
--- a/curriculum/test/test-challenges.js
+++ b/curriculum/test/test-challenges.js
@@ -44,8 +44,8 @@ const { getLines } = require('../../utils/get-lines');
 const { getChallengesForLang, getMetaForBlock } = require('../getChallenges');
 const { challengeSchemaValidator } = require('../schema/challengeSchema');
 const { testedLang, getSuperOrder } = require('../utils');
-const ChallengeTitles = require('./utils/challengeTitles');
-const MongoIds = require('./utils/mongoIds');
+const ChallengeTitles = require('./utils/challenge-titles');
+const MongoIds = require('./utils/mongo-ids');
 const createPseudoWorker = require('./utils/pseudo-worker');
 
 const { sortChallenges } = require('./utils/sort-challenges');
diff --git a/curriculum/test/utils/challengeTitles.js b/curriculum/test/utils/challenge-titles.js
similarity index 100%
rename from curriculum/test/utils/challengeTitles.js
rename to curriculum/test/utils/challenge-titles.js
diff --git a/curriculum/test/utils/mongoIds.js b/curriculum/test/utils/mongo-ids.js
similarity index 100%
rename from curriculum/test/utils/mongoIds.js
rename to curriculum/test/utils/mongo-ids.js

From 63762164d5870d618a7e41dac713f635c0fb704d Mon Sep 17 00:00:00 2001
From: a2937 <a.rcottrill521@gmail.com>
Date: Fri, 10 Feb 2023 11:47:39 -0500
Subject: [PATCH 24/52] chore: migrate navigation bar tests to TypeScript
 (#49215)

* Chore: Rename navbar

* Remove error suppressors

* Fix the prototype issue

* Experiment with listeners

* Fix the arguments problem.

* Remove anti-pattern loader.

* Fix: Properly wait for the page to load.
---
 .../default/learn/common-components/navbar.js | 115 ------------------
 .../default/learn/common-components/navbar.ts |  91 ++++++++++++++
 2 files changed, 91 insertions(+), 115 deletions(-)
 delete mode 100644 cypress/e2e/default/learn/common-components/navbar.js
 create mode 100644 cypress/e2e/default/learn/common-components/navbar.ts

diff --git a/cypress/e2e/default/learn/common-components/navbar.js b/cypress/e2e/default/learn/common-components/navbar.js
deleted file mode 100644
index 928cc7ee714..00000000000
--- a/cypress/e2e/default/learn/common-components/navbar.js
+++ /dev/null
@@ -1,115 +0,0 @@
-const selectors = {
-  heading: "[data-test-label='landing-header']",
-  smallCallToAction: "[data-test-label='landing-small-cta']",
-  navigationLinks: '.nav-list',
-  avatarContainer: '.avatar-container',
-  defaultAvatar: '.avatar-container',
-  menuButton: '.toggle-button-nav',
-  avatarImage: '.avatar-container .avatar'
-};
-
-let appHasStarted;
-function spyOnListener(win) {
-  const addListener = win.EventTarget.prototype.addEventListener;
-  win.EventTarget.prototype.addEventListener = function (name) {
-    if (name === 'click') {
-      appHasStarted = true;
-      win.EventTarget.prototype.addEventListener = addListener;
-    }
-    return addListener.apply(this, arguments);
-  };
-}
-
-function waitForAppStart() {
-  return new Promise(resolve => {
-    const isReady = () => {
-      if (appHasStarted) {
-        return resolve();
-      }
-      return setTimeout(isReady, 0);
-    };
-    isReady();
-  });
-}
-
-describe('Navbar when logged out', () => {
-  beforeEach(() => {
-    appHasStarted = false;
-    cy.visit('/', {
-      onBeforeLoad: spyOnListener
-    }).then(waitForAppStart);
-    cy.viewport(1300, 660);
-  });
-
-  it('Should have a "Sign in" button', () => {
-    cy.contains("[data-test-label='landing-small-cta']", 'Sign in');
-  });
-
-  it(
-    'Should have `Sign in` link on landing and learn pages' +
-      ' when not signed in',
-    () => {
-      cy.contains(selectors.smallCallToAction, 'Sign in');
-      cy.get(selectors.menuButton).click();
-      cy.get(selectors.navigationLinks).contains('Curriculum').click();
-      cy.contains(selectors.smallCallToAction, 'Sign in');
-    }
-  );
-});
-
-describe('Navbar Logged in', () => {
-  beforeEach(() => {
-    cy.login();
-    appHasStarted = false;
-    cy.visit('/', {
-      onBeforeLoad: spyOnListener
-    }).then(waitForAppStart);
-    cy.viewport(1300, 660);
-  });
-
-  it('Should render properly', () => {
-    cy.get('#universal-nav').should('be.visible');
-    cy.get('#universal-nav').should('have.class', 'universal-nav');
-  });
-
-  it(
-    'Should take user to learn page when clicked on ' + 'the freeCodeCamp logo',
-    () => {
-      cy.get('.universal-nav-middle').within(() => {
-        cy.get('svg').click();
-      });
-      cy.url().should('include', '/learn');
-    }
-  );
-
-  // have the curriculum and CTA on landing and /learn pages.
-  it(
-    'Should have `Radio`, `Forum`, and `Curriculum` links on landing and learn pages' +
-      'page when not signed in',
-    () => {
-      cy.get(selectors.menuButton).click();
-      cy.get(selectors.navigationLinks).contains('Forum');
-      cy.get(selectors.navigationLinks).contains('Curriculum').click();
-      cy.url().should('include', '/learn');
-      cy.get(selectors.navigationLinks).contains('Curriculum');
-      cy.get(selectors.navigationLinks).contains('Forum');
-      cy.get(selectors.navigationLinks).contains('Radio');
-    }
-  );
-
-  it('Should have `Profile` link when user is signed in', () => {
-    cy.get(selectors.menuButton).click();
-    cy.get(selectors.navigationLinks).contains('Profile').click();
-    cy.url().should('include', '/developmentuser');
-  });
-
-  it('Should have a profile image with class `default-border`', () => {
-    cy.get(selectors.avatarContainer).should('have.class', 'default-border');
-    cy.get(selectors.defaultAvatar).should('exist');
-  });
-
-  it('Should have a profile image with dimensions that are <= 31px', () => {
-    cy.get(selectors.avatarImage).invoke('width').should('lte', 31);
-    cy.get(selectors.avatarImage).invoke('height').should('lte', 31);
-  });
-});
diff --git a/cypress/e2e/default/learn/common-components/navbar.ts b/cypress/e2e/default/learn/common-components/navbar.ts
new file mode 100644
index 00000000000..9072b7960b0
--- /dev/null
+++ b/cypress/e2e/default/learn/common-components/navbar.ts
@@ -0,0 +1,91 @@
+const navBarselectors = {
+  heading: "[data-test-label='landing-header']",
+  smallCallToAction: "[data-test-label='landing-small-cta']",
+  navigationLinks: '.nav-list',
+  avatarContainer: '.avatar-container',
+  defaultAvatar: '.avatar-container',
+  menuButton: '.toggle-button-nav',
+  avatarImage: '.avatar-container .avatar'
+};
+
+describe('Navbar when logged out', () => {
+  beforeEach(() => {
+    cy.visit('/');
+    cy.viewport(1200, 660);
+    cy.contains('Learn to code — for free.').should('exist');
+  });
+
+  it('Should have a "Sign in" button', () => {
+    cy.contains("[data-test-label='landing-small-cta']", 'Sign in');
+  });
+
+  it(
+    'Should have `Sign in` link on landing and learn pages' +
+      ' when not signed in',
+    () => {
+      cy.contains(navBarselectors.smallCallToAction, 'Sign in');
+      cy.get(navBarselectors.menuButton).click();
+      cy.get(navBarselectors.navigationLinks).contains('Curriculum').click();
+      cy.contains(navBarselectors.smallCallToAction, 'Sign in');
+    }
+  );
+});
+
+describe('Navbar Logged in', () => {
+  beforeEach(() => {
+    cy.visit('/');
+    cy.viewport(1200, 660);
+    cy.contains('Learn to code — for free.')
+      .should('exist')
+      .then(() => cy.login());
+  });
+
+  it('Should render properly', () => {
+    cy.get('#universal-nav').should('be.visible');
+    cy.get('#universal-nav').should('have.class', 'universal-nav');
+  });
+
+  it(
+    'Should take user to learn page when clicked on ' + 'the freeCodeCamp logo',
+    () => {
+      cy.get('.universal-nav-middle').within(() => {
+        cy.get('svg').click();
+      });
+      cy.url().should('include', '/learn');
+    }
+  );
+
+  // have the curriculum and CTA on landing and /learn pages.
+  it(
+    'Should have `Radio`, `Forum`, and `Curriculum` links on landing and learn pages' +
+      'page when not signed in',
+    () => {
+      cy.get(navBarselectors.menuButton).click();
+      cy.get(navBarselectors.navigationLinks).contains('Forum');
+      cy.get(navBarselectors.navigationLinks).contains('Curriculum').click();
+      cy.url().should('include', '/learn');
+      cy.get(navBarselectors.navigationLinks).contains('Curriculum');
+      cy.get(navBarselectors.navigationLinks).contains('Forum');
+      cy.get(navBarselectors.navigationLinks).contains('Radio');
+    }
+  );
+
+  it('Should have `Profile` link when user is signed in', () => {
+    cy.get(navBarselectors.menuButton).click();
+    cy.get(navBarselectors.navigationLinks).contains('Profile').click();
+    cy.url().should('include', '/developmentuser');
+  });
+
+  it('Should have a profile image with class `default-border`', () => {
+    cy.get(navBarselectors.avatarContainer).should(
+      'have.class',
+      'default-border'
+    );
+    cy.get(navBarselectors.defaultAvatar).should('exist');
+  });
+
+  it('Should have a profile image with dimensions that are <= 31px', () => {
+    cy.get(navBarselectors.avatarImage).invoke('width').should('lte', 31);
+    cy.get(navBarselectors.avatarImage).invoke('height').should('lte', 31);
+  });
+});

From a1ebe6dcd66ec3b6ed7e8f8b16d8f6fcab0354ee Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <muhammed@freecodecamp.org>
Date: Fri, 10 Feb 2023 19:13:27 +0200
Subject: [PATCH 25/52] refactor(client): turn image validation component into
 subComponent (#49155)

* refactor(client): clean extra FormGroup component in personal info

* Revert "refactor(client): clean extra FormGroup component in personal info"

This reverts commit cc29df30339e623a5c673f42aab467116702d1a4.

* refactor show image component into JSX

* Remove redundant text

Co-authored-by: moT01 <20648924+moT01@users.noreply.github.com>

---------

Co-authored-by: moT01 <20648924+moT01@users.noreply.github.com>
---
 client/src/components/settings/about.tsx | 40 ++++++++++++------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/client/src/components/settings/about.tsx b/client/src/components/settings/about.tsx
index 4b3f1aa8d16..ab8f1b96dfa 100644
--- a/client/src/components/settings/about.tsx
+++ b/client/src/components/settings/about.tsx
@@ -48,6 +48,18 @@ type AboutState = {
   isPictureUrlValid: boolean;
 };
 
+const ShowImageValidationWarning = ({
+  alertContent
+}: {
+  alertContent: string;
+}) => {
+  return (
+    <HelpBlock>
+      <Alert bsStyle='info'>{alertContent}</Alert>
+    </HelpBlock>
+  );
+};
+
 class AboutSettings extends Component<AboutProps, AboutState> {
   validationImage: HTMLImageElement;
   static displayName: string;
@@ -79,7 +91,6 @@ class AboutSettings extends Component<AboutProps, AboutState> {
       picture === formValues.picture &&
       about === formValues.about
     ) {
-      // eslint-disable-next-line react/no-did-update-set-state
       return this.setState({
         originalValues: {
           name,
@@ -170,21 +181,6 @@ class AboutSettings extends Component<AboutProps, AboutState> {
     }));
   };
 
-  showImageValidationWarning = () => {
-    const { t } = this.props;
-    if (this.state.isPictureUrlValid === false) {
-      return (
-        <HelpBlock>
-          <Alert bsStyle='info' closeLabel={t('buttons.close')}>
-            {t('validation.url-not-image')}
-          </Alert>
-        </HelpBlock>
-      );
-    } else {
-      return true;
-    }
-  };
-
   handleAboutChange = (e: React.FormEvent<HTMLInputElement>) => {
     const value = (e.target as HTMLInputElement).value.slice(0);
     return this.setState(state => ({
@@ -210,9 +206,9 @@ class AboutSettings extends Component<AboutProps, AboutState> {
       toggleKeyboardShortcuts
     } = this.props;
     return (
-      <div className='about-settings'>
+      <>
         <UsernameSettings username={username} />
-        <br />
+        <Spacer />
         <SectionHeader>{t('settings.headings.personal-info')}</SectionHeader>
         <FullWidthRow>
           <form id='camper-identity' onSubmit={this.handleSubmit}>
@@ -246,7 +242,11 @@ class AboutSettings extends Component<AboutProps, AboutState> {
                   type='url'
                   value={picture}
                 />
-                {this.showImageValidationWarning()}
+                {!this.state.isPictureUrlValid && (
+                  <ShowImageValidationWarning
+                    alertContent={t('validation.url-not-image')}
+                  />
+                )}
               </FormGroup>
               <FormGroup controlId='about-about'>
                 <ControlLabel>
@@ -279,7 +279,7 @@ class AboutSettings extends Component<AboutProps, AboutState> {
             toggleKeyboardShortcuts={toggleKeyboardShortcuts}
           />
         </FullWidthRow>
-      </div>
+      </>
     );
   }
 }

From 17bca17c1c7be86b1b2711443115a71ea5329f84 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Date: Fri, 10 Feb 2023 22:44:29 +0530
Subject: [PATCH 26/52] chore: rename e2e tests (#49332)

---
 .../e2e/default/{ShowCertification.js => show-certification.js}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename cypress/e2e/default/{ShowCertification.js => show-certification.js} (100%)

diff --git a/cypress/e2e/default/ShowCertification.js b/cypress/e2e/default/show-certification.js
similarity index 100%
rename from cypress/e2e/default/ShowCertification.js
rename to cypress/e2e/default/show-certification.js

From c12f7ad623841c38e68ed85a99f0c01afa0a4a94 Mon Sep 17 00:00:00 2001
From: camperbot <camperbot@users.noreply.github.com>
Date: Sat, 11 Feb 2023 02:47:31 +0530
Subject: [PATCH 27/52] chore(i18n,client): processed translations (#49325)

---
 client/i18n/locales/arabic/translations.json     |  6 +++---
 .../chinese-traditional/translations.json        |  6 +++---
 client/i18n/locales/chinese/translations.json    |  6 +++---
 client/i18n/locales/espanol/translations.json    |  6 +++---
 client/i18n/locales/german/translations.json     |  6 +++---
 client/i18n/locales/italian/translations.json    |  6 +++---
 client/i18n/locales/japanese/translations.json   |  6 +++---
 client/i18n/locales/portuguese/intro.json        | 14 +++++++-------
 client/i18n/locales/portuguese/translations.json |  6 +++---
 client/i18n/locales/ukrainian/intro.json         | 16 ++++++++--------
 client/i18n/locales/ukrainian/translations.json  |  6 +++---
 11 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/client/i18n/locales/arabic/translations.json b/client/i18n/locales/arabic/translations.json
index c8e03f6e144..05161c547e8 100644
--- a/client/i18n/locales/arabic/translations.json
+++ b/client/i18n/locales/arabic/translations.json
@@ -15,8 +15,8 @@
     "show-cert": "عرض الشهادة",
     "claim-cert": "المطالبة بالشهادة",
     "save-progress": "حفظ التقدم",
-    "accepted-honesty": "لقد قبلت سياسة الصدق الأكاديمي الخاصة بنا.",
-    "agree": "موافق",
+    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
+    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
     "save-portfolio": "حفظ عنصر الحافظة هذا",
     "remove-portfolio": "إزالة عنصر الحافظة هذا",
     "add-portfolio": "إضافة عنصر حافظة جديد",
@@ -517,7 +517,7 @@
     "opens-new-window": "فتح في نافذة جديدة"
   },
   "flash": {
-    "honest-first": "للمطالبة بشهادة ، يجب عليك أولاً قبول سياسة الصدق الأكاديمي الخاصة بنا",
+    "honest-first": "To claim a certification, you must first agree to our academic honesty policy",
     "really-weird": "حدث شيء غريب حقاً، إذا حدث مرة أخرى، يرجى النظر في الإبلاغ عنها على https://github.com/freeCodeCamp/freeCodeCamp/issues/new",
     "not-right": "يبدو ان هناك خطأ ما. لقد تم إنشاء تقرير وتم إخطار فريق freeCodeCamp.org",
     "went-wrong": "حدث خطأ ما، الرجاء التحقق والمحاولة مرة أخرى",
diff --git a/client/i18n/locales/chinese-traditional/translations.json b/client/i18n/locales/chinese-traditional/translations.json
index cc2d192fe41..4489ee6239e 100644
--- a/client/i18n/locales/chinese-traditional/translations.json
+++ b/client/i18n/locales/chinese-traditional/translations.json
@@ -15,8 +15,8 @@
     "show-cert": "顯示認證",
     "claim-cert": "申請認證",
     "save-progress": "保存進度",
-    "accepted-honesty": "你已接受我們的《學術誠信條例》",
-    "agree": "同意",
+    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
+    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
     "save-portfolio": "保存這個作品集項目",
     "remove-portfolio": "移除這個作品集項目",
     "add-portfolio": "增加一個新的作品集項目",
@@ -517,7 +517,7 @@
     "opens-new-window": "Opens in new window"
   },
   "flash": {
-    "honest-first": "申請認證之前，你必須先接受我們的《學術誠信條例》",
+    "honest-first": "To claim a certification, you must first agree to our academic honesty policy",
     "really-weird": "出現了一些奇怪的情況。如果再出現這種情況，請考慮在 https://github.com/freeCodeCamp/freeCodeCamp/issues/new 提交 issue。",
     "not-right": "有些不對勁。已生成報告，通知 freeCodeCamp.org 團隊。",
     "went-wrong": "出了點問題，請檢查並重試。",
diff --git a/client/i18n/locales/chinese/translations.json b/client/i18n/locales/chinese/translations.json
index 363620e436c..8d7625d6a4c 100644
--- a/client/i18n/locales/chinese/translations.json
+++ b/client/i18n/locales/chinese/translations.json
@@ -15,8 +15,8 @@
     "show-cert": "显示认证",
     "claim-cert": "申请认证",
     "save-progress": "保存进度",
-    "accepted-honesty": "你已接受我们的《学术诚信条例》",
-    "agree": "同意",
+    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
+    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
     "save-portfolio": "保存这个作品集项目",
     "remove-portfolio": "移除这个作品集项目",
     "add-portfolio": "增加一个新的作品集项目",
@@ -517,7 +517,7 @@
     "opens-new-window": "Opens in new window"
   },
   "flash": {
-    "honest-first": "申请认证之前，你必须先接受我们的《学术诚信条例》",
+    "honest-first": "To claim a certification, you must first agree to our academic honesty policy",
     "really-weird": "出现了一些奇怪的情况。如果再出现这种情况，请考虑在 https://github.com/freeCodeCamp/freeCodeCamp/issues/new 提交 issue。",
     "not-right": "有些不对劲。已生成报告，通知 freeCodeCamp.org 团队。",
     "went-wrong": "出了点问题，请检查并重试。",
diff --git a/client/i18n/locales/espanol/translations.json b/client/i18n/locales/espanol/translations.json
index 73a90666766..6565ee368f9 100644
--- a/client/i18n/locales/espanol/translations.json
+++ b/client/i18n/locales/espanol/translations.json
@@ -15,8 +15,8 @@
     "show-cert": "Mostrar certificación",
     "claim-cert": "Solicitar certificación",
     "save-progress": "Guardar progreso",
-    "accepted-honesty": "Has aceptado nuestra Política de Honestidad Académica.",
-    "agree": "Aceptar",
+    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
+    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
     "save-portfolio": "Guardar este elemento de portafolio",
     "remove-portfolio": "Eliminar este elemento de portafolio",
     "add-portfolio": "Agregar un nuevo elemento de portafolio",
@@ -517,7 +517,7 @@
     "opens-new-window": "Opens in new window"
   },
   "flash": {
-    "honest-first": "Para reclamar una certificación, primero debes aceptar nuestra política de honestidad académica.",
+    "honest-first": "To claim a certification, you must first agree to our academic honesty policy",
     "really-weird": "Sucedió algo realmente extraño. Si vuelve a ocurrir, considera hacer un reporte del problema en https://github.com/freeCodeCamp/freeCodeCamp/issues/new",
     "not-right": "Algo no está bien. Se ha generado un informe y se ha notificado al equipo de freeCodeCamp.org",
     "went-wrong": "Algo salió mal, verifica e intenta nuevamente",
diff --git a/client/i18n/locales/german/translations.json b/client/i18n/locales/german/translations.json
index 2d78036c031..452779783dd 100644
--- a/client/i18n/locales/german/translations.json
+++ b/client/i18n/locales/german/translations.json
@@ -15,8 +15,8 @@
     "show-cert": "Zertifikat anzeigen",
     "claim-cert": "Zertifizierung anfordern",
     "save-progress": "Fortschritt speichern",
-    "accepted-honesty": "Du hast unsere Akademische Ehrlichkeitsrichtlinie akzeptiert.",
-    "agree": "Zustimmen",
+    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
+    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
     "save-portfolio": "Dieses Portfolioelement speichern",
     "remove-portfolio": "Dieses Portfolioelement entfernen",
     "add-portfolio": "Neues Portfolioelement hinzufügen",
@@ -517,7 +517,7 @@
     "opens-new-window": "Opens in new window"
   },
   "flash": {
-    "honest-first": "Um eine Zertifizierung zu erlangen, musst du zunächst unsere Richtlinie zur akademischen Ehrlichkeit akzeptieren",
+    "honest-first": "To claim a certification, you must first agree to our academic honesty policy",
     "really-weird": "Etwas wirklich Seltsames ist passiert. Wenn es wieder passiert, erwäge bitte, einen Fehler auf https://github.com/freeCodeCamp/freeCodeCamp/issues/new zu melden.",
     "not-right": "Irgendetwas ist nicht in Ordnung. Es wurde ein Bericht erstellt und das freeCodeCamp.org Team wurde benachrichtigt",
     "went-wrong": "Etwas ist schief gelaufen, bitte überprüfe und versuche es erneut",
diff --git a/client/i18n/locales/italian/translations.json b/client/i18n/locales/italian/translations.json
index 18007266443..bb22c1ac79f 100644
--- a/client/i18n/locales/italian/translations.json
+++ b/client/i18n/locales/italian/translations.json
@@ -15,8 +15,8 @@
     "show-cert": "Mostra la Certificazione",
     "claim-cert": "Richiedi la Certificazione",
     "save-progress": "Salva l'avanzamento",
-    "accepted-honesty": "Hai accettato la nostra Politica di Onestà Accademica.",
-    "agree": "Accetta",
+    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
+    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
     "save-portfolio": "Salva questo elemento del portfolio",
     "remove-portfolio": "Rimuovi questo elemento del portfolio",
     "add-portfolio": "Aggiungi un nuovo elemento nel portfolio",
@@ -517,7 +517,7 @@
     "opens-new-window": "Apri in una nuova finestra"
   },
   "flash": {
-    "honest-first": "Per richiedere una certificazione, è necessario prima accettare la nostra politica di onestà accademica",
+    "honest-first": "To claim a certification, you must first agree to our academic honesty policy",
     "really-weird": "È successo qualcosa di veramente strano, se succede di nuovo, ti preghiamo di considerare di sollevare un problema su https://github.com/freeCodeCamp/freeCodeCamp/issues/new",
     "not-right": "Qualcosa non è del tutto giusto. Un rapporto è stato generato e il team freeCodeCamp.org è stato avvisato",
     "went-wrong": "Qualcosa è andato storto, controlla e riprova",
diff --git a/client/i18n/locales/japanese/translations.json b/client/i18n/locales/japanese/translations.json
index a0aa273780a..fa2cb2b43c2 100644
--- a/client/i18n/locales/japanese/translations.json
+++ b/client/i18n/locales/japanese/translations.json
@@ -15,8 +15,8 @@
     "show-cert": "認定証を表示",
     "claim-cert": "認定証を取得",
     "save-progress": "進行状況を保存",
-    "accepted-honesty": "学問的誠実性ポリシーに同意しました。",
-    "agree": "同意する",
+    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
+    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
     "save-portfolio": "このポートフォリオアイテムを保存",
     "remove-portfolio": "このポートフォリオアイテムを削除",
     "add-portfolio": "新規ポートフォリオアイテムを追加",
@@ -517,7 +517,7 @@
     "opens-new-window": "新しいウィンドウで開く"
   },
   "flash": {
-    "honest-first": "認定証を請求するには、まず学問的誠実性ポリシーに同意する必要があります。",
+    "honest-first": "To claim a certification, you must first agree to our academic honesty policy",
     "really-weird": "予期しない問題が発生しました。この問題が何度も発生するようであれば、https://github.com/freeCodeCamp/freeCodeCamp/issues/new への Issue 登録をご検討ください。",
     "not-right": "問題が発生しました。レポートが生成され、freeCodeCamp.org チームへ通知されました。",
     "went-wrong": "問題が発生しました。ご確認の上もう一度お試しください。",
diff --git a/client/i18n/locales/portuguese/intro.json b/client/i18n/locales/portuguese/intro.json
index ea6ec4d33e3..a0262686a7b 100644
--- a/client/i18n/locales/portuguese/intro.json
+++ b/client/i18n/locales/portuguese/intro.json
@@ -790,18 +790,18 @@
   "the-odin-project": {
     "title": "The Odin Project",
     "intro": [
-      "The Odin Project is one of those \"What I wish I had when I was learning\" resources. ",
-      "Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway.",
-      "This project is designed to fill in the gap for people who are trying to hack it on their own but still want a high quality education."
+      "The Odin Project é um daqueles recursos do tipo \"O que eu gostaria de ter visto quando estava aprendendo\". ",
+      "Nem todas as pessoas têm acesso à educação em ciência da computação ou aos fundos necessários para frequentar uma escola de programação intensiva. De qualquer modo, não necessariamente, essas duas sejam a solução final para todos que queiram aprender.",
+      "Este projeto destina-se a preencher a lacuna para aquelas pessoas que tentam buscar suas próprias soluções, mas que continuam procurando uma educação de alta qualidade."
     ],
     "blocks": {
       "top-learn-html-foundations": {
-        "title": "Learn HTML Foundations",
-        "intro": ["A description is to be determined"]
+        "title": "Aprenda o básico de HTML",
+        "intro": ["Uma descrição deve ser determinada"]
       },
       "top-build-a-recipe-project": {
-        "title": "Learn HTML Foundations by Building a Recipe Page",
-        "intro": ["A description is to be determined"]
+        "title": "Aprenda o básico de HTML criando uma página de receitas",
+        "intro": ["Uma descrição deve ser determinada"]
       }
     }
   },
diff --git a/client/i18n/locales/portuguese/translations.json b/client/i18n/locales/portuguese/translations.json
index 1471ae2b7ad..1d6f945a5e5 100644
--- a/client/i18n/locales/portuguese/translations.json
+++ b/client/i18n/locales/portuguese/translations.json
@@ -15,8 +15,8 @@
     "show-cert": "Exibir certificado",
     "claim-cert": "Solicitar certificação",
     "save-progress": "Salvar progresso",
-    "accepted-honesty": "Você aceitou nossa política de honestidade acadêmica.",
-    "agree": "Aceitar",
+    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
+    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
     "save-portfolio": "Salvar esse item de portfólio",
     "remove-portfolio": "Remover este item de portfólio",
     "add-portfolio": "Adicionar um novo item de portfólio",
@@ -517,7 +517,7 @@
     "opens-new-window": "Abre em uma nova janela"
   },
   "flash": {
-    "honest-first": "Para solicitar uma certificação, você precisa primeiro aceitar nossa política de honestidade acadêmica",
+    "honest-first": "To claim a certification, you must first agree to our academic honesty policy",
     "really-weird": "Algo realmente estranho aconteceu. Se acontecer novamente, considere apresentar um problema pelo endereço https://github.com/freeCodeCamp/freeCodeCamp/issues/new",
     "not-right": "Algo não está certo. Um relatório foi gerado e a equipe do freeCodeCamp.org foi notificada",
     "went-wrong": "Algo deu errado. Verifique e tente novamente",
diff --git a/client/i18n/locales/ukrainian/intro.json b/client/i18n/locales/ukrainian/intro.json
index d6f04eaa4e3..ec06abf9f61 100644
--- a/client/i18n/locales/ukrainian/intro.json
+++ b/client/i18n/locales/ukrainian/intro.json
@@ -788,20 +788,20 @@
     }
   },
   "the-odin-project": {
-    "title": "The Odin Project",
+    "title": "Проєкт «Odin»",
     "intro": [
-      "The Odin Project is one of those \"What I wish I had when I was learning\" resources. ",
-      "Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway.",
-      "This project is designed to fill in the gap for people who are trying to hack it on their own but still want a high quality education."
+      "Проєкт «Odin» є одним з тих ресурсів, про які хотіли б дізнатися ще коли навчались. ",
+      "Не кожен має доступ до технологічної освіти або коштів, необхідних для відвідування інтенсивної школи. Однак це не остаточне рішення для тих, хто хоче вчитися.",
+      "Цей проєкт розроблений, щоб заповнити прогалину для людей, які намагаються вчитись самостійно, але все ж таки хочуть високоякісну освіту."
     ],
     "blocks": {
       "top-learn-html-foundations": {
-        "title": "Learn HTML Foundations",
-        "intro": ["A description is to be determined"]
+        "title": "Вивчіть основи HTML",
+        "intro": ["Опис буде надано пізніше"]
       },
       "top-build-a-recipe-project": {
-        "title": "Learn HTML Foundations by Building a Recipe Page",
-        "intro": ["A description is to be determined"]
+        "title": "Вивчіть основи HTML, побудувавши сторінку з рецептами",
+        "intro": ["Опис буде надано пізніше"]
       }
     }
   },
diff --git a/client/i18n/locales/ukrainian/translations.json b/client/i18n/locales/ukrainian/translations.json
index 4bb4a7e7e92..16aab52cdae 100644
--- a/client/i18n/locales/ukrainian/translations.json
+++ b/client/i18n/locales/ukrainian/translations.json
@@ -15,8 +15,8 @@
     "show-cert": "Показати сертифікацію",
     "claim-cert": "Отримати сертифікацію",
     "save-progress": "Зберегти прогрес",
-    "accepted-honesty": "Ви прийняли нашу Політику академічної доброчесності.",
-    "agree": "Прийняти",
+    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
+    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
     "save-portfolio": "Зберегти цей елемент портфоліо",
     "remove-portfolio": "Видалити цей елемент портфоліо",
     "add-portfolio": "Додати новий елемент портфоліо",
@@ -517,7 +517,7 @@
     "opens-new-window": "Відкривається у новому вікні"
   },
   "flash": {
-    "honest-first": "Щоб отримати сертифікацію, ви повинні спочатку прийняти нашу політику академічної доброчесності",
+    "honest-first": "To claim a certification, you must first agree to our academic honesty policy",
     "really-weird": "Щось пішло не так. Якщо це повториться, будь ласка, повідомте про це за посиланням: https://github.com/freeCodeCamp/freeCodeCamp/issues/new",
     "not-right": "Щось пішло не так. Звіт було сформовано і команду freeCodeCamp.org вже сповістили.",
     "went-wrong": "Щось пішло не так. Будь ласка, перевірте та повторіть спробу.",

From d7787eb0cc0c53a1ff2ed96cb22ebf931664c6ca Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 13:00:19 +0530
Subject: [PATCH 28/52] chore(deps): update github/codeql-action digest to
 17573ee (#49338)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index eb6949ec6f2..7eb860f4417 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -32,8 +32,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
       - name: Setup CodeQL
-        uses: github/codeql-action/init@3ebbd71c74ef574dbc558c82f70e52732c8b44fe # v2
+        uses: github/codeql-action/init@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2
         with:
           languages: ${{ matrix.language }}
       - name: Perform Analysis
-        uses: github/codeql-action/analyze@3ebbd71c74ef574dbc558c82f70e52732c8b44fe # v2
+        uses: github/codeql-action/analyze@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2

From 1cc6c5546975d72793c1d4cced0f3fc49a9a16f8 Mon Sep 17 00:00:00 2001
From: a2937 <a.rcottrill521@gmail.com>
Date: Sat, 11 Feb 2023 02:57:47 -0500
Subject: [PATCH 29/52] Chore : Migrate universal-navigation.js (#49337)

---
 config/i18n.ts                                |  2 +-
 ...-navigation.js => universal-navigation.ts} | 41 ++++++++++++-------
 2 files changed, 28 insertions(+), 15 deletions(-)
 rename cypress/e2e/default/learn/header/{universal-navigation.js => universal-navigation.ts} (91%)

diff --git a/config/i18n.ts b/config/i18n.ts
index 9fe7a6311d2..88a0e24713b 100644
--- a/config/i18n.ts
+++ b/config/i18n.ts
@@ -68,7 +68,7 @@ export const i18nextCodes = {
 };
 
 // These are for the language selector dropdown menu in the footer
-export const LangNames = {
+export const LangNames: { [key: string]: string } = {
   [Languages.English]: 'English',
   [Languages.Espanol]: 'Español',
   [Languages.Chinese]: '中文（简体字）',
diff --git a/cypress/e2e/default/learn/header/universal-navigation.js b/cypress/e2e/default/learn/header/universal-navigation.ts
similarity index 91%
rename from cypress/e2e/default/learn/header/universal-navigation.js
rename to cypress/e2e/default/learn/header/universal-navigation.ts
index 23301aafae9..aa898243e95 100644
--- a/cypress/e2e/default/learn/header/universal-navigation.js
+++ b/cypress/e2e/default/learn/header/universal-navigation.ts
@@ -7,7 +7,7 @@ import envData from '../../../../../config/env.json';
 
 const { clientLocale } = envData;
 
-const selectors = {
+const selectors: { [key: string]: string } = {
   'navigation-list': '.nav-list',
   'toggle-button': '.toggle-button-nav',
   'language-menu': '.nav-lang-menu',
@@ -21,7 +21,7 @@ const selectors = {
   'cancel-signout': "[data-test-label='cancel-signout']"
 };
 
-const links = {
+const links: { [key: string]: string } = {
   'sign-in': '/signin',
   donate: '/donate',
   curriculum: '/learn',
@@ -223,31 +223,44 @@ const testAllLanguages = () => {
   const availableLangNames = availableLangs.client
     .filter(lang => !hiddenLangs.includes(lang))
     .map(lang => LangNames[lang]);
-  availableLangNames.forEach(langName =>
-    cy.get(selectors['language-menu']).contains(langName)
-  );
+  for (let i = 0; i < availableLangNames.length; i++) {
+    const langName = availableLangNames[i];
+    cy.get(selectors['language-menu']).contains(langName);
+  }
 };
 
-const testLink = (item, selector = 'navigation-list', checkParent) => {
+const testLink = (
+  item: string,
+  selector = 'navigation-list',
+  checkParent = false
+) => {
   if (checkParent) {
     return cy
       .get(selectors[selector])
       .should('contain.text', item)
       .should('have.attr', 'href')
-      .and('contain', links[item.replaceAll(' ', '-').toLowerCase()]);
+      .and('contain', links[item.replace(/\s+/g, '-').toLowerCase()]);
+    //.and('contain', links[item.replaceAll(' ', '-').toLowerCase()]);
   }
-  return cy
-    .get(selectors[selector])
-    .contains(item)
-    .should('have.attr', 'href')
-    .and('contain', links[item.replaceAll(' ', '-').toLowerCase()]);
+  return (
+    cy
+      .get(selectors[selector])
+      .contains(item)
+      .should('have.attr', 'href')
+      //.and('contain', links[item.replaceAll(' ', '-').toLowerCase()]);
+
+      .and('contain', links[item.replace(/\s+/g, '-').toLowerCase()])
+  );
 };
 
-const navigateLanguagesWithKey = direction => {
+const navigateLanguagesWithKey = (direction: string) => {
   const directions = ['downArrow', 'upArrow'];
   if (!directions.includes(direction)) {
     throw new Error(
-      'Invalid direction: ' + direction + '\nMust be one of: ' + directions
+      'Invalid direction: ' +
+        direction +
+        '\nMust be one of: ' +
+        directions.join(',')
     );
   }
   const availableLangNames = availableLangs.client

From e9b2cc630ba05e2961c17f8e4a163ded727c2603 Mon Sep 17 00:00:00 2001
From: Vansh Baghel <103327712+Vansh-Baghel@users.noreply.github.com>
Date: Sat, 11 Feb 2023 13:30:51 +0530
Subject: [PATCH 30/52] chore(curriculum) : Added backticks and class reference
 to bar word (#49322)

Added backticks and class reference to bar word
---
 .../visualize-data-with-a-bar-chart.md               | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/curriculum/challenges/english/04-data-visualization/data-visualization-projects/visualize-data-with-a-bar-chart.md b/curriculum/challenges/english/04-data-visualization/data-visualization-projects/visualize-data-with-a-bar-chart.md
index 4e648ec9b72..a86369073dd 100644
--- a/curriculum/challenges/english/04-data-visualization/data-visualization-projects/visualize-data-with-a-bar-chart.md
+++ b/curriculum/challenges/english/04-data-visualization/data-visualization-projects/visualize-data-with-a-bar-chart.md
@@ -24,17 +24,17 @@ You can use HTML, JavaScript, CSS, and the D3 svg-based visualization library. T
 
 **User Story #5:** My chart should have a `rect` element for each data point with a corresponding `class="bar"` displaying the data.
 
-**User Story #6:** Each bar should have the properties `data-date` and `data-gdp` containing `date` and `GDP` values.
+**User Story #6:** Each `.bar` should have the properties `data-date` and `data-gdp` containing `date` and `GDP` values.
 
-**User Story #7:** The bar elements' `data-date` properties should match the order of the provided data.
+**User Story #7:** The `.bar` elements' `data-date` properties should match the order of the provided data.
 
-**User Story #8:** The bar elements' `data-gdp` properties should match the order of the provided data.
+**User Story #8:** The `.bar` elements' `data-gdp` properties should match the order of the provided data.
 
-**User Story #9:** Each bar element's height should accurately represent the data's corresponding `GDP`.
+**User Story #9:** Each `.bar` element's height should accurately represent the data's corresponding `GDP`.
 
-**User Story #10:** The `data-date` attribute and its corresponding bar element should align with the corresponding value on the x-axis.
+**User Story #10:** The `data-date` attribute and its corresponding `.bar` element should align with the corresponding value on the x-axis.
 
-**User Story #11:** The `data-gdp` attribute and its corresponding bar element should align with the corresponding value on the y-axis.
+**User Story #11:** The `data-gdp` attribute and its corresponding `.bar` element should align with the corresponding value on the y-axis.
 
 **User Story #12:** I can mouse over an area and see a tooltip with a corresponding `id="tooltip"` which displays more information about the area.
 

From 3065d7cab7fa623e795aad445bdbcec398be6f5e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 12:47:01 +0200
Subject: [PATCH 31/52] chore(deps): update dependency tailwindcss to v3.2.6
 (#49342)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json                | 49 +++++++++++++++++++++-----------
 tools/ui-components/package.json |  2 +-
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a675d5ace56..3979c332441 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41718,8 +41718,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.10",
-      "license": "MIT",
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+      "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -49314,8 +49315,9 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.2.4",
-      "license": "MIT",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.6.tgz",
+      "integrity": "sha512-BfgQWZrtqowOQMC2bwaSNe7xcIjdDEgixWGYOd6AL0CbKHJlvhfdbINeAW76l1sO+1ov/MJ93ODJ9yluRituIw==",
       "dependencies": {
         "arg": "^5.0.2",
         "chokidar": "^3.5.3",
@@ -49331,12 +49333,12 @@
         "normalize-path": "^3.0.0",
         "object-hash": "^3.0.0",
         "picocolors": "^1.0.0",
-        "postcss": "^8.4.18",
+        "postcss": "^8.0.9",
         "postcss-import": "^14.1.0",
         "postcss-js": "^4.0.0",
         "postcss-load-config": "^3.1.4",
         "postcss-nested": "6.0.0",
-        "postcss-selector-parser": "^6.0.10",
+        "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
         "quick-lru": "^5.1.1",
         "resolve": "^1.22.1"
@@ -49354,15 +49356,18 @@
     },
     "node_modules/tailwindcss/node_modules/arg": {
       "version": "5.0.2",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
     },
     "node_modules/tailwindcss/node_modules/color-name": {
       "version": "1.1.4",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/tailwindcss/node_modules/glob-parent": {
       "version": "6.0.2",
-      "license": "ISC",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -54343,7 +54348,7 @@
         "rollup": "2.79.1",
         "rollup-plugin-postcss": "4.0.2",
         "rollup-plugin-terser": "7.0.2",
-        "tailwindcss": "3.2.4"
+        "tailwindcss": "3.2.6"
       },
       "engines": {
         "node": ">=16",
@@ -56650,7 +56655,7 @@
         "rollup": "2.79.1",
         "rollup-plugin-postcss": "4.0.2",
         "rollup-plugin-terser": "7.0.2",
-        "tailwindcss": "3.2.4",
+        "tailwindcss": "3.2.6",
         "typescript": "4.9.5"
       }
     },
@@ -82754,7 +82759,9 @@
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.10",
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+      "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
       "requires": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -87628,7 +87635,9 @@
       }
     },
     "tailwindcss": {
-      "version": "3.2.4",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.6.tgz",
+      "integrity": "sha512-BfgQWZrtqowOQMC2bwaSNe7xcIjdDEgixWGYOd6AL0CbKHJlvhfdbINeAW76l1sO+1ov/MJ93ODJ9yluRituIw==",
       "requires": {
         "arg": "^5.0.2",
         "chokidar": "^3.5.3",
@@ -87644,25 +87653,31 @@
         "normalize-path": "^3.0.0",
         "object-hash": "^3.0.0",
         "picocolors": "^1.0.0",
-        "postcss": "^8.4.18",
+        "postcss": "^8.0.9",
         "postcss-import": "^14.1.0",
         "postcss-js": "^4.0.0",
         "postcss-load-config": "^3.1.4",
         "postcss-nested": "6.0.0",
-        "postcss-selector-parser": "^6.0.10",
+        "postcss-selector-parser": "^6.0.11",
         "postcss-value-parser": "^4.2.0",
         "quick-lru": "^5.1.1",
         "resolve": "^1.22.1"
       },
       "dependencies": {
         "arg": {
-          "version": "5.0.2"
+          "version": "5.0.2",
+          "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+          "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
         },
         "color-name": {
-          "version": "1.1.4"
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
         },
         "glob-parent": {
           "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
           "requires": {
             "is-glob": "^4.0.3"
           }
diff --git a/tools/ui-components/package.json b/tools/ui-components/package.json
index cb821fb6da7..cb6931a27c7 100644
--- a/tools/ui-components/package.json
+++ b/tools/ui-components/package.json
@@ -53,7 +53,7 @@
     "rollup": "2.79.1",
     "rollup-plugin-postcss": "4.0.2",
     "rollup-plugin-terser": "7.0.2",
-    "tailwindcss": "3.2.4"
+    "tailwindcss": "3.2.6"
   },
   "scripts": {
     "storybook": "start-storybook -p 6006",

From 8aa35385a04579900293077ce49f6ec86272db2d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 11 Feb 2023 10:47:49 +0000
Subject: [PATCH 32/52] chore(deps): update dependency prettier to v2.8.4
 (#49341)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json                           | 16 ++++++++--------
 tools/challenge-helper-scripts/package.json |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3979c332441..5bf40a16fab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41801,9 +41801,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz",
-      "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
+      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -54048,7 +54048,7 @@
         "cross-env": "7.0.3",
         "gray-matter": "4.0.3",
         "inquirer": "8.2.5",
-        "prettier": "2.8.3",
+        "prettier": "2.8.4",
         "ts-node": "10.9.1",
         "typescript": "4.9.5"
       },
@@ -56500,7 +56500,7 @@
         "cross-env": "7.0.3",
         "gray-matter": "4.0.3",
         "inquirer": "8.2.5",
-        "prettier": "2.8.3",
+        "prettier": "2.8.4",
         "ts-node": "10.9.1",
         "typescript": "4.9.5"
       }
@@ -82809,9 +82809,9 @@
       "version": "2.0.0"
     },
     "prettier": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz",
-      "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw=="
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz",
+      "integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw=="
     },
     "pretty-bytes": {
       "version": "5.6.0"
diff --git a/tools/challenge-helper-scripts/package.json b/tools/challenge-helper-scripts/package.json
index f55579a5add..91613a9b754 100644
--- a/tools/challenge-helper-scripts/package.json
+++ b/tools/challenge-helper-scripts/package.json
@@ -28,7 +28,7 @@
     "cross-env": "7.0.3",
     "gray-matter": "4.0.3",
     "inquirer": "8.2.5",
-    "prettier": "2.8.3",
+    "prettier": "2.8.4",
     "ts-node": "10.9.1",
     "typescript": "4.9.5"
   }

From 65b9f87b0bf048785c3f415abbf68ad6fb32c4ca Mon Sep 17 00:00:00 2001
From: Shiva kumar <39256145+ShivaKodes@users.noreply.github.com>
Date: Sat, 11 Feb 2023 17:04:56 +0530
Subject: [PATCH 33/52] fix(curriculum): remove attributes from Building a
 registration Form (#49334)

fix #49301-removed name attributes from seed code on step 41
---
 .../60fad1cafcde010995e15306.md                      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/curriculum/challenges/english/14-responsive-web-design-22/learn-html-forms-by-building-a-registration-form/60fad1cafcde010995e15306.md b/curriculum/challenges/english/14-responsive-web-design-22/learn-html-forms-by-building-a-registration-form/60fad1cafcde010995e15306.md
index 0f68b139a27..ec598b5f119 100644
--- a/curriculum/challenges/english/14-responsive-web-design-22/learn-html-forms-by-building-a-registration-form/60fad1cafcde010995e15306.md
+++ b/curriculum/challenges/english/14-responsive-web-design-22/learn-html-forms-by-building-a-registration-form/60fad1cafcde010995e15306.md
@@ -103,23 +103,23 @@ You should not give any of the `fieldset` elements a `name` attribute.
     <form method="post" action='https://register-demo.freecodecamp.org'>
 --fcc-editable-region--
         <fieldset>
-        <label for="first-name">Enter Your First Name: <input id="first-name" name="first-name" type="text" required /></label>
-        <label for="last-name">Enter Your Last Name: <input id="last-name" name="last-name" type="text" required /></label>
-        <label for="email">Enter Your Email: <input id="email" name="email" type="email" required /></label>
-        <label for="new-password">Create a New Password: <input id="new-password" name="new-password" type="password" pattern="[a-z0-5]{8,}" required /></label>
+        <label for="first-name">Enter Your First Name: <input id="first-name" type="text" required /></label>
+        <label for="last-name">Enter Your Last Name: <input id="last-name" type="text" required /></label>
+        <label for="email">Enter Your Email: <input id="email" type="email" required /></label>
+        <label for="new-password">Create a New Password: <input id="new-password" type="password" pattern="[a-z0-5]{8,}" required /></label>
       </fieldset>
       <fieldset>
         <label for="personal-account"><input id="personal-account" type="radio" name="account-type" /> Personal Account</label>
         <label for="business-account"><input id="business-account" type="radio" name="account-type" /> Business Account</label>
         <label for="terms-and-conditions">
-          <input id="terms-and-conditions" type="checkbox" required name="terms-and-conditions" /> I accept the <a href="https://www.freecodecamp.org/news/terms-of-service/">terms and conditions</a>
+          <input id="terms-and-conditions" type="checkbox" required /> I accept the <a href="https://www.freecodecamp.org/news/terms-of-service/">terms and conditions</a>
         </label>
       </fieldset>
       <fieldset>
         <label for="profile-picture">Upload a profile picture: <input id="profile-picture" type="file"/></label>
         <label for="age">Input your age (years): <input id="age" type="number" min="13" max="120" /></label>
         <label for="referrer">How did you hear about us?
-          <select id="referrer" name="referrer">
+          <select id="referrer">
             <option value="">(select one)</option>
             <option value="1">freeCodeCamp News</option>
             <option value="2">freeCodeCamp YouTube Channel</option>

From 57932418fdb514f6b818abd6b499d70301dc0a2a Mon Sep 17 00:00:00 2001
From: jpjpjp <github@shipherd.com>
Date: Sat, 11 Feb 2023 12:41:16 -0500
Subject: [PATCH 34/52] fix(curriculum): nutrition label step 53 instruction
 (#49349)

fix(curriculum): Add 0mg span element too

this commit fixes #49324
---
 .../615f7de4487b64919bb4aa5e.md                                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/curriculum/challenges/english/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f7de4487b64919bb4aa5e.md b/curriculum/challenges/english/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f7de4487b64919bb4aa5e.md
index 144b600fada..8384abae4e7 100644
--- a/curriculum/challenges/english/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f7de4487b64919bb4aa5e.md
+++ b/curriculum/challenges/english/14-responsive-web-design-22/learn-typography-by-building-a-nutrition-label/615f7de4487b64919bb4aa5e.md
@@ -7,7 +7,7 @@ dashedName: step-53
 
 # --description--
 
-After your last `.divider`, create a new `p` element with the text `Cholesterol 0mg 0%`. Wrap the text `Cholesterol` in a `span` element, and give that `span` element the `class` attribute set to `bold`. Wrap the text `0%` in another `span` element, with the `class` set to `bold`. Finally, nest the `Cholesterol` and `0mg` `span` elements inside an additional `span` element for alignment.
+After your last `.divider`, create a new `p` element with the text `Cholesterol 0mg 0%`. Wrap the text `Cholesterol` in a `span` element, and give that `span` element the `class` of `bold`. Wrap the text `0%` in another `span` element, with the `class` of `bold`. Finally, nest the `Cholesterol` `span` element and the text `0mg` in an additional `span` element for alignment.
 
 # --hints--
 

From 046f73a0f4cd5290f221a5606e677a2c8783aa96 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 12 Feb 2023 12:05:01 +0200
Subject: [PATCH 35/52] chore(deps): update typescript-eslint monorepo to
 v5.51.0 (#49355)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 164 +++++++++++++++++++++++-----------------------
 package.json      |   4 +-
 2 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5bf40a16fab..fda791b2e18 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,8 +66,8 @@
         "@types/sanitize-html": "2.8.0",
         "@types/store": "2.0.2",
         "@types/validator": "13.7.12",
-        "@typescript-eslint/eslint-plugin": "5.50.0",
-        "@typescript-eslint/parser": "5.50.0",
+        "@typescript-eslint/eslint-plugin": "5.51.0",
+        "@typescript-eslint/parser": "5.51.0",
         "babel-eslint": "10.1.0",
         "babel-plugin-transform-imports": "2.0.0",
         "cross-env": "7.0.3",
@@ -14403,13 +14403,13 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.50.0.tgz",
-      "integrity": "sha512-vwksQWSFZiUhgq3Kv7o1Jcj0DUNylwnIlGvKvLLYsq8pAWha6/WCnXUeaSoNNha/K7QSf2+jvmkxggC1u3pIwQ==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.51.0.tgz",
+      "integrity": "sha512-wcAwhEWm1RgNd7dxD/o+nnLW8oH+6RK1OGnmbmkj/GGoDPV1WWMVP0FXYQBivKHdwM1pwii3bt//RC62EriIUQ==",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.50.0",
-        "@typescript-eslint/type-utils": "5.50.0",
-        "@typescript-eslint/utils": "5.50.0",
+        "@typescript-eslint/scope-manager": "5.51.0",
+        "@typescript-eslint/type-utils": "5.51.0",
+        "@typescript-eslint/utils": "5.51.0",
         "debug": "^4.3.4",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
@@ -14645,13 +14645,13 @@
       "license": "ISC"
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.50.0.tgz",
-      "integrity": "sha512-KCcSyNaogUDftK2G9RXfQyOCt51uB5yqC6pkUYqhYh8Kgt+DwR5M0EwEAxGPy/+DH6hnmKeGsNhiZRQxjH71uQ==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.51.0.tgz",
+      "integrity": "sha512-fEV0R9gGmfpDeRzJXn+fGQKcl0inIeYobmmUWijZh9zA7bxJ8clPhV9up2ZQzATxAiFAECqPQyMDB4o4B81AaA==",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.50.0",
-        "@typescript-eslint/types": "5.50.0",
-        "@typescript-eslint/typescript-estree": "5.50.0",
+        "@typescript-eslint/scope-manager": "5.51.0",
+        "@typescript-eslint/types": "5.51.0",
+        "@typescript-eslint/typescript-estree": "5.51.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -14692,12 +14692,12 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.50.0.tgz",
-      "integrity": "sha512-rt03kaX+iZrhssaT974BCmoUikYtZI24Vp/kwTSy841XhiYShlqoshRFDvN1FKKvU2S3gK+kcBW1EA7kNUrogg==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz",
+      "integrity": "sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ==",
       "dependencies": {
-        "@typescript-eslint/types": "5.50.0",
-        "@typescript-eslint/visitor-keys": "5.50.0"
+        "@typescript-eslint/types": "5.51.0",
+        "@typescript-eslint/visitor-keys": "5.51.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -14708,12 +14708,12 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.50.0.tgz",
-      "integrity": "sha512-dcnXfZ6OGrNCO7E5UY/i0ktHb7Yx1fV6fnQGGrlnfDhilcs6n19eIRcvLBqx6OQkrPaFlDPk3OJ0WlzQfrV0bQ==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.51.0.tgz",
+      "integrity": "sha512-QHC5KKyfV8sNSyHqfNa0UbTbJ6caB8uhcx2hYcWVvJAZYJRBo5HyyZfzMdRx8nvS+GyMg56fugMzzWnojREuQQ==",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "5.50.0",
-        "@typescript-eslint/utils": "5.50.0",
+        "@typescript-eslint/typescript-estree": "5.51.0",
+        "@typescript-eslint/utils": "5.51.0",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
@@ -14755,9 +14755,9 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.50.0.tgz",
-      "integrity": "sha512-atruOuJpir4OtyNdKahiHZobPKFvZnBnfDiyEaBf6d9vy9visE7gDjlmhl+y29uxZ2ZDgvXijcungGFjGGex7w==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.51.0.tgz",
+      "integrity": "sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw==",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -14767,12 +14767,12 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.50.0.tgz",
-      "integrity": "sha512-Gq4zapso+OtIZlv8YNAStFtT6d05zyVCK7Fx3h5inlLBx2hWuc/0465C2mg/EQDDU2LKe52+/jN4f0g9bd+kow==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz",
+      "integrity": "sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA==",
       "dependencies": {
-        "@typescript-eslint/types": "5.50.0",
-        "@typescript-eslint/visitor-keys": "5.50.0",
+        "@typescript-eslint/types": "5.51.0",
+        "@typescript-eslint/visitor-keys": "5.51.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -14844,15 +14844,15 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.50.0.tgz",
-      "integrity": "sha512-v/AnUFImmh8G4PH0NDkf6wA8hujNNcrwtecqW4vtQ1UOSNBaZl49zP1SHoZ/06e+UiwzHpgb5zP5+hwlYYWYAw==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.51.0.tgz",
+      "integrity": "sha512-76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw==",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.50.0",
-        "@typescript-eslint/types": "5.50.0",
-        "@typescript-eslint/typescript-estree": "5.50.0",
+        "@typescript-eslint/scope-manager": "5.51.0",
+        "@typescript-eslint/types": "5.51.0",
+        "@typescript-eslint/typescript-estree": "5.51.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0",
         "semver": "^7.3.7"
@@ -14896,11 +14896,11 @@
       "license": "ISC"
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.50.0.tgz",
-      "integrity": "sha512-cdMeD9HGu6EXIeGOh2yVW6oGf9wq8asBgZx7nsR/D36gTfQ0odE5kcRYe5M81vjEFAcPeugXrHg78Imu55F6gg==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz",
+      "integrity": "sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ==",
       "dependencies": {
-        "@typescript-eslint/types": "5.50.0",
+        "@typescript-eslint/types": "5.51.0",
         "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
@@ -64623,13 +64623,13 @@
       "version": "1.9.2"
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.50.0.tgz",
-      "integrity": "sha512-vwksQWSFZiUhgq3Kv7o1Jcj0DUNylwnIlGvKvLLYsq8pAWha6/WCnXUeaSoNNha/K7QSf2+jvmkxggC1u3pIwQ==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.51.0.tgz",
+      "integrity": "sha512-wcAwhEWm1RgNd7dxD/o+nnLW8oH+6RK1OGnmbmkj/GGoDPV1WWMVP0FXYQBivKHdwM1pwii3bt//RC62EriIUQ==",
       "requires": {
-        "@typescript-eslint/scope-manager": "5.50.0",
-        "@typescript-eslint/type-utils": "5.50.0",
-        "@typescript-eslint/utils": "5.50.0",
+        "@typescript-eslint/scope-manager": "5.51.0",
+        "@typescript-eslint/type-utils": "5.51.0",
+        "@typescript-eslint/utils": "5.51.0",
         "debug": "^4.3.4",
         "grapheme-splitter": "^1.0.4",
         "ignore": "^5.2.0",
@@ -64751,13 +64751,13 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.50.0.tgz",
-      "integrity": "sha512-KCcSyNaogUDftK2G9RXfQyOCt51uB5yqC6pkUYqhYh8Kgt+DwR5M0EwEAxGPy/+DH6hnmKeGsNhiZRQxjH71uQ==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.51.0.tgz",
+      "integrity": "sha512-fEV0R9gGmfpDeRzJXn+fGQKcl0inIeYobmmUWijZh9zA7bxJ8clPhV9up2ZQzATxAiFAECqPQyMDB4o4B81AaA==",
       "requires": {
-        "@typescript-eslint/scope-manager": "5.50.0",
-        "@typescript-eslint/types": "5.50.0",
-        "@typescript-eslint/typescript-estree": "5.50.0",
+        "@typescript-eslint/scope-manager": "5.51.0",
+        "@typescript-eslint/types": "5.51.0",
+        "@typescript-eslint/typescript-estree": "5.51.0",
         "debug": "^4.3.4"
       },
       "dependencies": {
@@ -64777,21 +64777,21 @@
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.50.0.tgz",
-      "integrity": "sha512-rt03kaX+iZrhssaT974BCmoUikYtZI24Vp/kwTSy841XhiYShlqoshRFDvN1FKKvU2S3gK+kcBW1EA7kNUrogg==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz",
+      "integrity": "sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ==",
       "requires": {
-        "@typescript-eslint/types": "5.50.0",
-        "@typescript-eslint/visitor-keys": "5.50.0"
+        "@typescript-eslint/types": "5.51.0",
+        "@typescript-eslint/visitor-keys": "5.51.0"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.50.0.tgz",
-      "integrity": "sha512-dcnXfZ6OGrNCO7E5UY/i0ktHb7Yx1fV6fnQGGrlnfDhilcs6n19eIRcvLBqx6OQkrPaFlDPk3OJ0WlzQfrV0bQ==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.51.0.tgz",
+      "integrity": "sha512-QHC5KKyfV8sNSyHqfNa0UbTbJ6caB8uhcx2hYcWVvJAZYJRBo5HyyZfzMdRx8nvS+GyMg56fugMzzWnojREuQQ==",
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.50.0",
-        "@typescript-eslint/utils": "5.50.0",
+        "@typescript-eslint/typescript-estree": "5.51.0",
+        "@typescript-eslint/utils": "5.51.0",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
@@ -64812,17 +64812,17 @@
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.50.0.tgz",
-      "integrity": "sha512-atruOuJpir4OtyNdKahiHZobPKFvZnBnfDiyEaBf6d9vy9visE7gDjlmhl+y29uxZ2ZDgvXijcungGFjGGex7w=="
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.51.0.tgz",
+      "integrity": "sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw=="
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.50.0.tgz",
-      "integrity": "sha512-Gq4zapso+OtIZlv8YNAStFtT6d05zyVCK7Fx3h5inlLBx2hWuc/0465C2mg/EQDDU2LKe52+/jN4f0g9bd+kow==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz",
+      "integrity": "sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA==",
       "requires": {
-        "@typescript-eslint/types": "5.50.0",
-        "@typescript-eslint/visitor-keys": "5.50.0",
+        "@typescript-eslint/types": "5.51.0",
+        "@typescript-eslint/visitor-keys": "5.51.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -64867,15 +64867,15 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.50.0.tgz",
-      "integrity": "sha512-v/AnUFImmh8G4PH0NDkf6wA8hujNNcrwtecqW4vtQ1UOSNBaZl49zP1SHoZ/06e+UiwzHpgb5zP5+hwlYYWYAw==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.51.0.tgz",
+      "integrity": "sha512-76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw==",
       "requires": {
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.50.0",
-        "@typescript-eslint/types": "5.50.0",
-        "@typescript-eslint/typescript-estree": "5.50.0",
+        "@typescript-eslint/scope-manager": "5.51.0",
+        "@typescript-eslint/types": "5.51.0",
+        "@typescript-eslint/typescript-estree": "5.51.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0",
         "semver": "^7.3.7"
@@ -64899,11 +64899,11 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.50.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.50.0.tgz",
-      "integrity": "sha512-cdMeD9HGu6EXIeGOh2yVW6oGf9wq8asBgZx7nsR/D36gTfQ0odE5kcRYe5M81vjEFAcPeugXrHg78Imu55F6gg==",
+      "version": "5.51.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz",
+      "integrity": "sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ==",
       "requires": {
-        "@typescript-eslint/types": "5.50.0",
+        "@typescript-eslint/types": "5.51.0",
         "eslint-visitor-keys": "^3.3.0"
       },
       "dependencies": {
diff --git a/package.json b/package.json
index 16a71b70a46..c8662745afb 100644
--- a/package.json
+++ b/package.json
@@ -153,8 +153,8 @@
     "@types/sanitize-html": "2.8.0",
     "@types/store": "2.0.2",
     "@types/validator": "13.7.12",
-    "@typescript-eslint/eslint-plugin": "5.50.0",
-    "@typescript-eslint/parser": "5.50.0",
+    "@typescript-eslint/eslint-plugin": "5.51.0",
+    "@typescript-eslint/parser": "5.51.0",
     "babel-eslint": "10.1.0",
     "babel-plugin-transform-imports": "2.0.0",
     "cross-env": "7.0.3",

From f2a4f589118307e44a499b6b0da56ea1c1c80b26 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 12 Feb 2023 12:06:39 +0200
Subject: [PATCH 36/52] chore(deps): update dependency @types/node to v18.13.0
 (#49348)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fda791b2e18..f51de4f6672 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -48,7 +48,7 @@
         "@types/jquery": "3.5.16",
         "@types/loadable__component": "5.13.4",
         "@types/lodash-es": "4.17.6",
-        "@types/node": "18.11.19",
+        "@types/node": "18.13.0",
         "@types/prismjs": "1.26.0",
         "@types/reach__router": "1.3.11",
         "@types/react": "17.0.53",
@@ -13854,9 +13854,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "18.11.19",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.19.tgz",
-      "integrity": "sha512-YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw=="
+      "version": "18.13.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz",
+      "integrity": "sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg=="
     },
     "node_modules/@types/node-fetch": {
       "version": "2.6.2",
@@ -64167,9 +64167,9 @@
       "version": "0.7.31"
     },
     "@types/node": {
-      "version": "18.11.19",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.19.tgz",
-      "integrity": "sha512-YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw=="
+      "version": "18.13.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz",
+      "integrity": "sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg=="
     },
     "@types/node-fetch": {
       "version": "2.6.2",
diff --git a/package.json b/package.json
index c8662745afb..a92224abef4 100644
--- a/package.json
+++ b/package.json
@@ -135,7 +135,7 @@
     "@types/jquery": "3.5.16",
     "@types/loadable__component": "5.13.4",
     "@types/lodash-es": "4.17.6",
-    "@types/node": "18.11.19",
+    "@types/node": "18.13.0",
     "@types/prismjs": "1.26.0",
     "@types/reach__router": "1.3.11",
     "@types/react": "17.0.53",

From 51217a62db22b00603d087980a4a1b50272213e4 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Date: Mon, 13 Feb 2023 16:56:48 +0530
Subject: [PATCH 37/52] fix: update github actions trigger configs (#49328)

---
 .github/workflows/codeql-analysis.yml        |  6 ++++--
 .github/workflows/e2e-mobile.yml             |  7 +++++--
 .github/workflows/e2e-third-party.yml        |  2 +-
 .github/workflows/e2e-web.yml                | 10 +++++-----
 .github/workflows/node.js-tests-upcoming.yml | 12 +++++++++---
 .github/workflows/node.js-tests.yml          | 17 ++++++++++++-----
 6 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 7eb860f4417..c096bb0e5fa 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,13 +1,15 @@
 name: CI - Run CodeQL Analysis
 on:
   push:
-    branches: [main]
     paths-ignore:
       - 'docs/**'
+    branches:
+      - 'main'
   pull_request:
-    branches: [main]
     paths-ignore:
       - 'docs/**'
+    branches:
+      - 'main'
 
 permissions:
   contents: read
diff --git a/.github/workflows/e2e-mobile.yml b/.github/workflows/e2e-mobile.yml
index 0fac7e65a62..4b688f1bc72 100644
--- a/.github/workflows/e2e-mobile.yml
+++ b/.github/workflows/e2e-mobile.yml
@@ -4,11 +4,14 @@ on:
   # push:
   #   paths-ignore:
   #     - 'docs/**'
-  #   branches-ignore:
-  #     - 'renovate/**'
+  #   branches:
+  #     - 'main'
   # pull_request:
   #   paths-ignore:
   #     - 'docs/**'
+  #   branches:
+  #     - 'main'
+  #     - 'next-**'
 
 jobs:
   mobile-test:
diff --git a/.github/workflows/e2e-third-party.yml b/.github/workflows/e2e-third-party.yml
index ab4d14744ac..411b42b630b 100644
--- a/.github/workflows/e2e-third-party.yml
+++ b/.github/workflows/e2e-third-party.yml
@@ -5,7 +5,7 @@ name: CI - E2E - 3rd party donation tests
 on:
   push:
     branches:
-      - 'prod-*'
+      - 'prod-**'
     paths-ignore:
       - 'docs/**'
 
diff --git a/.github/workflows/e2e-web.yml b/.github/workflows/e2e-web.yml
index 891c6ce59f3..1d8c8abe740 100644
--- a/.github/workflows/e2e-web.yml
+++ b/.github/workflows/e2e-web.yml
@@ -3,14 +3,14 @@ on:
   push:
     paths-ignore:
       - 'docs/**'
-    branches-ignore:
-      - 'renovate/**'
-      - 'next-api'
+    branches:
+      - 'main'
   pull_request:
     paths-ignore:
       - 'docs/**'
-    branches-ignore:
-      - 'next-api'
+    branches:
+      - 'main'
+      - 'next-**'
 
 jobs:
   build-client:
diff --git a/.github/workflows/node.js-tests-upcoming.yml b/.github/workflows/node.js-tests-upcoming.yml
index a12d2165b13..ffe5f3a6f89 100644
--- a/.github/workflows/node.js-tests-upcoming.yml
+++ b/.github/workflows/node.js-tests-upcoming.yml
@@ -2,14 +2,20 @@ name: CI - Node.js Test Upcoming
 env:
   NODE_OPTIONS: '--max_old_space_size=6144'
 on:
+  # Run on push events, but only for the below branches
   push:
     branches:
-      # Treat the below branches as special case for working on workflows
-      - actions-**
-      - upcoming-**
+      - 'main'
+      - 'prod-**'
+  # Run on pull requests, but only for the below targets
+  pull_request:
+    branches:
+      - 'main'
+      - 'next-**'
   schedule:
     # run this Action every 14 days
     - cron: '0 * */14 * *'
+  # Run on demand
   workflow_dispatch:
 
 permissions:
diff --git a/.github/workflows/node.js-tests.yml b/.github/workflows/node.js-tests.yml
index c434960e7b4..5dd1891c297 100644
--- a/.github/workflows/node.js-tests.yml
+++ b/.github/workflows/node.js-tests.yml
@@ -1,14 +1,21 @@
 name: CI - Node.js Test Current
 env:
   NODE_OPTIONS: '--max_old_space_size=6144'
+
 on:
+  # Run on push events, but only for the below branches
   push:
-    branches-ignore:
-      - 'renovate/**'
-      - 'next-api'
+    branches:
+      - 'main'
+      - 'prod-**'
+  # Run on pull requests, but only for the below targets
   pull_request:
-    branches-ignore:
-      - 'next-api'
+    branches:
+      - 'main'
+      - 'next-**'
+  # Run on Merge Queue
+  merge_group:
+    types: [checks_requested]
 
 permissions:
   contents: read

From 028112f2154fb7395a19e925a9ad0f511740976f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 Feb 2023 17:02:48 +0530
Subject: [PATCH 38/52] fix(deps): update dependency
 @growthbook/growthbook-react to v0.11.2 (#49344)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 client/package.json |  2 +-
 package-lock.json   | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/client/package.json b/client/package.json
index 5ca557ff12f..8575287edf7 100644
--- a/client/package.json
+++ b/client/package.json
@@ -48,7 +48,7 @@
     "@freecodecamp/react-bootstrap": "0.32.3",
     "@freecodecamp/react-calendar-heatmap": "1.0.0",
     "@freecodecamp/strip-comments": "3.0.1",
-    "@growthbook/growthbook-react": "0.11.1",
+    "@growthbook/growthbook-react": "0.11.2",
     "@loadable/component": "5.15.3",
     "@reach/router": "1.3.4",
     "@sentry/gatsby": "6.19.7",
diff --git a/package-lock.json b/package-lock.json
index f51de4f6672..24d719e9a6c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -441,7 +441,7 @@
         "@freecodecamp/react-bootstrap": "0.32.3",
         "@freecodecamp/react-calendar-heatmap": "1.0.0",
         "@freecodecamp/strip-comments": "3.0.1",
-        "@growthbook/growthbook-react": "0.11.1",
+        "@growthbook/growthbook-react": "0.11.2",
         "@loadable/component": "5.15.3",
         "@reach/router": "1.3.4",
         "@sentry/gatsby": "6.19.7",
@@ -3688,19 +3688,19 @@
       "license": "0BSD"
     },
     "node_modules/@growthbook/growthbook": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@growthbook/growthbook/-/growthbook-0.21.1.tgz",
-      "integrity": "sha512-R5A2hnnEdSFCs7YyBGg4MujlwFiFZ43I4OIIjGYCGB+Y/m+9dl6DAR7c3uvtGRgiGqR51KtWrecJKq2mIP25Jg==",
+      "version": "0.21.2",
+      "resolved": "https://registry.npmjs.org/@growthbook/growthbook/-/growthbook-0.21.2.tgz",
+      "integrity": "sha512-kAu6LH02krkS+IxfQbe5mGYfPCGrmw+Cm9N3BChc151anhhVvMd8KS1m+vev6yEPnY606BouxE6a3SuDmmCF4g==",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/@growthbook/growthbook-react": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/@growthbook/growthbook-react/-/growthbook-react-0.11.1.tgz",
-      "integrity": "sha512-xVFf5BxgiJkocKHZXE2QfFXX6p+ZFxRGTrDGVWjnD8TwuBgNdqrcIGF0n/bnH3XQ9bSbWEgh7WjI2UqxuTZXaQ==",
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/@growthbook/growthbook-react/-/growthbook-react-0.11.2.tgz",
+      "integrity": "sha512-C2O4F3Sf28vFDM8Bv3xj9wYAeCVm5r2ykGzWjtezrhd2MVc38gFVOz3tIMg79xJiffM50NF7G+qIm4Y664rV8Q==",
       "dependencies": {
-        "@growthbook/growthbook": "^0.21.1"
+        "@growthbook/growthbook": "^0.21.2"
       },
       "engines": {
         "node": ">=10"
@@ -56276,7 +56276,7 @@
         "@freecodecamp/react-bootstrap": "0.32.3",
         "@freecodecamp/react-calendar-heatmap": "1.0.0",
         "@freecodecamp/strip-comments": "3.0.1",
-        "@growthbook/growthbook-react": "0.11.1",
+        "@growthbook/growthbook-react": "0.11.2",
         "@loadable/component": "5.15.3",
         "@reach/router": "1.3.4",
         "@sentry/gatsby": "6.19.7",
@@ -56891,16 +56891,16 @@
       }
     },
     "@growthbook/growthbook": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@growthbook/growthbook/-/growthbook-0.21.1.tgz",
-      "integrity": "sha512-R5A2hnnEdSFCs7YyBGg4MujlwFiFZ43I4OIIjGYCGB+Y/m+9dl6DAR7c3uvtGRgiGqR51KtWrecJKq2mIP25Jg=="
+      "version": "0.21.2",
+      "resolved": "https://registry.npmjs.org/@growthbook/growthbook/-/growthbook-0.21.2.tgz",
+      "integrity": "sha512-kAu6LH02krkS+IxfQbe5mGYfPCGrmw+Cm9N3BChc151anhhVvMd8KS1m+vev6yEPnY606BouxE6a3SuDmmCF4g=="
     },
     "@growthbook/growthbook-react": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/@growthbook/growthbook-react/-/growthbook-react-0.11.1.tgz",
-      "integrity": "sha512-xVFf5BxgiJkocKHZXE2QfFXX6p+ZFxRGTrDGVWjnD8TwuBgNdqrcIGF0n/bnH3XQ9bSbWEgh7WjI2UqxuTZXaQ==",
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/@growthbook/growthbook-react/-/growthbook-react-0.11.2.tgz",
+      "integrity": "sha512-C2O4F3Sf28vFDM8Bv3xj9wYAeCVm5r2ykGzWjtezrhd2MVc38gFVOz3tIMg79xJiffM50NF7G+qIm4Y664rV8Q==",
       "requires": {
-        "@growthbook/growthbook": "^0.21.1"
+        "@growthbook/growthbook": "^0.21.2"
       }
     },
     "@hapi/address": {

From ea7df4fb9adc37d254aa2e435df42045aa5ac671 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 Feb 2023 16:53:33 +0530
Subject: [PATCH 39/52] fix(deps): update font awesome to v6.3.0 (#49357)

* fix(deps): update font awesome to v6.3.0

* update profile snapshot for the new icon

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Sboonny <muhammed@freecodecamp.org>
---
 client/package.json                           |  6 +-
 .../__snapshots__/profile.test.tsx.snap       |  2 +-
 package-lock.json                             | 60 +++++++++++--------
 3 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/client/package.json b/client/package.json
index 8575287edf7..0e3bb2e9514 100644
--- a/client/package.json
+++ b/client/package.json
@@ -39,9 +39,9 @@
     "@babel/preset-env": "7.20.2",
     "@babel/preset-react": "7.18.6",
     "@babel/standalone": "7.20.15",
-    "@fortawesome/fontawesome-svg-core": "6.2.1",
-    "@fortawesome/free-brands-svg-icons": "6.2.1",
-    "@fortawesome/free-solid-svg-icons": "6.2.1",
+    "@fortawesome/fontawesome-svg-core": "6.3.0",
+    "@fortawesome/free-brands-svg-icons": "6.3.0",
+    "@fortawesome/free-solid-svg-icons": "6.3.0",
     "@fortawesome/react-fontawesome": "0.2.0",
     "@freecodecamp/curriculum-helpers": "1.1.0",
     "@freecodecamp/loop-protect": "3.0.0",
diff --git a/client/src/components/profile/__snapshots__/profile.test.tsx.snap b/client/src/components/profile/__snapshots__/profile.test.tsx.snap
index bcb90fcb3d5..33e47cfaedf 100644
--- a/client/src/components/profile/__snapshots__/profile.test.tsx.snap
+++ b/client/src/components/profile/__snapshots__/profile.test.tsx.snap
@@ -232,7 +232,7 @@ exports[`<Profile/> renders correctly 1`] = `
               xmlns="http://www.w3.org/2000/svg"
             >
               <path
-                d="M579.8 267.7c56.5-56.5 56.5-148 0-204.5c-50-50-128.8-56.5-186.3-15.4l-1.6 1.1c-14.4 10.3-17.7 30.3-7.4 44.6s30.3 17.7 44.6 7.4l1.6-1.1c32.1-22.9 76-19.3 103.8 8.6c31.5 31.5 31.5 82.5 0 114L422.3 334.8c-31.5 31.5-82.5 31.5-114 0c-27.9-27.9-31.5-71.8-8.6-103.8l1.1-1.6c10.3-14.4 6.9-34.4-7.4-44.6s-34.4-6.9-44.6 7.4l-1.1 1.6C206.5 251.2 213 330 263 380c56.5 56.5 148 56.5 204.5 0L579.8 267.7zM60.2 244.3c-56.5 56.5-56.5 148 0 204.5c50 50 128.8 56.5 186.3 15.4l1.6-1.1c14.4-10.3 17.7-30.3 7.4-44.6s-30.3-17.7-44.6-7.4l-1.6 1.1c-32.1 22.9-76 19.3-103.8-8.6C74 372 74 321 105.5 289.5L217.7 177.2c31.5-31.5 82.5-31.5 114 0c27.9 27.9 31.5 71.8 8.6 103.9l-1.1 1.6c-10.3 14.4-6.9 34.4 7.4 44.6s34.4 6.9 44.6-7.4l1.1-1.6C433.5 260.8 427 182 377 132c-56.5-56.5-148-56.5-204.5 0L60.2 244.3z"
+                d="M562.8 267.7c56.5-56.5 56.5-148 0-204.5c-50-50-128.8-56.5-186.3-15.4l-1.6 1.1c-14.4 10.3-17.7 30.3-7.4 44.6s30.3 17.7 44.6 7.4l1.6-1.1c32.1-22.9 76-19.3 103.8 8.6c31.5 31.5 31.5 82.5 0 114L405.3 334.8c-31.5 31.5-82.5 31.5-114 0c-27.9-27.9-31.5-71.8-8.6-103.8l1.1-1.6c10.3-14.4 6.9-34.4-7.4-44.6s-34.4-6.9-44.6 7.4l-1.1 1.6C189.5 251.2 196 330 246 380c56.5 56.5 148 56.5 204.5 0L562.8 267.7zM43.2 244.3c-56.5 56.5-56.5 148 0 204.5c50 50 128.8 56.5 186.3 15.4l1.6-1.1c14.4-10.3 17.7-30.3 7.4-44.6s-30.3-17.7-44.6-7.4l-1.6 1.1c-32.1 22.9-76 19.3-103.8-8.6C57 372 57 321 88.5 289.5L200.7 177.2c31.5-31.5 82.5-31.5 114 0c27.9 27.9 31.5 71.8 8.6 103.9l-1.1 1.6c-10.3 14.4-6.9 34.4 7.4 44.6s34.4 6.9 44.6-7.4l1.1-1.6C416.5 260.8 410 182 360 132c-56.5-56.5-148-56.5-204.5 0L43.2 244.3z"
                 fill="currentColor"
               />
             </svg>
diff --git a/package-lock.json b/package-lock.json
index 24d719e9a6c..8ac40b4f8e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -432,9 +432,9 @@
         "@babel/preset-env": "7.20.2",
         "@babel/preset-react": "7.18.6",
         "@babel/standalone": "7.20.15",
-        "@fortawesome/fontawesome-svg-core": "6.2.1",
-        "@fortawesome/free-brands-svg-icons": "6.2.1",
-        "@fortawesome/free-solid-svg-icons": "6.2.1",
+        "@fortawesome/fontawesome-svg-core": "6.3.0",
+        "@fortawesome/free-brands-svg-icons": "6.3.0",
+        "@fortawesome/free-solid-svg-icons": "6.3.0",
         "@fortawesome/react-fontawesome": "0.2.0",
         "@freecodecamp/curriculum-helpers": "1.1.0",
         "@freecodecamp/loop-protect": "3.0.0",
@@ -3196,41 +3196,45 @@
       }
     },
     "node_modules/@fortawesome/fontawesome-common-types": {
-      "version": "6.2.1",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz",
+      "integrity": "sha512-4BC1NMoacEBzSXRwKjZ/X/gmnbp/HU5Qqat7E8xqorUtBFZS+bwfGH5/wqOC2K6GV0rgEobp3OjGRMa5fK9pFg==",
       "hasInstallScript": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/fontawesome-svg-core": {
-      "version": "6.2.1",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.3.0.tgz",
+      "integrity": "sha512-uz9YifyKlixV6AcKlOX8WNdtF7l6nakGyLYxYaCa823bEBqyj/U2ssqtctO38itNEwXb8/lMzjdoJ+aaJuOdrw==",
       "hasInstallScript": true,
-      "license": "MIT",
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "6.2.1"
+        "@fortawesome/fontawesome-common-types": "6.3.0"
       },
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/free-brands-svg-icons": {
-      "version": "6.2.1",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.3.0.tgz",
+      "integrity": "sha512-xI0c+a8xnKItAXCN8rZgCNCJQiVAd2Y7p9e2ND6zN3J3ekneu96qrePieJ7yA7073C1JxxoM3vH1RU7rYsaj8w==",
       "hasInstallScript": true,
-      "license": "(CC-BY-4.0 AND MIT)",
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "6.2.1"
+        "@fortawesome/fontawesome-common-types": "6.3.0"
       },
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/free-solid-svg-icons": {
-      "version": "6.2.1",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.3.0.tgz",
+      "integrity": "sha512-x5tMwzF2lTH8pyv8yeZRodItP2IVlzzmBuD1M7BjawWgg9XAvktqJJ91Qjgoaf8qJpHQ8FEU9VxRfOkLhh86QA==",
       "hasInstallScript": true,
-      "license": "(CC-BY-4.0 AND MIT)",
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "6.2.1"
+        "@fortawesome/fontawesome-common-types": "6.3.0"
       },
       "engines": {
         "node": ">=6"
@@ -55871,24 +55875,32 @@
       }
     },
     "@fortawesome/fontawesome-common-types": {
-      "version": "6.2.1"
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz",
+      "integrity": "sha512-4BC1NMoacEBzSXRwKjZ/X/gmnbp/HU5Qqat7E8xqorUtBFZS+bwfGH5/wqOC2K6GV0rgEobp3OjGRMa5fK9pFg=="
     },
     "@fortawesome/fontawesome-svg-core": {
-      "version": "6.2.1",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.3.0.tgz",
+      "integrity": "sha512-uz9YifyKlixV6AcKlOX8WNdtF7l6nakGyLYxYaCa823bEBqyj/U2ssqtctO38itNEwXb8/lMzjdoJ+aaJuOdrw==",
       "requires": {
-        "@fortawesome/fontawesome-common-types": "6.2.1"
+        "@fortawesome/fontawesome-common-types": "6.3.0"
       }
     },
     "@fortawesome/free-brands-svg-icons": {
-      "version": "6.2.1",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.3.0.tgz",
+      "integrity": "sha512-xI0c+a8xnKItAXCN8rZgCNCJQiVAd2Y7p9e2ND6zN3J3ekneu96qrePieJ7yA7073C1JxxoM3vH1RU7rYsaj8w==",
       "requires": {
-        "@fortawesome/fontawesome-common-types": "6.2.1"
+        "@fortawesome/fontawesome-common-types": "6.3.0"
       }
     },
     "@fortawesome/free-solid-svg-icons": {
-      "version": "6.2.1",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.3.0.tgz",
+      "integrity": "sha512-x5tMwzF2lTH8pyv8yeZRodItP2IVlzzmBuD1M7BjawWgg9XAvktqJJ91Qjgoaf8qJpHQ8FEU9VxRfOkLhh86QA==",
       "requires": {
-        "@fortawesome/fontawesome-common-types": "6.2.1"
+        "@fortawesome/fontawesome-common-types": "6.3.0"
       }
     },
     "@fortawesome/react-fontawesome": {
@@ -56267,9 +56279,9 @@
         "@babel/types": "7.20.7",
         "@codesee/babel-plugin-instrument": "0.494.0",
         "@codesee/tracker": "0.494.0",
-        "@fortawesome/fontawesome-svg-core": "6.2.1",
-        "@fortawesome/free-brands-svg-icons": "6.2.1",
-        "@fortawesome/free-solid-svg-icons": "6.2.1",
+        "@fortawesome/fontawesome-svg-core": "6.3.0",
+        "@fortawesome/free-brands-svg-icons": "6.3.0",
+        "@fortawesome/free-solid-svg-icons": "6.3.0",
         "@fortawesome/react-fontawesome": "0.2.0",
         "@freecodecamp/curriculum-helpers": "1.1.0",
         "@freecodecamp/loop-protect": "3.0.0",

From 2b63eaa8bb7da1871485fead597d793780b6b8e1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 Feb 2023 17:01:28 +0530
Subject: [PATCH 40/52] chore(deps): update dependency joi to v17.7.1 (#49339)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 curriculum/package.json |  2 +-
 package-lock.json       | 38 +++++++++++++++++++++++++-------------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/curriculum/package.json b/curriculum/package.json
index f79e8a1b0eb..1f00eca189a 100644
--- a/curriculum/package.json
+++ b/curriculum/package.json
@@ -44,7 +44,7 @@
     "cross-env": "7.0.3",
     "css": "3.0.0",
     "invariant": "2.2.4",
-    "joi": "17.7.0",
+    "joi": "17.7.1",
     "joi-objectid": "3.0.1",
     "js-yaml": "4.0.0",
     "jsdom": "16.7.0",
diff --git a/package-lock.json b/package-lock.json
index 8ac40b4f8e2..6472a1f80a0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -654,7 +654,7 @@
         "cross-env": "7.0.3",
         "css": "3.0.0",
         "invariant": "2.2.4",
-        "joi": "17.7.0",
+        "joi": "17.7.1",
         "joi-objectid": "3.0.1",
         "js-yaml": "4.0.0",
         "jsdom": "16.7.0",
@@ -5490,8 +5490,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@sideway/formula": {
-      "version": "3.0.0",
-      "license": "BSD-3-Clause"
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+      "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="
     },
     "node_modules/@sideway/pinpoint": {
       "version": "2.0.0",
@@ -33267,13 +33268,14 @@
       }
     },
     "node_modules/joi": {
-      "version": "17.7.0",
-      "license": "BSD-3-Clause",
+      "version": "17.7.1",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.7.1.tgz",
+      "integrity": "sha512-teoLhIvWE298R6AeJywcjR4sX2hHjB3/xJX4qPjg+gTg+c0mzUDsziYlqPmLomq9gVsfaMcgPaGc7VxtD/9StA==",
       "dependencies": {
         "@hapi/hoek": "^9.0.0",
         "@hapi/topo": "^5.0.0",
         "@sideway/address": "^4.1.3",
-        "@sideway/formula": "^3.0.0",
+        "@sideway/formula": "^3.0.1",
         "@sideway/pinpoint": "^2.0.0"
       }
     },
@@ -33284,11 +33286,13 @@
     },
     "node_modules/joi/node_modules/@hapi/hoek": {
       "version": "9.3.0",
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
     },
     "node_modules/joi/node_modules/@hapi/topo": {
       "version": "5.1.0",
-      "license": "BSD-3-Clause",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
       "dependencies": {
         "@hapi/hoek": "^9.0.0"
       }
@@ -56470,7 +56474,7 @@
         "cross-env": "7.0.3",
         "css": "3.0.0",
         "invariant": "2.2.4",
-        "joi": "17.7.0",
+        "joi": "17.7.1",
         "joi-objectid": "3.0.1",
         "js-yaml": "4.0.0",
         "jsdom": "16.7.0",
@@ -58064,7 +58068,9 @@
       }
     },
     "@sideway/formula": {
-      "version": "3.0.0"
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+      "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="
     },
     "@sideway/pinpoint": {
       "version": "2.0.0"
@@ -77315,20 +77321,26 @@
       "version": "0.15.0"
     },
     "joi": {
-      "version": "17.7.0",
+      "version": "17.7.1",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.7.1.tgz",
+      "integrity": "sha512-teoLhIvWE298R6AeJywcjR4sX2hHjB3/xJX4qPjg+gTg+c0mzUDsziYlqPmLomq9gVsfaMcgPaGc7VxtD/9StA==",
       "requires": {
         "@hapi/hoek": "^9.0.0",
         "@hapi/topo": "^5.0.0",
         "@sideway/address": "^4.1.3",
-        "@sideway/formula": "^3.0.0",
+        "@sideway/formula": "^3.0.1",
         "@sideway/pinpoint": "^2.0.0"
       },
       "dependencies": {
         "@hapi/hoek": {
-          "version": "9.3.0"
+          "version": "9.3.0",
+          "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+          "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
         },
         "@hapi/topo": {
           "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+          "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
           "requires": {
             "@hapi/hoek": "^9.0.0"
           }

From b4fa56be3ed7cc940b4686814b611bb185ce21cb Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:02:49 +0530
Subject: [PATCH 41/52] feat(tools): sentry apm and other telemetry (#49230)

---
 api-server/package.json        |   3 +-
 api-server/src/server/index.js |  21 +++-
 package-lock.json              | 174 ++++++++++++++++++++++++++++++---
 3 files changed, 181 insertions(+), 17 deletions(-)

diff --git a/api-server/package.json b/api-server/package.json
index 8b2b9214fea..f01fec9df07 100644
--- a/api-server/package.json
+++ b/api-server/package.json
@@ -29,7 +29,8 @@
   },
   "dependencies": {
     "@freecodecamp/loopback-component-passport": "1.2.0",
-    "@sentry/node": "6.19.7",
+    "@sentry/node": "7.37.1",
+    "@sentry/tracing": "7.37.1",
     "accepts": "1.3.8",
     "axios": "0.23.0",
     "bad-words": "3.0.4",
diff --git a/api-server/src/server/index.js b/api-server/src/server/index.js
index 6c350cf2cfb..347cb159547 100644
--- a/api-server/src/server/index.js
+++ b/api-server/src/server/index.js
@@ -2,6 +2,7 @@ const path = require('path');
 require('dotenv').config({ path: path.resolve(__dirname, '../../../.env') });
 
 const Sentry = require('@sentry/node');
+const Tracing = require('@sentry/tracing');
 const createDebugger = require('debug');
 const _ = require('lodash');
 const loopback = require('loopback');
@@ -14,16 +15,32 @@ const { setupPassport } = require('./component-passport');
 const log = createDebugger('fcc:server');
 const reqLogFormat = ':date[iso] :status :method :response-time ms - :url';
 
+const app = loopback();
+
 if (sentry.dsn === 'dsn_from_sentry_dashboard') {
   log('Sentry reporting disabled unless DSN is provided.');
 } else {
   Sentry.init({
-    dsn: sentry.dsn
+    dsn: sentry.dsn,
+    integrations: [
+      new Sentry.Integrations.Http({ tracing: true }),
+      new Tracing.Integrations.Express({
+        app
+      })
+    ],
+    // Capture 20% of transactions to avoid
+    // overwhelming Sentry and remain within
+    // the usage quota
+    tracesSampleRate: 0.2
   });
   log('Sentry initialized');
 }
 
-const app = loopback();
+// RequestHandler creates a separate execution context using domains, so that every
+// transaction/span/breadcrumb is attached to its own Hub instance
+app.use(Sentry.Handlers.requestHandler());
+// TracingHandler creates a trace for every incoming request
+app.use(Sentry.Handlers.tracingHandler());
 
 app.set('state namespace', '__fcc__');
 app.set('port', process.env.API_PORT || 3000);
diff --git a/package-lock.json b/package-lock.json
index 6472a1f80a0..32a5e2d0649 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -115,7 +115,8 @@
       "license": "BSD-3-Clause",
       "dependencies": {
         "@freecodecamp/loopback-component-passport": "1.2.0",
-        "@sentry/node": "6.19.7",
+        "@sentry/node": "7.37.1",
+        "@sentry/tracing": "7.37.1",
         "accepts": "1.3.8",
         "axios": "0.23.0",
         "bad-words": "3.0.4",
@@ -5416,20 +5417,53 @@
       }
     },
     "node_modules/@sentry/node": {
-      "version": "6.19.7",
-      "license": "BSD-3-Clause",
+      "version": "7.37.1",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.37.1.tgz",
+      "integrity": "sha512-nGerngIo5JwinJgl7m0SaL/xI+YRBlhb53gbkuLSAAcnoitBFzbp7LjywsqYFTWuWDIyk7O2t124GNxtolBAgA==",
       "dependencies": {
-        "@sentry/core": "6.19.7",
-        "@sentry/hub": "6.19.7",
-        "@sentry/types": "6.19.7",
-        "@sentry/utils": "6.19.7",
+        "@sentry/core": "7.37.1",
+        "@sentry/types": "7.37.1",
+        "@sentry/utils": "7.37.1",
         "cookie": "^0.4.1",
         "https-proxy-agent": "^5.0.0",
         "lru_map": "^0.3.3",
         "tslib": "^1.9.3"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
+      }
+    },
+    "node_modules/@sentry/node/node_modules/@sentry/core": {
+      "version": "7.37.1",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz",
+      "integrity": "sha512-eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ==",
+      "dependencies": {
+        "@sentry/types": "7.37.1",
+        "@sentry/utils": "7.37.1",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@sentry/node/node_modules/@sentry/types": {
+      "version": "7.37.1",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz",
+      "integrity": "sha512-c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@sentry/node/node_modules/@sentry/utils": {
+      "version": "7.37.1",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz",
+      "integrity": "sha512-/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA==",
+      "dependencies": {
+        "@sentry/types": "7.37.1",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/@sentry/react": {
@@ -5450,6 +5484,53 @@
         "react": "15.x || 16.x || 17.x || 18.x"
       }
     },
+    "node_modules/@sentry/tracing": {
+      "version": "7.37.1",
+      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.37.1.tgz",
+      "integrity": "sha512-3mQG2XtMCGqDkgfzhKpRJAIfRaokNAOF8WafgAmFmZQwEDsRAFjZ3pLoO+KiBUeQE5E5et7HyWBOl9rqHCkWnQ==",
+      "dependencies": {
+        "@sentry/core": "7.37.1",
+        "@sentry/types": "7.37.1",
+        "@sentry/utils": "7.37.1",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@sentry/tracing/node_modules/@sentry/core": {
+      "version": "7.37.1",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz",
+      "integrity": "sha512-eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ==",
+      "dependencies": {
+        "@sentry/types": "7.37.1",
+        "@sentry/utils": "7.37.1",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@sentry/tracing/node_modules/@sentry/types": {
+      "version": "7.37.1",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz",
+      "integrity": "sha512-c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@sentry/tracing/node_modules/@sentry/utils": {
+      "version": "7.37.1",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz",
+      "integrity": "sha512-/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA==",
+      "dependencies": {
+        "@sentry/types": "7.37.1",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@sentry/types": {
       "version": "6.19.7",
       "license": "BSD-3-Clause",
@@ -55925,7 +56006,8 @@
         "@babel/preset-env": "7.18.0",
         "@babel/register": "7.17.7",
         "@freecodecamp/loopback-component-passport": "1.2.0",
-        "@sentry/node": "6.19.7",
+        "@sentry/node": "7.37.1",
+        "@sentry/tracing": "7.37.1",
         "accepts": "1.3.8",
         "axios": "0.23.0",
         "babel-core": "7.0.0-bridge.0",
@@ -58017,16 +58099,43 @@
       }
     },
     "@sentry/node": {
-      "version": "6.19.7",
+      "version": "7.37.1",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.37.1.tgz",
+      "integrity": "sha512-nGerngIo5JwinJgl7m0SaL/xI+YRBlhb53gbkuLSAAcnoitBFzbp7LjywsqYFTWuWDIyk7O2t124GNxtolBAgA==",
       "requires": {
-        "@sentry/core": "6.19.7",
-        "@sentry/hub": "6.19.7",
-        "@sentry/types": "6.19.7",
-        "@sentry/utils": "6.19.7",
+        "@sentry/core": "7.37.1",
+        "@sentry/types": "7.37.1",
+        "@sentry/utils": "7.37.1",
         "cookie": "^0.4.1",
         "https-proxy-agent": "^5.0.0",
         "lru_map": "^0.3.3",
         "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "@sentry/core": {
+          "version": "7.37.1",
+          "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz",
+          "integrity": "sha512-eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ==",
+          "requires": {
+            "@sentry/types": "7.37.1",
+            "@sentry/utils": "7.37.1",
+            "tslib": "^1.9.3"
+          }
+        },
+        "@sentry/types": {
+          "version": "7.37.1",
+          "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz",
+          "integrity": "sha512-c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug=="
+        },
+        "@sentry/utils": {
+          "version": "7.37.1",
+          "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz",
+          "integrity": "sha512-/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA==",
+          "requires": {
+            "@sentry/types": "7.37.1",
+            "tslib": "^1.9.3"
+          }
+        }
       }
     },
     "@sentry/react": {
@@ -58040,6 +58149,43 @@
         "tslib": "^1.9.3"
       }
     },
+    "@sentry/tracing": {
+      "version": "7.37.1",
+      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.37.1.tgz",
+      "integrity": "sha512-3mQG2XtMCGqDkgfzhKpRJAIfRaokNAOF8WafgAmFmZQwEDsRAFjZ3pLoO+KiBUeQE5E5et7HyWBOl9rqHCkWnQ==",
+      "requires": {
+        "@sentry/core": "7.37.1",
+        "@sentry/types": "7.37.1",
+        "@sentry/utils": "7.37.1",
+        "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "@sentry/core": {
+          "version": "7.37.1",
+          "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz",
+          "integrity": "sha512-eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ==",
+          "requires": {
+            "@sentry/types": "7.37.1",
+            "@sentry/utils": "7.37.1",
+            "tslib": "^1.9.3"
+          }
+        },
+        "@sentry/types": {
+          "version": "7.37.1",
+          "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz",
+          "integrity": "sha512-c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug=="
+        },
+        "@sentry/utils": {
+          "version": "7.37.1",
+          "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz",
+          "integrity": "sha512-/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA==",
+          "requires": {
+            "@sentry/types": "7.37.1",
+            "tslib": "^1.9.3"
+          }
+        }
+      }
+    },
     "@sentry/types": {
       "version": "6.19.7"
     },

From 218fe6605b862553317c4658417f0cc922e67f23 Mon Sep 17 00:00:00 2001
From: camperbot <camperbot@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:32:14 +0530
Subject: [PATCH 42/52] chore(i18n,client): processed translations (#49369)

---
 client/i18n/locales/arabic/intro.json         |  2 +-
 client/i18n/locales/arabic/translations.json  |  6 +--
 client/i18n/locales/espanol/translations.json | 40 +++++++++----------
 .../i18n/locales/portuguese/translations.json |  6 +--
 .../i18n/locales/ukrainian/translations.json  |  6 +--
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/client/i18n/locales/arabic/intro.json b/client/i18n/locales/arabic/intro.json
index 10bb7b668ca..fdc68370e15 100644
--- a/client/i18n/locales/arabic/intro.json
+++ b/client/i18n/locales/arabic/intro.json
@@ -788,7 +788,7 @@
     }
   },
   "the-odin-project": {
-    "title": "The Odin Project",
+    "title": "مشروع أودين",
     "intro": [
       "The Odin Project is one of those \"What I wish I had when I was learning\" resources. ",
       "Not everyone has access to a computer science education or the funds to attend an intensive coding school and neither of those is right for everyone anyway.",
diff --git a/client/i18n/locales/arabic/translations.json b/client/i18n/locales/arabic/translations.json
index 05161c547e8..0f8b449fc7b 100644
--- a/client/i18n/locales/arabic/translations.json
+++ b/client/i18n/locales/arabic/translations.json
@@ -15,8 +15,8 @@
     "show-cert": "عرض الشهادة",
     "claim-cert": "المطالبة بالشهادة",
     "save-progress": "حفظ التقدم",
-    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
-    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
+    "accepted-honesty": "لقد وافقت على سياستنا للصدق الأكاديمي.",
+    "agree-honesty": "أوافق على سياسة freeCodeCamp للصدق الأكاديمي.",
     "save-portfolio": "حفظ عنصر الحافظة هذا",
     "remove-portfolio": "إزالة عنصر الحافظة هذا",
     "add-portfolio": "إضافة عنصر حافظة جديد",
@@ -517,7 +517,7 @@
     "opens-new-window": "فتح في نافذة جديدة"
   },
   "flash": {
-    "honest-first": "To claim a certification, you must first agree to our academic honesty policy",
+    "honest-first": "للمطالبة بشهادة، يجب عليك أولاً الموافقة على سياسة للصدق الأكاديمي",
     "really-weird": "حدث شيء غريب حقاً، إذا حدث مرة أخرى، يرجى النظر في الإبلاغ عنها على https://github.com/freeCodeCamp/freeCodeCamp/issues/new",
     "not-right": "يبدو ان هناك خطأ ما. لقد تم إنشاء تقرير وتم إخطار فريق freeCodeCamp.org",
     "went-wrong": "حدث خطأ ما، الرجاء التحقق والمحاولة مرة أخرى",
diff --git a/client/i18n/locales/espanol/translations.json b/client/i18n/locales/espanol/translations.json
index 6565ee368f9..e9b48effd1c 100644
--- a/client/i18n/locales/espanol/translations.json
+++ b/client/i18n/locales/espanol/translations.json
@@ -11,12 +11,12 @@
     "view": "Ver",
     "view-code": "Mostrar Código",
     "view-project": "Mostrar Proyecto",
-    "view-cert-title": "View {{certTitle}}",
+    "view-cert-title": "Ver {{certTitle}}",
     "show-cert": "Mostrar certificación",
     "claim-cert": "Solicitar certificación",
     "save-progress": "Guardar progreso",
-    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
-    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
+    "accepted-honesty": "Has aceptado nuestra Política de Honestidad Académica.",
+    "agree-honesty": "Estoy de acuerdo con la Política de Honestidad Académica de freeCodeCamp.",
     "save-portfolio": "Guardar este elemento de portafolio",
     "remove-portfolio": "Eliminar este elemento de portafolio",
     "add-portfolio": "Agregar un nuevo elemento de portafolio",
@@ -53,7 +53,7 @@
     "check-code": "Comprueba tu código (Ctrl + Enter)",
     "check-code-2": "Comprueba tu código",
     "reset": "Restablecer",
-    "reset-step": "Reset This Step",
+    "reset-step": "Restablecer este paso",
     "help": "Ayuda",
     "get-help": "Obtener ayuda",
     "watch-video": "Ver un Video",
@@ -159,7 +159,7 @@
       "internet": "Tu presencia en Internet",
       "portfolio": "Ajustes de portafolio",
       "privacy": "Ajustes de privacidad",
-      "personal-info": "Personal Information"
+      "personal-info": "Información Personal"
     },
     "danger": {
       "heading": "Zona de peligro",
@@ -228,12 +228,12 @@
     "page-number": "{{pageNumber}} de {{totalPages}}"
   },
   "footer": {
-    "tax-exempt-status": "freeCodeCamp is a donor-supported tax-exempt 501(c)(3) charitable organization (United States Federal Tax Identification Number: 82-0779546)",
+    "tax-exempt-status": "freeCodeCamp es una organización benéfica 501(c)(3) exenta de impuestos apoyada por donantes (Número de Identificación Fiscal Federal De Los Estados Unidos: 82-0779546)",
     "mission-statement": "Nuestra misión: ayudar a las personas a aprender a programar de forma gratuita. Logramos esto mediante la creación de miles de videos, artículos y lecciones de programación interactivas, todos disponibles gratuitamente para el público. También tenemos miles de grupos de estudio de FreeCodeCamp en todo el mundo.",
     "donation-initiatives": "Las donaciones a freeCodeCamp se destinan a nuestras iniciativas educativas y ayudan a pagar los servidores, los servicios y el personal.",
     "donate-text": "Puedes <1>hacer una donación deducible de impuestos aquí</1>.",
     "trending-guides": "Guías de tendencias",
-    "our-nonprofit": "Our Charity",
+    "our-nonprofit": "Nuestra Caridad",
     "links": {
       "about": "Acerca de",
       "alumni": "Red de ex-Alumnos",
@@ -274,9 +274,9 @@
     "add-subtitles": "Ayudar a mejorar o agregar subtítulos",
     "wrong-answer": "Lo siento, esa no es la respuesta correcta. ¡Vuelve a intentarlo!",
     "check-answer": "Haz clic en el botón de abajo para verificar tu respuesta.",
-    "assignment-not-complete": "Please finish the assignments",
-    "assignments": "Assignments",
-    "question": "Question",
+    "assignment-not-complete": "Por favor, completa las tareas",
+    "assignments": "Asignaciones",
+    "question": "Pregunta",
     "solution-link": "Enlace a la solución",
     "github-link": "Enlace de GitHub",
     "submit-and-go": "Enviar y pasar a mi siguiente desafío",
@@ -335,15 +335,15 @@
     "sorry-dont-giveup": "Lo sentimos, su código no pasa. No te rindas.",
     "challenges-completed": "{{completedCount}} de {{totalChallenges}} desafíos completados",
     "season-greetings-fcc": "Saludos de Temporada de la comunidad freeCodeCamp 🎉",
-    "if-getting-value": "If you're getting a lot out of freeCodeCamp, now is a great time to donate to support our charity's mission.",
+    "if-getting-value": "Si estás obteniendo mucho de freeCodeCamp, ahora es un buen momento para donar con el fin de apoyar nuestra misión sin fines de lucro.",
     "building-a-university": "Estamos construyendo un programa gratuito de grado universitario en ciencias de la computación",
     "if-help-university": "Ya hemos hecho un montón de progresos. Apoyamos nuestra caridad con el largo camino por delante."
   },
   "donate": {
-    "title": "Support our charity",
+    "title": "Apoya nuestra caridad",
     "processing": "Estamos procesando tu donación.",
     "redirecting": "Redirigiendo...",
-    "thanks": "Thanks for donating",
+    "thanks": "Gracias por donar",
     "thank-you": "Gracias por tu apoyo.",
     "additional": "Puede hacer una donación adicional única de cualquier monto utilizando este enlace: <0>{{url}}</0>",
     "help-more": "Ayúdanos a hacer más",
@@ -363,9 +363,9 @@
     "your-donation-2": "Tu donación de ${{usd}} proporcionará {{hours}} horas de aprendizaje a personas de todo el mundo cada mes.",
     "your-donation-3": "Tu donación de ${{usd}} proporcionará {{hours}} horas de aprendizaje a personas de todo el mundo cada año.",
     "become-supporter": "Conviértete en un colaborador",
-    "duration": "Become a one-time supporter of our charity.",
-    "duration-2": "Become a monthly supporter of our charity.",
-    "duration-4": "Become a supporter of our charity",
+    "duration": "Se un benefactor de nuestra organización benéfica con una donación única.",
+    "duration-2": "Se un benefactor mensual de nuestra organización benéfica.",
+    "duration-4": "Se un benefactor de nuestra organización benéfica",
     "nicely-done": "Bien hecho. Acabas de completar {{block}}.",
     "credit-card": "Tarjeta de crédito",
     "credit-card-2": "O dona con una tarjeta de crédito:",
@@ -379,25 +379,25 @@
     "email-receipt": "Correo electrónico (te enviaremos un recibo de donación deducible de impuestos):",
     "need-help": "¿Necesitas ayuda con tus donaciones actuales o pasadas?",
     "forward-receipt": "Envía una copia de tu recibo de donación a donors@freecodecamp.org y dinos cómo podemos ayudar.",
-    "efficiency": "freeCodeCamp is a highly efficient education charity.",
+    "efficiency": "freeCodeCamp es una organización benéfica educativa de gran eficacia.",
     "why-donate-1": "Cuando donas a freeCodeCamp, ayudas a las personas a aprender nuevas habilidades y proveer para sus familias",
     "why-donate-2": "También nos ayudas a crear nuevos recursos para que los utilices y amplíes tus propias habilidades tecnológicas.",
     "bigger-donation": "¿Quieres hacer una donación más grande de una sola vez, envíanos un cheque o da de otras maneras?",
-    "other-ways": "Here are many <0>other ways you can support our charity's mission</0>.",
+    "other-ways": "Aquí hay muchas <0>otras formas de apoyar la misión de nuestra organización benéfica</0>.",
     "failed-pay": "Oh no. Parece que tu transacción no se realizó. ¿Podrías intentarlo de nuevo?",
     "try-again": "Por favor, intenta de nuevo.",
     "card-number": "Tu número de tarjeta:",
     "expiration": "Fecha de vencimiento:",
     "secure-donation": "Donación segura",
     "faq": "Preguntas frecuentes",
-    "only-you": "Only you can see this message. Congratulations on earning this certification. It's no easy task. Running freeCodeCamp isn't easy either. Nor is it cheap. Help us help you and many other people around the world. Make a tax-deductible supporting donation to our charity today.",
+    "only-you": "Sólo tu puedes ver este mensaje. Enhorabuena por haber obtenido esta certificación. No es tarea fácil. Administrar freeCodeCamp tampoco es fácil. Tampoco es barato. Ayúdanos a ayudarte a ti y a muchas otras personas de todo el mundo. Haz hoy una donación deducible de impuestos a nuestra organización benéfica.",
     "get-help": "¿Cómo puedo obtener ayuda con mis donaciones?",
     "how-transparent": "¿Qué tan transparente es freeCodeCamp.org?",
     "very-transparent": "Muy Transparente. Tenemos una valoración de transparencia de platino en GuideStar.org.",
     "download-irs": "Puedes <0>descargar nuestra Carta de Determinación de IRS aquí</0>.",
     "download-990": "Puedes <0>descargar nuestro 990 más reciente (informe anual de impuestos) aquí</0>.",
     "how-efficient": "¿Qué tan eficiente es freeCodeCamp?",
-    "fcc-budget": "freeCodeCamp's budget is much smaller than most comparable charity. We haven't brought in professional fundraisers. Instead, Quincy does everything himself.",
+    "fcc-budget": "El presupuesto de freeCodeCamp es mucho menor que el de la mayoría de organizaciones benéficas comparables. No hemos contratado a profesionales para recaudar fondos. En su lugar, Quincy lo hace todo él mismo.",
     "help-millions": "Sin embargo, con un presupuesto de tan sólo unos cientos de miles de dólares al año, hemos podido ayudar a millones de personas.",
     "how-one-time": "¿Cómo puedo realizar una donación única?",
     "one-time": "Si prefieres hacer donaciones únicas, puedes apoyar la misión de freeCodeCamp cuando tengas dinero suficiente para hacer una aportación. Puedes usar <0>este enlace para donar cualquier cantidad que te sea cómodo a través de PayPal</0>.",
diff --git a/client/i18n/locales/portuguese/translations.json b/client/i18n/locales/portuguese/translations.json
index 1d6f945a5e5..8d45abc16c5 100644
--- a/client/i18n/locales/portuguese/translations.json
+++ b/client/i18n/locales/portuguese/translations.json
@@ -15,8 +15,8 @@
     "show-cert": "Exibir certificado",
     "claim-cert": "Solicitar certificação",
     "save-progress": "Salvar progresso",
-    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
-    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
+    "accepted-honesty": "Você concordou com nossa política de honestidade acadêmica.",
+    "agree-honesty": "Concordo com a Política de Honestidade Acadêmica do FreeCodeCamp.",
     "save-portfolio": "Salvar esse item de portfólio",
     "remove-portfolio": "Remover este item de portfólio",
     "add-portfolio": "Adicionar um novo item de portfólio",
@@ -517,7 +517,7 @@
     "opens-new-window": "Abre em uma nova janela"
   },
   "flash": {
-    "honest-first": "To claim a certification, you must first agree to our academic honesty policy",
+    "honest-first": "Para solicitar uma certificação, você precisa primeiro concordar com nossa política de honestidade acadêmica",
     "really-weird": "Algo realmente estranho aconteceu. Se acontecer novamente, considere apresentar um problema pelo endereço https://github.com/freeCodeCamp/freeCodeCamp/issues/new",
     "not-right": "Algo não está certo. Um relatório foi gerado e a equipe do freeCodeCamp.org foi notificada",
     "went-wrong": "Algo deu errado. Verifique e tente novamente",
diff --git a/client/i18n/locales/ukrainian/translations.json b/client/i18n/locales/ukrainian/translations.json
index 16aab52cdae..6d28efd4d02 100644
--- a/client/i18n/locales/ukrainian/translations.json
+++ b/client/i18n/locales/ukrainian/translations.json
@@ -15,8 +15,8 @@
     "show-cert": "Показати сертифікацію",
     "claim-cert": "Отримати сертифікацію",
     "save-progress": "Зберегти прогрес",
-    "accepted-honesty": "You have agreed to our Academic Honesty Policy.",
-    "agree-honesty": "I agree to freeCodeCamp's Academic Honesty Policy.",
+    "accepted-honesty": "Ви погодились з нашою політикою академічної доброчесності.",
+    "agree-honesty": "Я погоджуюсь з політикою академічної доброчесності freeCodeCamp.",
     "save-portfolio": "Зберегти цей елемент портфоліо",
     "remove-portfolio": "Видалити цей елемент портфоліо",
     "add-portfolio": "Додати новий елемент портфоліо",
@@ -517,7 +517,7 @@
     "opens-new-window": "Відкривається у новому вікні"
   },
   "flash": {
-    "honest-first": "To claim a certification, you must first agree to our academic honesty policy",
+    "honest-first": "Щоб отримати сертифікацію, ви повинні спочатку погодитись з нашою політикою академічної доброчесності",
     "really-weird": "Щось пішло не так. Якщо це повториться, будь ласка, повідомте про це за посиланням: https://github.com/freeCodeCamp/freeCodeCamp/issues/new",
     "not-right": "Щось пішло не так. Звіт було сформовано і команду freeCodeCamp.org вже сповістили.",
     "went-wrong": "Щось пішло не так. Будь ласка, перевірте та повторіть спробу.",

From 4ff00922da46306f10bac2739dfea4177d5ee35f Mon Sep 17 00:00:00 2001
From: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
Date: Mon, 13 Feb 2023 16:13:50 +0100
Subject: [PATCH 43/52] refactor: fix hidden eslint errors (#49365)

* refactor: explicit types for validate

* refactor: explicit return types for ui-components

* refactor: use exec instead of match

* refactor: add lots more boundary types

* refactor: more eslint warnings

* refactor: more explicit exports

* refactor: more explicit types

* refactor: even more explicit types

* fix: relax type contrainsts for superblock-order

* refactor: final boundaries

* refactor: avoid using 'object' type

* fix: use named import for captureException

This uses TypeScript (which works) instead of import/namespace
(which doesn't) to check if captureException exists in sentry/gatsby
(it does)
---
 client/i18n/schema-validation.ts              |  2 +-
 .../SolutionViewer/SolutionViewer.tsx         |  2 +-
 .../src/components/helpers/full-width-row.tsx | 19 +++++++------
 client/src/components/seo/index.tsx           | 15 +++++++++-
 .../solution-display-widget/index.tsx         |  2 +-
 .../Challenges/classic/mobile-layout.tsx      |  8 +++---
 .../Challenges/rechallenge/builders.ts        |  2 +-
 .../src/templates/Challenges/utils/build.ts   | 28 +++++++++++++------
 .../src/templates/Challenges/utils/frame.ts   | 13 ++++++---
 .../src/templates/Challenges/utils/index.ts   |  2 +-
 client/src/utils/ajax.ts                      |  2 ++
 client/src/utils/challenge-request-helpers.ts | 20 +++++++++++--
 client/src/utils/report-error.ts              |  4 +--
 client/src/utils/solution-display-type.ts     | 10 ++++++-
 client/src/utils/superblock-map-titles.ts     |  2 +-
 config/donation-settings.ts                   | 18 ++++++++++--
 config/i18n.ts                                |  2 +-
 config/superblock-order.ts                    | 12 ++++++--
 .../api/routes/block-route.ts                 |  5 +++-
 .../api/routes/index-route.ts                 |  2 +-
 .../challenge-editor/api/routes/save-route.ts |  2 +-
 .../challenge-editor/api/routes/step-route.ts |  2 +-
 .../api/routes/super-block-route.ts           |  5 +++-
 .../api/routes/tools-route.ts                 |  5 +++-
 .../challenge-editor/api/utils/get-blocks.ts  |  7 ++++-
 .../api/utils/get-step-contents.ts            |  2 +-
 tools/challenge-editor/api/utils/get-steps.ts |  8 +++++-
 tools/challenge-editor/api/utils/save-step.ts |  2 +-
 tools/challenge-helper-scripts/commands.ts    |  6 ++--
 tools/challenge-helper-scripts/utils.ts       |  8 +++---
 tools/scripts/build/schema/trending-schema.ts |  2 +-
 .../src/color-system/color-system.stories.tsx |  2 +-
 .../src/color-system/color-system.tsx         |  2 +-
 .../form-control/form-control-feedback.tsx    |  2 +-
 .../src/form-control/form-control-static.tsx  |  2 +-
 .../utils/gen-component-script.ts             |  2 +-
 .../utils/gen-component-template.ts           | 14 +++++-----
 utils/get-lines.ts                            |  2 +-
 utils/index.ts                                |  8 ++++--
 utils/validate.ts                             | 27 ++++++++++++++----
 40 files changed, 196 insertions(+), 84 deletions(-)

diff --git a/client/i18n/schema-validation.ts b/client/i18n/schema-validation.ts
index 02c0e86a1b6..d9ccd807d23 100644
--- a/client/i18n/schema-validation.ts
+++ b/client/i18n/schema-validation.ts
@@ -215,7 +215,7 @@ const schemaValidation = (
   if (
     fileName === 'motivation' &&
     !(fileJson.motivationalQuotes as MotivationalQuotes).every(
-      (object: object) =>
+      object =>
         Object.prototype.hasOwnProperty.call(object, 'quote') &&
         Object.prototype.hasOwnProperty.call(object, 'author')
     )
diff --git a/client/src/components/SolutionViewer/SolutionViewer.tsx b/client/src/components/SolutionViewer/SolutionViewer.tsx
index 255d9bf607d..841146b438b 100644
--- a/client/src/components/SolutionViewer/SolutionViewer.tsx
+++ b/client/src/components/SolutionViewer/SolutionViewer.tsx
@@ -9,7 +9,7 @@ type Props = {
 };
 type Solution = Pick<ChallengeFile, 'ext' | 'contents' | 'fileKey'>;
 
-function SolutionViewer({ challengeFiles, solution }: Props) {
+function SolutionViewer({ challengeFiles, solution }: Props): JSX.Element {
   const isLegacy = !challengeFiles || !challengeFiles.length;
   const solutions = isLegacy
     ? [
diff --git a/client/src/components/helpers/full-width-row.tsx b/client/src/components/helpers/full-width-row.tsx
index e91da137a59..707b6621b62 100644
--- a/client/src/components/helpers/full-width-row.tsx
+++ b/client/src/components/helpers/full-width-row.tsx
@@ -6,15 +6,16 @@ interface FullWidthRowProps {
   className?: string;
 }
 
-const FullWidthRow = ({ children, className }: FullWidthRowProps) => {
-  return (
-    <Row className={className}>
-      <Col sm={8} smOffset={2} xs={12}>
-        {children}
-      </Col>
-    </Row>
-  );
-};
+const FullWidthRow = ({
+  children,
+  className
+}: FullWidthRowProps): JSX.Element => (
+  <Row className={className}>
+    <Col sm={8} smOffset={2} xs={12}>
+      {children}
+    </Col>
+  </Row>
+);
 
 FullWidthRow.displayName = 'FullWidthRow';
 
diff --git a/client/src/components/seo/index.tsx b/client/src/components/seo/index.tsx
index 9abb02284cf..25b40ca884a 100644
--- a/client/src/components/seo/index.tsx
+++ b/client/src/components/seo/index.tsx
@@ -17,10 +17,23 @@ interface SiteData {
   };
 }
 
+interface Item {
+  '@type': 'Course';
+  url: string;
+  name: string;
+  description?: string;
+  provider: {
+    '@type': 'Organization';
+    name: string;
+    sameAs: string;
+    nonprofitStatus: string;
+  };
+}
+
 interface ListItem {
   '@type': 'ListItem';
   position: number;
-  item: object;
+  item: Item;
 }
 
 interface StructuredData {
diff --git a/client/src/components/solution-display-widget/index.tsx b/client/src/components/solution-display-widget/index.tsx
index 50694807034..b720163ae25 100644
--- a/client/src/components/solution-display-widget/index.tsx
+++ b/client/src/components/solution-display-widget/index.tsx
@@ -22,7 +22,7 @@ export function SolutionDisplayWidget({
   showUserCode,
   showProjectPreview,
   displayContext
-}: Props) {
+}: Props): JSX.Element | null {
   const { id, solution, githubLink } = completedChallenge;
   const { t } = useTranslation();
   const viewText = t('buttons.view');
diff --git a/client/src/templates/Challenges/classic/mobile-layout.tsx b/client/src/templates/Challenges/classic/mobile-layout.tsx
index c79b86f9871..04965a795e1 100644
--- a/client/src/templates/Challenges/classic/mobile-layout.tsx
+++ b/client/src/templates/Challenges/classic/mobile-layout.tsx
@@ -39,17 +39,17 @@ class MobileLayout extends Component<MobileLayoutProps, MobileLayoutState> {
     currentTab: this.props.hasEditableBoundaries ? Tab.Editor : Tab.Instructions
   };
 
-  switchTab = (tab: Tab) => {
+  switchTab = (tab: Tab): void => {
     this.setState({
       currentTab: tab
     });
   };
 
-  handleKeyDown = () => this.props.updateUsingKeyboardInTablist(true);
+  handleKeyDown = (): void => this.props.updateUsingKeyboardInTablist(true);
 
-  handleClick = () => this.props.updateUsingKeyboardInTablist(false);
+  handleClick = (): void => this.props.updateUsingKeyboardInTablist(false);
 
-  render() {
+  render(): JSX.Element {
     const { currentTab } = this.state;
     const {
       hasEditableBoundaries,
diff --git a/client/src/templates/Challenges/rechallenge/builders.ts b/client/src/templates/Challenges/rechallenge/builders.ts
index 9b0fd91f86e..f174c79acb9 100644
--- a/client/src/templates/Challenges/rechallenge/builders.ts
+++ b/client/src/templates/Challenges/rechallenge/builders.ts
@@ -10,7 +10,7 @@ export function concatHtml({
   required = [],
   template,
   contents
-}: ConcatHTMLOptions) {
+}: ConcatHTMLOptions): string {
   const embedSource = template
     ? _template(template)
     : ({ source }: { source: ConcatHTMLOptions['contents'] }) => source;
diff --git a/client/src/templates/Challenges/utils/build.ts b/client/src/templates/Challenges/utils/build.ts
index 81d04296ab2..6951043d988 100644
--- a/client/src/templates/Challenges/utils/build.ts
+++ b/client/src/templates/Challenges/utils/build.ts
@@ -107,11 +107,13 @@ const buildFunctions = {
   [challengeTypes.multifileCertProject]: buildDOMChallenge
 };
 
-export function canBuildChallenge(challengeData: BuildChallengeData) {
+export function canBuildChallenge(challengeData: BuildChallengeData): boolean {
   const { challengeType } = challengeData;
   return Object.prototype.hasOwnProperty.call(buildFunctions, challengeType);
 }
 
+// TODO: Figure out and (hopefully) simplify the return type.
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export async function buildChallenge(
   challengeData: BuildChallengeData,
   options: BuildOptions
@@ -131,6 +133,8 @@ const testRunners = {
   [challengeTypes.pythonProject]: getDOMTestRunner,
   [challengeTypes.multifileCertProject]: getDOMTestRunner
 };
+// TODO: Figure out and (hopefully) simplify the return type.
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export function getTestRunner(
   buildData: BuildChallengeData,
   runnerConfig: TestRunnerConfig,
@@ -185,10 +189,16 @@ async function getDOMTestRunner(
     runTestInTestFrame(document, testString, testTimeout);
 }
 
+type BuildResult = {
+  challengeType: number;
+  build: string;
+  sources: Source | undefined;
+};
+
 export function buildDOMChallenge(
   { challengeFiles, required = [], template = '' }: BuildChallengeData,
   { usesTestRunner } = { usesTestRunner: false }
-) {
+): Promise<BuildResult> | undefined {
   const finalRequires = [...required];
   if (usesTestRunner) finalRequires.push(...frameRunner);
 
@@ -225,7 +235,7 @@ export function buildDOMChallenge(
 export function buildJSChallenge(
   { challengeFiles }: { challengeFiles: ChallengeFiles },
   options: BuildOptions
-) {
+): Promise<BuildResult> | undefined {
   const pipeLine = composeFunctions(...getTransformers(options));
 
   const finalFiles = challengeFiles?.map(pipeLine);
@@ -262,7 +272,7 @@ export function updatePreview(
   buildData: BuildChallengeData,
   document: Document,
   proxyLogger: ProxyLogger
-) {
+): void {
   if (
     buildData.challengeType === challengeTypes.html ||
     buildData.challengeType === challengeTypes.multifileCertProject
@@ -293,7 +303,7 @@ function getDocumentTitle(buildData: BuildChallengeData) {
 export function updateProjectPreview(
   buildData: BuildChallengeData,
   document: Document
-) {
+): void {
   if (
     buildData.challengeType === challengeTypes.html ||
     buildData.challengeType === challengeTypes.multifileCertProject
@@ -309,7 +319,7 @@ export function updateProjectPreview(
   }
 }
 
-export function challengeHasPreview({ challengeType }: ChallengeMeta) {
+export function challengeHasPreview({ challengeType }: ChallengeMeta): boolean {
   return (
     challengeType === challengeTypes.html ||
     challengeType === challengeTypes.modern ||
@@ -317,13 +327,15 @@ export function challengeHasPreview({ challengeType }: ChallengeMeta) {
   );
 }
 
-export function isJavaScriptChallenge({ challengeType }: ChallengeMeta) {
+export function isJavaScriptChallenge({
+  challengeType
+}: ChallengeMeta): boolean {
   return (
     challengeType === challengeTypes.js ||
     challengeType === challengeTypes.jsProject
   );
 }
 
-export function isLoopProtected(challengeMeta: ChallengeMeta) {
+export function isLoopProtected(challengeMeta: ChallengeMeta): boolean {
   return challengeMeta.superBlock !== 'coding-interview-prep';
 }
diff --git a/client/src/templates/Challenges/utils/frame.ts b/client/src/templates/Challenges/utils/frame.ts
index 906df13cc46..4e1a29b8074 100644
--- a/client/src/templates/Challenges/utils/frame.ts
+++ b/client/src/templates/Challenges/utils/frame.ts
@@ -132,11 +132,15 @@ const createHeader = (id = mainPreviewId) => `
   </script>
 `;
 
+type TestResult =
+  | { pass: boolean }
+  | { err: { message: string; stack?: string } };
+
 export const runTestInTestFrame = async function (
   document: Document,
   test: string,
   timeout: number
-) {
+): Promise<TestResult | undefined> {
   const { contentDocument: frame } = document.getElementById(
     testId
   ) as HTMLIFrameElement;
@@ -309,7 +313,7 @@ export const createMainPreviewFramer = (
   document: Document,
   proxyLogger: ProxyLogger,
   frameTitle: string
-) =>
+): ((args: Context) => void) =>
   createFramer(
     document,
     mainPreviewId,
@@ -322,7 +326,7 @@ export const createMainPreviewFramer = (
 export const createProjectPreviewFramer = (
   document: Document,
   frameTitle: string
-) =>
+): ((args: Context) => void) =>
   createFramer(
     document,
     projectPreviewId,
@@ -336,7 +340,8 @@ export const createTestFramer = (
   document: Document,
   proxyLogger: ProxyLogger,
   frameReady: () => void
-) => createFramer(document, testId, initTestFrame, proxyLogger, frameReady);
+): ((args: Context) => void) =>
+  createFramer(document, testId, initTestFrame, proxyLogger, frameReady);
 
 const createFramer = (
   document: Document,
diff --git a/client/src/templates/Challenges/utils/index.ts b/client/src/templates/Challenges/utils/index.ts
index 81f0fb5146b..f4e3a5aa511 100644
--- a/client/src/templates/Challenges/utils/index.ts
+++ b/client/src/templates/Challenges/utils/index.ts
@@ -35,7 +35,7 @@ export function transformEditorLink(url: string): string {
 
 export function enhancePrismAccessibility(
   prismEnv: Prism.hooks.ElementHighlightedEnvironment
-) {
+): void {
   const langs: { [key: string]: string } = {
     js: 'JavaScript',
     javascript: 'JavaScript',
diff --git a/client/src/utils/ajax.ts b/client/src/utils/ajax.ts
index fbf3b19459a..b284b6924d8 100644
--- a/client/src/utils/ajax.ts
+++ b/client/src/utils/ajax.ts
@@ -136,6 +136,8 @@ function parseApiResponseToClientUser(data: ApiUser): UserResponse {
   };
 }
 
+// TODO: this at least needs a few aliases so it's human readable
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export function mapFilesToChallengeFiles<File, Rest>(
   fileContainer: ({ files: (File & { key: string })[] } & Rest)[] = []
 ) {
diff --git a/client/src/utils/challenge-request-helpers.ts b/client/src/utils/challenge-request-helpers.ts
index 3451f372437..d4017894beb 100644
--- a/client/src/utils/challenge-request-helpers.ts
+++ b/client/src/utils/challenge-request-helpers.ts
@@ -13,11 +13,25 @@ interface StandardizeRequestBodyArgs {
   challengeType: number;
 }
 
+interface File {
+  contents: string;
+  ext: string;
+  history: string[];
+  key: string;
+  name: string;
+}
+
+interface Body {
+  id: string;
+  files?: File[];
+  challengeType: number;
+}
+
 export function standardizeRequestBody({
   id,
   challengeFiles = [],
   challengeType
-}: StandardizeRequestBodyArgs) {
+}: StandardizeRequestBodyArgs): Body {
   return {
     id,
     files: challengeFiles?.map(({ fileKey, contents, ext, name, history }) => {
@@ -33,12 +47,12 @@ export function standardizeRequestBody({
   };
 }
 
-export function getStringSizeInBytes(str = '') {
+export function getStringSizeInBytes(str = ''): number {
   const stringSizeInBytes = new Blob([JSON.stringify(str)]).size;
 
   return stringSizeInBytes;
 }
 
-export function bodySizeFits(bodySizeInBytes: number) {
+export function bodySizeFits(bodySizeInBytes: number): boolean {
   return bodySizeInBytes <= MAX_BODY_SIZE;
 }
diff --git a/client/src/utils/report-error.ts b/client/src/utils/report-error.ts
index d58bc024ba5..4d4bc6cdc43 100644
--- a/client/src/utils/report-error.ts
+++ b/client/src/utils/report-error.ts
@@ -1,4 +1,4 @@
-import * as Sentry from '@sentry/gatsby';
+import { captureException } from '@sentry/gatsby';
 import envData from '../../../config/env.json';
 
 const { sentryClientDSN } = envData;
@@ -11,5 +11,5 @@ export function reportClientSideError(
 ): string | void {
   return sentryClientDSN === null
     ? console.error(`Client: ${message}`, e)
-    : Sentry.captureException(e);
+    : captureException(e);
 }
diff --git a/client/src/utils/solution-display-type.ts b/client/src/utils/solution-display-type.ts
index 8c1be9198b3..101553f5286 100644
--- a/client/src/utils/solution-display-type.ts
+++ b/client/src/utils/solution-display-type.ts
@@ -2,12 +2,20 @@ import type { CompletedChallenge } from '../redux/prop-types';
 import { challengeTypes } from '../../utils/challenge-types';
 import { maybeUrlRE } from '.';
 
+// eslint-disable-next-line @typescript-eslint/naming-convention
+type DisplayType =
+  | 'none'
+  | 'showMultifileProjectSolution'
+  | 'showUserCode'
+  | 'showProjectAndGithubLinks'
+  | 'showProjectLink';
+
 export const getSolutionDisplayType = ({
   solution,
   githubLink,
   challengeFiles,
   challengeType
-}: CompletedChallenge) => {
+}: CompletedChallenge): DisplayType => {
   if (challengeFiles?.length)
     return challengeType === challengeTypes.multifileCertProject
       ? 'showMultifileProjectSolution'
diff --git a/client/src/utils/superblock-map-titles.ts b/client/src/utils/superblock-map-titles.ts
index 1615bc2f5e8..dae9af0dcba 100644
--- a/client/src/utils/superblock-map-titles.ts
+++ b/client/src/utils/superblock-map-titles.ts
@@ -14,7 +14,7 @@ const superBlocksWithoutLastWord = [
   SuperBlocks.TheOdinProject
 ];
 
-export function getSuperBlockTitleForMap(superBlock: SuperBlocks) {
+export function getSuperBlockTitleForMap(superBlock: SuperBlocks): string {
   const i18nSuperBlock = i18next.t(`intro:${superBlock}.title`);
 
   return superBlocksWithoutLastWord.includes(superBlock)
diff --git a/config/donation-settings.ts b/config/donation-settings.ts
index 4196a53f475..0ade9659fc6 100644
--- a/config/donation-settings.ts
+++ b/config/donation-settings.ts
@@ -80,8 +80,22 @@ export const paypalConfigTypes = {
   }
 };
 
+type DonationAmount = 500 | 1000 | 2000 | 3000 | 4000 | 5000;
+
+interface OneTimeConfig {
+  amount: DonationAmount;
+  duration: 'one-time';
+  planId: null;
+}
+
+interface SubscriptionConfig {
+  amount: DonationAmount;
+  duration: 'month';
+  planId: string;
+}
+
 export const paypalConfigurator = (
-  donationAmount: 500 | 1000 | 2000 | 3000 | 4000 | 5000,
+  donationAmount: DonationAmount,
   donationDuration: 'one-time' | 'month',
   paypalConfig: {
     month: {
@@ -93,7 +107,7 @@ export const paypalConfigurator = (
       5000: { planId: string };
     };
   }
-) => {
+): OneTimeConfig | SubscriptionConfig => {
   if (donationDuration === 'one-time') {
     return { amount: donationAmount, duration: donationDuration, planId: null };
   }
diff --git a/config/i18n.ts b/config/i18n.ts
index 88a0e24713b..786c9a54261 100644
--- a/config/i18n.ts
+++ b/config/i18n.ts
@@ -111,7 +111,7 @@ export const rtlLangs = ['arabic'];
 // locale is sourced from a JSON file, so we use getLangCode to
 // find the associated enum values
 
-export function getLangCode(locale: PropertyKey) {
+export function getLangCode(locale: PropertyKey): string {
   if (isPropertyOf(LangCodes, locale)) return LangCodes[locale];
   throw new Error(`${String(locale)} is not a valid locale`);
 }
diff --git a/config/superblock-order.ts b/config/superblock-order.ts
index a7ba0346a0a..8857c06a228 100644
--- a/config/superblock-order.ts
+++ b/config/superblock-order.ts
@@ -576,11 +576,17 @@ function shouldShowSuperblocks({
   return true;
 }
 
+type Config = {
+  language: string;
+  showNewCurriculum?: string;
+  showUpcomingChanges?: string;
+};
+
 export function getLearnSuperBlocks({
   language = 'english',
   showNewCurriculum = 'false',
   showUpcomingChanges = 'false'
-}) {
+}: Config): SuperBlocks[] {
   const learnSuperBlocks: SuperBlocks[] = [];
 
   Object.values(TranslationStates).forEach(translationState => {
@@ -608,7 +614,7 @@ export function getAuditedSuperBlocks({
   language = 'english',
   showNewCurriculum = 'false',
   showUpcomingChanges = 'false'
-}) {
+}: Config): SuperBlocks[] {
   const auditedSuperBlocks: SuperBlocks[] = [];
 
   Object.values(SuperBlockStates).forEach(superBlockState => {
@@ -634,7 +640,7 @@ export function getNotAuditedSuperBlocks({
   language = 'english',
   showNewCurriculum = 'false',
   showUpcomingChanges = 'false'
-}) {
+}: Config): SuperBlocks[] {
   const notAuditedSuperBlocks: SuperBlocks[] = [];
 
   Object.values(SuperBlockStates).forEach(superBlockState => {
diff --git a/tools/challenge-editor/api/routes/block-route.ts b/tools/challenge-editor/api/routes/block-route.ts
index 0f50ff77e76..c12955fd289 100644
--- a/tools/challenge-editor/api/routes/block-route.ts
+++ b/tools/challenge-editor/api/routes/block-route.ts
@@ -1,7 +1,10 @@
 import { Request, Response } from 'express';
 import { getSteps } from '../utils/get-steps';
 
-export const blockRoute = async (req: Request, res: Response) => {
+export const blockRoute = async (
+  req: Request,
+  res: Response
+): Promise<void> => {
   const { superblock, block } = req.params;
 
   const steps = await getSteps(superblock, block);
diff --git a/tools/challenge-editor/api/routes/index-route.ts b/tools/challenge-editor/api/routes/index-route.ts
index 2abe9098ffc..6721d6bebe2 100644
--- a/tools/challenge-editor/api/routes/index-route.ts
+++ b/tools/challenge-editor/api/routes/index-route.ts
@@ -1,6 +1,6 @@
 import { Request, Response } from 'express';
 import { superBlockList } from '../configs/super-block-list';
 
-export const indexRoute = (req: Request, res: Response) => {
+export const indexRoute = (req: Request, res: Response): void => {
   res.json(superBlockList);
 };
diff --git a/tools/challenge-editor/api/routes/save-route.ts b/tools/challenge-editor/api/routes/save-route.ts
index f41ae15c217..beceeb8f357 100644
--- a/tools/challenge-editor/api/routes/save-route.ts
+++ b/tools/challenge-editor/api/routes/save-route.ts
@@ -1,7 +1,7 @@
 import { Request, Response } from 'express';
 import { saveStep } from '../utils/save-step';
 
-export const saveRoute = async (req: Request, res: Response) => {
+export const saveRoute = async (req: Request, res: Response): Promise<void> => {
   const { superblock, block, step } = req.params;
   const content = (req.body as { content: string }).content;
 
diff --git a/tools/challenge-editor/api/routes/step-route.ts b/tools/challenge-editor/api/routes/step-route.ts
index 3bef974858c..e04d2b60280 100644
--- a/tools/challenge-editor/api/routes/step-route.ts
+++ b/tools/challenge-editor/api/routes/step-route.ts
@@ -1,7 +1,7 @@
 import { Request, Response } from 'express';
 import { getStepContent } from '../utils/get-step-contents';
 
-export const stepRoute = async (req: Request, res: Response) => {
+export const stepRoute = async (req: Request, res: Response): Promise<void> => {
   const { superblock, block, step } = req.params;
 
   const stepContents = await getStepContent(superblock, block, step);
diff --git a/tools/challenge-editor/api/routes/super-block-route.ts b/tools/challenge-editor/api/routes/super-block-route.ts
index e20ee2d1f8c..ad50c4bb529 100644
--- a/tools/challenge-editor/api/routes/super-block-route.ts
+++ b/tools/challenge-editor/api/routes/super-block-route.ts
@@ -1,7 +1,10 @@
 import { Request, Response } from 'express';
 import { getBlocks } from '../utils/get-blocks';
 
-export const superblockRoute = async (req: Request, res: Response) => {
+export const superblockRoute = async (
+  req: Request,
+  res: Response
+): Promise<void> => {
   const sup = req.params.superblock;
 
   const blocks = await getBlocks(sup);
diff --git a/tools/challenge-editor/api/routes/tools-route.ts b/tools/challenge-editor/api/routes/tools-route.ts
index 255fc5ee568..86b87ec706a 100644
--- a/tools/challenge-editor/api/routes/tools-route.ts
+++ b/tools/challenge-editor/api/routes/tools-route.ts
@@ -25,7 +25,10 @@ const toolsSwitch: ToolsSwitch = {
   }
 };
 
-export const toolsRoute = async (req: Request, res: Response) => {
+export const toolsRoute = async (
+  req: Request,
+  res: Response
+): Promise<void> => {
   const { superblock, block, command } = req.params;
   const { num } = req.body as Record<string, number>;
   const directory = join(
diff --git a/tools/challenge-editor/api/utils/get-blocks.ts b/tools/challenge-editor/api/utils/get-blocks.ts
index d359efe9af7..71d76dd2342 100644
--- a/tools/challenge-editor/api/utils/get-blocks.ts
+++ b/tools/challenge-editor/api/utils/get-blocks.ts
@@ -4,7 +4,12 @@ import { CHALLENGE_DIR, META_DIR } from '../configs/paths';
 
 import { PartialMeta } from '../interfaces/partial-meta';
 
-export const getBlocks = async (sup: string) => {
+type Block = {
+  name: string;
+  path: string;
+};
+
+export const getBlocks = async (sup: string): Promise<Block[]> => {
   const filePath = join(CHALLENGE_DIR, sup);
 
   const files = await readdir(filePath);
diff --git a/tools/challenge-editor/api/utils/get-step-contents.ts b/tools/challenge-editor/api/utils/get-step-contents.ts
index f60c943d872..82cc1dd3b5d 100644
--- a/tools/challenge-editor/api/utils/get-step-contents.ts
+++ b/tools/challenge-editor/api/utils/get-step-contents.ts
@@ -7,7 +7,7 @@ export const getStepContent = async (
   sup: string,
   block: string,
   step: string
-) => {
+): Promise<{ name: string; fileData: string }> => {
   const filePath = join(CHALLENGE_DIR, sup, block, step);
 
   const fileData = await readFile(filePath, 'utf8');
diff --git a/tools/challenge-editor/api/utils/get-steps.ts b/tools/challenge-editor/api/utils/get-steps.ts
index 867cfd37f1e..e2f658bf7a2 100644
--- a/tools/challenge-editor/api/utils/get-steps.ts
+++ b/tools/challenge-editor/api/utils/get-steps.ts
@@ -10,7 +10,13 @@ const getFileOrder = (id: string, meta: PartialMeta) => {
   return meta.challengeOrder.findIndex(([f]) => f === id);
 };
 
-export const getSteps = async (sup: string, block: string) => {
+type Step = {
+  name: string;
+  id: string;
+  path: string;
+};
+
+export const getSteps = async (sup: string, block: string): Promise<Step[]> => {
   const filePath = join(CHALLENGE_DIR, sup, block);
 
   const metaPath = join(META_DIR, block, 'meta.json');
diff --git a/tools/challenge-editor/api/utils/save-step.ts b/tools/challenge-editor/api/utils/save-step.ts
index e4d3133ad79..5dfb5d3f27a 100644
--- a/tools/challenge-editor/api/utils/save-step.ts
+++ b/tools/challenge-editor/api/utils/save-step.ts
@@ -7,7 +7,7 @@ export const saveStep = async (
   block: string,
   step: string,
   content: string
-) => {
+): Promise<boolean> => {
   try {
     const filePath = join(CHALLENGE_DIR, sup, block, step);
 
diff --git a/tools/challenge-helper-scripts/commands.ts b/tools/challenge-helper-scripts/commands.ts
index 401311a1b23..27d54670130 100644
--- a/tools/challenge-helper-scripts/commands.ts
+++ b/tools/challenge-helper-scripts/commands.ts
@@ -9,7 +9,7 @@ import {
   updateStepTitles
 } from './utils';
 
-function deleteStep(stepNum: number) {
+function deleteStep(stepNum: number): void {
   if (stepNum < 1) {
     throw 'Step not deleted. Step num must be a number greater than 0.';
   }
@@ -28,7 +28,7 @@ function deleteStep(stepNum: number) {
   console.log(`Sucessfully deleted step #${stepNum}`);
 }
 
-function insertStep(stepNum: number) {
+function insertStep(stepNum: number): void {
   if (stepNum < 1) {
     throw 'Step not inserted. New step number must be greater than 0.';
   }
@@ -56,7 +56,7 @@ function insertStep(stepNum: number) {
   console.log(`Sucessfully inserted new step #${stepNum}`);
 }
 
-function createEmptySteps(num: number) {
+function createEmptySteps(num: number): void {
   if (num < 1 || num > 1000) {
     throw `No steps created. arg 'num' must be between 1 and 1000 inclusive`;
   }
diff --git a/tools/challenge-helper-scripts/utils.ts b/tools/challenge-helper-scripts/utils.ts
index 4fa7c64b833..879db8a1d4a 100644
--- a/tools/challenge-helper-scripts/utils.ts
+++ b/tools/challenge-helper-scripts/utils.ts
@@ -17,7 +17,7 @@ const createStepFile = ({
   stepNum,
   projectPath = getProjectPath(),
   challengeSeeds = {}
-}: Options) => {
+}: Options): ObjectID => {
   const challengeId = new ObjectID();
 
   const template = getStepTemplate({
@@ -36,7 +36,7 @@ interface InsertOptions {
   stepId: ObjectID;
 }
 
-function insertStepIntoMeta({ stepNum, stepId }: InsertOptions) {
+function insertStepIntoMeta({ stepNum, stepId }: InsertOptions): void {
   const existingMeta = getMetaData();
   const oldOrder = [...existingMeta.challengeOrder];
   oldOrder.splice(stepNum - 1, 0, [stepId.toString()]);
@@ -49,7 +49,7 @@ function insertStepIntoMeta({ stepNum, stepId }: InsertOptions) {
   updateMetaData({ ...existingMeta, challengeOrder });
 }
 
-function deleteStepFromMeta({ stepNum }: { stepNum: number }) {
+function deleteStepFromMeta({ stepNum }: { stepNum: number }): void {
   const existingMeta = getMetaData();
   const oldOrder = [...existingMeta.challengeOrder];
   oldOrder.splice(stepNum - 1, 1);
@@ -62,7 +62,7 @@ function deleteStepFromMeta({ stepNum }: { stepNum: number }) {
   updateMetaData({ ...existingMeta, challengeOrder });
 }
 
-const updateStepTitles = () => {
+const updateStepTitles = (): void => {
   const meta = getMetaData();
 
   const fileNames: string[] = [];
diff --git a/tools/scripts/build/schema/trending-schema.ts b/tools/scripts/build/schema/trending-schema.ts
index 935fd918e6f..c742eaf5bf4 100644
--- a/tools/scripts/build/schema/trending-schema.ts
+++ b/tools/scripts/build/schema/trending-schema.ts
@@ -65,6 +65,6 @@ const schema = Joi.object().keys({
 
 export const trendingSchemaValidator = (
   trendingObj: Record<string, string>
-) => {
+): Joi.ValidationResult => {
   return schema.validate(trendingObj);
 };
diff --git a/tools/ui-components/src/color-system/color-system.stories.tsx b/tools/ui-components/src/color-system/color-system.stories.tsx
index 59a4f879fcb..2ccbf3cf724 100644
--- a/tools/ui-components/src/color-system/color-system.stories.tsx
+++ b/tools/ui-components/src/color-system/color-system.stories.tsx
@@ -6,6 +6,6 @@ const story = {
   component: AllPalettes
 };
 
-export const ColorSystem = () => <AllPalettes />;
+export const ColorSystem = (): JSX.Element => <AllPalettes />;
 
 export default story;
diff --git a/tools/ui-components/src/color-system/color-system.tsx b/tools/ui-components/src/color-system/color-system.tsx
index ee9d97d3a5d..e4da89bd48d 100644
--- a/tools/ui-components/src/color-system/color-system.tsx
+++ b/tools/ui-components/src/color-system/color-system.tsx
@@ -53,7 +53,7 @@ const Palette = ({ colors }: PaletteProps) => {
   );
 };
 
-export const AllPalettes = () => {
+export const AllPalettes = (): JSX.Element => {
   return (
     <>
       <Palette colors={getPaletteByColorName('gray')} />
diff --git a/tools/ui-components/src/form-control/form-control-feedback.tsx b/tools/ui-components/src/form-control/form-control-feedback.tsx
index 707a79c9e33..bd2a07529d7 100644
--- a/tools/ui-components/src/form-control/form-control-feedback.tsx
+++ b/tools/ui-components/src/form-control/form-control-feedback.tsx
@@ -6,7 +6,7 @@ export const FormControlFeedback = ({
   children,
   className,
   testId
-}: FormControlVariationProps) => {
+}: FormControlVariationProps): JSX.Element => {
   const defaultClasses =
     'absolute top-0 right-0 z-2 block w-8 h-8 leading-8 ' +
     'text-center pointer-events-none text-green-700';
diff --git a/tools/ui-components/src/form-control/form-control-static.tsx b/tools/ui-components/src/form-control/form-control-static.tsx
index c85811930d1..3a6ba924e3d 100644
--- a/tools/ui-components/src/form-control/form-control-static.tsx
+++ b/tools/ui-components/src/form-control/form-control-static.tsx
@@ -6,7 +6,7 @@ export const FormControlStatic = ({
   className,
   children,
   testId
-}: FormControlVariationProps) => {
+}: FormControlVariationProps): JSX.Element => {
   const defaultClasses = 'py-1.5 mb-0 min-h-43-px text-foreground-secondary';
 
   const classes = [defaultClasses, className].join(' ');
diff --git a/tools/ui-components/utils/gen-component-script.ts b/tools/ui-components/utils/gen-component-script.ts
index 18250a19470..d7b218b22c8 100644
--- a/tools/ui-components/utils/gen-component-script.ts
+++ b/tools/ui-components/utils/gen-component-script.ts
@@ -8,7 +8,7 @@ if (!name) {
   throw new Error('You must include a component name.');
 }
 
-if (!name.match(/^[A-Z]/)) {
+if (!/^[A-Z]/.exec(name)) {
   throw new Error('Component name must be in PascalCase.');
 }
 
diff --git a/tools/ui-components/utils/gen-component-template.ts b/tools/ui-components/utils/gen-component-template.ts
index 70f268903e9..8634e42f879 100644
--- a/tools/ui-components/utils/gen-component-template.ts
+++ b/tools/ui-components/utils/gen-component-template.ts
@@ -1,23 +1,23 @@
 // component.tsx
-export const component = (name: string) => `
+export const component = (name: string): string => `
 import React from 'react';
-    
+
 import { ${name}Props } from './types';
-    
+
 export const ${name} = ({}: ${name}Props) => {
   return <div>Hello, I am a ${name} component</div>;
 };
 `;
 
 // types.ts
-export const type = (name: string) => `
+export const type = (name: string): string => `
 export interface ${name}Props {
   className?: string
 }
 `;
 
 // component.test.tsx
-export const test = (name: string) => `
+export const test = (name: string): string => `
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
@@ -30,7 +30,7 @@ describe('<${name} />', () => {
 `;
 
 // component.stories.tsx
-export const story = (name: string) => `
+export const story = (name: string): string => `
 import React from 'react';
 import { Story } from '@storybook/react';
 import { ${name}, ${name}Props } from '.';
@@ -53,7 +53,7 @@ export default story;
 `;
 
 // index.ts
-export const barrel = (name: string, kebabCasedName: string) => `
+export const barrel = (name: string, kebabCasedName: string): string => `
 export { ${name} } from './${kebabCasedName}';
 export type { ${name}Props } from './types';
 `;
diff --git a/utils/get-lines.ts b/utils/get-lines.ts
index a13112dfee6..012079f17fb 100644
--- a/utils/get-lines.ts
+++ b/utils/get-lines.ts
@@ -1,4 +1,4 @@
-export function getLines(contents: string, range?: number[]) {
+export function getLines(contents: string, range?: number[]): string {
   if (!range) {
     return '';
   }
diff --git a/utils/index.ts b/utils/index.ts
index 3a4b3b31633..60e4d572167 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -44,6 +44,8 @@ for (const [id, title] of idToTitle) {
   }
 }
 
-export const getCertIds = () => idToPath.keys();
-export const getPathFromID = (id: string) => idToPath.get(id);
-export const getTitleFromId = (id: string) => idToTitle.get(id);
+export const getCertIds = (): IterableIterator<string> => idToPath.keys();
+export const getPathFromID = (id: string): string | undefined =>
+  idToPath.get(id);
+export const getTitleFromId = (id: string): string | undefined =>
+  idToTitle.get(id);
diff --git a/utils/validate.ts b/utils/validate.ts
index 9f5ebf3e6af..12a1fa76019 100644
--- a/utils/validate.ts
+++ b/utils/validate.ts
@@ -1,21 +1,36 @@
-export const invalidCharError = {
+type Valid = {
+  valid: true;
+  error: null;
+};
+
+type Invalid = {
+  valid: false;
+  error: string;
+};
+
+type Validated = Valid | Invalid;
+
+export const invalidCharError: Invalid = {
   valid: false,
   error: 'contains invalid characters'
 };
-export const validationSuccess = { valid: true, error: null };
-export const usernameTooShort = { valid: false, error: 'is too short' };
-export const usernameIsHttpStatusCode = {
+export const validationSuccess: Valid = { valid: true, error: null };
+export const usernameTooShort: Invalid = {
+  valid: false,
+  error: 'is too short'
+};
+export const usernameIsHttpStatusCode: Invalid = {
   valid: false,
   error: 'is a reserved error code'
 };
 
 const validCharsRE = /^[a-zA-Z0-9\-_+]*$/;
-export const isHttpStatusCode = (str: string) => {
+export const isHttpStatusCode = (str: string): boolean => {
   const output = parseInt(str, 10);
   return !isNaN(output) && output >= 100 && output <= 599;
 };
 
-export const isValidUsername = (str: string) => {
+export const isValidUsername = (str: string): Validated => {
   if (!validCharsRE.test(str)) return invalidCharError;
   if (str.length < 3) return usernameTooShort;
   if (isHttpStatusCode(str)) return usernameIsHttpStatusCode;

From cd0c3e5c681efb7f50e0fbd844fc524df0654a53 Mon Sep 17 00:00:00 2001
From: Dario-DC <105294544+Dario-DC@users.noreply.github.com>
Date: Mon, 13 Feb 2023 16:43:11 +0100
Subject: [PATCH 44/52] chore(curriculum): added code tags in links and images
 questions of the odin project (#49366)

added code tags in links and images questions of the odin project
---
 .../links-and-images-question-b.md                   | 12 ++++++------
 .../links-and-images-question-c.md                   | 12 ++++++------
 .../links-and-images-question-d.md                   | 12 ++++++------
 .../links-and-images-question-e.md                   |  4 ++--
 .../links-and-images-question-f.md                   | 10 +++++-----
 .../links-and-images-question-g.md                   | 10 +++++-----
 .../links-and-images-question-h.md                   | 10 +++++-----
 7 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-b.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-b.md
index 0c69cc1981b..0d922ecf6a1 100644
--- a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-b.md
+++ b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-b.md
@@ -9,25 +9,25 @@ dashedName: links-and-images-question-b
 
 To get some practice using links and images throughout this lesson you need an HTML project to work with.
 
-- Create a new directory named odin-links-and-images.
+- Create a new directory named `odin-links-and-images`.
 
-- Within that directory, create a new file named index.html.
+- Within that directory, create a new file named `index.html`.
 
 - Fill in the usual HTML boilerplate.
 
-- finally, add the following h1 to the body: `<h1>Homepage</h1>`
+- finally, add the following `h1` to the `body`: `<h1>Homepage</h1>`
 
 ## Anchor Elements
 To create a link in HTML, you use the anchor element. An anchor element is defined by wrapping the text or another HTML element you want to be a link with an `<a>` tag.
-Add the following to the body of the index.html page you created and open it in the browser:
+Add the following to the `body` of the `index.html` page you created and open it in the browser:
 
 ```html
 <a>click me</a>
 ```
 
 You may have noticed that clicking this link doesn’t do anything. This is because an anchor tag on its own won’t know where you want to link to. You have to tell it a destination to go to. You do this by using an HTML attribute.
-An HTML attribute gives additional information to an HTML element and always goes in the element’s opening tag. An attribute is usually made up of two parts: a name, and a value; however, not all attributes require a value. In your case, you need to add a href (hyperlink reference) attribute to the opening anchor tag. The value of the href attribute is the destination you want your link to go to.
-Add the following href attribute to the anchor element you created previously and try clicking it again, don’t forget to refresh the browser so the new changes can be applied.
+An HTML attribute gives additional information to an HTML element and always goes in the element’s opening tag. An attribute is usually made up of two parts: a name, and a value; however, not all attributes require a value. In your case, you need to add a `href` (hyperlink reference) attribute to the opening anchor tag. The value of the `href` attribute is the destination you want your link to go to.
+Add the following `href` attribute to the anchor element you created previously and try clicking it again, don’t forget to refresh the browser so the new changes can be applied.
 
 ```html
 <a href="https://www.theodinproject.com/about">click me</a>
diff --git a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-c.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-c.md
index 8270794a1ea..d01498fa84e 100644
--- a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-c.md
+++ b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-c.md
@@ -9,25 +9,25 @@ dashedName: links-and-images-question-c
 
 To get some practice using links and images throughout this lesson you need an HTML project to work with.
 
-- Create a new directory named odin-links-and-images.
+- Create a new directory named `odin-links-and-images`.
 
-- Within that directory, create a new file named index.html.
+- Within that directory, create a new file named `index.html`.
 
 - Fill in the usual HTML boilerplate.
 
-- finally, add the following h1 to the body: `<h1>Homepage</h1>`
+- finally, add the following `h1` to the `body`: `<h1>Homepage</h1>`
 
 ## Anchor Elements
 To create a link in HTML, you use the anchor element. An anchor element is defined by wrapping the text or another HTML element you want to be a link with an `<a>` tag.
-Add the following to the body of the index.html page you created and open it in the browser:
+Add the following to the `body` of the `index.html` page you created and open it in the browser:
 
 ```html
 <a>click me</a>
 ```
 
 You may have noticed that clicking this link doesn’t do anything. This is because an anchor tag on its own won’t know where you want to link to. You have to tell it a destination to go to. You do this by using an HTML attribute.
-An HTML attribute gives additional information to an HTML element and always goes in the element’s opening tag. An attribute is usually made up of two parts: a name, and a value; however, not all attributes require a value. In your case, you need to add a href (hyperlink reference) attribute to the opening anchor tag. The value of the href attribute is the destination you want your link to go to.
-Add the following href attribute to the anchor element you created previously and try clicking it again, don’t forget to refresh the browser so the new changes can be applied.
+An HTML attribute gives additional information to an HTML element and always goes in the element’s opening tag. An attribute is usually made up of two parts: a name, and a value; however, not all attributes require a value. In your case, you need to add a `href` (hyperlink reference) attribute to the opening anchor tag. The value of the `href` attribute is the destination you want your link to go to.
+Add the following `href` attribute to the anchor element you created previously and try clicking it again, don’t forget to refresh the browser so the new changes can be applied.
 
 ```html
 <a href="https://www.theodinproject.com/about">click me</a>
diff --git a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-d.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-d.md
index 358954ad698..9d159592a4f 100644
--- a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-d.md
+++ b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-d.md
@@ -43,7 +43,7 @@ Within the `odin-links-and-images` directory, create another HTML file named `ab
 </html>
 ```
 
-Back in the index page, add the following anchor element to create a link to the about page:
+Back in the `index` page, add the following anchor element to create a link to the `about` page:
 
 ```html
 <body>
@@ -54,17 +54,17 @@ Back in the index page, add the following anchor element to create a link to the
 </body>
 ```
 
-Open the index file in a browser and click on the about link to make sure it is all wired together correctly. Clicking the link should go to the about page you just created.
+Open the `index.html` file in a browser and click on the about link to make sure it is all wired together correctly. Clicking the link should go to the `about` page you just created.
 
-This works because the index and about page are in the same directory. That means you can simply use its name (`about.html`) as the link’s href value.
+This works because the `index` and `about` page are in the same directory. That means you can simply use its name (`about.html`) as the link’s `href` value.
 
 But you will usually want to organize your website directories a little better. Normally you would only have the `index.html` at the root directory and all other HTML files in their own directory.
 
 Create a directory named `pages` within the `odin-links-and-images` directory and move the `about.html` file into this new directory.
 
-Refresh the index page in the browser and then click on the about link. It will now be broken. This is because the location of the about page file has changed.
+Refresh the `index` page in the browser and then click on the `about` link. It will now be broken. This is because the location of the `about` page file has changed.
 
-To fix this, you just need to update the about link `href` value to include the `pages/` directory since that is the new location of the about file relative to the index file.
+To fix this, you just need to update the `about` link `href` value to include the `pages/` directory since that is the new location of the `about.html` file relative to the `index.html` file.
 
 ```html
 <body>
@@ -73,7 +73,7 @@ To fix this, you just need to update the about link `href` value to include the
 </body>
 ```
 
-Refresh the index page in the browser and try clicking the about link again, it should now be back in working order.
+Refresh the `index` page in the browser and try clicking the `about` link again, it should now be back in working order.
 
 In many cases, this will work just fine; however, you can still run into unexpected issues with this approach. Prepending `./` before the link will in most cases prevent such issues. By adding `./` you are specifying to your code that it should start looking for the file/directory relative to the **current** directory.
 
diff --git a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-e.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-e.md
index e83d656458f..1e95ffa4b82 100644
--- a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-e.md
+++ b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-e.md
@@ -43,9 +43,9 @@ Save the `index.html` file and open it in a browser to view Charles in all his g
 
 ## Parent Directories
 
-What if you want to use the dog image in the about page? You would first have to go up one level out of the pages directory into its parent directory so you could then access the images directory.
+What if you want to use the dog image in the `about` page? You would first have to go up one level out of the pages directory into its parent directory so you could then access the images directory.
 
-To go to the parent directory you need to use two dots in the relative filepath like this: `../.` Let’s see this in action, within the body of the `about.html` file, add the following image below the heading you added earlier:
+To go to the parent directory you need to use two dots in the relative filepath like this: `../.` Let’s see this in action, within the `body` of the `about.html` file, add the following image below the heading you added earlier:
 
 ```html
 <img src="../images/dog.jpg">
diff --git a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-f.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-f.md
index 60b2ba8191f..95a587aaa2b 100644
--- a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-f.md
+++ b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-f.md
@@ -11,7 +11,7 @@ Websites would be fairly boring if they could only display text. Luckily HTML pr
 
 To display an image in HTML you use the `<img>` element. Unlike the other elements you have encountered, the `<img>` element is self-closing. Empty, self-closing HTML elements do not need a closing tag.
 
-Instead of wrapping content with an opening and closing tag, it embeds an image into the page using a src attribute which tells the browser where the image file is located. The src attribute works much like the href attribute for anchor tags. It can embed an image using both absolute and relative paths.
+Instead of wrapping content with an opening and closing tag, it embeds an image into the page using a `src` attribute which tells the browser where the image file is located. The `src` attribute works much like the `href` attribute for anchor tags. It can embed an image using both absolute and relative paths.
 
 For example, using an absolute path you can display an image located on The Odin Project site:
 
@@ -43,9 +43,9 @@ Save the `index.html` file and open it in a browser to view Charles in all his g
 
 ## Parent Directories
 
-What if you want to use the dog image in the about page? You would first have to go up one level out of the pages directory into its parent directory so you could then access the images directory.
+What if you want to use the dog image in the `about` page? You would first have to go up one level out of the pages directory into its parent directory so you could then access the images directory.
 
-To go to the parent directory you need to use two dots in the relative filepath like this: `../.` Let’s see this in action, within the body of the `about.html` file, add the following image below the heading you added earlier:
+To go to the parent directory you need to use two dots in the relative filepath like this: `../.` Let’s see this in action, within the `body` of the `about.html` file, add the following image below the heading you added earlier:
 
 ```html
 <img src="../images/dog.jpg">
@@ -63,9 +63,9 @@ Using the metaphor we used earlier, using `../` in a filepath is kind of like st
 
 ## Alt attribute
 
-Besides the src attribute, every image element should also have an alt (alternative text) attribute.
+Besides the `src` attribute, every image element should also have an `alt` (alternative text) attribute.
 
-The alt attribute is used to describe an image. It will be used in place of the image if it cannot be loaded. It is also used with screen readers to describe what the image is to visually impaired users.
+The `alt` attribute is used to describe an image. It will be used in place of the image if it cannot be loaded. It is also used with screen readers to describe what the image is to visually impaired users.
 
 This is how the The Odin Project logo example you used earlier looks with an alt attribute included:
 <iframe allowfullscreen="true" allowpaymentrequest="true" allowtransparency="true" class="cp_embed_iframe " frameborder="0" height="300" width="100%" name="cp_embed_2" scrolling="no" src="https://codepen.io/TheOdinProjectExamples/embed/ExXjoEp?height=300&amp;theme-id=dark&amp;default-tab=html%2Cresult&amp;slug-hash=ExXjoEp&amp;user=TheOdinProjectExamples&amp;name=cp_embed_2" style="width: 100%; overflow:hidden; display:block;" title="CodePen Embed" loading="lazy" id="cp_embed_ExXjoEp"></iframe>
diff --git a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-g.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-g.md
index a64b4b80e38..60cbf43ee0d 100644
--- a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-g.md
+++ b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-g.md
@@ -11,7 +11,7 @@ Websites would be fairly boring if they could only display text. Luckily HTML pr
 
 To display an image in HTML you use the `<img>` element. Unlike the other elements you have encountered, the `<img>` element is self-closing. Empty, self-closing HTML elements do not need a closing tag.
 
-Instead of wrapping content with an opening and closing tag, it embeds an image into the page using a src attribute which tells the browser where the image file is located. The src attribute works much like the href attribute for anchor tags. It can embed an image using both absolute and relative paths.
+Instead of wrapping content with an opening and closing tag, it embeds an image into the page using a `src` attribute which tells the browser where the image file is located. The `src` attribute works much like the `href` attribute for anchor tags. It can embed an image using both absolute and relative paths.
 
 For example, using an absolute path you can display an image located on The Odin Project site:
 
@@ -43,9 +43,9 @@ Save the `index.html` file and open it in a browser to view Charles in all his g
 
 ## Parent Directories
 
-What if you want to use the dog image in the about page? You would first have to go up one level out of the pages directory into its parent directory so you could then access the images directory.
+What if you want to use the dog image in the `about` page? You would first have to go up one level out of the pages directory into its parent directory so you could then access the images directory.
 
-To go to the parent directory you need to use two dots in the relative filepath like this: `../.` Let’s see this in action, within the body of the `about.html` file, add the following image below the heading you added earlier:
+To go to the parent directory you need to use two dots in the relative filepath like this: `../.` Let’s see this in action, within the `body` of the `about.html` file, add the following image below the heading you added earlier:
 
 ```html
 <img src="../images/dog.jpg">
@@ -63,9 +63,9 @@ Using the metaphor we used earlier, using `../` in a filepath is kind of like st
 
 ## Alt attribute
 
-Besides the src attribute, every image element should also have an alt (alternative text) attribute.
+Besides the `src` attribute, every image element should also have an `alt` (alternative text) attribute.
 
-The alt attribute is used to describe an image. It will be used in place of the image if it cannot be loaded. It is also used with screen readers to describe what the image is to visually impaired users.
+The `alt` attribute is used to describe an image. It will be used in place of the image if it cannot be loaded. It is also used with screen readers to describe what the image is to visually impaired users.
 
 This is how the The Odin Project logo example you used earlier looks with an alt attribute included:
 <iframe allowfullscreen="true" allowpaymentrequest="true" allowtransparency="true" class="cp_embed_iframe " frameborder="0" height="300" width="100%" name="cp_embed_2" scrolling="no" src="https://codepen.io/TheOdinProjectExamples/embed/ExXjoEp?height=300&amp;theme-id=dark&amp;default-tab=html%2Cresult&amp;slug-hash=ExXjoEp&amp;user=TheOdinProjectExamples&amp;name=cp_embed_2" style="width: 100%; overflow:hidden; display:block;" title="CodePen Embed" loading="lazy" id="cp_embed_ExXjoEp"></iframe>
diff --git a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-h.md b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-h.md
index 21c05af224b..45418d0d3a7 100644
--- a/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-h.md
+++ b/curriculum/challenges/english/16-the-odin-project/top-learn-html-foundations/links-and-images-question-h.md
@@ -11,7 +11,7 @@ Websites would be fairly boring if they could only display text. Luckily HTML pr
 
 To display an image in HTML you use the `<img>` element. Unlike the other elements you have encountered, the `<img>` element is self-closing. Empty, self-closing HTML elements do not need a closing tag.
 
-Instead of wrapping content with an opening and closing tag, it embeds an image into the page using a src attribute which tells the browser where the image file is located. The src attribute works much like the href attribute for anchor tags. It can embed an image using both absolute and relative paths.
+Instead of wrapping content with an opening and closing tag, it embeds an image into the page using a `src` attribute which tells the browser where the image file is located. The `src` attribute works much like the `href` attribute for anchor tags. It can embed an image using both absolute and relative paths.
 
 For example, using an absolute path you can display an image located on The Odin Project site:
 
@@ -43,9 +43,9 @@ Save the `index.html` file and open it in a browser to view Charles in all his g
 
 ## Parent Directories
 
-What if you want to use the dog image in the about page? You would first have to go up one level out of the pages directory into its parent directory so you could then access the images directory.
+What if you want to use the dog image in the `about` page? You would first have to go up one level out of the pages directory into its parent directory so you could then access the images directory.
 
-To go to the parent directory you need to use two dots in the relative filepath like this: `../.` Let’s see this in action, within the body of the `about.html` file, add the following image below the heading you added earlier:
+To go to the parent directory you need to use two dots in the relative filepath like this: `../.` Let’s see this in action, within the `body` of the `about.html` file, add the following image below the heading you added earlier:
 
 ```html
 <img src="../images/dog.jpg">
@@ -63,9 +63,9 @@ Using the metaphor we used earlier, using `../` in a filepath is kind of like st
 
 ## Alt attribute
 
-Besides the src attribute, every image element should also have an alt (alternative text) attribute.
+Besides the `src` attribute, every image element should also have an `alt` (alternative text) attribute.
 
-The alt attribute is used to describe an image. It will be used in place of the image if it cannot be loaded. It is also used with screen readers to describe what the image is to visually impaired users.
+The `alt` attribute is used to describe an image. It will be used in place of the image if it cannot be loaded. It is also used with screen readers to describe what the image is to visually impaired users.
 
 This is how the The Odin Project logo example you used earlier looks with an alt attribute included:
 <iframe allowfullscreen="true" allowpaymentrequest="true" allowtransparency="true" class="cp_embed_iframe " frameborder="0" height="300" width="100%" name="cp_embed_2" scrolling="no" src="https://codepen.io/TheOdinProjectExamples/embed/ExXjoEp?height=300&amp;theme-id=dark&amp;default-tab=html%2Cresult&amp;slug-hash=ExXjoEp&amp;user=TheOdinProjectExamples&amp;name=cp_embed_2" style="width: 100%; overflow:hidden; display:block;" title="CodePen Embed" loading="lazy" id="cp_embed_ExXjoEp"></iframe>

From cfc9d5e37253dfa3c09f6bba199c1e3ee3183290 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 Feb 2023 22:24:06 +0530
Subject: [PATCH 45/52] chore(deps): update automerged always - codesee to
 v0.498.0 (#49347)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 client/package.json |  4 ++--
 package-lock.json   | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/client/package.json b/client/package.json
index 0e3bb2e9514..2d4b4f94324 100644
--- a/client/package.json
+++ b/client/package.json
@@ -133,8 +133,8 @@
   },
   "devDependencies": {
     "@babel/types": "7.20.7",
-    "@codesee/babel-plugin-instrument": "0.494.0",
-    "@codesee/tracker": "0.494.0",
+    "@codesee/babel-plugin-instrument": "0.498.0",
+    "@codesee/tracker": "0.498.0",
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "12.1.5",
     "@types/react-gtm-module": "2.0.1",
diff --git a/package-lock.json b/package-lock.json
index 32a5e2d0649..bcd8f328b99 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -527,8 +527,8 @@
       },
       "devDependencies": {
         "@babel/types": "7.20.7",
-        "@codesee/babel-plugin-instrument": "0.494.0",
-        "@codesee/tracker": "0.494.0",
+        "@codesee/babel-plugin-instrument": "0.498.0",
+        "@codesee/tracker": "0.498.0",
         "@testing-library/jest-dom": "5.16.5",
         "@testing-library/react": "12.1.5",
         "@types/react-gtm-module": "2.0.1",
@@ -2856,9 +2856,9 @@
       }
     },
     "node_modules/@codesee/babel-plugin-instrument": {
-      "version": "0.494.0",
-      "resolved": "https://registry.npmjs.org/@codesee/babel-plugin-instrument/-/babel-plugin-instrument-0.494.0.tgz",
-      "integrity": "sha512-xS/aWp4Fh8uKBD7yR60uILg7C0DlMTW///+pYjMZbqLN9MDNZY7/muEpxe/D/UruIE/WJgB2nPgXxTS+6zZB+w==",
+      "version": "0.498.0",
+      "resolved": "https://registry.npmjs.org/@codesee/babel-plugin-instrument/-/babel-plugin-instrument-0.498.0.tgz",
+      "integrity": "sha512-Hs/42krR8PXSZggbQby89mQ3px3xQwVqMtPZiNPK7mlTO85efv8yMD8Ta0W6msKsjjUIz1F6pdhmwecpC0tQmQ==",
       "dev": true,
       "dependencies": {
         "@babel/plugin-syntax-jsx": "^7.12.13",
@@ -2873,9 +2873,9 @@
       }
     },
     "node_modules/@codesee/tracker": {
-      "version": "0.494.0",
-      "resolved": "https://registry.npmjs.org/@codesee/tracker/-/tracker-0.494.0.tgz",
-      "integrity": "sha512-MkeBs9V03utjVpNIJp8HXqDcwop38+vZ7MaPogGltw5Ic4ln/elBMH7C9iV1Ejm/8F3eNXplvJ5psNjy0PKtRA==",
+      "version": "0.498.0",
+      "resolved": "https://registry.npmjs.org/@codesee/tracker/-/tracker-0.498.0.tgz",
+      "integrity": "sha512-n+rf7eptQqGecLYQgjzcX2stNhbXK2dTKeHOq3+orYdPp978qbq58hc21OPwiJEXjZv+wKIiZDo4VEN5GgrEhw==",
       "dev": true
     },
     "node_modules/@cspotcode/source-map-support": {
@@ -55751,9 +55751,9 @@
       }
     },
     "@codesee/babel-plugin-instrument": {
-      "version": "0.494.0",
-      "resolved": "https://registry.npmjs.org/@codesee/babel-plugin-instrument/-/babel-plugin-instrument-0.494.0.tgz",
-      "integrity": "sha512-xS/aWp4Fh8uKBD7yR60uILg7C0DlMTW///+pYjMZbqLN9MDNZY7/muEpxe/D/UruIE/WJgB2nPgXxTS+6zZB+w==",
+      "version": "0.498.0",
+      "resolved": "https://registry.npmjs.org/@codesee/babel-plugin-instrument/-/babel-plugin-instrument-0.498.0.tgz",
+      "integrity": "sha512-Hs/42krR8PXSZggbQby89mQ3px3xQwVqMtPZiNPK7mlTO85efv8yMD8Ta0W6msKsjjUIz1F6pdhmwecpC0tQmQ==",
       "dev": true,
       "requires": {
         "@babel/plugin-syntax-jsx": "^7.12.13",
@@ -55765,9 +55765,9 @@
       }
     },
     "@codesee/tracker": {
-      "version": "0.494.0",
-      "resolved": "https://registry.npmjs.org/@codesee/tracker/-/tracker-0.494.0.tgz",
-      "integrity": "sha512-MkeBs9V03utjVpNIJp8HXqDcwop38+vZ7MaPogGltw5Ic4ln/elBMH7C9iV1Ejm/8F3eNXplvJ5psNjy0PKtRA==",
+      "version": "0.498.0",
+      "resolved": "https://registry.npmjs.org/@codesee/tracker/-/tracker-0.498.0.tgz",
+      "integrity": "sha512-n+rf7eptQqGecLYQgjzcX2stNhbXK2dTKeHOq3+orYdPp978qbq58hc21OPwiJEXjZv+wKIiZDo4VEN5GgrEhw==",
       "dev": true
     },
     "@cspotcode/source-map-support": {
@@ -56363,8 +56363,8 @@
         "@babel/preset-react": "7.18.6",
         "@babel/standalone": "7.20.15",
         "@babel/types": "7.20.7",
-        "@codesee/babel-plugin-instrument": "0.494.0",
-        "@codesee/tracker": "0.494.0",
+        "@codesee/babel-plugin-instrument": "0.498.0",
+        "@codesee/tracker": "0.498.0",
         "@fortawesome/fontawesome-svg-core": "6.3.0",
         "@fortawesome/free-brands-svg-icons": "6.3.0",
         "@fortawesome/free-solid-svg-icons": "6.3.0",

From 5e4ba38309f01d1b1c5db1116772be9fe29e6511 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <muhammed@freecodecamp.org>
Date: Mon, 13 Feb 2023 19:56:44 +0200
Subject: [PATCH 46/52] refactor(client): delete block save wrapper (#49217)

* refactor(client): delete block save wrapper

* Clean bloating divs and extra css import

* remove the blocksave wrapper snapshot
---
 .../block-save-wrapper.test.tsx.snap          |  9 ----
 .../formHelpers/block-save-wrapper.test.tsx   | 10 ----
 .../formHelpers/block-save-wrapper.tsx        | 17 -------
 .../components/formHelpers/form-fields.tsx    | 51 +++++++++----------
 client/src/components/formHelpers/form.tsx    | 17 +++----
 client/src/components/formHelpers/index.tsx   |  1 -
 .../Challenges/projects/tool-panel.tsx        |  6 +--
 7 files changed, 33 insertions(+), 78 deletions(-)
 delete mode 100644 client/src/components/formHelpers/__snapshots__/block-save-wrapper.test.tsx.snap
 delete mode 100644 client/src/components/formHelpers/block-save-wrapper.test.tsx
 delete mode 100644 client/src/components/formHelpers/block-save-wrapper.tsx

diff --git a/client/src/components/formHelpers/__snapshots__/block-save-wrapper.test.tsx.snap b/client/src/components/formHelpers/__snapshots__/block-save-wrapper.test.tsx.snap
deleted file mode 100644
index b088aec7c3c..00000000000
--- a/client/src/components/formHelpers/__snapshots__/block-save-wrapper.test.tsx.snap
+++ /dev/null
@@ -1,9 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<BlockSaveWrapper /> snapshot 1`] = `
-<div>
-  <div
-    style="padding: 0px 15px;"
-  />
-</div>
-`;
diff --git a/client/src/components/formHelpers/block-save-wrapper.test.tsx b/client/src/components/formHelpers/block-save-wrapper.test.tsx
deleted file mode 100644
index 25e9acff3bc..00000000000
--- a/client/src/components/formHelpers/block-save-wrapper.test.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { render } from '@testing-library/react';
-import React from 'react';
-
-import BlockSaveWrapper from './block-save-wrapper';
-
-test('<BlockSaveWrapper /> snapshot', () => {
-  const { container } = render(<BlockSaveWrapper />);
-
-  expect(container).toMatchSnapshot();
-});
diff --git a/client/src/components/formHelpers/block-save-wrapper.tsx b/client/src/components/formHelpers/block-save-wrapper.tsx
deleted file mode 100644
index 79186be5deb..00000000000
--- a/client/src/components/formHelpers/block-save-wrapper.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-
-const style = {
-  padding: '0 15px'
-};
-
-function BlockSaveWrapper({
-  children
-}: {
-  children?: React.ReactElement | null;
-}): JSX.Element {
-  return <div style={style}>{children}</div>;
-}
-
-BlockSaveWrapper.displayName = 'BlockSaveWrapper';
-
-export default BlockSaveWrapper;
diff --git a/client/src/components/formHelpers/form-fields.tsx b/client/src/components/formHelpers/form-fields.tsx
index ef308ae6794..2d737f5da6c 100644
--- a/client/src/components/formHelpers/form-fields.tsx
+++ b/client/src/components/formHelpers/form-fields.tsx
@@ -1,6 +1,5 @@
 import {
   Alert,
-  Col,
   ControlLabel,
   FormControl,
   FormGroup,
@@ -80,7 +79,7 @@ function FormFields(props: FormFieldsProps): JSX.Element {
     ) : null;
   };
   return (
-    <div>
+    <>
       {formFields
         .filter(formField => !ignored.includes(formField.name))
         .map(({ name, label }) => (
@@ -93,35 +92,33 @@ function FormFields(props: FormFieldsProps): JSX.Element {
                 name in placeholders ? placeholders[name] : '';
               const isURL = types[name] === 'url';
               return (
-                <Col key={key} xs={12}>
-                  <FormGroup>
-                    {type === 'hidden' ? null : (
-                      <ControlLabel htmlFor={key}>{label}</ControlLabel>
-                    )}
-                    <FormControl
-                      componentClass={type === 'textarea' ? type : 'input'}
-                      id={key}
-                      name={name}
-                      onChange={onChange}
-                      placeholder={placeholder}
-                      required={required.includes(name)}
-                      rows={4}
-                      type={type}
-                      value={value as string}
-                    />
-                    {nullOrWarning(
-                      value as string,
-                      !pristine && error,
-                      isURL,
-                      name
-                    )}
-                  </FormGroup>
-                </Col>
+                <FormGroup key={key}>
+                  {type === 'hidden' ? null : (
+                    <ControlLabel htmlFor={key}>{label}</ControlLabel>
+                  )}
+                  <FormControl
+                    componentClass={type === 'textarea' ? type : 'input'}
+                    id={key}
+                    name={name}
+                    onChange={onChange}
+                    placeholder={placeholder}
+                    required={required.includes(name)}
+                    rows={4}
+                    type={type}
+                    value={value as string}
+                  />
+                  {nullOrWarning(
+                    value as string,
+                    !pristine && error,
+                    isURL,
+                    name
+                  )}
+                </FormGroup>
               );
             }}
           </Field>
         ))}
-    </div>
+    </>
   );
 }
 
diff --git a/client/src/components/formHelpers/form.tsx b/client/src/components/formHelpers/form.tsx
index 64c174decee..ff4d6f87a51 100644
--- a/client/src/components/formHelpers/form.tsx
+++ b/client/src/components/formHelpers/form.tsx
@@ -12,7 +12,6 @@ import {
 import FormFields, { FormOptions } from './form-fields';
 
 import { default as BlockSaveButton } from './block-save-button';
-import { default as BlockSaveWrapper } from './block-save-wrapper';
 
 type URLValues = {
   [key: string]: string;
@@ -105,15 +104,13 @@ function DynamicForm({
           style={{ width: '100%' }}
         >
           <FormFields formFields={formFields} options={options} />
-          <BlockSaveWrapper>
-            {hideButton ? null : (
-              <BlockSaveButton
-                disabled={(pristine && !enableSubmit) || (error as boolean)}
-              >
-                {buttonText ? buttonText : null}
-              </BlockSaveButton>
-            )}
-          </BlockSaveWrapper>
+          {hideButton ? null : (
+            <BlockSaveButton
+              disabled={(pristine && !enableSubmit) || (error as boolean)}
+            >
+              {buttonText ? buttonText : null}
+            </BlockSaveButton>
+          )}
         </form>
       )}
     </Form>
diff --git a/client/src/components/formHelpers/index.tsx b/client/src/components/formHelpers/index.tsx
index d1f6f04d5e8..37b3b9ef31b 100644
--- a/client/src/components/formHelpers/index.tsx
+++ b/client/src/components/formHelpers/index.tsx
@@ -1,5 +1,4 @@
 import { default as Form, ValidatedValues } from './form';
 
 export { default as BlockSaveButton } from './block-save-button';
-export { default as BlockSaveWrapper } from './block-save-wrapper';
 export { Form, ValidatedValues };
diff --git a/client/src/templates/Challenges/projects/tool-panel.tsx b/client/src/templates/Challenges/projects/tool-panel.tsx
index 46a1e3cb820..d7cca68c119 100644
--- a/client/src/templates/Challenges/projects/tool-panel.tsx
+++ b/client/src/templates/Challenges/projects/tool-panel.tsx
@@ -6,8 +6,6 @@ import { bindActionCreators, Dispatch } from 'redux';
 
 import { openModal } from '../redux/actions';
 
-import './tool-panel.css';
-
 const mapStateToProps = () => ({});
 
 const mapDispatchToProps = (dispatch: Dispatch) =>
@@ -30,7 +28,7 @@ function ToolPanel({
   t
 }: ToolPanelProps): JSX.Element {
   return (
-    <div className='tool-panel-group project-tool-panel'>
+    <>
       {guideUrl && (
         <Button
           block={true}
@@ -50,7 +48,7 @@ function ToolPanel({
       >
         {t('buttons.ask-for-help')}
       </Button>
-    </div>
+    </>
   );
 }
 

From 58386567a77e97c4cea24b6b10cb2d05060e84ae Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 13 Feb 2023 23:50:45 +0530
Subject: [PATCH 47/52] fix(deps): update dependency
 @freecodecamp/react-calendar-heatmap to v1.1.0 (#49356)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 client/package.json |  2 +-
 package-lock.json   | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/client/package.json b/client/package.json
index 2d4b4f94324..bc3884d4532 100644
--- a/client/package.json
+++ b/client/package.json
@@ -46,7 +46,7 @@
     "@freecodecamp/curriculum-helpers": "1.1.0",
     "@freecodecamp/loop-protect": "3.0.0",
     "@freecodecamp/react-bootstrap": "0.32.3",
-    "@freecodecamp/react-calendar-heatmap": "1.0.0",
+    "@freecodecamp/react-calendar-heatmap": "1.1.0",
     "@freecodecamp/strip-comments": "3.0.1",
     "@growthbook/growthbook-react": "0.11.2",
     "@loadable/component": "5.15.3",
diff --git a/package-lock.json b/package-lock.json
index bcd8f328b99..dddecc03938 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -440,7 +440,7 @@
         "@freecodecamp/curriculum-helpers": "1.1.0",
         "@freecodecamp/loop-protect": "3.0.0",
         "@freecodecamp/react-bootstrap": "0.32.3",
-        "@freecodecamp/react-calendar-heatmap": "1.0.0",
+        "@freecodecamp/react-calendar-heatmap": "1.1.0",
         "@freecodecamp/strip-comments": "3.0.1",
         "@growthbook/growthbook-react": "0.11.2",
         "@loadable/component": "5.15.3",
@@ -3355,14 +3355,15 @@
       }
     },
     "node_modules/@freecodecamp/react-calendar-heatmap": {
-      "version": "1.0.0",
-      "license": "MIT",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@freecodecamp/react-calendar-heatmap/-/react-calendar-heatmap-1.1.0.tgz",
+      "integrity": "sha512-8HURv5KxiD0D/dZPA7jr2WRGaZqRjuTBmTHu/n+I1RlZlCtung6Wh7GpCy39EQXRIgqBvzX0VBj2PW3waa6qbg==",
       "dependencies": {
         "memoize-one": "^5.0.0",
         "prop-types": "^15.6.2"
       },
       "peerDependencies": {
-        "react": "^0.14.0 || ^15.0.0 || ^16.0.0"
+        "react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
       }
     },
     "node_modules/@freecodecamp/scripts-build": {
@@ -56372,7 +56373,7 @@
         "@freecodecamp/curriculum-helpers": "1.1.0",
         "@freecodecamp/loop-protect": "3.0.0",
         "@freecodecamp/react-bootstrap": "0.32.3",
-        "@freecodecamp/react-calendar-heatmap": "1.0.0",
+        "@freecodecamp/react-calendar-heatmap": "1.1.0",
         "@freecodecamp/strip-comments": "3.0.1",
         "@growthbook/growthbook-react": "0.11.2",
         "@loadable/component": "5.15.3",
@@ -56656,7 +56657,9 @@
       }
     },
     "@freecodecamp/react-calendar-heatmap": {
-      "version": "1.0.0",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@freecodecamp/react-calendar-heatmap/-/react-calendar-heatmap-1.1.0.tgz",
+      "integrity": "sha512-8HURv5KxiD0D/dZPA7jr2WRGaZqRjuTBmTHu/n+I1RlZlCtung6Wh7GpCy39EQXRIgqBvzX0VBj2PW3waa6qbg==",
       "requires": {
         "memoize-one": "^5.0.0",
         "prop-types": "^15.6.2"

From b5fcc389f0296af2ee3548db9f49cc7dfc35c417 Mon Sep 17 00:00:00 2001
From: Sriparno Roy <89148144+Sriparno08@users.noreply.github.com>
Date: Tue, 14 Feb 2023 02:08:27 +0530
Subject: [PATCH 48/52] fix(curriculum): Fix awkward phrasing (#49358)

* Fix awkward phrasing

* Remove sentence
---
 .../basic-javascript/escape-sequences-in-strings.md        | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/basic-javascript/escape-sequences-in-strings.md b/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/basic-javascript/escape-sequences-in-strings.md
index b41d20aed01..2a932a7708f 100644
--- a/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/basic-javascript/escape-sequences-in-strings.md
+++ b/curriculum/challenges/english/02-javascript-algorithms-and-data-structures/basic-javascript/escape-sequences-in-strings.md
@@ -9,12 +9,7 @@ dashedName: escape-sequences-in-strings
 
 # --description--
 
-Quotes are not the only characters that can be <dfn>escaped</dfn> inside a string. There are two reasons to use escaping characters:
-
-1.  To allow you to use characters you may not otherwise be able to type out, such as a newline.
-2.  To allow you to represent multiple quotes in a string without JavaScript misinterpreting what you mean.
-
-We learned this in the previous challenge.
+Quotes are not the only characters that can be <dfn>escaped</dfn> inside a string. Escape sequences allow you to use characters you may not otherwise be able to use in a string.
 
 <table class='table table-striped'><thead><tr><th>Code</th><th>Output</th></tr></thead><tbody><tr><td><code>\'</code></td><td>single quote</td></tr><tr><td><code>\"</code></td><td>double quote</td></tr><tr><td><code>\\</code></td><td>backslash</td></tr><tr><td><code>\n</code></td><td>newline</td></tr><tr><td><code>\t</code></td><td>tab</td></tr><tr><td><code>\r</code></td><td>carriage return</td></tr><tr><td><code>\b</code></td><td>word boundary</td></tr><tr><td><code>\f</code></td><td>form feed</td></tr></tbody></table>
 

From 26367a17c783b5771763cbc40ff6dead4a0536e3 Mon Sep 17 00:00:00 2001
From: Naomi Carrigan <nhcarrigan@gmail.com>
Date: Mon, 13 Feb 2023 23:53:38 -0800
Subject: [PATCH 49/52] chore: remove crowdin scripts (#49374)

---
 .github/labeler.yml                           |   1 -
 package-lock.json                             | 388 ------------------
 package.json                                  |   1 -
 .../actions/convert-chinese/action.yml        |   5 -
 .../crowdin/actions/convert-chinese/index.js  |  41 --
 .../hide-non-translated-strings/action.yml    |   5 -
 .../hide-non-translated-strings/index.js      |  62 ---
 .../actions/hide-specific-string/action.yml   |  12 -
 .../actions/hide-specific-string/index.js     |  34 --
 tools/crowdin/actions/pr-creator/action.yml   |  37 --
 tools/crowdin/actions/pr-creator/index.js     | 101 -----
 .../actions/remove-deleted-files/action.yml   |   5 -
 .../actions/remove-deleted-files/index.js     |  55 ---
 .../actions/unhide-specific-string/action.yml |  12 -
 .../actions/unhide-specific-string/index.js   |  33 --
 .../delete-all-translations-for-a-language.js |  30 --
 .../mark-translated-strings-as-done.js        |  54 ---
 tools/crowdin/package.json                    |  35 --
 tools/crowdin/sample.env                      |   4 -
 tools/crowdin/utils/auth-header.js            |   7 -
 tools/crowdin/utils/delay.js                  |   5 -
 tools/crowdin/utils/dirs.js                   |  86 ----
 tools/crowdin/utils/files.js                  | 122 ------
 tools/crowdin/utils/get-languages.js          |  17 -
 tools/crowdin/utils/make-request.js           |  34 --
 tools/crowdin/utils/strings.js                | 239 -----------
 26 files changed, 1425 deletions(-)
 delete mode 100644 tools/crowdin/actions/convert-chinese/action.yml
 delete mode 100644 tools/crowdin/actions/convert-chinese/index.js
 delete mode 100644 tools/crowdin/actions/hide-non-translated-strings/action.yml
 delete mode 100644 tools/crowdin/actions/hide-non-translated-strings/index.js
 delete mode 100644 tools/crowdin/actions/hide-specific-string/action.yml
 delete mode 100644 tools/crowdin/actions/hide-specific-string/index.js
 delete mode 100644 tools/crowdin/actions/pr-creator/action.yml
 delete mode 100644 tools/crowdin/actions/pr-creator/index.js
 delete mode 100644 tools/crowdin/actions/remove-deleted-files/action.yml
 delete mode 100644 tools/crowdin/actions/remove-deleted-files/index.js
 delete mode 100644 tools/crowdin/actions/unhide-specific-string/action.yml
 delete mode 100644 tools/crowdin/actions/unhide-specific-string/index.js
 delete mode 100644 tools/crowdin/one-off-scripts/delete-all-translations-for-a-language.js
 delete mode 100644 tools/crowdin/one-off-scripts/mark-translated-strings-as-done.js
 delete mode 100644 tools/crowdin/package.json
 delete mode 100644 tools/crowdin/sample.env
 delete mode 100644 tools/crowdin/utils/auth-header.js
 delete mode 100644 tools/crowdin/utils/delay.js
 delete mode 100644 tools/crowdin/utils/dirs.js
 delete mode 100644 tools/crowdin/utils/files.js
 delete mode 100644 tools/crowdin/utils/get-languages.js
 delete mode 100644 tools/crowdin/utils/make-request.js
 delete mode 100644 tools/crowdin/utils/strings.js

diff --git a/.github/labeler.yml b/.github/labeler.yml
index cae5f5099b4..1581cb23b3d 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -23,4 +23,3 @@
   - client/i18n/**/*
   - config/crowdin/**/*
   - config/i18n/**/*
-  - tools/crowdin/**/*
diff --git a/package-lock.json b/package-lock.json
index dddecc03938..342aa194961 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,6 @@
         "tools/challenge-editor/client",
         "tools/challenge-helper-scripts",
         "tools/challenge-parser",
-        "tools/crowdin",
         "tools/scripts/build",
         "tools/scripts/seed",
         "tools/ui-components"
@@ -702,38 +701,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/@actions/core": {
-      "version": "1.10.0",
-      "license": "MIT",
-      "dependencies": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
-      }
-    },
-    "node_modules/@actions/core/node_modules/uuid": {
-      "version": "8.3.2",
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/@actions/github": {
-      "version": "5.1.1",
-      "license": "MIT",
-      "dependencies": {
-        "@actions/http-client": "^2.0.1",
-        "@octokit/core": "^3.6.0",
-        "@octokit/plugin-paginate-rest": "^2.17.0",
-        "@octokit/plugin-rest-endpoint-methods": "^5.13.0"
-      }
-    },
-    "node_modules/@actions/http-client": {
-      "version": "2.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "tunnel": "^0.0.6"
-      }
-    },
     "node_modules/@adobe/css-tools": {
       "version": "4.0.1",
       "license": "MIT"
@@ -3272,10 +3239,6 @@
       "resolved": "client",
       "link": true
     },
-    "node_modules/@freecodecamp/crowdin": {
-      "resolved": "tools/crowdin",
-      "link": true
-    },
     "node_modules/@freecodecamp/curriculum": {
       "resolved": "curriculum",
       "link": true
@@ -4946,111 +4909,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@octokit/auth-token": {
-      "version": "2.5.0",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^6.0.3"
-      }
-    },
-    "node_modules/@octokit/core": {
-      "version": "3.6.0",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/auth-token": "^2.4.4",
-        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.6.3",
-        "@octokit/request-error": "^2.0.5",
-        "@octokit/types": "^6.0.3",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "node_modules/@octokit/endpoint": {
-      "version": "6.0.12",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^6.0.3",
-        "is-plain-object": "^5.0.0",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "node_modules/@octokit/endpoint/node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@octokit/graphql": {
-      "version": "4.8.0",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/request": "^5.6.0",
-        "@octokit/types": "^6.0.3",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "node_modules/@octokit/openapi-types": {
-      "version": "11.2.0",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "2.17.0",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^6.34.0"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=2"
-      }
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "5.13.0",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^6.34.0",
-        "deprecation": "^2.3.1"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=3"
-      }
-    },
-    "node_modules/@octokit/request": {
-      "version": "5.6.3",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.1.0",
-        "@octokit/types": "^6.16.1",
-        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.7",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "node_modules/@octokit/request-error": {
-      "version": "2.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^6.0.3",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/@octokit/request/node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@octokit/types": {
-      "version": "6.34.0",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^11.2.0"
-      }
-    },
     "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
       "version": "0.4.3",
       "license": "MIT",
@@ -17982,10 +17840,6 @@
       "version": "2.4.3",
       "license": "MIT"
     },
-    "node_modules/before-after-hook": {
-      "version": "2.2.2",
-      "license": "Apache-2.0"
-    },
     "node_modules/better-opn": {
       "version": "2.1.1",
       "license": "MIT",
@@ -22030,10 +21884,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/deprecation": {
-      "version": "2.3.1",
-      "license": "ISC"
-    },
     "node_modules/deps-sort": {
       "version": "2.0.1",
       "license": "MIT",
@@ -38651,13 +38501,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/node-opencc": {
-      "version": "2.0.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 7.6.0"
-      }
-    },
     "node_modules/node-releases": {
       "version": "2.0.6",
       "license": "MIT"
@@ -40516,14 +40359,6 @@
         "which": "bin/which"
       }
     },
-    "node_modules/path": {
-      "version": "0.12.7",
-      "license": "MIT",
-      "dependencies": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
-      }
-    },
     "node_modules/path-browserify": {
       "version": "1.0.1",
       "license": "MIT"
@@ -40581,17 +40416,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/path/node_modules/inherits": {
-      "version": "2.0.3",
-      "license": "ISC"
-    },
-    "node_modules/path/node_modules/util": {
-      "version": "0.10.4",
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
     "node_modules/pathval": {
       "version": "1.1.1",
       "license": "MIT",
@@ -50289,13 +50113,6 @@
       "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
       "dev": true
     },
-    "node_modules/tunnel": {
-      "version": "0.0.6",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
-      }
-    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "license": "Apache-2.0",
@@ -50841,10 +50658,6 @@
         "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/universal-user-agent": {
-      "version": "6.0.0",
-      "license": "ISC"
-    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "license": "MIT",
@@ -54282,38 +54095,6 @@
         "unist-util-stringify-position": "^1.1.1"
       }
     },
-    "tools/crowdin": {
-      "name": "@freecodecamp/crowdin",
-      "version": "0.0.1",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@actions/core": "1.10.0",
-        "@actions/github": "5.1.1",
-        "dotenv": "16.0.3",
-        "fs-extra": "10.0.0",
-        "gray-matter": "4.0.3",
-        "node-fetch": "2.6.9",
-        "node-opencc": "2.0.1",
-        "path": "0.12.7",
-        "readdirp": "3.6.0"
-      },
-      "engines": {
-        "node": ">=16",
-        "npm": ">=8"
-      }
-    },
-    "tools/crowdin/node_modules/fs-extra": {
-      "version": "10.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "tools/scripts/build": {
       "name": "@freecodecamp/scripts-build",
       "version": "0.0.1",
@@ -54447,33 +54228,6 @@
     }
   },
   "dependencies": {
-    "@actions/core": {
-      "version": "1.10.0",
-      "requires": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "8.3.2"
-        }
-      }
-    },
-    "@actions/github": {
-      "version": "5.1.1",
-      "requires": {
-        "@actions/http-client": "^2.0.1",
-        "@octokit/core": "^3.6.0",
-        "@octokit/plugin-paginate-rest": "^2.17.0",
-        "@octokit/plugin-rest-endpoint-methods": "^5.13.0"
-      }
-    },
-    "@actions/http-client": {
-      "version": "2.0.1",
-      "requires": {
-        "tunnel": "^0.0.6"
-      }
-    },
     "@adobe/css-tools": {
       "version": "4.0.1"
     },
@@ -56515,30 +56269,6 @@
         }
       }
     },
-    "@freecodecamp/crowdin": {
-      "version": "file:tools/crowdin",
-      "requires": {
-        "@actions/core": "1.10.0",
-        "@actions/github": "5.1.1",
-        "dotenv": "16.0.3",
-        "fs-extra": "10.0.0",
-        "gray-matter": "4.0.3",
-        "node-fetch": "2.6.9",
-        "node-opencc": "2.0.1",
-        "path": "0.12.7",
-        "readdirp": "3.6.0"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "10.0.0",
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        }
-      }
-    },
     "@freecodecamp/curriculum": {
       "version": "file:curriculum",
       "requires": {
@@ -57801,91 +57531,6 @@
         }
       }
     },
-    "@octokit/auth-token": {
-      "version": "2.5.0",
-      "requires": {
-        "@octokit/types": "^6.0.3"
-      }
-    },
-    "@octokit/core": {
-      "version": "3.6.0",
-      "requires": {
-        "@octokit/auth-token": "^2.4.4",
-        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.6.3",
-        "@octokit/request-error": "^2.0.5",
-        "@octokit/types": "^6.0.3",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "@octokit/endpoint": {
-      "version": "6.0.12",
-      "requires": {
-        "@octokit/types": "^6.0.3",
-        "is-plain-object": "^5.0.0",
-        "universal-user-agent": "^6.0.0"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "5.0.0"
-        }
-      }
-    },
-    "@octokit/graphql": {
-      "version": "4.8.0",
-      "requires": {
-        "@octokit/request": "^5.6.0",
-        "@octokit/types": "^6.0.3",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "@octokit/openapi-types": {
-      "version": "11.2.0"
-    },
-    "@octokit/plugin-paginate-rest": {
-      "version": "2.17.0",
-      "requires": {
-        "@octokit/types": "^6.34.0"
-      }
-    },
-    "@octokit/plugin-rest-endpoint-methods": {
-      "version": "5.13.0",
-      "requires": {
-        "@octokit/types": "^6.34.0",
-        "deprecation": "^2.3.1"
-      }
-    },
-    "@octokit/request": {
-      "version": "5.6.3",
-      "requires": {
-        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.1.0",
-        "@octokit/types": "^6.16.1",
-        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.7",
-        "universal-user-agent": "^6.0.0"
-      },
-      "dependencies": {
-        "is-plain-object": {
-          "version": "5.0.0"
-        }
-      }
-    },
-    "@octokit/request-error": {
-      "version": "2.1.0",
-      "requires": {
-        "@octokit/types": "^6.0.3",
-        "deprecation": "^2.0.0",
-        "once": "^1.4.0"
-      }
-    },
-    "@octokit/types": {
-      "version": "6.34.0",
-      "requires": {
-        "@octokit/openapi-types": "^11.2.0"
-      }
-    },
     "@pmmmwh/react-refresh-webpack-plugin": {
       "version": "0.4.3",
       "requires": {
@@ -67305,9 +66950,6 @@
     "bcryptjs": {
       "version": "2.4.3"
     },
-    "before-after-hook": {
-      "version": "2.2.2"
-    },
     "better-opn": {
       "version": "2.1.1",
       "requires": {
@@ -70066,9 +69708,6 @@
     "depd": {
       "version": "1.1.2"
     },
-    "deprecation": {
-      "version": "2.3.1"
-    },
     "deps-sort": {
       "version": "2.0.1",
       "requires": {
@@ -81047,9 +80686,6 @@
     "node-object-hash": {
       "version": "2.3.10"
     },
-    "node-opencc": {
-      "version": "2.0.1"
-    },
     "node-releases": {
       "version": "2.0.6"
     },
@@ -82247,24 +81883,6 @@
         }
       }
     },
-    "path": {
-      "version": "0.12.7",
-      "requires": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3"
-        },
-        "util": {
-          "version": "0.10.4",
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        }
-      }
-    },
     "path-browserify": {
       "version": "1.0.1"
     },
@@ -88378,9 +87996,6 @@
       "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==",
       "dev": true
     },
-    "tunnel": {
-      "version": "0.0.6"
-    },
     "tunnel-agent": {
       "version": "0.6.0",
       "requires": {
@@ -88719,9 +88334,6 @@
         "unist-util-is": "^4.0.0"
       }
     },
-    "universal-user-agent": {
-      "version": "6.0.0"
-    },
     "universalify": {
       "version": "2.0.0"
     },
diff --git a/package.json b/package.json
index a92224abef4..24a8b37021b 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,6 @@
     "tools/challenge-editor/client",
     "tools/challenge-helper-scripts",
     "tools/challenge-parser",
-    "tools/crowdin",
     "tools/scripts/build",
     "tools/scripts/seed",
     "tools/ui-components"
diff --git a/tools/crowdin/actions/convert-chinese/action.yml b/tools/crowdin/actions/convert-chinese/action.yml
deleted file mode 100644
index 58cba1de57b..00000000000
--- a/tools/crowdin/actions/convert-chinese/action.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: 'Translate Simplified Chinese to Traditional'
-description: 'Converts Simplified Chinese characters to Traditional Chinese Characters'
-runs:
-  using: 'node12'
-  main: './index.js'
diff --git a/tools/crowdin/actions/convert-chinese/index.js b/tools/crowdin/actions/convert-chinese/index.js
deleted file mode 100644
index 97040135075..00000000000
--- a/tools/crowdin/actions/convert-chinese/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/* eslint-disable import/no-unresolved */
-const path = require('path');
-const fs = require('fs-extra');
-const opencc = require('node-opencc');
-
-const getFiles = async (directory, fileList = []) => {
-  const files = await fs.readdir(directory);
-  for (const file of files) {
-    const fileStat = await fs.stat(path.join(directory, file));
-    if (fileStat.isDirectory()) {
-      fileList = await getFiles(path.join(directory, file), fileList);
-    } else {
-      fileList.push(path.join(directory, file));
-    }
-  }
-  return fileList;
-};
-
-(async () => {
-  console.info('Getting file list...');
-  const fileList = [];
-  const curriculum = await getFiles(
-    path.join(__dirname, '/../../../../curriculum/challenges/chinese')
-  );
-  fileList.push(...curriculum);
-
-  const client = await getFiles(
-    path.join(__dirname, '/../../../../client/i18n/locales/chinese')
-  );
-  fileList.push(...client);
-
-  for (const file of fileList) {
-    console.info(`Translating ${file}`);
-    const fileText = await fs.readFile(file, 'utf-8');
-    const translatedText = await opencc.simplifiedToTraditional(fileText);
-    await fs.outputFile(
-      file.replace('chinese', 'chinese-traditional'),
-      translatedText
-    );
-  }
-})();
diff --git a/tools/crowdin/actions/hide-non-translated-strings/action.yml b/tools/crowdin/actions/hide-non-translated-strings/action.yml
deleted file mode 100644
index c736f451059..00000000000
--- a/tools/crowdin/actions/hide-non-translated-strings/action.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: 'Hide Non-Translated Strings'
-description: "Updates each file's non-translatable string to Hidden"
-runs:
-  using: 'node12'
-  main: './index.js'
diff --git a/tools/crowdin/actions/hide-non-translated-strings/index.js b/tools/crowdin/actions/hide-non-translated-strings/index.js
deleted file mode 100644
index 9f41e3d0680..00000000000
--- a/tools/crowdin/actions/hide-non-translated-strings/index.js
+++ /dev/null
@@ -1,62 +0,0 @@
-require('dotenv').config({ path: `${__dirname}/../../.env` });
-const fs = require('fs');
-const path = require('path');
-const matter = require('gray-matter');
-const { getFiles } = require('../../utils/files');
-const { getStrings, updateFileString } = require('../../utils/strings');
-
-const createChallengeTitleLookup = (
-  lookup,
-  { fileId, path: crowdinFilePath }
-) => {
-  const challengeFilePath = path.join(
-    __dirname,
-    '/../../../../',
-    crowdinFilePath
-  );
-  try {
-    const challengeContent = fs.readFileSync(challengeFilePath);
-    const {
-      data: { title: challengeTitle }
-    } = matter(challengeContent);
-    return {
-      ...lookup,
-      [fileId]: {
-        crowdinFilePath,
-        challengeTitle
-      }
-    };
-  } catch (err) {
-    console.log(err.name);
-    console.log(err.message);
-  }
-  return lookup;
-};
-
-const hideNonTranslatedStrings = async projectId => {
-  console.log('hide non-translated strings...');
-  const crowdinFiles = await getFiles(projectId);
-  if (crowdinFiles && crowdinFiles.length) {
-    const challengeTitleLookup = crowdinFiles.reduce(
-      createChallengeTitleLookup,
-      {}
-    );
-    const crowdinStrings = await getStrings({ projectId });
-    if (crowdinStrings && crowdinStrings.length) {
-      for (let string of crowdinStrings) {
-        const { crowdinFilePath, challengeTitle } =
-          challengeTitleLookup[string.data.fileId];
-        await updateFileString({
-          projectId,
-          string,
-          challengeTitle,
-          crowdinFilePath
-        });
-      }
-    }
-  }
-  console.log('complete');
-};
-
-const projectId = process.env.CROWDIN_PROJECT_ID;
-hideNonTranslatedStrings(projectId);
diff --git a/tools/crowdin/actions/hide-specific-string/action.yml b/tools/crowdin/actions/hide-specific-string/action.yml
deleted file mode 100644
index f22ebbd945a..00000000000
--- a/tools/crowdin/actions/hide-specific-string/action.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: 'Hide Specific String'
-description: 'Updates a specific string to be hidden'
-runs:
-  using: 'node12'
-  main: './index.js'
-inputs:
-  filename:
-    description: 'name of file with specific string to hide'
-    required: true
-  string-content:
-    description: 'text content of string to hide'
-    required: true
diff --git a/tools/crowdin/actions/hide-specific-string/index.js b/tools/crowdin/actions/hide-specific-string/index.js
deleted file mode 100644
index a3faed2015a..00000000000
--- a/tools/crowdin/actions/hide-specific-string/index.js
+++ /dev/null
@@ -1,34 +0,0 @@
-require('dotenv').config({ path: `${__dirname}/../../.env` });
-const core = require('@actions/core');
-const { getFiles } = require('../../utils/files');
-const { getStrings, changeHiddenStatus } = require('../../utils/strings');
-// eslint-disable-next-line import/no-unresolved
-
-const filename = core.getInput('filename');
-const stringContent = core.getInput('string-content');
-
-const hideString = async (projectId, fileName, string) => {
-  const fileResponse = await getFiles(projectId);
-  const targetFile = fileResponse.find(el => el.path.endsWith(filename));
-  if (!targetFile) {
-    core.setFailed(`${fileName} was not found.`);
-    return;
-  }
-
-  const stringResponse = await getStrings({
-    projectId,
-    fileId: targetFile.fileId
-  });
-
-  const targetString = stringResponse.find(el => el.data.text === string);
-  if (!targetString) {
-    core.setFailed(`${string} was not found.`);
-    return;
-  }
-
-  await changeHiddenStatus(projectId, targetString.data.id, true);
-  console.log('string hidden!');
-};
-
-const projectId = process.env.CROWDIN_PROJECT_ID;
-hideString(projectId, filename, stringContent);
diff --git a/tools/crowdin/actions/pr-creator/action.yml b/tools/crowdin/actions/pr-creator/action.yml
deleted file mode 100644
index 57bfb7fa2c2..00000000000
--- a/tools/crowdin/actions/pr-creator/action.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: 'Create Crowdin PRs'
-description: 'Creates a PR by camperbot for Crowdin translation downloads'
-runs:
-  using: 'node12'
-  main: './index.js'
-inputs:
-  github-token:
-    description: 'PAT with write access to create PRs'
-    required: true
-  branch:
-    description: 'Branch name to which commits are made'
-    required: true
-  owner-repo:
-    description: 'owner and repo name specified as ownerName/repoName'
-    required: true
-  base:
-    description: 'base branch name'
-    default: 'main'
-    required: true
-  title:
-    description: 'PR title'
-    required: true
-  body:
-    description: 'PR body text'
-    required: true
-  labels:
-    description: 'PR labels'
-    required: false
-  reviewers:
-    description: 'Requested PR reviewers'
-    required: false
-  team_reviewers:
-    # Note that this should be a slug, not a full tag
-    # So a requested review from @freeCodeCamp/dev-team
-    # Should be passed only as 'dev-team'
-    description: 'Requested organization team PR reviewers'
-    required: false
diff --git a/tools/crowdin/actions/pr-creator/index.js b/tools/crowdin/actions/pr-creator/index.js
deleted file mode 100644
index f81a6504a64..00000000000
--- a/tools/crowdin/actions/pr-creator/index.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/* eslint-disable import/no-unresolved */
-/* eslint-disable camelcase */
-const core = require('@actions/core');
-const githubRoot = require('@actions/github');
-
-(async () => {
-  try {
-    const token = core.getInput('github-token');
-    const branch = core.getInput('branch');
-    const [owner, repo] = core.getInput('owner-repo').split('/');
-    if (!owner || !repo) {
-      core.setFailed('Must specify a valid ownerName/repoName');
-    }
-    const base = core.getInput('base');
-    const title = core.getInput('title');
-    const body = core.getInput('body');
-    const labelsStr = core.getInput('labels');
-    const labels = labelsStr.trim().split(/,\s+/);
-    const reviewersStr = core.getInput('reviewers');
-    const reviewers = reviewersStr.trim().split(/,\s+/);
-    const teamStr = core.getInput('team_reviewers');
-    const team_reviewers = teamStr.trim().split(/,\s+/);
-
-    const github = githubRoot.getOctokit(token);
-
-    const branchExists = await github.rest.repos
-      .getBranch({
-        owner,
-        repo,
-        branch
-      })
-      .catch(() => {
-        console.info('Branch does not exist. Likely no changes in download?');
-      });
-    if (!branchExists || branchExists.status !== 200) {
-      return;
-    }
-    const pullRequestExists = await github.rest.pulls.list({
-      owner,
-      repo,
-      head: `${owner}:${branch}`
-    });
-    if (pullRequestExists.data.length) {
-      console.info(
-        'It looks like a pull request already exists for this branch.'
-      );
-      return;
-    }
-    const PR = await github.rest.pulls
-      .create({
-        owner,
-        repo,
-        head: branch,
-        base,
-        title,
-        body
-      })
-      .catch(err => {
-        console.info(
-          'Unpredicted error occurred when trying to create the PR.'
-        );
-        console.error(err);
-      });
-    if (!PR || PR.status !== 201) {
-      return;
-    }
-    const prNumber = PR.data.number;
-    console.log(
-      `https://github.com/freeCodeCamp/freeCodeCamp/pull/${prNumber} created`
-    );
-    if (labels && labels.length) {
-      await github.rest.issues.addLabels({
-        owner,
-        repo,
-        issue_number: prNumber,
-        labels
-      });
-      console.log(`Labels ${labels} added to PR`);
-    }
-    if (reviewers && reviewers.length) {
-      await github.rest.pulls.requestReviewers({
-        owner,
-        repo,
-        pull_number: prNumber,
-        reviewers
-      });
-      console.log(`Requested Reviewers ${reviewers} added to PR`);
-    }
-    if (team_reviewers && team_reviewers.length) {
-      await github.rest.pulls.requestReviewers({
-        owner,
-        repo,
-        pull_number: prNumber,
-        team_reviewers
-      });
-      console.log(`Requested Team Reviewers ${team_reviewers} added to PR`);
-    }
-  } catch (error) {
-    core.setFailed(error.message);
-  }
-})();
diff --git a/tools/crowdin/actions/remove-deleted-files/action.yml b/tools/crowdin/actions/remove-deleted-files/action.yml
deleted file mode 100644
index fade21c6270..00000000000
--- a/tools/crowdin/actions/remove-deleted-files/action.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: 'Remove Deleted English Files From Crowdin'
-description: 'Deletes files from Crowdin that are no longer in the English curriculum folder'
-runs:
-  using: 'node12'
-  main: './index.js'
diff --git a/tools/crowdin/actions/remove-deleted-files/index.js b/tools/crowdin/actions/remove-deleted-files/index.js
deleted file mode 100644
index 8dbe0acbeb2..00000000000
--- a/tools/crowdin/actions/remove-deleted-files/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-require('dotenv').config({ path: `${__dirname}/../../.env` });
-// const core = require('@actions/core');
-const util = require('util');
-const exec = util.promisify(require('child_process').exec);
-
-const { getFiles, deleteFile } = require('../../utils/files');
-
-const getOutputFromCommand = async command => {
-  try {
-    const { stdout } = await exec(command);
-    return stdout;
-  } catch (err) {
-    console.log('Error');
-    console.log('command');
-    console.log(command + '\n');
-    console.log(err.message);
-    return null;
-  }
-};
-
-const removeDeletedFiles = async projectId => {
-  console.log('start deleting source files no longer in English curriculum...');
-  const crowdinFiles = await getFiles(projectId);
-
-  if (crowdinFiles && crowdinFiles.length) {
-    const challengeCommand = 'find curriculum/challenges/english -name \\*.*';
-    const listOfEnglishFiles = await getOutputFromCommand(challengeCommand);
-    const dictionaryCommand =
-      'find curriculum/dictionaries/english -name \\*.*';
-    const listOfDictFiles = await getOutputFromCommand(dictionaryCommand);
-    let curriculumFilesArr = listOfEnglishFiles.split('\n');
-    curriculumFilesArr = curriculumFilesArr.concat(listOfDictFiles.split('\n'));
-    if (curriculumFilesArr.length) {
-      const curriculumLookup = curriculumFilesArr.reduce((obj, filename) => {
-        return { ...obj, [filename]: 1 };
-      }, {});
-      for (let { fileId, path: crowdinFilePath } of crowdinFiles) {
-        if (
-          !Object.prototype.hasOwnProperty.call(
-            curriculumLookup,
-            crowdinFilePath
-          )
-        ) {
-          await deleteFile(projectId, fileId, crowdinFilePath);
-        }
-      }
-    }
-  } else {
-    console.log(`WARNING! No Crowdin files found for projectId ${projectId}`);
-  }
-  console.log('deleting source non-existent source files complete');
-};
-
-const projectId = process.env.CROWDIN_PROJECT_ID;
-removeDeletedFiles(projectId);
diff --git a/tools/crowdin/actions/unhide-specific-string/action.yml b/tools/crowdin/actions/unhide-specific-string/action.yml
deleted file mode 100644
index 7f36098838e..00000000000
--- a/tools/crowdin/actions/unhide-specific-string/action.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: 'Unhide Specific String'
-description: 'Updates a specific string to be not hidden'
-runs:
-  using: 'node12'
-  main: './index.js'
-inputs:
-  filename:
-    description: 'name of file with specific string to hide'
-    required: true
-  string-content:
-    description: 'text content of string to unhide'
-    required: true
diff --git a/tools/crowdin/actions/unhide-specific-string/index.js b/tools/crowdin/actions/unhide-specific-string/index.js
deleted file mode 100644
index 1c87883a053..00000000000
--- a/tools/crowdin/actions/unhide-specific-string/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-require('dotenv').config({ path: `${__dirname}/../../.env` });
-const core = require('@actions/core');
-const { getFiles } = require('../../utils/files');
-const { getStrings, changeHiddenStatus } = require('../../utils/strings');
-
-const filename = core.getInput('filename');
-const stringContent = core.getInput('string-content');
-
-const hideString = async (projectId, fileName, string) => {
-  const fileResponse = await getFiles(projectId);
-  const targetFile = fileResponse.find(el => el.path.endsWith(filename));
-  if (!targetFile) {
-    core.setFailed(`${fileName} was not found.`);
-    return;
-  }
-
-  const stringResponse = await getStrings({
-    projectId,
-    fileId: targetFile.fileId
-  });
-
-  const targetString = stringResponse.find(el => el.data.text === string);
-  if (!targetString) {
-    core.setFailed(`${string} was not found.`);
-    return;
-  }
-
-  await changeHiddenStatus(projectId, targetString.data.id, false);
-  console.log('string unhidden!');
-};
-
-const projectId = process.env.CROWDIN_PROJECT_ID;
-hideString(projectId, filename, stringContent);
diff --git a/tools/crowdin/one-off-scripts/delete-all-translations-for-a-language.js b/tools/crowdin/one-off-scripts/delete-all-translations-for-a-language.js
deleted file mode 100644
index b316904dfcd..00000000000
--- a/tools/crowdin/one-off-scripts/delete-all-translations-for-a-language.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-This one-off script can be used to delete all existing translations for a specified language on Crowdin.
-
-Specifying a projectId and lanaguageId in the .env file allows the script to accomplish this task.
-*/
-
-require('dotenv').config({ path: `${__dirname}/../.env` });
-
-const {
-  getLanguageTranslations,
-  deleteLanguageTranslations
-} = require('../utils/strings');
-
-const projectId = process.env.CROWDIN_PROJECT_ID;
-const languageId = process.env.CROWDIN_LANGUAGE_ID;
-
-(async (projectId, languageId) => {
-  console.log('starting script...');
-  const translations = await getLanguageTranslations({
-    projectId,
-    languageId
-  });
-  if (translations && translations.length) {
-    for (let translation of translations) {
-      const { stringId } = translation.data;
-      await deleteLanguageTranslations(projectId, languageId, stringId);
-    }
-  }
-  console.log('complete');
-})(projectId, languageId);
diff --git a/tools/crowdin/one-off-scripts/mark-translated-strings-as-done.js b/tools/crowdin/one-off-scripts/mark-translated-strings-as-done.js
deleted file mode 100644
index a643e451973..00000000000
--- a/tools/crowdin/one-off-scripts/mark-translated-strings-as-done.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-This one-off script can be used to make any string in a Crowdin project to be marked as "Done" in case a workflow
-change inadvertently causes strings, which already have translations (and even an approved translation), to be
-reverted to "To Do".
-
-Specifying a projectId in the .env file allows the script to find any string with at least one translation, 
-adds a new temporary translation to it, and then delete the newly added translation.  It is the addition of a
-new translation that switches the status back to "Done" in the Crowdsourcing view on Crowdin.
-
-*/
-
-require('dotenv').config({ path: `${__dirname}/../.env` });
-
-const getLanguages = require('../utils/get-languages');
-
-const {
-  addTranslation,
-  deleteTranslation,
-  getLanguageTranslations
-} = require('../utils/strings');
-
-const markTranslatedStringsAsDone = async projectId => {
-  console.log('starting script...');
-  const languageIds = await getLanguages(projectId);
-  for (let languageId of languageIds) {
-    const translations = await getLanguageTranslations({
-      projectId,
-      languageId
-    });
-    if (translations && translations.length) {
-      console.log(
-        `${languageId} has ${translations.length} strings with at least one translation`
-      );
-      for (let translation of translations) {
-        const { stringId } = translation.data;
-        const newTranslation = await addTranslation(
-          projectId,
-          stringId,
-          languageId,
-          'this is a camperbot test translation'
-        );
-        if (newTranslation && newTranslation.id);
-        console.log(
-          `added new translation (translationId: ${newTranslation.id}) for stringId: ${stringId}`
-        );
-        await deleteTranslation(projectId, newTranslation.id);
-      }
-    }
-  }
-  console.log('complete');
-};
-
-const projectId = process.env.CROWDIN_PROJECT_ID;
-markTranslatedStringsAsDone(projectId);
diff --git a/tools/crowdin/package.json b/tools/crowdin/package.json
deleted file mode 100644
index d2581fc490e..00000000000
--- a/tools/crowdin/package.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name": "@freecodecamp/crowdin",
-  "version": "0.0.1",
-  "description": "The freeCodeCamp.org open-source codebase and curriculum",
-  "license": "BSD-3-Clause",
-  "private": true,
-  "engines": {
-    "node": ">=16",
-    "npm": ">=8"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/freeCodeCamp/freeCodeCamp.git"
-  },
-  "bugs": {
-    "url": "https://github.com/freeCodeCamp/freeCodeCamp/issues"
-  },
-  "homepage": "https://github.com/freeCodeCamp/freeCodeCamp#readme",
-  "author": "freeCodeCamp <team@freecodecamp.org>",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "dependencies": {
-    "@actions/core": "1.10.0",
-    "@actions/github": "5.1.1",
-    "dotenv": "16.0.3",
-    "fs-extra": "10.0.0",
-    "gray-matter": "4.0.3",
-    "node-fetch": "2.6.9",
-    "node-opencc": "2.0.1",
-    "path": "0.12.7",
-    "readdirp": "3.6.0"
-  }
-}
diff --git a/tools/crowdin/sample.env b/tools/crowdin/sample.env
deleted file mode 100644
index 19149dbfe7b..00000000000
--- a/tools/crowdin/sample.env
+++ /dev/null
@@ -1,4 +0,0 @@
-CROWDIN_PROJECT_ID=
-CROWDIN_PERSONAL_TOKEN=
-CROWDIN_API_URL='https://freecodecamp.crowdin.com/api/v2/'
-CROWDIN_LANGUAGE_ID=
\ No newline at end of file
diff --git a/tools/crowdin/utils/auth-header.js b/tools/crowdin/utils/auth-header.js
deleted file mode 100644
index 2e216f8f0d9..00000000000
--- a/tools/crowdin/utils/auth-header.js
+++ /dev/null
@@ -1,7 +0,0 @@
-require('dotenv').config();
-
-const authHeader = {
-  Authorization: `Bearer ${process.env.CROWDIN_PERSONAL_TOKEN}`
-};
-
-module.exports = authHeader;
diff --git a/tools/crowdin/utils/delay.js b/tools/crowdin/utils/delay.js
deleted file mode 100644
index a311e0cdfcf..00000000000
--- a/tools/crowdin/utils/delay.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const delay = (time = 2000) => {
-  return new Promise(resolve => setTimeout(() => resolve(true), time));
-};
-
-module.exports = delay;
diff --git a/tools/crowdin/utils/dirs.js b/tools/crowdin/utils/dirs.js
deleted file mode 100644
index e7138555e19..00000000000
--- a/tools/crowdin/utils/dirs.js
+++ /dev/null
@@ -1,86 +0,0 @@
-const authHeader = require('./auth-header');
-const delay = require('./delay');
-const makeRequest = require('./make-request');
-
-const getDirs = async projectId => {
-  let headers = { ...authHeader };
-  let done = false;
-  let offset = 0;
-  let files = [];
-  while (!done) {
-    const endPoint = `projects/${projectId}/directories?limit=500&offset=${offset}`;
-    await delay(1000);
-    const response = await makeRequest({
-      method: 'get',
-      endPoint,
-      headers
-    });
-    if (response.data) {
-      if (response.data.length) {
-        files = [...files, ...response.data];
-        offset += 500;
-      } else {
-        done = true;
-        return files;
-      }
-    } else {
-      const { error } = response;
-      console.log(error.errorcode);
-      console.log(error.messsage);
-    }
-  }
-  return null;
-};
-
-const addDir = async (projectId, dirName, parentDirId) => {
-  let headers = { ...authHeader };
-  const endPoint = `projects/${projectId}/directories`;
-  let body = {
-    name: dirName
-  };
-  if (parentDirId) {
-    body = { ...body, directoryId: parentDirId };
-  }
-
-  const response = await makeRequest({
-    method: 'post',
-    endPoint,
-    headers,
-    body
-  });
-  return response;
-};
-
-const createDirs = async (crowdinDirs, dirPath) => {
-  // superParent is the top level directory on crowdin
-  const superParent = crowdinDirs.find(dir => !dir.data.directoryId);
-  let lastParentId = superParent.data.id;
-
-  const splitDirPath = dirPath.split('/');
-  splitDirPath.shift();
-
-  // we are assuming that the first directory in 'newFile' is the same as the superParent
-  // maybe throw a check in here to verify that's true
-  const findCurrDir = (directory, crowdinDirs) => {
-    return crowdinDirs.find(({ data: { name, directoryId } }) => {
-      return name === directory && directoryId === lastParentId;
-    });
-  };
-
-  for (let directory of splitDirPath) {
-    const currentDirectory = findCurrDir(directory, crowdinDirs);
-    if (!currentDirectory) {
-      const response = await addDir(10, directory, lastParentId);
-      lastParentId = response.data.id;
-    } else {
-      lastParentId = currentDirectory.data.id;
-    }
-  }
-  return lastParentId;
-};
-
-module.exports = {
-  addDir,
-  getDirs,
-  createDirs
-};
diff --git a/tools/crowdin/utils/files.js b/tools/crowdin/utils/files.js
deleted file mode 100644
index 740fd0771c9..00000000000
--- a/tools/crowdin/utils/files.js
+++ /dev/null
@@ -1,122 +0,0 @@
-const authHeader = require('./auth-header');
-const makeRequest = require('./make-request');
-
-const addFile = async (projectId, filename, fileContent, directoryId) => {
-  let headers = { ...authHeader };
-  headers['Crowdin-API-FileName'] = filename;
-  const endPoint = `storages`;
-  const contentType = 'application/text';
-  const body = fileContent;
-  const storageResponse = await makeRequest({
-    method: 'post',
-    contentType,
-    endPoint,
-    headers,
-    body
-  });
-  if (storageResponse.data) {
-    const fileBody = {
-      storageId: storageResponse.data.id,
-      name: filename,
-      directoryId
-    };
-    const fileResponse = await makeRequest({
-      method: 'post',
-      endPoint: `projects/${projectId}/files`,
-      headers,
-      body: fileBody
-    });
-    if (fileResponse.data) {
-      return fileResponse.data;
-    } else {
-      console.log('error');
-      console.dir(fileResponse, { depth: null, colors: true });
-    }
-  }
-  return null;
-};
-
-const updateFile = async (projectId, fileId, fileContent) => {
-  let headers = { ...authHeader };
-  const endPoint = `storages`;
-  const contentType = 'application/text';
-  const body = fileContent;
-  const storageResponse = await makeRequest({
-    method: 'post',
-    contentType,
-    endPoint,
-    headers,
-    body
-  });
-  if (storageResponse.data) {
-    const fileBody = {
-      storageId: storageResponse.data.id
-    };
-    const fileResponse = await makeRequest({
-      method: 'put',
-      endPoint: `projects/${projectId}/files${fileId}`,
-      headers,
-      body: fileBody
-    });
-    if (fileResponse.data) {
-      return fileResponse.data;
-    } else {
-      console.log('error');
-      console.dir(fileResponse, { depth: null, colors: true });
-    }
-  }
-  return null;
-};
-
-const deleteFile = async (projectId, fileId, filePath) => {
-  let headers = { ...authHeader };
-  const endPoint = `projects/${projectId}/files/${fileId}`;
-  await makeRequest({
-    method: 'delete',
-    endPoint,
-    headers
-  });
-  console.log(`Deleted ${filePath} from Crowdin project`);
-  return null;
-};
-
-const getFiles = async projectId => {
-  let headers = { ...authHeader };
-  let done = false;
-  let offset = 0;
-  let files = [];
-  while (!done) {
-    const endPoint = `projects/${projectId}/files?limit=500&offset=${offset}`;
-    const response = await makeRequest({
-      method: 'get',
-      endPoint,
-      headers
-    });
-    if (response.data) {
-      if (response.data.length) {
-        files = [...files, ...response.data];
-        offset += 500;
-      } else {
-        done = true;
-        files = files.map(({ data: { directoryId, id: fileId, path } }) => {
-          // remove leading forwardslash
-          path = path.slice(1);
-          return { directoryId, fileId, path };
-        });
-        return files;
-      }
-    } else {
-      const { error } = response;
-      console.log(error.errorcode);
-      console.log(error.messsage);
-    }
-  }
-  return null;
-};
-
-module.exports = {
-  addFile,
-  updateFile,
-  deleteFile,
-  getFiles
-};
diff --git a/tools/crowdin/utils/get-languages.js b/tools/crowdin/utils/get-languages.js
deleted file mode 100644
index cdf4901a0a6..00000000000
--- a/tools/crowdin/utils/get-languages.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const authHeader = require('./auth-header');
-const makeRequest = require('./make-request');
-
-const getLanguages = async projectId => {
-  let headers = { ...authHeader };
-  const endPoint = `projects/${projectId}?limit=500`;
-  const response = await makeRequest({ method: 'get', endPoint, headers });
-  if (response.data && response.data.targetLanguageIds.length) {
-    return response.data.targetLanguageIds;
-  } else {
-    const { error, errors } = response;
-    console.error(error ? error : errors);
-    return null;
-  }
-};
-
-module.exports = getLanguages;
diff --git a/tools/crowdin/utils/make-request.js b/tools/crowdin/utils/make-request.js
deleted file mode 100644
index 37e0af14369..00000000000
--- a/tools/crowdin/utils/make-request.js
+++ /dev/null
@@ -1,34 +0,0 @@
-require('dotenv').config();
-const fetch = require('node-fetch');
-
-const makeRequest = async ({
-  method,
-  endPoint,
-  contentType = 'application/json',
-  accept = 'application/json',
-  headers,
-  body
-}) => {
-  headers = { ...headers, 'Content-Type': contentType, Accept: accept };
-  const apiUrl = process.env.CROWDIN_API_URL + endPoint;
-
-  if (contentType === 'application/x-www-form-urlencoded') {
-    body = Object.entries(body)
-      .reduce((formDataArr, [key, value]) => {
-        return formDataArr.concat(`${key}=${value}`);
-      }, [])
-      .join('&');
-  } else if (contentType === 'application/json') {
-    body = JSON.stringify(body);
-  }
-
-  const response = await fetch(apiUrl, { headers, method, body });
-  if (method !== 'delete') {
-    const data = await response.json();
-    return data;
-  } else {
-    return null;
-  }
-};
-
-module.exports = makeRequest;
diff --git a/tools/crowdin/utils/strings.js b/tools/crowdin/utils/strings.js
deleted file mode 100644
index 4403f657fb7..00000000000
--- a/tools/crowdin/utils/strings.js
+++ /dev/null
@@ -1,239 +0,0 @@
-const authHeader = require('./auth-header');
-const makeRequest = require('./make-request');
-
-const isReservedHeading = (context, str) => {
-  const reservedHeadings = [
-    'after-user-code',
-    'answers',
-    'before-user-code',
-    'description',
-    'fcc-editable-region',
-    'hints',
-    'instructions',
-    'question',
-    'assignments',
-    'seed',
-    'seed-contents',
-    'solutions',
-    'text',
-    'video-solution'
-  ];
-  const captureGroupStr = `(${reservedHeadings.join('|')})`;
-  const regex = new RegExp(`--${captureGroupStr}--`);
-  return !!(context.match(/^Headline/) && str.match(regex));
-};
-
-const isCode = str => /^\/pre\/code|\/code$/.test(str);
-
-const isTitle = str => str.endsWith('title');
-
-const shouldHide = (text, context, challengeTitle, crowdinFilePath) => {
-  if (crowdinFilePath.endsWith('.yml')) {
-    return !isTitle(context);
-  }
-  if (isReservedHeading(context, text) || isCode(context)) {
-    return true;
-  }
-  return text !== challengeTitle && context.includes('id=front-matter');
-};
-
-const getStrings = async ({ projectId, fileId }) => {
-  let headers = { ...authHeader };
-  let done = false;
-  let offset = 0;
-  let strings = [];
-  while (!done) {
-    let endPoint = `projects/${projectId}/strings?limit=500&offset=${offset}`;
-    if (fileId) {
-      endPoint += `&fileId=${fileId}`;
-    }
-    const response = await makeRequest({ method: 'get', endPoint, headers });
-    if (response.data) {
-      if (response.data.length) {
-        strings = [...strings, ...response.data];
-        offset += 500;
-      } else {
-        done = true;
-        return strings;
-      }
-    } else {
-      const { error, errors } = response;
-      console.error(error ? error : errors);
-    }
-  }
-  return null;
-};
-
-const updateString = async ({ projectId, stringId, propsToUpdate }) => {
-  let headers = { ...authHeader };
-  const endPoint = `projects/${projectId}/strings/${stringId}`;
-  const body = propsToUpdate.map(({ path, value }) => ({
-    op: 'replace',
-    path,
-    value
-  }));
-  await makeRequest({
-    method: 'patch',
-    endPoint,
-    headers,
-    body
-  });
-};
-
-const changeHiddenStatus = async (projectId, stringId, newStatus) => {
-  await updateString({
-    projectId,
-    stringId,
-    propsToUpdate: [{ path: '/isHidden', value: newStatus }]
-  });
-};
-
-const updateFileStrings = async ({ projectId, fileId, challengeTitle }) => {
-  const fileStrings = await getStrings({
-    projectId,
-    fileId
-  });
-
-  for (let {
-    data: { id: stringId, text, isHidden, context }
-  } of fileStrings) {
-    const hideString = shouldHide(text, context, challengeTitle);
-    if (!isHidden && hideString) {
-      changeHiddenStatus(projectId, stringId, true);
-    } else if (isHidden && !hideString) {
-      changeHiddenStatus(projectId, stringId, false);
-    }
-  }
-};
-
-const updateFileString = async ({
-  projectId,
-  string,
-  challengeTitle,
-  crowdinFilePath
-}) => {
-  const {
-    data: { id: stringId, text, isHidden, context }
-  } = string;
-  const hideString = shouldHide(text, context, challengeTitle, crowdinFilePath);
-  if (!isHidden && hideString) {
-    await changeHiddenStatus(projectId, stringId, true);
-    console.log(
-      `${challengeTitle} - stringId: ${stringId} - changed isHidden to true`
-    );
-  } else if (isHidden && !hideString) {
-    await changeHiddenStatus(projectId, stringId, false);
-    console.log(
-      `${challengeTitle} - stringId: ${stringId} - changed isHidden to false`
-    );
-  }
-};
-
-const getStringTranslations = async ({ projectId, stringId, languageId }) => {
-  let headers = { ...authHeader };
-  let done = false;
-  let offset = 0;
-  let translations = [];
-  while (!done) {
-    let endPoint = `projects/${projectId}/translations?stringId=${stringId}&languageId=${languageId}&limit=500&offset=${offset}`;
-    const response = await makeRequest({ method: 'get', endPoint, headers });
-    if (response.data) {
-      if (response.data.length) {
-        translations = [...translations, ...response.data];
-        offset += 500;
-      } else {
-        done = true;
-        return translations;
-      }
-    } else {
-      const { error, errors } = response;
-      console.error(
-        error ? JSON.stringify(error, null, 2) : JSON.stringify(errors, null, 2)
-      );
-    }
-  }
-  return null;
-};
-
-const deleteTranslation = async (projectId, translationId) => {
-  let headers = { ...authHeader };
-  const endPoint = `projects/${projectId}/translations/${translationId}`;
-  await makeRequest({
-    method: 'delete',
-    endPoint,
-    headers
-  });
-  console.log(`Deleted translationId ${translationId} from Crowdin project`);
-  return null;
-};
-
-const addTranslation = async (projectId, stringId, languageId, text) => {
-  let headers = { ...authHeader };
-  const endPoint = `projects/${projectId}/translations`;
-  const body = {
-    stringId,
-    languageId,
-    text
-  };
-  const response = await makeRequest({
-    method: 'post',
-    endPoint,
-    headers,
-    body
-  });
-  if (response.data) {
-    return response.data;
-  }
-  return null;
-};
-
-const getLanguageTranslations = async ({ projectId, languageId }) => {
-  let headers = { ...authHeader };
-  let done = false;
-  let offset = 0;
-  let translations = [];
-  while (!done) {
-    let endPoint = `projects/${projectId}/languages/${languageId}/translations?limit=500&offset=${offset}`;
-    const response = await makeRequest({ method: 'get', endPoint, headers });
-    if (response.data) {
-      if (response.data.length) {
-        translations = [...translations, ...response.data];
-        offset += 500;
-      } else {
-        done = true;
-        return translations;
-      }
-    } else {
-      const { error, errors } = response;
-      console.error(
-        error ? JSON.stringify(error, null, 2) : JSON.stringify(errors, null, 2)
-      );
-    }
-  }
-  return null;
-};
-
-const deleteLanguageTranslations = async (projectId, languageId, stringId) => {
-  let headers = { ...authHeader };
-  const endPoint = `projects/${projectId}/translations?languageId=${languageId}&stringId=${stringId}`;
-  console.log(`deleting ${stringId}...`);
-  await makeRequest({
-    method: 'delete',
-    endPoint,
-    headers
-  });
-  return null;
-};
-
-module.exports = {
-  getStrings,
-  updateString,
-  updateFileStrings,
-  updateFileString,
-  getStringTranslations,
-  addTranslation,
-  deleteTranslation,
-  getLanguageTranslations,
-  deleteLanguageTranslations,
-  changeHiddenStatus
-};

From 96a821a2ac91c21e6e14aaf3c6d61e64a5378750 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Date: Tue, 14 Feb 2023 20:20:01 +0530
Subject: [PATCH 50/52] revert(tools): sentry apm and other telemetry (#49383)

Revert "feat(tools): sentry apm and other telemetry (#49230)"

This reverts commit b4fa56be3ed7cc940b4686814b611bb185ce21cb.
---
 api-server/package.json        |   3 +-
 api-server/src/server/index.js |  21 +---
 package-lock.json              | 174 +++------------------------------
 3 files changed, 17 insertions(+), 181 deletions(-)

diff --git a/api-server/package.json b/api-server/package.json
index f01fec9df07..8b2b9214fea 100644
--- a/api-server/package.json
+++ b/api-server/package.json
@@ -29,8 +29,7 @@
   },
   "dependencies": {
     "@freecodecamp/loopback-component-passport": "1.2.0",
-    "@sentry/node": "7.37.1",
-    "@sentry/tracing": "7.37.1",
+    "@sentry/node": "6.19.7",
     "accepts": "1.3.8",
     "axios": "0.23.0",
     "bad-words": "3.0.4",
diff --git a/api-server/src/server/index.js b/api-server/src/server/index.js
index 347cb159547..6c350cf2cfb 100644
--- a/api-server/src/server/index.js
+++ b/api-server/src/server/index.js
@@ -2,7 +2,6 @@ const path = require('path');
 require('dotenv').config({ path: path.resolve(__dirname, '../../../.env') });
 
 const Sentry = require('@sentry/node');
-const Tracing = require('@sentry/tracing');
 const createDebugger = require('debug');
 const _ = require('lodash');
 const loopback = require('loopback');
@@ -15,32 +14,16 @@ const { setupPassport } = require('./component-passport');
 const log = createDebugger('fcc:server');
 const reqLogFormat = ':date[iso] :status :method :response-time ms - :url';
 
-const app = loopback();
-
 if (sentry.dsn === 'dsn_from_sentry_dashboard') {
   log('Sentry reporting disabled unless DSN is provided.');
 } else {
   Sentry.init({
-    dsn: sentry.dsn,
-    integrations: [
-      new Sentry.Integrations.Http({ tracing: true }),
-      new Tracing.Integrations.Express({
-        app
-      })
-    ],
-    // Capture 20% of transactions to avoid
-    // overwhelming Sentry and remain within
-    // the usage quota
-    tracesSampleRate: 0.2
+    dsn: sentry.dsn
   });
   log('Sentry initialized');
 }
 
-// RequestHandler creates a separate execution context using domains, so that every
-// transaction/span/breadcrumb is attached to its own Hub instance
-app.use(Sentry.Handlers.requestHandler());
-// TracingHandler creates a trace for every incoming request
-app.use(Sentry.Handlers.tracingHandler());
+const app = loopback();
 
 app.set('state namespace', '__fcc__');
 app.set('port', process.env.API_PORT || 3000);
diff --git a/package-lock.json b/package-lock.json
index 342aa194961..029adbb8865 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -114,8 +114,7 @@
       "license": "BSD-3-Clause",
       "dependencies": {
         "@freecodecamp/loopback-component-passport": "1.2.0",
-        "@sentry/node": "7.37.1",
-        "@sentry/tracing": "7.37.1",
+        "@sentry/node": "6.19.7",
         "accepts": "1.3.8",
         "axios": "0.23.0",
         "bad-words": "3.0.4",
@@ -5276,53 +5275,20 @@
       }
     },
     "node_modules/@sentry/node": {
-      "version": "7.37.1",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.37.1.tgz",
-      "integrity": "sha512-nGerngIo5JwinJgl7m0SaL/xI+YRBlhb53gbkuLSAAcnoitBFzbp7LjywsqYFTWuWDIyk7O2t124GNxtolBAgA==",
+      "version": "6.19.7",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@sentry/core": "7.37.1",
-        "@sentry/types": "7.37.1",
-        "@sentry/utils": "7.37.1",
+        "@sentry/core": "6.19.7",
+        "@sentry/hub": "6.19.7",
+        "@sentry/types": "6.19.7",
+        "@sentry/utils": "6.19.7",
         "cookie": "^0.4.1",
         "https-proxy-agent": "^5.0.0",
         "lru_map": "^0.3.3",
         "tslib": "^1.9.3"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/node/node_modules/@sentry/core": {
-      "version": "7.37.1",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz",
-      "integrity": "sha512-eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ==",
-      "dependencies": {
-        "@sentry/types": "7.37.1",
-        "@sentry/utils": "7.37.1",
-        "tslib": "^1.9.3"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/node/node_modules/@sentry/types": {
-      "version": "7.37.1",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz",
-      "integrity": "sha512-c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/node/node_modules/@sentry/utils": {
-      "version": "7.37.1",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz",
-      "integrity": "sha512-/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA==",
-      "dependencies": {
-        "@sentry/types": "7.37.1",
-        "tslib": "^1.9.3"
-      },
-      "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
     "node_modules/@sentry/react": {
@@ -5343,53 +5309,6 @@
         "react": "15.x || 16.x || 17.x || 18.x"
       }
     },
-    "node_modules/@sentry/tracing": {
-      "version": "7.37.1",
-      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.37.1.tgz",
-      "integrity": "sha512-3mQG2XtMCGqDkgfzhKpRJAIfRaokNAOF8WafgAmFmZQwEDsRAFjZ3pLoO+KiBUeQE5E5et7HyWBOl9rqHCkWnQ==",
-      "dependencies": {
-        "@sentry/core": "7.37.1",
-        "@sentry/types": "7.37.1",
-        "@sentry/utils": "7.37.1",
-        "tslib": "^1.9.3"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/tracing/node_modules/@sentry/core": {
-      "version": "7.37.1",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz",
-      "integrity": "sha512-eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ==",
-      "dependencies": {
-        "@sentry/types": "7.37.1",
-        "@sentry/utils": "7.37.1",
-        "tslib": "^1.9.3"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/tracing/node_modules/@sentry/types": {
-      "version": "7.37.1",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz",
-      "integrity": "sha512-c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/tracing/node_modules/@sentry/utils": {
-      "version": "7.37.1",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz",
-      "integrity": "sha512-/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA==",
-      "dependencies": {
-        "@sentry/types": "7.37.1",
-        "tslib": "^1.9.3"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@sentry/types": {
       "version": "6.19.7",
       "license": "BSD-3-Clause",
@@ -55761,8 +55680,7 @@
         "@babel/preset-env": "7.18.0",
         "@babel/register": "7.17.7",
         "@freecodecamp/loopback-component-passport": "1.2.0",
-        "@sentry/node": "7.37.1",
-        "@sentry/tracing": "7.37.1",
+        "@sentry/node": "6.19.7",
         "accepts": "1.3.8",
         "axios": "0.23.0",
         "babel-core": "7.0.0-bridge.0",
@@ -57747,43 +57665,16 @@
       }
     },
     "@sentry/node": {
-      "version": "7.37.1",
-      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.37.1.tgz",
-      "integrity": "sha512-nGerngIo5JwinJgl7m0SaL/xI+YRBlhb53gbkuLSAAcnoitBFzbp7LjywsqYFTWuWDIyk7O2t124GNxtolBAgA==",
+      "version": "6.19.7",
       "requires": {
-        "@sentry/core": "7.37.1",
-        "@sentry/types": "7.37.1",
-        "@sentry/utils": "7.37.1",
+        "@sentry/core": "6.19.7",
+        "@sentry/hub": "6.19.7",
+        "@sentry/types": "6.19.7",
+        "@sentry/utils": "6.19.7",
         "cookie": "^0.4.1",
         "https-proxy-agent": "^5.0.0",
         "lru_map": "^0.3.3",
         "tslib": "^1.9.3"
-      },
-      "dependencies": {
-        "@sentry/core": {
-          "version": "7.37.1",
-          "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz",
-          "integrity": "sha512-eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ==",
-          "requires": {
-            "@sentry/types": "7.37.1",
-            "@sentry/utils": "7.37.1",
-            "tslib": "^1.9.3"
-          }
-        },
-        "@sentry/types": {
-          "version": "7.37.1",
-          "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz",
-          "integrity": "sha512-c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug=="
-        },
-        "@sentry/utils": {
-          "version": "7.37.1",
-          "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz",
-          "integrity": "sha512-/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA==",
-          "requires": {
-            "@sentry/types": "7.37.1",
-            "tslib": "^1.9.3"
-          }
-        }
       }
     },
     "@sentry/react": {
@@ -57797,43 +57688,6 @@
         "tslib": "^1.9.3"
       }
     },
-    "@sentry/tracing": {
-      "version": "7.37.1",
-      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.37.1.tgz",
-      "integrity": "sha512-3mQG2XtMCGqDkgfzhKpRJAIfRaokNAOF8WafgAmFmZQwEDsRAFjZ3pLoO+KiBUeQE5E5et7HyWBOl9rqHCkWnQ==",
-      "requires": {
-        "@sentry/core": "7.37.1",
-        "@sentry/types": "7.37.1",
-        "@sentry/utils": "7.37.1",
-        "tslib": "^1.9.3"
-      },
-      "dependencies": {
-        "@sentry/core": {
-          "version": "7.37.1",
-          "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz",
-          "integrity": "sha512-eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ==",
-          "requires": {
-            "@sentry/types": "7.37.1",
-            "@sentry/utils": "7.37.1",
-            "tslib": "^1.9.3"
-          }
-        },
-        "@sentry/types": {
-          "version": "7.37.1",
-          "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz",
-          "integrity": "sha512-c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug=="
-        },
-        "@sentry/utils": {
-          "version": "7.37.1",
-          "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz",
-          "integrity": "sha512-/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA==",
-          "requires": {
-            "@sentry/types": "7.37.1",
-            "tslib": "^1.9.3"
-          }
-        }
-      }
-    },
     "@sentry/types": {
       "version": "6.19.7"
     },

From 3a1ad99f0b794a6a7bdcfbc391f5033d9086b458 Mon Sep 17 00:00:00 2001
From: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
Date: Tue, 14 Feb 2023 16:54:33 +0100
Subject: [PATCH 51/52] fix(.gitpod.yml): use lts node (#49382)

* fix: use lts node in gitpod

* fix: use custom Dockerfile

* fix: actually use the image...
---
 .gitpod.Dockerfile | 8 ++++++++
 .gitpod.yml        | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 .gitpod.Dockerfile

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 00000000000..54b67b14d53
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,8 @@
+FROM gitpod/workspace-mongodb:latest
+
+# from https://www.gitpod.io/docs/introduction/languages/javascript#node-versions
+RUN bash -c 'VERSION="lts/*" \
+    && source $HOME/.nvm/nvm.sh && nvm install $VERSION \
+    && nvm use $VERSION && nvm alias default $VERSION'
+
+RUN echo "nvm use default &>/dev/null" >> ~/.bashrc.d/51-nvm-fix
diff --git a/.gitpod.yml b/.gitpod.yml
index d69ba77091e..a312e48f94a 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,4 +1,5 @@
-image: gitpod/workspace-mongodb
+image:
+  file: .gitpod.Dockerfile
 ports:
   - port: 27017 # mongodb
     onOpen: ignore

From 190ce3fea7d5c2f95e622c7d3cf9f1bbcea96462 Mon Sep 17 00:00:00 2001
From: camperbot <camperbot@users.noreply.github.com>
Date: Thu, 16 Feb 2023 10:03:57 +0530
Subject: [PATCH 52/52] chore(i18n,docs): processed translations (#49390)

---
 docs/i18n/ukrainian/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/i18n/ukrainian/index.md b/docs/i18n/ukrainian/index.md
index a06106f42e3..dd818c77547 100644
--- a/docs/i18n/ukrainian/index.md
+++ b/docs/i18n/ukrainian/index.md
@@ -16,7 +16,7 @@
 
 Ви можете допомогти нам збагатити та покращити навчальну програму. Ви також можете оновлювати історії користувачів з проєктів, щоб доповнити поняття тих чи інших концепцій. Ви також можете покращити наші автоматизовані тести, щоб ми могли максимально точно перевіряти код людей.
 
-**Якщо ви хочете поліпшити нашу навчальну програму, то почитайте [як зробити внесок до навчальної програми](how-to-work-on-coding-challenges.md).**
+**Якщо ви хочете покращити нашу навчальну програму, то перегляньте [як зробити внесок до навчальної програми](how-to-work-on-coding-challenges.md).**
 
 ## Переклади