diff --git a/README.md b/README.md index 304387d..5f11b4a 100644 --- a/README.md +++ b/README.md @@ -27,3 +27,12 @@ Site search is powered by [PageFind](https://pagefind.app/). Before deploy, a se Email addresses are Base64 encoded to prevent casual scraping. The site was not made with reuse in mind, but it hasn't been so hard. Just rip out the content files, rewrite nav.html and footer.html and change the base URL in config.toml. + +## Tips and notes + +1. Sometimes the script won't apply. This is due to the browser cache, run it in guest or incognito or clear cache +2. Any pagefind related change/content change needs to run `yarn pagefind-dev` to load +3. run `prettier docs package.json "{app,__{tests,mocks}__}/**/*.js" --write --single-quote --trailing-comma all` before you push +4. run `yarn test` before push to the main branch to ensure proper deployment +4. If you see expert, expertise, location, it is not related to this project +5. The main folders: layouts, assets/js, contents and all the configs and yml(website building) files. diff --git a/assets/img/logos/belt.png b/assets/img/logos/belt.png new file mode 100644 index 0000000..f9f89ee Binary files /dev/null and b/assets/img/logos/belt.png differ diff --git a/assets/img/logos/bodyBackground.webp b/assets/img/logos/bodyBackground.webp new file mode 100644 index 0000000..d94b227 Binary files /dev/null and b/assets/img/logos/bodyBackground.webp differ diff --git a/assets/img/logos/copy.svg b/assets/img/logos/copy.svg new file mode 100644 index 0000000..853d1cf --- /dev/null +++ b/assets/img/logos/copy.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/assets/img/logos/open-book-grey.svg b/assets/img/logos/open-book-grey.svg index 45da98c..79803ab 100644 --- a/assets/img/logos/open-book-grey.svg +++ b/assets/img/logos/open-book-grey.svg @@ -1,187 +1,31 @@ - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Openclipart - - - Open book (grayscale) - 2011-09-07T16:46:35 - Open book icon (grayscale) - https://openclipart.org/detail/159463/open-book-grayscale-by-sibskull - - - sibskull - - - - - book - documentation - grayscale - icon - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/img/logos/personBackground.jpg b/assets/img/logos/personBackground.jpg new file mode 100644 index 0000000..16962f8 Binary files /dev/null and b/assets/img/logos/personBackground.jpg differ diff --git a/assets/img/logos/researchArea.svg b/assets/img/logos/researchArea.svg new file mode 100644 index 0000000..7a195f6 --- /dev/null +++ b/assets/img/logos/researchArea.svg @@ -0,0 +1,17 @@ + + + + + + + + + + \ No newline at end of file diff --git a/assets/img/logos/titleBackground.webp b/assets/img/logos/titleBackground.webp new file mode 100644 index 0000000..36dff72 Binary files /dev/null and b/assets/img/logos/titleBackground.webp differ diff --git a/assets/img/logos/year-icon.svg b/assets/img/logos/year-icon.svg deleted file mode 100644 index 3042cc5..0000000 --- a/assets/img/logos/year-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/assets/img/logos/year.svg b/assets/img/logos/year.svg new file mode 100644 index 0000000..0d99afd --- /dev/null +++ b/assets/img/logos/year.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/content/_index.md b/content/_index.md index 5e6b3a3..bbb610d 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,5 +1,5 @@ --- -title: Hidden Figures +title: Hidden Figures- RCSA description: A database to highlight the contributions of physicists and astronomers from marginalized backgrounds. title-tag: Hidden Figures - RCSA --- diff --git a/content/scientist/Al-Kindi.md b/content/scientist/Al-Kindi.md index 30baa25..03faeca 100644 --- a/content/scientist/Al-Kindi.md +++ b/content/scientist/Al-Kindi.md @@ -1,5 +1,5 @@ { -"title": "name", +"title": "Al-Kindi", "name": "Al-Kindi", "linktitle": "Al-Kindi", "last": "N/A", diff --git a/content/scientist/Henrietta Swan Leavitt.md b/content/scientist/Henrietta Swan Leavitt.md index 1cabd24..35a903a 100644 --- a/content/scientist/Henrietta Swan Leavitt.md +++ b/content/scientist/Henrietta Swan Leavitt.md @@ -1,5 +1,5 @@ { - "title": "name", + "title": "Henrietta Swan Leavitt", "name": "Henrietta Swan Leavitt", "linktitle": "Henrietta Swan Leavitt", "last": "Leavitt", diff --git a/content/scientist/Jocelyn Bell Burnell.md b/content/scientist/Jocelyn Bell Burnell.md index 0cc0009..a58ec55 100644 --- a/content/scientist/Jocelyn Bell Burnell.md +++ b/content/scientist/Jocelyn Bell Burnell.md @@ -1,5 +1,5 @@ { - "title": "name", + "title": "Jocelyn Bell Burnell", "name": "Jocelyn Bell Burnell", "linktitle": "Jocelyn Bell Burnell", "last": "Burnell", diff --git a/content/scientist/Katharine Burr Blodgett.md b/content/scientist/Katharine Burr Blodgett.md index d3adcc2..6fddd09 100644 --- a/content/scientist/Katharine Burr Blodgett.md +++ b/content/scientist/Katharine Burr Blodgett.md @@ -1,5 +1,5 @@ { - "title": "name", + "title": "Katharine Burr Blodgett", "name": "Katharine Burr Blodgett", "linktitle": "Katharine Burr Blodgett", "last": "Blodgett", diff --git a/content/scientist/Lene Hau.md b/content/scientist/Lene Hau.md index 14cce10..ab23829 100644 --- a/content/scientist/Lene Hau.md +++ b/content/scientist/Lene Hau.md @@ -1,5 +1,5 @@ { - "title": "name", + "title": "Lene Hau", "name": "Lene Hau", "linktitle": "Lene Hau", "last": "Hau", diff --git a/hugo.toml b/hugo.toml index f85fde8..fd929f8 100644 --- a/hugo.toml +++ b/hugo.toml @@ -1,4 +1,4 @@ -baseURL = "https://amplifycolorado.colabnews.co/" +baseURL = "http://localhost:1313/" languageCode = "en-us" title = "" enableRobotsTXT = true diff --git a/layouts/_default/about.html b/layouts/_default/about.html index cbdc6a5..d3f26cd 100644 --- a/layouts/_default/about.html +++ b/layouts/_default/about.html @@ -1,26 +1,37 @@ {{ define "main" }} -
+
-

About Us

+ +

About Us

- -
+ +

Our Mission

-

+

{{ .Params.mission }}

- -
+ +

Meet Our Team

-
- {{ range .Params.team_members }} -
- {{ if .image }} +
+ {{ range $index, $member := .Params.team_members }} + {{ $delay := printf "%.1fs" (add 0.5 (mul $index 0.1)) }} +
+ {{ if $member.image }} Photo of {{ .name }} {{ else }} @@ -43,8 +54,10 @@

Meet Our Team

{{ end }}
-

{{ .name }}

-

{{ .position }}

+

+ {{ $member.name }} +

+

{{ $member.position }}

{{ end }} @@ -52,4 +65,68 @@

{{ .name }}

+ + + + + + {{ end }} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index e0cdc17..9fcde8c 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -4,11 +4,11 @@ - {{- with .Param "title-tag" -}} - {{- . -}} + {{- if .Param "last" -}} + Hidden Figure · + {{ .Title }} {{- else -}} - {{ .Title }} · - {{ .Site.Title }} + {{ .Title }} {{- end -}} @@ -37,6 +37,26 @@ href="/css/fonts/montserrat-v25/montserrat-v25-latin-regular.woff2" crossorigin /> + {{ if .IsHome }} + + + + {{ else }} + + + {{ end }} {{ $cssTW := resources.Get "css/main.css" }} {{ $css := $cssTW | resources.PostCSS (dict "inlineImports" true) }} diff --git a/layouts/_default/home.html b/layouts/_default/home.html index 481eb0c..e419cb4 100644 --- a/layouts/_default/home.html +++ b/layouts/_default/home.html @@ -3,39 +3,54 @@ -
-

- {{ .Title }} - {{ $img := resources.Get `img/logos/hiddenfigs_logo.png` }} - {{ $imgSmall := $img.Resize "400x" }} - {{ $imgMedium := $img.Resize "1000x" }} - Hidden Figures logo -

-

+
- A Cottrell Scholars Collaborative funded by the - Research Corporation for Science Advancement + {{ .Title }} + {{ $img := resources.Get `img/logos/hiddenfigs_logo.png` }} + {{ $imgSmall := $img.Resize "400x" }} + {{ $imgMedium := $img.Resize "1000x" }} + Hidden Figures logo +

+

-

-
- {{ .Content }} + A Cottrell Scholars Collaborative funded by the + Research Corporation for Science Advancement + +
+ {{ .Content }} +
+ + -
@@ -101,42 +116,47 @@

-
- {{ partial "search.html" . }} -
+
+
+ {{ partial "search.html" . }} +
- - {{ $secHedClass := `text-2xl font-sans font-bold leading-tight mb-2` }} -
-
-

- Meet our Scientists -

- {{ $scientists := .GetPage "scientist" }} - {{ $people := $scientists.RegularPages }} -
    - {{ range $people }} -
  • - {{ partial "person-box.html" . }} -
    • - {{ end }} -
-
-

- -

+ + {{ $secHedClass := `text-2xl font-sans font-bold leading-tight mb-2` }} +
+
+

+ Meet our Scientists +

+ {{ $scientists := .GetPage "scientist" }} + {{ $people := $scientists.RegularPages }} +
    + {{ range $people }} +
  • + {{ partial "person-box.html" . }} +
    • + {{ end }} +
+
+

+ +

+
-
+
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 1822aea..8c5ba5d 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,5 +1,8 @@ {{ define "main" }} -
+

> » {{ end }} - {{ .Title }} + {{ .Title }}

- + {{ if not (or (eq .Params.linktitle "Research Areas") (eq .Params.linktitle "Relevant Courses")) }} - + {{ else }}
+ + + + + + {{ end }} diff --git a/layouts/_default/person.html b/layouts/_default/person.html index 9e5ea29..4f2fc8e 100644 --- a/layouts/_default/person.html +++ b/layouts/_default/person.html @@ -1,25 +1,34 @@ {{ define "main" }} -
+
-

- {{ .Params.name }} -

- {{ with .Param "organization" }} -

- {{ . }} -

- {{ end }} - +
+

+ {{ .Params.name }} +

+ {{ with .Param "organization" }} +

+ {{ . }} +

+ {{ end }} +
-
+
-

+

@@ -29,7 +38,7 @@

-

+

@@ -39,19 +48,17 @@

-

+

- Year of Ph.D. or highest degree: {{ .Params.year_of_phd }} + {{ .Params.year_of_phd }}

-

+

@@ -66,7 +73,7 @@

-

+

@@ -81,7 +88,7 @@

-

+

Website @@ -94,7 +101,9 @@

>

-

+ + +

level @@ -116,7 +125,7 @@

-
+
@@ -271,11 +276,9 @@

x-transition:enter="transition ease-out duration-100 delay-100" x-transition:enter-start="transform opacity-0 scale-95" x-transition:enter-end="transform opacity-100 scale-100" - x-transition:leave="transition ease-in duration-75" - x-transition:leave-start="transform opacity-100 scale-100" - x-transition:leave-end="transform opacity-0 scale-95" x-cloak - class="mt-4" + class="mt-4 text-black" + style=" background-color: white; padding: 20px; border-radius: 8px;" >

Key Contributions

@@ -284,7 +287,7 @@

Key Contributions

{{ range $key, $value := .Params.key_contributions }} {{ $isOdd = not $isOdd }}

@@ -411,10 +414,21 @@

Citations

// Call the function to update level descriptions updateLevelDescriptions(); }); + + // initial animation remove + document.addEventListener("DOMContentLoaded", function () { + const bioSection = document.querySelector(".enter6"); + + if (bioSection) { + bioSection.addEventListener("animationend", function () { + bioSection.classList.remove("enter6"); + }); + } + }); - + + + + + {{ end }} diff --git a/layouts/_default/planet b/layouts/_default/planet new file mode 100644 index 0000000..ca00f5b --- /dev/null +++ b/layouts/_default/planet @@ -0,0 +1,153 @@ + + +
+ {{ $blkClass := `group relative block w-full p-2 text-center leading-tight duration-100 sm:w-64` }} + {{ $hedClass := `text-gray font-sans font-bold uppercase group-hover:text-white duration-100` }} + {{ $dekClass := `my-1 mx-auto max-w-xs font-serif text-g-7` }} + + + + +
+
+
Add an entry
+ or recommend someone and we will follow up +
+
+
+
+
+ + + + {{ $emailSubject := `About my Hidden Figures database entry` }} + +
+
+
Update entry.
+ Let us know if your information changed +
+
+
+
+
+ + + + {{ partial "contactus-box.html" . }} +
+ + \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 58e71da..94a7f37 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -3,6 +3,7 @@

{{ .Title }}

+ hello {{ .Content }}
diff --git a/layouts/partials/contactus-box.html b/layouts/partials/contactus-box.html new file mode 100644 index 0000000..cacf59e --- /dev/null +++ b/layouts/partials/contactus-box.html @@ -0,0 +1,136 @@ + + +
+
+
+ +
+
+

Contact Us

+
+ +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+
+
+
+ + + diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index 8736c05..8dfdf4f 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -46,6 +46,9 @@ class="self-center text-blue duration-500 hover:text-blue-darker" href="{{ .URL }}" {{ with .Post }}target="{{ . }}"{{ end }} + {{ if eq .Name "Contact Us" }} + @click="showModal = true;" + {{ end }} > {{- .Name -}} @@ -138,84 +141,6 @@
-
-
-
- -
-
-

Contact Us

-
-
-
- - -
-
- - -
-
- - -
-
- -
-
-
-
-
-
+ {{ partial "contactus-box.html" . }} diff --git a/layouts/partials/person-box.html b/layouts/partials/person-box.html index 0094536..ae66c61 100644 --- a/layouts/partials/person-box.html +++ b/layouts/partials/person-box.html @@ -1,5 +1,5 @@ {{ with .Param "images" }} @@ -50,16 +50,15 @@

{{- .Params.name -}}

{{ if $xpts := .Params.researchAreas }} -

+

- Research Areas @@ -78,11 +77,10 @@

{{ end }} {{ if $xpts := .Params.relevantCourses }} -

+

- Research Areas @@ -100,4 +98,19 @@

{{ end }} + + + + + + diff --git a/layouts/partials/search.html b/layouts/partials/search.html index 1b1c899..ea8f673 100644 --- a/layouts/partials/search.html +++ b/layouts/partials/search.html @@ -1,10 +1,10 @@ -

-