Skip to content

Commit

Permalink
Merge pull request #429 from holochain/move-references-to-resources
Browse files Browse the repository at this point in the history
change /references path to /resources, along with all labels
  • Loading branch information
pdaoust authored Mar 11, 2024
2 parents 0354c41 + 5060d0c commit c194c1e
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .cspell/words-that-should-exist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ counterparty
counterparty's
filesystem
filesystems
howto
howtos
interoperating
permissioned
permissivity
Expand Down
11 changes: 8 additions & 3 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
from = "/resources/happ-bundle/"
to = "/redirect-to-redux-site.html#!docs/resources/happ-bundle/"
# There will eventually be a new hApp bundle format that will get documented,
# and I intend to put it under `/references`.
# and I intend to put it under `/resources`.
status = 302

# Some of the core concepts' titles and URLs have changed,
Expand Down Expand Up @@ -71,6 +71,11 @@
to = "/concepts/8_calls_capabilities/"
status = 301

[[redirects]]
from = "/references/*"
to = "/resources/:splat"
status = 301

# Once upon a time, we had a landing page and all the actual docs were in /docs.
[[redirects]]
from = "/docs/*"
Expand Down Expand Up @@ -101,10 +106,10 @@
to = "/get-started/"
status = 301

# Glossary has been moved to the references path.
# Glossary has been moved to the resources path.
[[redirects]]
from = "/glossary/"
to = "/references/glossary/"
to = "/resources/glossary/"
status = 301

# The front page for the core concepts has been removed.
Expand Down
4 changes: 2 additions & 2 deletions src/pages/_data/navigation/footerLinks.json5
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
links: [
{ title: "Get Started", url: "/get-started/" },
{ title: "Core Concepts", url: "/concepts/1_the_basics/" },
{ title: "Resources", url: "/references/" },
{ title: "Resources", url: "/resources/" },
]
},

Expand All @@ -16,7 +16,7 @@
{ title: "App API reference", url: "https://docs.rs/holochain_conductor_api/latest/holochain_conductor_api/enum.AppRequest.html", external: true },
{ title: "Admin API reference", url: "https://docs.rs/holochain_conductor_api/latest/holochain_conductor_api/enum.AdminRequest.html", external: true },
{ title: "CLI", url: "https://github.com/holochain/holochain/tree/main/crates/hc", external: true },
{ title: "Glossary", url: "/references/glossary/", external: true },
{ title: "Glossary", url: "/resources/glossary/", external: true },
]
},

Expand Down
2 changes: 1 addition & 1 deletion src/pages/_data/navigation/headerNav.json5
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
links: [
{ title: "Get Started", url: "/get-started/", class:"" },
{ title: "Core Concepts", url: "/concepts/1_the_basics/", class:"" },
{ title: "Resources", url: "/references/", class:"" },
{ title: "Resources", url: "/resources/", class:"" },
{ title: "Get Involved", url: "/get-involved/", class:"" },
]
}
4 changes: 2 additions & 2 deletions src/pages/_data/navigation/mainNav.json5
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
{ title: "Lifecycle Events", url: "/concepts/11_lifecycle_events/" },
]
},
{ title: "References", url: "/references/", children: [
{ title: "References", url: "/resources/", children: [
{ title: "HDK (Rust)", url: "https://docs.rs/hdk", external: true },
{ title: "App API reference", url: "https://docs.rs/holochain_conductor_api/latest/holochain_conductor_api/enum.AppRequest.html", external: true },
{ title: "Admin API reference", url: "https://docs.rs/holochain_conductor_api/latest/holochain_conductor_api/enum.AdminRequest.html", external: true },
{ title: "CLI", url: "https://github.com/holochain/holochain/tree/main/crates/hc", external: true },
{ title: "Glossary", url: "/references/glossary/" },
{ title: "Glossary", url: "/resources/glossary/" },
]
},
{ title: "Get Involved", url: "/get-involved/" },
Expand Down
6 changes: 3 additions & 3 deletions src/pages/_includes/widgets/home-tiles.njk
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
</div>
{% endlinkTile %}

{% linkTile "/references/", "home-tile" %}
{% linkTile "/resources/", "home-tile" %}
{{ toolPanelIcon() }}
<div class="text-wrapper">
<h2>Resources & Docs</h2>
<p>Advanced tips and more</p>
<h2>Resources</h2>
<p>Howtos, references, examples, and more</p>
</div>
{% endlinkTile %}

Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit c194c1e

Please sign in to comment.