From ca304fa7bdb44494560073e35520df11530d788d Mon Sep 17 00:00:00 2001 From: Lev Kokotov Date: Thu, 31 Aug 2023 10:51:32 -0700 Subject: [PATCH 1/2] Remove diff --- pgml-dashboard/src/components/mod.rs | 58 ++++++++++++++-------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/pgml-dashboard/src/components/mod.rs b/pgml-dashboard/src/components/mod.rs index 64af15f8a..f148ea8f0 100644 --- a/pgml-dashboard/src/components/mod.rs +++ b/pgml-dashboard/src/components/mod.rs @@ -5,58 +5,58 @@ mod component; pub(crate) use component::{component, Component}; -// src/components/navbar_web_app -pub mod navbar_web_app; -pub use navbar_web_app::NavbarWebApp; - // src/components/navbar pub mod navbar; pub use navbar::Navbar; -// src/components/postgres_logo -pub mod postgres_logo; -pub use postgres_logo::PostgresLogo; - // src/components/static_nav_link pub mod static_nav_link; pub use static_nav_link::StaticNavLink; -// src/components/modal -pub mod modal; -pub use modal::Modal; +// src/components/left_nav_web_app +pub mod left_nav_web_app; +pub use left_nav_web_app::LeftNavWebApp; + +// src/components/left_nav_menu +pub mod left_nav_menu; +pub use left_nav_menu::LeftNavMenu; // src/components/static_nav pub mod static_nav; pub use static_nav::StaticNav; -// src/components/test_component -pub mod test_component; -pub use test_component::TestComponent; +// src/components/nav_link +pub mod nav_link; +pub use nav_link::NavLink; + +// src/components/confirm_modal +pub mod confirm_modal; +pub use confirm_modal::ConfirmModal; + +// src/components/navbar_web_app +pub mod navbar_web_app; +pub use navbar_web_app::NavbarWebApp; // src/components/nav pub mod nav; pub use nav::Nav; -// src/components/left_nav_web_app -pub mod left_nav_web_app; -pub use left_nav_web_app::LeftNavWebApp; +// src/components/modal +pub mod modal; +pub use modal::Modal; + +// src/components/postgres_logo +pub mod postgres_logo; +pub use postgres_logo::PostgresLogo; // src/components/github_icon pub mod github_icon; pub use github_icon::GithubIcon; -// src/components/confirm_modal -pub mod confirm_modal; -pub use confirm_modal::ConfirmModal; - -// src/components/left_nav_menu -pub mod left_nav_menu; -pub use left_nav_menu::LeftNavMenu; - -// src/components/nav_link -pub mod nav_link; -pub use nav_link::NavLink; - // src/components/breadcrumbs pub mod breadcrumbs; pub use breadcrumbs::Breadcrumbs; + +// src/components/test_component +pub mod test_component; +pub use test_component::TestComponent; From 787f165b7b69ead53b1ed68310909889a61f984e Mon Sep 17 00:00:00 2001 From: Lev Kokotov Date: Thu, 31 Aug 2023 10:55:52 -0700 Subject: [PATCH 2/2] sort paths --- pgml-apps/cargo-pgml-components/Cargo.toml | 2 +- .../src/frontend/components.rs | 9 ++- pgml-dashboard/src/components/mod.rs | 58 +++++++++---------- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/pgml-apps/cargo-pgml-components/Cargo.toml b/pgml-apps/cargo-pgml-components/Cargo.toml index ed7e37973..be13f563c 100644 --- a/pgml-apps/cargo-pgml-components/Cargo.toml +++ b/pgml-apps/cargo-pgml-components/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-pgml-components" -version = "0.1.8" +version = "0.1.9" edition = "2021" authors = ["PostgresML "] license = "MIT" diff --git a/pgml-apps/cargo-pgml-components/src/frontend/components.rs b/pgml-apps/cargo-pgml-components/src/frontend/components.rs index e4bf2b6b0..d1833b281 100644 --- a/pgml-apps/cargo-pgml-components/src/frontend/components.rs +++ b/pgml-apps/cargo-pgml-components/src/frontend/components.rs @@ -115,10 +115,13 @@ pub fn add(name: &str, overwrite: bool) { /// Update `mod.rs` with all the components in `src/components`. pub fn update_modules() { let mut modules = Vec::new(); + let mut paths: Vec<_> = unwrap_or_exit!(read_dir(COMPONENT_DIRECTORY)) + .map(|p| p.unwrap()) + .collect(); + paths.sort_by_key(|dir| dir.path()); - for path in unwrap_or_exit!(read_dir(COMPONENT_DIRECTORY)) { - let path = unwrap_or_exit!(path).path(); - + for path in paths { + let path = path.path(); if path.is_file() { continue; } diff --git a/pgml-dashboard/src/components/mod.rs b/pgml-dashboard/src/components/mod.rs index f148ea8f0..d8c65199b 100644 --- a/pgml-dashboard/src/components/mod.rs +++ b/pgml-dashboard/src/components/mod.rs @@ -5,57 +5,57 @@ mod component; pub(crate) use component::{component, Component}; -// src/components/navbar -pub mod navbar; -pub use navbar::Navbar; +// src/components/breadcrumbs +pub mod breadcrumbs; +pub use breadcrumbs::Breadcrumbs; -// src/components/static_nav_link -pub mod static_nav_link; -pub use static_nav_link::StaticNavLink; +// src/components/confirm_modal +pub mod confirm_modal; +pub use confirm_modal::ConfirmModal; -// src/components/left_nav_web_app -pub mod left_nav_web_app; -pub use left_nav_web_app::LeftNavWebApp; +// src/components/github_icon +pub mod github_icon; +pub use github_icon::GithubIcon; // src/components/left_nav_menu pub mod left_nav_menu; pub use left_nav_menu::LeftNavMenu; -// src/components/static_nav -pub mod static_nav; -pub use static_nav::StaticNav; +// src/components/left_nav_web_app +pub mod left_nav_web_app; +pub use left_nav_web_app::LeftNavWebApp; + +// src/components/modal +pub mod modal; +pub use modal::Modal; + +// src/components/nav +pub mod nav; +pub use nav::Nav; // src/components/nav_link pub mod nav_link; pub use nav_link::NavLink; -// src/components/confirm_modal -pub mod confirm_modal; -pub use confirm_modal::ConfirmModal; +// src/components/navbar +pub mod navbar; +pub use navbar::Navbar; // src/components/navbar_web_app pub mod navbar_web_app; pub use navbar_web_app::NavbarWebApp; -// src/components/nav -pub mod nav; -pub use nav::Nav; - -// src/components/modal -pub mod modal; -pub use modal::Modal; - // src/components/postgres_logo pub mod postgres_logo; pub use postgres_logo::PostgresLogo; -// src/components/github_icon -pub mod github_icon; -pub use github_icon::GithubIcon; +// src/components/static_nav +pub mod static_nav; +pub use static_nav::StaticNav; -// src/components/breadcrumbs -pub mod breadcrumbs; -pub use breadcrumbs::Breadcrumbs; +// src/components/static_nav_link +pub mod static_nav_link; +pub use static_nav_link::StaticNavLink; // src/components/test_component pub mod test_component; pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy