feat: rich text for subtitles, partners and community sections

.github/workflows/lint-build.yml

@@ -9,21 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Cache node modules
-        uses: actions/cache@v4
+      - uses: actions/setup-node@v4
         with:
-          path: node_modules
-          key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
+          cache: npm
       - name: Install dependencies
         run: npm install
-        env:
-          CI: true
       - name: Lint files
         run: npm run lint
-        env:
-          CI: true
       - name: Build site
         run: npm run build
-        env:
-          CI: true
-

.github/workflows/release-please.yml

@@ -8,7 +8,7 @@ jobs:
   release-please:
     runs-on: ubuntu-latest
     steps:
-      - uses: google-github-actions/release-please-action@v4
+      - uses: googleapis/release-please-action@v4
         id: release
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.nvmrc

@@ -1 +1 @@
-18
+22

package.json

@@ -30,41 +30,41 @@
   },
   "homepage": "https://github.com/codelearncreate/weavly.org#readme",
   "dependencies": {
-    "@11ty/eleventy": "2.0.1",
-    "@11ty/eleventy-img": "6.0.1",
-    "@11ty/eleventy-navigation": "0.3.5",
-    "@babel/standalone": "7.25.3",
+    "@11ty/eleventy": "^2.0.1",
+    "@11ty/eleventy-img": "^6.0.1",
+    "@11ty/eleventy-navigation": "^0.3.5",
+    "@babel/standalone": "^7.25.3",
     "@zachleat/filter-container": "greatislander/filter-container#feat/paginated-results",
-    "decap-cms": "3.6.2",
-    "eleventy-plugin-fluid": "2.7.1",
-    "infusion": "4.8.0",
-    "modern-css-reset": "1.4.0",
-    "prop-types": "15.8.1",
-    "react": "16.14.0",
-    "wicg-inert": "3.1.2"
+    "decap-cms": "^3.6.2",
+    "eleventy-plugin-fluid": "^2.7.1",
+    "infusion": "^4.8.0",
+    "modern-css-reset": "^1.4.0",
+    "prop-types": "^15.8.1",
+    "react": "^16.14.0",
+    "wicg-inert": "^3.1.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "19.3.0",
-    "@commitlint/config-conventional": "19.7.1",
-    "cross-env": "7.0.3",
-    "decap-server": "3.0.4",
-    "eslint": "8.57.0",
-    "eslint-config-fluid": "2.1.1",
-    "eslint-plugin-jsdoc": "48.10.2",
-    "eslint-plugin-markdown": "4.0.1",
-    "eslint-plugin-yml": "1.17.0",
-    "husky": "9.0.11",
-    "image-size": "1.1.1",
-    "linkedom": "0.18.4",
-    "lint-staged": "15.2.2",
-    "markdownlint-cli2": "0.9.2",
-    "markdownlint-config-fluid": "0.1.5",
-    "npm-run-all": "4.1.5",
-    "rimraf": "5.0.5",
-    "stylelint": "14.16.1",
-    "stylelint-config-fluid": "1.0.0",
-    "stylelint-config-standard-scss": "6.1.0",
-    "stylelint-use-logical-spec": "5.0.1"
+    "@commitlint/cli": "^19.3.0",
+    "@commitlint/config-conventional": "^19.7.1",
+    "cross-env": "^7.0.3",
+    "decap-server": "^3.0.4",
+    "eslint": "^8.57.0",
+    "eslint-config-fluid": "^2.1.1",
+    "eslint-plugin-jsdoc": "^48.10.2",
+    "eslint-plugin-markdown": "^4.0.1",
+    "eslint-plugin-yml": "^1.17.0",
+    "husky": "^9.0.11",
+    "image-size": "^1.1.1",
+    "linkedom": "^0.18.4",
+    "lint-staged": "^15.2.2",
+    "markdownlint-cli2": "^0.9.2",
+    "markdownlint-config-fluid": "^0.1.5",
+    "npm-run-all": "^4.1.5",
+    "rimraf": "^5.0.5",
+    "stylelint": "^14.16.1",
+    "stylelint-config-fluid": "^1.0.0",
+    "stylelint-config-standard-scss": "^6.1.0",
+    "stylelint-use-logical-spec": "^5.0.1"
   },
   "lint-staged": {
     "*.scss": "stylelint --fix",

renovate.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:recommended"],
+  "commitBody": "[skip netlify]",
+  "lockFileMaintenance": {
+    "enabled": true,
+    "automerge": true
+  },
+  "packageRules": [
+    {
+      "matchUpdateTypes": ["minor", "patch"],
+      "matchCurrentVersion": "!/^0/",
+      "automerge": true
+    }
+  ]
+}

src/_includes/layouts/about.njk

@@ -41,19 +41,29 @@
   </div>
 </div>
 <div class="[ bg ]">
-  <div class="[ wrapper ]">
+  <div class="[ wrapper ] [ flow-lg ]">
+    <h3>{{ whoSection.partnersTitle }}</h3>
     <div class="[ switcher ]">
       <div>
         {% for partner in whoSection.partners %}
         <div class="[ flow ]">
           {% image partner.image, partner.imageAlt, 640, 520 %}
-          <h3>{{ partner.name }}{% if partner.acronym %} ({{ partner.acronym }}){% endif %}</h3>
+          <h4>{{ partner.name }}{% if partner.acronym %} ({{ partner.acronym }}){% endif %}</h4>
           {% renderString partner.content, "md" %}
           <p><a rel="external" href="{{ partner.link }}">Visit {{ partner.acronym if partner.acronym else partner.name }} website</a></p>
         </div>
         {% endfor %}
       </div>
     </div>
+    <div class="[ flow-lg ]">
+    <h3>{{ whoSection.communityTitle }}</h3>
+    {% renderString whoSection.community, "md" %}
+    </div>
+    <div class="[ community-members ]">
+      {% for communityMember in whoSection.communityMembers %}
+      <div class="[ community-member ]"><a rel="external" href="{{ communityMember.link }}">{{ communityMember.name }}</a></div>
+      {% endfor %}
+    </div>
   </div>
   <svg class="[ wave wave--bottom ]" viewBox="0 0 1437 52" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M824.685 0C1036.3 0 1325.5 31.333 1441 52H.078C82.042 52 560.164 0 824.685 0z" fill="var(--color-red-75)"/></svg>
 </div>

src/_includes/layouts/base.njk

@@ -26,7 +26,7 @@
                     {% block pageHeader %}
                         <h1>{{ title }}</h1>
                         {% if subtitle %}
-                        <p class="[ subtitle ] [ prose ]">{{ subtitle | safe }}</p>
+                        <div class="[ subtitle ] [ prose ]">{% renderString subtitle, "md" %}</div>
                         {% endif %}
                         {% if page.url === "/" %}
                         <p class="[ sm:center ]"><a class="call-to-action" rel="external" href="https://create.weavly.org">Create</a></p>

src/about.md

@@ -10,7 +10,11 @@ whatWeDoSection:
       link: /learn/#activities
 whoSection:
   title: Who We Are
-  intro: "**Weavly** is a collaborative effort between the Inclusive Design Research Centre, IRIS Institute, and the Bridges Canada. This project is funded by the Innovation, Science and Economic Development Canada’s Accessible Technology Program."
+  intro: "**Weavly** is a collaborative effort between the Inclusive Design
+    Research Centre, IRIS Institute, and the Bridges Canada. This project is
+    funded by the Innovation, Science and Economic Development Canada’s
+    Accessible Technology Program."
+  partnersTitle: Partners
   partners:
     - name: Inclusive Design Research Centre
       acronym: IDRC
@@ -31,6 +35,54 @@ whoSection:
       image: /assets/media/20122485921_8dfcf134e3_o.jpg
       imageAlt: "Image of several kids talking. One of the kids is seated on a powered
         wheelchair and using a single switch. "
+  communityTitle: Community
+  community: >-
+    Weavly is built upon the efforts and contributions of many young and adult
+    co-designers, family members, educators, and caregivers over the years.
+    Without their insights and dedication, this project would not have been
+    possible. Due to privacy reasons, we are unable to list their names here,
+    but we are always deeply grateful for their invaluable contributions.
+
+
+    We would like to acknowledge the individuals and community-based groups who facilitated connections with our co-designers and significantly contributed to the progress of this project.
+
+
+    If you have contributed to Weavly in any capacity and would like your name to be included, please contact our team at weavly@idrc.ocadu.ca.
+  communityMembers:
+    - name: Alberta Health Services
+      link: https://www.albertahealthservices.ca/
+    - name: Beverely School - Toronto District School Board
+      link: https://schoolweb.tdsb.on.ca/beverleyschool
+    - name: Alan Bridgeman
+      link: https://www.linkedin.com/in/alan-bridgeman-234490113/
+    - name: Burnaby Schools
+      link: https://burnabyschools.ca/
+    - name: Camp Karma
+      link: https://www.veryspecialcamps.com/summer-camps/Karma-Country-Camp-for-Teenagers-and-Young-Adults-with-ASD-and-Special-Needs-2675.html
+    - name: Grandpals
+      link: https://grandpals.ca/
+    - name: Holland Bloorview
+      link: https://hollandbloorview.ca/
+    - name: Hour of Code
+      link: https://hourofcode.com/ca
+    - name: Kayla Children’s Centre
+      link: https://kaylaschildrencentre.org/
+    - name: Kensington Community School - Toronto District School Board
+      link: https://www.tdsb.on.ca/Find-your/Schools/schno/5347
+    - name: Melanie Mulcaster - Peel School Board
+      link: https://www.linkedin.com/in/mel-mulcaster-9541a549/
+    - name: PhET Interactive Simulations - University of Colorado at Boulder
+      link: https://phet.colorado.edu/
+    - name: Playful Strides
+      link: https://playfulstrides.com/
+    - name: SD48
+      link: https://www.sd48seatosky.org/
+    - name: Taking It Global
+      link: https://welcome.tigweb.org/en
+    - name: Tetra TMU - Toronto Metropolitan University
+      link: https://www.instagram.com/tetratmu/
+    - name: Adam Wilton
+      link: https://www.brailleliteracycanada.ca/en/about/board/adam-wilton
 layout: layouts/about
 permalink: /about/
 goalSection:
@@ -46,13 +98,20 @@ goalSection:
   callToActionLink: https://www.codelearncreate.org/blog/
 headerBg: teal-75
 title: About
-subtitle: We’re designing educational coding tools for kids who have been left
-  out of learning—especially those with complex needs.
+subtitle: >-
+  We’re designing educational coding tools for kids who have been left out of
+  learning—especially those with complex needs.
+
+
+  For notes on co-design sessions and other project updates, please visit the [Code to Learn and Create
+
+  site](https://codelearncreate.org/).
 eleventyNavigation:
   key: About
   order: 6
 connectSection:
   title: Connect
   titleLink: mailto:idrc@ocadu.ca
-  content: Please email the project leads at the Inclusive Design Research Centre and the IRIS institute if you’d like to be part of this conversation.
+  content: Please email the project leads at the Inclusive Design Research Centre
+    and the IRIS institute if you’d like to be part of this conversation.
 ---