Blit dirty data to the screen instead of everything

.gitea/workflows/actions.yaml

@@ -1,33 +0,0 @@
-name: Monorepo build
-run-name: ${{ gitea.actor }} is testing out Gitea Actions
-on: [push]
-
-jobs:
-  # Explore-Gitea-Actions:
-  #   runs-on: native
-  #   steps:
-  #     - run: echo "The job was automatically triggered by a ${{ gitea.event_name }} event."
-  #     - run: echo "This job is now running on ${{ runner.os }} server hosted by Gitea!"
-  #     - run: echo "The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
-  #     - name: Check out repository code
-  #       uses: actions/checkout@v4
-  #     - run: echo "The ${{ gitea.repository }} repository has been cloned to the runner."
-  #     - run: echo "The workflow is now ready to test your code on the runner."
-  #     - name: List files in the repository
-  #       run: |
-  #         ls ${{ gitea.workspace }}
-  #     - run: echo "This job's status is ${{ job.status }}."
-
-  build-flake:
-    runs-on: nixos
-    defaults.run.working-directory: ${{ gitea.workspace }}
-    steps:
-      - name: Checkout repository code
-        uses: actions/checkout@v4
-      - name: Where am I?
-        run: pwd
-      - name: Build the apps
-        run: /run/current-system/sw/bin/nix --extra-experimental-features "nix-command flakes" build .#all
-      - name: Check the end of the build
-        run: ls ${{ gitea.workspace }}/result/bin
-

Cargo.toml

@@ -2,6 +2,7 @@
 resolver = "2"
 members = [
     "authdb",
+    # "bike-lights/bike",
     "bike-lights/core",
     "bike-lights/simulator",
     "changeset",
@@ -34,7 +35,4 @@ members = [
     "timezone-testing",
     "tree",
     "visions/server",
-    "visions/types",
-    "visions/ui",
-    # "bike-lights/bike",
 ]

flake.nix

@@ -26,7 +26,6 @@
             pkgs.cargo-watch
             pkgs.clang
             pkgs.crate2nix
-            pkgs.trunk
             pkgs.glib
             pkgs.gst_all_1.gst-plugins-bad
             pkgs.gst_all_1.gst-plugins-base

pico-st7789/src/canvas.rs

@@ -8,6 +8,8 @@
 // e       c
 //   d d d
 
+use alloc::vec::Vec;
+
 use crate::font::{Font, Glyph};
 
 pub struct RGB {
@@ -18,10 +20,15 @@ pub struct RGB {
 
 pub trait Canvas {
     fn set_pixel(&mut self, x: usize, y: usize, color: &RGB);
+    fn buf(&self) -> &[u8];
+    fn partial(&self, x1: usize, y1: usize, x2: usize, y2: usize) -> impl Iterator<Item = &[u8]>;
+    fn clean(&mut self);
+    fn dirty(&self) -> Option<(usize, usize, usize, usize)>;
+    fn width(&self) -> usize;
 
     fn fill(&mut self, x1: usize, y1: usize, x2: usize, y2: usize, color: &RGB) {
-        for x in x1..x2 + 1 {
-            for y in y1..y2 + 1 {
+        for x in x1..x2 {
+            for y in y1..y2 {
                 self.set_pixel(x, y, color);
             }
         }

pico-st7789/src/light_sensor.rs

@@ -0,0 +1,42 @@
+use embedded_hal::i2c::{I2c, Error};
+
+const ADDR: u8 = 0x39;
+
+pub struct LightSensor<I2C> {
+    i2c: I2C
+}
+
+impl <I2C: I2c> LightSensor<I2C> {
+    pub fn new(i2c: I2C) -> Self {
+        Self { i2c }
+    }
+
+    pub fn control(&mut self) -> Result<u8, I2C::Error> {
+        let mut ctrl = [0];
+        self.i2c.write_read(ADDR, &[0x80], &mut ctrl)?;
+        Ok(ctrl[0])
+    }
+
+    pub fn power_up(&mut self) -> Result<(), I2C::Error> {
+        self.i2c.write(ADDR, &[0x80, 0x03])?;
+        Ok(())
+    }
+
+    pub fn read_full_spectrum(&mut self) -> Result<u16, I2C::Error> {
+        let mut light_parts = [0, 0];
+        self.i2c.write_read(ADDR, &[0xAC], &mut light_parts)?;
+        let ll: u16 = light_parts[0].into();
+        let lh: u16 = light_parts[1].into();
+        let light: u16 = 256 * lh + ll;
+        Ok(light)
+    }
+
+    pub fn read_ir(&mut self) -> Result<u16, I2C::Error> {
+        let mut light_parts = [0, 0];
+        self.i2c.write_read(ADDR, &[0xAE], &mut light_parts)?;
+        let ll: u16 = light_parts[0].into();
+        let lh: u16 = light_parts[1].into();
+        let light: u16 = 256 * lh + ll;
+        Ok(light)
+    }
+}

pico-st7789/src/main.rs

@@ -3,23 +3,38 @@
 
 extern crate alloc;
 
-use alloc::fmt::format;
+use alloc::{
+    fmt::format,
+    vec::{self, Vec},
+};
 use embedded_alloc::LlffHeap as Heap;
 use embedded_hal::{delay::DelayNs, digital::OutputPin};
 use fugit::RateExtU32;
+use light_sensor::LightSensor;
 use panic_halt as _;
 use rp_pico::{
     entry,
-    hal::{clocks::init_clocks_and_plls, spi::Spi, Clock, Sio, Timer, Watchdog},
+    hal::{
+        clocks::init_clocks_and_plls,
+        gpio::{
+            bank0::{Gpio20, Gpio21},
+            FunctionI2C, Pin, PullUp,
+        },
+        i2c::I2C,
+        spi::Spi,
+        Clock, Sio, Timer, Watchdog,
+    },
     pac, Pins,
 };
 
 mod canvas;
-use canvas::{Canvas, RGB, print};
+use canvas::{print, Canvas, RGB};
 
 mod font;
 use font::{BitmapFont, Font, Glyph, SevenSegmentFont, SixteenSegmentFont};
 
+mod light_sensor;
+
 mod st7789;
 use st7789::{ST7789Display, SETUP_PROGRAM};
 
@@ -36,6 +51,7 @@ static mut BUF: [u8; 163200] = [0; 163200];
 
 pub struct FrameBuf {
     pub buf: &'static mut [u8; 163200],
+    pub dirty: Option<(usize, usize, usize, usize)>,
     pub width: usize,
 }
 
@@ -43,6 +59,7 @@ impl FrameBuf {
     pub fn new() -> Self {
         Self {
             buf: unsafe { &mut BUF },
+            dirty: None,
             width: 170,
         }
     }
@@ -50,9 +67,51 @@ impl FrameBuf {
 
 impl Canvas for FrameBuf {
     fn set_pixel(&mut self, x: usize, y: usize, color: &RGB) {
-        self.buf[(y * self.width + x) * 3 + 0] = color.r << 2;
-        self.buf[(y * self.width + x) * 3 + 1] = color.g << 2;
-        self.buf[(y * self.width + x) * 3 + 2] = color.b << 2;
+        let addr = y * self.width + x;
+        self.buf[addr * 3 + 0] = color.r << 2;
+        self.buf[addr * 3 + 1] = color.g << 2;
+        self.buf[addr * 3 + 2] = color.b << 2;
+
+        if let Some((ref mut x1, ref mut y1, ref mut x2, ref mut y2)) = self.dirty {
+            if x < *x1 {
+                *x1 = x
+            }
+            if y < *y1 {
+                *y1 = y
+            }
+            if x > *x2 {
+                *x2 = x
+            }
+            if y > *y2 {
+                *y2 = y
+            }
+        } else {
+            self.dirty = Some((x, y, x, y));
+        }
+    }
+
+    fn buf(&self) -> &[u8] {
+        self.buf
+    }
+
+    fn partial(&self, x1: usize, y1: usize, x2: usize, y2: usize) -> impl Iterator<Item = &[u8]> {
+        (y1..y2 + 1).map(move |y| {
+            let start = (y * self.width + x1) * 3;
+            let end = (y * self.width + x2) * 3;
+            &self.buf[start..end]
+        })
+    }
+
+    fn clean(&mut self) {
+        self.dirty = None;
+    }
+
+    fn dirty(&self) -> Option<(usize, usize, usize, usize)> {
+        self.dirty
+    }
+
+    fn width(&self) -> usize {
+        self.width
     }
 }
 
@@ -116,6 +175,9 @@ unsafe fn main() -> ! {
     let mut data_command = pins.gpio15.into_function();
     let mut reset = pins.gpio14.into_function();
 
+    let i2c_clk: Pin<Gpio21, FunctionI2C, PullUp> = pins.gpio21.reconfigure();
+    let i2c_sdo: Pin<Gpio20, FunctionI2C, PullUp> = pins.gpio20.reconfigure();
+
     let _ = reset.set_low();
     let _ = board_select.set_high();
     let _ = data_command.set_high();
@@ -132,6 +194,17 @@ unsafe fn main() -> ! {
         embedded_hal::spi::MODE_3,
     );
 
+    let i2c = I2C::i2c0(
+        peripherals.I2C0,
+        i2c_sdo,
+        i2c_clk,
+        400.kHz(),
+        &mut peripherals.RESETS,
+        125_000_000.Hz(),
+    );
+
+    let mut light_sensor = LightSensor::new(i2c);
+
     let mut display = ST7789Display::new(board_select, data_command, spi);
 
     let _ = reset.set_high();
@@ -148,37 +221,124 @@ unsafe fn main() -> ! {
     let mut canvas = Canvas::new(&mut framebuf, COLUMNS);
     */
     let mut canvas = FrameBuf::new();
-    let white = RGB { r: 63, g: 63, b: 63 };
+    let white = RGB {
+        r: 63,
+        g: 63,
+        b: 63,
+    };
     let mut count = 0;
 
-    loop {
-        canvas.fill(0, 10, 170, 20, &RGB{r: 0, g: 0, b: 0 });
-        print(&mut canvas, &font_bitmap, 1, 10, &format(format_args!("COUNT: {:03}", count)), &RGB{ r: 32, g: 32, b: 63 });
-        print(&mut canvas, &font_bitmap, 1, 200, " !\"#$%&'<>*+,-./", &RGB{ r: 63, g: 63, b: 63 });
-        print(&mut canvas, &font_bitmap, 1, 220, "0123456789|: = ?", &RGB{ r: 63, g: 63, b: 63 });
-        print(&mut canvas, &font_bitmap, 1, 240, "@ABCDEFGHIJKLMNO", &RGB{ r: 63, g: 63, b: 63 });
-        print(&mut canvas, &font_bitmap, 1, 260, "PQRSTUVWXYZ[\\]^_", &RGB{ r: 63, g: 63, b: 63 });
-        print(&mut canvas, &font_bitmap, 1, 280, "`abcdefghijklmno", &RGB{ r: 63, g: 63, b: 63 });
-        print(&mut canvas, &font_bitmap, 1, 300, "pqrstuvwxyz{|}", &RGB{ r: 63, g: 63, b: 63 });
+    light_sensor.power_up();
+    match light_sensor.control() {
+        Ok(v) if v == 0 => print(
+            &mut canvas,
+            &font_bitmap,
+            0,
+            0,
+            &format(format_args!("POWER_DOWN")),
+            &RGB {
+                r: 63,
+                g: 16,
+                b: 16,
+            },
+        ),
+        Ok(_) => {}
+        Err(err) => print(
+            &mut canvas,
+            &font_bitmap,
+            0,
+            0,
+            &format(format_args!("ERROR: {:?}", err)),
+            &RGB {
+                r: 63,
+                g: 16,
+                b: 16,
+            },
+        ),
+    }
 
-        // canvas.square(10, 70, 160, 310, &white);
+    {
+        let display = display.acquire();
+        display.blit_frame(&canvas);
+    }
+
+    loop {
+        canvas.fill(0, 0, 170, 60, &RGB { r: 0, g: 0, b: 0 });
+        if let Some((x1, y1, x2, y2)) = canvas.dirty() {
+            print(
+                &mut canvas,
+                &font_bitmap,
+                0,
+                0,
+                &format(format_args!("{} {} {} {}", x1, y1, x2, y2)),
+                &RGB {
+                    r: 63,
+                    g: 63,
+                    b: 63,
+                },
+            );
+        }
+
+        match light_sensor.read_full_spectrum() {
+            Ok(full) => print(
+                &mut canvas,
+                &font_bitmap,
+                0,
+                20,
+                &format(format_args!("FULL: {}", full)),
+                &RGB {
+                    r: 63,
+                    g: 63,
+                    b: 63,
+                },
+            ),
+            Err(err) => print(
+                &mut canvas,
+                &font_bitmap,
+                0,
+                20,
+                &format(format_args!("FULL: {:?}", err)),
+                &RGB {
+                    r: 63,
+                    g: 16,
+                    b: 16,
+                },
+            ),
+        }
+        match light_sensor.read_ir() {
+            Ok(ir) => print(
+                &mut canvas,
+                &font_bitmap,
+                0,
+                40,
+                &format(format_args!("IR:   {}", ir)),
+                &RGB {
+                    r: 63,
+                    g: 63,
+                    b: 63,
+                },
+            ),
+            Err(err) => print(
+                &mut canvas,
+                &font_bitmap,
+                0,
+                40,
+                &format(format_args!("IR:   {:?}", err)),
+                &RGB {
+                    r: 63,
+                    g: 16,
+                    b: 16,
+                },
+            ),
+        }
 
         {
             let display = display.acquire();
             let _ = led.set_high();
-            timer.delay_ms(100);
-            display.send_buf(canvas.buf);
+            display.blit_dirty(&canvas);
             let _ = led.set_low();
         }
-        count = count + 1;
-        /*
-        for x in 80..90 {
-            for y in 155..165 {
-                draw_pixel(&mut frame, x, y, (0, 0, 63));
-            }
-        }
-        */
 
-        timer.delay_ms(1000);
+        timer.delay_ms(100);
     }
 }

pico-st7789/src/st7789.rs

@@ -5,6 +5,8 @@ use rp_pico::hal::{
     Spi, Timer,
 };
 
+use crate::canvas::Canvas;
+
 pub struct Step {
     param_cnt: usize,
     command: u8,
@@ -185,14 +187,52 @@ impl<BoardSelectId: PinId, DataCommandId: PinId, D: SpiDevice, Pinout: ValidSpiP
         }
     }
 
-    pub fn send_buf(&mut self, frame: &[u8]) {
+    pub fn blit_frame(&mut self, frame: &impl Canvas) {
         // let _ = DISPOFF.send_command(&mut self.spi, &mut self.data_command);
         let _ = self.data_command.set_low();
         let _ = self.spi.write(&[RAMWR]);
         let _ = self.data_command.set_high();
-        let _ = self.spi.write(&frame);
+        let _ = self.spi.write(frame.buf());
         // let _ = DISPON.send_command(&mut self.spi, &mut self.data_command);
     }
+
+    pub fn blit_dirty(&mut self, frame: &impl Canvas) {
+        if let Some((start_x, start_y, end_x, end_y)) = frame.dirty() {
+            let end_y = end_y + 60;
+            Step {
+                param_cnt: 4,
+                command: 0x30,
+                params: [
+                    (start_y >> 8 & 0xff) as u8,
+                    (start_y & 0xff) as u8,
+                    (end_y >> 8 & 0xff) as u8,
+                    (end_y & 0xff) as u8,
+                ],
+                delay: None,
+            }
+            .send_command(&mut self.spi, &mut self.data_command);
+            Step {
+                param_cnt: 0,
+                command: 0x12,
+                params: [0, 0, 0, 0],
+                delay: None,
+            }
+            .send_command(&mut self.spi, &mut self.data_command);
+            let _ = self.data_command.set_low();
+            let _ = self.spi.write(&[RAMWR]);
+            let _ = self.data_command.set_high();
+            for row in frame.partial(0, start_y, frame.width(), end_y) {
+                let _ = self.spi.write(row);
+            }
+            Step {
+                param_cnt: 0,
+                command: 0x13,
+                params: [0, 0, 0, 0],
+                delay: None,
+            }
+            .send_command(&mut self.spi, &mut self.data_command);
+        }
+    }
 }
 
 impl<BoardSelectId: PinId, DataCommandId: PinId, D: SpiDevice, Pinout: ValidSpiPinout<D>> Drop

visions/server/Cargo.toml

@@ -4,12 +4,3 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-axum = { version = "0.8.1", features = ["macros"] }
-visions-types = { path = "../types" }
-serde = { version = "1.0.217", features = ["derive", "serde_derive"] }
-tokio = { version = "1.43.0", features = ["full", "rt"] }
-tower-http = { version = "0.6.2", features = ["cors"] }
-typeshare = "1.0.4"
-uuid = { version = "1.13.1", features = ["v4"] }
-result-extended = { path = "../../result-extended" }
-thiserror = "2.0.11"

visions/server/src/main.rs

@@ -1,157 +1,3 @@
-use std::future::Future;
-
-use axum::{
-    http::{
-        header::{AUTHORIZATION, CONTENT_TYPE},
-        HeaderMap, Method, StatusCode,
-    },
-    routing::{get, post},
-    Json, Router,
-};
-use visions_types::{AccountStatus, AuthRequest, AuthResponse, SessionId, UserOverview};
-use result_extended::{error, ok, ResultExt};
-use thiserror::Error;
-use tower_http::cors::{Any, CorsLayer};
-
-#[axum::debug_handler]
-async fn check_password(
-    request: Json<AuthRequest>,
-) -> (StatusCode, Json<Option<AuthResponse>>) {
-    let Json(request) = request;
-    if request.username == "vakarian" && request.password == "aoeu" {
-        (
-            StatusCode::OK,
-            Json(Some(AuthResponse::Success("vakarian-session-id".into()))),
-        )
-    } else if request.username == "shephard" && request.password == "aoeu" {
-        (
-            StatusCode::OK,
-            Json(Some(AuthResponse::PasswordReset(
-                "shephard-session-id".into(),
-            ))),
-        )
-    } else {
-        (StatusCode::UNAUTHORIZED, Json(None))
-    }
-}
-
-#[derive(Debug, Error)]
-enum AppError {
-    #[error("no user authorized")]
-    Unauthorized,
-    #[error("bad request")]
-    BadRequest,
-}
-
-#[derive(Debug, Error)]
-enum FatalError {
-    #[error("on unknown fatal error occurred")]
-    Unknown,
-}
-
-impl result_extended::FatalError for FatalError {}
-
-fn parse_session_header(headers: HeaderMap) -> ResultExt<Option<SessionId>, AppError, FatalError> {
-    match headers.get("Authorization") {
-        Some(token) => {
-            println!("session token: {:?}", token);
-            match token
-                .to_str()
-                .unwrap()
-                .split(" ")
-                .collect::<Vec<&str>>()
-                .as_slice()
-            {
-                [_schema, token] => ok(Some(SessionId::from(*token))),
-                _ => error(AppError::BadRequest),
-            }
-        }
-        None => ok(None),
-    }
-}
-
-async fn auth_required<B, F, Fut>(headers: HeaderMap, f: F) -> (StatusCode, Json<Option<B>>)
-where
-    F: Fn() -> Fut,
-    Fut: Future<Output = (StatusCode, B)>,
-{
-    match parse_session_header(headers) {
-        ResultExt::Ok(Some(session_id)) => {
-            if session_id == "vakarian-session-id".into() {
-                let (code, result) = f().await;
-                (code, Json(Some(result)))
-            } else {
-                (StatusCode::UNAUTHORIZED, Json(None))
-            }
-        }
-        ResultExt::Ok(None) => (StatusCode::UNAUTHORIZED, Json(None)),
-        ResultExt::Err(AppError::Unauthorized) => (StatusCode::UNAUTHORIZED, Json(None)),
-        ResultExt::Err(AppError::BadRequest) => (StatusCode::BAD_REQUEST, Json(None)),
-        ResultExt::Fatal(err) => {
-            panic!("{}", err);
-        }
-    }
-}
-
-#[tokio::main]
-async fn main() {
-    let app = Router::new()
-        .route(
-            "/api/test/health",
-            get(|| async { (StatusCode::OK, Json(None::<String>)) }).layer(
-                CorsLayer::new()
-                    .allow_methods([Method::GET])
-                    .allow_origin(Any),
-            ),
-        )
-        .route(
-            "/api/test/auth",
-            post(|req: Json<AuthRequest>| check_password(req)).layer(
-                CorsLayer::new()
-                    .allow_methods([Method::POST])
-                    .allow_headers([CONTENT_TYPE])
-                    .allow_origin(Any),
-            ),
-        )
-        .route(
-            "/api/test/list-users",
-            get(|headers: HeaderMap| {
-                auth_required(headers, || async {
-                    println!("list_users is about to return a bunch of stuff");
-                    (
-                        StatusCode::OK,
-                        Some(vec![
-                            UserOverview {
-                                id: "vakarian-id".into(),
-                                name: "vakarian".to_owned(),
-                                status: AccountStatus::Ok,
-                            },
-                            UserOverview {
-                                id: "shephard-id".into(),
-                                name: "shephard".to_owned(),
-                                status: AccountStatus::PasswordReset(
-                                    "2050-01-01 00:00:00".to_owned(),
-                                ),
-                            },
-                            UserOverview {
-                                id: "tali-id".into(),
-                                name: "tali".to_owned(),
-                                status: AccountStatus::Locked,
-                            },
-                        ]),
-                    )
-                })
-            })
-            .layer(
-                CorsLayer::new()
-                    .allow_headers([AUTHORIZATION])
-                    .allow_methods([Method::GET])
-                    .allow_origin(Any),
-            ),
-        );
-    let listener = tokio::net::TcpListener::bind("127.0.0.1:8001")
-        .await
-        .unwrap();
-
-    axum::serve(listener, app).await.unwrap();
+fn main() {
+    println!("Hello, world!");
 }

visions/types/.gitignore

@@ -1,2 +0,0 @@
-gen/
-dist/

visions/types/Cargo.toml

@@ -1,8 +0,0 @@
-[package]
-name = "visions-types"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-serde = { version = "1.0.218", features = ["derive"] }
-uuid = { version = "1.13.2", features = ["v4", "js"] }

visions/types/Taskfile.yml

@@ -0,0 +1,8 @@
+version: '3'
+
+tasks:
+  build:
+    cmds:
+      - npm install typescript
+      - typeshare --lang typescript --output-file visions.ts ../server/src
+      - npx tsc

visions/types/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "visions-types",
+  "version": "0.0.1",
+  "description": "Shared data types for Visions",
+  "main": "visions.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "typescript": "^5.7.3"
+  }
+}

visions/types/src/lib.rs

@@ -1,81 +0,0 @@
-use serde::{Deserialize, Serialize};
-use uuid::Uuid;
-
-#[derive(Clone, Deserialize, PartialEq, Serialize)]
-#[serde(tag = "type", content = "content", rename_all = "kebab-case")]
-pub enum AccountStatus {
-    Ok,
-    PasswordReset(String),
-    Locked,
-}
-
-#[derive(Deserialize, Serialize)]
-pub struct AuthRequest {
-    pub username: String,
-    pub password: String,
-}
-
-#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
-pub struct SessionId(String);
-
-impl SessionId {
-    pub fn new() -> Self {
-        Self(format!("{}", Uuid::new_v4().hyphenated()))
-    }
-
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-}
-
-impl From<&str> for SessionId {
-    fn from(s: &str) -> Self {
-        Self(s.to_owned())
-    }
-}
-
-impl From<String> for SessionId {
-    fn from(s: String) -> Self {
-        Self(s)
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
-pub struct UserId(String);
-
-impl UserId {
-    pub fn new() -> Self {
-        Self(format!("{}", Uuid::new_v4().hyphenated()))
-    }
-
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-}
-
-impl From<&str> for UserId {
-    fn from(s: &str) -> Self {
-        Self(s.to_owned())
-    }
-}
-
-impl From<String> for UserId {
-    fn from(s: String) -> Self {
-        Self(s)
-    }
-}
-
-#[derive(Clone, Deserialize, PartialEq, Serialize)]
-pub struct UserOverview {
-    pub id: UserId,
-    pub name: String,
-    pub status: AccountStatus,
-}
-
-#[derive(Deserialize, Serialize)]
-#[serde(tag = "type", content = "content", rename_all = "kebab-case")]
-pub enum AuthResponse {
-    Success(SessionId),
-    PasswordReset(SessionId),
-}
-

visions/types/tsconfig.json

@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "es2016",
+    "module": "commonjs",
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "outDir": "./dist",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true
+  },
+  "include": ["./visions.ts"]
+}

visions/ui/.gitignore

@@ -0,0 +1,23 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

visions/ui/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "visions-client"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-visions-types = { path = "../types" }
-gloo-console = "0.3.0"
-gloo-net = "0.6.0"
-serde = { version = "1.0.217", features = ["derive"] }
-serde-wasm-bindgen = "0.6.5"
-serde_json = "1.0.138"
-wasm-bindgen = "0.2.100"
-wasm-bindgen-futures = "0.4.50"
-web-sys = "0.3.77"
-yew = { git = "https://github.com/yewstack/yew/", features = ["csr"] }
-

visions/ui/Taskfile.yml

@@ -3,5 +3,12 @@ version: '3'
 tasks:
   dev:
     cmds:
-      - trunk serve --open
+      - cd ../visions-types && task build
+      - npm install
+      - npm run start
 
+  test:
+    cmds:
+      - cd ../visions-types && task build
+      - npm install
+      - npm run test

visions/ui/Trunk.toml

@@ -1,3 +0,0 @@
-[[proxy]]
-backend = "http://localhost:8001/api"
-insecure = true

visions/ui/design.css

@@ -1,36 +0,0 @@
-:root {
-    --spacing-s: 4px;
-    --spacing-m: 8px;
-    --shadow-shallow: 2px 2px 1px;
-}
-
-body {
-    background-color: hsl(0, 0%, 95%);
-    font-family: Ariel, sans-serif;
-}
-
-.card {
-    display: flex;
-    flex-direction: column;
-    align-items: space-between;
-    border: 1px solid black;
-    box-shadow: var(--shadow-shallow);
-    border-radius: var(--spacing-s);
-    padding: var(--spacing-m);
-}
-
-.card > h1 {
-    margin: 0px;
-}
-
-.card > * {
-    margin-top: var(--spacing-s);
-    margin-bottom: var(--spacing-s);
-}
-
-.login-form {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100vh;
-}

visions/ui/index.html

@@ -1,9 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <meta charset="utf-8" />
-        <title>Visions Client Demo</title>
-        <link data-trunk rel="css" href="design.css" />
-    </head>
-    <body></body>
-</html>

visions/ui/package.json

@@ -0,0 +1,51 @@
+{
+  "name": "ui",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.2.0",
+    "@testing-library/user-event": "^14.6.1",
+    "@types/jest": "^27.5.2",
+    "@types/node": "^16.18.119",
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.1",
+    "@types/react-router": "^5.1.20",
+    "@types/react-router-dom": "^5.3.3",
+    "classnames": "^2.5.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-router": "^6.28.0",
+    "react-router-dom": "^6.28.0",
+    "react-scripts": "5.0.1",
+    "react-use-websocket": "^4.11.1",
+    "typescript": "^4.9.5",
+    "visions-types": "../visions-types",
+    "web-vitals": "^2.1.4"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+  },
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  }
+}

visions/ui/src/client.rs

@@ -1,55 +0,0 @@
-use std::future::Future;
-
-use gloo_console::log;
-use gloo_net::http::{Request, Response};
-use visions_types::{AuthRequest, AuthResponse, SessionId, UserOverview};
-
-pub enum ClientError {
-    Unauthorized,
-    Err(u16),
-}
-
-pub trait Client {
-    fn auth(&self, username: String, password: String) -> impl Future<Output = Result<AuthResponse, ClientError>>;
-    fn list_users(&self, session_id: &SessionId) -> impl Future<Output = Result<Vec<UserOverview>, ClientError>>;
-}
-
-pub struct Connection;
-
-impl Connection {
-    pub fn new() -> Self { Self }
-}
-
-impl Client for Connection {
-    async fn auth(&self, username: String, password: String) -> Result<AuthResponse, ClientError> {
-        log!("authenticating: ", &username, &password);
-        let response: Response = Request::post("/api/test/auth")
-            .header("Content-Type", "application/json")
-            .body(serde_wasm_bindgen::to_value(&serde_json::to_string(&AuthRequest{ username, password }).unwrap()).unwrap())
-            .unwrap()
-            .send()
-            .await
-            .unwrap();
-
-        if response.ok() {
-            Ok(serde_json::from_slice(&response.binary().await.unwrap()).unwrap())
-        } else {
-            Err(ClientError::Err(response.status()))
-        }
-    }
-
-    async fn list_users(&self, session_id: &SessionId) -> Result<Vec<UserOverview>, ClientError> {
-        let response: Response = Request::get("/api/test/list-users")
-            .header("Content-Type", "application/json")
-            .header("Authorization", &format!("Bearer {}", session_id.as_str()))
-            .send()
-            .await
-            .unwrap();
-
-        if response.ok() {
-            Ok(serde_json::from_slice(&response.binary().await.unwrap()).unwrap())
-        } else {
-            Err(ClientError::Err(response.status()))
-        }
-    }
-}

visions/ui/src/main.rs

@@ -1,125 +0,0 @@
-use std::rc::Rc;
-
-use gloo_console::log;
-use visions_types::{AuthResponse, SessionId, UserOverview};
-use yew::prelude::*;
-
-mod client;
-use client::*;
-
-mod views;
-use views::Login;
-
-struct AuthInfo {
-    session_id: Option<SessionId>,
-}
-
-impl Default for AuthInfo {
-    fn default() -> Self {
-        Self { session_id: None }
-    }
-}
-
-enum AuthAction {
-    Auth(String),
-    Unauth,
-}
-
-impl Reducible for AuthInfo {
-    type Action = AuthAction;
-
-    fn reduce(self: Rc<Self>, action: Self::Action) -> Rc<Self> {
-        // log!("reduce", action);
-        match action {
-            AuthAction::Auth(session_id) => Self {
-                session_id: Some(session_id.into()),
-            }
-            .into(),
-            AuthAction::Unauth => Self { session_id: None }.into(),
-        }
-    }
-}
-
-#[derive(Properties, PartialEq)]
-struct LandingProps {
-    session_id: SessionId,
-}
-
-#[function_component]
-fn Landing(LandingProps { session_id }: &LandingProps) -> Html {
-    let user_ref = use_state(|| vec![]);
-
-    {
-        let user_ref = user_ref.clone();
-        let session_id = session_id.clone();
-        use_effect(move || {
-            wasm_bindgen_futures::spawn_local(async move {
-                let client = Connection::new();
-                match client.list_users(&session_id).await {
-                    Ok(users) => user_ref.set(users),
-                    Err(ClientError::Unauthorized) => todo!(),
-                    Err(ClientError::Err(status)) => {
-                        log!("error: {:?}", status);
-                        todo!()
-                    }
-                }
-            })
-        });
-    }
-
-    html! {
-        <div>
-            {"Landing Page"}
-            {user_ref.iter().map(|overview| {
-                let overview = overview.clone();
-                html! { <UserOverviewComponent overview={overview} /> }}).collect::<Vec<Html>>()
-            }
-        </div>
-    }
-}
-
-#[derive(Properties, PartialEq)]
-struct UserOverviewProps {
-    overview: UserOverview,
-}
-
-#[function_component]
-fn UserOverviewComponent(UserOverviewProps { overview }: &UserOverviewProps) -> Html {
-    html! {
-        <div> { overview.name.clone() } </div>
-    }
-}
-
-#[function_component]
-fn App() -> Html {
-    let auth_info = use_reducer(AuthInfo::default);
-
-    let on_login = {
-        let auth_info = auth_info.clone();
-        Callback::from(move |(username, password)| {
-            let auth_info = auth_info.clone();
-            wasm_bindgen_futures::spawn_local(async move {
-                let client = Connection::new();
-                match client.auth(username, password).await {
-                    Ok(AuthResponse::Success(session_id)) => {
-                        auth_info.dispatch(AuthAction::Auth(session_id.as_str().to_owned()))
-                    }
-                    Ok(AuthResponse::PasswordReset(session_id)) => {
-                        auth_info.dispatch(AuthAction::Auth(session_id.as_str().to_owned()))
-                    }
-                    Err(ClientError::Unauthorized) => todo!(),
-                    Err(ClientError::Err(status)) => todo!(),
-                };
-            })
-        })
-    };
-
-    match auth_info.session_id {
-        Some(ref session_id) => html! { <Landing session_id={session_id.clone()} /> },
-        None => html! { <Login on_login={on_login.clone()} /> },
-    }
-}
-
-fn main() {
-    yew::Renderer::<App>::new().render();
-}

visions/ui/src/views/login.rs

@@ -1,58 +0,0 @@
-use wasm_bindgen::JsCast;
-use web_sys::HtmlInputElement;
-use yew::{function_component, html, use_state, Callback, Event, Html, Properties};
-
-#[derive(Properties, PartialEq)]
-pub struct LoginProps {
-    pub on_login: Callback<(String, String)>,
-}
-
-#[function_component]
-pub fn Login(LoginProps { on_login }: &LoginProps) -> Html {
-    let username = use_state(|| "".to_owned());
-    let password = use_state(|| "".to_owned());
-
-    let on_click = {
-        let on_login = on_login.clone();
-        let username = username.clone();
-        let password = password.clone();
-        Callback::from(move |_| on_login.emit((username.to_string(), password.to_string())))
-    };
-
-    let on_username_changed = {
-        let username = username.clone();
-        Callback::from(move |event: Event| {
-            let input = event
-                .target()
-                .and_then(|t| t.dyn_into::<HtmlInputElement>().ok());
-            if let Some(input) = input {
-                username.set(input.value());
-            }
-        })
-    };
-
-    let on_password_changed = {
-        let password = password.clone();
-        Callback::from(move |event: Event| {
-            let input = event
-                .target()
-                .and_then(|t| t.dyn_into::<HtmlInputElement>().ok());
-            if let Some(input) = input {
-                password.set(input.value());
-            }
-        })
-    };
-
-    html! {
-        <div class="login-form">
-            <div class="card">
-                <h1>{"Welcome to Visions VTT"}</h1>
-                <input type="text" name="username" placeholder="username" onchange={on_username_changed} />
-                <input type="password" name="password" placeholder="password" onchange={on_password_changed} />
-                <button onclick={on_click}>{"Login"}</button>
-            </div>
-        </div>
-    }
-}
-
-

visions/ui/src/views/mod.rs

@@ -1,2 +0,0 @@
-mod login;
-pub use login::Login;

visions/ui/tsconfig.json

@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noFallthroughCasesInSwitch": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx"
+  },
+  "include": [
+    "src",
+    "gen"
+  ]
+}

visions/yew-app/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-name = "yew-app"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-gloo-net = "0.6.0"
-serde = { version = "1.0.217", features = ["derive"] }
-wasm-bindgen-futures = "0.4.50"
-yew = { git = "https://github.com/yewstack/yew/", features = ["csr"] }
-

visions/yew-app/design.css

@@ -1,3 +0,0 @@
-body {
-    background-color: hsl(0, 0%, 50%);
-}

visions/yew-app/index.html

@@ -1,5 +0,0 @@
-<!doctype html>
-<html lang="en">
-    <head></head>
-    <body></body>
-</html>

visions/yew-app/src/main.rs

@@ -1,126 +0,0 @@
-use yew::prelude::*;
-use serde::Deserialize;
-use gloo_net::http::Request;
-
-#[derive(Clone, PartialEq, Deserialize)]
-struct Video {
-    id: usize,
-    title: String,
-    speaker: String,
-    url: String,
-}
-
-#[derive(Properties, PartialEq)]
-struct VideosListProps {
-    videos: Vec<Video>,
-    on_click: Callback<Video>,
-}
-
-/*
-fn videos() -> Vec<Video> {
-    vec![
-        Video {
-            id: 1,
-            title: "Building and breaking things".to_string(),
-            speaker: "John Doe".to_string(),
-            url: "https://youtu.be/PsaFVLr8t4E".to_string(),
-        },
-        Video {
-            id: 2,
-            title: "The development process".to_string(),
-            speaker: "Jane Smith".to_string(),
-            url: "https://youtu.be/PsaFVLr8t4E".to_string(),
-        },
-        Video {
-            id: 3,
-            title: "The Web 7.0".to_string(),
-            speaker: "Matt Miller".to_string(),
-            url: "https://youtu.be/PsaFVLr8t4E".to_string(),
-        },
-        Video {
-            id: 4,
-            title: "Mouseless development".to_string(),
-            speaker: "Tom Jerry".to_string(),
-            url: "https://youtu.be/PsaFVLr8t4E".to_string(),
-        },
-    ]
-}
-*/
-
-#[function_component(VideosList)]
-fn videos_list(VideosListProps { videos, on_click }: &VideosListProps) -> Html {
-    let on_click = on_click.clone();
-    videos
-        .iter()
-        .map(|video| {
-            let on_video_select = {
-                let on_click = on_click.clone();
-                let video = video.clone();
-                Callback::from(move |_| on_click.emit(video.clone()))
-            };
-            html! {
-                <p key={video.id} onclick={on_video_select}>{format!("{}: {}", video.speaker, video.title)}</p>
-            }
-        })
-        .collect()
-}
-
-#[derive(Properties, PartialEq)]
-struct VideosDetailsProps {
-    video: Video,
-}
-
-#[function_component(VideoDetails)]
-fn video_details(VideosDetailsProps { video }: &VideosDetailsProps) -> Html {
-    html! {
-        <div>
-            <h3>{video.title.clone()}</h3>
-            <img src="https://via.placeholder.com/640x360.png?text=Video+Player+Placeholder" alt="video thumbnail" />
-        </div>
-    }
-}
-
-#[function_component(App)]
-fn app() -> Html {
-    let videos = use_state(|| vec![]);
-    {
-        let videos = videos.clone();
-        use_effect_with((), move |_| {
-            let videos = videos.clone();
-            wasm_bindgen_futures::spawn_local(async move {
-                let response = Request::get("/tutorial/data.json").send().await;
-                println!("response: {:?}", response);
-                let response = response.unwrap();
-                let fetched_videos: Vec<Video> = response.json().await.unwrap();
-                videos.set(fetched_videos);
-            });
-            || ()
-        });
-    }
-
-    let selected_video = use_state(|| None);
-
-    let on_video_select = {
-        let selected_video = selected_video.clone();
-        Callback::from(move |video: Video| selected_video.set(Some(video)))
-    };
-
-    let details = selected_video.as_ref().map(|video| html! {
-        <VideoDetails video={video.clone()} />
-    });
-
-    html! {
-        <>
-        <h1>{ "RustConf Explorer" }</h1>
-        <div>
-            <h3>{"Videos to watch"}</h3>
-            <VideosList videos={(*videos).clone()} on_click={on_video_select.clone()} />
-        </div>
-        { for details }
-        </>
-    }
-}
-
-fn main() {
-    yew::Renderer::<App>::new().render();
-}