Skip to content

Commit 30af361

Browse files
winstonwumbowinstonwumbo
authored
Merge branch 'haxtheweb:main' into main
2 parents 5027a1c + 88163f7 commit 30af361

File tree

14 files changed

+466
-29
lines changed

14 files changed

+466
-29
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
44

5+
## [10.0.4](https://github.com/haxtheweb/haxcms-nodejs/compare/v10.0.3...v10.0.4) (2025-03-07)
6+
57
## [10.0.3](https://github.com/haxtheweb/haxcms-nodejs/compare/v10.0.2...v10.0.3) (2025-02-24)
68

79
## [10.0.2](https://github.com/haxtheweb/haxcms-nodejs/compare/v10.0.1...v10.0.2) (2025-01-31)

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@haxtheweb/haxcms-nodejs",
3-
"version": "10.0.3",
3+
"version": "10.0.4",
44
"publishConfig": {
55
"access": "public"
66
},

‎src/boilerplate/page/collection/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h3>Our Properties</h3>
1212
icon="hax:idea"
1313
line2="Pedagogy, examples and more"
1414
line3="A&amp;A ODL"
15-
url="https://oer.hax.psu.edu/bto108/sites/haxcellence/ontology"
15+
url="https://haxtheweb.org/ontology"
1616
saturate="saturate" image="https://images-assets.nasa.gov/image/201106080002HQ/201106080002HQ~thumb.jpg">
1717
</collection-item>
1818

‎src/boilerplate/page/course/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h2>Get involved with HAX</h2>
2828
</p>
2929
<p>We hope you enjoy working with HAX as much as the team has enjoyed building it! If you want to join our community, hit "Merlin" and look for the Discord link among other ways to get involved!</p>
3030
<ul>
31-
<li><a href="https://oer.hax.psu.edu/bto108/sites/haxcellence/" target="_blank">Read our HAX Teaching excellence resources</a></li>
31+
<li><a href="https://haxtheweb.org/" target="_blank">Read our HAX Teaching excellence resources</a></li>
3232
<li><a href="https://bit.ly/hax-discord" target="_blank">Join the HAX community</a></li>
3333
<li><a href="https://github.com/elmsln/issues/issues/new?assignees=&labels=POP&template=issue-report.md&title=User%20report%20from%20HAX%20welcome%20page" target="_blank">Post an issue in our issue queue</a></li>
3434
</ul>

‎src/boilerplate/site/.dddignore

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Directories
2+
# (Must start with with / or \, as seen below)
3+
/.github # Inline comments are supported
4+
/.vscode
5+
/.idea
6+
/locales
7+
\test
8+
/dist
9+
/build
10+
/public # ignored by program regardless of presence in .dddignore
11+
/node_modules # ignored by program regardless of presence in .dddignore
12+
13+
# Files
14+
# (Must include filename and extension, as seen below)
15+
LICENSE
16+
false
17+
Dockerfile
18+
CNAME
19+
.dddignore
20+
.editorconfig
21+
.gitignore
22+
.gitkeep
23+
.nojekyll
24+
.npmignore
25+
.surgeignore
26+
rollup.config.js
27+
28+
# File extension
29+
# (Must start with *, as seen below)
30+
*.xml
31+
*.php
32+
*.xsd
33+
*.html
34+
*.md
35+
*.txt
36+
*.yml
37+
*.json
38+
*.toml
39+
*.mjs
40+
*.cjs
41+
*.png
42+
*.ico
43+
*.svg
44+
*.jpg
45+
*.jpeg
46+
*.stories.js

‎src/boilerplate/site/.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
run: echo 'GITHUB_REPOSITORY=$GITHUB_REPOSITORY' >> $GITHUB_ENV
1818

1919
- name: Checkout 🛎️
20-
uses: actions/[email protected] # If you're using actions/checkout@v2 you must set persist-credentials to false in most cases for the deployment to work correctly.
20+
uses: actions/[email protected]
2121
with:
2222
persist-credentials: false
2323

@@ -34,6 +34,6 @@ jobs:
3434
- name: Deploy to GitHub Pages
3535
uses: JamesIves/[email protected]
3636
with:
37-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38-
BRANCH: $GITHUB_BASE_REF # The branch the action should deploy to.
39-
FOLDER: ./ # The folder the action should deploy.
37+
token: ${{ secrets.GITHUB_TOKEN }}
38+
branch: ${{ github.base_ref }} # The branch the action should deploy to.
39+
folder: ./ # The folder the action should deploy.

‎src/boilerplate/site/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,12 @@
226226
</script>
227227
</head>
228228
<body vocab="http://schema.org/" prefix="oer:http://oerschema.org cc:http://creativecommons.org/ns dc:http://purl.org/dc/terms/">
229-
<div id="loading">
229+
<section role="alert" id="loading" aria-busy="true">
230230
<div class="messaging">
231231
<div class="progress-line"></div>
232-
<h1 role="alert" aria-busy="true">Loading..</h1>
232+
<h1>Loading..</h1>
233233
</div>
234-
</div>
234+
</section>
235235
<haxcms-site-builder id="site" file="site.json?2GQKWcJ3ni0xrL2X4_Dw_Sr9SeXqY2Sk3XblmvHVArA"></haxcms-site-builder>
236236
<script>
237237
globalThis.MicroFrontendRegistryConfig = globalThis.MicroFrontendRegistryConfig || {};

‎src/boilerplate/site/index.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@
161161
</script>
162162
</head>
163163
<body <?php print $HAXSiteConfig->getSitePageAttributes();?>>
164-
<div id="loading">
164+
<section role="alert" id="loading" aria-busy="true">
165165
<div class="messaging">
166166
<div class="progress-line"></div>
167-
<h1 role="alert" aria-busy="true">Loading <?php print $HAXSiteConfig->name; ?>..</h1>
167+
<h1>Loading <?php print $HAXSiteConfig->name; ?>..</h1>
168168
</div>
169-
</div>
169+
</section>
170170
<haxcms-site-builder id="site" file="site.json<?php print $HAXSiteConfig->cacheBusterHash();?>">
171171
<?php print $HAXSiteConfig->getPageContent($HAXSiteConfig->page); ?>
172172
</haxcms-site-builder>

‎src/boilerplate/site/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"scripts": {
1515
"start": "npm run dev",
16-
"ghpages:build": "rm dist && rm assets/babel* && rm build && rm node_modules && rm wc-registry.json",
16+
"ghpages:build": "rm assets/babel* && rm build && rm wc-registry.json",
1717
"dev": "npx @haxtheweb/haxcms-nodejs",
1818
"dev-theme": "cd custom && npm start"
1919
}

0 commit comments

Comments
 (0)