This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch preview/volunteers-staging
in repository https://gitbox.apache.org/repos/asf/comdev-site.git
The following commit(s) were added to refs/heads/preview/volunteers-staging by
this push:
new 98450f0 Updated preview/volunteers-staging from preview/volunteers at
ea05c2f6f7c439387af034357d025e176ce7b484
98450f0 is described below
commit 98450f07f188229b84eb1c961179936a4f0b46d5
Author: jenkins <[email protected]>
AuthorDate: Mon Nov 27 17:07:05 2023 +0000
Updated preview/volunteers-staging from preview/volunteers at
ea05c2f6f7c439387af034357d025e176ce7b484
Built from
https://ci-builds.apache.org/job/Community%20Development/job/site/job/preview%252Fvolunteers/7/
---
content/_pagefind/fragment/en_0bfb1a4.pf_fragment | Bin 0 -> 1166 bytes
content/_pagefind/fragment/en_ad13356.pf_fragment | Bin 1251 -> 0 bytes
content/_pagefind/index/en_17f0e66.pf_index | Bin 28613 -> 0 bytes
content/_pagefind/index/en_372e752.pf_index | Bin 27933 -> 0 bytes
content/_pagefind/index/en_45f8a04.pf_index | Bin 10754 -> 0 bytes
content/_pagefind/index/en_607ced8.pf_index | Bin 0 -> 33008 bytes
content/_pagefind/index/en_631d32c.pf_index | Bin 30292 -> 0 bytes
content/_pagefind/index/en_66492b6.pf_index | Bin 32941 -> 0 bytes
content/_pagefind/index/en_8874e6a.pf_index | Bin 27817 -> 0 bytes
content/_pagefind/index/en_9084282.pf_index | Bin 0 -> 28017 bytes
content/_pagefind/index/en_9529b4f.pf_index | Bin 0 -> 30493 bytes
content/_pagefind/index/en_aeb2a0e.pf_index | Bin 0 -> 10396 bytes
content/_pagefind/index/en_b5e76c6.pf_index | Bin 0 -> 30837 bytes
content/_pagefind/index/en_b89f709.pf_index | Bin 30814 -> 0 bytes
content/_pagefind/index/en_e112e18.pf_index | Bin 0 -> 27813 bytes
content/_pagefind/index/en_e71974e.pf_index | Bin 0 -> 30626 bytes
content/_pagefind/index/en_f6cc7b1.pf_index | Bin 0 -> 29349 bytes
content/_pagefind/index/en_fb25864.pf_index | Bin 30651 -> 0 bytes
content/_pagefind/pagefind-entry.json | 2 +-
content/_pagefind/pagefind.en_30f6b5ed38.pf_meta | Bin 1220 -> 0 bytes
content/_pagefind/pagefind.en_3bccb995a5.pf_meta | Bin 0 -> 1211 bytes
content/contributors/asf-volunteers.html | 10 ++++++----
content/data/people.json | 18 ++++++++++++++++++
.../components/{whimsy-loader.js => data-loader.js} | 8 ++++----
content/js/components/person-projects.js | 4 ++--
content/js/components/volunteers-list.js | 19 +++++++++----------
26 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/content/_pagefind/fragment/en_0bfb1a4.pf_fragment
b/content/_pagefind/fragment/en_0bfb1a4.pf_fragment
new file mode 100644
index 0000000..660ee7d
Binary files /dev/null and b/content/_pagefind/fragment/en_0bfb1a4.pf_fragment
differ
diff --git a/content/_pagefind/fragment/en_ad13356.pf_fragment
b/content/_pagefind/fragment/en_ad13356.pf_fragment
deleted file mode 100644
index b97b54e..0000000
Binary files a/content/_pagefind/fragment/en_ad13356.pf_fragment and /dev/null
differ
diff --git a/content/_pagefind/index/en_17f0e66.pf_index
b/content/_pagefind/index/en_17f0e66.pf_index
deleted file mode 100644
index ce20b95..0000000
Binary files a/content/_pagefind/index/en_17f0e66.pf_index and /dev/null differ
diff --git a/content/_pagefind/index/en_372e752.pf_index
b/content/_pagefind/index/en_372e752.pf_index
deleted file mode 100644
index 54c28df..0000000
Binary files a/content/_pagefind/index/en_372e752.pf_index and /dev/null differ
diff --git a/content/_pagefind/index/en_45f8a04.pf_index
b/content/_pagefind/index/en_45f8a04.pf_index
deleted file mode 100644
index 9ae1d82..0000000
Binary files a/content/_pagefind/index/en_45f8a04.pf_index and /dev/null differ
diff --git a/content/_pagefind/index/en_607ced8.pf_index
b/content/_pagefind/index/en_607ced8.pf_index
new file mode 100644
index 0000000..aab166b
Binary files /dev/null and b/content/_pagefind/index/en_607ced8.pf_index differ
diff --git a/content/_pagefind/index/en_631d32c.pf_index
b/content/_pagefind/index/en_631d32c.pf_index
deleted file mode 100644
index b49d9ee..0000000
Binary files a/content/_pagefind/index/en_631d32c.pf_index and /dev/null differ
diff --git a/content/_pagefind/index/en_66492b6.pf_index
b/content/_pagefind/index/en_66492b6.pf_index
deleted file mode 100644
index 28ac5c4..0000000
Binary files a/content/_pagefind/index/en_66492b6.pf_index and /dev/null differ
diff --git a/content/_pagefind/index/en_8874e6a.pf_index
b/content/_pagefind/index/en_8874e6a.pf_index
deleted file mode 100644
index fd45892..0000000
Binary files a/content/_pagefind/index/en_8874e6a.pf_index and /dev/null differ
diff --git a/content/_pagefind/index/en_9084282.pf_index
b/content/_pagefind/index/en_9084282.pf_index
new file mode 100644
index 0000000..325f5b5
Binary files /dev/null and b/content/_pagefind/index/en_9084282.pf_index differ
diff --git a/content/_pagefind/index/en_9529b4f.pf_index
b/content/_pagefind/index/en_9529b4f.pf_index
new file mode 100644
index 0000000..6ddb277
Binary files /dev/null and b/content/_pagefind/index/en_9529b4f.pf_index differ
diff --git a/content/_pagefind/index/en_aeb2a0e.pf_index
b/content/_pagefind/index/en_aeb2a0e.pf_index
new file mode 100644
index 0000000..5fa939a
Binary files /dev/null and b/content/_pagefind/index/en_aeb2a0e.pf_index differ
diff --git a/content/_pagefind/index/en_b5e76c6.pf_index
b/content/_pagefind/index/en_b5e76c6.pf_index
new file mode 100644
index 0000000..6181182
Binary files /dev/null and b/content/_pagefind/index/en_b5e76c6.pf_index differ
diff --git a/content/_pagefind/index/en_b89f709.pf_index
b/content/_pagefind/index/en_b89f709.pf_index
deleted file mode 100644
index 687c52c..0000000
Binary files a/content/_pagefind/index/en_b89f709.pf_index and /dev/null differ
diff --git a/content/_pagefind/index/en_e112e18.pf_index
b/content/_pagefind/index/en_e112e18.pf_index
new file mode 100644
index 0000000..e641964
Binary files /dev/null and b/content/_pagefind/index/en_e112e18.pf_index differ
diff --git a/content/_pagefind/index/en_e71974e.pf_index
b/content/_pagefind/index/en_e71974e.pf_index
new file mode 100644
index 0000000..0535ccc
Binary files /dev/null and b/content/_pagefind/index/en_e71974e.pf_index differ
diff --git a/content/_pagefind/index/en_f6cc7b1.pf_index
b/content/_pagefind/index/en_f6cc7b1.pf_index
new file mode 100644
index 0000000..b587725
Binary files /dev/null and b/content/_pagefind/index/en_f6cc7b1.pf_index differ
diff --git a/content/_pagefind/index/en_fb25864.pf_index
b/content/_pagefind/index/en_fb25864.pf_index
deleted file mode 100644
index 0df2ccf..0000000
Binary files a/content/_pagefind/index/en_fb25864.pf_index and /dev/null differ
diff --git a/content/_pagefind/pagefind-entry.json
b/content/_pagefind/pagefind-entry.json
index 416fdd2..78a52cb 100644
--- a/content/_pagefind/pagefind-entry.json
+++ b/content/_pagefind/pagefind-entry.json
@@ -1 +1 @@
-{"version":"1.0.3","languages":{"en":{"hash":"en_30f6b5ed38","wasm":"en","page_count":135}}}
\ No newline at end of file
+{"version":"1.0.3","languages":{"en":{"hash":"en_3bccb995a5","wasm":"en","page_count":135}}}
\ No newline at end of file
diff --git a/content/_pagefind/pagefind.en_30f6b5ed38.pf_meta
b/content/_pagefind/pagefind.en_30f6b5ed38.pf_meta
deleted file mode 100644
index b26d885..0000000
Binary files a/content/_pagefind/pagefind.en_30f6b5ed38.pf_meta and /dev/null
differ
diff --git a/content/_pagefind/pagefind.en_3bccb995a5.pf_meta
b/content/_pagefind/pagefind.en_3bccb995a5.pf_meta
new file mode 100644
index 0000000..7929ca4
Binary files /dev/null and b/content/_pagefind/pagefind.en_3bccb995a5.pf_meta
differ
diff --git a/content/contributors/asf-volunteers.html
b/content/contributors/asf-volunteers.html
index 157ac65..9ecf794 100644
--- a/content/contributors/asf-volunteers.html
+++ b/content/contributors/asf-volunteers.html
@@ -241,7 +241,9 @@ To add your name to this list, use the same
format as other entries and keep the list sorted
alphabetically by ASF username.
-The languages and location fields are optional.
+You can add additional data such as your personal
+website URL, languages spoken, location etc.
+to the /static/data/people.json file
This data is combined with public ASF info found under
https://whimsy.apache.org/public/public_ldap_projects.json ,
@@ -249,9 +251,9 @@ by a Web Component loaded for this page.
-->
<p><strong>TODO</strong>: add an “edit in GitHub” link pointing to
the right page so that people can add their names</p>
<ul>
-<li>bdelacretaz # mentor, speaker # French, English, some German # <a
href="https://grep.codeconsult.ch";>https://grep.codeconsult.ch</a> #
Switzerland</li>
-<li>curcuru # mentor, speaker # # <a
href="https://shanecurcuru.org/";>https://shanecurcuru.org/</a> # Boston, MA,
US</li>
-<li>rbowen # mentor, speaker # # <a
href="https://drbacchus.com/";>https://drbacchus.com/</a> #</li>
+<li>bdelacretaz # mentor, speaker</li>
+<li>curcuru # mentor, speaker</li>
+<li>rbowen # mentor, speaker</li>
</ul>
</volunteers-list>
diff --git a/content/data/people.json b/content/data/people.json
new file mode 100644
index 0000000..c4505c2
--- /dev/null
+++ b/content/data/people.json
@@ -0,0 +1,18 @@
+{
+ "NONAME_KEEP_THIS_FIRST": {
+ "info": "This file supplies additional public information about our
people, so far for the ASF volunteers page",
+ "details": "See static/js/components for how this data is used"
+ },
+ "bdelacretaz" : {
+ "speaks": [ "French", "English", "Some German"],
+ "region": "Switzerland",
+ "website": "https://grep.codeconsult.ch";
+ },
+ "curcuru" : {
+ "region": "Boston, MA, US",
+ "website": " https://shanecurcuru.org/";
+ },
+ "rbowen" : {
+ "website": "https://drbacchus.com";
+ }
+}
\ No newline at end of file
diff --git a/content/js/components/whimsy-loader.js
b/content/js/components/data-loader.js
similarity index 51%
rename from content/js/components/whimsy-loader.js
rename to content/js/components/data-loader.js
index 8615791..c454fc5 100644
--- a/content/js/components/whimsy-loader.js
+++ b/content/js/components/data-loader.js
@@ -1,8 +1,8 @@
// This is used by the components in this folder to load
-// public data from Whimsy
-const fetchPublicData = async whimsyFilename => {
+// JSON public data from various places
+const fetchJSON = async url => {
var result = {};
- const response = await
fetch(`https://whimsy.apache.org/public/${whimsyFilename}`);
+ const response = await fetch(url);
if (response.status == 200) {
const data = await response.text();
result = JSON.parse(data);
@@ -10,4 +10,4 @@ const fetchPublicData = async whimsyFilename => {
return result;
}
-export default fetchPublicData;
\ No newline at end of file
+export default fetchJSON;
\ No newline at end of file
diff --git a/content/js/components/person-projects.js
b/content/js/components/person-projects.js
index e94678d..b681829 100644
--- a/content/js/components/person-projects.js
+++ b/content/js/components/person-projects.js
@@ -1,5 +1,5 @@
-import fetchPublicData from "./whimsy-loader.js";
-const projects = await fetchPublicData('public_ldap_projects.json');
+import fetchJSON from './data-loader.js';
+const projects = await
fetchJSON('https://whimsy.apache.org/public/public_ldap_projects.json');
var projectsById = {};
{
diff --git a/content/js/components/volunteers-list.js
b/content/js/components/volunteers-list.js
index 2f43e6a..2f21860 100644
--- a/content/js/components/volunteers-list.js
+++ b/content/js/components/volunteers-list.js
@@ -1,4 +1,4 @@
-import fetchPublicData from "./whimsy-loader.js";
+import fetchJSON from "./data-loader.js";
// Component that enriches a list of volunteers where each
// entry is formatted in Markdown like
@@ -6,18 +6,20 @@ import fetchPublicData from "./whimsy-loader.js";
//
class VolunteersList extends HTMLElement {
async connectedCallback() {
- const people = await fetchPublicData('public_ldap_people.json');
+ const whimsyPeople = await
fetchJSON('https://whimsy.apache.org/public/public_ldap_people.json');
+ const localPeople = await fetchJSON('/data/people.json');
this.querySelectorAll('li').forEach(li => {
const d = this._parseEntry(li.textContent);
// set volunteer information
- const name = people.people[d.id]?.name ? people.people[d.id]?.name :
d.id;
+ const name = whimsyPeople.people[d.id]?.name ?
whimsyPeople.people[d.id]?.name : d.id;
+ const localinfo = localPeople[d.id];
li.innerHTML = `
- <a rel="nofollow" href="${d.url}">${name}</a>
+ ${localinfo?.website ? '<a rel="nofollow" href="' + localinfo.website
+ '">' + name + '</a>' : name }
(${d.id})
- ${d.roles}
- ${d.location ? '- ' + d.location : ''}
- ${d.lang ? '- languages spoken: ' + d.lang : ''}
+ ${localinfo?.region ? '- ' + localinfo.region : ''}
+ ${localinfo?.speaks ? '- languages spoken: ' + localinfo.speaks : ''}
<br/><span class='projects'><em>projects: </em><person-projects
asfid="${d.id}"></person-projects></span>
`;
})
@@ -37,10 +39,7 @@ class VolunteersList extends HTMLElement {
var i = 0;
return {
id: nullIfEmpty(fields[i++]),
- roles: nullIfEmpty(fields[i++]),
- lang: nullIfEmpty(fields[i++]),
- url: nullIfEmpty(fields[i++]),
- location: nullIfEmpty(fields[i++])
+ roles: nullIfEmpty(fields[i++])
}
}
