sync from internal repository

Author: lostmygithubaccount

AGENTS.md

@@ -24,10 +24,12 @@ bin/bump-version   # Bump version (--patch, --minor (default), --major)
 dkdc-links/        # Core Rust crate (standalone, not in monorepo workspace)
   src/lib.rs       # Library root
   src/main.rs      # Binary entry point
-  src/cli.rs       # CLI (clap), optional `gui` subcommand
+  src/cli.rs       # CLI (clap) with --app and --webapp flags
   src/config.rs    # Config loading/saving (~/.config/dkdc/links/config.toml)
   src/open.rs      # Link resolution (alias → link → URI)
-  src/gui.rs       # iced GUI (behind `gui` feature flag)
+  src/app.rs       # iced desktop app (behind `app` feature flag)
+  src/webapp.rs    # Axum HTMX webapp on port 1414 (behind `webapp` feature flag)
+  assets/icon.png  # App window icon
 dkdc-links-py/     # PyO3 bindings (cdylib)
 src/dkdc_links/    # Python wrapper + type stubs (core.pyi, py.typed)
 ```

README.md

@@ -52,8 +52,8 @@ dkdc-links dev
 | Flag | Short | Description |
 |------|-------|-------------|
 | `--config` | `-c` | Open config file in editor |
-| `--app` | `-a` | Open desktop app (requires `app` feature; under construction) |
-| `--webapp` | `-w` | Open the webapp (requires `webapp` feature) |
+| `--app` | `-a` | Open desktop app (iced GUI, requires `app` feature) |
+| `--webapp` | `-w` | Open the webapp on localhost:1414 (requires `webapp` feature) |
 | `--help` | `-h` | Print help |
 | `--version` | `-V` | Print version |
 

dkdc-links-py/Cargo.lock

@@ -2,7 +2,7 @@
 
 [package]
 name = "dkdc-links-py"
-version = "4.1.1"
+version = "4.1.2"
 edition = "2021"
 authors = ["Cody <cody@dkdc.dev>"]
 license = "MIT"

dkdc-links-py/Cargo.toml

@@ -7,13 +7,14 @@ codegen-units = 1
 
 [package]
 name = "dkdc-links"
-version = "4.1.1"
+version = "4.1.2"
 edition = "2021"
 authors = ["Cody <cody@dkdc.dev>"]
 description = "Bookmarks in your terminal"
 repository = "https://github.com/lostmygithubaccount/dkdc-links"
 homepage = "https://github.com/lostmygithubaccount/dkdc-links"
 license = "MIT"
+readme = "../README.md"
 
 [lib]
 name = "dkdc_links"

dkdc-links/Cargo.lock

@@ -9,6 +9,7 @@ use std::collections::HashSet;
 
 use crate::config::Config;
 use crate::storage::Storage;
+use crate::strings;
 
 // -- Colors ------------------------------------------------------------------
 
@@ -259,8 +260,7 @@ impl Links {
                 let target = self.add_alias_target.trim().to_string();
                 if !alias.is_empty() && !target.is_empty() {
                     if !self.config.links.contains_key(&target) {
-                        self.error =
-                            Some(format!("alias target '{target}' does not exist in links"));
+                        self.error = Some(strings::err_alias_target_missing(&target));
                     } else {
                         self.config.aliases.insert(alias, target);
                         self.save();
@@ -290,8 +290,7 @@ impl Links {
                         .map(String::as_str)
                         .collect();
                     if !missing.is_empty() {
-                        self.error =
-                            Some(format!("group entries not found: {}", missing.join(", ")));
+                        self.error = Some(strings::err_group_entries_missing(&missing));
                     } else {
                         self.config.groups.insert(name, entries);
                         self.save();
@@ -477,7 +476,7 @@ impl Links {
             }
             (ItemKind::Alias, "value") => {
                 if !self.config.links.contains_key(value) {
-                    self.error = Some(format!("alias target '{value}' does not exist in links"));
+                    self.error = Some(strings::err_alias_target_missing(value));
                     return;
                 }
                 if let Some(target) = self.config.aliases.get_mut(name) {
@@ -506,7 +505,7 @@ impl Links {
                     .map(String::as_str)
                     .collect();
                 if !missing.is_empty() {
-                    self.error = Some(format!("group entries not found: {}", missing.join(", ")));
+                    self.error = Some(strings::err_group_entries_missing(&missing));
                     return;
                 }
                 if let Some(existing) = self.config.groups.get_mut(name) {
@@ -559,7 +558,7 @@ impl Links {
                     iced::widget::span("dkdc-links")
                         .size(13)
                         .color(colors::PURPLE)
-                        .link("https://dkdc.io/links/".to_string()),
+                        .link(strings::PROJECT_URL.to_string()),
                     iced::widget::span(": bookmarks in your ")
                         .size(13)
                         .color(colors::TEXT_DIM),
@@ -637,7 +636,7 @@ impl Links {
     }
 
     fn view_toolbar(&self) -> Element<'_, Message> {
-        let search = text_input("filter...", &self.search)
+        let search = text_input(strings::PH_FILTER, &self.search)
             .on_input(Message::SearchChanged)
             .size(13)
             .width(200)
@@ -727,13 +726,13 @@ impl Links {
 
     fn view_add_forms(&self) -> Element<'_, Message> {
         let link_form = row![
-            text_input("link name", &self.add_link_name)
+            text_input(strings::PH_LINK_NAME, &self.add_link_name)
                 .on_input(Message::AddLinkName)
                 .on_submit(Message::SubmitLink)
                 .size(13)
                 .width(Length::FillPortion(2))
                 .style(|_, status| input_style(status)),
-            text_input("https://...", &self.add_link_url)
+            text_input(strings::PH_LINK_URL, &self.add_link_url)
                 .on_input(Message::AddLinkUrl)
                 .on_submit(Message::SubmitLink)
                 .size(13)
@@ -749,13 +748,13 @@ impl Links {
         .align_y(iced::Alignment::Center);
 
         let alias_form = row![
-            text_input("alias", &self.add_alias_name)
+            text_input(strings::PH_ALIAS_NAME, &self.add_alias_name)
                 .on_input(Message::AddAliasName)
                 .on_submit(Message::SubmitAlias)
                 .size(13)
                 .width(Length::FillPortion(2))
                 .style(|_, status| input_style(status)),
-            text_input("link name", &self.add_alias_target)
+            text_input(strings::PH_ALIAS_TARGET, &self.add_alias_target)
                 .on_input(Message::AddAliasTarget)
                 .on_submit(Message::SubmitAlias)
                 .size(13)
@@ -771,13 +770,13 @@ impl Links {
         .align_y(iced::Alignment::Center);
 
         let group_form = row![
-            text_input("group name", &self.add_group_name)
+            text_input(strings::PH_GROUP_NAME, &self.add_group_name)
                 .on_input(Message::AddGroupName)
                 .on_submit(Message::SubmitGroup)
                 .size(13)
                 .width(Length::FillPortion(2))
                 .style(|_, status| input_style(status)),
-            text_input("link1, alias2, ...", &self.add_group_entries)
+            text_input(strings::PH_GROUP_ENTRIES, &self.add_group_entries)
                 .on_input(Message::AddGroupEntries)
                 .on_submit(Message::SubmitGroup)
                 .size(13)

dkdc-links/Cargo.toml

@@ -2,6 +2,7 @@ pub mod cli;
 pub mod config;
 pub mod open;
 pub mod storage;
+pub mod strings;
 pub mod toml_storage;
 
 #[cfg(feature = "app")]

dkdc-links/src/app.rs

@@ -0,0 +1,25 @@
+//! Shared string constants used across CLI, app, and webapp.
+
+// -- Project ----------------------------------------------------------------
+
+pub const PROJECT_URL: &str = "https://dkdc.io/links/";
+
+// -- Placeholders ------------------------------------------------------------
+
+pub const PH_LINK_NAME: &str = "link name";
+pub const PH_LINK_URL: &str = "https://...";
+pub const PH_ALIAS_NAME: &str = "alias name";
+pub const PH_ALIAS_TARGET: &str = "link name";
+pub const PH_GROUP_NAME: &str = "group name";
+pub const PH_GROUP_ENTRIES: &str = "link name, alias name, ...";
+pub const PH_FILTER: &str = "filter...";
+
+// -- Error templates ---------------------------------------------------------
+
+pub fn err_alias_target_missing(target: &str) -> String {
+    format!("alias target '{target}' does not exist in links")
+}
+
+pub fn err_group_entries_missing(missing: &[&str]) -> String {
+    format!("group entries not found: {}", missing.join(", "))
+}

dkdc-links/src/lib.rs

@@ -9,6 +9,7 @@ use std::sync::{Arc, Mutex};
 
 use crate::config::Config;
 use crate::storage::Storage;
+use crate::strings;
 
 struct AppState {
     storage: Mutex<Box<dyn Storage>>,
@@ -34,6 +35,7 @@ fn escape(s: &str) -> String {
 // -- HTML rendering ----------------------------------------------------------
 
 fn page(body: &str) -> String {
+    let project_url = strings::PROJECT_URL;
     format!(
         r##"<!DOCTYPE html>
 <html lang="en">
@@ -131,7 +133,7 @@ fn page(body: &str) -> String {
 </head>
 <body>
   <h1>Bookmarks</h1>
-  <p class="subtitle"><a href="https://dkdc.io/links/" target="_blank" rel="noopener">dkdc-links</a>: bookmarks in your <s>terminal</s> browser</p>
+  <p class="subtitle"><a href="{project_url}" target="_blank" rel="noopener">dkdc-links</a>: bookmarks in your <s>terminal</s> browser</p>
   <div id="content">
     {body}
   </div>
@@ -483,14 +485,15 @@ fn render_content(config: &Config, sort: SortField, error: Option<&str>) -> Stri
     // Toolbar: search + tab filter
     html.push_str(&format!(
         r##"<div class="toolbar">
-  <input id="search" type="text" placeholder="filter..." oninput="filterRows()" autocomplete="off">
+  <input id="search" type="text" placeholder="{ph_filter}" oninput="filterRows()" autocomplete="off">
   <div class="tabs">
     <button id="tab-all" class="tab active" onclick="showTab('all')">all</button>
     <button id="tab-links" class="tab" onclick="showTab('links')">links<span class="counts">{lc}</span></button>
     <button id="tab-aliases" class="tab" onclick="showTab('aliases')">aliases<span class="counts">{ac}</span></button>
     <button id="tab-groups" class="tab" onclick="showTab('groups')">groups<span class="counts">{gc}</span></button>
   </div>
 </div>"##,
+        ph_filter = strings::PH_FILTER,
         lc = links.len(),
         ac = aliases.len(),
         gc = groups.len(),
@@ -514,25 +517,31 @@ fn render_content(config: &Config, sort: SortField, error: Option<&str>) -> Stri
     );
 
     // Add forms at the top
-    html.push_str(
+    html.push_str(&format!(
         r##"<div class="section">
 <form class="inline" hx-post="/add/link" hx-target="#content">
-  <input name="name" placeholder="link name" required>
-  <input name="url" placeholder="https://..." required>
+  <input name="name" placeholder="{ph_link_name}" required>
+  <input name="url" placeholder="{ph_link_url}" required>
   <button class="btn btn-add" type="submit">+ link</button>
 </form>
 <form class="inline" hx-post="/add/alias" hx-target="#content">
-  <input name="alias" placeholder="alias" required>
-  <input name="target" placeholder="link name" required>
+  <input name="alias" placeholder="{ph_alias_name}" required>
+  <input name="target" placeholder="{ph_alias_target}" required>
   <button class="btn btn-add" type="submit">+ alias</button>
 </form>
 <form class="inline" hx-post="/add/group" hx-target="#content">
-  <input name="name" placeholder="group name" required>
-  <input name="entries" placeholder="link1, alias2, ..." required>
+  <input name="name" placeholder="{ph_group_name}" required>
+  <input name="entries" placeholder="{ph_group_entries}" required>
   <button class="btn btn-add" type="submit">+ group</button>
 </form>
 </div>"##,
-    );
+        ph_link_name = strings::PH_LINK_NAME,
+        ph_link_url = strings::PH_LINK_URL,
+        ph_alias_name = strings::PH_ALIAS_NAME,
+        ph_alias_target = strings::PH_ALIAS_TARGET,
+        ph_group_name = strings::PH_GROUP_NAME,
+        ph_group_entries = strings::PH_GROUP_ENTRIES,
+    ));
 
     // Links section
     html.push_str(r##"<div class="section" id="section-links"><h2>links</h2>"##);
@@ -641,10 +650,7 @@ async fn add_alias(State(state): S, axum::extract::Form(form): Form) -> Html<Str
     if !alias.is_empty() && !target.is_empty() {
         let config = state.load_config();
         if !config.links.contains_key(&target) {
-            return content_err(
-                &state,
-                &format!("alias target '{target}' does not exist in links"),
-            );
+            return content_err(&state, &strings::err_alias_target_missing(&target));
         }
         let mut config = config;
         config.aliases.insert(alias, target);
@@ -673,10 +679,7 @@ async fn add_group(State(state): S, axum::extract::Form(form): Form) -> Html<Str
                 .map(String::as_str)
                 .collect();
             if !missing.is_empty() {
-                return content_err(
-                    &state,
-                    &format!("group entries not found: {}", missing.join(", ")),
-                );
+                return content_err(&state, &strings::err_group_entries_missing(&missing));
             }
             let mut config = config;
             config.groups.insert(name, entries);
@@ -747,10 +750,7 @@ async fn edit_alias(
 
     if let Some(new_target) = new_target {
         if !config.links.contains_key(new_target) {
-            return content_err(
-                &state,
-                &format!("alias target '{new_target}' does not exist in links"),
-            );
+            return content_err(&state, &strings::err_alias_target_missing(new_target));
         }
         if let Some(target) = config.aliases.get_mut(&name) {
             *target = new_target.clone();
@@ -792,10 +792,7 @@ async fn edit_group(
             .map(String::as_str)
             .collect();
         if !missing.is_empty() {
-            return content_err(
-                &state,
-                &format!("group entries not found: {}", missing.join(", ")),
-            );
+            return content_err(&state, &strings::err_group_entries_missing(&missing));
         }
         if let Some(existing) = config.groups.get_mut(&name) {
             *existing = entries;