From 0e0d67a9ac60d2cf25a04e1bd4fdfdf59f586d29 Mon Sep 17 00:00:00 2001
From: Savanni D'Gerinel <savanni@luminescent-dreams.com>
Date: Wed, 6 Dec 2023 23:39:27 -0500
Subject: [PATCH] Split Fitnesstrax into two crates

---
 Cargo.lock                           | 14 ++++++++++----
 Cargo.toml                           |  3 ++-
 fitnesstrax/{ => app}/Cargo.toml     | 15 ---------------
 fitnesstrax/{ => app}/src/main.rs    |  0
 fitnesstrax/core/Cargo.toml          | 16 ++++++++++++++++
 fitnesstrax/{ => core}/src/legacy.rs |  0
 fitnesstrax/{ => core}/src/lib.rs    |  0
 fitnesstrax/{ => core}/src/types.rs  |  0
 8 files changed, 28 insertions(+), 20 deletions(-)
 rename fitnesstrax/{ => app}/Cargo.toml (66%)
 rename fitnesstrax/{ => app}/src/main.rs (100%)
 create mode 100644 fitnesstrax/core/Cargo.toml
 rename fitnesstrax/{ => core}/src/legacy.rs (100%)
 rename fitnesstrax/{ => core}/src/lib.rs (100%)
 rename fitnesstrax/{ => core}/src/types.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index f459e2e..510d6f2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -978,15 +978,11 @@ version = "0.1.0"
 dependencies = [
  "chrono",
  "chrono-tz",
- "dimensioned 0.8.0",
- "emseries",
  "gio",
  "glib",
  "glib-build-tools 0.18.0",
  "gtk4",
  "libadwaita",
- "serde 1.0.188",
- "tempfile",
  "tokio",
 ]
 
@@ -1134,6 +1130,16 @@ dependencies = [
  "syn 2.0.37",
 ]
 
+[[package]]
+name = "ft-core"
+version = "0.1.0"
+dependencies = [
+ "dimensioned 0.8.0",
+ "emseries",
+ "serde 1.0.188",
+ "tempfile",
+]
+
 [[package]]
 name = "fuchsia-cprng"
 version = "0.1.1"
diff --git a/Cargo.toml b/Cargo.toml
index 0aed9b0..73f671e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,8 @@ members = [
     "dashboard",
     "emseries",
     "file-service",
-    "fitnesstrax",
+    "fitnesstrax/core",
+    "fitnesstrax/app",
     "fluent-ergonomics",
     "geo-types",
     "gm-control-panel",
diff --git a/fitnesstrax/Cargo.toml b/fitnesstrax/app/Cargo.toml
similarity index 66%
rename from fitnesstrax/Cargo.toml
rename to fitnesstrax/app/Cargo.toml
index 8faa7f7..7c7b3b3 100644
--- a/fitnesstrax/Cargo.toml
+++ b/fitnesstrax/app/Cargo.toml
@@ -5,30 +5,15 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[lib]
-name = "fitnesstrax"
-path = "src/lib.rs"
-
-[[bin]]
-name = "fitnesstrax"
-path = "src/main.rs"
-
 [dependencies]
 adw             = { version = "0.5", package = "libadwaita", features = [ "v1_2" ] }
 chrono          = { version = "0.4" }
 chrono-tz       = { version = "0.8" }
-dimensioned     = { version = "0.8", features = [ "serde" ] }
-emseries        = { path = "../emseries" }
 gio             = { version = "0.18" }
 glib            = { version = "0.18" }
 gtk             = { version = "0.7", package = "gtk4", features = [ "v4_8" ] }
-serde           = { version = "1", features = [ "derive" ] }
 tokio           = { version = "1.34", features = [ "full" ] }
 
-[dev-dependencies]
-tempfile        = "*"
-
 [build-dependencies]
 glib-build-tools = "0.18"
 
-
diff --git a/fitnesstrax/src/main.rs b/fitnesstrax/app/src/main.rs
similarity index 100%
rename from fitnesstrax/src/main.rs
rename to fitnesstrax/app/src/main.rs
diff --git a/fitnesstrax/core/Cargo.toml b/fitnesstrax/core/Cargo.toml
new file mode 100644
index 0000000..6b838eb
--- /dev/null
+++ b/fitnesstrax/core/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "ft-core"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+dimensioned     = { version = "0.8", features = [ "serde" ] }
+emseries        = { path = "../../emseries" }
+serde           = { version = "1", features = [ "derive" ] }
+
+[dev-dependencies]
+tempfile        = "*"
+
+
diff --git a/fitnesstrax/src/legacy.rs b/fitnesstrax/core/src/legacy.rs
similarity index 100%
rename from fitnesstrax/src/legacy.rs
rename to fitnesstrax/core/src/legacy.rs
diff --git a/fitnesstrax/src/lib.rs b/fitnesstrax/core/src/lib.rs
similarity index 100%
rename from fitnesstrax/src/lib.rs
rename to fitnesstrax/core/src/lib.rs
diff --git a/fitnesstrax/src/types.rs b/fitnesstrax/core/src/types.rs
similarity index 100%
rename from fitnesstrax/src/types.rs
rename to fitnesstrax/core/src/types.rs