From 9010cac039efcd224b36e9b6f78746694ea23ec5 Mon Sep 17 00:00:00 2001 From: Marc-Antoine ARNAUD Date: Fri, 13 Nov 2026 11:45:31 +0100 Subject: [PATCH 1/2] feat: add new components demo and update patternfly style --- Cargo.lock | 151 ++++++++++--------- Cargo.toml | 2 +- src/app/mod.rs | 15 ++ src/components/avatar/avatar.4.example | 9 ++ src/components/avatar/avatar.5.example | 13 ++ src/components/avatar/mod.rs | 6 +- src/components/hero/hero.1.example | 20 +++ src/components/hero/hero.2.example | 11 ++ src/components/hero/hero.3.example | 11 ++ src/components/hero/hero.4.example | 11 ++ src/components/hero/mod.rs | 17 +++ src/components/mod.rs | 4 + src/components/timestamp/mod.rs | 19 +++ src/components/timestamp/timestamp.1.example | 15 ++ src/components/timestamp/timestamp.2.example | 22 +++ src/components/timestamp/timestamp.3.example | 11 ++ src/components/timestamp/timestamp.4.example | 15 ++ src/components/timestamp/timestamp.5.example | 14 ++ src/components/timestamp/timestamp.6.example | 3 + src/layouts/level/level.1.example | 7 + src/layouts/level/level.2.example | 7 + src/layouts/level/mod.rs | 12 ++ src/layouts/mod.rs | 2 + 23 files changed, 324 insertions(+), 73 deletions(-) create mode 100644 src/components/avatar/avatar.4.example create mode 100644 src/components/avatar/avatar.5.example create mode 100644 src/components/hero/hero.1.example create mode 100644 src/components/hero/hero.2.example create mode 100644 src/components/hero/hero.3.example create mode 100644 src/components/hero/hero.4.example create mode 100644 src/components/hero/mod.rs create mode 100644 src/components/timestamp/mod.rs create mode 100644 src/components/timestamp/timestamp.1.example create mode 100644 src/components/timestamp/timestamp.2.example create mode 100644 src/components/timestamp/timestamp.3.example create mode 100644 src/components/timestamp/timestamp.4.example create mode 100644 src/components/timestamp/timestamp.5.example create mode 100644 src/components/timestamp/timestamp.6.example create mode 100644 src/layouts/level/level.1.example create mode 100644 src/layouts/level/level.2.example create mode 100644 src/layouts/level/mod.rs diff --git a/Cargo.lock b/Cargo.lock index 99a06ab8..62632451 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -50,9 +50,9 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "cc" -version = "1.8.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6651c9ed80effdc7db0ff72512157f901af5e3549e341e24b1dd4887d836d838" +checksum = "4ff2a8126fff0f8c839080d619675a585e61720bb12d2baceae45769fd66f155" dependencies = [ "find-msvc-tools", "shlex", @@ -145,20 +145,20 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.10", ] [[package]] name = "equivalent" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" +checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826" [[package]] name = "find-msvc-tools" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484" +checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48" [[package]] name = "fnv" @@ -219,7 +219,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.10", ] [[package]] @@ -544,9 +544,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513" +checksum = "fe090a42a0d3140fed8c63263ed1fecc02422cb2f4bfe55cd8de2de1b8e105dd" dependencies = [ "displaydoc", "potential_utf", @@ -558,9 +558,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb" +checksum = "25d29b57c17c6528d0dc4c2141cfa2d08200465acb537a3909c8b9b8a4a984c0" dependencies = [ "displaydoc", "litemap", @@ -571,9 +571,9 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f" +checksum = "404a3b8c486f205c87fe7f23ab6894d84a4ad76d6e4671ae1981ba7def87c599" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -585,15 +585,15 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0" +checksum = "20f0088bfb7441f7a37fa0c9e20cb1e9cba1cac6b9ce8cd2a6dc44294f8e8cbc" [[package]] name = "icu_properties" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148" +checksum = "2ea83d991c56158f7cf898bf86436c1dfe7c07ee82fe88951f2695c9f37a379f" dependencies = [ "displaydoc", "icu_collections", @@ -606,15 +606,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa" +checksum = "b98f29af82d02b163fe50161388350e743bb3107cc8e8c2f7314cb505faddfcf" [[package]] name = "icu_provider" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73" +checksum = "413099315636c588ee8f011190b329b971a09a8fae9d157e01dcae8379468514" dependencies = [ "displaydoc", "icu_locale_core", @@ -684,15 +684,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" [[package]] name = "js-sys" -version = "0.3.106" +version = "0.3.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7883d941dae510fb2d978fc3fe018c71c9e2892fd38854de3e8b92c2e5ad9cc5" +checksum = "8dc09d2154098bbf4ef54eab6b117a3c24cbbffe94046b16ee6d6d4510584d3a" dependencies = [ "cfg-if", "futures-util", @@ -701,9 +701,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.190" +version = "0.2.191" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78" +checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a" [[package]] name = "litemap" @@ -713,9 +713,9 @@ checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae" [[package]] name = "log" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" +checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c" [[package]] name = "memchr" @@ -750,8 +750,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "patternfly-yew" -version = "0.8.5" -source = "git+https://github.com/patternfly-yew/patternfly-yew?rev=40d93dd0#40d93dd0a65084caca358641a52a78ed63c95a1c" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df6aed2454c9380cf012da5cd431c92c5533a87fda6148f3d22c5fae8abbe4ba" dependencies = [ "chrono", "gloo-events 0.3.0", @@ -998,7 +999,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.10", ] [[package]] @@ -1040,9 +1041,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.16.3" +version = "1.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3dc8af474f516a851ff4bd12db780f948b9250ad37211e4eec0bccea54e01b" +checksum = "149309498a5f7334b12ddae0cad8aba81ce785fe91755068867e017cf98fee46" [[package]] name = "stable_deref_trait" @@ -1100,9 +1101,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.8" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01016da373cd8f7ef12624f796309f5c31ba8d646dd08856c02cd741d823c622" +checksum = "4ae9ccbea3a7b0b09443036490c8f34a8b1b760fd345e5c0dae0aac718faea79" dependencies = [ "proc-macro2", "quote", @@ -1117,7 +1118,7 @@ checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.10", ] [[package]] @@ -1157,14 +1158,14 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.10", ] [[package]] name = "tinystr" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" +checksum = "abc840c238154d58f9e86b2792261edfde565a17696e1cda1a449de27979801a" dependencies = [ "displaydoc", "zerovec", @@ -1172,9 +1173,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.53.2" +version = "1.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e95f91fcc7a621e8b030f6aa23c71fe9838ae2fb4d8118b75602a328f5144044" +checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3" dependencies = [ "pin-project-lite", "tokio-macros", @@ -1188,7 +1189,7 @@ checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.10", ] [[package]] @@ -1299,15 +1300,24 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "utf8_iter" -version = "1.0.4" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af3bd9d3e571c26fcce9d033b87ea5ab061b8d2ffe9b7a5675d810d68f03edf0" +dependencies = [ + "utf_types", +] + +[[package]] +name = "utf_types" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +checksum = "3a3b425286980a367278453f3b6d28cdcb134b574e5a35824a6ff5eebad50bb6" [[package]] name = "uuid" -version = "1.28.0" +version = "1.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc1186384beb7dd8eedea376413fd654937285ea6c9cfbb928dc3043ea4b606" +checksum = "bed99139f7dac9b5cfe5f17be4d66dc7079a34dee1d74bcc77217119240e267c" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -1328,12 +1338,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasm-bindgen" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb54f33acc68fd454578d9820b0bde1a1a3d17aa17bb7b6595806d02886d409" +checksum = "a0181c14ddd6c7b8b0b0132a5f1ea2f32be0d893cd3ea97b6e3b28886b8a3d1c" dependencies = [ "cfg-if", - "once_cell", "rustversion", "wasm-bindgen-macro", "wasm-bindgen-shared", @@ -1341,9 +1350,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.79" +version = "0.4.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbab34de2d982e9b48e18d216d04c4a6f641066ff19ffb699980f591ee3610e" +checksum = "5e14e0327cb5368ad60ccb22d04a9827a693c95a926d8d125e9fa39e0baec501" dependencies = [ "js-sys", "tokio", @@ -1352,9 +1361,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e29d0c35b16e224a7eeb5cd2d25e3e1968fbd65604117b44d3b789d00ee8535" +checksum = "6e931a02a39abdbf66966fc35902b5ed58344750a70885bed4ebb3d8eaf28ed9" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1362,22 +1371,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f501a8bc3719dba86ef8ae4728879c08001bea749eb1333ac5b91e040e2a6b7" +checksum = "2ca4b54280e455bd831e33a6b8e734baf432fe63fbc35c42ac14ce67a043a53a" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.10", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f0c9c52aa7cd7d77769a4cfe2a9adb1b331f489a41d912ce14513d5ab995c6" +checksum = "3b1f9c3798725016c6ee5f2f57869ec0831e8bbc0ab0310a86e787e97f41389e" dependencies = [ "unicode-ident", ] @@ -1395,9 +1404,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.106" +version = "0.3.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88261b9deccee56594c11a3460c462c41f58d148598fe70ad77070126a68aba4" +checksum = "d7d179596ff5ec0f6de4db64d54011bde6289cc49603d3a6e4ce3f329207ab88" dependencies = [ "js-sys", "wasm-bindgen", @@ -1594,9 +1603,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" +checksum = "417ef3fcf6c300b7dbd25c85531a746931c02ad536f3cf4786ed1e88223340b3" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -1611,7 +1620,7 @@ checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.10", "synstructure", ] @@ -1632,7 +1641,7 @@ checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.10", "synstructure", ] @@ -1649,9 +1658,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8" +checksum = "f58a2799cfe9a1670c7ea8edbd52ef8edb93cb37a7f83bf31ba9e35d9dae6a40" dependencies = [ "yoke", "zerofrom", @@ -1660,13 +1669,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" +checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.8", + "syn 3.0.10", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1c515cff..59e43215 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ features = [ ] [patch.crates-io] -patternfly-yew = { git = "https://github.com/patternfly-yew/patternfly-yew", rev = "40d93dd0" } # Banner support, awaiting release +#patternfly-yew = { git = "https://github.com/patternfly-yew/patternfly-yew", rev = "40d93dd0" } # Banner support, awaiting release #patternfly-yew = { path = "../patternfly-yew" } #patternfly-yew = { git = "https://github.com/patternfly-yew/patternfly-yew", rev = "9d1715d57e6ae801dec48fcfd89c4e6bd5a89366" } # FIXME: awaiting release #yew-nested-router = { path = "../yew-nested-router" } diff --git a/src/app/mod.rs b/src/app/mod.rs index 45267cbb..64db8528 100644 --- a/src/app/mod.rs +++ b/src/app/mod.rs @@ -38,6 +38,7 @@ pub enum Component { FileUpload, Form(Form), HelperText, + Hero, Hint, Label, List, @@ -58,6 +59,7 @@ pub enum Component { Table, Text, TextInputGroup, + Timestamp, Title, Toast, ToggleGroup, @@ -97,6 +99,7 @@ pub enum Layout { Flex, Gallery, Grid, + Level, Split, Stack, } @@ -162,6 +165,7 @@ fn switch_app_route(target: AppRoute) -> Html { Component::Form(Form::Checkbox) => html! { }, Component::Form(Form::Radio) => html! { }, Component::HelperText => html! { }, + Component::Hero => html! { }, Component::Hint => html! { }, Component::Label => html! { }, Component::List => html! { }, @@ -183,6 +187,7 @@ fn switch_app_route(target: AppRoute) -> Html { Component::Tabs(current) => html! { }, Component::Text => html! { }, Component::TextInputGroup => html! { }, + Component::Timestamp => html! { }, Component::Title => html! { }, Component::Toast => html! { }, Component::ToggleGroup => html! { }, @@ -196,6 +201,7 @@ fn switch_app_route(target: AppRoute) -> Html { Layout::Flex => html! { }, Layout::Gallery => html! { }, Layout::Grid => html! { }, + Layout::Level => html! { }, Layout::Split => html! { }, Layout::Stack => html! { }, }; @@ -401,6 +407,9 @@ fn page(props: &PageProps) -> Html { to={AppRoute::Component(Component::HelperText)}> { "HelperText" } > + to={AppRoute::Component(Component::Hero)}> + { "Hero" } + > to={AppRoute::Component(Component::Hint)}> { "Hint" } > @@ -477,6 +486,9 @@ fn page(props: &PageProps) -> Html { > { "Text Input Group" } > + to={AppRoute::Component(Component::Timestamp)}> + { "Timestamp" } + > to={AppRoute::Component(Component::Title)}> { "Title" } > @@ -509,6 +521,9 @@ fn page(props: &PageProps) -> Html { to={AppRoute::Layout(Layout::Grid)}> { "Grid" } > + to={AppRoute::Layout(Layout::Level)}> + { "Level" } + > to={AppRoute::Layout(Layout::Split)}> { "Split" } > diff --git a/src/components/avatar/avatar.4.example b/src/components/avatar/avatar.4.example new file mode 100644 index 00000000..ba29cf4a --- /dev/null +++ b/src/components/avatar/avatar.4.example @@ -0,0 +1,9 @@ +html!( + + { for AvatarColor::ALL.into_iter().map(|color| html_nested!( + + + + )) } + +) diff --git a/src/components/avatar/avatar.5.example b/src/components/avatar/avatar.5.example new file mode 100644 index 00000000..079c6f9d --- /dev/null +++ b/src/components/avatar/avatar.5.example @@ -0,0 +1,13 @@ +html!( + + + + + + + + + + + +) diff --git a/src/components/avatar/mod.rs b/src/components/avatar/mod.rs index a80cacc8..faa8a809 100644 --- a/src/components/avatar/mod.rs +++ b/src/components/avatar/mod.rs @@ -7,10 +7,14 @@ pub fn avatar() -> Html { let example1 = example! ("Basic" => "avatar.1.example"); let example2 = example! ("Size Variations" => "avatar.2.example"); let example3 = example! ("Border Styles" => "avatar.3.example"); + let example4 = example! ("Color modifiers" => "avatar.4.example"); + let example5 = example! ("With initials" => "avatar.5.example"); html! { <> - { example1 }{ example2 }{ example3 } + + { example1 }{ example4 }{ example5 }{ example2 }{ example3 } + } } diff --git a/src/components/hero/hero.1.example b/src/components/hero/hero.1.example new file mode 100644 index 00000000..bd866cb6 --- /dev/null +++ b/src/components/hero/hero.1.example @@ -0,0 +1,20 @@ +html!( + + +

{ "Welcome to PatternFly" }

+

+ { "Build consistent, accessible, and scalable user experiences. \ + Get started with components, patterns, and guidelines." } +

+
+
+ + + + + + + + +
+) diff --git a/src/components/hero/hero.2.example b/src/components/hero/hero.2.example new file mode 100644 index 00000000..cf92b6f0 --- /dev/null +++ b/src/components/hero/hero.2.example @@ -0,0 +1,11 @@ +html!( + + +

{ "A hero with a gradient" }

+

{ "Light and dark themes use separate gradients. Each stop accepts any valid CSS color." }

+
+
+) diff --git a/src/components/hero/hero.3.example b/src/components/hero/hero.3.example new file mode 100644 index 00000000..1ea643e6 --- /dev/null +++ b/src/components/hero/hero.3.example @@ -0,0 +1,11 @@ +html!( + + +

{ "A hero with a background image" }

+

{ "Provide distinct light and dark theme assets, and keep enough contrast with the text." }

+
+
+) diff --git a/src/components/hero/hero.4.example b/src/components/hero/hero.4.example new file mode 100644 index 00000000..69927e62 --- /dev/null +++ b/src/components/hero/hero.4.example @@ -0,0 +1,11 @@ +html!( + + +

{ "Narrow body" }

+

+ { "Use the body width and max-width to control where the text sits, \ + for example when no background image is used." } +

+
+
+) diff --git a/src/components/hero/mod.rs b/src/components/hero/mod.rs new file mode 100644 index 00000000..b6846bf8 --- /dev/null +++ b/src/components/hero/mod.rs @@ -0,0 +1,17 @@ +use crate::{example, example::ExamplePage}; +use patternfly_yew::prelude::*; +use yew::prelude::*; + +#[function_component(HeroExample)] +pub fn hero_example() -> Html { + let example1 = example! ("Basic" => "hero.1.example"); + let example2 = example! ("With gradient" => "hero.2.example"); + let example3 = example! ("With background image" => "hero.3.example"); + let example4 = example! ("Custom body width" => "hero.4.example"); + + html! { + + { example1 }{ example2 }{ example3 }{ example4 } + + } +} diff --git a/src/components/mod.rs b/src/components/mod.rs index 258dcbb4..800d14ec 100644 --- a/src/components/mod.rs +++ b/src/components/mod.rs @@ -21,6 +21,7 @@ mod expandable_section; mod file_upload; mod form; mod helper_text; +mod hero; mod hint; mod label; mod list; @@ -41,6 +42,7 @@ mod table; mod tabs; mod text; mod text_input_group; +mod timestamp; mod title; mod toast; mod toggle_group; @@ -71,6 +73,7 @@ pub use expandable_section::*; pub use file_upload::*; pub use form::*; pub use helper_text::*; +pub use hero::*; pub use hint::*; pub use label::*; pub use list::*; @@ -91,6 +94,7 @@ pub use table::*; pub use tabs::*; pub use text::*; pub use text_input_group::*; +pub use timestamp::*; pub use title::*; pub use toast::*; pub use toggle_group::*; diff --git a/src/components/timestamp/mod.rs b/src/components/timestamp/mod.rs new file mode 100644 index 00000000..87fbeb51 --- /dev/null +++ b/src/components/timestamp/mod.rs @@ -0,0 +1,19 @@ +use crate::{example, example::ExamplePage}; +use patternfly_yew::prelude::*; +use yew::prelude::*; + +#[function_component(TimestampExample)] +pub fn timestamp_example() -> Html { + let example1 = example! ("Default" => "timestamp.1.example"); + let example2 = example! ("Basic formats" => "timestamp.2.example"); + let example3 = example! ("Custom format" => "timestamp.3.example"); + let example4 = example! ("Default tooltip" => "timestamp.4.example"); + let example5 = example! ("Custom content" => "timestamp.5.example"); + let example6 = example! ("Custom tooltip" => "timestamp.6.example"); + + html! { + + { example1 }{ example2 }{ example3 }{ example4 }{ example5 }{ example6 } + + } +} diff --git a/src/components/timestamp/timestamp.1.example b/src/components/timestamp/timestamp.1.example new file mode 100644 index 00000000..a4e26395 --- /dev/null +++ b/src/components/timestamp/timestamp.1.example @@ -0,0 +1,15 @@ +{ + let date = chrono::DateTime::parse_from_rfc3339("2022-08-09T14:57:00Z") + .unwrap() + .with_timezone(&chrono::Utc); + + html!( + <> + +
+ +
+ + + ) +} diff --git a/src/components/timestamp/timestamp.2.example b/src/components/timestamp/timestamp.2.example new file mode 100644 index 00000000..875dab0c --- /dev/null +++ b/src/components/timestamp/timestamp.2.example @@ -0,0 +1,22 @@ +html!( + <> + +
+ +
+ +
+ +
+ + +) diff --git a/src/components/timestamp/timestamp.3.example b/src/components/timestamp/timestamp.3.example new file mode 100644 index 00000000..bdfe3e64 --- /dev/null +++ b/src/components/timestamp/timestamp.3.example @@ -0,0 +1,11 @@ +html!( + +) diff --git a/src/components/timestamp/timestamp.4.example b/src/components/timestamp/timestamp.4.example new file mode 100644 index 00000000..6b0e989a --- /dev/null +++ b/src/components/timestamp/timestamp.4.example @@ -0,0 +1,15 @@ +html!( + <> + +
+ + +) diff --git a/src/components/timestamp/timestamp.5.example b/src/components/timestamp/timestamp.5.example new file mode 100644 index 00000000..854447bc --- /dev/null +++ b/src/components/timestamp/timestamp.5.example @@ -0,0 +1,14 @@ +{ + let date = chrono::Utc::now() - chrono::Duration::hours(1); + + html!( + + { "1 hour ago" } + + ) +} diff --git a/src/components/timestamp/timestamp.6.example b/src/components/timestamp/timestamp.6.example new file mode 100644 index 00000000..488bb3b7 --- /dev/null +++ b/src/components/timestamp/timestamp.6.example @@ -0,0 +1,3 @@ +html!( + +) diff --git a/src/layouts/level/level.1.example b/src/layouts/level/level.1.example new file mode 100644 index 00000000..11f9d74e --- /dev/null +++ b/src/layouts/level/level.1.example @@ -0,0 +1,7 @@ +html!{ + + {"Level Item"} + {"Level Item"} + {"Level Item"} + +} \ No newline at end of file diff --git a/src/layouts/level/level.2.example b/src/layouts/level/level.2.example new file mode 100644 index 00000000..7a5f1c78 --- /dev/null +++ b/src/layouts/level/level.2.example @@ -0,0 +1,7 @@ +html!{ + + {"Level Item"} + {"Level Item"} + {"Level Item"} + +} \ No newline at end of file diff --git a/src/layouts/level/mod.rs b/src/layouts/level/mod.rs new file mode 100644 index 00000000..01b98a59 --- /dev/null +++ b/src/layouts/level/mod.rs @@ -0,0 +1,12 @@ +use crate::{example, example::ExamplePage, layouts::LayoutItem}; +use patternfly_yew::prelude::*; +use yew::prelude::*; + +#[function_component(LevelExample)] +pub fn level_example() -> Html { + let example1 = example!("Level" => "level.1.example"); + let example2 = example!("Level (gutter)" => "level.2.example"); + html! { + { example1 }{ example2 } + } +} diff --git a/src/layouts/mod.rs b/src/layouts/mod.rs index 18c54350..28401e46 100644 --- a/src/layouts/mod.rs +++ b/src/layouts/mod.rs @@ -2,6 +2,7 @@ mod bullseye; mod flex; mod gallery; mod grid; +mod level; mod split; mod stack; @@ -9,6 +10,7 @@ pub use bullseye::*; pub use flex::*; pub use gallery::*; pub use grid::*; +pub use level::*; pub use split::*; pub use stack::*; use yew::prelude::*; From 231a3685d1db5b904a975d550a198d7d03e0286f Mon Sep 17 00:00:00 2001 From: Marc-Antoine ARNAUD Date: Fri, 13 Nov 2026 11:40:48 +0100 Subject: [PATCH 2/2] refactor: improve code with clippy --- src/components/avatar/mod.rs | 6 +++++- src/components/hero/mod.rs | 4 +--- src/components/table/table.11.example | 2 +- src/components/timestamp/mod.rs | 7 ++++++- src/full/login_page.rs | 2 +- src/layouts/level/mod.rs | 4 +--- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/components/avatar/mod.rs b/src/components/avatar/mod.rs index faa8a809..b13e0237 100644 --- a/src/components/avatar/mod.rs +++ b/src/components/avatar/mod.rs @@ -13,7 +13,11 @@ pub fn avatar() -> Html { html! { <> - { example1 }{ example4 }{ example5 }{ example2 }{ example3 } + { example1 } + { example4 } + { example5 } + { example2 } + { example3 } } diff --git a/src/components/hero/mod.rs b/src/components/hero/mod.rs index b6846bf8..8785a711 100644 --- a/src/components/hero/mod.rs +++ b/src/components/hero/mod.rs @@ -10,8 +10,6 @@ pub fn hero_example() -> Html { let example4 = example! ("Custom body width" => "hero.4.example"); html! { - - { example1 }{ example2 }{ example3 }{ example4 } - + { example1 }{ example2 }{ example3 }{ example4 } } } diff --git a/src/components/table/table.11.example b/src/components/table/table.11.example index 74e3a978..66e35ea0 100644 --- a/src/components/table/table.11.example +++ b/src/components/table/table.11.example @@ -24,7 +24,7 @@ fn example() -> Html { entries_sorted.sort_by(|a, b| a.foo.cmp(&b.foo)); }, Columns::Second => { - entries_sorted.sort_by(|a, b| a.foo.len().cmp(&b.foo.len())); + entries_sorted.sort_by_key(|a| a.foo.len()); }, _ => {}, }; diff --git a/src/components/timestamp/mod.rs b/src/components/timestamp/mod.rs index 87fbeb51..868e8692 100644 --- a/src/components/timestamp/mod.rs +++ b/src/components/timestamp/mod.rs @@ -13,7 +13,12 @@ pub fn timestamp_example() -> Html { html! { - { example1 }{ example2 }{ example3 }{ example4 }{ example5 }{ example6 } + { example1 } + { example2 } + { example3 } + { example4 } + { example5 } + { example6 } } } diff --git a/src/full/login_page.rs b/src/full/login_page.rs index c08be062..47371bfc 100644 --- a/src/full/login_page.rs +++ b/src/full/login_page.rs @@ -45,7 +45,7 @@ pub fn login_page_example() -> Html { if let Some(toaster) = &toaster { toaster.toast(format!( "Login - Username: {}, Password: {}", - &*username, &*password + *username, *password )); } }) diff --git a/src/layouts/level/mod.rs b/src/layouts/level/mod.rs index 01b98a59..37964196 100644 --- a/src/layouts/level/mod.rs +++ b/src/layouts/level/mod.rs @@ -6,7 +6,5 @@ use yew::prelude::*; pub fn level_example() -> Html { let example1 = example!("Level" => "level.1.example"); let example2 = example!("Level (gutter)" => "level.2.example"); - html! { - { example1 }{ example2 } - } + html! { { example1 }{ example2 } } }