+
+
-
+
{% endif %}
{% if item.source and item.source == 'github' %}
-
+
-
+
From b6a9ef20d8853aeef33c46be7cdd7b1e8e68d627 Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Mon, 13 Jan 2025 23:17:28 +0000
Subject: [PATCH 02/12] Replace Shields.io with locally rendered data/badges
---
sass/_extra.scss | 8 ++
sass/_semantic.scss | 2 +-
sass/semantic/_label.scss | 2 +-
templates/categories/macros.html | 161 +++++++++++++++++++------------
4 files changed, 111 insertions(+), 62 deletions(-)
diff --git a/sass/_extra.scss b/sass/_extra.scss
index c79c2d62..ed8c144e 100644
--- a/sass/_extra.scss
+++ b/sass/_extra.scss
@@ -57,6 +57,14 @@
margin-right: 0.5em;
}
+.ui.label > .icon {
+ margin-right: 0.25em;
+}
+
+.ui.label > .detail {
+ margin-left: 0.5em;
+}
+
@media only screen and (max-width: 991px) {
.masthead .ui.menu a.item {
display: none;
diff --git a/sass/_semantic.scss b/sass/_semantic.scss
index 64094c55..a8a7134f 100644
--- a/sass/_semantic.scss
+++ b/sass/_semantic.scss
@@ -8,7 +8,7 @@
@import 'semantic/icon';
@import 'semantic/image';
// @import 'semantic/input';
-// @import 'semantic/label';
+@import 'semantic/label';
@import 'semantic/list';
//@import 'semantic/loader';
//@import 'semantic/placeholder';
diff --git a/sass/semantic/_label.scss b/sass/semantic/_label.scss
index 02183579..72107d7c 100755
--- a/sass/semantic/_label.scss
+++ b/sass/semantic/_label.scss
@@ -351,7 +351,7 @@ a.ui.label {
}
.ui.card .image > .ui.ribbon.label,
.ui.image > .ui.ribbon.label {
- left: calc(--0.05rem - 1.2em);
+ left: calc(-0.05rem - 1.2em);
}
.ui.card .image > .ui[class*="right ribbon"].label,
.ui.image > .ui[class*="right ribbon"].label {
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index e301f79a..14d0eec6 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -1,36 +1,39 @@
{% macro info(item, section, archived=false) %}
+{% set github_token = get_env(name="GITHUB_TOKEN") %}
+
{% if item.name %}
{% set name = item.name %}
{% endif %}
-{% if item.source %}
- {% if item.source == 'crates' %}
- {% set data = load_data(url = "https://crates.io/api/v1/crates/" ~ item.name ~ "?include=downloads", format="json", headers=["User-Agent=arewegameyet (gamedev-wg@rust-lang.org)"]) %}
- {# human readable name #}
- {% set name = data.crate.name %}
- {# Github/Gitlab/Etc. repository #}
- {% set repository_url = data.crate.repository %}
- {% set crate_url = 'https://crates.io/crates/' ~ name %}
- {% set description = data.crate.description %}
- {% set latest_version = data.crate.default_version %}
- {% set downloads = data.crate.downloads %}
- {% set recent_downloads = data.crate.recent_downloads %}
- {% if data.crate.homepage %}
- {% set homepage_url = data.crate.homepage %}
- {% endif %}
- {% elif item.source == 'github' %}
- {% set data = load_data(url="https://api.github.com/repos/" ~ item.name, format="json") %}
- {% set name = data.name %}
- {% set repository_url = data.html_url %}
- {# Org or User name #}
- {% set owner = data.owner.login %}
- {% if data.homepage != "" %}
- {% set homepage_url = data.homepage %}
- {% endif %}
- {% set description = data.description %}
- {% set stars = data.stargazers_count %}
- {% set last_commit = data.pushed_at %}
+{% if item.source and item.source == 'crates' %}
+ {% set data = load_data(url = "https://crates.io/api/v1/crates/" ~ item.name ~ "?include=downloads,default_version", format="json", headers=["User-Agent=arewegameyet (gamedev-wg@rust-lang.org)"]) %}
+
+ {% set name = data.crate.name %}
+ {% set description = data.crate.description %}
+ {% set repository_url = data.crate.repository %}
+ {% set crate_url = 'https://crates.io/crates/' ~ name %}
+ {% set latest_version = data.crate.default_version %}
+ {% set downloads = data.crate.downloads %}
+ {% set recent_downloads = data.crate.recent_downloads %}
+ {% set license = data.versions | first | get(key="license") %}
+
+ {% if data.crate.homepage %}
+ {% set homepage_url = data.crate.homepage %}
+ {% endif %}
+{% elif item.source and item.source == 'github' %}
+ {% set data = load_data(url="https://api.github.com/repos/" ~ item.name, headers=["Authorization=Bearer " ~ github_token], format="json") %}
+
+ {% set name = data.name %}
+ {% set description = data.description %}
+ {% set repository_url = data.html_url %}
+
+ {% if data.license %}
+ {% set license = data.license.name %}
+ {% endif %}
+
+ {% if data.homepage %}
+ {% set homepage_url = data.homepage %}
{% endif %}
{% endif %}
@@ -50,6 +53,24 @@
{% set primary_url = repository_url %}
{% endif %}
+{% if repository_url and repository_url is containing("github.com/") %}
+ {% set repo_id = repository_url | split(pat="github.com/") | last %}
+
+ {% set data = load_data(url="https://api.github.com/repos/" ~ repo_id, headers=["Authorization=Bearer " ~ github_token], format="json", required=false) %}
+ {% if data %}
+ {% set stars = data.stargazers_count %}
+ {% set last_activity = data.pushed_at %}
+ {% endif %}
+{% elif repository_url and repository_url is containing("gitlab.com/") %}
+ {% set repo_id = repository_url | split(pat="gitlab.com/") | last | urlencode_strict %}
+
+ {% set data = load_data(url="https://gitlab.com/api/v4/projects/" ~ repo_id, format="json", required=false) %}
+ {% if data %}
+ {% set stars = data.star_count %}
+ {% set last_activity = data.last_activity_at %}
+ {% endif %}
+{% endif %}
+
{% if item.image %}
{% if primary_url %}
@@ -66,28 +87,28 @@
{% endif %}
-
-
+
+
{% if repository_url %}
-
-
+
+
{% endif %}
{% if crate_url %}
-
-
+
+
{% endif %}
{% if homepage_url %}
-
-
+
+
{% endif %}
-
+
{% if primary_url %}
{{ name }}
@@ -112,60 +133,80 @@
{% if item.source or gitter_url %}
From c9876283f75fc83ce5882194fd2f9230aadb8d79 Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Tue, 14 Jan 2025 11:37:37 +0000
Subject: [PATCH 07/12] Fix GitHub icon displaying even when repo is on a
different site
---
templates/categories/macros.html | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index b901991b..c2533d10 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -53,7 +53,9 @@
{% set primary_url = repository_url %}
{% endif %}
+{# Fetch repository stats #}
{% if repository_url and repository_url is containing("github.com/") %}
+ {% set repo_icon = "github" %}
{% set repo_id = repository_url | split(pat="github.com/") | last | trim_end_matches(pat="/") | trim_end_matches(pat=".git") %}
{% set data = load_data(url="https://api.github.com/repos/" ~ repo_id, headers=["Authorization=Bearer " ~ github_token], format="json", required=false) %}
@@ -62,13 +64,16 @@
{% set last_activity = data.pushed_at %}
{% endif %}
{% elif repository_url and repository_url is containing("gitlab.com/") %}
- {% set repo_id = repository_url | split(pat="gitlab.com/") | last | trim_end_matches(pat="/") | trim_end_matches(pat=".git") | urlencode_strict %}
+ {% set repo_icon = "gitlab" %}
+ {% set repo_id = repository_url | split(pat="gitlab.com/") | last | trim_end_matches(pat="/") | trim_end_matches(pat=".git") | urlencode_strict %}
{% set data = load_data(url="https://gitlab.com/api/v4/projects/" ~ repo_id, format="json", required=false) %}
{% if data %}
{% set stars = data.star_count %}
{% set last_activity = data.last_activity_at %}
{% endif %}
+{% else %}
+ {% set repo_icon = "code" %}
{% endif %}
@@ -92,8 +97,8 @@
{% if repository_url %}
-
-
+
+
{% endif %}
From 84138b9d2c5ec6e262aa45be2286c16f615aa06b Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Tue, 14 Jan 2025 13:10:33 +0000
Subject: [PATCH 08/12] More accessibility tweaks
---
sass/_extra.scss | 8 ++++++++
templates/categories/macros.html | 34 ++++++++++++++++----------------
templates/categories/page.html | 10 +++++-----
3 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/sass/_extra.scss b/sass/_extra.scss
index ed8c144e..2cf3c9d1 100644
--- a/sass/_extra.scss
+++ b/sass/_extra.scss
@@ -57,6 +57,14 @@
margin-right: 0.5em;
}
+ul.ui.horizontal.list {
+ margin: 0;
+}
+
+ul.ui.list li::before {
+ content: none;
+}
+
.ui.label > .icon {
margin-right: 0.25em;
}
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index c2533d10..fab7ba8b 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -76,7 +76,7 @@
{% set repo_icon = "code" %}
{% endif %}
-
+
{% if item.image %}
{% if primary_url %}
@@ -138,19 +138,19 @@
{% if item.source or repository_url or gitter_url %}
diff --git a/templates/categories/page.html b/templates/categories/page.html
index 45fa93ee..2f1b8b47 100644
--- a/templates/categories/page.html
+++ b/templates/categories/page.html
@@ -23,7 +23,7 @@
{# Heading #}
-
- {% if item.source or gitter_url %}
+ {% if item.source or repository_url or gitter_url %}
- {% if item.source and item.source == 'crates' %}
+ {% if gitter_url %}
+ {% endif %}
+ {% if latest_version %}
+ {% endif %}
+ {% if downloads %}
+ {% endif %}
+ {% if recent_downloads %}
{% endif %}
- {% if item.source and item.source == 'github' %}
+ {% if license %}
+ {% endif %}
+ {% if stars %}
{% endif %}
- {% if gitter_url %}
+ {% if last_activity %}
{% endif %}
From 31104a520e4c30bf42b8e5159850366e31397720 Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Tue, 14 Jan 2025 01:21:28 +0000
Subject: [PATCH 03/12] Fix missing repo info when repository URL ends in a
slash
---
templates/categories/macros.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 14d0eec6..06f68ee6 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -54,7 +54,7 @@
{% endif %}
{% if repository_url and repository_url is containing("github.com/") %}
- {% set repo_id = repository_url | split(pat="github.com/") | last %}
+ {% set repo_id = repository_url | split(pat="github.com/") | last | trim_end_matches(pat="/") %}
{% set data = load_data(url="https://api.github.com/repos/" ~ repo_id, headers=["Authorization=Bearer " ~ github_token], format="json", required=false) %}
{% if data %}
@@ -62,7 +62,7 @@
{% set last_activity = data.pushed_at %}
{% endif %}
{% elif repository_url and repository_url is containing("gitlab.com/") %}
- {% set repo_id = repository_url | split(pat="gitlab.com/") | last | urlencode_strict %}
+ {% set repo_id = repository_url | split(pat="gitlab.com/") | last | trim_end_matches(pat="/") | urlencode_strict %}
{% set data = load_data(url="https://gitlab.com/api/v4/projects/" ~ repo_id, format="json", required=false) %}
{% if data %}
From ad11440fdf6f427a52849de47d7ce5c7c15a158e Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Tue, 14 Jan 2025 01:26:47 +0000
Subject: [PATCH 04/12] Fix missing activity info for items without source
---
templates/categories/macros.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 06f68ee6..0113f14a 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -131,7 +131,7 @@
-
- 
-
+
-
+
+
+ Latest version:
+
{{ latest_version }}
+
-
- 
-
+
-
+
+
+ Downloads:
+
{{ downloads | num_format }}
+
-
- 
-
+
-
+
+
+ Recent downloads:
+
{{ recent_downloads | num_format }}
+
-
- 
-
+
-
+
+
+ License:
+
{{ license }}
+
-
- 
-
+
-
+
+
+ Stars:
+
{{ stars }}
+
-
- 
-
+
-
+
+
+ Last activity:
+
{{ last_activity | date(format="%Y-%m-%d") }}
+
{% if gitter_url %}
From ff11016f3515bfa404e32531e34dc6ac6c8f7e9d Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Tue, 14 Jan 2025 01:29:14 +0000
Subject: [PATCH 05/12] Fix missing repo info when repository URL ends in .git
---
templates/categories/macros.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 0113f14a..398c7eba 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -54,7 +54,7 @@
{% endif %}
{% if repository_url and repository_url is containing("github.com/") %}
- {% set repo_id = repository_url | split(pat="github.com/") | last | trim_end_matches(pat="/") %}
+ {% set repo_id = repository_url | split(pat="github.com/") | last | trim_end_matches(pat="/") | trim_end_matches(pat=".git") %}
{% set data = load_data(url="https://api.github.com/repos/" ~ repo_id, headers=["Authorization=Bearer " ~ github_token], format="json", required=false) %}
{% if data %}
@@ -62,7 +62,7 @@
{% set last_activity = data.pushed_at %}
{% endif %}
{% elif repository_url and repository_url is containing("gitlab.com/") %}
- {% set repo_id = repository_url | split(pat="gitlab.com/") | last | trim_end_matches(pat="/") | urlencode_strict %}
+ {% set repo_id = repository_url | split(pat="gitlab.com/") | last | trim_end_matches(pat="/") | trim_end_matches(pat=".git") | urlencode_strict %}
{% set data = load_data(url="https://gitlab.com/api/v4/projects/" ~ repo_id, format="json", required=false) %}
{% if data %}
From 57f0e74d312988a592efa1c3f9bc7e4b3c6b8e5f Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Tue, 14 Jan 2025 01:32:11 +0000
Subject: [PATCH 06/12] Format star count
---
templates/categories/macros.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 398c7eba..b901991b 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -194,7 +194,7 @@
Stars:
-
{{ stars }}
+ {{ stars | num_format }}
-
{% endif %}
+
+
-
{% if gitter_url %}
-
- -
-
-@@ -158,10 +158,10 @@{{ latest_version }}
-
-@@ -169,10 +169,10 @@{{ downloads | num_format }}
-
-@@ -180,10 +180,10 @@{{ recent_downloads | num_format }}
-
-@@ -191,10 +191,10 @@{{ license }}
-
-@@ -202,10 +202,10 @@{{ stars | num_format }}
-
-@@ -213,9 +213,9 @@{{ last_activity | date(format="%Y-%m-%d") }}
+
+
{% endif %}
{% if latest_version %}
-
+
+
{% endif %}
{% if downloads %}
-
+
+
{% endif %}
{% if recent_downloads %}
-
+
+
{% endif %}
{% if license %}
-
+
+
{% endif %}
{% if stars %}
-
+
+
{% endif %}
{% if last_activity %}
-
+
+
{% endif %}
- - + {{ page.title }}
@@ -51,7 +51,7 @@
-
+
{{ section.extra.plural | title }}
@@ -71,7 +71,7 @@
-
+
Archived
@@ -79,7 +79,7 @@
-
+
These {{ section.extra.plural }} are no longer maintained, but may still be of interest.
@@ -96,7 +96,7 @@
-
+
Contribute
From 436badf8646f14ba5cf3afb79d599d2d4479845b Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Wed, 15 Jan 2025 14:28:49 +0000
Subject: [PATCH 09/12] Add Gitea stats support
---
templates/categories/macros.html | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index fab7ba8b..5d55b9c0 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -72,8 +72,14 @@
{% set stars = data.star_count %}
{% set last_activity = data.last_activity_at %}
{% endif %}
-{% else %}
- {% set repo_icon = "code" %}
+{% elif repository_url and repository_url is containing("gitea.com/") %}
+ {% set repo_id = repository_url | split(pat="gitea.com/") | last | trim_end_matches(pat="/") | trim_end_matches(pat=".git") %}
+
+ {% set data = load_data(url="https://gitea.com/api/v1/repos/" ~ repo_id, format="json", required=false) %}
+ {% if data %}
+ {% set stars = data.stars_count %}
+ {% set last_activity = data.updated_at %}
+ {% endif %}
{% endif %}
@@ -98,7 +104,7 @@
{% if repository_url %}
-
+
{% endif %}
From bed73fcd14b78502b389c4d50b5ea52de1c2431a Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Wed, 15 Jan 2025 16:29:58 +0000
Subject: [PATCH 10/12] Re-order card markup for better accessibility
I tried the page with NVDA, and the aria-label approach didn't work (apparently it's not valid for 'li' tags). So instead, I just tweaked the markup to properly present the item's title first.
---
sass/_extra.scss | 5 +++++
templates/categories/macros.html | 18 +++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/sass/_extra.scss b/sass/_extra.scss
index 2cf3c9d1..81fee603 100644
--- a/sass/_extra.scss
+++ b/sass/_extra.scss
@@ -45,6 +45,11 @@
height: 256px;
}
+.ui.cards > .card > .content > .header:not(.ui), .ui.card > .content > .header:not(.ui) {
+ display: inline-block;
+ margin-bottom: 0;
+}
+
.ui.card > .image > img, .ui.cards > .card > .image > img {
object-fit: cover;
width: 100%;
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 5d55b9c0..970b929b 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -82,7 +82,7 @@
{% endif %}
{% endif %}
-
+
{% if item.image %}
{% if primary_url %}
@@ -98,6 +98,14 @@
{% endif %}
+
+ {% if primary_url %}
+ {{ name }}
+ {% else %}
+ {{ name }}
+ {% endif %}
+
+
@@ -120,14 +128,6 @@
{% endif %}
-
- {% if primary_url %}
- {{ name }}
- {% else %}
- {{ name }}
- {% endif %}
-
-
{% for category in item.categories %}
{% set category_data = get_page(path="." ~ section.path ~ category ~ ".md") %}
From 079a044194b71adcd566d04a45e471d0be70fab4 Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Thu, 16 Jan 2025 17:34:37 +0000
Subject: [PATCH 11/12] Add build date to the footer
---
templates/categories/macros.html | 2 +-
templates/master.html | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 970b929b..18b94509 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -216,7 +216,7 @@
Last activity:
- {{ last_activity | date(format="%Y-%m-%d") }}
+ {{ last_activity | date }}
diff --git a/templates/master.html b/templates/master.html
index 479fac55..38cf4512 100644
--- a/templates/master.html
+++ b/templates/master.html
@@ -106,7 +106,13 @@ About
Arewegameyet?
- 
This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+
+
+ This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+ Page generated at {{ now() | date(format="%Y-%m-%d %H:%M") }}.
+
Get involved
From a46351e7db5fc814b00baae32cebb7b59ef16975 Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Thu, 16 Jan 2025 22:21:18 +0000
Subject: [PATCH 12/12] Hide license badge when GitHub check inconclusive
A lot of the cases where 'Other' was showing as the license turned out to be MIT/Apache projects with their files named wrong, which feels misleading.
---
templates/categories/macros.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 18b94509..cb6ca57f 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -28,7 +28,7 @@
{% set description = data.description %}
{% set repository_url = data.html_url %}
- {% if data.license %}
+ {% if data.license and data.license.key != "other" %}
{% set license = data.license.name %}
{% endif %}
- + {{ section.extra.plural | title }}
@@ -71,7 +71,7 @@
-
+
Archived
@@ -79,7 +79,7 @@
-
+
These {{ section.extra.plural }} are no longer maintained, but may still be of interest.
@@ -96,7 +96,7 @@
-
+
Contribute
From 436badf8646f14ba5cf3afb79d599d2d4479845b Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Wed, 15 Jan 2025 14:28:49 +0000
Subject: [PATCH 09/12] Add Gitea stats support
---
templates/categories/macros.html | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index fab7ba8b..5d55b9c0 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -72,8 +72,14 @@
{% set stars = data.star_count %}
{% set last_activity = data.last_activity_at %}
{% endif %}
-{% else %}
- {% set repo_icon = "code" %}
+{% elif repository_url and repository_url is containing("gitea.com/") %}
+ {% set repo_id = repository_url | split(pat="gitea.com/") | last | trim_end_matches(pat="/") | trim_end_matches(pat=".git") %}
+
+ {% set data = load_data(url="https://gitea.com/api/v1/repos/" ~ repo_id, format="json", required=false) %}
+ {% if data %}
+ {% set stars = data.stars_count %}
+ {% set last_activity = data.updated_at %}
+ {% endif %}
{% endif %}
@@ -98,7 +104,7 @@
{% if repository_url %}
-
+
{% endif %}
From bed73fcd14b78502b389c4d50b5ea52de1c2431a Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Wed, 15 Jan 2025 16:29:58 +0000
Subject: [PATCH 10/12] Re-order card markup for better accessibility
I tried the page with NVDA, and the aria-label approach didn't work (apparently it's not valid for 'li' tags). So instead, I just tweaked the markup to properly present the item's title first.
---
sass/_extra.scss | 5 +++++
templates/categories/macros.html | 18 +++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/sass/_extra.scss b/sass/_extra.scss
index 2cf3c9d1..81fee603 100644
--- a/sass/_extra.scss
+++ b/sass/_extra.scss
@@ -45,6 +45,11 @@
height: 256px;
}
+.ui.cards > .card > .content > .header:not(.ui), .ui.card > .content > .header:not(.ui) {
+ display: inline-block;
+ margin-bottom: 0;
+}
+
.ui.card > .image > img, .ui.cards > .card > .image > img {
object-fit: cover;
width: 100%;
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 5d55b9c0..970b929b 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -82,7 +82,7 @@
{% endif %}
{% endif %}
-
+
{% if item.image %}
{% if primary_url %}
@@ -98,6 +98,14 @@
{% endif %}
+
+ {% if primary_url %}
+ {{ name }}
+ {% else %}
+ {{ name }}
+ {% endif %}
+
+
@@ -120,14 +128,6 @@
{% endif %}
-
- {% if primary_url %}
- {{ name }}
- {% else %}
- {{ name }}
- {% endif %}
-
-
{% for category in item.categories %}
{% set category_data = get_page(path="." ~ section.path ~ category ~ ".md") %}
From 079a044194b71adcd566d04a45e471d0be70fab4 Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Thu, 16 Jan 2025 17:34:37 +0000
Subject: [PATCH 11/12] Add build date to the footer
---
templates/categories/macros.html | 2 +-
templates/master.html | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 970b929b..18b94509 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -216,7 +216,7 @@
Last activity:
- {{ last_activity | date(format="%Y-%m-%d") }}
+ {{ last_activity | date }}
diff --git a/templates/master.html b/templates/master.html
index 479fac55..38cf4512 100644
--- a/templates/master.html
+++ b/templates/master.html
@@ -106,7 +106,13 @@ About
Arewegameyet?
-
This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+
+
+ This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+ Page generated at {{ now() | date(format="%Y-%m-%d %H:%M") }}.
+
Get involved
From a46351e7db5fc814b00baae32cebb7b59ef16975 Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Thu, 16 Jan 2025 22:21:18 +0000
Subject: [PATCH 12/12] Hide license badge when GitHub check inconclusive
A lot of the cases where 'Other' was showing as the license turned out to be MIT/Apache projects with their files named wrong, which feels misleading.
---
templates/categories/macros.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 18b94509..cb6ca57f 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -28,7 +28,7 @@
{% set description = data.description %}
{% set repository_url = data.html_url %}
- {% if data.license %}
+ {% if data.license and data.license.key != "other" %}
{% set license = data.license.name %}
{% endif %}
- + Archived
@@ -79,7 +79,7 @@
-
+
These {{ section.extra.plural }} are no longer maintained, but may still be of interest.
@@ -96,7 +96,7 @@
-
+
Contribute
From 436badf8646f14ba5cf3afb79d599d2d4479845b Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Wed, 15 Jan 2025 14:28:49 +0000
Subject: [PATCH 09/12] Add Gitea stats support
---
templates/categories/macros.html | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index fab7ba8b..5d55b9c0 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -72,8 +72,14 @@
{% set stars = data.star_count %}
{% set last_activity = data.last_activity_at %}
{% endif %}
-{% else %}
- {% set repo_icon = "code" %}
+{% elif repository_url and repository_url is containing("gitea.com/") %}
+ {% set repo_id = repository_url | split(pat="gitea.com/") | last | trim_end_matches(pat="/") | trim_end_matches(pat=".git") %}
+
+ {% set data = load_data(url="https://gitea.com/api/v1/repos/" ~ repo_id, format="json", required=false) %}
+ {% if data %}
+ {% set stars = data.stars_count %}
+ {% set last_activity = data.updated_at %}
+ {% endif %}
{% endif %}
@@ -98,7 +104,7 @@
{% if repository_url %}
-
+
{% endif %}
From bed73fcd14b78502b389c4d50b5ea52de1c2431a Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Wed, 15 Jan 2025 16:29:58 +0000
Subject: [PATCH 10/12] Re-order card markup for better accessibility
I tried the page with NVDA, and the aria-label approach didn't work (apparently it's not valid for 'li' tags). So instead, I just tweaked the markup to properly present the item's title first.
---
sass/_extra.scss | 5 +++++
templates/categories/macros.html | 18 +++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/sass/_extra.scss b/sass/_extra.scss
index 2cf3c9d1..81fee603 100644
--- a/sass/_extra.scss
+++ b/sass/_extra.scss
@@ -45,6 +45,11 @@
height: 256px;
}
+.ui.cards > .card > .content > .header:not(.ui), .ui.card > .content > .header:not(.ui) {
+ display: inline-block;
+ margin-bottom: 0;
+}
+
.ui.card > .image > img, .ui.cards > .card > .image > img {
object-fit: cover;
width: 100%;
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 5d55b9c0..970b929b 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -82,7 +82,7 @@
{% endif %}
{% endif %}
-
+
{% if item.image %}
{% if primary_url %}
@@ -98,6 +98,14 @@
{% endif %}
+
+ {% if primary_url %}
+ {{ name }}
+ {% else %}
+ {{ name }}
+ {% endif %}
+
+
@@ -120,14 +128,6 @@
{% endif %}
-
- {% if primary_url %}
- {{ name }}
- {% else %}
- {{ name }}
- {% endif %}
-
-
{% for category in item.categories %}
{% set category_data = get_page(path="." ~ section.path ~ category ~ ".md") %}
From 079a044194b71adcd566d04a45e471d0be70fab4 Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Thu, 16 Jan 2025 17:34:37 +0000
Subject: [PATCH 11/12] Add build date to the footer
---
templates/categories/macros.html | 2 +-
templates/master.html | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 970b929b..18b94509 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -216,7 +216,7 @@
Last activity:
- {{ last_activity | date(format="%Y-%m-%d") }}
+ {{ last_activity | date }}
diff --git a/templates/master.html b/templates/master.html
index 479fac55..38cf4512 100644
--- a/templates/master.html
+++ b/templates/master.html
@@ -106,7 +106,13 @@ About
Arewegameyet?
-
This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+
+
+ This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+ Page generated at {{ now() | date(format="%Y-%m-%d %H:%M") }}.
+
Get involved
From a46351e7db5fc814b00baae32cebb7b59ef16975 Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Thu, 16 Jan 2025 22:21:18 +0000
Subject: [PATCH 12/12] Hide license badge when GitHub check inconclusive
A lot of the cases where 'Other' was showing as the license turned out to be MIT/Apache projects with their files named wrong, which feels misleading.
---
templates/categories/macros.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 18b94509..cb6ca57f 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -28,7 +28,7 @@
{% set description = data.description %}
{% set repository_url = data.html_url %}
- {% if data.license %}
+ {% if data.license and data.license.key != "other" %}
{% set license = data.license.name %}
{% endif %}
-
+
These {{ section.extra.plural }} are no longer maintained, but may still be of interest.
@@ -96,7 +96,7 @@
-
+
Contribute
From 436badf8646f14ba5cf3afb79d599d2d4479845b Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Wed, 15 Jan 2025 14:28:49 +0000
Subject: [PATCH 09/12] Add Gitea stats support
---
templates/categories/macros.html | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index fab7ba8b..5d55b9c0 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -72,8 +72,14 @@
{% set stars = data.star_count %}
{% set last_activity = data.last_activity_at %}
{% endif %}
-{% else %}
- {% set repo_icon = "code" %}
+{% elif repository_url and repository_url is containing("gitea.com/") %}
+ {% set repo_id = repository_url | split(pat="gitea.com/") | last | trim_end_matches(pat="/") | trim_end_matches(pat=".git") %}
+
+ {% set data = load_data(url="https://gitea.com/api/v1/repos/" ~ repo_id, format="json", required=false) %}
+ {% if data %}
+ {% set stars = data.stars_count %}
+ {% set last_activity = data.updated_at %}
+ {% endif %}
{% endif %}
@@ -98,7 +104,7 @@
{% if repository_url %}
-
+
{% endif %}
From bed73fcd14b78502b389c4d50b5ea52de1c2431a Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Wed, 15 Jan 2025 16:29:58 +0000
Subject: [PATCH 10/12] Re-order card markup for better accessibility
I tried the page with NVDA, and the aria-label approach didn't work (apparently it's not valid for 'li' tags). So instead, I just tweaked the markup to properly present the item's title first.
---
sass/_extra.scss | 5 +++++
templates/categories/macros.html | 18 +++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/sass/_extra.scss b/sass/_extra.scss
index 2cf3c9d1..81fee603 100644
--- a/sass/_extra.scss
+++ b/sass/_extra.scss
@@ -45,6 +45,11 @@
height: 256px;
}
+.ui.cards > .card > .content > .header:not(.ui), .ui.card > .content > .header:not(.ui) {
+ display: inline-block;
+ margin-bottom: 0;
+}
+
.ui.card > .image > img, .ui.cards > .card > .image > img {
object-fit: cover;
width: 100%;
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 5d55b9c0..970b929b 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -82,7 +82,7 @@
{% endif %}
{% endif %}
-
+
{% if item.image %}
{% if primary_url %}
@@ -98,6 +98,14 @@
{% endif %}
+
+ {% if primary_url %}
+ {{ name }}
+ {% else %}
+ {{ name }}
+ {% endif %}
+
+
@@ -120,14 +128,6 @@
{% endif %}
-
- {% if primary_url %}
- {{ name }}
- {% else %}
- {{ name }}
- {% endif %}
-
-
{% for category in item.categories %}
{% set category_data = get_page(path="." ~ section.path ~ category ~ ".md") %}
From 079a044194b71adcd566d04a45e471d0be70fab4 Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Thu, 16 Jan 2025 17:34:37 +0000
Subject: [PATCH 11/12] Add build date to the footer
---
templates/categories/macros.html | 2 +-
templates/master.html | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 970b929b..18b94509 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -216,7 +216,7 @@
Last activity:
- {{ last_activity | date(format="%Y-%m-%d") }}
+ {{ last_activity | date }}
diff --git a/templates/master.html b/templates/master.html
index 479fac55..38cf4512 100644
--- a/templates/master.html
+++ b/templates/master.html
@@ -106,7 +106,13 @@ About
Arewegameyet?
-
This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+
+
+ This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+ Page generated at {{ now() | date(format="%Y-%m-%d %H:%M") }}.
+
Get involved
From a46351e7db5fc814b00baae32cebb7b59ef16975 Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Thu, 16 Jan 2025 22:21:18 +0000
Subject: [PATCH 12/12] Hide license badge when GitHub check inconclusive
A lot of the cases where 'Other' was showing as the license turned out to be MIT/Apache projects with their files named wrong, which feels misleading.
---
templates/categories/macros.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 18b94509..cb6ca57f 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -28,7 +28,7 @@
{% set description = data.description %}
{% set repository_url = data.html_url %}
- {% if data.license %}
+ {% if data.license and data.license.key != "other" %}
{% set license = data.license.name %}
{% endif %}
- + Contribute
From 436badf8646f14ba5cf3afb79d599d2d4479845b Mon Sep 17 00:00:00 2001 From: Joe Clay <27cupsofcoffee@gmail.com> Date: Wed, 15 Jan 2025 14:28:49 +0000 Subject: [PATCH 09/12] Add Gitea stats support --- templates/categories/macros.html | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/templates/categories/macros.html b/templates/categories/macros.html index fab7ba8b..5d55b9c0 100644 --- a/templates/categories/macros.html +++ b/templates/categories/macros.html @@ -72,8 +72,14 @@ {% set stars = data.star_count %} {% set last_activity = data.last_activity_at %} {% endif %} -{% else %} - {% set repo_icon = "code" %} +{% elif repository_url and repository_url is containing("gitea.com/") %} + {% set repo_id = repository_url | split(pat="gitea.com/") | last | trim_end_matches(pat="/") | trim_end_matches(pat=".git") %} + + {% set data = load_data(url="https://gitea.com/api/v1/repos/" ~ repo_id, format="json", required=false) %} + {% if data %} + {% set stars = data.stars_count %} + {% set last_activity = data.updated_at %} + {% endif %} {% endif %}
+
+ {% if primary_url %} + {{ name }} + {% else %} + {{ name }} + {% endif %} +
+ @@ -120,14 +128,6 @@ {% endif %} -
- {% if primary_url %}
- {{ name }}
- {% else %}
- {{ name }}
- {% endif %}
-
-
{% for category in item.categories %}
{% set category_data = get_page(path="." ~ section.path ~ category ~ ".md") %}
From 079a044194b71adcd566d04a45e471d0be70fab4 Mon Sep 17 00:00:00 2001
From: Joe Clay <27cupsofcoffee@gmail.com>
Date: Thu, 16 Jan 2025 17:34:37 +0000
Subject: [PATCH 11/12] Add build date to the footer
---
templates/categories/macros.html | 2 +-
templates/master.html | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/templates/categories/macros.html b/templates/categories/macros.html
index 970b929b..18b94509 100644
--- a/templates/categories/macros.html
+++ b/templates/categories/macros.html
@@ -216,7 +216,7 @@
diff --git a/templates/master.html b/templates/master.html
index 479fac55..38cf4512 100644
--- a/templates/master.html
+++ b/templates/master.html
@@ -106,7 +106,13 @@
Last activity:
- {{ last_activity | date(format="%Y-%m-%d") }}
+ {{ last_activity | date }}
{{ last_activity | date(format="%Y-%m-%d") }}
+ {{ last_activity | date }}
About
Arewegameyet?
-
This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+
+ This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+ Page generated at {{ now() | date(format="%Y-%m-%d %H:%M") }}.
+