Update

Cargo.toml

@@ -4,9 +4,9 @@ members = ["app", "db", "shared", "tui"]
 resolver = "2"
 
 [workspace.dependencies]
-rex-shared = "0.1.0"
-rex-db = "0.1.1"
-rex-app = "0.1.1"
+rex-shared = "0.2.0"
+rex-db = "0.2.0"
+rex-app = "0.2.0"
 chrono = "0.4.42"
 diesel = { version = "2.3.2", default-features = false, features = [
     "returning_clauses_for_sqlite_3_35",

app/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rex-app"
-version = "0.1.1"
+version = "0.2.0"
 edition = "2024"
 description = """
 Core functionality for Rex
@@ -10,8 +10,8 @@ repository = "https://github.com/TheRustyPickle/Rex"
 license = "MIT"
 
 [dependencies]
-db = { package = "rex-db", version = "0.1.1" }
-shared = { package = "rex-shared", version = "0.1.0" }
+rex-db.workspace = true
+rex-shared.workspace = true
 chrono.workspace = true
 anyhow.workspace = true
 diesel.workspace = true

app/src/conn.rs

@@ -1,9 +1,9 @@
 use anyhow::{Error, Result};
 use chrono::NaiveDate;
-pub use db::models::FetchNature;
-use db::models::{Balance, FullTx, NewSearch, NewTx, Tag, Tx, TxMethod};
-use db::{Cache, ConnCache, get_connection, get_connection_no_migrations};
 use diesel::{Connection, SqliteConnection};
+pub use rex_db::models::FetchNature;
+use rex_db::models::{Balance, FullTx, NewSearch, NewTx, Tag, Tx, TxMethod};
+use rex_db::{Cache, ConnCache, get_connection, get_connection_no_migrations};
 use std::collections::{HashMap, HashSet};
 
 use crate::modifier::{

app/src/migration.rs

@@ -1,13 +1,13 @@
 use anyhow::{Error, Result};
 use chrono::{Datelike, Months, NaiveDate, NaiveTime};
-use db::ConnCache;
-use db::models::{
-    Activity, ActivityNature, ActivityTx, ActivityTxTag, Balance, FetchNature, NewTag, NewTx, Tag,
-    TxMethod, TxTag, TxType,
-};
 use diesel::prelude::*;
 use diesel::sql_query;
 use diesel::sql_types::{Integer, Text};
+use rex_db::ConnCache;
+use rex_db::models::{
+    Activity, ActivityNature, ActivityTx, ActivityTxTag, Balance, FetchNature, NewTag, NewTx, Tag,
+    TxMethod, TxTag, TxType,
+};
 use std::collections::{HashMap, HashSet};
 use std::io::Write;
 

app/src/modifier/delete_tx.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
-use db::ConnCache;
-use db::models::{Balance, FullTx, Tx, TxTag, TxType};
+use rex_db::ConnCache;
+use rex_db::models::{Balance, FullTx, Tx, TxTag, TxType};
 
 use crate::modifier::tidy_balances;
 

app/src/modifier/new_activity.rs

@@ -1,6 +1,6 @@
 use anyhow::{Result, anyhow};
-use db::ConnCache;
-use db::models::{
+use rex_db::ConnCache;
+use rex_db::models::{
     ActivityNature, ActivityTxTag, FullTx, NewActivity, NewActivityTx, NewSearch, NewTx, Tag,
 };
 

app/src/modifier/new_method.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
-use db::ConnCache;
-use db::models::{Balance, NewTxMethod, TxMethod};
+use rex_db::ConnCache;
+use rex_db::models::{Balance, NewTxMethod, TxMethod};
 
 pub(crate) fn add_new_tx_methods(
     method_list: &Vec<String>,

app/src/modifier/new_tx.rs

@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
-use db::ConnCache;
-use db::models::{Balance, NewTag, NewTx, Tag, Tx, TxTag, TxType};
+use rex_db::ConnCache;
+use rex_db::models::{Balance, NewTag, NewTx, Tag, Tx, TxTag, TxType};
 
 use crate::modifier::tidy_balances;
 

app/src/modifier/shared.rs

@@ -1,8 +1,8 @@
 use anyhow::{Result, anyhow};
 use chrono::{Days, Local, Months, NaiveDate, NaiveTime};
-use db::ConnCache;
-use db::models::{Balance, DateNature, FetchNature, NewSearch, NewTx, Tx, TxType};
-use shared::models::Dollar;
+use rex_db::ConnCache;
+use rex_db::models::{Balance, DateNature, FetchNature, NewSearch, NewTx, Tx, TxType};
+use rex_shared::models::Dollar;
 
 use crate::utils::parse_amount_nature_cent;
 

app/src/ui_helper/autofiller.rs

@@ -1,5 +1,5 @@
-use db::ConnCache;
-use db::models::TxType;
+use rex_db::ConnCache;
+use rex_db::models::TxType;
 
 use crate::conn::MutDbConn;
 use crate::ui_helper::get_best_match;

app/src/ui_helper/stepper.rs

@@ -1,5 +1,5 @@
 use chrono::{Duration, Months, NaiveDate};
-use db::ConnCache;
+use rex_db::ConnCache;
 
 use crate::conn::MutDbConn;
 use crate::ui_helper::{

app/src/ui_helper/verifier.rs

@@ -2,7 +2,7 @@ use std::cmp::Ordering;
 use std::collections::HashSet;
 
 use chrono::NaiveDate;
-use db::ConnCache;
+use rex_db::ConnCache;
 
 use crate::conn::MutDbConn;
 use crate::ui_helper::{DateType, Field, Output, VerifierError, get_best_match};

app/src/utils.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
-use db::models::AmountNature;
-use shared::models::{Cent, Dollar};
+use rex_db::models::AmountNature;
+use rex_shared::models::{Cent, Dollar};
 
 pub fn month_name_to_num(name: &str) -> u32 {
     match name {

app/src/views/activity_view.rs

@@ -1,8 +1,8 @@
 use anyhow::Result;
 use chrono::NaiveDate;
-use db::ConnCache;
-pub use db::models::FullActivityTx;
-use db::models::{Activity, ActivityNature, ActivityWithTxs};
+use rex_db::ConnCache;
+pub use rex_db::models::FullActivityTx;
+use rex_db::models::{Activity, ActivityNature, ActivityWithTxs};
 
 pub struct ActivityView(Vec<ActivityWithTxs>);
 

app/src/views/chart_view.rs

@@ -1,6 +1,6 @@
 use chrono::NaiveDate;
-use db::models::FullTx;
-use shared::models::Cent;
+use rex_db::models::FullTx;
+use rex_shared::models::Cent;
 use std::collections::{HashMap, HashSet};
 
 use crate::views::TxViewGroup;

app/src/views/search_view.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
-use db::ConnCache;
-use db::models::{FullTx, NewSearch};
+use rex_db::ConnCache;
+use rex_db::models::{FullTx, NewSearch};
 
 pub struct SearchView(Vec<FullTx>);
 
@@ -18,7 +18,7 @@ pub(crate) fn get_search_txs(
 impl SearchView {
     #[must_use]
     pub fn tx_array(&self) -> Vec<Vec<String>> {
-        self.0.iter().map(db::models::FullTx::to_array).collect()
+        self.0.iter().map(FullTx::to_array).collect()
     }
 
     #[must_use]

app/src/views/summary_models.rs

@@ -1,5 +1,5 @@
 use chrono::NaiveDate;
-use shared::models::{Cent, Dollar};
+use rex_shared::models::{Cent, Dollar};
 use std::fmt;
 
 #[derive(Default, Clone)]

app/src/views/summary_view.rs

@@ -1,8 +1,8 @@
 use anyhow::Result;
 use chrono::{Datelike, NaiveDate};
-use db::ConnCache;
-use db::models::{FetchNature, FullTx, TxType};
-use shared::models::{Cent, Dollar};
+use rex_db::ConnCache;
+use rex_db::models::{FetchNature, FullTx, TxType};
+use rex_shared::models::{Cent, Dollar};
 use std::collections::HashMap;
 
 use crate::utils::{get_percentages, month_year_to_unique};

app/src/views/tx_view.rs

@@ -1,9 +1,9 @@
 use anyhow::Result;
 use chrono::NaiveDate;
-use db::ConnCache;
-pub use db::models::FullTx;
-use db::models::{Balance, FetchNature, TxMethod, TxType};
-use shared::models::{Cent, Dollar};
+use rex_db::ConnCache;
+pub use rex_db::models::FullTx;
+use rex_db::models::{Balance, FetchNature, TxMethod, TxType};
+use rex_shared::models::{Cent, Dollar};
 use std::collections::HashMap;
 
 use crate::conn::DbConn;

app/tests/add_tx.rs

@@ -1,7 +1,7 @@
 use chrono::NaiveDate;
-use db::ConnCache;
 use rex_app::conn::FetchNature;
 use rex_app::modifier::parse_tx_fields;
+use rex_db::ConnCache;
 use std::fs;
 
 use crate::common::create_test_db;

db/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rex-db"
-version = "0.1.1"
+version = "0.2.0"
 edition = "2024"
 description = """
 Rex database models using diesel
@@ -10,7 +10,7 @@ repository = "https://github.com/TheRustyPickle/Rex"
 license = "MIT"
 
 [dependencies]
-shared = { package = "rex-shared", version = "0.1.0" }
+rex-shared.workspace = true
 diesel.workspace = true
 chrono.workspace = true
 anyhow.workspace = true

db/src/lib.rs

@@ -8,7 +8,8 @@ use std::collections::{HashMap, HashSet};
 
 use crate::models::{FullTx, Tag, TxMethod};
 
-pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("../db/src/migrations");
+// pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("../db/src/migrations");
+pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("src/migrations");
 
 pub trait ConnCache {
     fn conn(&mut self) -> &mut SqliteConnection;

db/src/models/activity_txs.rs

@@ -1,7 +1,7 @@
 use chrono::Datelike;
 use diesel::prelude::*;
 use diesel::result::Error;
-use shared::models::Cent;
+use rex_shared::models::Cent;
 use std::collections::HashMap;
 
 use crate::ConnCache;

db/src/models/balances.rs

@@ -2,7 +2,7 @@ use chrono::{Datelike, Months, NaiveDate};
 use diesel::prelude::*;
 use diesel::result::Error;
 use diesel::upsert::excluded;
-use shared::models::Cent;
+use rex_shared::models::Cent;
 use std::collections::{HashMap, HashSet};
 
 use crate::ConnCache;

db/src/models/others.rs

@@ -1,5 +1,5 @@
 use chrono::NaiveDateTime;
-use shared::models::Cent;
+use rex_shared::models::Cent;
 use std::fmt::{self, Display};
 
 #[derive(Clone, Debug, Copy)]

db/src/models/txs.rs

@@ -3,7 +3,7 @@ use diesel::dsl::{exists, sql};
 use diesel::prelude::*;
 use diesel::result::Error;
 use diesel::sql_types::Bool;
-use shared::models::Cent;
+use rex_shared::models::Cent;
 use std::collections::HashMap;
 
 use crate::ConnCache;

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rex-shared"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2024"
 description = """
 Shared code for Rex

tui/Cargo.toml

@@ -21,8 +21,8 @@ test = false
 bench = false
 
 [dependencies]
-app = { package = "rex-app", version = "0.1.1" }
-shared = { package = "rex-shared", version = "0.1.0" }
+rex-app.workspace = true
+rex-shared.workspace = true
 anyhow.workspace = true
 crossterm = "0.29.0"
 chrono = "0.4.42"

tui/src/key_checker/key_handler.rs

@@ -1,8 +1,8 @@
 use anyhow::{Result, anyhow};
-use app::conn::{DbConn, FetchNature};
-use app::ui_helper::{DateType, StepType};
-use app::views::{ActivityView, ChartView, FullSummary, SearchView, SummaryView, TxViewGroup};
 use crossterm::event::{KeyCode, KeyEvent};
+use rex_app::conn::{DbConn, FetchNature};
+use rex_app::ui_helper::{DateType, StepType};
+use rex_app::views::{ActivityView, ChartView, FullSummary, SearchView, SummaryView, TxViewGroup};
 use std::collections::HashMap;
 use std::fmt::Write;
 

tui/src/page_handler/initializer.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
-use app::conn::get_conn;
 use atty::Stream;
+use rex_app::conn::get_conn;
 use std::env::set_current_dir;
 use std::fs::{self, File};
 use std::io::prelude::*;

tui/src/page_handler/ui_handler.rs

@@ -1,10 +1,10 @@
-use app::conn::{DbConn, FetchNature};
-use app::ui_helper::DateType;
-use app::views::SearchView;
 use crossterm::event::{self, Event, KeyEventKind, poll};
 use ratatui::Terminal;
 use ratatui::backend::Backend;
 use ratatui::style::Color;
+use rex_app::conn::{DbConn, FetchNature};
+use rex_app::ui_helper::DateType;
+use rex_app::views::SearchView;
 use std::time::Duration;
 
 use crate::config::Config;

tui/src/page_handler/ui_state.rs

@@ -1,7 +1,7 @@
-use app::conn::DbConn;
 use chrono::Datelike;
 use chrono::prelude::Local;
 use ratatui::widgets::TableState;
+use rex_app::conn::DbConn;
 use strum_macros::Display;
 
 pub const MONTHS: [&str; 12] = [

tui/src/pages/activity_ui.rs

@@ -1,8 +1,8 @@
-use app::views::ActivityView;
 use ratatui::Frame;
 use ratatui::layout::{Constraint, Direction, Layout};
 use ratatui::style::{Modifier, Style};
 use ratatui::widgets::{Cell, Row, Table};
+use rex_app::views::ActivityView;
 use thousands::Separable;
 
 use crate::page_handler::{