mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-11-14 18:39:33 +01:00
merge feat/desktop-app (the PR #763 review fixes) into the graphical installer branch
Both branches changed the connect page and three Rust files. How the conflicts were settled: - Layout (connect.html): both sides fixed the page being cut off above a small window. One layout is kept, the one that also holds the header still: a fixed top margin on `main`. The wizard's own top margin is dropped, since the page is anchored from the top in every state now and a second margin would move the header when the wizard opens. `#elsewhere` is a child of the card since the status line moved above it, so the wizard hides it too. - State (connect.html): `gui` from the installer next to `askedFrom`, `reopen` and the starting-server counters from the review. - setup.rs: `running_install` for the port, `install_in_app` for the flag. - local_server.rs: `login_environment` and `in_home` both stay. - README: the installer's This Mac row with the sentence about a starting server; both new paragraphs. test/desktop-connect-page.browser.test.ts reaches the Terminal install the way the page now offers it (Install, a failed preparation, "Install in Terminal instead"), since Install opens the graphical install here. Checked on the merged tree: 138 Rust unit tests, clippy and fmt on the Mac mini; test/desktop-connect-install.test.ts (jsdom) and test/desktop-connect-page.browser.test.ts (Chromium) both pass. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
commit
c04955ca68
13 files changed
+2910
-217
No files matched your search
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user