Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Steve branch #10

Merged
merged 11 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vs/ProjectSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
YueSteveYin marked this conversation as resolved.
Show resolved Hide resolved
"CurrentProjectSetting": null
}
7 changes: 7 additions & 0 deletions .vs/VSWorkspaceState.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"ExpandedNodes": [
""
],
"SelectedNode": "\\C:\\Users\\katie\\source\\repos\\hiddenfigs.github.io\\hiddenfigures_addingEnts",
"PreviewInSolutionExplorer": false
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file.
Binary file added .vs/hiddenfigures_addingEnts/v17/.wsuo
Binary file not shown.
Binary file added .vs/slnx.sqlite
Binary file not shown.
16 changes: 9 additions & 7 deletions assets/js/utils/search-people.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

export default function searchPeople() {
return {
filterType: "",
filterType: "scientist",
filterExpertise: [],
filterLocation: [],
filterResearchAreas: [],
Expand Down Expand Up @@ -76,6 +76,7 @@
this.isLoading = true;
this.resultCount = 0;
let options = {};
console.log(this.filterType)

Check warning on line 79 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check failure on line 79 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Insert `;`

Check warning on line 79 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check failure on line 79 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Insert `;`
if (this.filterType) {
options.filters = {
type: this.filterType,
Expand All @@ -93,6 +94,7 @@
options.filters.relevantCourses = this.filterRelevantCourses.map(
(f) => f.value,
);
console.log(options.filters)

Check warning on line 97 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check failure on line 97 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Insert `;`

Check warning on line 97 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check failure on line 97 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Insert `;`
}
}
if (this.hasFilters && !query) {
Expand All @@ -107,6 +109,9 @@
options,
timeout,
);
console.log(this.pagefind)

Check warning on line 112 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check failure on line 112 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Insert `;`

Check warning on line 112 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check failure on line 112 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Insert `;`
console.log(query)

Check warning on line 113 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check failure on line 113 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Insert `;`

Check warning on line 113 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check failure on line 113 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Insert `;`
console.log(options)

Check warning on line 114 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check failure on line 114 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Insert `;`

Check warning on line 114 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check failure on line 114 in assets/js/utils/search-people.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Insert `;`
if (search === null) return;
results = await Promise.all(search.results.map((r) => r.data()));
this.resultCount = search.results.length;
Expand Down Expand Up @@ -145,6 +150,8 @@
expertise: data.filters.expertise || [],
location: data.filters.location || [],
area: data.filters.area || [],
researchAreas: data.filters.researchAreas || [], // New Filter
relevantCourses: data.filters.relevantCourses || [],
image: data.meta.image,
alt: data.meta.image_alt,
srcset: data.meta.image_srcset,
Expand All @@ -153,12 +160,7 @@
}));
},

get() {
if (this.filterType === "expert") {
return this.filterExpertise.length || this.filterLocation.length;
} else if (this.filterType === "journalist") {
return this.filterArea.length || this.filterBeat.length;
}
get hasFilters() {
return (
this.filterResearchAreas.length || this.filterRelevantCourses.length
);
Expand Down
20 changes: 20 additions & 0 deletions content/scientist/j-ernest-wilkins-jr.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
YueSteveYin marked this conversation as resolved.
Show resolved Hide resolved
"name":"J. Ernest Wilkins Jr.",
"linktitle":"J Ernest Wilkins Jr",
"last":"Wilkins",
"institution_of_phd":"University of Chicago",
"field_of_phd":"Mathematics",
"year_of_phd":"1942",
"research_areas":["nuclear physics","mathematical physics"],
"relevant_courses":["thermodynamics"],
"relevant_concepts":["thermodynamics","Maxwell-Boltzmann distribution"],
"wikipedia":"https://en.wikipedia.org/wiki/J._Ernest_Wilkins_Jr",
"image":"/img/uploads/j-ernest-wilkins-jr.jpeg",
YueSteveYin marked this conversation as resolved.
Show resolved Hide resolved
"general_bio":"Born in 1923, J. Ernest Wilkins, Jr. entered the University of Chicago at age 13, and received his Ph.D. at age 19. His first job was teaching mathematics at the Tuskegee Institute (now Tuskegee University). He co-discovered the Wigner-Wilkins approach for estimating the distribution of neutron energies in nuclear reactors in 1944 (declassified in 1948) [1]. Worked with Fermi and Compton on the Manhattan Project (without knowing the ultimate goal of the work until after the atomic bomb was dropped) in the early 1940s. Distinguished Professor of Applied Mathematical Physics at Howard University in 1970. He was the second African American to be elected to the National Academy of Engineers in 1976. He published more than 100 papers on differential geometry, linear differential equations, integrals, nuclear engineering, gamma radiation shielding, and optics. He passed away at age 87 in 2011.",
"key_contributions":
{
"Wigner-Wilkins approach": "In a nuclear reactor, energy is released when uranium atoms fission, or split, after being hit by a neutron. Each fission also releases additional neutrons, which bounce around within the reactor at a variety of energies. Wigner and Wilkins' work on determining the energy distribution of such neutrons [1] is a foundation of nuclear physics, still cited by researchers today. Those neutrons go on to initiate more fissions, producing a chain reaction, so understanding their energies is crucial for designing reactors."
},
"citations":["https://doi.org/10.1007/978-3-642-77425-6_33"],
"layout":"person"
}
20 changes: 20 additions & 0 deletions content/scientist/mary-chilton-noyes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "Mary Chilton Noyes",
"linktitle": "Mary Chilton Noyes",
"last": "Noyes",
"institution_of_phd": "Case Western Reserve University (Ph.D.)",
"field_of_phd": "Physics",
"year_of_phd": "1895",
"research_areas": ["Materials"],
"relevant_courses": ["Material Science"],
"relevant_concepts": ["Young’s Modulus"],
"wikipedia": "https://en.wikipedia.org/wiki/Mary_Chilton_Noyes",
"image": "/img/uploads/mary-chilton-noyes.jpg",
YueSteveYin marked this conversation as resolved.
Show resolved Hide resolved
"general_bio": "Dr. Mary Chilton Noyes was one of the first women to receive a Ph.D. in the United States. She received her Ph.D. from Western Reserve University, which is now known as Case Western Reserve University, in 1895. Noyes was born on January 13th, 1855. Prior to her PhD, she received a bachelor's of philosophy in 1881, master's of arts from Iowa in 1884, and a master's of science from Cornell in 1894. Western Reserve has constructed a brand new physics research building without the use of Fe so it would not interfere with delicate B-field measurements. This new building is probably why Noyes pursued a PhD at Western Reserve because her own research required this building and at the time her 1-year PhD aligned with Western Reserve’s requirements. Noyes' PhD work, 'The Influence of Heat and the Electric Current Upon Young’s Modulus for a Piano Wire', was published in the fourth issue of Physical Review. She continued her career as a teacher of mathematics at Lake Erie College, followed by becoming an instructor of mathematics, physics, and astronomy at Indianapolis Academy.",
"key_contributions":
{
"Elasticity of a Piano Wire": "Recorded the elasticity of a piano wire, expanding the temperature range to 200 degrees celsius. Prior work on the elasticity of piano wire only recorded work up to 100 degrees celsius. Noyes concluded that elasticity decreased linearly as temperature increased. Additionally, there was no maximum of elasticity at 100 degrees celsius."
},
"citations": ["https://doi.org/10.1103/PhysRevSeriesI.2.277"],
"layout": "person"
}
26 changes: 26 additions & 0 deletions content/scientist/robert-a-ellis-jr.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"name": "Robert A. Ellis Jr.",
"linktitle": "Robert A. Ellis Jr.",
"last": "Ellis",
"institution_of_phd": "University of Iowa",
"field_of_phd": "Physics",
"year_of_phd": "1954",
"research_areas": ["plasma physics", "nuclear fusion", "cosmic rays"],
"relevant_courses": ["electricity and magnetism", "modern physics"],
"relevant_concepts": ["plasma confinement", "nuclear physics"],
"wikipedia": "https://en.wikipedia.org/wiki/Robert_Ellis_(physicist)",
"image": "/img/uploads/robert-a-ellis-jr.jpg",
YueSteveYin marked this conversation as resolved.
Show resolved Hide resolved
"general_bio": "Robert A. Ellis Jr. was born in Kansas City, Missouri in 1927. Ellis earned his bachelor's degree from Fisk University and his master's from Yale University. Ellis became an instructor at the Tennessee Agricultural & Industrial State College, at the time an all-Black institution (now Tennessee State University); Ellis later was promoted to full professor there. On leave from that position, he completed PhD work at the University of Iowa, where he was James Van Allen’s first PhD student. He designed payloads for balloon-launched rockets to study cosmic rays in the upper atmosphere. From the obituary in Physics Today, 'Van Allen' urged him to seek a position at a research university. But Bob’s commitment to black. In 1956, Ellis joined Project Matterhorn (later became the Princeton Plasma Physics Laboratory) to work in a group led by Lyman Spitzer Jr., who invented the stellarator. Remained at PPPL until his death in 1989. He committed to furthering international cooperation and collaboration in science, in various positions (including spending 6 months at the Institute of Nuclear Physics in Novosibirsk, USSR in 1969; 2 years as head of the physics section of the IAEA).",
"key_contributions":
{
"Stellarators and Tokamaks" : "Tokamaks and Stellarators are both machines used for energy fusion. Energy fusion could offer a solution to the energy crisis because it would offer an alternative energy source with an abundance of fuel and no greenhouse gasses or radioactive waste would be produced. Tokamaks and Stellarators are both fusion reactors that hold plasmas in magnetic fields that heat up to an extremely high temperature that is necessary for hydrogen nuclei to fuse together. Tokamaks are more common to encounter due to their ability to hold in plasma and maintain temperature easier than the Stellarators. Additionally, Tokamaks’ donut shape, opposed to the Stellarator’s more twisted ring shape, makes it easier to build and design. However, Stellarators do not have magnetic disruptions that Tokamaks have. Ellis worked on both Stellarators and Tokamaks."
}
,
"citations": [
"https://pubs.aip.org/physicstoday/article/44/3/86/406525/Robert-A-Ellis-Jr",
"https://www.science.org/content/article/bizarre-reactor-might-save-nuclear-fusion",
"https://www.economist.com/science-and-technology/2015/10/24/stellar-work",
"https://www.energy.gov/science/doe-explainsfusion-energy-science"
],
"layout": "person"
}
4 changes: 2 additions & 2 deletions hugo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ googleAnalytics = 'G-0N3FRVSW3G'
buildFuture = true

[params]
favicon = "/img/logos/amplify-placeholder.png"
touch-icon = "/img/logos/colab-square.png"
favicon = "/img/logos/hiddenfigs_logo.png"
touch-icon = "/img/logos/hiddenfigs_logo.png"
donate-link = "https://colab.fundjournalism.org/amplifycolorado/"
nominate-link = "http://bit.ly/AmplifyColorado"
[taxonomies]
Expand Down
2 changes: 1 addition & 1 deletion layouts/_default/baseof.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<body
data-ga-label="{{ $pageCat }}:featured"
data-ga-category="featured"
class="bg-blue font-serif text-base leading-normal text-g-9"
class="bg-gray font-serif text-base leading-normal text-g-9"
>
<div
class="max-w-screen flex min-h-screen flex-col overflow-x-hidden bg-white"
Expand Down
4 changes: 2 additions & 2 deletions layouts/_default/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ <h1>
<section
class="flex flex-col justify-around space-y-4 bg-g-4 p-8 shadow-inner sm:flex-row sm:space-x-4 sm:space-y-0"
>
{{ $blkClass := `group relative block w-full border-8 border-blue bg-white p-2 text-center leading-tight shadow-md duration-100 hover:border-blue-darker sm:w-64` }}
{{ $svgWrapperClass := `text-gray group-hover:text-green` }}
{{ $blkClass := `group relative block w-full border-8 border-gray bg-white p-2 text-center leading-tight shadow-md duration-100 hover:border-black sm:w-64` }}
{{ $svgWrapperClass := `text-blue group-hover:text-blue-darker` }}
{{ $hedClass := `text-blue font-sans font-bold uppercase group-hover:text-blue-darker duration-100` }}
{{ $dekClass := `my-1 mx-auto max-w-xs font-serif text-g-7` }}
<a
Expand Down
6 changes: 3 additions & 3 deletions layouts/_default/person.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,17 @@ <h1 class="break-word font-bold leading-tight">
</p>
</div>
<!-- content button switch -->
<div class="mt-4 flex flex-row justify-around bg-blue p-2">
<div class="mt-4 flex flex-row justify-around bg-black p-2">
<button
:class="isBio ? 'bg-white text-black' : 'bg-blue text-white'"
:class="isBio ? 'bg-white text-black' : 'bg-gray text-white'"
class="mx-4 flex-1 transform rounded-lg px-4 py-2
transition-transform duration-200 ease-in-out hover:scale-105 hover:shadow-lg focus:outline-none"
@click="isBio = true"
>
Bio
</button>
<button
:class="!isBio ? 'bg-white text-black' : 'bg-blue text-white'"
:class="!isBio ? 'bg-white text-black' : 'bg-gray text-white'"
class="mx-4 flex-1 transform rounded-lg px-4 py-2
transition-transform duration-200 ease-in-out hover:scale-105 hover:shadow-lg focus:outline-none"
@click="isBio = false"
Expand Down
6 changes: 3 additions & 3 deletions layouts/partials/combobox.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<template x-for="selectedOpt in selected" :key="selectedOpt.id">
<button
@click.prevent="remove(selectedOpt)"
class="inline-flex items-center gap-1 rounded bg-blue p-1 px-2 text-xs text-white hover:bg-gray"
class="inline-flex items-center gap-1 rounded bg-gray p-1 px-2 text-xs text-white hover:bg-gray"
>
<span x-text="selectedOpt.name"></span>
<svg class="h-3 w-3 fill-current">
Expand Down Expand Up @@ -62,15 +62,15 @@
:value="opt"
:disabled="opt.disabled"
:class="{
'bg-blue/75 text-white': $comboboxOption.isActive,
'bg-gray/75 text-white': $comboboxOption.isActive,
'text-g-7': ! $comboboxOption.isActive,
'opacity-50 cursor-not-allowed': $comboboxOption.isDisabled,
}"
class="flex w-full cursor-default items-center justify-between gap-2 px-4 py-2 text-sm"
>
<span
hidden
class="cursor-not-allowed bg-blue/75 text-g-7 text-white opacity-50"
class="cursor-not-allowed bg-gray/75 text-g-7 text-white opacity-50"
></span>
<span x-text="opt.name"></span>

Expand Down
Binary file modified static/favicon.ico
Binary file not shown.
Loading