diff --git a/.gitmodules b/.gitmodules index 4674640..b664110 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "syntax-highlighting/sublime_toml_highlighting"] path = syntax-highlighting/sublime_toml_highlighting url = https://github.com/jasonwilliams/sublime_toml_highlighting.git +[submodule "docs/v0.6"] + path = docs/v0.6 + url = https://github.com/cot-rs/cot.git diff --git a/cot-site-common/src/lib.rs b/cot-site-common/src/lib.rs index 0273651..d64d2e8 100644 --- a/cot-site-common/src/lib.rs +++ b/cot-site-common/src/lib.rs @@ -3,5 +3,13 @@ mod utils; pub use utils::{Version, VersionError}; pub const MASTER_VERSION: &str = "master"; -pub const LATEST_VERSION: &str = "v0.5"; -pub const ALL_VERSIONS: &[&str] = &[MASTER_VERSION, "v0.5", "v0.4", "v0.3", "v0.2", "v0.1"]; +pub const LATEST_VERSION: &str = "v0.6"; +pub const ALL_VERSIONS: &[&str] = &[ + MASTER_VERSION, + LATEST_VERSION, + "v0.5", + "v0.4", + "v0.3", + "v0.2", + "v0.1", +]; diff --git a/cot-site-macros/src/lib.rs b/cot-site-macros/src/lib.rs index c23a70b..bf81b43 100644 --- a/cot-site-macros/src/lib.rs +++ b/cot-site-macros/src/lib.rs @@ -12,7 +12,12 @@ pub fn md_page(input: TokenStream) -> TokenStream { let MdPageInput { prefix, link } = syn::parse2(input).unwrap(); - let md_page = md_pages::parse_md_page(&format!("docs/{prefix}"), &link, &prefix); + let path_prefix = if prefix.is_empty() { + "docs/".to_string() + } else { + format!("docs/{prefix}/docs") + }; + let md_page = md_pages::parse_md_page(&path_prefix, &link, &prefix); md_pages::quote_md_page(&md_page).into() } diff --git a/docs/v0.1/admin-panel.md b/docs/v0.1/docs/admin-panel.md similarity index 100% rename from docs/v0.1/admin-panel.md rename to docs/v0.1/docs/admin-panel.md diff --git a/docs/v0.1/db-models.md b/docs/v0.1/docs/db-models.md similarity index 100% rename from docs/v0.1/db-models.md rename to docs/v0.1/docs/db-models.md diff --git a/docs/v0.1/error-pages.md b/docs/v0.1/docs/error-pages.md similarity index 100% rename from docs/v0.1/error-pages.md rename to docs/v0.1/docs/error-pages.md diff --git a/docs/v0.1/forms.md b/docs/v0.1/docs/forms.md similarity index 100% rename from docs/v0.1/forms.md rename to docs/v0.1/docs/forms.md diff --git a/docs/v0.1/introduction.md b/docs/v0.1/docs/introduction.md similarity index 100% rename from docs/v0.1/introduction.md rename to docs/v0.1/docs/introduction.md diff --git a/docs/v0.1/static-files.md b/docs/v0.1/docs/static-files.md similarity index 100% rename from docs/v0.1/static-files.md rename to docs/v0.1/docs/static-files.md diff --git a/docs/v0.1/templates.md b/docs/v0.1/docs/templates.md similarity index 100% rename from docs/v0.1/templates.md rename to docs/v0.1/docs/templates.md diff --git a/docs/v0.1/testing.md b/docs/v0.1/docs/testing.md similarity index 100% rename from docs/v0.1/testing.md rename to docs/v0.1/docs/testing.md diff --git a/docs/v0.2/admin-panel.md b/docs/v0.2/docs/admin-panel.md similarity index 100% rename from docs/v0.2/admin-panel.md rename to docs/v0.2/docs/admin-panel.md diff --git a/docs/v0.2/db-models.md b/docs/v0.2/docs/db-models.md similarity index 100% rename from docs/v0.2/db-models.md rename to docs/v0.2/docs/db-models.md diff --git a/docs/v0.2/error-pages.md b/docs/v0.2/docs/error-pages.md similarity index 100% rename from docs/v0.2/error-pages.md rename to docs/v0.2/docs/error-pages.md diff --git a/docs/v0.2/forms.md b/docs/v0.2/docs/forms.md similarity index 100% rename from docs/v0.2/forms.md rename to docs/v0.2/docs/forms.md diff --git a/docs/v0.2/introduction.md b/docs/v0.2/docs/introduction.md similarity index 100% rename from docs/v0.2/introduction.md rename to docs/v0.2/docs/introduction.md diff --git a/docs/v0.2/static-files.md b/docs/v0.2/docs/static-files.md similarity index 100% rename from docs/v0.2/static-files.md rename to docs/v0.2/docs/static-files.md diff --git a/docs/v0.2/templates.md b/docs/v0.2/docs/templates.md similarity index 100% rename from docs/v0.2/templates.md rename to docs/v0.2/docs/templates.md diff --git a/docs/v0.2/testing.md b/docs/v0.2/docs/testing.md similarity index 100% rename from docs/v0.2/testing.md rename to docs/v0.2/docs/testing.md diff --git a/docs/v0.3/admin-panel.md b/docs/v0.3/docs/admin-panel.md similarity index 100% rename from docs/v0.3/admin-panel.md rename to docs/v0.3/docs/admin-panel.md diff --git a/docs/v0.3/db-models.md b/docs/v0.3/docs/db-models.md similarity index 100% rename from docs/v0.3/db-models.md rename to docs/v0.3/docs/db-models.md diff --git a/docs/v0.3/error-pages.md b/docs/v0.3/docs/error-pages.md similarity index 100% rename from docs/v0.3/error-pages.md rename to docs/v0.3/docs/error-pages.md diff --git a/docs/v0.3/forms.md b/docs/v0.3/docs/forms.md similarity index 100% rename from docs/v0.3/forms.md rename to docs/v0.3/docs/forms.md diff --git a/docs/v0.3/introduction.md b/docs/v0.3/docs/introduction.md similarity index 100% rename from docs/v0.3/introduction.md rename to docs/v0.3/docs/introduction.md diff --git a/docs/v0.3/openapi.md b/docs/v0.3/docs/openapi.md similarity index 100% rename from docs/v0.3/openapi.md rename to docs/v0.3/docs/openapi.md diff --git a/docs/v0.3/static-files.md b/docs/v0.3/docs/static-files.md similarity index 100% rename from docs/v0.3/static-files.md rename to docs/v0.3/docs/static-files.md diff --git a/docs/v0.3/templates.md b/docs/v0.3/docs/templates.md similarity index 100% rename from docs/v0.3/templates.md rename to docs/v0.3/docs/templates.md diff --git a/docs/v0.3/testing.md b/docs/v0.3/docs/testing.md similarity index 100% rename from docs/v0.3/testing.md rename to docs/v0.3/docs/testing.md diff --git a/docs/v0.4/admin-panel.md b/docs/v0.4/docs/admin-panel.md similarity index 100% rename from docs/v0.4/admin-panel.md rename to docs/v0.4/docs/admin-panel.md diff --git a/docs/v0.4/db-models.md b/docs/v0.4/docs/db-models.md similarity index 100% rename from docs/v0.4/db-models.md rename to docs/v0.4/docs/db-models.md diff --git a/docs/v0.4/error-pages.md b/docs/v0.4/docs/error-pages.md similarity index 100% rename from docs/v0.4/error-pages.md rename to docs/v0.4/docs/error-pages.md diff --git a/docs/v0.4/forms.md b/docs/v0.4/docs/forms.md similarity index 100% rename from docs/v0.4/forms.md rename to docs/v0.4/docs/forms.md diff --git a/docs/v0.4/introduction.md b/docs/v0.4/docs/introduction.md similarity index 100% rename from docs/v0.4/introduction.md rename to docs/v0.4/docs/introduction.md diff --git a/docs/v0.4/openapi.md b/docs/v0.4/docs/openapi.md similarity index 100% rename from docs/v0.4/openapi.md rename to docs/v0.4/docs/openapi.md diff --git a/docs/v0.4/static-files.md b/docs/v0.4/docs/static-files.md similarity index 100% rename from docs/v0.4/static-files.md rename to docs/v0.4/docs/static-files.md diff --git a/docs/v0.4/templates.md b/docs/v0.4/docs/templates.md similarity index 100% rename from docs/v0.4/templates.md rename to docs/v0.4/docs/templates.md diff --git a/docs/v0.4/testing.md b/docs/v0.4/docs/testing.md similarity index 100% rename from docs/v0.4/testing.md rename to docs/v0.4/docs/testing.md diff --git a/docs/v0.4/upgrade-guide.md b/docs/v0.4/docs/upgrade-guide.md similarity index 100% rename from docs/v0.4/upgrade-guide.md rename to docs/v0.4/docs/upgrade-guide.md diff --git a/docs/v0.5/admin-panel.md b/docs/v0.5/docs/admin-panel.md similarity index 100% rename from docs/v0.5/admin-panel.md rename to docs/v0.5/docs/admin-panel.md diff --git a/docs/v0.5/caching.md b/docs/v0.5/docs/caching.md similarity index 100% rename from docs/v0.5/caching.md rename to docs/v0.5/docs/caching.md diff --git a/docs/v0.5/db-models.md b/docs/v0.5/docs/db-models.md similarity index 100% rename from docs/v0.5/db-models.md rename to docs/v0.5/docs/db-models.md diff --git a/docs/v0.5/error-pages.md b/docs/v0.5/docs/error-pages.md similarity index 100% rename from docs/v0.5/error-pages.md rename to docs/v0.5/docs/error-pages.md diff --git a/docs/v0.5/forms.md b/docs/v0.5/docs/forms.md similarity index 100% rename from docs/v0.5/forms.md rename to docs/v0.5/docs/forms.md diff --git a/docs/v0.5/framework-comparison.md b/docs/v0.5/docs/framework-comparison.md similarity index 100% rename from docs/v0.5/framework-comparison.md rename to docs/v0.5/docs/framework-comparison.md diff --git a/docs/v0.5/introduction.md b/docs/v0.5/docs/introduction.md similarity index 100% rename from docs/v0.5/introduction.md rename to docs/v0.5/docs/introduction.md diff --git a/docs/v0.5/openapi.md b/docs/v0.5/docs/openapi.md similarity index 100% rename from docs/v0.5/openapi.md rename to docs/v0.5/docs/openapi.md diff --git a/docs/v0.5/sending-emails.md b/docs/v0.5/docs/sending-emails.md similarity index 100% rename from docs/v0.5/sending-emails.md rename to docs/v0.5/docs/sending-emails.md diff --git a/docs/v0.5/static-files.md b/docs/v0.5/docs/static-files.md similarity index 100% rename from docs/v0.5/static-files.md rename to docs/v0.5/docs/static-files.md diff --git a/docs/v0.5/templates.md b/docs/v0.5/docs/templates.md similarity index 100% rename from docs/v0.5/templates.md rename to docs/v0.5/docs/templates.md diff --git a/docs/v0.5/testing.md b/docs/v0.5/docs/testing.md similarity index 100% rename from docs/v0.5/testing.md rename to docs/v0.5/docs/testing.md diff --git a/docs/v0.5/upgrade-guide.md b/docs/v0.5/docs/upgrade-guide.md similarity index 100% rename from docs/v0.5/upgrade-guide.md rename to docs/v0.5/docs/upgrade-guide.md diff --git a/docs/v0.6 b/docs/v0.6 new file mode 160000 index 0000000..e2ea8a9 --- /dev/null +++ b/docs/v0.6 @@ -0,0 +1 @@ +Subproject commit e2ea8a90f8050f373b0b2b708721baf600933ffd diff --git a/src/guides.rs b/src/guides.rs index 96ab0bb..cdcce05 100644 --- a/src/guides.rs +++ b/src/guides.rs @@ -152,6 +152,29 @@ pub(crate) fn get_categories(master_version: Vec<(&'static str, Vec)>) - ("About", vec![md_page!("v0.5", "framework-comparison")]), ], ), + ( + "v0.6", + vec![ + ( + "Getting started", + vec![ + md_page!("v0.6", "introduction"), + md_page!("v0.6", "templates"), + md_page!("v0.6", "forms"), + md_page!("v0.6", "db-models"), + md_page!("v0.6", "admin-panel"), + md_page!("v0.6", "static-files"), + md_page!("v0.6", "sending-emails"), + md_page!("v0.6", "caching"), + md_page!("v0.6", "error-pages"), + md_page!("v0.6", "openapi"), + md_page!("v0.6", "testing"), + ], + ), + ("Upgrading", vec![md_page!("v0.6", "upgrade-guide")]), + ("About", vec![md_page!("v0.6", "framework-comparison")]), + ], + ), ("master", master_version), ]);