Merge pull request #724 from freeCodeCamp/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

api/__mocks__/env-exam.ts

@@ -343,9 +343,7 @@ export const exam: EnvExam = {
 };
 
 export async function seedEnvExam() {
-  await fastifyTestInstance.prisma.envExamAttempt.deleteMany({});
-  await fastifyTestInstance.prisma.envGeneratedExam.deleteMany({});
-  await fastifyTestInstance.prisma.envExam.deleteMany({});
+  await clearEnvExam();
 
   await fastifyTestInstance.prisma.envExam.create({
     data: exam
@@ -369,3 +367,15 @@ export async function seedEnvExam() {
   //   }
   // }
 }
+
+export async function clearEnvExam() {
+  await fastifyTestInstance.prisma.envExamAttempt.deleteMany({});
+  await fastifyTestInstance.prisma.envGeneratedExam.deleteMany({});
+  await fastifyTestInstance.prisma.envExam.deleteMany({});
+}
+
+export async function seedEnvExamAttempt() {
+  await fastifyTestInstance.prisma.envExamAttempt.create({
+    data: examAttempt
+  });
+}

api/prisma/schema.prisma

@@ -277,7 +277,7 @@ model EnvExamAttempt {
   needsRetake        Boolean
 
   // Relations
-  user          user             @relation(fields: [userId], references: [id])
+  user          user             @relation(fields: [userId], references: [id], onDelete: Cascade)
   exam          EnvExam          @relation(fields: [examId], references: [id])
   generatedExam EnvGeneratedExam @relation(fields: [generatedExamId], references: [id])
 }

api/src/exam-environment/routes/exam-environment.test.ts

@@ -42,6 +42,10 @@ describe('/exam-environment/', () => {
         res.body.examEnvironmentAuthorizationToken;
     });
 
+    afterAll(async () => {
+      await mock.clearEnvExam();
+    });
+
     describe('POST /exam-environment/exam/attempt', () => {
       afterEach(async () => {
         await fastifyTestInstance.prisma.envExamAttempt.deleteMany();

api/src/routes/protected/user.test.ts

@@ -16,6 +16,11 @@ import {
   createSuperRequest
 } from '../../../jest.utils';
 import { JWT_SECRET } from '../../utils/env';
+import {
+  clearEnvExam,
+  seedEnvExam,
+  seedEnvExamAttempt
+} from '../../../__mocks__/env-exam';
 import { getMsTranscriptApiUrl } from './user';
 
 const mockedFetch = jest.fn();
@@ -336,13 +341,18 @@ describe('userRoutes', () => {
     });
 
     describe('/account/delete', () => {
+      beforeEach(async () => {
+        await seedEnvExam();
+        await seedEnvExamAttempt();
+      });
       afterEach(async () => {
         await fastifyTestInstance.prisma.userToken.deleteMany({
           where: { OR: [{ userId: defaultUserId }, { userId: otherUserId }] }
         });
         await fastifyTestInstance.prisma.msUsername.deleteMany({
           where: { OR: [{ userId: defaultUserId }, { userId: otherUserId }] }
         });
+        await clearEnvExam();
       });
 
       test('POST returns 200 status code with empty object', async () => {
@@ -398,6 +408,18 @@ describe('userRoutes', () => {
         );
         expect(setCookie).toHaveLength(3);
       });
+
+      test("POST deletes all the user's exam attempts", async () => {
+        const examAttempts =
+          await fastifyTestInstance.prisma.envExamAttempt.findMany();
+        expect(examAttempts).toHaveLength(1);
+
+        await superPost('/account/delete');
+
+        const examAttemptsAfter =
+          await fastifyTestInstance.prisma.envExamAttempt.findMany();
+        expect(examAttemptsAfter).toHaveLength(0);
+      });
     });
 
     describe('/account/reset-progress', () => {

client/i18n/locales/chinese-traditional/intro.json

@@ -1561,6 +1561,12 @@
         "intro": [
           "This course will provide you with ways to explain things to other people while assisting them."
         ]
+      },
+      "a2-english-for-developers-certification-exam": {
+        "title": "A2 English for Developers Certification Exam",
+        "intro": [
+          "This exam is required to claim the A2 English for Developers Certification."
+        ]
       }
     }
   },
@@ -1756,9 +1762,11 @@
           "The following quiz will test your knowledge of the basic HTML concepts you have learned so far."
         ]
       },
-      "evdc": {
-        "title": "11",
-        "intro": []
+      "lecture-importance-of-semantic-html": {
+        "title": "Importance of Semantic HTML",
+        "intro": [
+          "In these lecture videos, you will learn about semantic HTML and the importance of using it."
+        ]
       },
       "workshop-blog-page": {
         "title": "Build a Cat Blog Page",
@@ -1786,9 +1794,11 @@
           "The following quiz will test your knowledge on semantic HTML concepts you have learned so far."
         ]
       },
-      "cfgp": {
-        "title": "16",
-        "intro": []
+      "lecture-working-with-forms": {
+        "title": "Working with Forms",
+        "intro": [
+          "In these lecture videos, you will learn about working with forms in HTML."
+        ]
       },
       "workshop-hotel-feedback-form": {
         "title": "Build a Hotel Feedback Form",
@@ -1804,9 +1814,9 @@
           "This lab will give you the opportunity to practice working with the <code>label</code> element, the different <code>input</code> elements, the <code>required</code> attribute, and more. "
         ]
       },
-      "wgot": {
-        "title": "19",
-        "intro": []
+      "lecture-working-with-tables": {
+        "title": "Working with Tables",
+        "intro": ["In these lecture videos, you will learn about HTML tables."]
       },
       "workshop-final-exams-table": {
         "title": "Build a Final Exams Table",
@@ -1821,9 +1831,11 @@
           "This lab will give you an opportunity to practice working with the different table components like the <code>Table Head</code>, <code>Table Row</code> and <code>Table Data Cell</code> elements."
         ]
       },
-      "rsve": {
-        "title": "22",
-        "intro": []
+      "lecture-working-with-html-tools": {
+        "title": "Working with HTML Tools",
+        "intro": [
+          "In these lecture videos, you will learn about working with HTML tools."
+        ]
       },
       "review-html-tables-and-forms": {
         "title": "HTML Tables and Forms Review",
@@ -1838,9 +1850,11 @@
           "The following quiz will test your knowledge of HTML tables and forms."
         ]
       },
-      "ghoc": {
-        "title": "25",
-        "intro": []
+      "lecture-importance-of-accessibility-and-good-html-structure": {
+        "title": "Importance of Accessibility and Good HTML Structure",
+        "intro": [
+          "In these lecture videos, you will learn about importance of accessibility and using good HTML structure."
+        ]
       },
       "lab-checkout-page": {
         "title": "Build a Checkout Page",
@@ -2163,7 +2177,8 @@
       "review-css-typography": {
         "title": "CSS Typography Review",
         "intro": [
-          "Review the CSS Typography concepts to prepare for the upcoming quiz."
+          "Before you are quizzed on the fundamentals of typography, you first need to review.",
+          "Open up this page to review concepts like web safe fonts, the <code>font-family</code> property and more."
         ]
       },
       "quiz-css-typography": {
@@ -2230,7 +2245,7 @@
         "title": "Build a Cat Painting",
         "intro": [
           "Mastering CSS positioning is essential for creating visually appealing and responsive web layouts.",
-          "In this workshop, you will build a cat painting. You'll learn about how to work with absolute positioning, the z-index property, and the transform property."
+          "In this workshop, you will build a cat painting. You'll learn about how to work with absolute positioning, the <code>z-index</code> property, and the <code>transform</code> property."
         ]
       },
       "lab-house-painting": {
@@ -2368,9 +2383,9 @@
         ]
       },
       "review-css-animations": {
-        "title": "CSS Amimations Review",
+        "title": "CSS Animations Review",
         "intro": [
-          "Review the CSS Amimations concepts to prepare for the upcoming quiz."
+          "Review the CSS Animations concepts to prepare for the upcoming quiz."
         ]
       },
       "quiz-css-animations": {
@@ -3067,9 +3082,12 @@
         "title": "251",
         "intro": []
       },
-      "byqx": {
-        "title": "252",
-        "intro": []
+      "workshop-fcc-authors-page": {
+        "title": "Build an fCC Authors Page",
+        "intro": [
+          "One common aspect of web development is learning how to fetch data from an external API, then work with asynchronous JavaScript.",
+          "In this workshop you will practice how to use the fetch method, dynamically update the DOM to display the fetched data and paginate your data so you can load results in batches."
+        ]
       },
       "alda": {
         "title": "253",
@@ -3617,58 +3635,14 @@
         "title": "368",
         "intro": []
       },
-      "workshop-npm-packages": {
-        "title": "Managing Packages with npm",
-        "intro": [
-          "npm (Node Package Manager), is a command line tool to install, create, and share packages of JavaScript code written for Node.js. There are many open source packages available on npm, so before starting a project, take some time to explore so you don't end up recreating the wheel for things like working with dates or fetching data from an API.",
-          "In this workshop, you'll learn the basics of using npm, including how to work with the <code>package.json</code> file and how to manage your installed dependencies."
-        ]
-      },
       "hjku": {
         "title": "370",
         "intro": []
       },
-      "workshop-node-and-express": {
-        "title": "Basic Node and Express",
-        "intro": [
-          "Node.js is a JavaScript runtime that allows developers to write backend (server-side) programs in JavaScript. Node.js comes with a handful of built-in modules — small, independent programs — that help with this. Some of the core modules include HTTP, which acts like a server, and File System, a module to read and modify files.",
-          "In the last set of courses you learned to install and manage packages from npm, which are collections of smaller modules. These packages can help you build larger, more complex applications.",
-          "Express is a lightweight web application framework, and is one of the most popular packages on npm. Express makes it much easier to create a server and handle routing for your application, which handles things like directing people to the correct page when they visit a certain endpoint like <pre>/blog</pre>.",
-          "In this course, you'll learn the basics of Node and Express including how to create a server, serve different files, and handle different requests from the browser."
-        ]
-      },
-      "lab-timestamp-microservice": {
-        "title": "Build a Timestamp Microservice",
-        "intro": ["In this lab you will build a timestamp microservice"]
-      },
-      "lab-request-header-parser-microservice": {
-        "title": "Build a Request Header Parser Microservice",
-        "intro": [
-          "In this lab, you will build a request header parser microservice"
-        ]
-      },
-      "lab-url-shortener-microservice": {
-        "title": "Build a URL Shortener Microservice",
-        "intro": ["In this lab, you will build a URL Shortener Microservice"]
-      },
-      "lab-exercise-tracker": {
-        "title": "Build an Exercise Tracker",
-        "intro": ["In this lab, you will build an exercise tracker"]
-      },
-      "lab-file-metadata-microservice": {
-        "title": "Build a File Metadata Microservice",
-        "intro": ["For this lab you will build a file metadata microservice"]
-      },
       "kegi": {
         "title": "377",
         "intro": []
       },
-      "quiz-backend-javascript": {
-        "title": "Backend JavaScript Quiz",
-        "intro": [
-          "Test what you've learned in this quiz on Backend JavaScript."
-        ]
-      },
       "vnfu": {
         "title": "379",
         "intro": []
@@ -3685,12 +3659,6 @@
         "title": "382",
         "intro": []
       },
-      "quiz-tooling-and-deployment": {
-        "title": "Tooling and Deployment Quiz",
-        "intro": [
-          "Test what you've learned in this quiz of tooling and deployment"
-        ]
-      },
       "nkjt": {
         "title": "384",
         "intro": []

client/i18n/locales/chinese-traditional/translations.json

@@ -96,6 +96,8 @@
     "exit": "退出",
     "finish-exam": "完成考試",
     "finish": "完成",
+    "exit-quiz": "Exit the quiz",
+    "finish-quiz": "Finish the quiz",
     "submit-exam-results": "提交我的結果",
     "verify-trophy": "驗證獎盃",
     "link-account": "關聯賬戶",
@@ -518,7 +520,15 @@
       "correct-answer": "Correct!",
       "incorrect-answer": "Incorrect.",
       "unanswered-questions": "The following questions are unanswered: {{ unansweredQuestions }}. You must answer all questions.",
-      "have-n-correct-questions": "You have {{ correctAnswerCount }} out of {{ total }} questions correct."
+      "have-n-correct-questions": "You have {{ correctAnswerCount }} out of {{ total }} questions correct.",
+      "finish-modal-header": "Finish Quiz",
+      "finish-modal-body": "Are you sure you want to finish the quiz? You will not be able to change any answers.",
+      "finish-modal-yes": "Yes, I am finished",
+      "finish-modal-no": "No, I would like to continue the quiz",
+      "exit-modal-header": "Exit Quiz",
+      "exit-modal-body": "Are you sure you want to leave the quiz? You will lose any progress you have made.",
+      "exit-modal-yes": "Yes, I want to leave the quiz",
+      "exit-modal-no": "No, I would like to continue the quiz"
     },
     "exam": {
       "qualified": "恭喜，你已經完成了考試資格的所有要求。",
@@ -770,6 +780,7 @@
     "heart": "愛心",
     "initial": "初始",
     "input-reset": "清除搜索條件",
+    "input-search": "Submit search terms",
     "info": "介紹信息",
     "spacer": "間隔",
     "toggle": "切換選中標記",