From 0fa0dad3389a23e720d17a63730b1ad5ebd657af Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Tue, 25 Feb 2025 09:02:17 -0400 Subject: [PATCH 01/10] fix: add link and rich text support to subtitles Resolves #932. --- src/_includes/layouts/base.njk | 2 +- src/about.md | 2 +- src/admin/config.yml | 275 ++++++++++++++++++++++++++++----- 3 files changed, 235 insertions(+), 44 deletions(-) diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk index e6434a28..0a9279bb 100644 --- a/src/_includes/layouts/base.njk +++ b/src/_includes/layouts/base.njk @@ -26,7 +26,7 @@ {% block pageHeader %}

{{ title }}

{% if subtitle %} -

{{ subtitle | safe }}

+
{% renderString subtitle, "md" %}
{% endif %} {% if page.url === "/" %}

Create

diff --git a/src/about.md b/src/about.md index 135d9ac9..a3169e8b 100644 --- a/src/about.md +++ b/src/about.md @@ -47,7 +47,7 @@ goalSection: 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. + 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 diff --git a/src/admin/config.yml b/src/admin/config.yml index 10a05ac9..4b9ae5de 100644 --- a/src/admin/config.yml +++ b/src/admin/config.yml @@ -1,4 +1,3 @@ - backend: name: git-gateway branch: main @@ -26,8 +25,14 @@ collections: fields: - {label: Title, name: title, widget: string} - {label: Subtitle, name: subtitle, widget: text} - - {label: Header Call to Action Text, name: headerCallToActionText, widget: string} - - {label: Header Call to Action Link, name: headerCallToActionLink, widget: string} + - label: Header Call to Action Text + name: headerCallToActionText + widget: string + + - label: Header Call to Action Link + name: headerCallToActionLink + widget: string + - label: Create Section name: createSection widget: object @@ -48,8 +53,14 @@ collections: - {label: Content, name: content, widget: text} - {label: Image, name: image, widget: image} - {label: Image Alt Text, name: imageAlt, widget: string} - - {label: Call to Action Text, name: callToActionText, widget: string} - - {label: Call to Action Link, name: callToActionLink, widget: string} + - label: Call to Action Text + name: callToActionText + widget: string + + - label: Call to Action Link + name: callToActionLink + widget: string + - label: About Section name: aboutSection widget: object @@ -58,8 +69,14 @@ collections: - {label: Content, name: content, widget: text} - {label: Image, name: image, widget: image} - {label: Image Alt Text, name: imageAlt, widget: string} - - {label: Call to Action Text, name: callToActionText, widget: string} - - {label: Call to Action Link, name: callToActionLink, widget: string} + - label: Call to Action Text + name: callToActionText + widget: string + + - label: Call to Action Link + name: callToActionLink + widget: string + - label: Try Section name: trySection widget: object @@ -83,8 +100,14 @@ collections: - {label: Content, name: content, widget: text} - {label: Image, name: image, widget: image} - {label: Image Alt Text, name: imageAlt, widget: string} - - {label: Call to Action Text, name: callToActionText, widget: string} - - {label: Call to Action Link, name: callToActionLink, widget: string} + - label: Call to Action Text + name: callToActionText + widget: string + + - label: Call to Action Link + name: callToActionLink + widget: string + - label: Activities Section name: activitiesSection widget: object @@ -106,8 +129,14 @@ collections: - {label: Content, name: content, widget: text} - {label: Image, name: image, widget: image} - {label: Image Alt Text, name: imageAlt, widget: string} - - {label: Call to Action Text, name: callToActionText, widget: string} - - {label: Call to Action Link, name: callToActionLink, widget: string} + - label: Call to Action Text + name: callToActionText + widget: string + + - label: Call to Action Link + name: callToActionLink + widget: string + - label: Trainings & Workshops Section name: trainingsSection widget: object @@ -116,8 +145,14 @@ collections: - {label: Content, name: content, widget: text} - {label: Image, name: image, widget: image} - {label: Image Alt Text, name: imageAlt, widget: string} - - {label: Call to Action Text, name: callToActionText, widget: string} - - {label: Call to Action Link, name: callToActionLink, widget: string} + - label: Call to Action Text + name: callToActionText + widget: string + + - label: Call to Action Link + name: callToActionLink + widget: string + - label: Share Section name: shareSection widget: object @@ -171,7 +206,7 @@ collections: preview: false fields: - {label: Title, name: title, widget: string} - - {label: Subtitle, name: subtitle, widget: text} + - {label: Subtitle, name: subtitle, widget: markdown} - label: Goal Section name: goalSection widget: object @@ -180,8 +215,14 @@ collections: - {label: Content, name: content, widget: text} - {label: Image, name: image, widget: image} - {label: Image Alt Text, name: imageAlt, widget: string} - - {label: Call to Action Text, name: callToActionText, widget: string} - - {label: Call to Action Link, name: callToActionLink, widget: string} + - label: Call to Action Text + name: callToActionText + widget: string + + - label: Call to Action Link + name: callToActionLink + widget: string + - label: What We Do Section name: whatWeDoSection widget: object @@ -204,7 +245,11 @@ collections: widget: list fields: - {label: Name, name: name, widget: string} - - {label: Acronym, name: acronym, widget: string, required: false} + - label: Acronym + name: acronym + widget: string + required: false + - {label: Content, name: content, widget: text} - {label: Link, name: link, widget: string} - {label: Image, name: image, widget: image} @@ -232,8 +277,14 @@ collections: - {label: Content, name: content, widget: text} - {label: Image, name: image, widget: image} - {label: Image Alt Text, name: imageAlt, widget: string} - - {label: Call to Action Text, name: callToActionText, widget: string} - - {label: Call to Action Link, name: callToActionLink, widget: string} + - label: Call to Action Text + name: callToActionText + widget: string + + - label: Call to Action Link + name: callToActionLink + widget: string + - label: Outcomes Section name: outcomesSection widget: object @@ -246,7 +297,11 @@ collections: fields: - {label: Title, name: title, widget: string} - {label: Link, name: link, widget: string} - - {label: Download, name: download, widget: boolean, default: false} + - label: Download + name: download + widget: boolean + default: false + - {label: Content, name: content, widget: markdown} - label: Next Steps Section name: nextStepsSection @@ -266,7 +321,11 @@ collections: widget: list fields: - {label: Name, name: name, widget: string} - - {label: Acronym, name: acronym, widget: string, required: false} + - label: Acronym + name: acronym + widget: string + required: false + - {label: Content, name: content, widget: text} - {label: Link, name: link, widget: string} - {label: Image, name: image, widget: image} @@ -300,10 +359,26 @@ collections: - {label: Title, name: title, widget: string} - {label: Date, name: date, widget: datetime, timeFormat: false} - {label: Author, name: author, widget: string, required: false} - - {label: Resource Type, name: type, widget: relation, collection: siteData, file: resourceTags, value_field: types.*, display_fields: [types.*], search_fields: [types.*]} + - label: Resource Type + name: type + widget: relation + collection: siteData + file: resourceTags + value_field: types.* + display_fields: [types.*] + search_fields: [types.*] + - {label: Description, name: description, widget: text, required: false} - - {label: Preview Image, name: metaImage, widget: image, required: false} - - {label: Preview Image Alt Text, name: metaImageAlt, widget: string, required: false} + - label: Preview Image + name: metaImage + widget: image + required: false + + - label: Preview Image Alt Text + name: metaImageAlt + widget: string + required: false + - {label: Body, name: body, widget: markdown} - label: Supportive Material name: supportiveMaterial @@ -324,13 +399,54 @@ collections: create: true fields: - {label: Title, name: title, widget: string} - - {label: Type, name: type, widget: relation, collection: siteData, file: activityTags, value_field: types.*, display_fields: [types.*], search_fields: [types.*]} - - {label: Coding Experience Level, name: experience, widget: relation, collection: siteData, file: activityTags, value_field: experience.*, display_fields: [experience.*], search_fields: [experience.*]} - - {label: Subject, name: subject, widget: relation, collection: siteData, file: activityTags, value_field: subjects.*, display_fields: [subjects.*], search_fields: [subjects.*]} - - {label: Related Activities, name: relatedActivities, widget: relation, collection: activities, search_fields: [title], value_field: title, display_fields: [title], multiple: true, required: false} + - label: Type + name: type + widget: relation + collection: siteData + file: activityTags + value_field: types.* + display_fields: [types.*] + search_fields: [types.*] + + - label: Coding Experience Level + name: experience + widget: relation + collection: siteData + file: activityTags + value_field: experience.* + display_fields: [experience.*] + search_fields: [experience.*] + + - label: Subject + name: subject + widget: relation + collection: siteData + file: activityTags + value_field: subjects.* + display_fields: [subjects.*] + search_fields: [subjects.*] + + - label: Related Activities + name: relatedActivities + widget: relation + collection: activities + search_fields: [title] + value_field: title + display_fields: [title] + multiple: true + required: false + - {label: Description, name: description, widget: text, required: false} - - {label: Preview Image, name: metaImage, widget: image, required: false} - - {label: Preview Image Alt Text, name: metaImageAlt, widget: string, required: false} + - label: Preview Image + name: metaImage + widget: image + required: false + + - label: Preview Image Alt Text + name: metaImageAlt + widget: string + required: false + - label: What You Need name: whatYouNeed widget: markdown @@ -360,13 +476,55 @@ collections: create: true fields: - {label: Title, name: title, widget: string} - - {label: Robot, name: tags, widget: relation, multiple: true, max: 1, collection: guides, value_field: title, display_fields: [title], search_fields: [title]} - - {label: Coding Experience Level, name: experience, widget: relation, collection: siteData, file: robotActivityTags, value_field: experience.*, display_fields: [experience.*], search_fields: [experience.*]} - - {label: Topic, name: topic, widget: relation, collection: siteData, file: robotActivityTags, value_field: topics.*, display_fields: [topics.*], search_fields: [topics.*]} - - {label: Related Activities with Robots, name: relatedRobotActivities, widget: relation, collection: robotActivities, search_fields: [title], value_field: title, display_fields: [title], multiple: true, required: false} + - label: Robot + name: tags + widget: relation + multiple: true + max: 1 + collection: guides + value_field: title + display_fields: [title] + search_fields: [title] + + - label: Coding Experience Level + name: experience + widget: relation + collection: siteData + file: robotActivityTags + value_field: experience.* + display_fields: [experience.*] + search_fields: [experience.*] + + - label: Topic + name: topic + widget: relation + collection: siteData + file: robotActivityTags + value_field: topics.* + display_fields: [topics.*] + search_fields: [topics.*] + + - label: Related Activities with Robots + name: relatedRobotActivities + widget: relation + collection: robotActivities + search_fields: [title] + value_field: title + display_fields: [title] + multiple: true + required: false + - {label: Description, name: description, widget: text, required: false} - - {label: Preview Image, name: metaImage, widget: image, required: false} - - {label: Preview Image Alt Text, name: metaImageAlt, widget: string, required: false} + - label: Preview Image + name: metaImage + widget: image + required: false + + - label: Preview Image Alt Text + name: metaImageAlt + widget: string + required: false + - label: What You Need name: whatYouNeed widget: markdown @@ -403,12 +561,37 @@ collections: create: true fields: - {label: Title, name: title, widget: string} - - {label: Type, name: type, widget: relation, collection: siteData, file: projectTags, value_field: types.*, display_fields: [types.*], search_fields: [types.*], required: false} - - {label: Category, name: category, widget: relation, collection: siteData, file: projectTags, value_field: categories.*, display_fields: [categories.*], search_fields: [categories.*]} + - label: Type + name: type + widget: relation + collection: siteData + file: projectTags + value_field: types.* + display_fields: [types.*] + search_fields: [types.*] + required: false + + - label: Category + name: category + widget: relation + collection: siteData + file: projectTags + value_field: categories.* + display_fields: [categories.*] + search_fields: [categories.*] + - {label: Link, name: link, widget: string} - {label: Description, name: description, widget: text, required: false} - - {label: Preview Image, name: metaImage, widget: image, required: false} - - {label: Preview Image Alt Text, name: metaImageAlt, widget: string, required: false} + - label: Preview Image + name: metaImage + widget: image + required: false + + - label: Preview Image Alt Text + name: metaImageAlt + widget: string + required: false + - name: guides label: Manufacturer’s Guides label_singular: Manufacturer’s Guide @@ -421,8 +604,16 @@ collections: - {label: Title, name: title, widget: string} - {label: Manufacturer, name: manufacturer, widget: string} - {label: Manufacturer Link, name: manufacturerLink, widget: string} - - {label: Preview Image, name: metaImage, widget: image, required: false} - - {label: Preview Image Alt Text, name: metaImageAlt, widget: string, required: false} + - label: Preview Image + name: metaImage + widget: image + required: false + + - label: Preview Image Alt Text + name: metaImageAlt + widget: string + required: false + - label: Learning Resources name: resources widget: list From e10fad728bfb72188f148bb6d01eb16d48216c61 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Tue, 25 Feb 2025 09:16:49 -0400 Subject: [PATCH 02/10] feat: update partners and community section Resolves #933. --- src/_includes/layouts/about.njk | 7 +++++-- src/about.md | 3 +++ src/admin/config.yml | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/_includes/layouts/about.njk b/src/_includes/layouts/about.njk index 810bce76..968aa4f4 100644 --- a/src/_includes/layouts/about.njk +++ b/src/_includes/layouts/about.njk @@ -41,19 +41,22 @@
-
+
+

{{ whoSection.partnersTitle }}

{% for partner in whoSection.partners %}
{% image partner.image, partner.imageAlt, 640, 520 %} -

{{ partner.name }}{% if partner.acronym %} ({{ partner.acronym }}){% endif %}

+

{{ partner.name }}{% if partner.acronym %} ({{ partner.acronym }}){% endif %}

{% renderString partner.content, "md" %}

Visit {{ partner.acronym if partner.acronym else partner.name }} website

{% endfor %}
+

{{ whoSection.communityTitle }}

+ {% renderString whoSection.community, "md" %}
diff --git a/src/about.md b/src/about.md index a3169e8b..06850215 100644 --- a/src/about.md +++ b/src/about.md @@ -11,6 +11,7 @@ whatWeDoSection: 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." + partnersTitle: Partners partners: - name: Inclusive Design Research Centre acronym: IDRC @@ -31,6 +32,8 @@ 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: "" layout: layouts/about permalink: /about/ goalSection: diff --git a/src/admin/config.yml b/src/admin/config.yml index 4b9ae5de..549a5a4d 100644 --- a/src/admin/config.yml +++ b/src/admin/config.yml @@ -240,6 +240,7 @@ collections: fields: - {label: Title, name: title, widget: string} - {label: Intro, name: intro, widget: markdown} + - {label: Partners Title, name: partnersTitle, widget: string} - label: Partners name: partners widget: list @@ -254,6 +255,8 @@ collections: - {label: Link, name: link, widget: string} - {label: Image, name: image, widget: image} - {label: Image Alt Text, name: imageAlt, widget: string} + - {label: Community Title, name: communityTitle, widget: string} + - {label: Community Content, name: community, widget: markdown} - label: Connect Section name: connectSection widget: object From 5e3d9553155329e81c436e3785b0d2aad62b5e67 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Tue, 25 Feb 2025 09:23:56 -0400 Subject: [PATCH 03/10] chore(deps): update Node version --- .github/workflows/lint-build.yml | 13 ++----------- .github/workflows/release-please.yml | 2 +- .nvmrc | 2 +- package-lock.json | 2 +- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.github/workflows/lint-build.yml b/.github/workflows/lint-build.yml index 5a2615a5..06d11f64 100644 --- a/.github/workflows/lint-build.yml +++ b/.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 - diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 85d10fdd..ae23ca16 100644 --- a/.github/workflows/release-please.yml +++ b/.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 }} diff --git a/.nvmrc b/.nvmrc index 3c032078..2bd5a0a9 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18 +22 diff --git a/package-lock.json b/package-lock.json index 037600d4..4407d4df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20096,7 +20096,7 @@ "@zachleat/filter-container": { "version": "git+ssh://git@github.com/greatislander/filter-container.git#4a2ebb93bf06f06af5425b74523f9bf96d5632bf", "integrity": "sha512-ToDK0/AOmgGO+BCwIiQTr4dbw0SsuBjEofFyPh/+B9mwrQ0QkMP8BtvzaPZXmhDoTcNMtZCPXwvm4BGJTGz4iw==", - "from": "@zachleat/filter-container@github:greatislander/filter-container#4a2ebb93bf06f06af5425b74523f9bf96d5632bf" + "from": "@zachleat/filter-container@greatislander/filter-container#feat/paginated-results" }, "a-sync-waterfall": { "version": "1.0.1", From 6a8512b11b0171ff6b1ddf8615af7ce050b2f7a1 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 26 Feb 2025 11:01:12 -0400 Subject: [PATCH 04/10] chore(cms): add community content --- src/about.md | 110 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 106 insertions(+), 4 deletions(-) diff --git a/src/about.md b/src/about.md index 06850215..c719ac9d 100644 --- a/src/about.md +++ b/src/about.md @@ -10,7 +10,10 @@ 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 @@ -33,7 +36,103 @@ whoSection: imageAlt: "Image of several kids talking. One of the kids is seated on a powered wheelchair and using a single switch. " communityTitle: Community - 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. + + + Alberta Health Services + + + + + Beverely School - Toronto District School Board + + + + + Alan Bridgeman + + + + + Burnaby Schools + + + + + Camp Karma + + + + + Grandpals + + + + + Holland Bloorview + + + + + Hour of Code + + + + + Kayla Children’s Centre + + + + + Kensington Community School - Toronto District School Board + + + + + Melanie Mulcaster - Peel School Board + + + + + PhET Interactive Simulations - University of Colorado at Boulder + + + + + Playful Strides + + + + + SD48 + + + + + Taking It Global + + + + + Tetra TMU - Toronto Metropolitan University + + + + + Adam Wilton + + layout: layouts/about permalink: /about/ goalSection: @@ -50,12 +149,15 @@ goalSection: 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. For notes on co-design sessions and other project updates, please visit the [Code to Learn and Create site](https://codelearncreate.org/). + 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. --- From 42c24dcb7be911f0b231bd46c041395326d7b68d Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 5 Mar 2025 11:36:32 -0400 Subject: [PATCH 05/10] feat: layout contributors --- src/_includes/layouts/about.njk | 9 +- src/about.md | 119 ++++++------------- src/assets/styles/app.scss | 1 + src/assets/styles/components/_community.scss | 21 ++++ 4 files changed, 65 insertions(+), 85 deletions(-) create mode 100644 src/assets/styles/components/_community.scss diff --git a/src/_includes/layouts/about.njk b/src/_includes/layouts/about.njk index 968aa4f4..4113530c 100644 --- a/src/_includes/layouts/about.njk +++ b/src/_includes/layouts/about.njk @@ -41,7 +41,7 @@
-
+

{{ whoSection.partnersTitle }}

@@ -55,8 +55,15 @@ {% endfor %}
+

{{ whoSection.communityTitle }}

{% renderString whoSection.community, "md" %} +
+
+ {% for communityMember in whoSection.communityMembers %} +
{{ communityMember.name }}
+ {% endfor %} +
diff --git a/src/about.md b/src/about.md index c719ac9d..60b5e372 100644 --- a/src/about.md +++ b/src/about.md @@ -49,90 +49,41 @@ whoSection: 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. - - Alberta Health Services - - - - - Beverely School - Toronto District School Board - - - - - Alan Bridgeman - - - - - Burnaby Schools - - - - - Camp Karma - - - - - Grandpals - - - - - Holland Bloorview - - - - - Hour of Code - - - - - Kayla Children’s Centre - - - - - Kensington Community School - Toronto District School Board - - - - - Melanie Mulcaster - Peel School Board - - - - - PhET Interactive Simulations - University of Colorado at Boulder - - - - - Playful Strides - - - - - SD48 - - - - - Taking It Global - - - - - Tetra TMU - Toronto Metropolitan University - - - - - Adam Wilton - - + 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: diff --git a/src/assets/styles/app.scss b/src/assets/styles/app.scss index 51554a49..d505d34e 100644 --- a/src/assets/styles/app.scss +++ b/src/assets/styles/app.scss @@ -33,6 +33,7 @@ "components/call-to-action", "components/callout", "components/card", + "components/community", "components/filters", "components/grid-image", "components/grid-video", diff --git a/src/assets/styles/components/_community.scss b/src/assets/styles/components/_community.scss new file mode 100644 index 00000000..626912bc --- /dev/null +++ b/src/assets/styles/components/_community.scss @@ -0,0 +1,21 @@ +.community-members { + column-gap: var(--space-xl); + display: grid; + grid-template-columns: 1fr; + margin-inline: auto; + max-inline-size: 75ch; + row-gap: var(--space-md); +} + +.community-members .community-member { + display: flex; + flex-direction: column; + justify-content: flex-start; + text-align: start; +} + +@media (width >= 960px) { + .community-members { + grid-template-columns: repeat(2, 1fr); + } +} From 1855433d29ec95ac43af961d98c403d273c6bf8d Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 5 Mar 2025 11:40:10 -0400 Subject: [PATCH 06/10] feat: configure CMS --- src/admin/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/admin/config.yml b/src/admin/config.yml index 549a5a4d..de52037a 100644 --- a/src/admin/config.yml +++ b/src/admin/config.yml @@ -257,6 +257,12 @@ collections: - {label: Image Alt Text, name: imageAlt, widget: string} - {label: Community Title, name: communityTitle, widget: string} - {label: Community Content, name: community, widget: markdown} + - label: Community Members + name: communityMembers + widget: list + fields: + - {label: Name, name: name, widget: string} + - {label: Link, name: link, widget: string} - label: Connect Section name: connectSection widget: object From f4f1c1f0d648be4e5dbe0b2987b0b389624573c4 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 5 Mar 2025 12:01:06 -0400 Subject: [PATCH 07/10] fix: switch column fill direction --- src/about.md | 11 +++++++---- src/assets/styles/components/_community.scss | 7 ++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/about.md b/src/about.md index 60b5e372..ba18c206 100644 --- a/src/about.md +++ b/src/about.md @@ -48,7 +48,6 @@ whoSection: 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/ @@ -99,9 +98,13 @@ 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. For notes on co-design - sessions and other project updates, please visit the [Code to Learn and Create +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 diff --git a/src/assets/styles/components/_community.scss b/src/assets/styles/components/_community.scss index 626912bc..229a0efb 100644 --- a/src/assets/styles/components/_community.scss +++ b/src/assets/styles/components/_community.scss @@ -1,21 +1,18 @@ .community-members { - column-gap: var(--space-xl); - display: grid; - grid-template-columns: 1fr; margin-inline: auto; max-inline-size: 75ch; - row-gap: var(--space-md); } .community-members .community-member { display: flex; flex-direction: column; justify-content: flex-start; + margin-block-end: var(--space-md); text-align: start; } @media (width >= 960px) { .community-members { - grid-template-columns: repeat(2, 1fr); + columns: 2; } } From 3080622f8bf510d6b19d7123f0b8bf69dd671cc7 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 5 Mar 2025 14:32:50 -0400 Subject: [PATCH 08/10] fix: trailing > --- src/about.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/about.md b/src/about.md index ba18c206..3b3b75ef 100644 --- a/src/about.md +++ b/src/about.md @@ -66,7 +66,7 @@ whoSection: - name: Hour of Code link: https://hourofcode.com/ca - name: Kayla Children’s Centre - link: https://kaylaschildrencentre.org/> + 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 From cedbdc4a1bafc81b814ea03e02549c6097e09556 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 16 Apr 2025 14:33:05 -0300 Subject: [PATCH 09/10] fix: review changes --- src/_includes/layouts/about.njk | 2 +- src/assets/styles/components/_community.scss | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/_includes/layouts/about.njk b/src/_includes/layouts/about.njk index 4113530c..9e81169f 100644 --- a/src/_includes/layouts/about.njk +++ b/src/_includes/layouts/about.njk @@ -55,7 +55,7 @@ {% endfor %}
-
+

{{ whoSection.communityTitle }}

{% renderString whoSection.community, "md" %}
diff --git a/src/assets/styles/components/_community.scss b/src/assets/styles/components/_community.scss index 229a0efb..082cc42c 100644 --- a/src/assets/styles/components/_community.scss +++ b/src/assets/styles/components/_community.scss @@ -1,8 +1,3 @@ -.community-members { - margin-inline: auto; - max-inline-size: 75ch; -} - .community-members .community-member { display: flex; flex-direction: column; From e980eb09cc073d42c64cd3612b5a2dc2a908bd7a Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 16 Apr 2025 14:35:00 -0300 Subject: [PATCH 10/10] chore(deps): switch to renovate --- .github/dependabot.yml | 19 ------------- package-lock.json | 64 +++++++++++++++++++++--------------------- package.json | 64 +++++++++++++++++++++--------------------- renovate.json | 16 +++++++++++ 4 files changed, 80 insertions(+), 83 deletions(-) delete mode 100644 .github/dependabot.yml create mode 100644 renovate.json diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 6b381042..00000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: 2 -updates: - - package-ecosystem: npm - directory: / - schedule: - interval: monthly - allow: - - dependency-type: direct - ignore: - - dependency-name: react - versions: [">16"] - - dependency-name: stylelint - versions: [">14"] - - dependency-name: stylelint-config-standard-scss - versions: [">7"] - - package-ecosystem: github-actions - directory: / - schedule: - interval: monthly diff --git a/package-lock.json b/package-lock.json index 4407d4df..98422b52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,41 +9,41 @@ "version": "1.7.1", "license": "BSD-3-Clause", "dependencies": { - "@11ty/eleventy": "2.0.1", - "@11ty/eleventy-img": "3.1.8", - "@11ty/eleventy-navigation": "0.3.5", - "@babel/standalone": "7.25.3", + "@11ty/eleventy": "^2.0.1", + "@11ty/eleventy-img": "^3.1.8", + "@11ty/eleventy-navigation": "^0.3.5", + "@babel/standalone": "^7.25.3", "@zachleat/filter-container": "greatislander/filter-container#feat/paginated-results", - "decap-cms": "3.0.5", - "eleventy-plugin-fluid": "2.7.1", - "infusion": "4.6.0", - "modern-css-reset": "1.4.0", - "prop-types": "15.8.1", - "react": "16.14.0", - "wicg-inert": "3.1.2" + "decap-cms": "^3.0.5", + "eleventy-plugin-fluid": "^2.7.1", + "infusion": "^4.6.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.2.2", - "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.14.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.2.2", + "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.14.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" } }, "node_modules/@11ty/dependency-tree": { diff --git a/package.json b/package.json index 0e00904f..51bbfdc4 100644 --- a/package.json +++ b/package.json @@ -30,41 +30,41 @@ }, "homepage": "https://github.com/codelearncreate/weavly.org#readme", "dependencies": { - "@11ty/eleventy": "2.0.1", - "@11ty/eleventy-img": "3.1.8", - "@11ty/eleventy-navigation": "0.3.5", - "@babel/standalone": "7.25.3", + "@11ty/eleventy": "^2.0.1", + "@11ty/eleventy-img": "^3.1.8", + "@11ty/eleventy-navigation": "^0.3.5", + "@babel/standalone": "^7.25.3", "@zachleat/filter-container": "greatislander/filter-container#feat/paginated-results", - "decap-cms": "3.0.5", - "eleventy-plugin-fluid": "2.7.1", - "infusion": "4.6.0", - "modern-css-reset": "1.4.0", - "prop-types": "15.8.1", - "react": "16.14.0", - "wicg-inert": "3.1.2" + "decap-cms": "^3.0.5", + "eleventy-plugin-fluid": "^2.7.1", + "infusion": "^4.6.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.2.2", - "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.14.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.2.2", + "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.14.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", diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..928f87a0 --- /dev/null +++ b/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 + } + ] +}