From 44d03221c3e8dc64f7b210638b610767e94961ed Mon Sep 17 00:00:00 2001 From: Jason Heppler Date: Thu, 5 Dec 2024 14:42:01 -0600 Subject: [PATCH 1/7] refactor: Include Alpine site-wide --- bom-website/assets/js/common.js | 23 ++++++++----------- .../themes/dbn/layouts/_default/baseof.html | 15 ++++-------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/bom-website/assets/js/common.js b/bom-website/assets/js/common.js index c444ebde..2e2b9910 100644 --- a/bom-website/assets/js/common.js +++ b/bom-website/assets/js/common.js @@ -6,12 +6,10 @@ document.addEventListener("DOMContentLoaded", function () { document .querySelectorAll("nav .relative ul") .forEach((ul) => ul.classList.add("hidden")); - document - .querySelectorAll(".dropdown-toggle") - .forEach((btn) => { - btn.classList.remove("dropdown-open"); - btn.querySelector("svg").classList.remove("rotate-180"); - }); + document.querySelectorAll(".dropdown-toggle").forEach((btn) => { + btn.classList.remove("dropdown-open"); + btn.querySelector("svg").classList.remove("rotate-180"); + }); if (!isOpen) { dropdown.classList.remove("hidden"); @@ -26,12 +24,11 @@ document.addEventListener("DOMContentLoaded", function () { document .querySelectorAll("nav .relative ul") .forEach((ul) => ul.classList.add("hidden")); - document - .querySelectorAll(".dropdown-toggle") - .forEach((btn) => { - btn.classList.remove("dropdown-open"); - btn.querySelector("svg").classList.remove("rotate-180"); - }); + document.querySelectorAll(".dropdown-toggle").forEach((btn) => { + btn.classList.remove("dropdown-open"); + btn.querySelector("svg").classList.remove("rotate-180"); + }); } }); -}); \ No newline at end of file +}); + diff --git a/bom-website/themes/dbn/layouts/_default/baseof.html b/bom-website/themes/dbn/layouts/_default/baseof.html index 94b5e52d..05711f12 100644 --- a/bom-website/themes/dbn/layouts/_default/baseof.html +++ b/bom-website/themes/dbn/layouts/_default/baseof.html @@ -1,23 +1,18 @@ {{- partial "head.html" . -}} - + {{ if .IsHome }} {{- partial "hero.html" . -}} {{- else }} {{- partial "header.html" . -}} {{- end }} -
+
{{- block "main" . }}{{- end }}
{{- partial "footer.html" . -}} - - - + + + From c4df66f2a4d3e3a716a32bf30e8370bf9b2ce2ee Mon Sep 17 00:00:00 2001 From: Jason Heppler Date: Thu, 5 Dec 2024 14:42:19 -0600 Subject: [PATCH 2/7] refactor: Use site-wide Alpine library --- bom-website/assets/js/database.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/bom-website/assets/js/database.js b/bom-website/assets/js/database.js index 959bae22..20859c94 100644 --- a/bom-website/assets/js/database.js +++ b/bom-website/assets/js/database.js @@ -1,11 +1,5 @@ -import Alpine from "alpinejs"; -import collapse from "@alpinejs/collapse"; - -// initialize Alpine -window.Alpine = Alpine; -Alpine.plugin(collapse); - document.addEventListener("alpine:init", () => { + const params = new URLSearchParams(window.location.search); Alpine.data("billsData", () => ({ bills: [], christenings: [], @@ -118,7 +112,6 @@ document.addEventListener("alpine:init", () => { // billType defaults to filters.selectedBillType unless one is provided by the app billType = billType || this.filters.selectedBillType; - // Bills data let response = await fetch( `https://data.chnm.org/bom/bills?start-year=${this.filters.selectedStartYear}&end-year=${this.filters.selectedEndYear}&bill-type=${billType}&count-type=${this.filters.selectedCountType}&parish=${this.filters.selectedParishes}&limit=${this.server.limit}&offset=${this.server.offset}`, @@ -373,5 +366,3 @@ document.addEventListener("alpine:init", () => { }, })); }); - -Alpine.start(); From c83853b4421ab310d2a305d1a3de660edc8f47ab Mon Sep 17 00:00:00 2001 From: Jason Heppler Date: Thu, 5 Dec 2024 14:42:29 -0600 Subject: [PATCH 3/7] build: Content updates --- bom-website/content/analysis/_index.md | 2 +- bom-website/content/context/_index.md | 35 +++++++++++++++++++++++++- bom-website/content/data.md | 8 +++++- bom-website/content/pedagogy.md | 7 +++--- bom-website/content/people.md | 4 ++- 5 files changed, 48 insertions(+), 8 deletions(-) diff --git a/bom-website/content/analysis/_index.md b/bom-website/content/analysis/_index.md index 7d2f7b06..bddfaff5 100644 --- a/bom-website/content/analysis/_index.md +++ b/bom-website/content/analysis/_index.md @@ -3,4 +3,4 @@ title: "Analysis" slug: /analysis/ --- -Analysis page. *Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.* \ No newline at end of file +The London Bills of Mortality lend themselves to both qualitative and quantitative analyses. The following team member essays analyze the bills using a variety of historical and statistical methods. diff --git a/bom-website/content/context/_index.md b/bom-website/content/context/_index.md index a7889b70..208fdceb 100644 --- a/bom-website/content/context/_index.md +++ b/bom-website/content/context/_index.md @@ -3,4 +3,37 @@ title: Context slug: /context/ --- -Context intro. *Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.* \ No newline at end of file +The London Bills of Mortality were complex documents whose format changed significantly over the hundreds of years they were produced by the Worshipful Company of Parish Clerks. These essays by project team members help explain and situate the bills in their historical context. + +### General Introduction + +- [London Bills of Mortality](https://dev.deathbynumbers.org/context/the-london-bills-of-mortality/) +- [Confusion of Calendars](https://dev.deathbynumbers.org/context/confusion-of-calendars/) +- [Why is There Bread in the Bills?](https://dev.deathbynumbers.org/context/why-bread/) + +### Space and Places + +- [Parishes and Extra-Parochial Places](https://dev.deathbynumbers.org/context/parishes-and-extra-parochial-places/) +- ["Within the Bills": EEBO and the Early Modern London Metropolis](https://dev.deathbynumbers.org/context/within-the-bills-eebo-and-the-early-modern-london-metropolis/) +- [A Parish By Any Other Name](https://dev.deathbynumbers.org/context/a-parish-by-any-other-name/) + +### Production of the Bills + +- [A Woman's Touch on the Bills of Mortality](https://dev.deathbynumbers.org/context/2024-06-10-womans-touch/) +- [The Parish Clerks' Memento Mori: Iconography of Death and Trademark in the London Bills of Mortality, 1727-1752](https://dev.deathbynumbers.org/context/parish-clerks-memento-mori/) + +### Reading the Bills + +- [God's Terrible Voice in the City: New England Connections to the London Bills of Mortality](https://dev.deathbynumbers.org/context/2022-08-29-gods-terrible-voice-in-the-city-new-england-connections-to-the-bills-of-mortality/) +- [London in Tears: Grief and Collective Mourning in the Bills of Mortality](https://dev.deathbynumbers.org/context/2022-11-07-london-in-tears-grief-and-collective-mourning-in-the-bills-of-mortality/) +- [The Facts of Mortality: the Use of the London Bills in Daniel Defoe's _A Journal of the Plague Year_](https://dev.deathbynumbers.org/context/2022-09-26-the-facts-of-mortality-the-use-of-the-london-bills-in-daniel-dafoes-a-journal-of-the-plague-year/) + +### Specific Causes of Death + +- [A Starvation Death During the Great Plague of 1665](https://dev.deathbynumbers.org/analysis/starvation/) +- [Chimneys and the Great Storm of 1703](https://dev.deathbynumbers.org/analysis/chimneys-and-the-great-storm-of-1703/) +- [Found Dead? Unknown Causes of Death in the Bills of Mortality](https://dev.deathbynumbers.org/context/2022-10-31-found-dead-unknown-causes-of-death-in-the-bills-of-mortality/) +- [Infant Mortality in the Monarchical Bills of Mortality, 1665-1669](https://dev.deathbynumbers.org/analysis/2023-10-25-infant-mortality-in-the-monarchical-bills-of-mortality-1665-1669/) +- [Of Fires Great and Small](https://dev.deathbynumbers.org/analysis/2023-03-14-fires/) +- [Old Age and Aged Deaths](https://dev.deathbynumbers.org/analysis/old-age-and-aged-deaths/) +- [Strangled himself (being distracted): Messy Data and Suicides in the Bills of Mortality](https://dev.deathbynumbers.org/context/strangled-himself-being-distracted-messy-data-and-suicides-in-the-bills-of-mortality/) diff --git a/bom-website/content/data.md b/bom-website/content/data.md index 5e3dd813..0e4629cd 100644 --- a/bom-website/content/data.md +++ b/bom-website/content/data.md @@ -3,4 +3,10 @@ title: Data slug: /data/ --- -Data page overview. \ No newline at end of file +The data for the Death by Numbers project has been manually transcribed out of photographs and digitized microfiche images of the original bills of mortality. To ensure that scholars are able to trace our transcriptions back to the original, archival sources, we have divided our transcribed bills into multiple datasets that are named and described according to the archive and call numbers where we found collections of bills. This is most apparent in the downloadable CSV files and can also be traced in the unique IDs for each transcription. For more on our project workflow, see our [methodologies essays](https://deathbynumbers.org/methodologies/). + +Data can be access through +- [our online database](https://deathbynumbers.org/database/) +- [images of the bills](https://bom.chnm.org/s/bills-of-mortality/page/welcome) +- [downloadable CSV files](https://deathbynumbers.org/downloads/) +- [our API, which is documented here](https://deathbynumbers.org/api/) diff --git a/bom-website/content/pedagogy.md b/bom-website/content/pedagogy.md index 9d6fcf06..ae5e3426 100644 --- a/bom-website/content/pedagogy.md +++ b/bom-website/content/pedagogy.md @@ -3,9 +3,8 @@ title: Pedagogy slug: /pedagogy/ --- -Pedagogy page. +The London Bills of Mortality make an excellent resource to use in a classroom environment and are appropriate for students grades 8-12, undergraduates, and graduates. You may find below a poster presentation on using the bills in the classroom and a link to the prototype of a text-based adventure game to survive the Great Plague of 1665. More pedagogical resources will be forthcoming. -## Games - -- Plague game +- [Early Modern Death in the 21st Century Classroom](https://dev.deathbynumbers.org/context/teaching-early-modern-death/) +- [Gaming the Great Plague of London](https://1665plague.rrchnm.org) diff --git a/bom-website/content/people.md b/bom-website/content/people.md index 08b759d3..7a2440e6 100644 --- a/bom-website/content/people.md +++ b/bom-website/content/people.md @@ -7,11 +7,12 @@ slug: /team/ - [Hernán Adasme](/authors/hernan-adasme/), Graduate Research Assistant, 2022-present - Donna Baker, Grants Manager, 2023-present - Jerusha French, Digital History Research Assistant, 2024-present +- Mikayla Hart, Digital History Research Assistant, 2024-present - [Jason Heppler](/authors/jason-heppler/), Senior Web Developer, 2021-present - JD Hubbard, Digital History Research Assistant, 2024-present - Kristin Jacobsen, Omeka Designer, 2024-present -- [Katie Kania](/authors/katie-kania/), Digital History Research Assistant, 2021-present - Alison Langford, Office Manager, 2022-present +- Ha Le, Digital History Research Assistant, 2024-present - Francisco Perez, Digital History Research Assistant, 2024-present - [Laszlo Taba](/authors/laszlo-taba/), Digital History Research Assistant, 2024-present - Tony Trinh, Systems Administrator, 2022-present @@ -37,6 +38,7 @@ slug: /team/ - Julia Hoffer, Grants Administrator, 2020-2022 - [Dan Howlett](/authors/dan-howlett/), Graduate Research Assistant, 2021-2022 - Jennie Jiang, RRCHNM Summer Intern, 2022 +- [Katie Kania](/authors/katie-kania/), Digital History Research Assistant, 2021-2024 - God's Will Katchoua, Systems Administrator, 2020-2022 - Paige Kuester, Graduate Student Assistant, 2018 - [Emily Meyers](/authors/emily-meyers/), Digital History Research Assistant, 2021-2023 From e485d0383b3feb30402de076dd72a405808ba191 Mon Sep 17 00:00:00 2001 From: Jason Heppler Date: Thu, 5 Dec 2024 14:42:51 -0600 Subject: [PATCH 4/7] style: Update styles to match visualization button/dropdown designs --- .../themes/dbn/layouts/_default/database.html | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/bom-website/themes/dbn/layouts/_default/database.html b/bom-website/themes/dbn/layouts/_default/database.html index 8a14ae05..84867c50 100644 --- a/bom-website/themes/dbn/layouts/_default/database.html +++ b/bom-website/themes/dbn/layouts/_default/database.html @@ -3,6 +3,16 @@

{{ .Title }}

+
+ How to use this table +
+ + + {{ partial "tables/instructions.html" }} + {{/* begin: tab switcher */}}
@@ -10,7 +20,7 @@

{{ .Title }}

  • Weekly Bills @@ -19,7 +29,7 @@

    {{ .Title }}

  • General Bills @@ -28,7 +38,7 @@

    {{ .Title }}

  • Total Deaths @@ -37,7 +47,7 @@

    {{ .Title }}

  • Christenings @@ -73,3 +83,4 @@

    {{ .Title }}

    {{ end }} + From 787e1928dfe304cc4d4f4533bb2cb41ec846badb Mon Sep 17 00:00:00 2001 From: Jason Heppler Date: Thu, 5 Dec 2024 14:43:05 -0600 Subject: [PATCH 5/7] refactor: Update Context layout --- .../themes/dbn/layouts/context/list.html | 195 +++--------------- 1 file changed, 23 insertions(+), 172 deletions(-) diff --git a/bom-website/themes/dbn/layouts/context/list.html b/bom-website/themes/dbn/layouts/context/list.html index f54a9aee..8c9be553 100644 --- a/bom-website/themes/dbn/layouts/context/list.html +++ b/bom-website/themes/dbn/layouts/context/list.html @@ -1,57 +1,38 @@ {{ define "main" }}
    -
    +

    {{ .Title }}

    -
    -
    -
    +
    + +
    +
    + {{ .Content }} +
    +
    + + +
    + +
    +

    Recent Writings

    {{ range where (.Paginator 4).Pages "Params.categories" "intersect" (slice "context") }} -
    -
    -
    -

    {{ .Title }}

    -
    -
    - by - {{ range $i, $e := .Params.author }}{{ if $i }}, {{ end }}{{ $e }}{{ end }} -
    - {{.Date.Format "2006-01-02"}} -
    -
    - - - - - {{ range .Params.categories }} - {{ . }} - {{ end }} - +
    +
    +

    {{ .Title }}

    +
    +
    + by {{ range $i, $e := .Params.author }}{{ if $i }}, {{ end }}{{ $e }}{{ end }}
    -

    - {{.Summary }} - {{ if .Truncated }} -

    - {{ end }} -

    +
    {{ .Date.Format "2006-01-02" }}
    {{ end }}
    -
    -
    -
    -
    - {{ .Content }} -
    +

    {{ .Title }} Tags

    {{ if ne (len $.Site.Taxonomies.tags) 0 }} {{ $largestFontSize := 1.3 }} @@ -92,140 +73,10 @@

    {{ .Title }} Tags

    No tags found.

    {{ end }}
    +
    - - - {{ $paginator := .Paginator }} - - - {{ $adjacent_links := 2 }} - - - {{ $max_links := (add (mul $adjacent_links 2) 1) }} - - - {{ $lower_limit := (add $adjacent_links 1) }} - - - {{ $upper_limit := (sub $paginator.TotalPages $adjacent_links) }} - -
    - - - {{ if gt $paginator.TotalPages 1 }} - -
      - - - - {{ if ne $paginator.PageNumber 1 }} -
    • - - «« - -
      • - {{ end }} - - - {{ if $paginator.HasPrev }} -
    • - - « - -
      • - {{ end }} - - - {{ range $paginator.Pagers }} - - {{ $.Scratch.Set "page_number_flag" false }} - - - - {{ if gt $paginator.TotalPages $max_links }} - - - - - {{ if le $paginator.PageNumber $lower_limit }} - - - {{ if le .PageNumber $max_links }} - {{ $.Scratch.Set "page_number_flag" true }} - {{ end }} - - - - - {{ else if ge $paginator.PageNumber $upper_limit }} - - - {{ if gt .PageNumber (sub $paginator.TotalPages $max_links) }} - {{ $.Scratch.Set "page_number_flag" true }} - {{ end }} - - - - {{ else }} - - {{ if and ( ge .PageNumber (sub $paginator.PageNumber $adjacent_links) ) ( le .PageNumber (add - $paginator.PageNumber $adjacent_links) ) }} - {{ $.Scratch.Set "page_number_flag" true }} - {{ end }} - - {{ end }} - - - - {{ else }} - - {{ $.Scratch.Set "page_number_flag" true }} - - {{ end }} - - - {{ if eq ($.Scratch.Get "page_number_flag") true }} -
    • - - {{ .PageNumber }} - -
      • - {{ end }} - - {{ end }} - - - {{ if $paginator.HasNext }} -
    • - - » - -
      • - {{ end }} - - - {{ if ne $paginator.PageNumber $paginator.TotalPages }} -
    • - - »» - -
      • - {{ end }} - -
    - {{ end }} -
    - - -
    -
    {{ end }} From 3b82092496b154d5f894e0da6501a3ac05154a34 Mon Sep 17 00:00:00 2001 From: Jason Heppler Date: Thu, 5 Dec 2024 14:43:25 -0600 Subject: [PATCH 6/7] refactor: Update UI consistency --- .../partials/tables/christenings_filter.html | 20 ++++++------------- .../layouts/partials/tables/cod_filter.html | 17 +++++----------- .../dbn/layouts/partials/tables/deaths.html | 1 - .../dbn/layouts/partials/tables/filter.html | 20 ++++++------------- .../dbn/layouts/partials/tables/general.html | 3 +-- .../dbn/layouts/partials/tables/weekly.html | 2 -- 6 files changed, 18 insertions(+), 45 deletions(-) diff --git a/bom-website/themes/dbn/layouts/partials/tables/christenings_filter.html b/bom-website/themes/dbn/layouts/partials/tables/christenings_filter.html index 7acf766e..c83af1b8 100644 --- a/bom-website/themes/dbn/layouts/partials/tables/christenings_filter.html +++ b/bom-website/themes/dbn/layouts/partials/tables/christenings_filter.html @@ -21,7 +21,7 @@

    Parishes

    -
    +