From 5a4b19fd39183e1a162a1e32b9ddea98c8f033ff Mon Sep 17 00:00:00 2001 From: Julia Kent <46687291+jukent@users.noreply.github.com> Date: Tue, 19 Dec 2023 14:52:16 -0700 Subject: [PATCH 01/13] Update cookbook_gallery.txt (#186) --- site/cookbook_gallery.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/site/cookbook_gallery.txt b/site/cookbook_gallery.txt index e701407..23b6bb6 100644 --- a/site/cookbook_gallery.txt +++ b/site/cookbook_gallery.txt @@ -14,3 +14,4 @@ gridding-cookbook vapor-python-cookbook advanced-viz-cookbook unstructured-grid-viz-cookbook +na-cordex-viz-cookbook From 1298724890d782576a535057565bb67f680bab25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 10:16:51 -0700 Subject: [PATCH 02/13] Bump peter-evans/create-pull-request from 5 to 6 (#190) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 5 to 6. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v5...v6) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/update-cookbook-gallery.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-cookbook-gallery.yaml b/.github/workflows/update-cookbook-gallery.yaml index 1e12e67..e66f73f 100644 --- a/.github/workflows/update-cookbook-gallery.yaml +++ b/.github/workflows/update-cookbook-gallery.yaml @@ -118,7 +118,7 @@ jobs: - name: Create pull request id: cpr - uses: peter-evans/create-pull-request@v5 + uses: peter-evans/create-pull-request@v6 with: commit-message: 'Update cookbook gallery' committer: GitHub From d31ebdb1ea4fe7ebd0345e470ddb2ab597faf9b8 Mon Sep 17 00:00:00 2001 From: Orhan Eroglu <32553057+erogluorhan@users.noreply.github.com> Date: Fri, 29 Mar 2024 13:34:10 -0600 Subject: [PATCH 03/13] Start using the updated theme (#194) * Update several files to use the newer versioned theme * Use updated NSF NCAR logo * Update environment file * Switch from sphinx-panels to sphinx-design * Update environment.yml * Update environment.yml * Update nightly-build.yaml * Update publish-site.yaml --- .github/workflows/nightly-build.yaml | 2 +- .github/workflows/publish-site.yaml | 2 +- environment.yml | 9 +- site/_extensions/gallery_generator.py | 147 +++++++++--------- site/_static/custom.css | 26 ++++ .../images/logos/NCAR-contemp-logo-blue.svg | 1 - .../NSF-NCAR_Lockup-UCAR-Dark_102523.svg | 1 + site/conf.py | 25 +-- 8 files changed, 121 insertions(+), 92 deletions(-) delete mode 100644 site/_static/images/logos/NCAR-contemp-logo-blue.svg create mode 100644 site/_static/images/logos/NSF-NCAR_Lockup-UCAR-Dark_102523.svg diff --git a/.github/workflows/nightly-build.yaml b/.github/workflows/nightly-build.yaml index 008a692..1531944 100644 --- a/.github/workflows/nightly-build.yaml +++ b/.github/workflows/nightly-build.yaml @@ -19,4 +19,4 @@ jobs: if: ${{ github.repository_owner == 'ProjectPythia' }} uses: ProjectPythia/projectpythia.github.io/.github/workflows/sphinx-link-checker.yaml@main with: - path_to_source: 'site' \ No newline at end of file + path_to_source: 'site' diff --git a/.github/workflows/publish-site.yaml b/.github/workflows/publish-site.yaml index 76947b3..1283327 100644 --- a/.github/workflows/publish-site.yaml +++ b/.github/workflows/publish-site.yaml @@ -20,4 +20,4 @@ jobs: needs: build uses: ProjectPythia/cookbook-actions/.github/workflows/deploy-book.yaml@main with: - publish_dir: 'site/_build/html' \ No newline at end of file + publish_dir: 'site/_build/html' diff --git a/environment.yml b/environment.yml index c8d466a..b052e37 100644 --- a/environment.yml +++ b/environment.yml @@ -3,13 +3,10 @@ channels: - conda-forge - nodefaults dependencies: +- cffconvert - matplotlib - myst-nb - pandas -- pip -- pyyaml - pre-commit -- sphinx-panels -- cffconvert -- pip: - - sphinx-pythia-theme +- pyyaml +- sphinx-pythia-theme diff --git a/site/_extensions/gallery_generator.py b/site/_extensions/gallery_generator.py index cbb7c31..f088fd7 100644 --- a/site/_extensions/gallery_generator.py +++ b/site/_extensions/gallery_generator.py @@ -1,5 +1,4 @@ import itertools, json, yaml, pathlib, subprocess, requests -from textwrap import dedent from truncatehtml import truncate @@ -61,7 +60,7 @@ def generate_repo_dicts(all_items): cookbook_title = citation_dict["title"] description = citation_dict["description"] creators = citation_dict["creators"] - names = [item.get("name") for item in creators] + names = [creator.get("name") for creator in creators] authors = ", ".join(names) gallery_info_url = f"https://raw.githubusercontent.com/ProjectPythia/{repo}/main/_gallery_info.yml" @@ -132,16 +131,16 @@ def _generate_tag_menu(repo_dicts, tag_key): ) return f""" -
- - -
    -{options} -
-
-""" +
+ + +
    + {options} +
+
+ """ def generate_menu(repo_dicts, submit_btn_txt=None, submit_btn_link=None): @@ -174,7 +173,7 @@ def build_from_repos( ): # Build the gallery file - panels_body = [] + grid_body = [] for repo_dict in repo_dicts: repo = repo_dict["repo"] github_url = repo_dict["github_url"] @@ -199,7 +198,8 @@ def build_from_repos( for tag in tag_list_f ] tags = "\n".join(tags) - tag_class_str = " ".join(tag_list_f) + + # tag_class_str = " ".join(tag_list_f) description = repo_dict["description"] ellipsis_str = ' ... more' @@ -207,70 +207,71 @@ def build_from_repos( if ellipsis_str in short_description: modal_str = f""" -
-
- -

{cookbook_title}

-{authors_str} -

{description}

-

{tags}

-

Visit Website

-
-
-""" +
+
+ +

{cookbook_title}

+ {authors_str} +

{description}

+

{tags}

+

Visit Website

+
+
+ """ + modal_str = '\n'.join([m.lstrip() for m in modal_str.split('\n')]) else: modal_str = "" - - panels_body.append( - f"""\ ---- -:column: + tagged-card {tag_class_str} - -
- -
-

{cookbook_title}

 -

{authors_str}

-
-

{short_description}

-
-
-{modal_str} - -+++ -
-{tags} -
{status_badges}
-
- -""" - ) - - panels_body = "\n".join(panels_body) + new_card = f"""\ + :::{{grid-item-card}} + :shadow: md + :class-footer: card-footer +
+ +
+

{cookbook_title}

 +

{authors_str}

+

{short_description}

+
+
+ {modal_str} + + +++ + +
+ {tags} +
{status_badges}
+
+ + ::: + + """ + + grid_body.append('\n'.join([m.lstrip() for m in new_card.split('\n')])) + + + grid_body = "\n".join(grid_body) stitle = f"#### {subtitle}" if subtitle else "" stext = subtext if subtext else "" - panels = f""" -# {title} - -{stitle} -{stext} - -{menu_html} - -````{{panels}} -:column: col-12 -:card: +mb-4 w-100 -:header: d-none -:body: p-3 m-0 -:footer: p-1 - -{dedent(panels_body)} -```` + grid = f""" + # {title} + {'=' * len(title)} + + {stitle} + {stext} + + {menu_html} + + ::::{{grid}} 1 + :gutter: 4 + + {grid_body} + +
+ + """ -
- -""" + grid = '\n'.join([m.lstrip() for m in grid.split('\n')]) - pathlib.Path(f"{filename}.md").write_text(panels) + pathlib.Path(f"{filename}.md").write_text(grid) diff --git a/site/_static/custom.css b/site/_static/custom.css index 7804720..97d45a9 100644 --- a/site/_static/custom.css +++ b/site/_static/custom.css @@ -1,3 +1,19 @@ +:root { + --pst-color-border: rgba(0, 0, 0, 0.125) !important; +} + +.bd-main .bd-content .bd-article-container { + max-width: 100%; /* default is 60em */ +} +.bd-page-width { + max-width: 100%; /* default is 88rem */ +} + +.sd-card-footer { + background: rgba(var(--spt-color-gray-100), 1) !important; + padding: 4px; +} + main.banner-main #project-pythia { padding-top: 1rem; padding-bottom: 1rem; @@ -74,12 +90,22 @@ main.banner-main #project-pythia { margin: auto 0; padding: 0; max-width: 160px; + background: transparent !important; } .card-subtitle { font-size: 0.8rem; } + .my-2 { + color: inherit; + } + + .text-decoration-none { + text-decoration: none; + color: inherit; + } + @media (max-width: 576px) { .modal { padding: 2rem; diff --git a/site/_static/images/logos/NCAR-contemp-logo-blue.svg b/site/_static/images/logos/NCAR-contemp-logo-blue.svg deleted file mode 100644 index 3bcda63..0000000 --- a/site/_static/images/logos/NCAR-contemp-logo-blue.svg +++ /dev/null @@ -1 +0,0 @@ -NCAR-contemp-logo-blue.a diff --git a/site/_static/images/logos/NSF-NCAR_Lockup-UCAR-Dark_102523.svg b/site/_static/images/logos/NSF-NCAR_Lockup-UCAR-Dark_102523.svg new file mode 100644 index 0000000..4eb4ded --- /dev/null +++ b/site/_static/images/logos/NSF-NCAR_Lockup-UCAR-Dark_102523.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/site/conf.py b/site/conf.py index 668033d..f601cc2 100644 --- a/site/conf.py +++ b/site/conf.py @@ -24,7 +24,7 @@ project = "Project Pythia Cookbooks" author = 'the Project Pythia Community' -copyright = "2022" +copyright = "2024" # -- General configuration --------------------------------------------------- @@ -33,7 +33,7 @@ # ones. extensions = [ "myst_nb", - "sphinx_panels", + "sphinx_design", "cookbook_gallery_generator", ] @@ -84,7 +84,9 @@ # HTML Theme-specific Options html_theme_options = { - "google_analytics_id": "G-T52X8HNYE8", + 'analytics': { + 'google_analytics_id': 'G-T52X8HNYE8', + }, "github_url": "https://github.com/ProjectPythia", "twitter_url": "https://twitter.com/project_pythia", "icon_links": [ @@ -95,7 +97,11 @@ "type": "fontawesome", } ], - "logo_link": "https://projectpythia.org", + 'logo': { + 'link': 'https://projectpythia.org', + }, + 'navbar_align': 'left', + 'navbar_start': ['navbar-logo'], "navbar_links": [ {"name": "Home", "url": "https://projectpythia.org"}, {"name": "Foundations", "url": "https://foundations.projectpythia.org"}, @@ -104,24 +110,23 @@ {"name": "Community", "url": "https://projectpythia.org/#join-us"}, {"name": "Blog", "url": "https://projectpythia.org/blog.html"}, ], + 'navbar_end': ['navbar-icon-links'], "page_layouts": { "index": "page-standalone.html", }, + 'secondary_sidebar_items': [], "footer_logos": { - "NCAR": "_static/images/logos/NCAR-contemp-logo-blue.svg", + "NCAR": "_static/images/logos/NSF-NCAR_Lockup-UCAR-Dark_102523.svg", "Unidata": "_static/images/logos/Unidata_logo_horizontal_1200x300.svg", "UAlbany": "_static/images/logos/UAlbany-A2-logo-purple-gold.svg", }, - "extra_navbar": ('Theme by Project Pythia'), + 'footer_start': ['footer-logos', 'footer-menu', 'footer-info', 'footer-extra'], } -# Panels config -panels_add_bootstrap_css = False - # MyST config myst_enable_extensions = ["amsmath", "colon_fence", "deflist", "html_image"] myst_url_schemes = ["http", "https", "mailto"] -jupyter_execute_notebooks = "off" +nb_execution_mode = 'off' myst_heading_anchors = 3 # Don't run the link checker on immutable DOI links From 6c214efe45b64954dc79c2eb11f1fcd5fd2e28c1 Mon Sep 17 00:00:00 2001 From: Julia Kent <46687291+jukent@users.noreply.github.com> Date: Fri, 29 Mar 2024 13:50:09 -0600 Subject: [PATCH 04/13] Update footer-menu.html (#193) --- site/_templates/footer-menu.html | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_templates/footer-menu.html b/site/_templates/footer-menu.html index f10872f..d06c8da 100644 --- a/site/_templates/footer-menu.html +++ b/site/_templates/footer-menu.html @@ -9,6 +9,7 @@

{{ _("About") }}

  • {{ _("How to use Pythia Foundations") }}
  • {{ _("The Project Team") }}
  • {{ _("How to Cite") }}
    • +
  • {{ _("Metrics") }}
    • From 4ce228de4f617d0c11c72c77551f6b2e09136ad1 Mon Sep 17 00:00:00 2001 From: Brian Rose Date: Fri, 24 May 2024 15:02:41 -0400 Subject: [PATCH 05/13] Change button to point to guide (#203) --- site/_extensions/cookbook_gallery_generator.py | 4 ++-- site/cookbook_gallery_subtext.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site/_extensions/cookbook_gallery_generator.py b/site/_extensions/cookbook_gallery_generator.py index 221fcee..6b56e92 100644 --- a/site/_extensions/cookbook_gallery_generator.py +++ b/site/_extensions/cookbook_gallery_generator.py @@ -15,8 +15,8 @@ def main(app): for line in fid: subtext = subtext + line - submit_btn_link = "https://github.com/ProjectPythia/cookbook-gallery/issues/new?assignees=ProjectPythia%2Feducation&labels=content%2Ccookbook-gallery-submission&template=update-cookbook-gallery.yaml&title=Update+Gallery+with+new+Cookbook" - submit_btn_txt = "Submit a new Cookbook" + submit_btn_link = "https://projectpythia.org/cookbook-guide.html" + submit_btn_txt = "How can I create a new Cookbook?" menu_html = generate_menu( repo_dicts, submit_btn_txt=submit_btn_txt, submit_btn_link=submit_btn_link ) diff --git a/site/cookbook_gallery_subtext.md b/site/cookbook_gallery_subtext.md index 4d62c7a..f43137f 100644 --- a/site/cookbook_gallery_subtext.md +++ b/site/cookbook_gallery_subtext.md @@ -2,4 +2,4 @@ Pythia Cookbooks provide example workflows on more advanced and domain-specific Cookbooks are created from Jupyter Notebooks that we strive to binderize so each Cookbook can be [executed in the cloud with a single click from your browser](https://foundations.projectpythia.org/preamble/how-to-use.html#interacting-with-jupyter-notebooks-in-the-cloud-via-binder), but in some instances executing a Cookbook will require [running the notebooks locally](https://foundations.projectpythia.org/preamble/how-to-use.html#interacting-with-jupyter-books-locally). -Interested in contributing a new Cookbook or contributing to an existing Cookbook? Great! Please see the [Project Pythia Cookbook Contributor's Guide](https://github.com/ProjectPythia/.github/blob/main/.github/CONTRIBUTING.md), and consider opening a discussion under the [Project Pythia category of the Pangeo Discourse](https://discourse.pangeo.io/c/education/project-pythia/60). +Interested in contributing a new Cookbook or contributing to an existing Cookbook? Great! Please see the [Project Pythia Cookbook Contributor's Guide](https://projectpythia.org/cookbook-guide.html), and consider opening a discussion under the [Project Pythia category of the Pangeo Discourse](https://discourse.pangeo.io/c/education/project-pythia/60). From 9214820e3e1f2fecd3741facd0c09aa6328cc0d5 Mon Sep 17 00:00:00 2001 From: Brian Rose Date: Tue, 4 Jun 2024 07:58:37 -0400 Subject: [PATCH 06/13] Remove unsightly ========= (#205) --- site/_extensions/gallery_generator.py | 1 - 1 file changed, 1 deletion(-) diff --git a/site/_extensions/gallery_generator.py b/site/_extensions/gallery_generator.py index f088fd7..039a009 100644 --- a/site/_extensions/gallery_generator.py +++ b/site/_extensions/gallery_generator.py @@ -256,7 +256,6 @@ def build_from_repos( grid = f""" # {title} - {'=' * len(title)} {stitle} {stext} From 94aba6aff020d07ac4ff563c5aa5324981f2624e Mon Sep 17 00:00:00 2001 From: Brian Rose Date: Tue, 4 Jun 2024 07:59:21 -0400 Subject: [PATCH 07/13] Move new card creation outside of else block (#204) --- site/_extensions/gallery_generator.py | 49 ++++++++++++++------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/site/_extensions/gallery_generator.py b/site/_extensions/gallery_generator.py index 039a009..fab9e59 100644 --- a/site/_extensions/gallery_generator.py +++ b/site/_extensions/gallery_generator.py @@ -221,30 +221,31 @@ def build_from_repos( modal_str = '\n'.join([m.lstrip() for m in modal_str.split('\n')]) else: modal_str = "" - new_card = f"""\ - :::{{grid-item-card}} - :shadow: md - :class-footer: card-footer -
    - -
    -

    {cookbook_title}

     -

    {authors_str}

    -

    {short_description}

    -
    -
    - {modal_str} - - +++ - -
    - {tags} -
    {status_badges}
    -
    - - ::: - - """ + + new_card = f"""\ + :::{{grid-item-card}} + :shadow: md + :class-footer: card-footer +
    + +
    +

    {cookbook_title}

     +

    {authors_str}

    +

    {short_description}

    +
    +
    + {modal_str} + + +++ + +
    + {tags} +
    {status_badges}
    +
    + + ::: + + """ grid_body.append('\n'.join([m.lstrip() for m in new_card.split('\n')])) From fec19d96d8c6bc5e432e00e6275fa1e98063c26a Mon Sep 17 00:00:00 2001 From: Brian Rose Date: Thu, 6 Jun 2024 14:29:33 -0400 Subject: [PATCH 08/13] Reverse name order when building author list (#206) * Reverse name order when building author list * Oops put the previous fix back in --- site/_extensions/gallery_generator.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/site/_extensions/gallery_generator.py b/site/_extensions/gallery_generator.py index fab9e59..71701c7 100644 --- a/site/_extensions/gallery_generator.py +++ b/site/_extensions/gallery_generator.py @@ -43,6 +43,12 @@ def _run_cffconvert(command): error_message = stderr.decode("utf-8").strip() raise RuntimeError(f"cffconvert command failed: {error_message}") +def _make_standard_name(name): + '''Take string input like LASTNAME, FIRSTNAME and return FIRSTNAME LASTNAME without comma''' + lastfirst = name.split(', ') + firstlast = lastfirst[::-1] + standard = ' '.join(firstlast) + return standard def generate_repo_dicts(all_items): @@ -60,7 +66,7 @@ def generate_repo_dicts(all_items): cookbook_title = citation_dict["title"] description = citation_dict["description"] creators = citation_dict["creators"] - names = [creator.get("name") for creator in creators] + names = [_make_standard_name(creator.get("name")) for creator in creators] authors = ", ".join(names) gallery_info_url = f"https://raw.githubusercontent.com/ProjectPythia/{repo}/main/_gallery_info.yml" From b872d3bfbcced72abdc84050e4d8508825ec19b4 Mon Sep 17 00:00:00 2001 From: Julia Kent <46687291+jukent@users.noreply.github.com> Date: Fri, 7 Jun 2024 08:26:33 -0600 Subject: [PATCH 09/13] Fix dropdown gallery filtering (#208) * drop down menu without bullets * css and remove === * make subtext black * mess with javascript * jv edits * filtering working! * fix card margins, tag titling, and clear all filters * add all cookbooks back * fix merge conflicts * undo subtext changes --- .../_extensions/cookbook_gallery_generator.py | 4 +- site/_extensions/gallery_generator.py | 104 ++++----- site/_static/custom.css | 46 ++++ site/_static/custom.js | 211 +++++------------- site/conf.py | 2 +- site/cookbook_gallery.txt | 2 +- site/cookbook_gallery_subtext.md | 2 +- 7 files changed, 162 insertions(+), 209 deletions(-) diff --git a/site/_extensions/cookbook_gallery_generator.py b/site/_extensions/cookbook_gallery_generator.py index 6b56e92..9f36b0f 100644 --- a/site/_extensions/cookbook_gallery_generator.py +++ b/site/_extensions/cookbook_gallery_generator.py @@ -1,6 +1,5 @@ from gallery_generator import build_from_repos, generate_menu, generate_repo_dicts - def main(app): with open("cookbook_gallery.txt") as fid: @@ -25,6 +24,5 @@ def main(app): repo_dicts, "index", title=title, subtext=subtext, menu_html=menu_html ) - def setup(app): - app.connect("builder-inited", main) + app.connect("builder-inited", main) \ No newline at end of file diff --git a/site/_extensions/gallery_generator.py b/site/_extensions/gallery_generator.py index 71701c7..00eb212 100644 --- a/site/_extensions/gallery_generator.py +++ b/site/_extensions/gallery_generator.py @@ -1,5 +1,6 @@ import itertools, json, yaml, pathlib, subprocess, requests from truncatehtml import truncate +import re def _grab_binder_link(repo): @@ -113,14 +114,18 @@ def _generate_sorted_tag_keys(repo_dicts): return sorted(key_set) +def _title_case_preserve(s): + return re.sub(r'\b(\w)', lambda m: m.group(1).upper(), s) + def _generate_tag_set(repo_dicts, tag_key=None): tag_set = set() for repo_dict in repo_dicts: for k, e in repo_dict["tags"].items(): + tags = [_title_case_preserve(t) for t in e] if tag_key and k != tag_key: continue - for t in e: + for t in tags: tag_set.add(t) return tag_set @@ -132,20 +137,18 @@ def _generate_tag_menu(repo_dicts, tag_key): tag_list = sorted(tag_set) options = "".join( - f'
    • ' + f'
    • ' for tag in tag_list ) return f""" -
    - - -
      - {options} -
    -
    + :::{{dropdown}} {tag_key} +
    +
      + {options} +
    +
    + ::: """ @@ -200,12 +203,11 @@ def build_from_repos( tag_list = sorted((itertools.chain(*tag_dict.values()))) tag_list_f = [tag.replace(" ", "-") for tag in tag_list] tags = [ - f'{tag}' + f'{_title_case_preserve(tag)}' for tag in tag_list_f ] tags = "\n".join(tags) - - # tag_class_str = " ".join(tag_list_f) + tag_classes = " ".join(tag_list_f) description = repo_dict["description"] ellipsis_str = ' ... more' @@ -214,53 +216,53 @@ def build_from_repos( if ellipsis_str in short_description: modal_str = f"""
    -
    - -

    {cookbook_title}

    - {authors_str} -

    {description}

    -

    {tags}

    -

    Visit Website

    -
    +
    + +

    {cookbook_title}

    + {authors_str} +

    {description}

    +

    {tags}

    +

    Visit Website

    +
    """ modal_str = '\n'.join([m.lstrip() for m in modal_str.split('\n')]) else: modal_str = "" - - new_card = f"""\ - :::{{grid-item-card}} - :shadow: md - :class-footer: card-footer -
    - -
    -

    {cookbook_title}

     -

    {authors_str}

    -

    {short_description}

    -
    -
    - {modal_str} - - +++ - -
    - {tags} -
    {status_badges}
    -
    - - ::: - - """ - grid_body.append('\n'.join([m.lstrip() for m in new_card.split('\n')])) + new_card = f""" + :::{{grid-item-card}} + :shadow: md + :class-footer: card-footer + :class-card: tagged-card {tag_classes} + +
    + +
    +

    {cookbook_title}

     +

    {authors_str}

    +

    {short_description}

    +
    +
    + {modal_str} + + +++ + +
    + {tags} +
    {status_badges}
    +
    + ::: + """ + grid_body.append('\n'.join([m.lstrip() for m in new_card.split('\n')])) - grid_body = "\n".join(grid_body) stitle = f"#### {subtitle}" if subtitle else "" stext = subtext if subtext else "" + grid_body = "\n".join(grid_body) + grid = f""" # {title} @@ -270,12 +272,12 @@ def build_from_repos( {menu_html} ::::{{grid}} 1 - :gutter: 4 + :gutter: 0 {grid_body}
    - + """ grid = '\n'.join([m.lstrip() for m in grid.split('\n')]) diff --git a/site/_static/custom.css b/site/_static/custom.css index 97d45a9..d9e0cdb 100644 --- a/site/_static/custom.css +++ b/site/_static/custom.css @@ -153,3 +153,49 @@ main.banner-main #project-pythia { .tagsandbadges { padding: 0 0; } + +.dropdown ul { + list-style: none; + padding: 0; + margin: 0; +} + +.dropdown-item { + display: block; +} + +.dropdown-item input[type="checkbox"] { + margin-right: 0.5em; +} + +details.sd-dropdown { + box-shadow: none !important; +} + +details.sd-dropdown summary.sd-card-header + div.sd-summary-content { + background-color: white !important; + border: 0.2rem solid var(--pst-sd-dropdown-color) !important; + border-radius: calc(.25rem - 1px); +} + +.bd-content .sd-card .sd-card-header { + background-color: var(--pst-color-panel-background) !important; +} + +.sd-summary-content.sd-card-body.docutils { + position: absolute; + z-index: 100; +} + +details.sd-dropdown summary.sd-card-header { + border: 0.2rem solid var(--pst-sd-dropdown-color) !important; + border-radius: calc(.25rem - 1px); +} + +p { + color: black; +} + +.sd-col.sd-d-flex-row.docutils.has-visible-card { + margin-bottom: 1rem; +} diff --git a/site/_static/custom.js b/site/_static/custom.js index f0f3d57..26420cf 100644 --- a/site/_static/custom.js +++ b/site/_static/custom.js @@ -1,184 +1,91 @@ -var buttons = document.querySelectorAll('.modal-btn') -var backdrop = document.querySelector('.modal-backdrop') -var modals = document.querySelectorAll('.modal') - -function openModal(i) { - backdrop.style.display = 'block' - modals[i].style.display = 'block' -} - -function closeModal(i) { - backdrop.style.display = 'none' - modals[i].style.display = 'none' -} - -for (i = 0; i < buttons.length; i++) { - buttons[i].addEventListener( - 'click', - (function (j) { - return function () { - openModal(j) - } - })(i) - ) - backdrop.addEventListener( - 'click', - (function (j) { - return function () { - closeModal(j) - } - })(i) - ) +function getClassOfCheckedCheckboxes(checkboxes) { + var tags = []; + checkboxes.forEach(function (cb) { + if (cb.checked) { + tags.push(cb.getAttribute("rel")); + } + }); + return tags; } - function change() { - var affiliationCbs = document.querySelectorAll(".affiliation input[type='checkbox']"); + console.log("Change event fired."); var domainsCbs = document.querySelectorAll(".domains input[type='checkbox']"); - var formatsCbs = document.querySelectorAll(".formats input[type='checkbox']"); var packagesCbs = document.querySelectorAll(".packages input[type='checkbox']"); + var domainTags = getClassOfCheckedCheckboxes(domainsCbs); + var packageTags = getClassOfCheckedCheckboxes(packagesCbs); + var filters = { - affiliation: getClassOfCheckedCheckboxes(affiliationCbs), - domains: getClassOfCheckedCheckboxes(domainsCbs), - formats: getClassOfCheckedCheckboxes(formatsCbs), - packages: getClassOfCheckedCheckboxes(packagesCbs) + domains: domainTags, + packages: packageTags }; filterResults(filters); } -function getClassOfCheckedCheckboxes(checkboxes) { - var classes = []; - - if (checkboxes && checkboxes.length > 0) { - for (var i = 0; i < checkboxes.length; i++) { - var cb = checkboxes[i]; - - if (cb.checked) { - classes.push(cb.getAttribute("rel")); - } - } - } - - return classes; -} - function filterResults(filters) { + console.log("Filtering results..."); var rElems = document.querySelectorAll(".tagged-card"); - var hiddenElems = []; - - if (!rElems || rElems.length <= 0) { - return; - } - - for (var i = 0; i < rElems.length; i++) { - var el = rElems[i]; - - if (filters.affiliation.length > 0) { - var isHidden = true; - for (var j = 0; j < filters.affiliation.length; j++) { - var filter = filters.affiliation[j]; + rElems.forEach(function (el) { + var isVisible = true; // Assume visible by default - if (el.classList.contains(filter)) { - isHidden = false; - break; - } - } + // Check if the element has any domain or package filter + if (filters.domains.length > 0 || filters.packages.length > 0) { + var hasMatchingDomain = filters.domains.length === 0 || filters.domains.some(domain => el.classList.contains(domain)); + var hasMatchingPackage = filters.packages.length === 0 || filters.packages.some(package => el.classList.contains(package)); - if (isHidden) { - hiddenElems.push(el); - } + // The element should be visible if it matches any filter within each category + isVisible = hasMatchingDomain && hasMatchingPackage; } - if (filters.domains.length > 0) { - var isHidden = true; - - for (var j = 0; j < filters.domains.length; j++) { - var filter = filters.domains[j]; - - if (el.classList.contains(filter)) { - isHidden = false; - break; - } - } - - if (isHidden) { - hiddenElems.push(el); - } + // Toggle visibility based on the result + if (isVisible) { + el.classList.remove("d-none"); + el.classList.add("d-flex"); + } else { + el.classList.remove("d-flex"); + el.classList.add("d-none"); } + }); - if (filters.formats.length > 0) { - var isHidden = true; - - for (var j = 0; j < filters.formats.length; j++) { - var filter = filters.formats[j]; - - if (el.classList.contains(filter)) { - isHidden = false; - break; - } - } - - if (isHidden) { - hiddenElems.push(el); - } - } + // Update the margins after filtering + updateMargins(); +} - if (filters.packages.length > 0) { - var isHidden = true; +var checkboxes = document.querySelectorAll('input[type="checkbox"]'); +checkboxes.forEach(function (checkbox) { + checkbox.addEventListener("change", change); +}); - for (var j = 0; j < filters.packages.length; j++) { - var filter = filters.packages[j]; +function updateMargins() { + const columns = document.querySelectorAll('.sd-col.sd-d-flex-row.docutils'); - if (el.classList.contains(filter)) { - isHidden = false; - break; - } - } + columns.forEach(column => { + // Check if this column has any visible cards + const hasVisibleCard = Array.from(column.children).some(child => !child.classList.contains('d-none')); - if (isHidden) { - hiddenElems.push(el); - } + // Toggle a class based on whether there are visible cards + if (hasVisibleCard) { + column.classList.add('has-visible-card'); + } else { + column.classList.remove('has-visible-card'); } - } - - for (var i = 0; i < rElems.length; i++) { - rElems[i].classList.replace("d-none", "d-flex"); - } - - if (hiddenElems.length <= 0) { - return; - } - - for (var i = 0; i < hiddenElems.length; i++) { - hiddenElems[i].classList.replace("d-flex", "d-none"); - } + }); } - function clearCbs() { - var affiliationCbs = document.querySelectorAll(".affiliation input[type='checkbox']"); - var domainsCbs = document.querySelectorAll(".domains input[type='checkbox']"); - var formatsCbs = document.querySelectorAll(".formats input[type='checkbox']"); - var packagesCbs = document.querySelectorAll(".packages input[type='checkbox']"); + // Select all checkbox inputs and uncheck them + var checkboxes = document.querySelectorAll('input[type="checkbox"]'); + checkboxes.forEach(function(checkbox) { + checkbox.checked = false; + }); - for (var i = 0; i < affiliationCbs.length; i++) { - affiliationCbs[i].checked=false; - } - - for (var i = 0; i < domainsCbs.length; i++) { - domainsCbs[i].checked=false; - } - - for (var i = 0; i < formatsCbs.length; i++) { - formatsCbs[i].checked=false; - } + change(); +} - for (var i = 0; i < packagesCbs.length; i++) { - packagesCbs[i].checked=false; - } +// Initial call to set up correct margins when the page loads +document.addEventListener('DOMContentLoaded', updateMargins); - change(); -} +console.log("Script loaded."); diff --git a/site/conf.py b/site/conf.py index f601cc2..c9deebe 100644 --- a/site/conf.py +++ b/site/conf.py @@ -75,7 +75,7 @@ # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ["_static"] html_css_files = ["custom.css"] -# html_js_files = ['custom.js'] +html_js_files = ['custom.js'] # Disable Sidebars on special pages html_sidebars = { diff --git a/site/cookbook_gallery.txt b/site/cookbook_gallery.txt index 23b6bb6..dfe4245 100644 --- a/site/cookbook_gallery.txt +++ b/site/cookbook_gallery.txt @@ -14,4 +14,4 @@ gridding-cookbook vapor-python-cookbook advanced-viz-cookbook unstructured-grid-viz-cookbook -na-cordex-viz-cookbook +na-cordex-viz-cookbook \ No newline at end of file diff --git a/site/cookbook_gallery_subtext.md b/site/cookbook_gallery_subtext.md index f43137f..891c24f 100644 --- a/site/cookbook_gallery_subtext.md +++ b/site/cookbook_gallery_subtext.md @@ -2,4 +2,4 @@ Pythia Cookbooks provide example workflows on more advanced and domain-specific Cookbooks are created from Jupyter Notebooks that we strive to binderize so each Cookbook can be [executed in the cloud with a single click from your browser](https://foundations.projectpythia.org/preamble/how-to-use.html#interacting-with-jupyter-notebooks-in-the-cloud-via-binder), but in some instances executing a Cookbook will require [running the notebooks locally](https://foundations.projectpythia.org/preamble/how-to-use.html#interacting-with-jupyter-books-locally). -Interested in contributing a new Cookbook or contributing to an existing Cookbook? Great! Please see the [Project Pythia Cookbook Contributor's Guide](https://projectpythia.org/cookbook-guide.html), and consider opening a discussion under the [Project Pythia category of the Pangeo Discourse](https://discourse.pangeo.io/c/education/project-pythia/60). +Interested in contributing a new Cookbook or contributing to an existing Cookbook? Great! Please see the [Project Pythia Cookbook Contributor's Guide](https://projectpythia.org/cookbook-guide.html), and consider opening a discussion under the [Project Pythia category of the Pangeo Discourse](https://discourse.pangeo.io/c/education/project-pythia/60). \ No newline at end of file From 4a9c80db223e6bd5fa8e01c4485625ac1066a669 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 14:55:51 -0400 Subject: [PATCH 10/13] Bump peter-evans/find-comment from 2 to 3 (#189) Bumps [peter-evans/find-comment](https://github.com/peter-evans/find-comment) from 2 to 3. - [Release notes](https://github.com/peter-evans/find-comment/releases) - [Commits](https://github.com/peter-evans/find-comment/compare/v2...v3) --- updated-dependencies: - dependency-name: peter-evans/find-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/update-cookbook-gallery.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-cookbook-gallery.yaml b/.github/workflows/update-cookbook-gallery.yaml index e66f73f..4fe4ab8 100644 --- a/.github/workflows/update-cookbook-gallery.yaml +++ b/.github/workflows/update-cookbook-gallery.yaml @@ -14,7 +14,7 @@ jobs: shell: bash -l {0} steps: - name: Find Comment - uses: peter-evans/find-comment@v2 + uses: peter-evans/find-comment@v3 id: fc with: issue-number: ${{ github.event.issue.number }} @@ -132,7 +132,7 @@ jobs: branch: cookbook-gallery-${{ github.event.issue.number }} - name: Find Comment - uses: peter-evans/find-comment@v2 + uses: peter-evans/find-comment@v3 id: fc with: issue-number: ${{ github.event.issue.number }} From e91753a9e885dd718f8c432859a92fcbdb40c6df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 14:59:04 -0400 Subject: [PATCH 11/13] Bump peter-evans/create-or-update-comment from 3 to 4 (#188) Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 3 to 4. - [Release notes](https://github.com/peter-evans/create-or-update-comment/releases) - [Commits](https://github.com/peter-evans/create-or-update-comment/compare/v3...v4) --- updated-dependencies: - dependency-name: peter-evans/create-or-update-comment dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/update-cookbook-gallery.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-cookbook-gallery.yaml b/.github/workflows/update-cookbook-gallery.yaml index 4fe4ab8..dceca95 100644 --- a/.github/workflows/update-cookbook-gallery.yaml +++ b/.github/workflows/update-cookbook-gallery.yaml @@ -23,7 +23,7 @@ jobs: - name: Create comment if: steps.fc.outputs.comment-id == '' - uses: peter-evans/create-or-update-comment@v3 + uses: peter-evans/create-or-update-comment@v4 with: issue-number: ${{ github.event.issue.number }} body: | @@ -33,7 +33,7 @@ jobs: - name: Update comment if: steps.fc.outputs.comment-id != '' - uses: peter-evans/create-or-update-comment@v3 + uses: peter-evans/create-or-update-comment@v4 with: comment-id: ${{ steps.fc.outputs.comment-id }} edit-mode: replace @@ -141,7 +141,7 @@ jobs: - name: Create comment if: steps.fc.outputs.comment-id == '' - uses: peter-evans/create-or-update-comment@v3 + uses: peter-evans/create-or-update-comment@v4 with: issue-number: ${{ github.event.issue.number }} body: | @@ -151,7 +151,7 @@ jobs: - name: Update comment if: steps.fc.outputs.comment-id != '' - uses: peter-evans/create-or-update-comment@v3 + uses: peter-evans/create-or-update-comment@v4 with: comment-id: ${{ steps.fc.outputs.comment-id }} edit-mode: replace From 2370c4ba88ebdf4ab35449b55c1ee5b1219567b9 Mon Sep 17 00:00:00 2001 From: "pythia-pr-machine[bot]" <125689685+pythia-pr-machine[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 12:40:52 -0600 Subject: [PATCH 12/13] Update cookbook gallery (#197) Co-authored-by: r-ford Co-authored-by: Brian Rose --- site/cookbook_gallery.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/cookbook_gallery.txt b/site/cookbook_gallery.txt index dfe4245..7589a03 100644 --- a/site/cookbook_gallery.txt +++ b/site/cookbook_gallery.txt @@ -14,4 +14,5 @@ gridding-cookbook vapor-python-cookbook advanced-viz-cookbook unstructured-grid-viz-cookbook -na-cordex-viz-cookbook \ No newline at end of file +na-cordex-viz-cookbook +eofs-cookbook From c1cc880b5d595c0a8c231be87858e507bfcf3b49 Mon Sep 17 00:00:00 2001 From: Julia Kent <46687291+jukent@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:58:43 -0600 Subject: [PATCH 13/13] Fix 3D-tag not working (#210) * drop down menu without bullets * css and remove === * make subtext black * mess with javascript * jv edits * filtering working! * fix card margins, tag titling, and clear all filters * add all cookbooks back * fix merge conflicts * undo subtext changes * fix rel pointing to class starting with a number * rm duplicate cookbooks * fix button styling - color change on click --- site/_extensions/gallery_generator.py | 5 ++++- site/_static/custom.css | 22 +++++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/site/_extensions/gallery_generator.py b/site/_extensions/gallery_generator.py index 00eb212..06b0141 100644 --- a/site/_extensions/gallery_generator.py +++ b/site/_extensions/gallery_generator.py @@ -117,6 +117,9 @@ def _generate_sorted_tag_keys(repo_dicts): def _title_case_preserve(s): return re.sub(r'\b(\w)', lambda m: m.group(1).upper(), s) +def _make_class(s): + return re.sub(r'^\d+', '', s.replace(" ", "-").lower()) + def _generate_tag_set(repo_dicts, tag_key=None): tag_set = set() @@ -137,7 +140,7 @@ def _generate_tag_menu(repo_dicts, tag_key): tag_list = sorted(tag_set) options = "".join( - f'
    • ' + f'
    • ' for tag in tag_list ) diff --git a/site/_static/custom.css b/site/_static/custom.css index d9e0cdb..09685e3 100644 --- a/site/_static/custom.css +++ b/site/_static/custom.css @@ -178,24 +178,32 @@ details.sd-dropdown summary.sd-card-header + div.sd-summary-content { border-radius: calc(.25rem - 1px); } -.bd-content .sd-card .sd-card-header { - background-color: var(--pst-color-panel-background) !important; -} - .sd-summary-content.sd-card-body.docutils { position: absolute; z-index: 100; } -details.sd-dropdown summary.sd-card-header { - border: 0.2rem solid var(--pst-sd-dropdown-color) !important; - border-radius: calc(.25rem - 1px); +details.sd-dropdown:not([open])>.sd-card-header { + background-color: white !important; + border: 2px solid #1a648f !important; + color: #1a648f; + border-radius: .5rem; +} + +details.sd-dropdown[open]>.sd-card-header { + background-color: #1a648f !important; + color: white; + border-radius: .5rem; } p { color: black; } +main.bd-content #main-content a { + color: #1a648f; +} + .sd-col.sd-d-flex-row.docutils.has-visible-card { margin-bottom: 1rem; }