bit-badger/bitbadger.solutions-theme
1
0
Fork 0
Code Pull Requests Packages Activity

Update Git URLs

Browse Source 
- Remove quotes where not required
This commit is contained in:
Daniel J. Summers 2024-04-20 14:06:56 -04:00
parent b614c2fdd8
commit 2e7f976d8a
7 changed files with 143 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
theme/home-page.liquid
View File

@ -1,130 +1,104 @@
<div class="home"> <div class=home>
<article class="content auto"> <article class="content auto">
{{ page.text }} {{ page.text }}
{% if is_logged_on -%} {% if is_logged_on -%}
<p><small><a hx-boost="false" href="{{ page | edit_page_link }}">Edit This Page</a></small></p> <p><small><a hx-boost=false href="{{ page | edit_page_link }}">Edit This Page</a></small>
{% endif %} {% endif %}
</article> </article>
<aside class="app-sidebar"> <aside class=app-sidebar>
<div> <div>
<div class="app-sidebar-head">Web Sites and Applications</div> <div class=app-sidebar-head>Web Sites and Applications</div>
<div> <div>
<p class="app-sidebar-name"> <p class=app-sidebar-name>
<strong>PrayerTracker</strong><br> <strong>PrayerTracker</strong><br>
<a href="{{ "solutions/prayer-tracker" | relative_link }}" <a href="{{ "solutions/prayer-tracker" | relative_link }}"
title="About PrayerTracker &bull; Bit Badger Solutions"> title="About PrayerTracker &bull; Bit Badger Solutions">
About About
</a> • </a> •
<a href="https://prayer.bitbadger.solutions" title="PrayerTracker" target="_blank" rel="noopener">Visit</a> <a href=https://prayer.bitbadger.solutions title=PrayerTracker target=_blank rel=noopener>Visit</a>
</p> <p class=app-sidebar-description>A prayer request tracking website (Free for any church or Sunday School class!)
<p class="app-sidebar-description">
A prayer request tracking website (Free for any church or Sunday School class!)
</p>
</div> </div>
<div> <div>
<p class="app-sidebar-name"> <p class=app-sidebar-name>
<strong>myPrayerJournal</strong><br> <strong>myPrayerJournal</strong><br>
<a href="{{ "solutions/my-prayer-journal" | relative_link }}" <a href="{{ "solutions/my-prayer-journal" | relative_link }}"
title="About myPrayerJournal &bull; Bit Badger Solutions"> title="About myPrayerJournal &bull; Bit Badger Solutions">
About About
</a> • </a> •
<a href="https://prayerjournal.me" title="myPrayerJournal" target="_blank" rel="noopener">Visit</a> <a href=https://prayerjournal.me title=myPrayerJournal target=_blank rel=noopener>Visit</a>
</p> <p class=app-sidebar-description>Minimalist personal prayer journal
<p class="app-sidebar-description">Minimalist personal prayer journal</p>
</div> </div>
<div> <div>
<p class="app-sidebar-name"> <p class=app-sidebar-name>
<strong>Linux Resources</strong><br> <strong>Linux Resources</strong><br>
<a href="https://blog.bitbadger.solutions/linux/" title="Linux Resources" target="_blank" rel="noopener"> <a href="https://blog.bitbadger.solutions/linux/" title="Linux Resources" target=_blank rel=noopener>
Visit Visit
</a> </a>
</p> <p class=app-sidebar-description>Handy information for Linux folks
<p class="app-sidebar-description">Handy information for Linux folks</p>
</div> </div>
</div> </div>
<div> <div>
<div class="app-sidebar-head">WordPress</div> <div class=app-sidebar-head>WordPress</div>
<div> <div>
<p class="app-sidebar-name"> <p class=app-sidebar-name>
<strong>Futility Closet</strong><br> <strong>Futility Closet</strong><br>
<a href="{{ "solutions/futility-closet" | relative_link }}" <a href="{{ "solutions/futility-closet" | relative_link }}"
title="About Futility Closet &bull; Bit Badger Solutions"> title="About Futility Closet &bull; Bit Badger Solutions">
About About
</a> • </a> •
<a href="https://www.futilitycloset.com" title="Futility Closet" target="_blank" rel="noopener">Visit</a> <a href=https://www.futilitycloset.com title="Futility Closet" target=_blank rel=noopener>Visit</a>
</p> <p class=app-sidebar-description>An idler’s miscellany of compendious amusements
<p class="app-sidebar-description">An idler’s miscellany of compendious amusements</p>
</div> </div>
<div> <div>
<p class="app-sidebar-name"> <p class=app-sidebar-name>
<strong>Mindy Mackenzie</strong><br> <strong>Riehl World News</strong><br>
<a href="{{ "solutions/mindy-mackenzie" | relative_link }}" <a href="{{ "solutions/riehl-world-news" | relative_link }}"
title="About Mindy Mackenzie &bull; Bit Badger Solutions"> title="About Riehl World News &bull; Bit Badger Solutions">
About About
</a> • </a> •
<a href="https://mindymackenzie.com" title="Mindy Mackenzie" target="_blank" rel="noopener">Visit</a> <a href=http://riehlworldview.com title="Riehl World News" target=_blank rel=noopener>Visit</a>
</p> <p class=app-sidebar-description>Riehl news for real people
<p class="app-sidebar-description"><em>WSJ</em>-best-selling author of <em>The Courage Solution</em></p>
</div>
<div>
<p class="app-sidebar-name">
<strong>Riehl World News</strong><br>
<a href="{{ "solutions/riehl-world-news" | relative_link }}"
title="About Riehl World News &bull; Bit Badger Solutions">
About
</a> •
<a href="http://riehlworldview.com" title="Riehl World News" target="_blank" rel="noopener">Visit</a>
</p>
<p class="app-sidebar-description">Riehl news for real people</p>
</div> </div>
</div> </div>
<div> <div>
<div class="app-sidebar-head">Static Sites</div> <div class=app-sidebar-head>Static Sites</div>
<div> <div>
<p class="app-sidebar-name"> <p class=app-sidebar-name>
<strong>Bay Vista Baptist Church</strong><br> <strong>Bay Vista Baptist Church</strong><br>
<a href="{{ "solutions/bay-vista" | relative_link }}" <a href="{{ "solutions/bay-vista" | relative_link }}"
title="About Bay Vista Baptist Church &bull; Bit Badger Solutions"> title="About Bay Vista Baptist Church &bull; Bit Badger Solutions">
About About
</a> • </a> •
<a href="https://bayvista.org" title="Bay Vista Baptist Church" target="_blank" rel="noopener">Visit</a> <a href=https://bayvista.org title="Bay Vista Baptist Church" target=_blank rel=noopener>Visit</a>
</p> <p class=app-sidebar-description>Biloxi, Mississippi
<p class="app-sidebar-description">Biloxi, Mississippi</p>
</div> </div>
</div> </div>
<div> <div>
<div> <div>
<div class="app-sidebar-head">myWebLog</div> <div class=app-sidebar-head>myWebLog</div>
<p class="app-sidebar-name"> <p class=app-sidebar-name>
<strong>The Bit Badger Blog</strong><br> <strong>The Bit Badger Blog</strong><br>
<a href="{{ "solutions/tech-blog" | relative_link }}" <a href="{{ "solutions/tech-blog" | relative_link }}"
title="About The Bit Badger Blog &bull; Bit Badger Solutions"> title="About The Bit Badger Blog &bull; Bit Badger Solutions">
About About
</a> • </a> •
<a href="https://bitbadger.solutions/blog" title="The Bit Badger Blog" target="_blank" rel="noopener"> <a href=https://bitbadger.solutions/blog title="The Bit Badger Blog" target=_blank rel=noopener>Visit</a>
Visit <p class=app-sidebar-description>Technical information (“geek stuff”) from Bit Badger Solutions
</a>
</p>
<p class="app-sidebar-description">Technical information (“geek stuff”) from Bit Badger Solutions</p>
</div> </div>
</div> </div>
<div> <div>
<div class="app-sidebar-head">Personal</div> <div class=app-sidebar-head>Personal</div>
<div> <div>
<p class="app-sidebar-name"> <p class=app-sidebar-name>
<strong>Daniel J. Summers</strong><br> <strong>Daniel J. Summers</strong><br>
<a href="https://daniel.summershome.org" title="Daniel J. Summers" target="_blank" rel="noopener">Visit</a> <a href=https://daniel.summershome.org title="Daniel J. Summers" target=_blank rel=noopener>Visit</a>
</p> <p class=app-sidebar-description>Daniel’s personal blog
<p class="app-sidebar-description">Daniel’s personal blog</p>
</div> </div>
<div> <div>
<p class="app-sidebar-name"> <p class=app-sidebar-name>
<strong>A Word from the Word</strong><br> <strong>A Word from the Word</strong><br>
<a href="https://devotions.summershome.org" title="A Word from the Word" target="_blank" rel="noopener"> <a href=https://devotions.summershome.org title="A Word from the Word" target=_blank rel=noopener>Visit</a>
Visit <p class=app-sidebar-description>Devotions by Daniel
</a>
</p>
<p class="app-sidebar-description">Devotions by Daniel</p>
</div> </div>
</div> </div>
</aside> </aside>

12
theme/layout-partial.liquid
View File

@ -1,10 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang=en>
<head> <meta charset=utf-8>
<meta charset="UTF-8"> <title>{{ page_title }} &raquo; Bit Badger Solutions</title>
<title>{{ page_title }} &raquo; Bit Badger Solutions</title> <body>{{ content }}</body>
</head>
<body>
{{ content }}
</body>
</html> </html>

36
theme/layout.liquid
View File

@ -1,35 +1,33 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang=en>
<head> <meta charset=utf-8>
<meta charset="UTF-8"> <meta name=viewport content="width=device-width">
<meta name="viewport" content="width=device-width"> <title>{{ page_title }} &raquo; Bit Badger Solutions</title>
<title>{{ page_title }} &raquo; Bit Badger Solutions</title> <link rel=stylesheet href="https://fonts.googleapis.com/css?family=Oswald|Raleway">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Oswald|Raleway"> {% page_head -%}
{% page_head -%} <body hx-boost=true hx-target=main hx-indicator=#loadOverlay hx-swap="innerHTML show:body:top">
</head> <header class=site-header>
<body hx-boost="true" hx-target="main" hx-indicator="#loadOverlay" hx-swap="innerHTML show:body:top"> <div class=header-logo>
<header class="site-header">
<div class="header-logo">
<a href="{{ "" | relative_link }}"> <a href="{{ "" | relative_link }}">
<img src="{{ "bitbadger.png" | theme_asset }}" <img src="{{ "bitbadger.png" | theme_asset }}"
alt="A cartoon badger looking at a computer screen, with his paw on a mouse" alt="A cartoon badger looking at a computer screen, with his paw on a mouse"
title="Bit Badger Solutions"> title="Bit Badger Solutions">
</a> </a>
</div> </div>
<div class="header-title"><a href="{{ "" | relative_link }}">Bit Badger Solutions</a></div> <div class=header-title><a href="{{ "" | relative_link }}">Bit Badger Solutions</a></div>
<div class="header-spacer"> &nbsp; </div> <div class=header-spacer> &nbsp; </div>
<div class="header-social"> <div class=header-social>
<a href="https://twitter.com/Bit_Badger" title="Bit_Badger on Twitter" target="_blank"> <a href=https://twitter.com/Bit_Badger title="Bit_Badger on Twitter" target=_blank>
<img src="{{ "twitter.png" | theme_asset }}" alt="Twitter"> <img src="{{ "twitter.png" | theme_asset }}" alt="Twitter">
</a> &nbsp; </a> &nbsp;
<a href="https://www.facebook.com/bitbadger.solutions" title="Bit Badger Solutions on Facebook" target="_blank"> <a href=https://www.facebook.com/bitbadger.solutions title="Bit Badger Solutions on Facebook" target=_blank>
<img src="{{ "facebook.png" | theme_asset }}" alt="Facebook"> <img src="{{ "facebook.png" | theme_asset }}" alt="Facebook">
</a> </a>
</div> </div>
</header> </header>
<div class="load-overlay" id="loadOverlay"><h1>Loading&hellip;</h1></div> <div class=load-overlay id="loadOverlay"><h1>Loading&hellip;</h1></div>
<main>{{ content }}</main> <main>{{ content }}</main>
<footer hx-boost="false"> <footer hx-boost=false>
<div> <div>
<small> <small>
{% if is_logged_on -%} {% if is_logged_on -%}
@ -40,7 +38,7 @@
{% endif %} {% endif %}
</small> </small>
</div> </div>
<div class="footer-by"> <div class=footer-by>
A <strong><a href="{{ "" | relative_link }}">Bit Badger Solutions</a></strong> original design A <strong><a href="{{ "" | relative_link }}">Bit Badger Solutions</a></strong> original design
</div> </div>
</footer> </footer>

25
theme/project-page.liquid
View File

@ -1,20 +1,20 @@
<article class="content auto"> <article class="content auto">
{%- assign parts = page.title | split: ' » ' -%} {%- assign parts = page.title | split: ' » ' -%}
{%- assign parts_count = parts | size -%} {%- assign parts_count = parts | size -%}
<h1 class="project-title"> <h1 class=project-title>
{% if parts_count == 1 -%} {% if parts_count == 1 -%}
{{ page.title }}<br> {{ page.title }}<br>
<small><small> <small><small>
<a href="https://github.com/bit-badger/{{ page.title }}" target="_blank" rel="noopener" <a href="https://git.bitbadger.solutions/bit-badger/{{ page.title }}" target=_blank rel=noopener
title="{{ parts[0] }} on GitHub"> title="{{ parts[0] }} Git Repository">
View on GitHub View Source Repo
</a> </a>
{% if is_logged_on %} &bull; <a hx-boost="false" href="{{ page | edit_page_link }}">Edit Page</a>{% endif %} {% if is_logged_on %} &bull; <a hx-boost=false href="{{ page | edit_page_link }}">Edit Page</a>{% endif %}
</small></small> </small></small>
{%- else -%} {%- else -%}
<small><small> <small><small>
<a href="." title="{{ parts[0] }} Home">{{ parts[0] }}</a> <a href="." title="{{ parts[0] }} Home">{{ parts[0] }}</a>
{% if is_logged_on %} &bull; <a hx-boost="false" href="{{ page | edit_page_link }}">Edit</a>{% endif %} {% if is_logged_on %} &bull; <a hx-boost=false href="{{ page | edit_page_link }}">Edit</a>{% endif %}
</small></small> </small></small>
<br> <br>
{{ parts[1] }} {{ parts[1] }}
@ -22,12 +22,11 @@
</h1> </h1>
{{ page.text }} {{ page.text }}
{% if parts_count > 1 -%} {% if parts_count > 1 -%}
<p class="project-footer"> <p class=project-footer>
<a href="." title="{{ parts[0] }} Home">&laquo; {{ parts[0] }} Home</a> <a href="." title="{{ parts[0] }} Home">&laquo; {{ parts[0] }} Home</a>
<a href="https://github.com/bit-badger/{{ parts[0] }}" target="_blank" rel="noopener" <a href="https://git.bitbadger.solutions/bit-badger/{{ parts[0] }}" target=_blank rel=noopener
title="{{ parts[0] }} on GitHub"> title="{{ parts[0] }} Git Repository">
View GitHub Repo View Source Repo
</a> </a>
</p>
{%- endif %} {%- endif %}
</article> </article>

4
theme/single-page.liquid
View File

@ -1,8 +1,8 @@
<article class="content auto"> <article class="content auto">
<h1>{{ page.title }}</h1> <h1>{{ page.title }}</h1>
{{ page.text }} {{ page.text }}
<p><br><a href="{{ "" | relative_link }}" title="Home">&laquo; Home</a></p> <p><br><a href="{{ "" | relative_link }}" title=Home>&laquo; Home</a>
{% if is_logged_on -%} {% if is_logged_on -%}
<p><small><a hx-boost="false" href="{{ page | edit_page_link }}">Edit This Page</a></small></p> <p><small><a hx-boost=false href="{{ page | edit_page_link }}">Edit This Page</a></small>
{% endif %} {% endif %}
</article> </article>

74
theme/solution-page.liquid
View File

@ -1,6 +1,6 @@
{% assign tech_with_links = "ASP.NET MVC|Azure|BlogEngine.NET|Database Abstraction|Digital Ocean|Giraffe|GitHub|GitHub Pages|Hexo|Hugo|htmx|Jekyll|LiteDB|MongoDB|MySQL|myWebLog|nginx|Orchard|PHP|PostgreSQL|Rackspace Cloud|RavenDB|RethinkDB|SQL Server|Vue.js|WordPress" | split: "|" %} {% assign tech_with_links = "ASP.NET MVC|Azure|BlogEngine.NET|Database Abstraction|Digital Ocean|Giraffe|GitHub|GitHub Pages|Hexo|Hugo|htmx|Jekyll|LiteDB|MongoDB|MySQL|myWebLog|nginx|Orchard|PHP|PostgreSQL|Rackspace Cloud|RavenDB|RethinkDB|SQL Server|Vue.js|WordPress" | split: "|" %}
{% assign tech_links = "https://dotnet.microsoft.com/apps/aspnet/mvc|https://azure.microsoft.com/|http://www.dotnetblogengine.net/|https://github.com/danieljsummers/DatabaseAbstraction|https://www.digitalocean.com/|https://giraffe.wiki|https://github.com/|https://pages.github.com/|https://hexo.io/|https://gohugo.io/|https://htmx.org/|https://jekyllrb.com/|https://www.litedb.org/|https://www.mongodb.com/|https://www.mysql.com/|https://bitbadger.solutions/open-source/myweblog/|http://nginx.org/|https://orchardproject.net/|https://www.php.net/|https://www.postgresql.org/|https://www.rackspace.com/cloud|https://ravendb.net/|https://rethinkdb.com/|https://www.microsoft.com/en-us/sql-server/|https://vuejs.org/|https://wordpress.org" | split: "|" %} {% assign tech_links = "https://dotnet.microsoft.com/apps/aspnet/mvc|https://azure.microsoft.com/|http://www.dotnetblogengine.net/|https://github.com/danieljsummers/DatabaseAbstraction|https://www.digitalocean.com/|https://giraffe.wiki|https://github.com/|https://pages.github.com/|https://hexo.io/|https://gohugo.io/|https://htmx.org/|https://jekyllrb.com/|https://www.litedb.org/|https://www.mongodb.com/|https://www.mysql.com/|https://bitbadger.solutions/open-source/myweblog/|http://nginx.org/|https://orchardproject.net/|https://www.php.net/|https://www.postgresql.org/|https://www.rackspace.com/cloud|https://ravendb.net/|https://rethinkdb.com/|https://www.microsoft.com/en-us/sql-server/|https://vuejs.org/|https://wordpress.org" | split: "|" %}
<h1 class="solution-header"> <h1 class=solution-header>
{{ page.title }}<br> {{ page.title }}<br>
<small><small> <small><small>
{%- assign url = page.metadata | value: "url" -%} {%- assign url = page.metadata | value: "url" -%}
@ -9,16 +9,16 @@
{% if no_link == "true" -%} {% if no_link == "true" -%}
{{ url }} {{ url }}
{%- else -%} {%- else -%}
<a href="{{ url }}" target="_blank" rel="noopener">{{ url }}</a> <a href="{{ url }}" target=_blank rel=noopener>{{ url }}</a>
{%- endif %} {%- endif %}
{% if archive > 0 -%} {% if archive > 0 -%}
&nbsp;&nbsp; &nbsp;&nbsp;
<a href="{{ page.metadata | value: "archive_url" }}" target="_blank" rel="noopener"><small>(Archive)</small></a> <a href="{{ page.metadata | value: "archive_url" }}" target=_blank rel=noopener><small>(Archive)</small></a>
{%- endif %} {%- endif %}
</small></small> </small></small>
</h1> </h1>
<div class="app-info"> <div class=app-info>
<article class="content"> <article class=content>
<aside> <aside>
{%- capture screen_url %}screenshots/{{ page.permalink | split: "/" | last }}.png{% endcapture -%} {%- capture screen_url %}screenshots/{{ page.permalink | split: "/" | last }}.png{% endcapture -%}
<img src="{{ screen_url | theme_asset }}" alt="Screen shot of {{ page.title | escape }}"> <img src="{{ screen_url | theme_asset }}" alt="Screen shot of {{ page.title | escape }}">
@ -31,57 +31,55 @@
{% if curr_count > 0 or past_count > 0 -%} {% if curr_count > 0 or past_count > 0 -%}
<section aria-label="The Technology Stack"> <section aria-label="The Technology Stack">
<h3 onclick="toggle('techStack')"> <h3 onclick="toggle('techStack')">
The Technology Stack<span id="techStackArrow" class="arrow">&#x25BC;</span> The Technology Stack<span id=techStackArrow class=arrow>&#x25BC;</span>
</h3> </h3>
<div id="techStack" class="collapse-panel hidden"> <div id=techStack class="collapse-panel hidden">
{% if curr_count > 0 -%} {% if curr_count > 0 -%}
{% if past_count > 0 -%} {% if past_count > 0 -%}
<p><small><strong>Current:</strong></small></p> <p><small><strong>Current:</strong></small></p>
{%- endif %} {%- endif %}
<ul> <ul>
{% for curr in curr_tech -%} {% for curr in curr_tech -%}
{%- assign tech = curr.value | split: "|" -%} {%- assign tech = curr.value | split: "|" -%}
{%- assign link_idx = -1 -%} {%- assign link_idx = -1 -%}
{%- for tech_name in tech_with_links -%} {%- for tech_name in tech_with_links -%}
{%- if tech_name == tech[0] %}{% assign link_idx = forloop.index0 %}{% endif -%} {%- if tech_name == tech[0] %}{% assign link_idx = forloop.index0 %}{% endif -%}
{%- endfor -%} {%- endfor -%}
<li> <li>
{% if link_idx >= 0 -%} {% if link_idx >= 0 -%}
<a href="{{ tech_links[link_idx] }}" target="_blank" rel="noopener">{{ tech[0] }}</a> <a href="{{ tech_links[link_idx] }}" target=_blank rel=noopener>{{ tech[0] }}</a>
{% else %} {% else %}
{{ tech[0] }} {{ tech[0] }}
{%- endif %} for {{ tech[1] }} {%- endif %} for {{ tech[1] }}
</li> {%- endfor %}
{%- endfor %}
</ul> </ul>
{%- endif %} {%- endif %}
{% if past_count > 0 -%} {% if past_count > 0 -%}
{% if curr_count > 0 %} {% if curr_count > 0 %}
<p><small><strong>Previously:</strong></small></p> <p><small><strong>Previously:</strong></small>
{% endif %} {% endif %}
<ul> <ul>
{% for past in past_tech -%} {% for past in past_tech -%}
{%- assign tech = past.value | split: "|" -%} {%- assign tech = past.value | split: "|" -%}
{%- assign link_idx = -1 -%} {%- assign link_idx = -1 -%}
{%- for tech_name in tech_with_links -%} {%- for tech_name in tech_with_links -%}
{%- if tech_name == tech[0] %}{% assign link_idx = forloop.index0 %}{% endif -%} {%- if tech_name == tech[0] %}{% assign link_idx = forloop.index0 %}{% endif -%}
{%- endfor -%} {%- endfor -%}
<li> <li>
{% if link_idx >= 0 %} {% if link_idx >= 0 %}
<a href="{{ tech_links[link_idx] }}" target="_blank" rel="noopener">{{ tech[0] }}</a> <a href="{{ tech_links[link_idx] }}" target=_blank rel=noopener>{{ tech[0] }}</a>
{% else %} {% else %}
{{ tech[0] }} {{ tech[0] }}
{%- endif %} for {{ tech[1] }} {%- endif %} for {{ tech[1] }}
</li> {%- endfor %}
{%- endfor %}
</ul> </ul>
{% endif %} {% endif %}
</div> </div>
</section> </section>
{%- endif %} {%- endif %}
<p><br><a href="{{ "solutions" | relative_link }}">&laquo; Back to All Solutions</a></p> <p><br><a href="{{ "solutions" | relative_link }}">&laquo; Back to All Solutions</a>
{% if is_logged_on -%} {% if is_logged_on -%}
<p><small><a hx-boost="false" href="{{ page | edit_page_link }}">Edit This Page</a></small></p> <p><small><a hx-boost="false" href="{{ page | edit_page_link }}">Edit This Page</a></small>
{% endif %} {% endif %}
</article> </article>
</div> </div>

2
theme/version.txt
View File

@ -1,2 +1,2 @@
Bit Badger Solutions Bit Badger Solutions
20220903 20240420