From 245246d083e4eb12521a7c3066f7ce66e465d07a Mon Sep 17 00:00:00 2001 From: Joakim Hulthe Date: Sun, 28 Dec 2025 14:50:09 +0100 Subject: [PATCH] Rename crate folders --- Cargo.toml | 6 +++--- {inköpslista-gui => gui}/.cargo/config.toml | 0 {inköpslista-gui => gui}/Cargo.toml | 2 +- {inköpslista-gui => gui}/build.rs | 0 {inköpslista-gui => gui}/flatpak/.gitignore | 0 {inköpslista-gui => gui}/flatpak/build-flatpak.sh | 2 +- .../flatpak/sh.nubo.Inkopslista.desktop | 0 .../flatpak/sh.nubo.Inkopslista.yml | 0 {inköpslista-gui => gui}/images/icon.svg | 0 {inköpslista-gui => gui}/images/icon_x128.png | Bin {inköpslista-gui => gui}/images/icon_x144.png | Bin {inköpslista-gui => gui}/images/icon_x192.png | Bin {inköpslista-gui => gui}/images/icon_x512.png | Bin {inköpslista-gui => gui}/images/icon_x72.png | Bin {inköpslista-gui => gui}/src/config.rs | 0 {inköpslista-gui => gui}/src/main.rs | 0 {inköpslista-gui => gui}/ui/app.slint | 0 {inköpslista-gui => gui}/ui/settings.slint | 0 {inköpslista-gui => gui}/ui/state.slint | 0 {inkopslista-lib => lib}/Cargo.toml | 0 {inkopslista-lib => lib}/src/lib.rs | 0 {inköpslista-srv => srv}/Cargo.toml | 2 +- {inköpslista-srv => srv}/list.json | 0 {inköpslista-srv => srv}/src/main.rs | 0 24 files changed, 6 insertions(+), 6 deletions(-) rename {inköpslista-gui => gui}/.cargo/config.toml (100%) rename {inköpslista-gui => gui}/Cargo.toml (91%) rename {inköpslista-gui => gui}/build.rs (100%) rename {inköpslista-gui => gui}/flatpak/.gitignore (100%) rename {inköpslista-gui => gui}/flatpak/build-flatpak.sh (86%) rename {inköpslista-gui => gui}/flatpak/sh.nubo.Inkopslista.desktop (100%) rename {inköpslista-gui => gui}/flatpak/sh.nubo.Inkopslista.yml (100%) rename {inköpslista-gui => gui}/images/icon.svg (100%) rename {inköpslista-gui => gui}/images/icon_x128.png (100%) rename {inköpslista-gui => gui}/images/icon_x144.png (100%) rename {inköpslista-gui => gui}/images/icon_x192.png (100%) rename {inköpslista-gui => gui}/images/icon_x512.png (100%) rename {inköpslista-gui => gui}/images/icon_x72.png (100%) rename {inköpslista-gui => gui}/src/config.rs (100%) rename {inköpslista-gui => gui}/src/main.rs (100%) rename {inköpslista-gui => gui}/ui/app.slint (100%) rename {inköpslista-gui => gui}/ui/settings.slint (100%) rename {inköpslista-gui => gui}/ui/state.slint (100%) rename {inkopslista-lib => lib}/Cargo.toml (100%) rename {inkopslista-lib => lib}/src/lib.rs (100%) rename {inköpslista-srv => srv}/Cargo.toml (81%) rename {inköpslista-srv => srv}/list.json (100%) rename {inköpslista-srv => srv}/src/main.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index e881618..dac149e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "3" members = [ - "inkopslista-lib", - "inköpslista-srv", - "inköpslista-gui", + "lib", + "srv", + "gui", ] diff --git a/inköpslista-gui/.cargo/config.toml b/gui/.cargo/config.toml similarity index 100% rename from inköpslista-gui/.cargo/config.toml rename to gui/.cargo/config.toml diff --git a/inköpslista-gui/Cargo.toml b/gui/Cargo.toml similarity index 91% rename from inköpslista-gui/Cargo.toml rename to gui/Cargo.toml index 2d58ad8..930a321 100644 --- a/inköpslista-gui/Cargo.toml +++ b/gui/Cargo.toml @@ -5,7 +5,7 @@ edition = "2024" [dependencies] reqwest = { version = "0.12.26", features = ["json", "rustls-tls"], default-features = false } -inkopslista-lib = { path = "../inkopslista-lib" } +inkopslista-lib = { path = "../lib" } tokio = { version = "1.48.0", features = ["full"] } serde = { version = "1.0.228", features = ["derive"] } xdg = "3.0.0" diff --git a/inköpslista-gui/build.rs b/gui/build.rs similarity index 100% rename from inköpslista-gui/build.rs rename to gui/build.rs diff --git a/inköpslista-gui/flatpak/.gitignore b/gui/flatpak/.gitignore similarity index 100% rename from inköpslista-gui/flatpak/.gitignore rename to gui/flatpak/.gitignore diff --git a/inköpslista-gui/flatpak/build-flatpak.sh b/gui/flatpak/build-flatpak.sh similarity index 86% rename from inköpslista-gui/flatpak/build-flatpak.sh rename to gui/flatpak/build-flatpak.sh index 2fe2a3a..0927ded 100644 --- a/inköpslista-gui/flatpak/build-flatpak.sh +++ b/gui/flatpak/build-flatpak.sh @@ -8,7 +8,7 @@ CARGO_TARGET_DIR="${CARGO_TARGET_DIR:-../../target}" # TODO: cross compilation with cross --target=aarch64-unknown-linux-gnu cargo b -r -cp "$CARGO_TARGET_DIR/release/inköpslista" . +cp "$CARGO_TARGET_DIR/release/inkopslista" inköpslista # TODO: cross compilation with --arch=aarch64 flatpak-builder -v --force-clean --user --install-deps-from=flathub --repo=repo --install builddir sh.nubo.Inkopslista.yml diff --git a/inköpslista-gui/flatpak/sh.nubo.Inkopslista.desktop b/gui/flatpak/sh.nubo.Inkopslista.desktop similarity index 100% rename from inköpslista-gui/flatpak/sh.nubo.Inkopslista.desktop rename to gui/flatpak/sh.nubo.Inkopslista.desktop diff --git a/inköpslista-gui/flatpak/sh.nubo.Inkopslista.yml b/gui/flatpak/sh.nubo.Inkopslista.yml similarity index 100% rename from inköpslista-gui/flatpak/sh.nubo.Inkopslista.yml rename to gui/flatpak/sh.nubo.Inkopslista.yml diff --git a/inköpslista-gui/images/icon.svg b/gui/images/icon.svg similarity index 100% rename from inköpslista-gui/images/icon.svg rename to gui/images/icon.svg diff --git a/inköpslista-gui/images/icon_x128.png b/gui/images/icon_x128.png similarity index 100% rename from inköpslista-gui/images/icon_x128.png rename to gui/images/icon_x128.png diff --git a/inköpslista-gui/images/icon_x144.png b/gui/images/icon_x144.png similarity index 100% rename from inköpslista-gui/images/icon_x144.png rename to gui/images/icon_x144.png diff --git a/inköpslista-gui/images/icon_x192.png b/gui/images/icon_x192.png similarity index 100% rename from inköpslista-gui/images/icon_x192.png rename to gui/images/icon_x192.png diff --git a/inköpslista-gui/images/icon_x512.png b/gui/images/icon_x512.png similarity index 100% rename from inköpslista-gui/images/icon_x512.png rename to gui/images/icon_x512.png diff --git a/inköpslista-gui/images/icon_x72.png b/gui/images/icon_x72.png similarity index 100% rename from inköpslista-gui/images/icon_x72.png rename to gui/images/icon_x72.png diff --git a/inköpslista-gui/src/config.rs b/gui/src/config.rs similarity index 100% rename from inköpslista-gui/src/config.rs rename to gui/src/config.rs diff --git a/inköpslista-gui/src/main.rs b/gui/src/main.rs similarity index 100% rename from inköpslista-gui/src/main.rs rename to gui/src/main.rs diff --git a/inköpslista-gui/ui/app.slint b/gui/ui/app.slint similarity index 100% rename from inköpslista-gui/ui/app.slint rename to gui/ui/app.slint diff --git a/inköpslista-gui/ui/settings.slint b/gui/ui/settings.slint similarity index 100% rename from inköpslista-gui/ui/settings.slint rename to gui/ui/settings.slint diff --git a/inköpslista-gui/ui/state.slint b/gui/ui/state.slint similarity index 100% rename from inköpslista-gui/ui/state.slint rename to gui/ui/state.slint diff --git a/inkopslista-lib/Cargo.toml b/lib/Cargo.toml similarity index 100% rename from inkopslista-lib/Cargo.toml rename to lib/Cargo.toml diff --git a/inkopslista-lib/src/lib.rs b/lib/src/lib.rs similarity index 100% rename from inkopslista-lib/src/lib.rs rename to lib/src/lib.rs diff --git a/inköpslista-srv/Cargo.toml b/srv/Cargo.toml similarity index 81% rename from inköpslista-srv/Cargo.toml rename to srv/Cargo.toml index 74a4645..5a5adac 100644 --- a/inköpslista-srv/Cargo.toml +++ b/srv/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" rocket = { version = "0.5.1", features = ["json"] } serde = { version = "1.0.228", features = ["derive"] } serde_json = "1.0.145" -inkopslista-lib = { path = "../inkopslista-lib" } +inkopslista-lib = { path = "../lib" } diff --git a/inköpslista-srv/list.json b/srv/list.json similarity index 100% rename from inköpslista-srv/list.json rename to srv/list.json diff --git a/inköpslista-srv/src/main.rs b/srv/src/main.rs similarity index 100% rename from inköpslista-srv/src/main.rs rename to srv/src/main.rs