Compare commits

..

3 Commits

14 changed files with 16461 additions and 511 deletions

View File

@ -24,6 +24,8 @@ jobs:
steps: steps:
- name: Checkout repository code - name: Checkout repository code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Where am I?
run: pwd
- name: Build the apps - name: Build the apps
run: /run/current-system/sw/bin/nix --extra-experimental-features "nix-command flakes" build .#all run: /run/current-system/sw/bin/nix --extra-experimental-features "nix-command flakes" build .#all
- name: Check the end of the build - name: Check the end of the build

4159
Cargo.lock generated

File diff suppressed because it is too large Load Diff

12613
Cargo.nix

File diff suppressed because it is too large Load Diff

View File

@ -1,74 +1,40 @@
[workspace] [workspace]
resolver = "2" resolver = "2"
members = [ members = [
# "authdb", "authdb",
# "bike-lights/core", "bike-lights/core",
# "bike-lights/simulator", "bike-lights/simulator",
# "changeset", "changeset",
# "config", "config",
# "config-derive", "config-derive",
# "coordinates", "coordinates",
# "cyber-slides", "cyber-slides",
"cyberpunk", "cyberpunk",
"cyberpunk-splash", "cyberpunk-splash",
# "dashboard", "dashboard",
# "emseries", "emseries",
# "file-service", "file-service",
"fitnesstrax/app", "fitnesstrax/app",
# "fitnesstrax/core", "fitnesstrax/core",
# "fluent-ergonomics", "fluent-ergonomics",
# "geo-types", "geo-types",
# "gm-control-panel", "gm-control-panel",
# "gm-dash/server", "gm-dash/server",
# "hex-grid", "hex-grid",
# "icon-test", "icon-test",
"l10n-db", "l10n-db",
# "memorycache", "memorycache",
# "nom-training", "nom-training",
# "otg/core", "otg/core",
# "otg/gtk", "otg/gtk",
# "pico-st7789", "pico-st7789",
# "result-extended", "result-extended",
# "screenplay", "screenplay",
# "sgf", "sgf",
# "timezone-testing", "timezone-testing",
# "tree", "tree",
"visions/server", "visions/server",
# "visions/types", "visions/types",
"visions/ui", "visions/ui",
# "bike-lights/bike", # "bike-lights/bike",
] ]
[workspace.dependencies]
adw = { version = "0.5", package = "libadwaita", features = [ "v1_4" ] }
async-channel = { version = "2.1" }
async-std = { version = "1.13" }
async-trait = { version = "0.1" }
axum = { version = "0.8", features = ["macros"] }
cairo-rs = { version = "0.18" }
chrono = { version = "0.4" }
chrono-tz = { version = "0.8" }
dimensioned = { version = "0.8", features = [ "serde" ] }
gdk = { version = "0.7", package = "gdk4" }
gio = { version = "0.18" }
glib = { version = "0.18" }
gloo-console = { version = "0.3.0" }
gloo-net = { version = "0.6.0" }
gtk = { version = "0.7", package = "gtk4", features = [ "v4_10" ] }
serde = { version = "1.0", features = ["derive", "serde_derive"] }
serde-wasm-bindgen = { version = "0.6.5" }
serde_json = { version = "1.0.138" }
thiserror = { version = "2.0" }
tokio = { version = "1.43", features = ["full", "rt"] }
tower-http = { version = "0.6", features = ["cors"] }
uuid = { version = "1.13", features = ["v4"] }
wasm-bindgen = { version = "0.2.100" }
wasm-bindgen-futures = { version = "0.4.50" }
web-sys = { version = "0.3.77" }
yew = { git = "https://github.com/yewstack/yew/", features = ["csr"] }
# cairo-rs = { version = "0.18" }
# gio = { version = "0.18" }
# glib = { version = "0.18" }
# gtk = { version = "0.7", package = "gtk4" }

View File

@ -13,8 +13,4 @@ tasks:
lint: lint:
cmds: cmds:
- cargo clippy - cargo watch -x clippy
test:
cmds:
- cargo test

View File

@ -1,4 +0,0 @@
{
"git+https://github.com/yewstack/yew/#yew-macro@0.21.0": "1g47mpyzd2mib73cjrbmcivrp7kr16f6hbrmpaap56kbc518khwf",
"git+https://github.com/yewstack/yew/#yew@0.21.0": "1g47mpyzd2mib73cjrbmcivrp7kr16f6hbrmpaap56kbc518khwf"
}

View File

@ -7,9 +7,9 @@ license = "GPL-3.0-only"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
async-std = { workspace = true } async-std = "1.13.0"
cairo-rs = { workspace = true } cairo-rs = { version = "0.18" }
cyberpunk = { path = "../cyberpunk" } cyberpunk = { path = "../cyberpunk" }
gio = { workspace = true } gio = { version = "0.18" }
glib = { workspace = true } glib = { version = "0.18" }
gtk = { workspace = true } gtk = { version = "0.7", package = "gtk4" }

View File

@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
cairo-rs = { workspace = true } cairo-rs = { version = "0.18" }
gio = { workspace = true } gio = { version = "0.18" }
glib = { workspace = true } glib = { version = "0.18" }
gtk = { workspace = true } gtk = { version = "0.7", package = "gtk4" }

View File

@ -6,20 +6,20 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
adw = { workspace = true } adw = { version = "0.5", package = "libadwaita", features = [ "v1_4" ] }
async-channel = { workspace = true } async-channel = { version = "2.1" }
async-trait = { workspace = true } async-trait = { version = "0.1" }
chrono = { workspace = true } chrono = { version = "0.4" }
chrono-tz = { workspace = true } chrono-tz = { version = "0.8" }
dimensioned = { workspace = true } dimensioned = { version = "0.8", features = [ "serde" ] }
emseries = { path = "../../emseries" } emseries = { path = "../../emseries" }
ft-core = { path = "../core" } ft-core = { path = "../core" }
gio = { workspace = true } gio = { version = "0.18" }
glib = { workspace = true } glib = { version = "0.18" }
gdk = { workspace = true } gdk = { version = "0.7", package = "gdk4" }
gtk = { workspace = true } gtk = { version = "0.7", package = "gtk4", features = [ "v4_10" ] }
thiserror = { workspace = true } thiserror = { version = "1.0" }
tokio = { workspace = true } tokio = { version = "1.34", features = [ "full" ] }
[build-dependencies] [build-dependencies]
glib-build-tools = "0.18" glib-build-tools = "0.18"

View File

@ -6,12 +6,12 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
chrono = { workspace = true } chrono = { version = "0.4" }
chrono-tz = { workspace = true } chrono-tz = { version = "0.8" }
dimensioned = { workspace = true } dimensioned = { version = "0.8", features = [ "serde" ] }
emseries = { path = "../../emseries" } emseries = { path = "../../emseries" }
serde = { workspace = true } serde = { version = "1", features = [ "derive" ] }
serde_json = { workspace = true } serde_json = { version = "1" }
[dev-dependencies] [dev-dependencies]
tempfile = "*" tempfile = "*"

View File

@ -57,6 +57,7 @@
packages."x86_64-linux" = packages."x86_64-linux" =
let let
pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgs = import nixpkgs { system = "x86_64-linux"; };
gtkNativeInputs = [ gtkNativeInputs = [
pkgs.pkg-config pkgs.pkg-config
pkgs.gtk4 pkgs.gtk4
@ -94,13 +95,13 @@
all = pkgs.symlinkJoin { all = pkgs.symlinkJoin {
name = "all"; name = "all";
paths = [ paths = [
# cyber-slides cyber-slides
cyberpunk-splash cyberpunk-splash
# dashboard dashboard
# file-service # file-service
fitnesstrax fitnesstrax
l10n-db l10n-db
# otg-gtk otg-gtk
]; ];
}; };

View File

@ -1,4 +1,4 @@
[toolchain] [toolchain]
channel = "1.86.0" channel = "1.85.0"
targets = [ "wasm32-unknown-unknown", "thumbv6m-none-eabi" ] targets = [ "wasm32-unknown-unknown", "thumbv6m-none-eabi" ]
components = [ "rustfmt", "rust-analyzer", "clippy" ] components = [ "rustfmt", "rust-analyzer", "clippy" ]

View File

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

View File

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