Merge branch 'release/3.12.0'

uccser · Oct 11, 2022 · 485aa31 · 485aa31
2 parents 0865262 + bcf6e5a
commit 485aa31
Show file tree

Hide file tree

Showing 49 changed files with 2,648 additions and 2,153 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -171,8 +171,3 @@ updates:
     schedule:
       interval: "daily"
     open-pull-requests-limit: 999
-  - package-ecosystem: "npm"
-    directory: "/csfieldguide/static/js/modules/fsa/"
-    schedule:
-      interval: "daily"
-    open-pull-requests-limit: 999
diff --git a/.github/workflows/auto-merge-dependency-updates.yaml b/.github/workflows/auto-merge-dependency-updates.yaml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.3.3
+        uses: dependabot/fetch-metadata@v1.3.4
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve

diff --git a/.github/workflows/crowdin-actions.yaml b/.github/workflows/crowdin-actions.yaml
@@ -19,12 +19,12 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Upload or update source files to Crowdin
-      uses: crowdin/github-action@1.4.12
+      uses: crowdin/github-action@1.4.14
       with:
         upload_sources: true
 
     - name: Download German translations
-      uses: crowdin/github-action@1.4.12
+      uses: crowdin/github-action@1.4.14
       with:
         upload_sources: false
         download_translations: true
@@ -42,7 +42,7 @@ jobs:
         config: crowdin.yaml
 
     - name: Download Spanish translations
-      uses: crowdin/github-action@1.4.12
+      uses: crowdin/github-action@1.4.14
       with:
         upload_sources: false
         download_translations: true

diff --git a/csfieldguide/config/__init__.py b/csfieldguide/config/__init__.py
@@ -1,3 +1,3 @@
 """Module for Django system configuration."""
 
-__version__ = "3.11.0"
+__version__ = "3.12.0"
diff --git a/csfieldguide/gulpfile.js b/csfieldguide/gulpfile.js
@@ -120,7 +120,10 @@ const js_files_skip_optimisation = [
 
 // Styles autoprefixing and minification
 function css() {
-    return src(`${paths.css_source}/**/*.css`)
+    return src([
+            `${paths.css_source}/**/*.css`,
+            `!${paths.css_source}/**/node_modules/**/*.css`,
+        ])
         .pipe(errorHandler(catchError))
         .pipe(sourcemaps.init())
         .pipe(postcss(processCss))
@@ -130,14 +133,16 @@ function css() {
 }
 
 function scss() {
-    return src(`${paths.scss_source}/**/*.scss`, { since: lastRun(scss) })
+    return src([
+            `${paths.scss_source}/**/*.scss`,
+            `!${paths.scss_source}/**/node_modules/**/*.scss`,
+        ], { since: lastRun(scss) })
         .pipe(errorHandler(catchError))
         .pipe(dependents())
         .pipe(sourcemaps.init())
         .pipe(sass({
             includePaths: [
-                paths.bootstrap_source,
-                paths.scss_source
+                paths.bootstrap_source
             ],
             sourceComments: !PRODUCTION,
         }).on('error', sass.logError))
@@ -155,7 +160,7 @@ function js() {
     const js_filter = filter(js_files_skip_optimisation, { restore: true })
     return src([
             `${paths.js_source}/**/*.js`,
-            `!${paths.js_source}/**/modules/**/*.js`
+            `!${paths.js_source}/**/node_modules/**/*.js`
         ], {since: lastRun(js)})
         .pipe(js_filter)
         .pipe(errorHandler(catchError))
@@ -196,6 +201,7 @@ function svg() {
 function interactives() {
     return src([
             `${paths.interactives_source}/**/*`,
+            `!${paths.interactives_source}/**/node_modules/**/*`,
             `!${paths.interactives_source}/**/*.scss`,
             `!${paths.interactives_source}/**/*.js`
         ])

diff --git a/csfieldguide/interactives/content/en/interactives.yaml b/csfieldguide/interactives/content/en/interactives.yaml
@@ -148,10 +148,14 @@ pixel-viewer:
   name: Pixel Viewer
 plane-turbulence:
     name: Plane Turbulence
+product-code-check-digit-calculation:
+  name: Product Code Check Digit Calculation
 python-interpreter:
   name: Python Interpreter
 python-syntax-error:
   name: Python Syntax Error
+qr-code-generator:
+  name: QR Code Generator
 regular-expression-filter:
   name: Regular Expression Filter
 regular-expression-search:
@@ -179,7 +183,7 @@ searching-algorithms:
 sha2:
   name: SHA2
 shannon-experiment:
-  name: Shannon Experiment
+  name: Shannon's prediction and entropy of printed text experiment
 sorting-algorithm-comparison:
   name: Sorting Algorithm Comparison
 sorting-algorithms:

diff --git a/csfieldguide/interactives/content/structure/interactives.yaml b/csfieldguide/interactives/content/structure/interactives.yaml
@@ -39,6 +39,10 @@ base-calculator:
   languages:
     en: interactives/base-calculator.html
   is_interactive: true
+product-code-check-digit-calculation:
+  languages:
+    en: interactives/product-code-check-digit-calculation.html
+  is_interactive: true
 big-number-calculator:
   languages:
     en: interactives/big-number-calculator.html
@@ -345,6 +349,10 @@ python-syntax-error:
   languages:
     en: interactives/python-syntax-error.html
   is_interactive: false
+qr-code-generator:
+  languages:
+    en: interactives/qr-code-generator.html
+  is_interactive: true
 regular-expression-filter:
   languages:
     en: interactives/regular-expression-filter.html