yewstack · siku2 · Sep 21, 2020 · Sep 14, 2020 · Sep 14, 2020 · Sep 14, 2020
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,7 +37,7 @@ members = [
   "examples/dashboard",
   "examples/file_upload",
   "examples/fragments",
-  "examples/futures_wp",
+  "examples/futures",
   "examples/game_of_life",
   "examples/inner_html",
   "examples/js_callback",

diff --git a/_PR.md b/_PR.md
@@ -0,0 +1,58 @@
+# Changes
+
+This is just the file I'm using to keep track of everything. It won't be part of the final PR.
+
+## TODO
+
+- update all examples
+- update examples for yew-router (fix #1377)
+- update examples for yewtil
+
+## Somewhat related issues
+
+- #1073 (should probably be closed now)
+- #1016 (promises some good stylin' for the examples but it's been a while)
+
+## Examples
+
+## 1. counter
+
+## 2. crm
+
+Modified to make the example more modular.
+What used to be a single component handling a lot of message spaghetti is now split into dedicated components.
+
+## 3. custom_components
+
+**Should be updated or removed**.
+
+## 4. dashboard
+
+## 5. file_upload
+
+## 5. fragments
+
+**Should be updated or removed**.
+
+## 6. futures
+
+Renamed from "futures_wp".
+
+## 7. game_of_life
+
+Split code across two files.
+
+## 8. inner_html
+
+## 16. multithread
+
+**TODO** this example is special!
+
+## 25. todomvc
+
+Split `State` into a separate file to make it more manageable.
+Updates TodoMVC CSS to latest version.
+
+## 26. two_apps
+
+## 26. webgl
diff --git a/examples/.gitignore b/examples/.gitignore
@@ -1,5 +1 @@
-*/static/package.json
-*/static/wasm_bg.wasm
-*/static/wasm_bg.d.ts
-*/static/wasm.d.ts
-*/static/wasm.js
+*/dist/
diff --git a/examples/README.md b/examples/README.md
@@ -1,43 +1,15 @@
 # Yew Examples
 
-In order to run the examples, we provide the `run_example.sh` script.
-This script takes care of compiling the example and runs a web server for you.
-All that's left is for you to play around with the examples :).
-
-> **A note for Windows users:**<br>
-> Depending on how you installed `git` you will already have a bash emulator at your disposal. This allows you to run the `run_example.sh` script (and any other bash script) normally.<br>
-> See <https://gitforwindows.org/#bash> for more information.
->
-> We're always trying to improve the developer experience for developers across all platforms.
-> There's an ongoing effort to replace the bash scripts with a Rust command line tool ([#1418](https://github.com/yewstack/yew/issues/1418)).
-> If at any point you encounter an issue, don't hesitate to ask a question or open an issue.
-
 ## Dependencies
 
-Before we can run the examples we need to get a few things ready.
-
-Some examples currently use `wasm-bindgen` and others use `wasm-pack`.
-You can install them both using the following command:
+The examples are built with [trunk](https://github.com/thedodd/trunk).
+You can install it with the following command:
 
 ```bash
-cargo install wasm-pack wasm-bindgen-cli
+# at some point in the future, trunk should automatically download wasm-bindgen for you
+cargo install trunk wasm-bindgen-cli
 ```
 
-### Optional dependencies
-
-We've written a small web server which you can use to serve the built examples. In order to
-use it, you'll need to have installed Python (3.6 or greater).
-You can also use a different web server, provided that it can serve static files from a directory.
-
-> **Note:**<br>
-> Some examples don't have an `index.html` file in their static directory.
-> The python web server handles this by serving a default index file.
-> If you aren't using it, you will need to create the index file manually.
-
-One alternative to the built-in web server there is an extension for [Visual Studio Code](https://code.visualstudio.com/) called [Live Server](https://marketplace.visualstudio.com/items?itemName=ritwickdey.LiveServer).
-This extension is used to serve static files.
-To do so, open the `index.html` file in the static directory of the example you wish to run and press "Open with Live Server" in the context menu.
-
 ## Run an example
 
 ```bash
@@ -48,54 +20,50 @@ git clone https://github.com/yewstack/yew.git
 cd yew/examples
 
 # run the "todomvc" example
-./run_example.sh todomvc
+cd todomvc
+trunk serve
 ```
 
-## Script options
-
-The general structure of the command looks like this:<br>
-`./run_example.sh <example> [OPTIONS]`
-
-`<example>` is the name of the example (i.e. the name of the directory).
-
-The following table describes all possible options:
-
-| Option                   | Description                                                                                                         |
-| ------------------------ | ------------------------------------------------------------------------------------------------------------------- |
-| `--debug`<br>`--release` | Specifies which profile to use for `cargo build`. Defaults to `--debug`.                                            |
-| `--build-only`           | Disables the built-in server.<br>Use this if you don't have Python installed or if you want to use your own server. |
+Some examples will may require additional steps.
+In those cases, instructions are placed in the example's README.md file.
 
 ## List of examples
 
-| Example                                | Description                                                                                                                        | Has README |
-| -------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | :--------: |
-| [counter](counter)                     | A single component which displays a stateful number. The number can be incremented and decremented using buttons                   |     ✖      |
-| [crm](crm)                             | See the `README` file for details                                                                                                  |     ✔      |
-| [custom_components](custom_components) | Demonstrates the use of components                                                                                                 |     ✔      |
-| [dashboard](dashboard)                 | Uses the `fetch` and `websocket` services to load external data                                                                    |     ✔      |
-| [file_upload](file_upload)             | Uses the `reader` service to read the content of user uploaded files                                                               |     ✖      |
-| [fragments](fragments)                 | Similar to the counter example but demonstrating the use of [fragments](https://yew.rs/docs/concepts/html/lists#fragments)         |     ✖      |
-| [futures_wp](futures_wp)               | Demonstrates how you can use futures and async code with Yew. Features a Markdown renderer.                                        |     ✔      |
-| [game_of_life](game_of_life)           | Implementation of [Conway's Game of Life](https://en.wikipedia.org/wiki/Conway%27s_Game_of_Life)                                   |     ✖      |
-| [inner_html](inner_html)               | Embeds an external document as raw HTML by manually managing the element                                                           |     ✖      |
-| [js_callback](js_callback)             | Interacts with JavaScript code                                                                                                     |     ✔      |
-| [keyed_list](keyed_list)               | Demonstrates how to use keys to improve the performance of lists                                                                   |     ✖      |
-| [large_table](large_table)             | Renders a big table which highlights the selected cell                                                                             |     ✖      |
-| [minimal](minimal)                     | A simple button that listens to click events                                                                                       |     ✖      |
-| [minimal_wp](minimal)                  | Same as the minimal example but using `wasm-pack`                                                                                  |     ✖      |
-| [mount_point](mount_point)             | Shows how to mount the root component to a custom element                                                                          |     ✖      |
-| [multi_thread](multi_thread)           | Demonstrates the use of Web Workers to offload computation to the background                                                       |     ✔      |
-| [nested_list](nested_list)             | Renders a styled list which tracks hover events                                                                                    |     ✖      |
-| [node_refs](node_refs)                 | Uses a [`NodeRef`](https://yew.rs/docs/concepts/components/refs) to focus the input element under the cursor                       |     ✖      |
-| [npm_and_rest](npm_and_rest)           | A more elaborate demonstration of the `fetch` service                                                                              |     ✖      |
-| [pub_sub](pub_sub)                     | Cross-component communication using [Agents](https://yew.rs/docs/concepts/agents)                                                  |     ✔      |
-| [store](store)                         | Showcases the `yewtil::store` API                                                                                                  |     ✔      |
-| [textarea](textarea)                   | Shows how to use the value of a textarea or input tag                                                                              |     ✖      |
-| [timer](timer)                         | Demonstrates the use of the interval and timeout services                                                                          |     ✖      |
-| [todomvc](todomvc)                     | Implementation of the [TodoMVC](http://todomvc.com/) app                                                                           |     ✔      |
-| [two_apps](two_apps)                   | Runs two separate Yew apps at the same time                                                                                        |     ✖      |
-| [webgl](webgl)                         | Controls a [WebGL canvas](https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/Tutorial/Getting_started_with_WebGL) from Yew |     ✔      |
+| Example                                | Description                                                                                                                        |
+| -------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- |
+| [counter](counter)                     | A single component which displays a stateful number. The number can be incremented and decremented using buttons                   |
+| [crm](crm)                             | See the `README` file for details                                                                                                  |
+| [custom_components](custom_components) | Demonstrates the use of components                                                                                                 |
+| [dashboard](dashboard)                 | Uses the `fetch` and `websocket` services to load external data                                                                    |
+| [file_upload](file_upload)             | Uses the `reader` service to read the content of user uploaded files                                                               |
+| [fragments](fragments)                 | Similar to the counter example but demonstrating the use of [fragments](https://yew.rs/docs/concepts/html/lists#fragments)         |
+| [futures_wp](futures_wp)               | Demonstrates how you can use futures and async code with Yew. Features a Markdown renderer.                                        |
+| [game_of_life](game_of_life)           | Implementation of [Conway's Game of Life](https://en.wikipedia.org/wiki/Conway%27s_Game_of_Life)                                   |
+| [inner_html](inner_html)               | Embeds an external document as raw HTML by manually managing the element                                                           |
+| [js_callback](js_callback)             | Interacts with JavaScript code                                                                                                     |
+| [keyed_list](keyed_list)               | Demonstrates how to use keys to improve the performance of lists                                                                   |
+| [large_table](large_table)             | Renders a big table which highlights the selected cell                                                                             |
+| [minimal](minimal)                     | A simple button that listens to click events                                                                                       |
+| [minimal_wp](minimal)                  | Same as the minimal example but using `wasm-pack`                                                                                  |
+| [mount_point](mount_point)             | Shows how to mount the root component to a custom element                                                                          |
+| [multi_thread](multi_thread)           | Demonstrates the use of Web Workers to offload computation to the background                                                       |
+| [nested_list](nested_list)             | Renders a styled list which tracks hover events                                                                                    |
+| [node_refs](node_refs)                 | Uses a [`NodeRef`](https://yew.rs/docs/concepts/components/refs) to focus the input element under the cursor                       |
+| [npm_and_rest](npm_and_rest)           | A more elaborate demonstration of the `fetch` service                                                                              |
+| [pub_sub](pub_sub)                     | Cross-component communication using [Agents](https://yew.rs/docs/concepts/agents)                                                  |
+| [store](store)                         | Showcases the `yewtil::store` API                                                                                                  |
+| [textarea](textarea)                   | Shows how to use the value of a textarea or input tag                                                                              |
+| [timer](timer)                         | Demonstrates the use of the interval and timeout services                                                                          |
+| [todomvc](todomvc)                     | Implementation of the [TodoMVC](http://todomvc.com/) app                                                                           |
+| [two_apps](two_apps)                   | Runs two separate Yew apps at the same time                                                                                        |
+| [webgl](webgl)                         | Controls a [WebGL canvas](https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/Tutorial/Getting_started_with_WebGL) from Yew |
 
 ## Next steps
 
 Have a look at Yew's [starter templates](https://yew.rs/docs/getting-started/starter-templates) when starting a project using Yew – they can significantly simplify things.
+
+## Help out
+
+Most examples have an "improvements" section in their README.md which lists ways to improve the example.
+
+The biggest point of improvement is the presentation of the examples (ex. styling).
diff --git a/examples/counter/README.md b/examples/counter/README.md
@@ -0,0 +1,11 @@
+# Counter Example
+
+A counter which can be increased or decreased with the press of a button.
+
+## Concepts
+
+Demonstrates the use of messages to update state.
+
+## Improvements
+
+- Improve the presentation of the example with CSS.
diff --git a/examples/counter/index.html b/examples/counter/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>Yew • Counter</title>
+  </head>
+
+  <body></body>
+</html>
diff --git a/examples/counter/src/lib.rs b/examples/counter/src/lib.rs
diff --git a/examples/counter/src/main.rs b/examples/counter/src/main.rs
@@ -1,3 +1,71 @@
+use js_sys::Date;
+use yew::services::ConsoleService;
+use yew::{html, Component, ComponentLink, Html, ShouldRender};
+
+pub enum Msg {
+    Increment,
+    Decrement,
+}
+
+pub struct Model {
+    link: ComponentLink<Self>,
+    value: i64,
+}
+
+impl Component for Model {
+    type Message = Msg;
+    type Properties = ();
+
+    fn create(_props: Self::Properties, link: ComponentLink<Self>) -> Self {
+        Model { link, value: 0 }
+    }
+
+    fn update(&mut self, msg: Self::Message) -> ShouldRender {
+        match msg {
+            Msg::Increment => {
+                self.value += 1;
+                ConsoleService::log("plus one");
+                true
+            }
+            Msg::Decrement => {
+                self.value -= 1;
+                ConsoleService::log("minus one");
+                true
+            }
+        }
+    }
+
+    fn change(&mut self, _props: Self::Properties) -> ShouldRender {
+        unimplemented!()
+    }
+
+    fn view(&self) -> Html {
+        html! {
+            <div>
+                <nav class="menu">
+                    <button onclick=self.link.callback(|_| Msg::Increment)>
+                        { "Increment" }
+                    </button>
+                    <button onclick=self.link.callback(|_| Msg::Decrement)>
+                        { "Decrement" }
+                    </button>
+                    <button onclick=self.link.batch_callback(|_| vec![Msg::Increment, Msg::Increment])>
+                        { "Increment Twice" }
+                    </button>
+                </nav>
+                <p>
+                    <b>{ "Current value: " }</b>
+                    { self.value }
+                </p>
+                <p>
+                    <b>{ "Rendered at: " }</b>
+                    { String::from(Date::new_0().to_string()) }
+                </p>
+            </div>
+        }
+    }
+}
+
 fn main() {
-    yew::start_app::<counter::Model>();
+    yew::start_app::<Model>();
 }