diff --git a/Cargo.lock b/Cargo.lock index de6765c..434407c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -189,7 +189,7 @@ dependencies = [ [[package]] name = "backbone-lib" -version = "0.2.11" +version = "0.1.0" dependencies = [ "bytes", "ewebsock", @@ -2649,7 +2649,7 @@ dependencies = [ [[package]] name = "protocol" -version = "0.2.11" +version = "0.1.0" dependencies = [ "serde", ] @@ -2883,7 +2883,7 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "relay-server" -version = "0.2.11" +version = "0.1.0" dependencies = [ "argon2", "axum", @@ -3893,7 +3893,7 @@ dependencies = [ [[package]] name = "trictrac-store" -version = "0.2.11" +version = "0.1.0" dependencies = [ "anyhow", "base64 0.21.7", @@ -3906,7 +3906,7 @@ dependencies = [ [[package]] name = "trictrac-web" -version = "0.2.11" +version = "0.1.0" dependencies = [ "backbone-lib", "futures", diff --git a/Cargo.toml b/Cargo.toml index 9db1a73..e78d862 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,3 @@ -[workspace.package] -version = "0.2.11" - [workspace] resolver = "2" diff --git a/clients/backbone-lib/Cargo.toml b/clients/backbone-lib/Cargo.toml index d6ae5c9..1e57d93 100644 --- a/clients/backbone-lib/Cargo.toml +++ b/clients/backbone-lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "backbone-lib" -version.workspace = true +version = "0.1.0" edition = "2024" [dependencies] diff --git a/clients/web/Cargo.toml b/clients/web/Cargo.toml index 1edb9eb..4849bec 100644 --- a/clients/web/Cargo.toml +++ b/clients/web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trictrac-web" -version.workspace = true +version = "0.1.0" edition = "2021" [package.metadata.leptos-i18n] diff --git a/clients/web/assets/style.css b/clients/web/assets/style.css index 09b21e9..e81e0de 100644 --- a/clients/web/assets/style.css +++ b/clients/web/assets/style.css @@ -2076,19 +2076,3 @@ a:hover { text-decoration: underline; } max-width: 200px; margin: 0 auto; } - -/* Push the version wrapper to the bottom of the sidebar flex column */ -.game-sidebar > div:has(.site-nav-version) { - margin-top: auto; - padding: 0.75rem 1rem; - border-top: 1px solid rgba(200,164,72,0.12); -} - -.site-nav-version { - display: block; - text-align: center; - font-family: var(--font-ui); - font-size: 0.7rem; - letter-spacing: 0.06em; - color: rgba(200,164,72,0.4); -} diff --git a/clients/web/src/app.rs b/clients/web/src/app.rs index 5c38d33..3819b61 100644 --- a/clients/web/src/app.rs +++ b/clients/web/src/app.rs @@ -32,7 +32,6 @@ use std::collections::VecDeque; const RELAY_URL: &str = "ws://localhost:8080/ws"; const GAME_ID: &str = "trictrac"; const STORAGE_KEY: &str = "trictrac_session"; -const VERSION: &str = env!("CARGO_PKG_VERSION"); /// The state the UI needs to render the game screen. #[derive(Clone, PartialEq)] @@ -622,9 +621,6 @@ fn SiteHamburger() -> impl IntoView { sidebar_open.set(false); }>{t!(i18n, replay_snapshot)} -
- "v" {VERSION} -
// ── Replay snapshot modal ───────────────────────────────────────────── diff --git a/clients/web/src/nav.rs b/clients/web/src/nav.rs new file mode 100644 index 0000000..10ecc36 --- /dev/null +++ b/clients/web/src/nav.rs @@ -0,0 +1,46 @@ +use leptos::prelude::*; +use leptos::task::spawn_local; +use leptos_router::components::A; + +use crate::api; +use crate::i18n::*; + +#[component] +pub fn SiteNav() -> impl IntoView { + let i18n = use_i18n(); + let auth_username = + use_context::>>().expect("auth_username context not found"); + + let logout = move |_| { + spawn_local(async move { + let _ = api::post_logout().await; + auth_username.set(None); + }); + }; + + view! { + + } +} diff --git a/flake.nix b/flake.nix index cde292d..54da2ed 100644 --- a/flake.nix +++ b/flake.nix @@ -103,7 +103,7 @@ trictrac = with final; rustPlatform.buildRustPackage { pname = "trictrac"; - version = "0.2.11"; # trictrac-version + version = "0.2.1"; src = ./.; nativeBuildInputs = [ pkg-config ]; diff --git a/justfile b/justfile index fe4e52e..fe80391 100644 --- a/justfile +++ b/justfile @@ -2,17 +2,6 @@ # ^ A shebang isn't required, but allows a justfile to be executed # like a script, with `./justfile test`, for example. -# Bump the project version and start a git-flow release. -# Usage: just bump 0.2.12 -# After running, finish with: git flow release finish -bump version: - sed -i '/^\[workspace\.package\]/,/^\[/{s/^version = ".*"/version = "{{version}}"/}' Cargo.toml - sed -i 's/version = "[0-9.]*"; # trictrac-version/version = "{{version}}"; # trictrac-version/' flake.nix - git flow release start {{version}} - git add Cargo.toml flake.nix - git commit -m "chore: bump version to {{version}}" - @echo "Done. Finish with: git flow release finish {{version}}" - doc: cargo doc --no-deps shell: diff --git a/server/protocol/Cargo.toml b/server/protocol/Cargo.toml index 70f4e68..2630fc1 100644 --- a/server/protocol/Cargo.toml +++ b/server/protocol/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "protocol" -version.workspace = true +version = "0.1.0" edition = "2024" [dependencies] diff --git a/server/relay-server/Cargo.toml b/server/relay-server/Cargo.toml index 1c0112b..ccb97fa 100644 --- a/server/relay-server/Cargo.toml +++ b/server/relay-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "relay-server" -version.workspace = true +version = "0.1.0" edition = "2024" [dependencies] diff --git a/store/Cargo.toml b/store/Cargo.toml index 92b1b84..d8a594c 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trictrac-store" -version.workspace = true +version = "0.1.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html