Merge branch 'dev'

.github/workflows/ensure-cms-branch.yml

@@ -20,7 +20,7 @@ jobs:
       run: |
         echo "target_branch=main" >> $GITHUB_ENV
     - name: Update CMS branch configuration
-      uses: mikefarah/yq@v4.40.5
+      uses: mikefarah/yq@v4.42.1
       with:
         cmd: yq eval -i '.backend.branch = "${{ env.target_branch }}"' src/admin/config.yml
     - name: Commit changes

package.json

@@ -44,7 +44,7 @@
     "@11ty/eleventy-plugin-rss": "1.2.0",
     "airtable": "0.12.2",
     "axios": "1.6.7",
-    "decap-cms": "3.1.1",
+    "decap-cms": "3.1.2",
     "eleventy-plugin-fluid": "2.7.1",
     "eleventy-plugin-pwa-v2": "1.0.1",
     "estrella": "1.4.1",
@@ -61,19 +61,19 @@
   },
   "devDependencies": {
     "@commitlint/cli": "18.6.0",
-    "@commitlint/config-conventional": "18.6.0",
+    "@commitlint/config-conventional": "19.0.3",
     "autoprefixer": "10.4.17",
     "cross-env": "7.0.3",
     "decap-server": "3.0.2",
     "dotenv": "16.4.1",
-    "eslint": "8.56.0",
+    "eslint": "8.57.0",
     "eslint-config-fluid": "2.1.1",
-    "eslint-plugin-jsdoc": "48.0.4",
+    "eslint-plugin-jsdoc": "48.2.0",
     "eslint-plugin-markdown": "3.0.1",
     "eslint-plugin-react": "7.33.2",
     "eslint-plugin-yml": "1.12.2",
     "husky": "9.0.10",
-    "lint-staged": "15.2.1",
+    "lint-staged": "15.2.2",
     "markdownlint-cli2": "0.12.1",
     "markdownlint-config-fluid": "0.1.5",
     "npm-run-all": "4.1.5",

src/_includes/components/card.macro.njk

@@ -0,0 +1,13 @@
+{%- macro card(params) -%}
+<div class="card {{ params.color }}">
+  {% include params.backgroundSvg %}
+  <div class="card__content">
+    <h2>
+      <a href="{{ params.url }}">
+        {{ params.title | safe }}
+      </a>
+    </h2>
+    <p>{{ params.text | safe }}</p>
+  </div>
+</div>
+{% endmacro %}

src/_includes/layouts/page.njk

@@ -17,38 +17,11 @@
     </div>
   </article>
   <div class="homepage-cards">
-    <div class="card blue">
-      <h2>
-        <a href="/resources/">
-          Resource Library
-        </a>
-      </h2>
-      <p>Search IDRC's library of AI and data analytics resources</p>
-    </div>
-    <div class="card green">
-      <h2>
-        <a href="/events/">
-          Events
-        </a>
-      </h2>
-      <p>Find out about IDRC events and how you can participate</p>
-    </div>
-     <div class="card azure">
-      <h2>
-        <a href="/initiatives/">
-          Events
-        </a>
-      </h2>
-      <p>Explore IDRC project activities</p>
-    </div>
-    <div class="card yellow">
-      <h2>
-        <a href="/rtdd/">
-          Regulating the Digital / <span lang="fr-CA">Réguler le numérique</span>
-        </a>
-      </h2>
-      <p>Addressing digital exclusion / <span lang="fr-CA">Lutter contre l’exclusion numérique</span></p>
-    </div>
+    {%- from '../components/card.macro.njk' import card %}
+    {{ card({color: "blue", url: "/resources/", title: "Resource Library", text: "Search IDRC's library of AI and data analytics resources", backgroundSvg: "../svg/blue.svg"}) }}
+    {{ card({color: "green", url: "/events/", title: "Events", text: "Find out about IDRC events and how you can participate", backgroundSvg: "../svg/green.svg"}) }}
+    {{ card({color: "azure", url: "/initiatives/", title: "Inclusive AI Initiatives", text: "Explore IDRC project activities", backgroundSvg: "../svg/azure.svg"}) }}
+    {{ card({color: "yellow", url: "/rtdd/", title: "Regulating the Digital<div lang='fr-CA'>Réguler le numérique</div>", text: "Addressing digital exclusion / <span lang='fr-CA'>Lutter contre l’exclusion numérique</span>", backgroundSvg: "../svg/yellow.svg"}) }}
   </div>
 </div>