Merge branch 'pr/alexkazik/30'

isosphere · Nov 12, 2023 · bb19075 · bb19075
2 parents af08ffe + b810894
commit bb19075
Show file tree

Hide file tree

Showing 21 changed files with 2,508 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/Cargo.lock b/examples/Cargo.lock
diff --git a/examples/basics/src/main.rs b/examples/basics/src/main.rs
@@ -1,6 +1,7 @@
 use yew::prelude::*;
 
 use yew_bootstrap::component::*;
+use yew_bootstrap::icons::*;
 use yew_bootstrap::util::*;
 
 enum Msg {}
@@ -18,13 +19,13 @@ impl Component for Model {
         let brand = BrandType::BrandIcon {
             text: AttrValue::from("Yew Bootstrap"),
             url: Some(AttrValue::from("https://yew.rs")),
-            icon: AttrValue::from("rocket")
+            icon: BI::ROCKET,
         };
 
         html! {
             <>
                 {include_inline()}
-                {include_cdn_icons()}
+                {BIFiles::cdn()}
                 <NavBar nav_id={"test-nav"} class="navbar-expand-lg navbar-light bg-light" brand={brand}>
                     <NavItem text="link 1" />
                     <NavItem text="link 2" />

diff --git a/examples/forms/src/main.rs b/examples/forms/src/main.rs
@@ -4,6 +4,7 @@ use yew::prelude::*;
 use gloo_console::debug;
 
 use yew_bootstrap::component::*;
+use yew_bootstrap::icons::*;
 use yew_bootstrap::util::*;
 use yew_bootstrap::component::form::*;
 
@@ -156,13 +157,13 @@ impl Component for Model {
         let brand = BrandType::BrandIcon {
             text: AttrValue::from("Yew Bootstrap"),
             url: Some(AttrValue::from("https://yew.rs")),
-            icon: AttrValue::from("rocket")
+            icon: BI::ROCKET,
         };
 
         html! {
             <>
                 {include_inline()}
-                {include_cdn_icons()}
+                {BIFiles::cdn()}
                 <NavBar nav_id={"test-nav"} class="navbar-expand-lg navbar-light bg-light" brand={brand}>
                     <NavItem text="link 1" />
                     <NavItem text="link 2" />

diff --git a/examples/icons/Cargo.toml b/examples/icons/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "icons"
+version = "0.1.0"
+authors = ["ALeX Kazik <alex@kazik.de>"]
+edition = "2021"
+license = "MIT"
+
+[dependencies]
+yew = { version = "0.21", features = ["csr"] }
+yew-bootstrap = { path = "../../packages/yew-bootstrap" }
+
+[[bin]]
+name = "copy-bootstrap-icons"
diff --git a/examples/icons/README.md b/examples/icons/README.md
@@ -0,0 +1,61 @@
+# Example of automatically copying the bootstrap-icons files
+
+This is copies the required files to the `dist` directory, which is recommended.
+
+Please see [the documentation](https://docs.rs/yew-bootstrap/latest/yew_bootstrap/icons/index.html) for more information.
+
+A copy of `bootstrap-icons` is included and should change only rarely. `trunk` does not add a hash to generated files, and thus a change in those files won't be detected by `trunk`. 
+
+## Instructions
+
+1. `Cargo.toml`
+
+   Add the build-executed binary.
+
+    ```toml
+    [[bin]]
+    name = "copy-bootstrap-icons"
+    ```
+
+2. `src/bin/copy-bootstrap-icons.rs`
+
+   Create the program to copy the files.
+
+    ```rust
+    use std::path::PathBuf;
+    use yew_bootstrap::icons::BIFiles;
+
+    fn main() -> Result<(), std::io::Error> {
+        let path = PathBuf::from(
+            std::env::var("TRUNK_STAGING_DIR").expect("Environment variable TRUNK_STAGING_DIR"),
+        )
+        .join(BIFiles::NAME);
+        if !path.is_dir() {
+            std::fs::create_dir(&path)?;
+        }
+        BIFiles::copy(&path)
+    }
+    ```
+
+3. `index.html`
+
+   Set base reference, link the required CSS and specify your WASM program[^1].
+
+   [^1]: Since we'll be writing a build-executed program, there are now two binaries and trunk needs to know which is your WASM binary.
+
+    ```html
+    <base data-trunk-public-url />
+    <link rel="stylesheet" href="bootstrap-icons-v1.10.5/bootstrap-icons.css" />
+    <link data-trunk rel="rust" data-bin="name-of-app" />
+    ```
+
+4. `Trunk.toml`
+
+   Add a hook to run the build-executed program.
+
+    ```toml
+    [[hooks]]
+    stage = "build"
+    command = "cargo"
+    command_arguments = ["run", "--bin", "copy-bootstrap-icons"]
+    ```
diff --git a/examples/icons/Trunk.toml b/examples/icons/Trunk.toml
@@ -0,0 +1,4 @@
+[[hooks]]
+stage = "build"
+command = "cargo"
+command_arguments = ["run", "--bin", "copy-bootstrap-icons"]
diff --git a/examples/icons/index.html b/examples/icons/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <base data-trunk-public-url/>
+    <meta charset="utf-8"/>
+    <title>Yew App</title>
+    <link rel="stylesheet" href="bootstrap-icons-v1.10.5/bootstrap-icons.css"/>
+    <link data-trunk rel="rust" data-bin="icons"/>
+</head>
+</html>
diff --git a/examples/icons/src/bin/copy-bootstrap-icons.rs b/examples/icons/src/bin/copy-bootstrap-icons.rs
@@ -0,0 +1,13 @@
+use std::path::PathBuf;
+use yew_bootstrap::icons::BIFiles;
+
+fn main() -> Result<(), std::io::Error> {
+    let path = PathBuf::from(
+        std::env::var("TRUNK_STAGING_DIR").expect("Environment variable TRUNK_STAGING_DIR"),
+    )
+    .join(BIFiles::NAME);
+    if !path.is_dir() {
+        std::fs::create_dir(&path)?;
+    }
+    BIFiles::copy(&path)
+}
diff --git a/examples/icons/src/main.rs b/examples/icons/src/main.rs
@@ -0,0 +1,13 @@
+use yew::prelude::*;
+use yew_bootstrap::icons::*;
+
+#[function_component(App)]
+fn app() -> Html {
+    html! {
+        <h1>{"I"}<span style="color: red">{BI::HEART_FILL}</span>{BI::GEAR_FILL}</h1>
+    }
+}
+
+fn main() {
+    yew::Renderer::<App>::new().render();
+}
diff --git a/packages/yew-bootstrap/Cargo.toml b/packages/yew-bootstrap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yew-bootstrap"
-version = "0.6.3"
+version = "0.7.0"
 authors = ["Matthew Scheffel <matt@dataheck.com>", "Foorack <max@foorack.com>"]
 edition = "2021"
 license = "MIT"
@@ -23,3 +23,7 @@ log = "0.4"
 [dev-dependencies]
 wasm-bindgen = "0.2.*"
 web-sys = { version = "0.3.*", features = ["HtmlTextAreaElement", "HtmlSelectElement"] }
+
+[build-dependencies]
+convert_case = { version = "0.6.0", default-features = false }
+anyhow = { version = "1.0.75", default-features = false, features = ["std"] }
diff --git a/packages/yew-bootstrap/README.md b/packages/yew-bootstrap/README.md
@@ -7,7 +7,7 @@ Add the dependency next to the regular yew dependency:
 ```toml
 [dependencies]
 yew = "0.21"
-yew-bootstrap = "0.6"
+yew-bootstrap = "0.7"
 ```
 
 To use form callback functions, the following dependencies should be added: