Merge pull request #715 from freeCodeCamp/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.dockerignore

@@ -4,8 +4,9 @@ client/public
 .git
 .gitignore
 .dockerignore
-docker/web/Dockerfile
-docker/api/Dockerfile
+docker/**/Dockerfile
 **/*docker-compose*
 **/node_modules
 .eslintcache
+api/__mocks__
+api/src/exam-environment/seed

.github/workflows/build-images.yml

@@ -0,0 +1,43 @@
+name: CI - Build Images
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build (Image)
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        node-version: [20.x]
+        apps: [api]
+        site_tlds: [dev]
+      fail-fast: false
+
+    steps:
+      - name: Checkout Source Files
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: Create a tagname
+        id: tagname
+        run: |
+          echo "tagname=$(git rev-parse --short HEAD)-$(date +%Y%m%d)-$(date +%H%M)" >> $GITHUB_ENV
+
+      - name: Build & Tag Image
+        run: |
+          docker build \
+            --tag registry.digitalocean.com/${{ secrets.DOCR_NAME }}/${{ matrix.site_tlds }}/learn-${{ matrix.apps }}:$tagname \
+            --tag registry.digitalocean.com/${{ secrets.DOCR_NAME }}/${{ matrix.site_tlds }}/learn-${{ matrix.apps }}:latest \
+            --file docker/${{ matrix.apps }}/Dockerfile .
+
+      - name: Install doctl
+        uses: digitalocean/action-doctl@v2
+        with:
+          token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+
+      - name: Log in to DigitalOcean Container Registry with short-lived credentials
+        run: doctl registry login --expiry-seconds 1200
+
+      - name: Push image to DigitalOcean Container Registry
+        run: |
+          docker push registry.digitalocean.com/${{ secrets.DOCR_NAME }}/${{ matrix.site_tlds }}/learn-${{ matrix.apps }}:$tagname
+          docker push registry.digitalocean.com/${{ secrets.DOCR_NAME }}/${{ matrix.site_tlds }}/learn-${{ matrix.apps }}:latest

.github/workflows/e2e-with-new-api.yml

@@ -71,25 +71,6 @@ jobs:
           name: webpack-stats
           path: client/public/stats.json
 
-  build-api:
-    name: Build Api (Container)
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        node-version: [20.x]
-
-    steps:
-      - name: Checkout Source Files
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        with:
-          submodules: 'recursive'
-
-      - name: Create Image
-        run: |
-          docker build \
-            -t fcc-api \
-            -f docker/api/Dockerfile .
-
   build-new-api:
     name: Build New Api (Container)
     runs-on: ubuntu-22.04
@@ -106,11 +87,11 @@ jobs:
       - name: Create Image
         run: |
           docker build \
-            -t fcc-new-api \
-            -f docker/new-api/Dockerfile .
+            -t fcc-api \
+            -f docker/api/Dockerfile .
 
       - name: Save Image
-        run: docker save fcc-new-api > api-artifact.tar
+        run: docker save fcc-api > api-artifact.tar
 
       - name: Upload Api Artifact
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
@@ -166,7 +147,6 @@ jobs:
       - name: Set freeCodeCamp Environment Variables (needed by api)
         run: |
           cp sample.env .env
-          echo 'HOST=0.0.0.0' >> .env
 
       - name: Install playwright dependencies
         run: npx playwright install --with-deps

.github/workflows/github-autoclose.yml

@@ -21,7 +21,12 @@ jobs:
             });
             if (
               files.data.length !== 1 ||
-              files.data[0].filename !== ".gitignore"
+              (files.data[0].filename !== ".gitignore" &&
+              // We've had four PRs make this same (irrelevant) change already.
+                !(files.data[0].filename === "664ef4623946e65e18d59764.md" &&
+                  files.data[0].patch.includes("return re.sub('(?<!\d)1', '', equation_string.strip('+'))")
+                )
+              )
             ) {
               return;
             }

.github/workflows/temporary-container-checks.yml

@@ -50,7 +50,6 @@ jobs:
             --build-arg SHOW_NEW_CURRICULUM=false \
             --build-arg GROWTHBOOK_URI=api_URI_from_Growthbook_dashboard \
             --build-arg FREECODECAMP_NODE_ENV=development \
-            -t fcc-client \
             -f docker/web/Dockerfile .
 
   build-api:
@@ -69,8 +68,7 @@ jobs:
       - name: Create Image
         run: |
           docker build \
-            -t fcc-api \
-            -f docker/api/Dockerfile .
+            -f docker/api-server/Dockerfile .
 
   build-new-api:
     name: Build New Api (Container)
@@ -88,5 +86,4 @@ jobs:
       - name: Create Image
         run: |
           docker build \
-            -t fcc-new-api \
-            -f docker/new-api/Dockerfile .
+            -f docker/api/Dockerfile .

.gitignore

@@ -162,6 +162,7 @@ shared/utils/get-lines.test.js
 shared/utils/validate.js
 shared/utils/validate.test.js
 shared/utils/is-audited.js
+shared/utils/shuffle-array.js
 
 ### Old Generated files ###
 # These files are no longer generated by the client, but can

.gitpod.yml

@@ -41,8 +41,8 @@ tasks:
   - name: db
     # starting mongod in background, so it doesn't block prebuilds
     before: >
-      mkdir -p /workspace/data &&
-      (mongod --dbpath /workspace/data &)
+      cd api/tools &&
+      docker compose up -d
 
   - name: server
     before: export COOKIE_DOMAIN=gitpod.io && export HOME_LOCATION=$(gp url 8000) && export API_LOCATION=$(gp url 3000)
@@ -58,7 +58,8 @@ tasks:
       pnpm run seed &&
       mongosh --eval "db.fsyncLock(); db.fsyncUnlock()" &&
       gp ports await 27017 &&
-      pnpm run develop:server
+      cd api &&
+      pnpm run develop
 
   - name: client
     before: export HOME_LOCATION=$(gp url 8000) && export API_LOCATION=$(gp url 3000)

.prettierignore

@@ -1,11 +1,12 @@
 **/.cache
 **/*fixtures*
-**/public
 api-server/lib
 client/**/trending.json
+client/**/search-bar.json
 client/config/*.json
 client/config/browser-scripts/*.json
 client/static
+client/public
 curriculum/challenges/_meta/*/*
 curriculum/challenges/**/*
 curriculum/i18n-curriculum

api-server/package.json

@@ -80,11 +80,9 @@
     "@babel/cli": "7.17.10",
     "@babel/core": "7.18.0",
     "@babel/node": "7.17.10",
-    "@babel/plugin-proposal-class-properties": "7.17.12",
     "@babel/plugin-proposal-object-rest-spread": "7.18.0",
     "@babel/plugin-proposal-optional-chaining": "7.17.12",
     "@babel/preset-env": "7.18.0",
-    "@babel/register": "7.17.7",
     "loopback-component-explorer": "6.4.0",
     "nodemon": "2.0.16"
   }

api-server/src/server/utils/exam.js

@@ -1,18 +1,4 @@
-function shuffleArray(arr) {
-  let currentIndex = arr.length,
-    randomIndex;
-
-  while (currentIndex != 0) {
-    randomIndex = Math.floor(Math.random() * currentIndex);
-    currentIndex--;
-    [arr[currentIndex], arr[randomIndex]] = [
-      arr[randomIndex],
-      arr[currentIndex]
-    ];
-  }
-
-  return arr;
-}
+import { shuffleArray } from '../../../../shared/utils/shuffle-array';
 
 function filterDeprecated(arr) {
   return arr.filter(i => !i.deprecated);