Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/web/src/ui/library.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export function Library({ screen, actions }: { screen: LibraryScreen; actions: A
{screen.shelves.length > 1 && <ShelfSwitcher shelves={screen.shelves} current={origin} actions={actions} />}

<section aria-label={m.lib_section_desktops()} className="flex flex-col gap-3">
<h2 className="text-xs font-medium tracking-wide text-muted-foreground uppercase">{m.lib_section_desktops()}</h2>
<h2 className="text-xs font-medium text-muted-foreground">{m.lib_section_desktops()}</h2>
{/* A scroller clips everything past its box, rings and shadows included, so the row is
padded out to the page's gutters and back in again: it bleeds to the page's edge, as
the macOS shelf does, and nothing a card draws outside itself is cut off. */}
Expand All @@ -96,7 +96,7 @@ export function Library({ screen, actions }: { screen: LibraryScreen; actions: A

<section aria-label={m.lib_section_games()} className="flex flex-col gap-4">
<div className="flex flex-wrap items-center justify-between gap-3">
<h2 className="text-xs font-medium tracking-wide text-muted-foreground uppercase">{m.lib_section_games()}</h2>
<h2 className="text-xs font-medium text-muted-foreground">{m.lib_section_games()}</h2>
{screen.entries.length > 0 && (
<label className="relative w-full max-w-xs">
<Search className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-muted-foreground" aria-hidden="true" />
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/ui/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ function SettingsTabs({ screen, actions }: { screen: SettingsScreen; actions: Ac
),
)}
</Group>
<Group title="punktfunk web">
<Group title="Punktfunk web">
<Row label={m.about_version()}>
<span className="font-mono text-sm text-muted-foreground">{__PF_VERSION__}</span>
</Row>
Expand Down Expand Up @@ -477,7 +477,7 @@ function Panel({ value, children }: { value: TabName; children: ReactNode }): JS
function Group({ title, children }: { title?: string; children: ReactNode }): JSX.Element {
return (
<section className="flex flex-col gap-2">
{title && <h2 className="px-1 text-xs font-medium tracking-wide text-muted-foreground uppercase">{title}</h2>}
{title && <h2 className="px-1 text-xs font-medium text-muted-foreground">{title}</h2>}
<Card className="flex flex-col gap-4 p-5">
<Stagger gap={ROW_GAP} className="contents [&>*+*]:border-t [&>*+*]:border-border [&>*+*]:pt-4">
{rows(children).map((child, i) => (
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/ui/sheets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export function ErrorCard({ screen, actions }: Props<"error">): JSX.Element {
<Sub>{screen.text}</Sub>
<Row>
<Button autoFocus variant="secondary" onClick={() => actions.back()}>{m.common_back()}</Button>
{screen.retry && <Button onClick={() => actions.retry()}>{m.common_try_again()}</Button>}
{screen.retry && <Button onClick={() => actions.retry()}>{m.common_retry()}</Button>}
</Row>
</Sheet>
);
Expand Down
10 changes: 5 additions & 5 deletions packages/stream/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/stream/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ name = "punktfunk-client-web"
path = "rust/main.rs"

# The punktfunk crates follow the host's release tags, all three together: the client speaks that
# release's wire. This is main at c4d6fe182, ahead of v0.46.0.
# release's wire. This is main at b58dc3cfe, ahead of v0.46.0.
[dependencies]
anyhow = "1"
# The device fingerprint: SHA-256 of the WebCrypto key's SPKI, which is what the host stores.
# Already in the tree via `pake`.
sha2 = "0.11"
# `transport::Transport`, the wire codecs and the SPAKE2 ceremony. `pake`, not `quic`: the
# browser plane is WebTransport, so the ceremony is wanted and the quinn runtime under it is not.
punktfunk-core = { git = "https://git.unom.io/unom/punktfunk", rev = "c4d6fe182882dd1874afc47e78bbe7ff8d8c822c", default-features = false, features = ["pake"] }
punktfunk-core = { git = "https://git.unom.io/unom/punktfunk", rev = "b58dc3cfe152c48c584c8e2f77dc05d08f6aeb12", default-features = false, features = ["pake"] }

# wasm only. Off it this is a bin that prints how to build it, so `cargo test` on a developer's
# desktop stays green and does not resolve skia-safe for a target that wants a second Skia
Expand All @@ -32,12 +32,12 @@ punktfunk-core = { git = "https://git.unom.io/unom/punktfunk", rev = "c4d6fe1828
# The shell itself. `default-features = false`: `vulkan-overlay` is the desktop session binary's,
# and it would put `vulkan` on skia-safe and change the prebuilt key away from
# `ganesh-gl-jpegd-jpege-pdf-textlayout`, the one build.sh downloads for this target.
pf-console-ui = { git = "https://git.unom.io/unom/punktfunk", rev = "c4d6fe182882dd1874afc47e78bbe7ff8d8c822c", default-features = false }
pf-console-ui = { git = "https://git.unom.io/unom/punktfunk", rev = "b58dc3cfe152c48c584c8e2f77dc05d08f6aeb12", default-features = false }
# The bridge's JSON both ways: the model the page pushes, what the shell raises.
serde = "1"
serde_json = "1"
# The portable half — `trust::Settings` for the snapshot store the shell loads from.
pf-client-core = { git = "https://git.unom.io/unom/punktfunk", rev = "c4d6fe182882dd1874afc47e78bbe7ff8d8c822c", default-features = false }
pf-client-core = { git = "https://git.unom.io/unom/punktfunk", rev = "b58dc3cfe152c48c584c8e2f77dc05d08f6aeb12", default-features = false }
# The SAME line pf-console-ui's wasm block carries, features included: two feature sets in one
# build resolve two prebuilt keys, and the second one puts a source build of Skia on the critical
# path. Only `host.rs` names it, to build the context and wrap the canvas.
Expand Down
2 changes: 1 addition & 1 deletion packages/stream/src/game-end.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test("a status maps to what the player is told, in the native clients' words", (
assert.equal(gameEndOf(401).kind, "unsupported");
assert.equal(gameEndOf(404).kind, "unsupported");
assert.equal(gameEndOf(403).kind, "expired");
assert.equal(gameEndNotice(gameEndOf(409), "Hades"), "Hades isn't running any more.");
assert.equal(gameEndNotice(gameEndOf(409), "Hades"), "Hades isn't running anymore.");
assert.equal(gameEndNotice(gameEndOf(500), "Hades"), "Couldn't end Hades \u2014 the host refused it (500)");
});

Expand Down
4 changes: 2 additions & 2 deletions server/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
wtransport = { version = "0.7", default-features = false, features = ["aws-lc-rs"] }
# The same PinVerify and address ranking the native clients use, and the route table, address
# classes and plane attestation check the host itself reads. The same rev as packages/stream.
punktfunk-core = { git = "https://git.unom.io/unom/punktfunk", rev = "c4d6fe182882dd1874afc47e78bbe7ff8d8c822c", default-features = false, features = ["tls"] }
punktfunk-core = { git = "https://git.unom.io/unom/punktfunk", rev = "b58dc3cfe152c48c584c8e2f77dc05d08f6aeb12", default-features = false, features = ["tls"] }

[dev-dependencies]
tower = { version = "0.5", features = ["util"] }
Expand Down
Loading