63 Commits

Author SHA1 Message Date
arrelin
19abdd0e88 drag & drop 2026-05-16 17:10:10 +03:00
061bc18df7 Merge pull request 'ci/cd fix' (#38) from feature/change-categories into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 3m34s
Reviewed-on: #38
2026-05-16 16:34:25 +03:00
arrelin
ecf0240ba9 ci/cd fix 2026-05-16 16:33:51 +03:00
90127d1e0d Merge pull request 'update category' (#37) from feature/change-categories into master
Some checks failed
Build and Publish Images / build-and-push (push) Failing after 30s
Reviewed-on: #37
2026-05-16 16:30:57 +03:00
arrelin
8daea3ea47 update category 2026-05-16 16:30:38 +03:00
318e2144f0 Merge pull request 'mobile update' (#36) from bugfix/iro4ka into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 35s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/36
2026-03-10 14:59:16 +03:00
arrelin
7c352d9e82 mobile update 2026-03-10 14:59:04 +03:00
fe1de2bbf9 Merge pull request 'mobile update' (#35) from bugfix/iro4ka into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 2m12s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/35
2026-03-10 14:45:19 +03:00
arrelin
035e6b20c7 mobile update 2026-03-10 14:45:08 +03:00
7b7554c84b Merge pull request 'mobile update' (#34) from bugfix/iro4ka into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 2m8s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/34
2026-03-10 14:28:58 +03:00
arrelin
1832997ebe mobile update 2026-03-10 14:28:24 +03:00
c884bf812c Merge pull request 'mobile update' (#33) from bugfix/iro4ka into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 43s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/33
2026-03-10 14:11:49 +03:00
arrelin
45eefeb1f5 mobile update 2026-03-10 14:11:35 +03:00
91f9ed5474 Merge pull request 'bugfix/iro4ka' (#32) from bugfix/iro4ka into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 2m26s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/32
2026-03-10 13:55:40 +03:00
arrelin
265c29d542 mobile update 2026-03-10 13:55:24 +03:00
arrelin
d7802cf584 mobile update 2026-03-10 13:54:27 +03:00
adad656df2 Merge pull request 'bugos' (#31) from bugfix/iro4ka into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 2m39s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/31
2026-03-10 12:16:13 +03:00
arrelin
6f679a5066 bugos 2026-03-10 12:16:00 +03:00
0f72d62d3e Merge pull request 'try to do better' (#30) from feature/new-sort into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 3m47s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/30
2026-03-06 15:10:20 +03:00
arrelin
5b4ff98cc5 try to do better 2026-03-06 15:09:49 +03:00
50f5610459 Merge pull request 'try to do better' (#29) from feature/new-deploy into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 8s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/29
2026-02-24 13:18:40 +03:00
arrelin
67f72e05a1 try to do better 2026-02-24 13:18:25 +03:00
7e5d5332df Merge pull request 'try to do better' (#28) from feature/new-deploy into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 6s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/28
2026-02-24 13:10:01 +03:00
arrelin
7dc0ebf3c1 try to do better 2026-02-24 13:09:49 +03:00
f48abe37ea Merge pull request 'try to do better' (#27) from feature/new-deploy into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 6s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/27
2026-02-24 13:07:20 +03:00
arrelin
e9a588e479 try to do better 2026-02-24 13:07:08 +03:00
b000efe886 Merge pull request 'try to do better' (#26) from feature/new-deploy into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 7s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/26
2026-02-24 13:02:50 +03:00
arrelin
9eaa3de231 try to do better 2026-02-24 13:02:31 +03:00
22dd91f7ce Merge pull request 'try to do better' (#25) from feature/new-deploy into master
Some checks failed
Build and Publish Images / build-and-push (push) Failing after 2m37s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/25
2026-02-24 12:54:44 +03:00
arrelin
80f2fa55cd try to do better 2026-02-24 12:54:19 +03:00
38ffa260b3 Merge pull request 'try to do better' (#24) from feature/history into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 28s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/24
2026-02-12 15:58:17 +00:00
arrelin
b90e002f28 try to do better 2026-02-12 18:57:52 +03:00
0e856b8904 Merge pull request 'try to do better' (#23) from feature/history into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 12s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/23
2026-02-12 15:51:38 +00:00
arrelin
62aa6b2215 try to do better 2026-02-12 18:51:17 +03:00
8d47aa336e Merge pull request 'try to do better' (#22) from feature/history into master
Some checks failed
Build and Publish Images / build-and-push (push) Failing after 3m48s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/22
2026-02-12 15:44:17 +00:00
arrelin
2f4e8af2a0 try to do better 2026-02-12 18:43:36 +03:00
3410786da7 Merge pull request 'revert 24f04a7e82a439975a4bcc27553e000c744a7484' (#21) from arrelin-patch-2 into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 6s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/21
2026-01-29 12:43:28 +00:00
c7b9a14ff6 revert 24f04a7e82
revert try to do better
2026-01-29 12:43:22 +00:00
75fa8bd4e2 Merge pull request 'revert 30b1c97043f3af895a2797e9941251af2d49ad9b' (#19) from arrelin-patch-1 into master
Some checks failed
Build and Publish Images / build-and-push (push) Failing after 9s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/19
2026-01-29 12:38:28 +00:00
5bcabb2736 revert 30b1c97043
revert Merge pull request 'try to do better' (#18) from refactor/frontend-code-quality into master

Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/18
2026-01-29 12:38:21 +00:00
30b1c97043 Merge pull request 'try to do better' (#18) from refactor/frontend-code-quality into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 13s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/18
2026-01-29 12:32:41 +00:00
arrelin
b88eb4a9e3 try to do better 2026-01-29 15:32:22 +03:00
8334c848f1 Merge pull request 'try to do better' (#17) from refactor/frontend-code-quality into master
Some checks failed
Build and Publish Images / build-and-push (push) Failing after 13s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/17
2026-01-29 12:18:22 +00:00
arrelin
24f04a7e82 try to do better 2026-01-29 15:17:54 +03:00
f00ddc7d10 Merge pull request 'try arch docker' (#16) from feature/arch-in-docker into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 2m37s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/16
2026-01-28 08:58:05 +00:00
arrelin
332c9e141b try arch docker 2026-01-28 11:57:51 +03:00
22bd235f20 Merge pull request 'google icon for simplicity' (#15) from bugfix/react-icons into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 49s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/15
2026-01-28 08:49:23 +00:00
arrelin
df3495376b google icon for simplicity 2026-01-28 11:48:56 +03:00
bbd3e9c01d Merge pull request 'try to fix' (#14) from bugfix/deps-update into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 3m14s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/14
2026-01-24 17:32:04 +00:00
arrelin
50b1b31cb5 try to fix 2026-01-24 20:31:49 +03:00
6c72c514ae Merge pull request 'try to fix' (#13) from bugfix/deps-update into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 5s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/13
2026-01-24 17:25:04 +00:00
arrelin
721534f213 try to fix 2026-01-24 20:24:46 +03:00
c819668fd6 Merge pull request 'fix' (#12) from bugfix/deps-update into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 21s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/12
2026-01-24 17:07:44 +00:00
arrelin
86cb341ca4 fix 2026-01-24 20:07:34 +03:00
a9481676c1 Merge pull request 'dependencies update' (#11) from feature/deps-update into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 2m21s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/11
2026-01-24 15:06:33 +00:00
arrelin
83ce6dac8a dependencies update 2026-01-24 18:06:14 +03:00
8d98a7d24c Merge pull request 'fixes' (#10) from bugfix/darktheme-shoplist into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 12s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/10
2026-01-23 19:00:27 +00:00
arrelin
699b08628b fixes 2026-01-23 22:00:09 +03:00
3fabc762fd Merge pull request 'fix: improve purchased items visibility on dark theme' (#9) from bugfix/darktheme into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 12s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/9
2026-01-23 17:47:10 +00:00
arrelin
4ec3b12d03 fix: improve purchased items visibility on dark theme
Use custom .shopping-purchased class for purchased items
in shopping list. Now purchased items have proper background
on both light and dark themes.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2026-01-23 20:46:01 +03:00
0451bdc6c6 Merge pull request 'fix: improve member highlight visibility on dark theme' (#8) from feature/personal-account into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 12s
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/8
2026-01-23 14:38:14 +00:00
b86d5e1af5 Merge branch 'master' into feature/personal-account 2026-01-23 14:38:00 +00:00
arrelin
3d2888b66b fix: improve member highlight visibility on dark theme
Use custom .member-current class instead of tailwind bg-purple-50
to properly support dark theme. Current user now has visible
background on both light and dark themes.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2026-01-23 17:37:08 +03:00
97 changed files with 2593 additions and 226 deletions

View File

@@ -13,19 +13,26 @@ jobs:
uses: actions/checkout@v4
- name: Login to Gitea Registry
run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 192.168.31.100:3847 -u ${{ secrets.REGISTRY_USER }} --password-stdin
run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login gitea.arreliny.dedyn.io -u ${{ secrets.REGISTRY_USER }} --password-stdin
- name: Build and push backend image
run: |
docker build -t 192.168.31.100:3847/arrelin/family_budget-backend:latest -t 192.168.31.100:3847/arrelin/family_budget-backend:${{ gitea.sha }} ./backend
docker push 192.168.31.100:3847/arrelin/family_budget-backend:latest
docker push 192.168.31.100:3847/arrelin/family_budget-backend:${{ gitea.sha }}
docker build -t gitea.arreliny.dedyn.io/arrelin/family_budget-backend:latest -t gitea.arreliny.dedyn.io/arrelin/family_budget-backend:${{ gitea.sha }} ./backend
docker push gitea.arreliny.dedyn.io/arrelin/family_budget-backend:latest
docker push gitea.arreliny.dedyn.io/arrelin/family_budget-backend:${{ gitea.sha }}
- name: Build and push frontend image
run: |
docker build -t 192.168.31.100:3847/arrelin/family_budget-frontend:latest -t 192.168.31.100:3847/arrelin/family_budget-frontend:${{ gitea.sha }} ./frontend
docker push 192.168.31.100:3847/arrelin/family_budget-frontend:latest
docker push 192.168.31.100:3847/arrelin/family_budget-frontend:${{ gitea.sha }}
docker build -t gitea.arreliny.dedyn.io/arrelin/family_budget-frontend:latest -t gitea.arreliny.dedyn.io/arrelin/family_budget-frontend:${{ gitea.sha }} ./frontend
docker push gitea.arreliny.dedyn.io/arrelin/family_budget-frontend:latest
docker push gitea.arreliny.dedyn.io/arrelin/family_budget-frontend:${{ gitea.sha }}
- name: Logout
run: docker logout 192.168.31.100:3847
run: docker logout gitea.arreliny.dedyn.io
- name: Trigger Coolify redeploy
run: |
curl -s -H "Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}" \
"http://192.168.31.100:8000/api/v1/deploy?uuid=msoc4skogk44ckc84wokocw0&force=true"

6
.gitignore vendored
View File

@@ -11,3 +11,9 @@ Cargo.lock
certbot/
nginx/conf.d/app-ssl.conf
.env
mobile/src-tauri/gen/android/build/
mobile/src-tauri/gen/android/.gradle/
mobile/src-tauri/gen/android/app/build/
mobile/src-tauri/gen/android/buildSrc/build/
mobile/src-tauri/gen/schemas/

View File

@@ -1,5 +1,5 @@
[workspace]
members = ["backend"]
members = ["backend", "mobile/src-tauri"]
resolver = "2"
[profile.release]

View File

@@ -4,24 +4,29 @@ version = "0.1.0"
edition = "2024"
[dependencies]
tokio = { version = "1.48.0", features = ["full"] }
sea-orm = { version = "1.0", features = ["sqlx-postgres", "runtime-tokio-rustls", "macros"] }
sea-orm-migration = { version = "1.0", default-features = false, features = ["sqlx-postgres", "runtime-tokio-rustls"] }
tokio = { version = "1.49.0", features = ["full"] }
sea-orm = { version = "1.1.19", features = ["sqlx-postgres", "runtime-tokio-rustls", "macros"] }
sea-orm-migration = { version = "1.1.19", default-features = false, features = ["sqlx-postgres", "runtime-tokio-rustls"] }
dotenvy = "0.15.7"
axum = { version = "0.7", features = ["json"] }
tower-http = { version = "0.5", features = ["cors"] }
axum = { version = "0.8.8", features = ["json"] }
tower-http = { version = "0.6.8", features = ["cors"] }
chrono = { version = "0.4.42", features = ["serde"] }
serde = { version = "1.0.228", features = ["derive"] }
serde_json = "1.0"
utoipa = { version = "5.4.0", features = ["axum_extras", "chrono", "decimal_float"] }
utoipa-swagger-ui = { version = "8.0", features = ["axum"] }
axum-login = "0.15"
tower-sessions = "0.12"
tower-sessions-sqlx-store = { version = "0.12", features = ["postgres"] }
utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
axum-login = "0.18.0"
tower-sessions = "0.14.0"
tower-sessions-sqlx-store = { version = "0.15.0", features = ["postgres"] }
argon2 = "0.5"
async-trait = "0.1"
thiserror = "2.0"
time = "0.3"
oauth2 = { version = "5.0.0", features = ["reqwest"] }
reqwest = { version = "0.12.28", features = ["json"] }
rand = "0.8"
reqwest = { version = "0.13.1", features = ["json"] }
rand = "0.9.2"
uuid = { version = "1", features = ["v4"] }
sha2 = "0.10"
hex = "0.4"
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

View File

@@ -1,4 +1,8 @@
FROM rust:1.92.0 AS builder
FROM archlinux:latest AS builder
RUN pacman -Syu --noconfirm && \
pacman -S --noconfirm rust cargo && \
pacman -Scc --noconfirm
WORKDIR /app
@@ -11,12 +15,11 @@ COPY src ./src
RUN touch src/main.rs
RUN cargo build --release
FROM debian:bookworm-slim
FROM archlinux:latest
RUN apt-get update && apt-get install -y \
libssl3 \
ca-certificates \
&& rm -rf /var/lib/apt/lists/*
RUN pacman -Syu --noconfirm && \
pacman -S --noconfirm openssl ca-certificates && \
pacman -Scc --noconfirm
WORKDIR /app

View File

@@ -40,43 +40,52 @@ pub struct Credentials {
pub password: String,
}
#[async_trait::async_trait]
impl AuthnBackend for AuthBackend {
type User = user::Model;
type Credentials = Credentials;
type Error = Error;
async fn authenticate(
fn authenticate(
&self,
creds: Self::Credentials,
) -> Result<Option<Self::User>, Self::Error> {
let user = User::find()
.filter(user::Column::Username.eq(&creds.username))
.one(&self.db)
.await?;
) -> impl Future<Output = Result<Option<Self::User>, Self::Error>> + Send {
let db = self.db.clone();
async move {
let user = User::find()
.filter(user::Column::Username.eq(&creds.username))
.one(&db)
.await?;
if let Some(user) = user {
let password_hash = user.password_hash.as_ref().ok_or(Error::InvalidCredentials)?;
let parsed_hash = PasswordHash::new(password_hash)
.map_err(|_| Error::PasswordHash)?;
if let Some(user) = user {
let password_hash = user.password_hash.as_ref().ok_or(Error::InvalidCredentials)?;
let parsed_hash = PasswordHash::new(password_hash)
.map_err(|_| Error::PasswordHash)?;
let is_valid = Argon2::default()
.verify_password(creds.password.as_bytes(), &parsed_hash)
.is_ok();
let is_valid = Argon2::default()
.verify_password(creds.password.as_bytes(), &parsed_hash)
.is_ok();
if is_valid {
Ok(Some(user))
if is_valid {
Ok(Some(user))
} else {
Err(Error::InvalidCredentials)
}
} else {
Err(Error::InvalidCredentials)
}
} else {
Err(Error::InvalidCredentials)
}
}
async fn get_user(&self, user_id: &UserId<Self>) -> Result<Option<Self::User>, Self::Error> {
let user = User::find_by_id(*user_id).one(&self.db).await?;
Ok(user)
fn get_user(
&self,
user_id: &UserId<Self>,
) -> impl Future<Output = Result<Option<Self::User>, Self::Error>> + Send {
let db = self.db.clone();
let user_id = *user_id;
async move {
let user = User::find_by_id(user_id).one(&db).await?;
Ok(user)
}
}
}

View File

@@ -14,6 +14,7 @@ use time::Duration;
use tower_http::cors::CorsLayer;
use axum::http::{Method, HeaderValue};
pub mod models;
pub mod services;
pub mod migration;
@@ -50,6 +51,7 @@ pub use middleware::{require_admin, require_family_access};
routes::expense::update_expense,
routes::expense::delete_expense,
routes::expense::get_remaining_limit,
routes::expense::get_history,
routes::shopping_item::create_shopping_item,
routes::shopping_item::get_shopping_items_by_family,
routes::shopping_item::get_shopping_item,
@@ -87,6 +89,8 @@ pub use middleware::{require_admin, require_family_access};
routes::expense::CreateExpenseRequest,
routes::expense::UpdateExpenseRequest,
routes::expense::RemainingLimitResponse,
routes::expense::ExpenseHistoryResponse,
routes::expense::MonthlyExpenseGroup,
routes::shopping_item::CreateShoppingItemRequest,
routes::shopping_item::UpdateShoppingItemRequest,
routes::shopping_item::MarkAsPurchasedRequest,
@@ -150,7 +154,7 @@ pub async fn create_app(db: DatabaseConnection) -> Result<Router, DbErr> {
let admin_family_routes = Router::new()
.route("/families", post(routes::family::create_family))
.route("/families/:id", delete(routes::family::delete_family))
.route("/families/{id}", delete(routes::family::delete_family))
.route_layer(axum_middleware::from_fn(middleware::require_admin))
.layer(auth_layer.clone())
.with_state(db.clone());
@@ -168,48 +172,50 @@ pub async fn create_app(db: DatabaseConnection) -> Result<Router, DbErr> {
let oauth_routes = Router::new()
.route("/auth/google", get(routes::oauth::google_auth))
.route("/auth/google/callback", get(routes::oauth::google_callback))
.route("/auth/mobile-callback", get(routes::oauth::mobile_callback))
.layer(auth_layer.clone())
.with_state(db.clone());
let invite_link_routes = Router::new()
.route("/my-family/invite-links", post(routes::invite_link::create_invite_link))
.route("/my-family/invite-links", get(routes::invite_link::get_my_invite_links))
.route("/my-family/invite-links/:token", delete(routes::invite_link::delete_invite_link))
.route("/invite/:token/join", post(routes::invite_link::join_family_via_invite))
.route("/my-family/invite-links/{token}", delete(routes::invite_link::delete_invite_link))
.route("/invite/{token}/join", post(routes::invite_link::join_family_via_invite))
.layer(auth_layer.clone())
.with_state(db.clone());
let family_protected_routes = Router::new()
.route("/families/:family_id/categories", post(routes::category::create_category))
.route("/families/:family_id/categories", get(routes::category::get_categories_by_family))
.route("/families/:family_id/categories/:category_id", get(routes::category::get_category))
.route("/families/:family_id/categories/:category_id", put(routes::category::update_category))
.route("/families/:family_id/categories/:category_id", delete(routes::category::delete_category))
.route("/families/:family_id/categories/:category_id/expenses", post(routes::expense::create_expense))
.route("/families/:family_id/categories/:category_id/expenses", get(routes::expense::get_expenses_by_category))
.route("/families/:family_id/categories/:category_id/expenses/:expense_id", get(routes::expense::get_expense))
.route("/families/:family_id/categories/:category_id/expenses/:expense_id", put(routes::expense::update_expense))
.route("/families/:family_id/categories/:category_id/expenses/:expense_id", delete(routes::expense::delete_expense))
.route("/families/:family_id/categories/:category_id/remaining", get(routes::expense::get_remaining_limit))
.route("/families/:family_id/shopping-items", post(routes::shopping_item::create_shopping_item))
.route("/families/:family_id/shopping-items", get(routes::shopping_item::get_shopping_items_by_family))
.route("/families/:family_id/shopping-items/:id", get(routes::shopping_item::get_shopping_item))
.route("/families/:family_id/shopping-items/:id", put(routes::shopping_item::update_shopping_item))
.route("/families/:family_id/shopping-items/:id", delete(routes::shopping_item::delete_shopping_item))
.route("/families/:family_id/shopping-items/:id/purchased", axum::routing::patch(routes::shopping_item::mark_as_purchased))
.route("/families/:family_id/shopping-items/mark-all-purchased", post(routes::shopping_item::mark_all_as_purchased))
.route("/families/:family_id/shopping-items/clear-all", delete(routes::shopping_item::clear_all))
.route("/families/:family_id/members", get(routes::user::get_family_members))
.route("/families/{family_id}/categories", post(routes::category::create_category))
.route("/families/{family_id}/categories", get(routes::category::get_categories_by_family))
.route("/families/{family_id}/categories/{category_id}", get(routes::category::get_category))
.route("/families/{family_id}/categories/{category_id}", put(routes::category::update_category))
.route("/families/{family_id}/categories/{category_id}", delete(routes::category::delete_category))
.route("/families/{family_id}/categories/{category_id}/expenses", post(routes::expense::create_expense))
.route("/families/{family_id}/categories/{category_id}/expenses", get(routes::expense::get_expenses_by_category))
.route("/families/{family_id}/categories/{category_id}/expenses/history", get(routes::expense::get_history))
.route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", get(routes::expense::get_expense))
.route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", put(routes::expense::update_expense))
.route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", delete(routes::expense::delete_expense))
.route("/families/{family_id}/categories/{category_id}/remaining", get(routes::expense::get_remaining_limit))
.route("/families/{family_id}/shopping-items", post(routes::shopping_item::create_shopping_item))
.route("/families/{family_id}/shopping-items", get(routes::shopping_item::get_shopping_items_by_family))
.route("/families/{family_id}/shopping-items/{id}", get(routes::shopping_item::get_shopping_item))
.route("/families/{family_id}/shopping-items/{id}", put(routes::shopping_item::update_shopping_item))
.route("/families/{family_id}/shopping-items/{id}", delete(routes::shopping_item::delete_shopping_item))
.route("/families/{family_id}/shopping-items/{id}/purchased", axum::routing::patch(routes::shopping_item::mark_as_purchased))
.route("/families/{family_id}/shopping-items/mark-all-purchased", post(routes::shopping_item::mark_all_as_purchased))
.route("/families/{family_id}/shopping-items/clear-all", delete(routes::shopping_item::clear_all))
.route("/families/{family_id}/members", get(routes::user::get_family_members))
.route_layer(axum_middleware::from_fn(middleware::require_family_access))
.layer(auth_layer.clone())
.with_state(db.clone());
let public_routes = Router::new()
.route("/families", get(routes::family::get_all_families))
.route("/families/:id", get(routes::family::get_family))
.route("/families/:id", put(routes::family::update_family))
.route("/families/:id/verify", post(routes::family::verify_family_password))
.route("/invite/:token", get(routes::invite_link::validate_invite_link))
.route("/families/{id}", get(routes::family::get_family))
.route("/families/{id}", put(routes::family::update_family))
.route("/families/{id}/verify", post(routes::family::verify_family_password))
.route("/invite/{token}", get(routes::invite_link::validate_invite_link))
.layer(session_layer)
.with_state(db);
@@ -225,7 +231,7 @@ pub async fn create_app(db: DatabaseConnection) -> Result<Router, DbErr> {
.url("/api-docs/openapi.json", ApiDoc::openapi());
let allowed_origins = std::env::var("ALLOWED_ORIGINS")
.unwrap_or_else(|_| "http://localhost:3000,http://localhost:5173,http://localhost:5174,http://localhost:5175,http://localhost:8080".to_string());
.unwrap_or_else(|_| "http://localhost:3000,http://localhost:5173,http://localhost:5174,http://localhost:5175,http://localhost:8080,http://localhost:1420,http://tauri.localhost,https://tauri.localhost".to_string());
let origins: Vec<HeaderValue> = allowed_origins
.split(',')

View File

@@ -1,9 +1,15 @@
use family_budget::*;
use sea_orm::DbErr;
use sea_orm_migration::prelude::*;
#[tokio::main]
async fn main() -> Result<(), DbErr> {
tracing_subscriber::fmt()
.with_env_filter(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "family_budget=debug,info".parse().unwrap()),
)
.init();
let db = establish_connection().await?;
println!("Successfully connected to database!");

View File

@@ -0,0 +1,40 @@
use sea_orm_migration::prelude::*;
#[derive(DeriveMigrationName)]
pub struct Migration;
#[async_trait::async_trait]
impl MigrationTrait for Migration {
async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
manager
.alter_table(
Table::alter()
.table(Expense::Table)
.add_column(
ColumnDef::new(Expense::Active)
.boolean()
.not_null()
.default(true)
)
.to_owned(),
)
.await
}
async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
manager
.alter_table(
Table::alter()
.table(Expense::Table)
.drop_column(Expense::Active)
.to_owned(),
)
.await
}
}
#[derive(DeriveIden)]
enum Expense {
Table,
Active,
}

View File

@@ -7,6 +7,7 @@ mod m20241215_000001_add_family_password;
mod m20241224_000001_create_shopping_items;
mod m20250116_000001_add_oauth_fields;
mod m20250117_000001_create_invite_links;
mod m20260212_000001_add_expense_active;
pub struct Migrator;
@@ -21,6 +22,7 @@ impl MigratorTrait for Migrator {
Box::new(m20241224_000001_create_shopping_items::Migration),
Box::new(m20250116_000001_add_oauth_fields::Migration),
Box::new(m20250117_000001_create_invite_links::Migration),
Box::new(m20260212_000001_add_expense_active::Migration),
]
}
}

View File

@@ -11,6 +11,7 @@ pub struct Model {
pub amount: Decimal,
pub description: Option<String>,
pub created_at: DateTime,
pub active: bool,
}
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

View File

@@ -1,12 +1,11 @@
use axum::{
extract::{Path, State},
extract::{Path, Query, State},
http::StatusCode,
Json,
};
use sea_orm::{prelude::Decimal, DatabaseConnection};
use serde::{Deserialize, Serialize};
use utoipa::ToSchema;
use utoipa::{IntoParams, ToSchema};
use crate::models::expense::Model as ExpenseModel;
use crate::services::{CategoryService, ExpenseService};
@@ -31,6 +30,27 @@ pub struct RemainingLimitResponse {
pub remaining_limit: Decimal,
}
#[derive(Debug, Serialize, Deserialize, ToSchema)]
pub struct MonthlyExpenseGroup {
pub year: i32,
pub month: u32,
pub total_amount: Decimal,
pub expenses: Vec<ExpenseModel>,
}
#[derive(Debug, Serialize, Deserialize, ToSchema)]
pub struct ExpenseHistoryResponse {
pub months: Vec<MonthlyExpenseGroup>,
}
#[derive(Debug, Deserialize, IntoParams)]
pub struct HistoryQueryParams {
#[serde(default)]
pub sort_order: Option<String>,
#[serde(default)]
pub show_archive: Option<bool>,
}
#[utoipa::path(
post,
path = "/families/{family_id}/categories/{category_id}/expenses",
@@ -183,6 +203,53 @@ pub async fn update_expense(
.map(Json)
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)
}
#[utoipa::path(
get,
path = "/families/{family_id}/categories/{category_id}/expenses/history",
tag = "expenses",
params(
("family_id" = i32, Path, description = "Family ID"),
("category_id" = i32, Path, description = "Category ID"),
HistoryQueryParams
),
responses(
(status = 200, description = "Expense history grouped by month", body = ExpenseHistoryResponse),
(status = 404, description = "Category not found"),
(status = 500, description = "Internal server error")
)
)]
pub async fn get_history(
State(db): State<DatabaseConnection>,
Path((family_id, category_id)): Path<(i32, i32)>,
Query(params): Query<HistoryQueryParams>,
) -> Result<Json<ExpenseHistoryResponse>, StatusCode> {
let category = CategoryService::find_by_id(&db, category_id)
.await
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
.ok_or(StatusCode::NOT_FOUND)?;
if category.family_id != family_id {
return Err(StatusCode::NOT_FOUND);
}
let groups = ExpenseService::get_expense_history(
&db,
category_id,
params.sort_order,
params.show_archive.unwrap_or(false)
)
.await
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
let months = groups.into_iter().map(|g| MonthlyExpenseGroup {
year: g.year,
month: g.month,
total_amount: g.total_amount,
expenses: g.expenses,
}).collect();
Ok(Json(ExpenseHistoryResponse { months }))
}
#[utoipa::path(
delete,
@@ -194,7 +261,7 @@ pub async fn update_expense(
("expense_id" = i32, Path, description = "Expense ID")
),
responses(
(status = 204, description = "Expense deleted successfully"),
(status = 200, description = "Expense deactivated successfully", body = ExpenseModel),
(status = 404, description = "Expense not found"),
(status = 500, description = "Internal server error")
)
@@ -202,7 +269,7 @@ pub async fn update_expense(
pub async fn delete_expense(
State(db): State<DatabaseConnection>,
Path((family_id, category_id, expense_id)): Path<(i32, i32, i32)>,
) -> Result<StatusCode, StatusCode> {
) -> Result<Json<ExpenseModel>, StatusCode> {
let category = CategoryService::find_by_id(&db, category_id)
.await
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
@@ -223,7 +290,7 @@ pub async fn delete_expense(
ExpenseService::delete(&db, expense_id)
.await
.map(|_| StatusCode::NO_CONTENT)
.map(Json)
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)
}

View File

@@ -1,24 +1,87 @@
use axum::{
extract::{Query, State},
http::StatusCode,
response::Redirect,
response::{Html, IntoResponse, Redirect, Response},
Json,
};
use axum_login::AuthSession;
use sea_orm::DatabaseConnection;
use sea_orm::{DatabaseConnection, EntityTrait};
use serde::{Deserialize, Serialize};
use sha2::{Digest, Sha256};
use tower_sessions::Session;
use tracing::{info, warn};
use utoipa::ToSchema;
use crate::auth::AuthBackend;
use crate::models::User;
use crate::services::OAuthService;
const CSRF_TOKEN_KEY: &str = "oauth_csrf_token";
const FRONTEND_URL_KEY: &str = "oauth_frontend_url";
fn mobile_secret() -> String {
std::env::var("MOBILE_SECRET").unwrap_or_else(|_| "family-budget-mobile-secret".to_string())
}
fn sign(data: &str) -> String {
let secret = mobile_secret();
let mut hasher = Sha256::new();
hasher.update(format!("{}:{}", secret, data).as_bytes());
hex::encode(hasher.finalize())
}
fn make_mobile_csrf_state(nonce: &str) -> String {
let sig = sign(&format!("csrf.mobile.{}", nonce));
format!("mobile.{}.{}", nonce, sig)
}
fn verify_mobile_csrf_state(state: &str) -> bool {
let mut parts = state.splitn(3, '.');
match (parts.next(), parts.next(), parts.next()) {
(Some("mobile"), Some(nonce), Some(sig)) => {
sign(&format!("csrf.mobile.{}", nonce)) == sig
}
_ => false,
}
}
fn make_auth_token(user_id: i32) -> String {
let timestamp = std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_secs();
let payload = format!("{}.{}", user_id, timestamp);
let sig = sign(&format!("auth.{}", payload));
format!("{}.{}", payload, sig)
}
fn verify_auth_token(token: &str) -> Option<i32> {
let mut parts = token.splitn(3, '.');
let user_id_str = parts.next()?;
let timestamp_str = parts.next()?;
let sig = parts.next()?;
let payload = format!("{}.{}", user_id_str, timestamp_str);
if sign(&format!("auth.{}", payload)) != sig {
return None;
}
let timestamp: u64 = timestamp_str.parse().ok()?;
let now = std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_secs();
if now.saturating_sub(timestamp) > 300 {
return None;
}
user_id_str.parse().ok()
}
#[derive(Debug, Deserialize, ToSchema)]
pub struct GoogleAuthQuery {
pub redirect_url: Option<String>,
pub mobile: Option<bool>,
}
#[derive(Debug, Deserialize)]
@@ -37,7 +100,8 @@ pub struct OAuthUrlResponse {
path = "/auth/google",
tag = "auth",
params(
("redirect_url" = Option<String>, Query, description = "Frontend URL to redirect after auth")
("redirect_url" = Option<String>, Query, description = "Frontend URL to redirect after auth"),
("mobile" = Option<bool>, Query, description = "Mobile OAuth flow")
),
responses(
(status = 200, description = "Returns Google OAuth URL", body = OAuthUrlResponse)
@@ -48,6 +112,15 @@ pub async fn google_auth(
Query(query): Query<GoogleAuthQuery>,
) -> Result<Json<OAuthUrlResponse>, StatusCode> {
let oauth_service = OAuthService::new();
if query.mobile.unwrap_or(false) {
let nonce = uuid::Uuid::new_v4().to_string();
let mobile_state = make_mobile_csrf_state(&nonce);
let auth_url = oauth_service.get_auth_url_with_state(mobile_state);
info!("mobile google_auth: generated signed state for nonce={}", nonce);
return Ok(Json(OAuthUrlResponse { url: auth_url }));
}
let (auth_url, csrf_token) = oauth_service.get_auth_url();
session
@@ -79,24 +152,32 @@ pub async fn google_callback(
session: Session,
State(db): State<DatabaseConnection>,
Query(query): Query<GoogleCallbackQuery>,
) -> Result<Redirect, StatusCode> {
let stored_csrf: Option<String> = session
.get(CSRF_TOKEN_KEY)
.await
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
) -> Result<Response, StatusCode> {
let is_mobile = verify_mobile_csrf_state(&query.state);
info!("google_callback: state={} is_mobile={}", &query.state[..query.state.len().min(20)], is_mobile);
if !is_mobile {
let session_csrf: Option<String> = session
.get(CSRF_TOKEN_KEY)
.await
.unwrap_or(None);
session.remove::<String>(CSRF_TOKEN_KEY).await.ok();
match session_csrf {
Some(csrf) if csrf == query.state => {}
_ => {
warn!("google_callback: CSRF mismatch, session_csrf={:?}", session_csrf.as_deref().map(|s| &s[..s.len().min(10)]));
return Err(StatusCode::UNAUTHORIZED);
}
}
}
let frontend_url: Option<String> = session
.get(FRONTEND_URL_KEY)
.await
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
session.remove::<String>(CSRF_TOKEN_KEY).await.ok();
.unwrap_or(None);
session.remove::<String>(FRONTEND_URL_KEY).await.ok();
if stored_csrf.as_deref() != Some(&query.state) {
return Err(StatusCode::UNAUTHORIZED);
}
let oauth_service = OAuthService::new();
let access_token = oauth_service
@@ -114,6 +195,17 @@ pub async fn google_callback(
.await
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
if is_mobile {
let token = make_auth_token(user.id);
info!("google_callback: mobile auth for user_id={}, token_prefix={}", user.id, &token[..token.len().min(20)]);
let deep_link = format!("com.arrelin.family-budget-android://auth?token={}", token);
let html = format!(
r#"<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0;url={0}"></head><body><script>window.location="{0}"</script></body></html>"#,
deep_link
);
return Ok(Html(html).into_response());
}
auth_session
.login(&user)
.await
@@ -127,14 +219,57 @@ pub async fn google_callback(
.unwrap_or_default();
if !authorized_families.contains(&family_id) {
authorized_families.push(family_id);
session
.insert("authorized_families", authorized_families)
.await
.ok();
session.insert("authorized_families", authorized_families).await.ok();
}
}
let redirect_url = frontend_url.unwrap_or_else(|| "http://localhost:3000".to_string());
Ok(Redirect::temporary(&redirect_url).into_response())
}
Ok(Redirect::temporary(&redirect_url))
}
#[derive(Debug, Deserialize)]
pub struct MobileCallbackQuery {
pub token: String,
}
pub async fn mobile_callback(
mut auth_session: AuthSession<AuthBackend>,
session: Session,
State(db): State<DatabaseConnection>,
Query(query): Query<MobileCallbackQuery>,
) -> Result<Json<serde_json::Value>, StatusCode> {
info!("mobile_callback: received token_prefix={}", &query.token[..query.token.len().min(20)]);
let user_id = match verify_auth_token(&query.token) {
Some(id) => id,
None => {
warn!("mobile_callback: token verification failed for token={}", &query.token[..query.token.len().min(40)]);
return Err(StatusCode::UNAUTHORIZED);
}
};
info!("mobile_callback: token valid for user_id={}", user_id);
let user = User::find_by_id(user_id)
.one(&db)
.await
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
.ok_or(StatusCode::UNAUTHORIZED)?;
auth_session
.login(&user)
.await
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
if let Some(family_id) = user.family_id {
let mut authorized_families: Vec<i32> = session
.get("authorized_families")
.await
.unwrap_or(None)
.unwrap_or_default();
if !authorized_families.contains(&family_id) {
authorized_families.push(family_id);
session.insert("authorized_families", authorized_families).await.ok();
}
}
Ok(Json(serde_json::json!({"success": true})))
}

View File

@@ -1,9 +1,18 @@
use sea_orm::*;
use sea_orm::prelude::Decimal;
use chrono::Utc;
use chrono::{Utc, Datelike};
use std::collections::HashMap;
use crate::models::expense::{self, Entity as Expense, Model as ExpenseModel};
use crate::models::category::{Entity as Category};
#[derive(Debug, Clone)]
pub struct MonthlyExpenseGroup {
pub year: i32,
pub month: u32,
pub total_amount: Decimal,
pub expenses: Vec<ExpenseModel>,
}
pub struct ExpenseService;
impl ExpenseService {
@@ -18,6 +27,7 @@ impl ExpenseService {
amount: Set(amount),
description: Set(description),
created_at: Set(Utc::now().naive_utc()),
active: Set(true),
..Default::default()
};
@@ -38,6 +48,28 @@ impl ExpenseService {
) -> Result<Vec<ExpenseModel>, DbErr> {
Expense::find()
.filter(expense::Column::CategoryId.eq(category_id))
.filter(expense::Column::Active.eq(true))
.all(db)
.await
}
pub async fn find_all_by_category_id(
db: &DatabaseConnection,
category_id: i32,
) -> Result<Vec<ExpenseModel>, DbErr> {
Expense::find()
.filter(expense::Column::CategoryId.eq(category_id))
.all(db)
.await
}
pub async fn find_inactive_by_category_id(
db: &DatabaseConnection,
category_id: i32,
) -> Result<Vec<ExpenseModel>, DbErr> {
Expense::find()
.filter(expense::Column::CategoryId.eq(category_id))
.filter(expense::Column::Active.eq(false))
.all(db)
.await
}
@@ -66,14 +98,15 @@ impl ExpenseService {
expense.update(db).await
}
pub async fn delete(db: &DatabaseConnection, id: i32) -> Result<DeleteResult, DbErr> {
pub async fn delete(db: &DatabaseConnection, id: i32) -> Result<ExpenseModel, DbErr> {
let expense = Expense::find_by_id(id)
.one(db)
.await?
.ok_or(DbErr::RecordNotFound("Expense not found".to_string()))?;
let expense: expense::ActiveModel = expense.into();
expense.delete(db).await
let mut expense: expense::ActiveModel = expense.into();
expense.active = Set(false);
expense.update(db).await
}
pub async fn calculate_remaining_limit(
@@ -92,4 +125,60 @@ impl ExpenseService {
Ok(remaining)
}
pub async fn get_expense_history(
db: &DatabaseConnection,
category_id: i32,
sort_order: Option<String>,
show_archive: bool,
) -> Result<Vec<MonthlyExpenseGroup>, DbErr> {
let expenses = if show_archive {
Self::find_inactive_by_category_id(db, category_id).await?
} else {
Self::find_by_category_id(db, category_id).await?
};
let mut grouped: HashMap<(i32, u32), Vec<ExpenseModel>> = HashMap::new();
for expense in expenses {
let year = expense.created_at.year();
let month = expense.created_at.month();
grouped.entry((year, month))
.or_insert_with(Vec::new)
.push(expense);
}
let mut result: Vec<MonthlyExpenseGroup> = grouped
.into_iter()
.map(|((year, month), mut expenses)| {
let total_amount: Decimal = expenses
.iter()
.map(|e| e.amount)
.sum();
expenses.sort_by(|a, b| b.created_at.cmp(&a.created_at));
MonthlyExpenseGroup {
year,
month,
total_amount,
expenses,
}
})
.collect();
let sort_desc = sort_order
.as_deref()
.map(|s| s.to_lowercase() == "desc")
.unwrap_or(true);
result.sort_by(|a, b| {
let cmp = a.year.cmp(&b.year).then(a.month.cmp(&b.month));
if sort_desc {
cmp.reverse()
} else {
cmp
}
});
Ok(result)
}
}

View File

@@ -1,5 +1,5 @@
use sea_orm::*;
use rand::distributions::Alphanumeric;
use rand::distr::Alphanumeric;
use rand::Rng;
use crate::models::invite_link::{self, Entity as InviteLink, Model as InviteLinkModel};
use crate::models::{user, User};
@@ -8,7 +8,7 @@ pub struct InviteLinkService;
impl InviteLinkService {
pub fn generate_token() -> String {
rand::thread_rng()
rand::rng()
.sample_iter(&Alphanumeric)
.take(32)
.map(char::from)

View File

@@ -1,7 +1,5 @@
use oauth2::{
basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl,
AuthorizationCode, TokenResponse, Scope, CsrfToken,
};
use oauth2::{basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl, AuthorizationCode, TokenResponse, Scope, CsrfToken, Client, StandardRevocableToken, EndpointSet, EndpointNotSet};
use oauth2::basic::{BasicErrorResponse, BasicRevocationErrorResponse, BasicTokenIntrospectionResponse, BasicTokenResponse};
use reqwest::Client as HttpClient;
use sea_orm::{DatabaseConnection, EntityTrait, ColumnTrait, QueryFilter, ActiveModelTrait, Set};
use serde::Deserialize;
@@ -34,11 +32,7 @@ impl OAuthService {
let redirect_url = std::env::var("GOOGLE_REDIRECT_URL")
.unwrap_or_else(|_| "http://localhost:8080/api/auth/google/callback".to_string());
let client = BasicClient::new(ClientId::new(client_id))
.set_client_secret(ClientSecret::new(client_secret))
.set_auth_uri(AuthUrl::new("https://accounts.google.com/o/oauth2/v2/auth".to_string()).unwrap())
.set_token_uri(TokenUrl::new("https://oauth2.googleapis.com/token".to_string()).unwrap())
.set_redirect_uri(RedirectUrl::new(redirect_url).unwrap());
let client = Self::get_client(client_id, client_secret, redirect_url);
let (auth_url, csrf_token) = client
.authorize_url(CsrfToken::new_random)
@@ -50,6 +44,26 @@ impl OAuthService {
(auth_url.to_string(), csrf_token)
}
pub fn get_auth_url_with_state(&self, state: String) -> String {
let client_id = std::env::var("GOOGLE_CLIENT_ID")
.expect("GOOGLE_CLIENT_ID must be set");
let client_secret = std::env::var("GOOGLE_CLIENT_SECRET")
.expect("GOOGLE_CLIENT_SECRET must be set");
let redirect_url = std::env::var("GOOGLE_REDIRECT_URL")
.unwrap_or_else(|_| "http://localhost:8080/api/auth/google/callback".to_string());
let client = Self::get_client(client_id, client_secret, redirect_url);
let (auth_url, _) = client
.authorize_url(move || CsrfToken::new(state))
.add_scope(Scope::new("openid".to_string()))
.add_scope(Scope::new("email".to_string()))
.add_scope(Scope::new("profile".to_string()))
.url();
auth_url.to_string()
}
pub async fn exchange_code(&self, code: String) -> Result<String, OAuthError> {
let client_id = std::env::var("GOOGLE_CLIENT_ID")
.expect("GOOGLE_CLIENT_ID must be set");
@@ -58,11 +72,7 @@ impl OAuthService {
let redirect_url = std::env::var("GOOGLE_REDIRECT_URL")
.unwrap_or_else(|_| "http://localhost:8080/api/auth/google/callback".to_string());
let client = BasicClient::new(ClientId::new(client_id))
.set_client_secret(ClientSecret::new(client_secret))
.set_auth_uri(AuthUrl::new("https://accounts.google.com/o/oauth2/v2/auth".to_string()).unwrap())
.set_token_uri(TokenUrl::new("https://oauth2.googleapis.com/token".to_string()).unwrap())
.set_redirect_uri(RedirectUrl::new(redirect_url).unwrap());
let client = Self::get_client(client_id, client_secret, redirect_url);
let http_client = oauth2::reqwest::ClientBuilder::new()
.build()
@@ -77,6 +87,23 @@ impl OAuthService {
Ok(token.access_token().secret().clone())
}
fn get_client(client_id: String, client_secret: String, redirect_url: String) -> Client<BasicErrorResponse,
BasicTokenResponse,
BasicTokenIntrospectionResponse,
StandardRevocableToken,
BasicRevocationErrorResponse,
EndpointSet,
EndpointNotSet,
EndpointNotSet,
EndpointNotSet,
EndpointSet> {
BasicClient::new(ClientId::new(client_id))
.set_client_secret(ClientSecret::new(client_secret))
.set_auth_uri(AuthUrl::new("https://accounts.google.com/o/oauth2/v2/auth".to_string()).unwrap())
.set_token_uri(TokenUrl::new("https://oauth2.googleapis.com/token".to_string()).unwrap())
.set_redirect_uri(RedirectUrl::new(redirect_url).unwrap())
}
pub async fn get_user_info(&self, access_token: &str) -> Result<GoogleUserInfo, OAuthError> {
let response = self.http_client
.get("https://www.googleapis.com/oauth2/v2/userinfo")

View File

@@ -4,6 +4,9 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="theme-color" content="#667eea" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<title>Family budget</title>
</head>
<body>

View File

@@ -8,7 +8,14 @@
"name": "frontend",
"version": "0.0.0",
"dependencies": {
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@tailwindcss/postcss": "^4.1.18",
"@tauri-apps/api": "^2.10.1",
"@tauri-apps/plugin-deep-link": "^2.4.7",
"@tauri-apps/plugin-opener": "^2.5.3",
"@tauri-apps/plugin-shell": "^2.3.5",
"axios": "^1.13.2",
"i18next": "^25.8.0",
"i18next-browser-languagedetector": "^8.2.0",
@@ -16,6 +23,7 @@
"react": "^19.2.0",
"react-dom": "^19.2.0",
"react-i18next": "^16.5.3",
"react-icons": "^5.5.0",
"react-router-dom": "^7.10.1",
"zustand": "^5.0.9"
},
@@ -340,6 +348,59 @@
"node": ">=6.9.0"
}
},
"node_modules/@dnd-kit/accessibility": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz",
"integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==",
"license": "MIT",
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"react": ">=16.8.0"
}
},
"node_modules/@dnd-kit/core": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
"integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
"license": "MIT",
"dependencies": {
"@dnd-kit/accessibility": "^3.1.1",
"@dnd-kit/utilities": "^3.2.2",
"tslib": "^2.0.0"
},
"peerDependencies": {
"react": ">=16.8.0",
"react-dom": ">=16.8.0"
}
},
"node_modules/@dnd-kit/sortable": {
"version": "10.0.0",
"resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-10.0.0.tgz",
"integrity": "sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==",
"license": "MIT",
"dependencies": {
"@dnd-kit/utilities": "^3.2.2",
"tslib": "^2.0.0"
},
"peerDependencies": {
"@dnd-kit/core": "^6.3.0",
"react": ">=16.8.0"
}
},
"node_modules/@dnd-kit/utilities": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
"integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
"license": "MIT",
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"react": ">=16.8.0"
}
},
"node_modules/@esbuild/aix-ppc64": {
"version": "0.25.12",
"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz",
@@ -1607,6 +1668,43 @@
"tailwindcss": "4.1.18"
}
},
"node_modules/@tauri-apps/api": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.10.1.tgz",
"integrity": "sha512-hKL/jWf293UDSUN09rR69hrToyIXBb8CjGaWC7gfinvnQrBVvnLr08FeFi38gxtugAVyVcTa5/FD/Xnkb1siBw==",
"license": "Apache-2.0 OR MIT",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/tauri"
}
},
"node_modules/@tauri-apps/plugin-deep-link": {
"version": "2.4.7",
"resolved": "https://registry.npmjs.org/@tauri-apps/plugin-deep-link/-/plugin-deep-link-2.4.7.tgz",
"integrity": "sha512-K0FQlLM6BoV7Ws2xfkh+Tnwi5VZVdkI4Vw/3AGLSf0Xvu2y86AMBzd9w/SpzKhw9ai2B6ES8di/OoGDCExkOzg==",
"license": "MIT OR Apache-2.0",
"dependencies": {
"@tauri-apps/api": "^2.10.1"
}
},
"node_modules/@tauri-apps/plugin-opener": {
"version": "2.5.3",
"resolved": "https://registry.npmjs.org/@tauri-apps/plugin-opener/-/plugin-opener-2.5.3.tgz",
"integrity": "sha512-CCcUltXMOfUEArbf3db3kCE7Ggy1ExBEBl51Ko2ODJ6GDYHRp1nSNlQm5uNCFY5k7/ufaK5Ib3Du/Zir19IYQQ==",
"license": "MIT OR Apache-2.0",
"dependencies": {
"@tauri-apps/api": "^2.8.0"
}
},
"node_modules/@tauri-apps/plugin-shell": {
"version": "2.3.5",
"resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.3.5.tgz",
"integrity": "sha512-jewtULhiQ7lI7+owCKAjc8tYLJr92U16bPOeAa472LHJdgaibLP83NcfAF2e+wkEcA53FxKQAZ7byDzs2eeizg==",
"license": "MIT OR Apache-2.0",
"dependencies": {
"@tauri-apps/api": "^2.10.1"
}
},
"node_modules/@types/babel__core": {
"version": "7.20.5",
"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
@@ -3819,6 +3917,15 @@
}
}
},
"node_modules/react-icons": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz",
"integrity": "sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==",
"license": "MIT",
"peerDependencies": {
"react": "*"
}
},
"node_modules/react-refresh": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz",
@@ -4048,6 +4155,12 @@
"typescript": ">=4.8.4"
}
},
"node_modules/tslib": {
"version": "2.8.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
"license": "0BSD"
},
"node_modules/type-check": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",

View File

@@ -10,7 +10,14 @@
"preview": "vite preview"
},
"dependencies": {
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@tailwindcss/postcss": "^4.1.18",
"@tauri-apps/api": "^2.10.1",
"@tauri-apps/plugin-deep-link": "^2.4.7",
"@tauri-apps/plugin-opener": "^2.5.3",
"@tauri-apps/plugin-shell": "^2.3.5",
"axios": "^1.13.2",
"i18next": "^25.8.0",
"i18next-browser-languagedetector": "^8.2.0",
@@ -18,6 +25,7 @@
"react": "^19.2.0",
"react-dom": "^19.2.0",
"react-i18next": "^16.5.3",
"react-icons": "^5.5.0",
"react-router-dom": "^7.10.1",
"zustand": "^5.0.9"
},

View File

@@ -16,9 +16,20 @@ function AppContent() {
const { user, isAuthenticated, isLoading, setUser, setIsLoading } = useStore();
const location = useLocation();
const themeColors: Record<string, string> = {
light: '#667eea',
dark: '#000000',
sunset: '#f97316',
ocean: '#3b82f6',
forest: '#22c55e',
purple: '#8b5cf6',
};
useEffect(() => {
const storedTheme = localStorage.getItem('theme') || 'light';
document.documentElement.setAttribute('data-theme', storedTheme);
const metaTheme = document.querySelector('meta[name="theme-color"]');
if (metaTheme) metaTheme.setAttribute('content', themeColors[storedTheme] ?? '#667eea');
const storedLocale = localStorage.getItem('locale');
if (storedLocale && storedLocale !== i18n.language) {

View File

@@ -26,6 +26,7 @@ import type {
JoinFamilyResponse,
FamilyMember,
LeaveFamilyResponse,
ExpenseHistoryResponse,
} from '../types';
const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || '';
@@ -45,10 +46,16 @@ export const authApi = {
me: () =>
apiClient.get<User>('/me'),
getGoogleAuthUrl: (redirectUrl?: string) =>
getGoogleAuthUrl: (redirectUrl?: string, mobile?: boolean) =>
apiClient.get<OAuthUrlResponse>('/auth/google', {
params: redirectUrl ? { redirect_url: redirectUrl } : undefined,
params: {
...(redirectUrl ? { redirect_url: redirectUrl } : {}),
...(mobile ? { mobile: true } : {}),
},
}),
mobileCallback: (token: string) =>
apiClient.get('/auth/mobile-callback', { params: { token } }),
};
export const familyApi = {
@@ -120,6 +127,11 @@ export const expenseApi = {
getRemainingLimit: (familyId: number, categoryId: number) =>
apiClient.get<RemainingLimit>(`/families/${familyId}/categories/${categoryId}/remaining`),
getHistory: (familyId: number, categoryId: number, showArchive: boolean = false, sortOrder: string = 'desc') =>
apiClient.get<ExpenseHistoryResponse>(`/families/${familyId}/categories/${categoryId}/expenses/history`, {
params: { show_archive: showArchive, sort_order: sortOrder },
}),
};
export const shoppingItemApi = {

View File

@@ -302,7 +302,7 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
{purchasedItems.map((item) => (
<div
key={item.id}
className="bg-green-50 p-4 rounded-2xl border-2 border-green-200"
className="shopping-purchased p-4 rounded-2xl border-2"
>
<div className="flex items-center justify-between">
<div className="flex items-center gap-3">

View File

@@ -55,6 +55,7 @@
"expense": "Expense",
"reset": "Reset",
"history": "History",
"archive": "Archive",
"management": "Category management",
"newCategory": "New category",
"categoryName": "Category name",
@@ -62,6 +63,8 @@
"addCategory": "Add category",
"deleteConfirm": "Delete category?",
"resetConfirm": "Delete all expenses for this category?",
"editTitle": "Category settings",
"editError": "Error updating category",
"createError": "Error creating category",
"deleteError": "Error deleting category",
"resetError": "Error resetting expenses"
@@ -73,9 +76,13 @@
"description": "Description",
"descriptionPlaceholder": "Optional",
"historyTitle": "Expense history",
"archiveTitle": "Expense archive",
"noExpenses": "No expenses",
"noArchive": "Archive is empty",
"archived": "Archived",
"addError": "Error adding expense",
"historyError": "Error loading expense history"
"historyError": "Error loading expense history",
"archiveError": "Error loading archive"
},
"invite": {
"title": "Invite member",
@@ -168,5 +175,19 @@
"forest": "Forest",
"purple": "Purple"
}
},
"months": {
"1": "January",
"2": "February",
"3": "March",
"4": "April",
"5": "May",
"6": "June",
"7": "July",
"8": "August",
"9": "September",
"10": "October",
"11": "November",
"12": "December"
}
}

View File

@@ -55,6 +55,7 @@
"expense": "Расход",
"reset": "Обнулить",
"history": "История",
"archive": "Архив",
"management": "Управление категориями",
"newCategory": "Новая категория",
"categoryName": "Название категории",
@@ -62,6 +63,8 @@
"addCategory": "Добавить категорию",
"deleteConfirm": "Удалить категорию?",
"resetConfirm": "Удалить все траты по этой категории?",
"editTitle": "Настройки категории",
"editError": "Ошибка обновления категории",
"createError": "Ошибка создания категории",
"deleteError": "Ошибка удаления категории",
"resetError": "Ошибка сброса трат"
@@ -73,9 +76,13 @@
"description": "Описание",
"descriptionPlaceholder": "Опционально",
"historyTitle": "История трат",
"archiveTitle": "Архив трат",
"noExpenses": "Нет трат",
"noArchive": "Архив пуст",
"archived": "Архив",
"addError": "Ошибка добавления расхода",
"historyError": "Ошибка загрузки истории трат"
"historyError": "Ошибка загрузки истории трат",
"archiveError": "Ошибка загрузки архива"
},
"invite": {
"title": "Пригласить участника",
@@ -168,5 +175,19 @@
"forest": "Лес",
"purple": "Фиолетовая"
}
},
"months": {
"1": "Январь",
"2": "Февраль",
"3": "Март",
"4": "Апрель",
"5": "Май",
"6": "Июнь",
"7": "Июль",
"8": "Август",
"9": "Сентябрь",
"10": "Октябрь",
"11": "Ноябрь",
"12": "Декабрь"
}
}

View File

@@ -1,5 +1,12 @@
@import "tailwindcss";
html,
body {
background: linear-gradient(135deg, var(--gradient-start) 0%, var(--gradient-end) 100%);
background-attachment: fixed;
overscroll-behavior-y: none;
}
:root,
[data-theme="light"] {
--gradient-start: #667eea;
@@ -181,6 +188,44 @@
color: var(--text-secondary);
}
.member-current {
background-color: rgb(243, 232, 255);
border-color: rgb(216, 180, 254);
}
[data-theme="dark"] .member-current {
background-color: rgba(139, 92, 246, 0.2);
border-color: rgba(139, 92, 246, 0.5);
}
.shopping-purchased {
background-color: rgb(240, 253, 244);
border-color: rgb(187, 247, 208);
}
[data-theme="dark"] .shopping-purchased {
background-color: rgba(34, 197, 94, 0.15);
border-color: rgba(34, 197, 94, 0.4);
}
.expense-history-item {
background-color: rgb(255, 255, 255);
border-color: rgb(229, 231, 235);
}
[data-theme="dark"] .expense-history-item {
background-color: rgba(55, 55, 55, 0.6);
border-color: rgba(75, 75, 75, 0.8);
}
.expense-description {
background-color: rgb(249, 250, 251);
}
[data-theme="dark"] .expense-description {
background-color: rgba(40, 40, 40, 0.8);
}
.animate-fadeIn {
animation: fadeIn 0.2s ease-in-out;
}

View File

@@ -3,13 +3,14 @@ import { useParams, useNavigate } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
import { categoryApi, expenseApi, inviteLinkApi } from '../api/client';
import { useStore } from '../store/useStore';
import type { Category, Expense, InviteLinkResponse } from '../types';
import type { Category, InviteLinkResponse, ExpenseHistoryResponse } from '../types';
import {
Wallet,
TrendingDown,
Plus,
Trash2,
RotateCcw,
Archive,
Loader2,
X,
DollarSign,
@@ -22,8 +23,64 @@ import {
Copy,
Check,
User,
Settings,
GripVertical,
} from 'lucide-react';
import ShoppingListModal from '../components/ShoppingListModal';
import {
DndContext,
closestCenter,
PointerSensor,
KeyboardSensor,
useSensor,
useSensors,
type DragEndEvent,
} from '@dnd-kit/core';
import {
arrayMove,
SortableContext,
sortableKeyboardCoordinates,
useSortable,
verticalListSortingStrategy,
} from '@dnd-kit/sortable';
import { CSS } from '@dnd-kit/utilities';
function SortableItem({
id,
children,
}: {
id: number;
children: (props: { listeners: ReturnType<typeof useSortable>['listeners']; attributes: ReturnType<typeof useSortable>['attributes'] }) => React.ReactNode;
}) {
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({ id });
return (
<div
ref={setNodeRef}
style={{
transform: CSS.Transform.toString(transform),
transition,
opacity: isDragging ? 0.5 : 1,
zIndex: isDragging ? 10 : 'auto' as any,
position: 'relative',
}}
>
{children({ listeners, attributes })}
</div>
);
}
const getCategoryOrder = (fid: string): number[] => {
try {
const stored = localStorage.getItem(`cat_order_${fid}`);
return stored ? JSON.parse(stored) : [];
} catch {
return [];
}
};
const saveCategoryOrder = (fid: string, order: number[]) => {
localStorage.setItem(`cat_order_${fid}`, JSON.stringify(order));
};
export default function FamilyView() {
const { t } = useTranslation();
@@ -31,6 +88,11 @@ export default function FamilyView() {
const navigate = useNavigate();
const { selectedFamily } = useStore();
const sensors = useSensors(
useSensor(PointerSensor),
useSensor(KeyboardSensor, { coordinateGetter: sortableKeyboardCoordinates })
);
const [categories, setCategories] = useState<Category[]>([]);
const [remainingLimits, setRemainingLimits] = useState<Map<number, number>>(new Map());
const [loading, setLoading] = useState(true);
@@ -44,8 +106,14 @@ export default function FamilyView() {
const [expenseAmount, setExpenseAmount] = useState('');
const [expenseDescription, setExpenseDescription] = useState('');
const [showEditCategory, setShowEditCategory] = useState<number | null>(null);
const [editCategoryName, setEditCategoryName] = useState('');
const [editCategoryLimit, setEditCategoryLimit] = useState('');
const [showHistory, setShowHistory] = useState<number | null>(null);
const [categoryExpenses, setCategoryExpenses] = useState<Expense[]>([]);
const [showArchive, setShowArchive] = useState<number | null>(null);
const [historyData, setHistoryData] = useState<ExpenseHistoryResponse | null>(null);
const [archiveData, setArchiveData] = useState<ExpenseHistoryResponse | null>(null);
const [showShoppingList, setShowShoppingList] = useState(false);
const [showInviteModal, setShowInviteModal] = useState(false);
const [inviteLink, setInviteLink] = useState<InviteLinkResponse | null>(null);
@@ -69,7 +137,19 @@ export default function FamilyView() {
console.log('Loading categories for family:', familyId);
const response = await categoryApi.getAllByFamily(parseInt(familyId));
console.log('Categories loaded:', response.data);
setCategories(response.data);
const savedOrder = getCategoryOrder(familyId);
if (savedOrder.length > 0) {
const sorted = [...response.data].sort((a, b) => {
const ai = savedOrder.indexOf(a.id);
const bi = savedOrder.indexOf(b.id);
if (ai === -1) return 1;
if (bi === -1) return -1;
return ai - bi;
});
setCategories(sorted);
} else {
setCategories(response.data);
}
const limits = new Map<number, number>();
for (const category of response.data) {
@@ -161,13 +241,58 @@ export default function FamilyView() {
setExpenseAmount('');
setExpenseDescription('');
setShowAddExpense(null);
loadCategories();
const limitResponse = await expenseApi.getRemainingLimit(parseInt(familyId), categoryId);
const limitValue = typeof limitResponse.data.remaining_limit === 'string'
? parseFloat(limitResponse.data.remaining_limit)
: limitResponse.data.remaining_limit;
setRemainingLimits(prev => new Map(prev).set(categoryId, limitValue));
if (showHistory === categoryId) {
const historyResponse = await expenseApi.getHistory(parseInt(familyId), categoryId, false);
setHistoryData(historyResponse.data);
}
} catch (err) {
alert(t('expense.addError'));
console.error(err);
}
};
const handleOpenEditCategory = (category: Category) => {
setEditCategoryName(category.name);
setEditCategoryLimit(parseFloat(category.limit_amount.toString()).toString());
setShowEditCategory(category.id);
setShowAddExpense(null);
};
const handleUpdateCategory = async (categoryId: number) => {
if (!familyId || !editCategoryName || !editCategoryLimit) return;
try {
await categoryApi.update(parseInt(familyId), categoryId, {
name: editCategoryName,
limit_amount: parseFloat(editCategoryLimit),
});
setShowEditCategory(null);
loadCategories();
} catch (err: any) {
const errorMsg = err.response?.data?.message || err.message || t('category.editError');
alert(`${t('category.editError')}: ${errorMsg}`);
}
};
const handleDragEnd = (event: DragEndEvent) => {
const { active, over } = event;
if (!over || active.id === over.id || !familyId) return;
setCategories((prev) => {
const oldIndex = prev.findIndex(c => c.id === active.id);
const newIndex = prev.findIndex(c => c.id === over.id);
const reordered = arrayMove(prev, oldIndex, newIndex);
saveCategoryOrder(familyId, reordered.map(c => c.id));
return reordered;
});
};
const handleShowHistory = async (categoryId: number) => {
if (!familyId) return;
@@ -176,12 +301,15 @@ export default function FamilyView() {
return;
}
setShowArchive(null);
try {
const response = await expenseApi.getAllByCategory(
const response = await expenseApi.getHistory(
parseInt(familyId),
categoryId
categoryId,
false
);
setCategoryExpenses(response.data);
setHistoryData(response.data);
setShowHistory(categoryId);
} catch (err) {
alert(t('expense.historyError'));
@@ -189,6 +317,30 @@ export default function FamilyView() {
}
};
const handleShowArchive = async (categoryId: number) => {
if (!familyId) return;
if (showArchive === categoryId) {
setShowArchive(null);
return;
}
setShowHistory(null);
try {
const response = await expenseApi.getHistory(
parseInt(familyId),
categoryId,
true
);
setArchiveData(response.data);
setShowArchive(categoryId);
} catch (err) {
alert(t('expense.archiveError'));
console.error(err);
}
};
const handleCreateInviteLink = async () => {
try {
setInviteLoading(true);
@@ -264,6 +416,15 @@ export default function FamilyView() {
});
};
const getMonthName = (month: number) => {
const months = [
t('months.1'), t('months.2'), t('months.3'), t('months.4'),
t('months.5'), t('months.6'), t('months.7'), t('months.8'),
t('months.9'), t('months.10'), t('months.11'), t('months.12')
];
return months[month - 1] || month;
};
return (
<div className="min-h-screen gradient-bg py-8 sm:py-12 px-4">
<div className="max-w-5xl mx-auto">
@@ -326,19 +487,29 @@ export default function FamilyView() {
</div>
)}
<div className="space-y-5 mb-6 max-w-3xl mx-auto">
<DndContext sensors={sensors} collisionDetection={closestCenter} onDragEnd={handleDragEnd}>
<SortableContext items={categories.map(c => c.id)} strategy={verticalListSortingStrategy}>
<div className="space-y-5 mb-6 max-w-3xl mx-auto">
{categories.map((category) => {
const remaining = remainingLimits.get(category.id) || 0;
const limit = parseFloat(category.limit_amount.toString());
const percentage = getProgressPercentage(remaining, limit);
return (
<SortableItem key={category.id} id={category.id}>
{({ listeners, attributes }) => (
<div
key={category.id}
className="glass-effect rounded-2xl shadow-lg p-4 sm:p-5 card-hover"
>
<div className="flex items-center justify-between gap-3 mb-4">
<div className="flex items-center gap-3">
<button
className="cursor-grab active:cursor-grabbing p-1 text-gray-400 hover:text-gray-600 touch-none flex-shrink-0"
{...listeners}
{...attributes}
>
<GripVertical className="w-5 h-5" />
</button>
<div className="p-2 category-icon text-white rounded-xl shadow-lg">
<Tag className="w-6 h-6" />
</div>
@@ -347,15 +518,24 @@ export default function FamilyView() {
</h2>
</div>
{showAddExpense !== category.id && (
<button
onClick={() => setShowAddExpense(category.id)}
className="flex items-center gap-2 px-4 py-2 btn-danger text-white rounded-xl hover:shadow-lg transition-all duration-300 font-semibold whitespace-nowrap text-sm"
>
<TrendingDown className="w-4 h-4" />
<span className="hidden sm:inline">{t('category.addExpense')}</span>
<span className="sm:hidden">{t('category.expense')}</span>
</button>
{showAddExpense !== category.id && showEditCategory !== category.id && (
<div className="flex items-center gap-2">
<button
onClick={() => handleOpenEditCategory(category)}
className="p-2 bg-gray-100 hover:bg-gray-200 border border-gray-300 text-gray-500 hover:text-gray-700 rounded-xl transition-all duration-300 shadow-sm"
title={t('category.editTitle')}
>
<Settings className="w-4 h-4" />
</button>
<button
onClick={() => setShowAddExpense(category.id)}
className="flex items-center gap-2 px-4 py-2 btn-danger text-white rounded-xl hover:shadow-lg transition-all duration-300 font-semibold whitespace-nowrap text-sm"
>
<TrendingDown className="w-4 h-4" />
<span className="hidden sm:inline">{t('category.addExpense')}</span>
<span className="sm:hidden">{t('category.expense')}</span>
</button>
</div>
)}
</div>
@@ -382,81 +562,37 @@ export default function FamilyView() {
</p>
</div>
<div className="flex gap-2 justify-between">
<div className="grid grid-cols-2 gap-2 mb-2">
<button
onClick={() => handleResetLimit(category.id)}
className="flex-1 flex items-center justify-center gap-1.5 px-3 py-2 bg-yellow-500 hover:bg-yellow-600 text-white rounded-xl transition-all font-semibold shadow-md hover:shadow-lg text-sm"
className="flex items-center justify-center gap-1.5 px-3 py-2 bg-yellow-500 hover:bg-yellow-600 text-white rounded-xl transition-all font-semibold shadow-md hover:shadow-lg text-sm"
>
<RotateCcw className="w-4 h-4" />
<span>{t('category.reset')}</span>
</button>
<button
onClick={() => handleShowHistory(category.id)}
className="flex-1 flex items-center justify-center gap-1.5 px-3 py-2 bg-blue-500 hover:bg-blue-600 text-white rounded-xl transition-all font-semibold shadow-md hover:shadow-lg text-sm"
className="flex items-center justify-center gap-1.5 px-3 py-2 bg-blue-500 hover:bg-blue-600 text-white rounded-xl transition-all font-semibold shadow-md hover:shadow-lg text-sm"
>
<History className="w-4 h-4" />
<span>{t('category.history')}</span>
</button>
<button
onClick={() => handleShowArchive(category.id)}
className="flex items-center justify-center gap-1.5 px-3 py-2 bg-purple-500 hover:bg-purple-600 text-white rounded-xl transition-all font-semibold shadow-md hover:shadow-lg text-sm"
>
<Archive className="w-4 h-4" />
<span>{t('category.archive')}</span>
</button>
<button
onClick={() => handleDeleteCategory(category.id)}
className="flex-1 flex items-center justify-center gap-1.5 px-3 py-2 bg-red-500 hover:bg-red-600 text-white rounded-xl transition-all font-semibold shadow-md hover:shadow-lg text-sm"
className="flex items-center justify-center gap-1.5 px-3 py-2 bg-red-500 hover:bg-red-600 text-white rounded-xl transition-all font-semibold shadow-md hover:shadow-lg text-sm"
>
<Trash2 className="w-4 h-4" />
<span>{t('common.delete')}</span>
</button>
</div>
{showHistory === category.id && (
<div className="mt-4 glass-effect p-4 rounded-2xl border-2 border-gray-200">
<div className="flex items-center justify-between mb-4">
<h3 className="font-semibold text-gray-800 text-lg flex items-center gap-2">
<History className="w-5 h-5" />
{t('expense.historyTitle')}
</h3>
<button
onClick={() => setShowHistory(null)}
className="p-2 hover:bg-white/50 rounded-xl transition-all"
>
<X className="w-5 h-5 text-gray-600" />
</button>
</div>
{categoryExpenses.length === 0 ? (
<p className="text-center text-gray-500 py-4">{t('expense.noExpenses')}</p>
) : (
<div className="space-y-2 max-h-96 overflow-y-auto">
{categoryExpenses.map((expense) => (
<div
key={expense.id}
className="bg-white p-3 rounded-xl shadow-sm border border-gray-200"
>
<div className="flex justify-between items-start mb-2">
<div className="flex items-center gap-2">
<div className="p-1.5 bg-red-100 rounded-lg">
<TrendingDown className="w-4 h-4 text-red-600" />
</div>
<span className="font-bold text-gray-900 text-lg">
{parseFloat(expense.amount.toString()).toFixed(2)}
</span>
</div>
<div className="flex items-center gap-1 text-xs text-gray-500">
<Calendar className="w-3 h-3" />
<span>{formatDate(expense.created_at)}</span>
</div>
</div>
{expense.description && (
<div className="flex items-start gap-2 text-sm text-gray-600 bg-gray-50 p-2 rounded-lg">
<MessageSquare className="w-4 h-4 mt-0.5 flex-shrink-0" />
<span>{expense.description}</span>
</div>
)}
</div>
))}
</div>
)}
</div>
)}
{showAddExpense === category.id && (
<div className="glass-effect p-6 rounded-2xl border-2 border-gray-200 mt-4">
<h3 className="font-semibold text-gray-800 mb-4 text-center">
@@ -505,10 +641,195 @@ export default function FamilyView() {
</div>
</div>
)}
{showEditCategory === category.id && (
<div className="glass-effect p-6 rounded-2xl border-2 border-gray-200 mt-4">
<h3 className="font-semibold text-gray-800 mb-4 text-center">
{t('category.editTitle')}
</h3>
<div className="space-y-4">
<div>
<label className="block text-sm font-medium text-gray-700 mb-2">
{t('category.categoryName')}
</label>
<input
type="text"
value={editCategoryName}
onChange={(e) => setEditCategoryName(e.target.value)}
className="w-full px-4 py-3 border-2 border-gray-300 rounded-2xl focus:border-purple-500 focus:ring-2 focus:ring-purple-200 transition-all font-medium"
/>
</div>
<div>
<label className="block text-sm font-medium text-gray-700 mb-2">
{t('category.categoryLimit')}
</label>
<input
type="number"
value={editCategoryLimit}
onChange={(e) => setEditCategoryLimit(e.target.value)}
className="w-full px-4 py-3 border-2 border-gray-300 rounded-2xl focus:border-purple-500 focus:ring-2 focus:ring-purple-200 transition-all text-center font-semibold text-lg"
/>
</div>
<div className="flex gap-3">
<button
onClick={() => handleUpdateCategory(category.id)}
className="flex-1 flex items-center justify-center gap-2 px-5 py-3 btn-success text-white rounded-2xl hover:shadow-xl transition-all font-semibold"
>
<Check className="w-5 h-5" />
{t('common.save')}
</button>
<button
onClick={() => setShowEditCategory(null)}
className="px-5 py-3 bg-gray-200 hover:bg-gray-300 text-gray-700 rounded-2xl transition-all font-medium"
>
<X className="w-5 h-5" />
</button>
</div>
</div>
</div>
)}
{showHistory === category.id && historyData && (
<div className="mt-4 glass-effect p-4 rounded-2xl border-2 border-blue-200">
<div className="flex items-center justify-between mb-4">
<h3 className="font-semibold text-gray-800 text-lg flex items-center gap-2">
<History className="w-5 h-5" />
{t('expense.historyTitle')}
</h3>
<button
onClick={() => setShowHistory(null)}
className="p-2 hover:bg-white/50 rounded-xl transition-all"
>
<X className="w-5 h-5 text-gray-600" />
</button>
</div>
{historyData.months.length === 0 ? (
<p className="text-center text-gray-500 py-4">{t('expense.noExpenses')}</p>
) : (
<div className="space-y-4 max-h-96 overflow-y-auto">
{historyData.months.map((monthGroup) => (
<div key={`${monthGroup.year}-${monthGroup.month}`} className="border-l-4 border-blue-500 pl-4">
<div className="flex justify-between items-center mb-3">
<h4 className="font-bold text-gray-900">
{getMonthName(monthGroup.month)} {monthGroup.year}
</h4>
<span className="text-lg font-semibold text-blue-600">
{parseFloat(monthGroup.total_amount.toString()).toFixed(2)}
</span>
</div>
<div className="space-y-2">
{monthGroup.expenses.map((expense) => (
<div
key={expense.id}
className="expense-history-item p-3 rounded-xl shadow-sm border bg-white"
>
<div className="flex justify-between items-start mb-2">
<div className="flex items-center gap-2">
<div className="p-1.5 bg-red-100 rounded-lg">
<TrendingDown className="w-4 h-4 text-red-600" />
</div>
<span className="font-bold text-gray-900 text-lg">
{parseFloat(expense.amount.toString()).toFixed(2)}
</span>
</div>
<div className="flex items-center gap-1 text-xs text-gray-500">
<Calendar className="w-3 h-3" />
<span>{formatDate(expense.created_at)}</span>
</div>
</div>
{expense.description && (
<div className="flex items-start gap-2 text-sm text-gray-600 expense-description p-2 rounded-lg">
<MessageSquare className="w-4 h-4 mt-0.5 flex-shrink-0" />
<span>{expense.description}</span>
</div>
)}
</div>
))}
</div>
</div>
))}
</div>
)}
</div>
)}
{showArchive === category.id && archiveData && (
<div className="mt-4 glass-effect p-4 rounded-2xl border-2 border-purple-200">
<div className="flex items-center justify-between mb-4">
<h3 className="font-semibold text-gray-800 text-lg flex items-center gap-2">
<Archive className="w-5 h-5" />
{t('expense.archiveTitle')}
</h3>
<button
onClick={() => setShowArchive(null)}
className="p-2 hover:bg-white/50 rounded-xl transition-all"
>
<X className="w-5 h-5 text-gray-600" />
</button>
</div>
{archiveData.months.length === 0 ? (
<p className="text-center text-gray-500 py-4">{t('expense.noArchive')}</p>
) : (
<div className="space-y-4 max-h-96 overflow-y-auto">
{archiveData.months.map((monthGroup) => (
<div key={`archive-${monthGroup.year}-${monthGroup.month}`} className="border-l-4 border-purple-500 pl-4">
<div className="flex justify-between items-center mb-3">
<h4 className="font-bold text-gray-700">
{getMonthName(monthGroup.month)} {monthGroup.year}
</h4>
<span className="text-lg font-semibold text-purple-600">
{parseFloat(monthGroup.total_amount.toString()).toFixed(2)}
</span>
</div>
<div className="space-y-2">
{monthGroup.expenses.map((expense) => (
<div
key={expense.id}
className="expense-history-item p-3 rounded-xl shadow-sm border bg-gray-50 opacity-75"
>
<div className="flex justify-between items-start mb-2">
<div className="flex items-center gap-2">
<div className="p-1.5 bg-gray-200 rounded-lg">
<TrendingDown className="w-4 h-4 text-gray-500" />
</div>
<span className="font-bold text-gray-600 text-lg line-through">
{parseFloat(expense.amount.toString()).toFixed(2)}
</span>
<span className="text-xs bg-purple-100 text-purple-700 px-2 py-1 rounded-full">
{t('expense.archived')}
</span>
</div>
<div className="flex items-center gap-1 text-xs text-gray-500">
<Calendar className="w-3 h-3" />
<span>{formatDate(expense.created_at)}</span>
</div>
</div>
{expense.description && (
<div className="flex items-start gap-2 text-sm text-gray-500 expense-description p-2 rounded-lg">
<MessageSquare className="w-4 h-4 mt-0.5 flex-shrink-0" />
<span className="line-through">{expense.description}</span>
</div>
)}
</div>
))}
</div>
</div>
))}
</div>
)}
</div>
)}
</div>
)}
</SortableItem>
);
})}
</div>
</div>
</SortableContext>
</DndContext>
<div className="glass-effect rounded-3xl shadow-xl p-6 sm:p-8 max-w-3xl mx-auto">
<div className="flex items-center justify-center gap-3 mb-8">

View File

@@ -1,22 +1,75 @@
import { useState } from 'react';
import { useState, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { authApi } from '../api/client';
import { useStore } from '../store/useStore';
import { Loader2, Wallet } from 'lucide-react';
import { FcGoogle } from 'react-icons/fc';
const isTauriEnv = () => typeof window !== 'undefined' && '__TAURI_INTERNALS__' in window;
const DEEP_LINK_SCHEME = 'com.arrelin.family-budget-android://auth';
export default function Login() {
const { t } = useTranslation();
const { setUser } = useStore();
const [loading, setLoading] = useState(false);
const [error, setError] = useState('');
useEffect(() => {
if (!isTauriEnv()) return;
let unlisten: (() => void) | null = null;
const setupDeepLink = async () => {
const { onOpenUrl } = await import('@tauri-apps/plugin-deep-link');
unlisten = await onOpenUrl(async (urls) => {
const url = Array.isArray(urls) ? urls[0] : urls;
if (!url.startsWith(DEEP_LINK_SCHEME)) return;
let token: string | null;
try {
token = new URL(url).searchParams.get('token');
} catch {
setError(t('login.authError'));
return;
}
if (!token) { setError(t('login.authError')); return; }
try {
setLoading(true);
await authApi.mobileCallback(token);
const me = await authApi.me();
setUser(me.data);
} catch (err: any) {
const status = err?.response?.status;
const msg = err?.response?.data ? JSON.stringify(err.response.data) : err?.message;
setError(`${status ?? 'network'}: ${msg}`);
setLoading(false);
}
});
};
setupDeepLink();
return () => { unlisten?.(); };
}, []);
const handleGoogleLogin = async () => {
try {
setLoading(true);
setError('');
if (isTauriEnv()) {
const { openUrl } = await import('@tauri-apps/plugin-opener');
const response = await authApi.getGoogleAuthUrl(undefined, true);
await openUrl(response.data.url);
return;
}
const currentUrl = window.location.origin;
const response = await authApi.getGoogleAuthUrl(currentUrl);
window.location.href = response.data.url;
} catch (err) {
setError(t('login.authError'));
} catch (err: any) {
setError(String(err?.message || err));
console.error(err);
setLoading(false);
}
@@ -53,24 +106,7 @@ export default function Login() {
<Loader2 className="w-6 h-6 animate-spin" />
) : (
<>
<svg className="w-6 h-6" viewBox="0 0 24 24">
<path
fill="#4285F4"
d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
/>
<path
fill="#34A853"
d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
/>
<path
fill="#FBBC05"
d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
/>
<path
fill="#EA4335"
d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
/>
</svg>
<FcGoogle className="w-6 h-6" />
{t('login.googleButton')}
</>
)}
@@ -79,4 +115,4 @@ export default function Login() {
</div>
</div>
);
}
}

View File

@@ -97,9 +97,20 @@ export default function Profile() {
}
};
const themeColors: Record<string, string> = {
light: '#667eea',
dark: '#000000',
sunset: '#f97316',
ocean: '#3b82f6',
forest: '#22c55e',
purple: '#8b5cf6',
};
const handleThemeChange = (theme: Theme) => {
setPreferences({ theme });
document.documentElement.setAttribute('data-theme', theme);
const metaTheme = document.querySelector('meta[name="theme-color"]');
if (metaTheme) metaTheme.setAttribute('content', themeColors[theme] ?? '#667eea');
};
const handleLocaleChange = (locale: 'ru' | 'en') => {
@@ -238,7 +249,7 @@ export default function Profile() {
{familyMembers.map((member) => (
<div
key={member.id}
className={`flex items-center justify-between p-3 rounded-xl ${member.id === user?.id ? 'bg-purple-50 border border-purple-200' : 'bg-gray-50'}`}
className={`flex items-center justify-between p-3 rounded-xl ${member.id === user?.id ? 'member-current border' : 'bg-gray-50'}`}
>
<div className="flex items-center gap-2">
<div className="w-8 h-8 category-icon rounded-full flex items-center justify-center text-white text-sm font-medium">

View File

@@ -29,6 +29,18 @@ export interface Expense {
amount: number;
description?: string;
created_at: string;
active: boolean;
}
export interface MonthlyExpenseGroup {
year: number;
month: number;
total_amount: number | string;
expenses: Expense[];
}
export interface ExpenseHistoryResponse {
months: MonthlyExpenseGroup[];
}
export interface RemainingLimit {

View File

@@ -5,10 +5,27 @@ export default defineConfig({
plugins: [react()],
server: {
port: 5173,
host: process.env.TAURI_DEV_HOST || 'localhost',
proxy: {
'/api': {
target: 'http://localhost:8080',
target: process.env.TAURI_DEV_HOST
? 'https://family-budget.duckdns.org'
: 'http://localhost:8080',
changeOrigin: true,
configure: (proxy) => {
if (process.env.TAURI_DEV_HOST) {
proxy.on('proxyRes', (proxyRes) => {
const cookies = proxyRes.headers['set-cookie'];
if (cookies) {
proxyRes.headers['set-cookie'] = cookies.map(cookie =>
cookie
.replace(/;\s*Secure/gi, '')
.replace(/;\s*Domain=[^;]*/gi, '')
);
}
});
}
},
}
}
}

24
mobile/.gitignore vendored Normal file
View File

@@ -0,0 +1,24 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
node_modules
dist
dist-ssr
*.local
# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

3
mobile/.vscode/extensions.json vendored Normal file
View File

@@ -0,0 +1,3 @@
{
"recommendations": ["tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
}

245
mobile/package-lock.json generated Normal file
View File

@@ -0,0 +1,245 @@
{
"name": "family-budget-mobile",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "family-budget-mobile",
"devDependencies": {
"@tauri-apps/cli": "^2"
}
},
"node_modules/@tauri-apps/cli": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-2.10.1.tgz",
"integrity": "sha512-jQNGF/5quwORdZSSLtTluyKQ+o6SMa/AUICfhf4egCGFdMHqWssApVgYSbg+jmrZoc8e1DscNvjTnXtlHLS11g==",
"dev": true,
"license": "Apache-2.0 OR MIT",
"bin": {
"tauri": "tauri.js"
},
"engines": {
"node": ">= 10"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/tauri"
},
"optionalDependencies": {
"@tauri-apps/cli-darwin-arm64": "2.10.1",
"@tauri-apps/cli-darwin-x64": "2.10.1",
"@tauri-apps/cli-linux-arm-gnueabihf": "2.10.1",
"@tauri-apps/cli-linux-arm64-gnu": "2.10.1",
"@tauri-apps/cli-linux-arm64-musl": "2.10.1",
"@tauri-apps/cli-linux-riscv64-gnu": "2.10.1",
"@tauri-apps/cli-linux-x64-gnu": "2.10.1",
"@tauri-apps/cli-linux-x64-musl": "2.10.1",
"@tauri-apps/cli-win32-arm64-msvc": "2.10.1",
"@tauri-apps/cli-win32-ia32-msvc": "2.10.1",
"@tauri-apps/cli-win32-x64-msvc": "2.10.1"
}
},
"node_modules/@tauri-apps/cli-darwin-arm64": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.10.1.tgz",
"integrity": "sha512-Z2OjCXiZ+fbYZy7PmP3WRnOpM9+Fy+oonKDEmUE6MwN4IGaYqgceTjwHucc/kEEYZos5GICve35f7ZiizgqEnQ==",
"cpu": [
"arm64"
],
"dev": true,
"license": "Apache-2.0 OR MIT",
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": ">= 10"
}
},
"node_modules/@tauri-apps/cli-darwin-x64": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.10.1.tgz",
"integrity": "sha512-V/irQVvjPMGOTQqNj55PnQPVuH4VJP8vZCN7ajnj+ZS8Kom1tEM2hR3qbbIRoS3dBKs5mbG8yg1WC+97dq17Pw==",
"cpu": [
"x64"
],
"dev": true,
"license": "Apache-2.0 OR MIT",
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": ">= 10"
}
},
"node_modules/@tauri-apps/cli-linux-arm-gnueabihf": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.10.1.tgz",
"integrity": "sha512-Hyzwsb4VnCWKGfTw+wSt15Z2pLw2f0JdFBfq2vHBOBhvg7oi6uhKiF87hmbXOBXUZaGkyRDkCHsdzJcIfoJC2w==",
"cpu": [
"arm"
],
"dev": true,
"license": "Apache-2.0 OR MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 10"
}
},
"node_modules/@tauri-apps/cli-linux-arm64-gnu": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.10.1.tgz",
"integrity": "sha512-OyOYs2t5GkBIvyWjA1+h4CZxTcdz1OZPCWAPz5DYEfB0cnWHERTnQ/SLayQzncrT0kwRoSfSz9KxenkyJoTelA==",
"cpu": [
"arm64"
],
"dev": true,
"libc": [
"glibc"
],
"license": "Apache-2.0 OR MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 10"
}
},
"node_modules/@tauri-apps/cli-linux-arm64-musl": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.10.1.tgz",
"integrity": "sha512-MIj78PDDGjkg3NqGptDOGgfXks7SYJwhiMh8SBoZS+vfdz7yP5jN18bNaLnDhsVIPARcAhE1TlsZe/8Yxo2zqg==",
"cpu": [
"arm64"
],
"dev": true,
"libc": [
"musl"
],
"license": "Apache-2.0 OR MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 10"
}
},
"node_modules/@tauri-apps/cli-linux-riscv64-gnu": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-riscv64-gnu/-/cli-linux-riscv64-gnu-2.10.1.tgz",
"integrity": "sha512-X0lvOVUg8PCVaoEtEAnpxmnkwlE1gcMDTqfhbefICKDnOTJ5Est3qL0SrWxizDackIOKBcvtpejrSiVpuJI1kw==",
"cpu": [
"riscv64"
],
"dev": true,
"libc": [
"glibc"
],
"license": "Apache-2.0 OR MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 10"
}
},
"node_modules/@tauri-apps/cli-linux-x64-gnu": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.10.1.tgz",
"integrity": "sha512-2/12bEzsJS9fAKybxgicCDFxYD1WEI9kO+tlDwX5znWG2GwMBaiWcmhGlZ8fi+DMe9CXlcVarMTYc0L3REIRxw==",
"cpu": [
"x64"
],
"dev": true,
"libc": [
"glibc"
],
"license": "Apache-2.0 OR MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 10"
}
},
"node_modules/@tauri-apps/cli-linux-x64-musl": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.10.1.tgz",
"integrity": "sha512-Y8J0ZzswPz50UcGOFuXGEMrxbjwKSPgXftx5qnkuMs2rmwQB5ssvLb6tn54wDSYxe7S6vlLob9vt0VKuNOaCIQ==",
"cpu": [
"x64"
],
"dev": true,
"libc": [
"musl"
],
"license": "Apache-2.0 OR MIT",
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 10"
}
},
"node_modules/@tauri-apps/cli-win32-arm64-msvc": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.10.1.tgz",
"integrity": "sha512-iSt5B86jHYAPJa/IlYw++SXtFPGnWtFJriHn7X0NFBVunF6zu9+/zOn8OgqIWSl8RgzhLGXQEEtGBdR4wzpVgg==",
"cpu": [
"arm64"
],
"dev": true,
"license": "Apache-2.0 OR MIT",
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">= 10"
}
},
"node_modules/@tauri-apps/cli-win32-ia32-msvc": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.10.1.tgz",
"integrity": "sha512-gXyxgEzsFegmnWywYU5pEBURkcFN/Oo45EAwvZrHMh+zUSEAvO5E8TXsgPADYm31d1u7OQU3O3HsYfVBf2moHw==",
"cpu": [
"ia32"
],
"dev": true,
"license": "Apache-2.0 OR MIT",
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">= 10"
}
},
"node_modules/@tauri-apps/cli-win32-x64-msvc": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.10.1.tgz",
"integrity": "sha512-6Cn7YpPFwzChy0ERz6djKEmUehWrYlM+xTaNzGPgZocw3BD7OfwfWHKVWxXzdjEW2KfKkHddfdxK1XXTYqBRLg==",
"cpu": [
"x64"
],
"dev": true,
"license": "Apache-2.0 OR MIT",
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">= 10"
}
}
}
}

12
mobile/package.json Normal file
View File

@@ -0,0 +1,12 @@
{
"name": "family-budget-mobile",
"private": true,
"scripts": {
"tauri": "tauri",
"android:dev": "tauri android dev",
"android:build": "tauri android build"
},
"devDependencies": {
"@tauri-apps/cli": "^2"
}
}

7
mobile/src-tauri/.gitignore vendored Normal file
View File

@@ -0,0 +1,7 @@
# Generated by Cargo
# will have compiled files and executables
/target/
# Generated by Tauri
# will have schema files for capabilities auto-completion
/gen/schemas

View File

@@ -0,0 +1,26 @@
[package]
name = "family-budget-android"
version = "0.1.0"
description = "A Tauri App"
authors = ["you"]
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
# The `_lib` suffix may seem redundant but it is necessary
# to make the lib name unique and wouldn't conflict with the bin name.
# This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519
name = "family_budget_android_lib"
crate-type = ["staticlib", "cdylib", "rlib"]
[build-dependencies]
tauri-build = { version = "2", features = [] }
[dependencies]
tauri = { version = "2", features = [] }
tauri-plugin-opener = "2"
tauri-plugin-deep-link = "2"
serde = { version = "1", features = ["derive"] }
serde_json = "1"

View File

@@ -0,0 +1,3 @@
fn main() {
tauri_build::build()
}

View File

@@ -0,0 +1,11 @@
{
"$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default",
"description": "Capability for the main window",
"windows": ["main"],
"permissions": [
"core:default",
"opener:default",
"deep-link:default"
]
}

View File

@@ -0,0 +1,12 @@
# EditorConfig is awesome: https://EditorConfig.org
# top-most EditorConfig file
root = true
[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = false

19
mobile/src-tauri/gen/android/.gitignore vendored Normal file
View File

@@ -0,0 +1,19 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
build
/captures
.externalNativeBuild
.cxx
local.properties
key.properties
/.tauri
/tauri.settings.gradle

View File

@@ -0,0 +1,6 @@
/src/main/**/generated
/src/main/jniLibs/**/*.so
/src/main/assets/tauri.conf.json
/tauri.build.gradle.kts
/proguard-tauri.pro
/tauri.properties

View File

@@ -0,0 +1,70 @@
import java.util.Properties
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("rust")
}
val tauriProperties = Properties().apply {
val propFile = file("tauri.properties")
if (propFile.exists()) {
propFile.inputStream().use { load(it) }
}
}
android {
compileSdk = 36
namespace = "com.arrelin.family_budget_android"
defaultConfig {
manifestPlaceholders["usesCleartextTraffic"] = "false"
applicationId = "com.arrelin.family_budget_android"
minSdk = 24
targetSdk = 36
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
}
buildTypes {
getByName("debug") {
manifestPlaceholders["usesCleartextTraffic"] = "true"
isDebuggable = true
isJniDebuggable = true
isMinifyEnabled = false
packaging { jniLibs.keepDebugSymbols.add("*/arm64-v8a/*.so")
jniLibs.keepDebugSymbols.add("*/armeabi-v7a/*.so")
jniLibs.keepDebugSymbols.add("*/x86/*.so")
jniLibs.keepDebugSymbols.add("*/x86_64/*.so")
}
}
getByName("release") {
isMinifyEnabled = true
proguardFiles(
*fileTree(".") { include("**/*.pro") }
.plus(getDefaultProguardFile("proguard-android-optimize.txt"))
.toList().toTypedArray()
)
}
}
kotlinOptions {
jvmTarget = "1.8"
}
buildFeatures {
buildConfig = true
}
}
rust {
rootDirRel = "../../../"
}
dependencies {
implementation("androidx.webkit:webkit:1.14.0")
implementation("androidx.appcompat:appcompat:1.7.1")
implementation("androidx.activity:activity-ktx:1.10.1")
implementation("com.google.android.material:material:1.12.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.4")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
}
apply(from = "tauri.build.gradle.kts")

View File

@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

View File

@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<!-- AndroidTV support -->
<uses-feature android:name="android.software.leanback" android:required="false" />
<application
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.family_budget_android"
android:usesCleartextTraffic="${usesCleartextTraffic}">
<activity
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
android:launchMode="singleTask"
android:label="@string/main_activity_title"
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<!-- AndroidTV support -->
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
</intent-filter>
<!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
<intent-filter >
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="com.arrelin.family-budget-android" />
<data android:host="auth" />
</intent-filter>
<!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
</activity>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
</application>
</manifest>

View File

@@ -0,0 +1,11 @@
package com.arrelin.family_budget_android
import android.os.Bundle
import androidx.activity.enableEdgeToEdge
class MainActivity : TauriActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge()
super.onCreate(savedInstanceState)
}
}

View File

@@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>

View File

@@ -0,0 +1,170 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
</vector>

View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -0,0 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.family_budget_android" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Customize your theme here. -->
</style>
</resources>

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
</resources>

View File

@@ -0,0 +1,4 @@
<resources>
<string name="app_name">Family Budget</string>
<string name="main_activity_title">Family Budget</string>
</resources>

View File

@@ -0,0 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.family_budget_android" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Customize your theme here. -->
</style>
</resources>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<external-path name="my_images" path="." />
<cache-path name="my_cache_images" path="." />
</paths>

View File

@@ -0,0 +1,22 @@
buildscript {
repositories {
google()
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:8.11.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
}
}
allprojects {
repositories {
google()
mavenCentral()
}
}
tasks.register("clean").configure {
delete("build")
}

View File

@@ -0,0 +1,23 @@
plugins {
`kotlin-dsl`
}
gradlePlugin {
plugins {
create("pluginsForCoolKids") {
id = "rust"
implementationClass = "RustPlugin"
}
}
}
repositories {
google()
mavenCentral()
}
dependencies {
compileOnly(gradleApi())
implementation("com.android.tools.build:gradle:8.11.0")
}

View File

@@ -0,0 +1,68 @@
import java.io.File
import org.apache.tools.ant.taskdefs.condition.Os
import org.gradle.api.DefaultTask
import org.gradle.api.GradleException
import org.gradle.api.logging.LogLevel
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.TaskAction
open class BuildTask : DefaultTask() {
@Input
var rootDirRel: String? = null
@Input
var target: String? = null
@Input
var release: Boolean? = null
@TaskAction
fun assemble() {
val executable = """npm""";
try {
runTauriCli(executable)
} catch (e: Exception) {
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
// Try different Windows-specific extensions
val fallbacks = listOf(
"$executable.exe",
"$executable.cmd",
"$executable.bat",
)
var lastException: Exception = e
for (fallback in fallbacks) {
try {
runTauriCli(fallback)
return
} catch (fallbackException: Exception) {
lastException = fallbackException
}
}
throw lastException
} else {
throw e;
}
}
}
fun runTauriCli(executable: String) {
val rootDirRel = rootDirRel ?: throw GradleException("rootDirRel cannot be null")
val target = target ?: throw GradleException("target cannot be null")
val release = release ?: throw GradleException("release cannot be null")
val args = listOf("run", "--", "tauri", "android", "android-studio-script");
project.exec {
workingDir(File(project.projectDir, rootDirRel))
executable(executable)
args(args)
if (project.logger.isEnabled(LogLevel.DEBUG)) {
args("-vv")
} else if (project.logger.isEnabled(LogLevel.INFO)) {
args("-v")
}
if (release) {
args("--release")
}
args(listOf("--target", target))
}.assertNormalExitValue()
}
}

View File

@@ -0,0 +1,85 @@
import com.android.build.api.dsl.ApplicationExtension
import org.gradle.api.DefaultTask
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.get
const val TASK_GROUP = "rust"
open class Config {
lateinit var rootDirRel: String
}
open class RustPlugin : Plugin<Project> {
private lateinit var config: Config
override fun apply(project: Project) = with(project) {
config = extensions.create("rust", Config::class.java)
val defaultAbiList = listOf("arm64-v8a", "armeabi-v7a", "x86", "x86_64");
val abiList = (findProperty("abiList") as? String)?.split(',') ?: defaultAbiList
val defaultArchList = listOf("arm64", "arm", "x86", "x86_64");
val archList = (findProperty("archList") as? String)?.split(',') ?: defaultArchList
val targetsList = (findProperty("targetList") as? String)?.split(',') ?: listOf("aarch64", "armv7", "i686", "x86_64")
extensions.configure<ApplicationExtension> {
@Suppress("UnstableApiUsage")
flavorDimensions.add("abi")
productFlavors {
create("universal") {
dimension = "abi"
ndk {
abiFilters += abiList
}
}
defaultArchList.forEachIndexed { index, arch ->
create(arch) {
dimension = "abi"
ndk {
abiFilters.add(defaultAbiList[index])
}
}
}
}
}
afterEvaluate {
for (profile in listOf("debug", "release")) {
val profileCapitalized = profile.replaceFirstChar { it.uppercase() }
val buildTask = tasks.maybeCreate(
"rustBuildUniversal$profileCapitalized",
DefaultTask::class.java
).apply {
group = TASK_GROUP
description = "Build dynamic library in $profile mode for all targets"
}
tasks["mergeUniversal${profileCapitalized}JniLibFolders"].dependsOn(buildTask)
for (targetPair in targetsList.withIndex()) {
val targetName = targetPair.value
val targetArch = archList[targetPair.index]
val targetArchCapitalized = targetArch.replaceFirstChar { it.uppercase() }
val targetBuildTask = project.tasks.maybeCreate(
"rustBuild$targetArchCapitalized$profileCapitalized",
BuildTask::class.java
).apply {
group = TASK_GROUP
description = "Build dynamic library in $profile mode for $targetArch"
rootDirRel = config.rootDirRel
target = targetName
release = profile == "release"
}
buildTask.dependsOn(targetBuildTask)
tasks["merge$targetArchCapitalized${profileCapitalized}JniLibFolders"].dependsOn(
targetBuildTask
)
}
}
}
}
}

View File

@@ -0,0 +1,24 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonFinalResIds=false

Binary file not shown.

View File

@@ -0,0 +1,6 @@
#Tue May 10 19:22:52 CST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

185
mobile/src-tauri/gen/android/gradlew vendored Executable file
View File

@@ -0,0 +1,185 @@
#!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
exec "$JAVACMD" "$@"

View File

@@ -0,0 +1,89 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

View File

@@ -0,0 +1,3 @@
include ':app'
apply from: 'tauri.settings.gradle'

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 974 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 903 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -0,0 +1,8 @@
#[cfg_attr(mobile, tauri::mobile_entry_point)]
pub fn run() {
tauri::Builder::default()
.plugin(tauri_plugin_opener::init())
.plugin(tauri_plugin_deep_link::init())
.run(tauri::generate_context!())
.expect("error while running tauri application");
}

View File

@@ -0,0 +1,6 @@
// Prevents additional console window on Windows in release, DO NOT REMOVE!!
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
fn main() {
family_budget_android_lib::run()
}

View File

@@ -0,0 +1,45 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "Family Budget",
"version": "0.1.0",
"identifier": "com.arrelin.family-budget-android",
"build": {
"beforeDevCommand": "npm run dev --prefix ../frontend",
"devUrl": "http://localhost:5173",
"beforeBuildCommand": "VITE_API_BASE_URL=https://family-budget.duckdns.org/api npm run build --prefix ../frontend",
"frontendDist": "../frontend/dist"
},
"app": {
"windows": [
{
"title": "family-budget-android",
"width": 800,
"height": 600
}
],
"security": {
"csp": null
}
},
"bundle": {
"active": true,
"targets": "all",
"icon": [
"icons/32x32.png",
"icons/128x128.png",
"icons/128x128@2x.png",
"icons/icon.icns",
"icons/icon.ico"
]
},
"plugins": {
"deep-link": {
"mobile": [
{
"scheme": ["com.arrelin.family-budget-android"],
"host": "auth"
}
]
}
}
}