Compare commits
33 Commits
24bd4aade4
...
bugfix/rev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
332c9e141b | ||
| 22bd235f20 | |||
|
|
df3495376b | ||
| bbd3e9c01d | |||
|
|
50b1b31cb5 | ||
| 6c72c514ae | |||
|
|
721534f213 | ||
| c819668fd6 | |||
|
|
86cb341ca4 | ||
| a9481676c1 | |||
|
|
83ce6dac8a | ||
| 8d98a7d24c | |||
|
|
699b08628b | ||
| 3fabc762fd | |||
|
|
4ec3b12d03 | ||
| 0451bdc6c6 | |||
| b86d5e1af5 | |||
|
|
3d2888b66b | ||
| 86fab6ae4f | |||
| 8cde23d291 | |||
|
|
ccac6a4d2f | ||
| f28f522663 | |||
| c859c0e78e | |||
|
|
c120c8ff5f | ||
| f20ece179b | |||
| e596093ffa | |||
|
|
f9d4bac75f | ||
| 0af982bac7 | |||
|
|
c817a2b57f | ||
| 4600400ba6 | |||
|
|
471da855bf | ||
| 2dfab403c8 | |||
|
|
b18f69ea62 |
@@ -4,24 +4,24 @@ version = "0.1.0"
|
|||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tokio = { version = "1.48.0", features = ["full"] }
|
tokio = { version = "1.49.0", features = ["full"] }
|
||||||
sea-orm = { version = "1.0", features = ["sqlx-postgres", "runtime-tokio-rustls", "macros"] }
|
sea-orm = { version = "1.1.19", features = ["sqlx-postgres", "runtime-tokio-rustls", "macros"] }
|
||||||
sea-orm-migration = { version = "1.0", default-features = false, features = ["sqlx-postgres", "runtime-tokio-rustls"] }
|
sea-orm-migration = { version = "1.1.19", default-features = false, features = ["sqlx-postgres", "runtime-tokio-rustls"] }
|
||||||
dotenvy = "0.15.7"
|
dotenvy = "0.15.7"
|
||||||
axum = { version = "0.7", features = ["json"] }
|
axum = { version = "0.8.8", features = ["json"] }
|
||||||
tower-http = { version = "0.5", features = ["cors"] }
|
tower-http = { version = "0.6.8", features = ["cors"] }
|
||||||
chrono = { version = "0.4.42", features = ["serde"] }
|
chrono = { version = "0.4.42", features = ["serde"] }
|
||||||
serde = { version = "1.0.228", features = ["derive"] }
|
serde = { version = "1.0.228", features = ["derive"] }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
utoipa = { version = "5.4.0", features = ["axum_extras", "chrono", "decimal_float"] }
|
utoipa = { version = "5.4.0", features = ["axum_extras", "chrono", "decimal_float"] }
|
||||||
utoipa-swagger-ui = { version = "8.0", features = ["axum"] }
|
utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
|
||||||
axum-login = "0.15"
|
axum-login = "0.18.0"
|
||||||
tower-sessions = "0.12"
|
tower-sessions = "0.14.0"
|
||||||
tower-sessions-sqlx-store = { version = "0.12", features = ["postgres"] }
|
tower-sessions-sqlx-store = { version = "0.15.0", features = ["postgres"] }
|
||||||
argon2 = "0.5"
|
argon2 = "0.5"
|
||||||
async-trait = "0.1"
|
async-trait = "0.1"
|
||||||
thiserror = "2.0"
|
thiserror = "2.0"
|
||||||
time = "0.3"
|
time = "0.3"
|
||||||
oauth2 = { version = "5.0.0", features = ["reqwest"] }
|
oauth2 = { version = "5.0.0", features = ["reqwest"] }
|
||||||
reqwest = { version = "0.12.28", features = ["json"] }
|
reqwest = { version = "0.13.1", features = ["json"] }
|
||||||
rand = "0.8"
|
rand = "0.9.2"
|
||||||
@@ -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
|
WORKDIR /app
|
||||||
|
|
||||||
@@ -11,12 +15,11 @@ COPY src ./src
|
|||||||
RUN touch src/main.rs
|
RUN touch src/main.rs
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM archlinux:latest
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN pacman -Syu --noconfirm && \
|
||||||
libssl3 \
|
pacman -S --noconfirm openssl ca-certificates && \
|
||||||
ca-certificates \
|
pacman -Scc --noconfirm
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
|||||||
@@ -40,43 +40,52 @@ pub struct Credentials {
|
|||||||
pub password: String,
|
pub password: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait::async_trait]
|
|
||||||
impl AuthnBackend for AuthBackend {
|
impl AuthnBackend for AuthBackend {
|
||||||
type User = user::Model;
|
type User = user::Model;
|
||||||
type Credentials = Credentials;
|
type Credentials = Credentials;
|
||||||
type Error = Error;
|
type Error = Error;
|
||||||
|
|
||||||
async fn authenticate(
|
fn authenticate(
|
||||||
&self,
|
&self,
|
||||||
creds: Self::Credentials,
|
creds: Self::Credentials,
|
||||||
) -> Result<Option<Self::User>, Self::Error> {
|
) -> impl Future<Output = Result<Option<Self::User>, Self::Error>> + Send {
|
||||||
let user = User::find()
|
let db = self.db.clone();
|
||||||
.filter(user::Column::Username.eq(&creds.username))
|
async move {
|
||||||
.one(&self.db)
|
let user = User::find()
|
||||||
.await?;
|
.filter(user::Column::Username.eq(&creds.username))
|
||||||
|
.one(&db)
|
||||||
|
.await?;
|
||||||
|
|
||||||
if let Some(user) = user {
|
if let Some(user) = user {
|
||||||
let password_hash = user.password_hash.as_ref().ok_or(Error::InvalidCredentials)?;
|
let password_hash = user.password_hash.as_ref().ok_or(Error::InvalidCredentials)?;
|
||||||
let parsed_hash = PasswordHash::new(password_hash)
|
let parsed_hash = PasswordHash::new(password_hash)
|
||||||
.map_err(|_| Error::PasswordHash)?;
|
.map_err(|_| Error::PasswordHash)?;
|
||||||
|
|
||||||
let is_valid = Argon2::default()
|
let is_valid = Argon2::default()
|
||||||
.verify_password(creds.password.as_bytes(), &parsed_hash)
|
.verify_password(creds.password.as_bytes(), &parsed_hash)
|
||||||
.is_ok();
|
.is_ok();
|
||||||
|
|
||||||
if is_valid {
|
if is_valid {
|
||||||
Ok(Some(user))
|
Ok(Some(user))
|
||||||
|
} else {
|
||||||
|
Err(Error::InvalidCredentials)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
Err(Error::InvalidCredentials)
|
Err(Error::InvalidCredentials)
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
Err(Error::InvalidCredentials)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn get_user(&self, user_id: &UserId<Self>) -> Result<Option<Self::User>, Self::Error> {
|
fn get_user(
|
||||||
let user = User::find_by_id(*user_id).one(&self.db).await?;
|
&self,
|
||||||
Ok(user)
|
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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -63,6 +63,8 @@ pub use middleware::{require_admin, require_family_access};
|
|||||||
routes::invite_link::delete_invite_link,
|
routes::invite_link::delete_invite_link,
|
||||||
routes::invite_link::validate_invite_link,
|
routes::invite_link::validate_invite_link,
|
||||||
routes::invite_link::join_family_via_invite,
|
routes::invite_link::join_family_via_invite,
|
||||||
|
routes::user::leave_family,
|
||||||
|
routes::user::get_family_members,
|
||||||
),
|
),
|
||||||
components(
|
components(
|
||||||
schemas(
|
schemas(
|
||||||
@@ -94,6 +96,8 @@ pub use middleware::{require_admin, require_family_access};
|
|||||||
routes::invite_link::InviteLinkResponse,
|
routes::invite_link::InviteLinkResponse,
|
||||||
routes::invite_link::ValidateInviteResponse,
|
routes::invite_link::ValidateInviteResponse,
|
||||||
routes::invite_link::JoinFamilyResponse,
|
routes::invite_link::JoinFamilyResponse,
|
||||||
|
routes::user::LeaveFamilyResponse,
|
||||||
|
routes::user::FamilyMember,
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
tags(
|
tags(
|
||||||
@@ -102,7 +106,8 @@ pub use middleware::{require_admin, require_family_access};
|
|||||||
(name = "categories", description = "Category management endpoints"),
|
(name = "categories", description = "Category management endpoints"),
|
||||||
(name = "expenses", description = "Expense management endpoints"),
|
(name = "expenses", description = "Expense management endpoints"),
|
||||||
(name = "shopping-items", description = "Shopping list management endpoints"),
|
(name = "shopping-items", description = "Shopping list management endpoints"),
|
||||||
(name = "invite-links", description = "Family invite link management endpoints")
|
(name = "invite-links", description = "Family invite link management endpoints"),
|
||||||
|
(name = "user", description = "User profile management endpoints")
|
||||||
),
|
),
|
||||||
info(
|
info(
|
||||||
title = "Family Budget API",
|
title = "Family Budget API",
|
||||||
@@ -145,7 +150,7 @@ pub async fn create_app(db: DatabaseConnection) -> Result<Router, DbErr> {
|
|||||||
|
|
||||||
let admin_family_routes = Router::new()
|
let admin_family_routes = Router::new()
|
||||||
.route("/families", post(routes::family::create_family))
|
.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))
|
.route_layer(axum_middleware::from_fn(middleware::require_admin))
|
||||||
.layer(auth_layer.clone())
|
.layer(auth_layer.clone())
|
||||||
.with_state(db.clone());
|
.with_state(db.clone());
|
||||||
@@ -154,6 +159,7 @@ pub async fn create_app(db: DatabaseConnection) -> Result<Router, DbErr> {
|
|||||||
.route("/login", post(routes::auth::login))
|
.route("/login", post(routes::auth::login))
|
||||||
.route("/logout", post(routes::auth::logout))
|
.route("/logout", post(routes::auth::logout))
|
||||||
.route("/me", get(routes::auth::me))
|
.route("/me", get(routes::auth::me))
|
||||||
|
.route("/me/leave-family", post(routes::user::leave_family))
|
||||||
.route("/my-family", post(routes::family::create_my_family))
|
.route("/my-family", post(routes::family::create_my_family))
|
||||||
.route("/auth/family-login", post(routes::auth::family_login))
|
.route("/auth/family-login", post(routes::auth::family_login))
|
||||||
.layer(auth_layer.clone())
|
.layer(auth_layer.clone())
|
||||||
@@ -168,41 +174,42 @@ pub async fn create_app(db: DatabaseConnection) -> Result<Router, DbErr> {
|
|||||||
let invite_link_routes = Router::new()
|
let invite_link_routes = Router::new()
|
||||||
.route("/my-family/invite-links", post(routes::invite_link::create_invite_link))
|
.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", get(routes::invite_link::get_my_invite_links))
|
||||||
.route("/my-family/invite-links/:token", delete(routes::invite_link::delete_invite_link))
|
.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("/invite/{token}/join", post(routes::invite_link::join_family_via_invite))
|
||||||
.layer(auth_layer)
|
.layer(auth_layer.clone())
|
||||||
.with_state(db.clone());
|
.with_state(db.clone());
|
||||||
|
|
||||||
let family_protected_routes = Router::new()
|
let family_protected_routes = Router::new()
|
||||||
.route("/families/:family_id/categories", post(routes::category::create_category))
|
.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", 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}", get(routes::category::get_category))
|
||||||
.route("/families/:family_id/categories/:category_id", put(routes::category::update_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}", 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", 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", 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}", 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}", 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}/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}/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", 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", 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}", 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}", 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}", 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/{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/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}/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))
|
.route_layer(axum_middleware::from_fn(middleware::require_family_access))
|
||||||
.layer(session_layer.clone())
|
.layer(auth_layer.clone())
|
||||||
.with_state(db.clone());
|
.with_state(db.clone());
|
||||||
|
|
||||||
let public_routes = Router::new()
|
let public_routes = Router::new()
|
||||||
.route("/families", get(routes::family::get_all_families))
|
.route("/families", get(routes::family::get_all_families))
|
||||||
.route("/families/:id", get(routes::family::get_family))
|
.route("/families/{id}", get(routes::family::get_family))
|
||||||
.route("/families/:id", put(routes::family::update_family))
|
.route("/families/{id}", put(routes::family::update_family))
|
||||||
.route("/families/:id/verify", post(routes::family::verify_family_password))
|
.route("/families/{id}/verify", post(routes::family::verify_family_password))
|
||||||
.route("/invite/:token", get(routes::invite_link::validate_invite_link))
|
.route("/invite/{token}", get(routes::invite_link::validate_invite_link))
|
||||||
.layer(session_layer)
|
.layer(session_layer)
|
||||||
.with_state(db);
|
.with_state(db);
|
||||||
|
|
||||||
|
|||||||
@@ -5,3 +5,4 @@ pub mod auth;
|
|||||||
pub mod shopping_item;
|
pub mod shopping_item;
|
||||||
pub mod oauth;
|
pub mod oauth;
|
||||||
pub mod invite_link;
|
pub mod invite_link;
|
||||||
|
pub mod user;
|
||||||
|
|||||||
97
backend/src/routes/user.rs
Normal file
97
backend/src/routes/user.rs
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
use axum::{
|
||||||
|
extract::{State, Path},
|
||||||
|
http::StatusCode,
|
||||||
|
Json,
|
||||||
|
};
|
||||||
|
use axum_login::AuthSession;
|
||||||
|
use sea_orm::DatabaseConnection;
|
||||||
|
use serde::Serialize;
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
use crate::auth::AuthBackend;
|
||||||
|
use crate::services::{UserService, FamilyService};
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, ToSchema)]
|
||||||
|
pub struct LeaveFamilyResponse {
|
||||||
|
pub family_deleted: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, ToSchema)]
|
||||||
|
pub struct FamilyMember {
|
||||||
|
pub id: i32,
|
||||||
|
pub username: Option<String>,
|
||||||
|
pub email: Option<String>,
|
||||||
|
pub is_admin: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
post,
|
||||||
|
path = "/me/leave-family",
|
||||||
|
tag = "user",
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Left family successfully", body = LeaveFamilyResponse),
|
||||||
|
(status = 400, description = "User is not in a family"),
|
||||||
|
(status = 401, description = "Not authenticated")
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
pub async fn leave_family(
|
||||||
|
auth_session: AuthSession<AuthBackend>,
|
||||||
|
State(db): State<DatabaseConnection>,
|
||||||
|
) -> Result<Json<LeaveFamilyResponse>, StatusCode> {
|
||||||
|
let user = auth_session.user.ok_or(StatusCode::UNAUTHORIZED)?;
|
||||||
|
|
||||||
|
let result = UserService::leave_family(&db, user.id)
|
||||||
|
.await
|
||||||
|
.map_err(|e| {
|
||||||
|
if e.to_string().contains("not in a family") {
|
||||||
|
StatusCode::BAD_REQUEST
|
||||||
|
} else {
|
||||||
|
StatusCode::INTERNAL_SERVER_ERROR
|
||||||
|
}
|
||||||
|
})?;
|
||||||
|
|
||||||
|
Ok(Json(LeaveFamilyResponse {
|
||||||
|
family_deleted: result.family_deleted,
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
get,
|
||||||
|
path = "/families/{family_id}/members",
|
||||||
|
tag = "families",
|
||||||
|
params(
|
||||||
|
("family_id" = i32, Path, description = "Family ID")
|
||||||
|
),
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "List of family members", body = Vec<FamilyMember>),
|
||||||
|
(status = 401, description = "Not authenticated"),
|
||||||
|
(status = 403, description = "Access denied")
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
pub async fn get_family_members(
|
||||||
|
auth_session: AuthSession<AuthBackend>,
|
||||||
|
State(db): State<DatabaseConnection>,
|
||||||
|
Path(family_id): Path<i32>,
|
||||||
|
) -> Result<Json<Vec<FamilyMember>>, StatusCode> {
|
||||||
|
let user = auth_session.user.ok_or(StatusCode::UNAUTHORIZED)?;
|
||||||
|
|
||||||
|
if user.family_id != Some(family_id) && !user.is_admin {
|
||||||
|
return Err(StatusCode::FORBIDDEN);
|
||||||
|
}
|
||||||
|
|
||||||
|
let members = FamilyService::get_members(&db, family_id)
|
||||||
|
.await
|
||||||
|
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||||
|
|
||||||
|
let response: Vec<FamilyMember> = members
|
||||||
|
.into_iter()
|
||||||
|
.map(|m| FamilyMember {
|
||||||
|
id: m.id,
|
||||||
|
username: m.username,
|
||||||
|
email: m.email,
|
||||||
|
is_admin: m.is_admin,
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
Ok(Json(response))
|
||||||
|
}
|
||||||
@@ -4,6 +4,7 @@ use argon2::{
|
|||||||
Argon2,
|
Argon2,
|
||||||
};
|
};
|
||||||
use crate::models::family::{self, Entity as Family, Model as FamilyModel};
|
use crate::models::family::{self, Entity as Family, Model as FamilyModel};
|
||||||
|
use crate::models::user::{self, Entity as User, Model as UserModel};
|
||||||
|
|
||||||
pub struct FamilyService;
|
pub struct FamilyService;
|
||||||
|
|
||||||
@@ -72,4 +73,11 @@ impl FamilyService {
|
|||||||
let family: family::ActiveModel = family.into();
|
let family: family::ActiveModel = family.into();
|
||||||
family.delete(db).await
|
family.delete(db).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn get_members(db: &DatabaseConnection, family_id: i32) -> Result<Vec<UserModel>, DbErr> {
|
||||||
|
User::find()
|
||||||
|
.filter(user::Column::FamilyId.eq(family_id))
|
||||||
|
.all(db)
|
||||||
|
.await
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
use sea_orm::*;
|
use sea_orm::*;
|
||||||
use rand::distributions::Alphanumeric;
|
use rand::distr::Alphanumeric;
|
||||||
use rand::Rng;
|
use rand::Rng;
|
||||||
use crate::models::invite_link::{self, Entity as InviteLink, Model as InviteLinkModel};
|
use crate::models::invite_link::{self, Entity as InviteLink, Model as InviteLinkModel};
|
||||||
use crate::models::{user, User};
|
use crate::models::{user, User};
|
||||||
@@ -8,7 +8,7 @@ pub struct InviteLinkService;
|
|||||||
|
|
||||||
impl InviteLinkService {
|
impl InviteLinkService {
|
||||||
pub fn generate_token() -> String {
|
pub fn generate_token() -> String {
|
||||||
rand::thread_rng()
|
rand::rng()
|
||||||
.sample_iter(&Alphanumeric)
|
.sample_iter(&Alphanumeric)
|
||||||
.take(32)
|
.take(32)
|
||||||
.map(char::from)
|
.map(char::from)
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ pub mod expense_service;
|
|||||||
pub mod shopping_item_service;
|
pub mod shopping_item_service;
|
||||||
pub mod oauth_service;
|
pub mod oauth_service;
|
||||||
pub mod invite_link_service;
|
pub mod invite_link_service;
|
||||||
|
pub mod user_service;
|
||||||
|
|
||||||
pub use family_service::FamilyService;
|
pub use family_service::FamilyService;
|
||||||
pub use category_service::CategoryService;
|
pub use category_service::CategoryService;
|
||||||
@@ -11,3 +12,4 @@ pub use expense_service::ExpenseService;
|
|||||||
pub use shopping_item_service::ShoppingItemService;
|
pub use shopping_item_service::ShoppingItemService;
|
||||||
pub use oauth_service::OAuthService;
|
pub use oauth_service::OAuthService;
|
||||||
pub use invite_link_service::InviteLinkService;
|
pub use invite_link_service::InviteLinkService;
|
||||||
|
pub use user_service::UserService;
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
use oauth2::{
|
use oauth2::{basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl, AuthorizationCode, TokenResponse, Scope, CsrfToken, Client, StandardRevocableToken, EndpointSet, EndpointNotSet};
|
||||||
basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl,
|
use oauth2::basic::{BasicErrorResponse, BasicRevocationErrorResponse, BasicTokenIntrospectionResponse, BasicTokenResponse};
|
||||||
AuthorizationCode, TokenResponse, Scope, CsrfToken,
|
|
||||||
};
|
|
||||||
use reqwest::Client as HttpClient;
|
use reqwest::Client as HttpClient;
|
||||||
use sea_orm::{DatabaseConnection, EntityTrait, ColumnTrait, QueryFilter, ActiveModelTrait, Set};
|
use sea_orm::{DatabaseConnection, EntityTrait, ColumnTrait, QueryFilter, ActiveModelTrait, Set};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
@@ -34,11 +32,7 @@ impl OAuthService {
|
|||||||
let redirect_url = std::env::var("GOOGLE_REDIRECT_URL")
|
let redirect_url = std::env::var("GOOGLE_REDIRECT_URL")
|
||||||
.unwrap_or_else(|_| "http://localhost:8080/api/auth/google/callback".to_string());
|
.unwrap_or_else(|_| "http://localhost:8080/api/auth/google/callback".to_string());
|
||||||
|
|
||||||
let client = BasicClient::new(ClientId::new(client_id))
|
let client = Self::getClient(client_id, client_secret, redirect_url);
|
||||||
.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 (auth_url, csrf_token) = client
|
let (auth_url, csrf_token) = client
|
||||||
.authorize_url(CsrfToken::new_random)
|
.authorize_url(CsrfToken::new_random)
|
||||||
@@ -58,11 +52,7 @@ impl OAuthService {
|
|||||||
let redirect_url = std::env::var("GOOGLE_REDIRECT_URL")
|
let redirect_url = std::env::var("GOOGLE_REDIRECT_URL")
|
||||||
.unwrap_or_else(|_| "http://localhost:8080/api/auth/google/callback".to_string());
|
.unwrap_or_else(|_| "http://localhost:8080/api/auth/google/callback".to_string());
|
||||||
|
|
||||||
let client = BasicClient::new(ClientId::new(client_id))
|
let client = Self::getClient(client_id, client_secret, redirect_url);
|
||||||
.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 http_client = oauth2::reqwest::ClientBuilder::new()
|
let http_client = oauth2::reqwest::ClientBuilder::new()
|
||||||
.build()
|
.build()
|
||||||
@@ -77,6 +67,23 @@ impl OAuthService {
|
|||||||
Ok(token.access_token().secret().clone())
|
Ok(token.access_token().secret().clone())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn getClient(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> {
|
pub async fn get_user_info(&self, access_token: &str) -> Result<GoogleUserInfo, OAuthError> {
|
||||||
let response = self.http_client
|
let response = self.http_client
|
||||||
.get("https://www.googleapis.com/oauth2/v2/userinfo")
|
.get("https://www.googleapis.com/oauth2/v2/userinfo")
|
||||||
|
|||||||
44
backend/src/services/user_service.rs
Normal file
44
backend/src/services/user_service.rs
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
use sea_orm::*;
|
||||||
|
use crate::models::user::{self, Entity as User, Model as UserModel};
|
||||||
|
use crate::models::family::{Entity as Family};
|
||||||
|
|
||||||
|
pub struct UserService;
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct LeaveFamilyResult {
|
||||||
|
pub family_deleted: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl UserService {
|
||||||
|
pub async fn leave_family(db: &DatabaseConnection, user_id: i32) -> Result<LeaveFamilyResult, DbErr> {
|
||||||
|
let user = User::find_by_id(user_id)
|
||||||
|
.one(db)
|
||||||
|
.await?
|
||||||
|
.ok_or(DbErr::RecordNotFound("User not found".to_string()))?;
|
||||||
|
|
||||||
|
let family_id = user.family_id
|
||||||
|
.ok_or(DbErr::Custom("User is not in a family".to_string()))?;
|
||||||
|
|
||||||
|
let mut user_active: user::ActiveModel = user.into();
|
||||||
|
user_active.family_id = Set(None);
|
||||||
|
user_active.update(db).await?;
|
||||||
|
|
||||||
|
let remaining_members = User::find()
|
||||||
|
.filter(user::Column::FamilyId.eq(family_id))
|
||||||
|
.count(db)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let family_deleted = if remaining_members == 0 {
|
||||||
|
Family::delete_by_id(family_id).exec(db).await?;
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(LeaveFamilyResult { family_deleted })
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn find_by_id(db: &DatabaseConnection, id: i32) -> Result<Option<UserModel>, DbErr> {
|
||||||
|
User::find_by_id(id).one(db).await
|
||||||
|
}
|
||||||
|
}
|
||||||
10
frontend/package-lock.json
generated
10
frontend/package-lock.json
generated
@@ -16,6 +16,7 @@
|
|||||||
"react": "^19.2.0",
|
"react": "^19.2.0",
|
||||||
"react-dom": "^19.2.0",
|
"react-dom": "^19.2.0",
|
||||||
"react-i18next": "^16.5.3",
|
"react-i18next": "^16.5.3",
|
||||||
|
"react-icons": "^5.5.0",
|
||||||
"react-router-dom": "^7.10.1",
|
"react-router-dom": "^7.10.1",
|
||||||
"zustand": "^5.0.9"
|
"zustand": "^5.0.9"
|
||||||
},
|
},
|
||||||
@@ -3819,6 +3820,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": {
|
"node_modules/react-refresh": {
|
||||||
"version": "0.18.0",
|
"version": "0.18.0",
|
||||||
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz",
|
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz",
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
"react": "^19.2.0",
|
"react": "^19.2.0",
|
||||||
"react-dom": "^19.2.0",
|
"react-dom": "^19.2.0",
|
||||||
"react-i18next": "^16.5.3",
|
"react-i18next": "^16.5.3",
|
||||||
|
"react-icons": "^5.5.0",
|
||||||
"react-router-dom": "^7.10.1",
|
"react-router-dom": "^7.10.1",
|
||||||
"zustand": "^5.0.9"
|
"zustand": "^5.0.9"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -6,16 +6,25 @@ import FamilyView from './pages/FamilyView';
|
|||||||
import AdminPanel from './pages/AdminPanel';
|
import AdminPanel from './pages/AdminPanel';
|
||||||
import NoFamily from './pages/NoFamily';
|
import NoFamily from './pages/NoFamily';
|
||||||
import InvitePage from './pages/InvitePage';
|
import InvitePage from './pages/InvitePage';
|
||||||
|
import Profile from './pages/Profile';
|
||||||
import { useStore } from './store/useStore';
|
import { useStore } from './store/useStore';
|
||||||
import { authApi } from './api/client';
|
import { authApi } from './api/client';
|
||||||
import { Loader2 } from 'lucide-react';
|
import { Loader2 } from 'lucide-react';
|
||||||
|
|
||||||
function AppContent() {
|
function AppContent() {
|
||||||
const { t } = useTranslation();
|
const { t, i18n } = useTranslation();
|
||||||
const { user, isAuthenticated, isLoading, setUser, setIsLoading } = useStore();
|
const { user, isAuthenticated, isLoading, setUser, setIsLoading } = useStore();
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
const storedTheme = localStorage.getItem('theme') || 'light';
|
||||||
|
document.documentElement.setAttribute('data-theme', storedTheme);
|
||||||
|
|
||||||
|
const storedLocale = localStorage.getItem('locale');
|
||||||
|
if (storedLocale && storedLocale !== i18n.language) {
|
||||||
|
i18n.changeLanguage(storedLocale);
|
||||||
|
}
|
||||||
|
|
||||||
checkAuth();
|
checkAuth();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
@@ -61,6 +70,7 @@ function AppContent() {
|
|||||||
return (
|
return (
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/adminpanel" element={<AdminPanel />} />
|
<Route path="/adminpanel" element={<AdminPanel />} />
|
||||||
|
<Route path="/profile" element={<Profile />} />
|
||||||
<Route path="*" element={<NoFamily />} />
|
<Route path="*" element={<NoFamily />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
);
|
);
|
||||||
@@ -70,6 +80,7 @@ function AppContent() {
|
|||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={<Navigate to={`/family/${user.family_id}`} replace />} />
|
<Route path="/" element={<Navigate to={`/family/${user.family_id}`} replace />} />
|
||||||
<Route path="/family/:familyId" element={<FamilyView />} />
|
<Route path="/family/:familyId" element={<FamilyView />} />
|
||||||
|
<Route path="/profile" element={<Profile />} />
|
||||||
<Route path="/adminpanel" element={<AdminPanel />} />
|
<Route path="/adminpanel" element={<AdminPanel />} />
|
||||||
<Route path="*" element={<Navigate to={`/family/${user.family_id}`} replace />} />
|
<Route path="*" element={<Navigate to={`/family/${user.family_id}`} replace />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ import type {
|
|||||||
InviteLinkResponse,
|
InviteLinkResponse,
|
||||||
ValidateInviteResponse,
|
ValidateInviteResponse,
|
||||||
JoinFamilyResponse,
|
JoinFamilyResponse,
|
||||||
|
FamilyMember,
|
||||||
|
LeaveFamilyResponse,
|
||||||
} from '../types';
|
} from '../types';
|
||||||
|
|
||||||
const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || '';
|
const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || '';
|
||||||
@@ -70,6 +72,14 @@ export const familyApi = {
|
|||||||
|
|
||||||
verifyPassword: (id: number, data: VerifyFamilyPasswordRequest) =>
|
verifyPassword: (id: number, data: VerifyFamilyPasswordRequest) =>
|
||||||
apiClient.post<VerifyFamilyPasswordResponse>(`/families/${id}/verify`, data),
|
apiClient.post<VerifyFamilyPasswordResponse>(`/families/${id}/verify`, data),
|
||||||
|
|
||||||
|
getMembers: (familyId: number) =>
|
||||||
|
apiClient.get<FamilyMember[]>(`/families/${familyId}/members`),
|
||||||
|
};
|
||||||
|
|
||||||
|
export const userApi = {
|
||||||
|
leaveFamily: () =>
|
||||||
|
apiClient.post<LeaveFamilyResponse>('/me/leave-family'),
|
||||||
};
|
};
|
||||||
|
|
||||||
export const categoryApi = {
|
export const categoryApi = {
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ export default function ConfirmModal({
|
|||||||
switch (variant) {
|
switch (variant) {
|
||||||
case 'danger':
|
case 'danger':
|
||||||
return {
|
return {
|
||||||
icon: 'bg-red-100 text-red-600',
|
icon: 'btn-danger',
|
||||||
confirmButton: 'bg-gradient-to-r from-red-500 to-red-600 hover:shadow-lg',
|
confirmButton: 'btn-danger hover:shadow-lg',
|
||||||
};
|
};
|
||||||
case 'warning':
|
case 'warning':
|
||||||
return {
|
return {
|
||||||
@@ -37,8 +37,8 @@ export default function ConfirmModal({
|
|||||||
};
|
};
|
||||||
case 'info':
|
case 'info':
|
||||||
return {
|
return {
|
||||||
icon: 'bg-blue-100 text-blue-600',
|
icon: 'btn-primary',
|
||||||
confirmButton: 'bg-gradient-to-r from-blue-500 to-blue-600 hover:shadow-lg',
|
confirmButton: 'btn-primary hover:shadow-lg',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -47,10 +47,10 @@ export default function ConfirmModal({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="fixed inset-0 bg-black/50 backdrop-blur-sm flex items-center justify-center z-[60] p-4">
|
<div className="fixed inset-0 bg-black/50 backdrop-blur-sm flex items-center justify-center z-[60] p-4">
|
||||||
<div className="bg-white rounded-3xl shadow-2xl max-w-md w-full overflow-hidden animate-scale-in">
|
<div className="glass-effect rounded-3xl shadow-2xl max-w-md w-full overflow-hidden animate-scale-in">
|
||||||
<div className="p-6">
|
<div className="p-6">
|
||||||
<div className="flex items-start gap-4">
|
<div className="flex items-start gap-4">
|
||||||
<div className={`p-3 rounded-2xl ${styles.icon}`}>
|
<div className={`p-3 rounded-2xl ${styles.icon} text-white`}>
|
||||||
<AlertTriangle className="w-6 h-6" />
|
<AlertTriangle className="w-6 h-6" />
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1">
|
<div className="flex-1">
|
||||||
|
|||||||
@@ -189,8 +189,8 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className="fixed inset-0 bg-black/50 backdrop-blur-sm flex items-center justify-center z-50 p-4">
|
<div className="fixed inset-0 bg-black/50 backdrop-blur-sm flex items-center justify-center z-50 p-4">
|
||||||
<div className="bg-white rounded-3xl shadow-2xl max-w-2xl w-full max-h-[90vh] overflow-hidden flex flex-col">
|
<div className="glass-effect rounded-3xl shadow-2xl max-w-2xl w-full max-h-[90vh] overflow-hidden flex flex-col">
|
||||||
<div className="bg-gradient-to-r from-green-500 to-emerald-600 p-6 flex items-center justify-between">
|
<div className="btn-success p-6 flex items-center justify-between">
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<div className="p-3 bg-white/20 backdrop-blur-md rounded-2xl">
|
<div className="p-3 bg-white/20 backdrop-blur-md rounded-2xl">
|
||||||
<ShoppingCart className="w-8 h-8 text-white" />
|
<ShoppingCart className="w-8 h-8 text-white" />
|
||||||
@@ -218,7 +218,7 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
|||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
onClick={handleAddItem}
|
onClick={handleAddItem}
|
||||||
className="px-6 py-3 bg-gradient-to-r from-green-500 to-green-600 text-white rounded-2xl hover:shadow-lg transition-all font-semibold flex items-center gap-2"
|
className="px-6 py-3 btn-success text-white rounded-2xl hover:shadow-lg transition-all font-semibold flex items-center gap-2"
|
||||||
>
|
>
|
||||||
<Plus className="w-5 h-5" />
|
<Plus className="w-5 h-5" />
|
||||||
<span className="hidden sm:inline">{t('common.add')}</span>
|
<span className="hidden sm:inline">{t('common.add')}</span>
|
||||||
@@ -302,7 +302,7 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
|||||||
{purchasedItems.map((item) => (
|
{purchasedItems.map((item) => (
|
||||||
<div
|
<div
|
||||||
key={item.id}
|
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 justify-between">
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
@@ -342,14 +342,14 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
|||||||
<div className="flex gap-3">
|
<div className="flex gap-3">
|
||||||
<button
|
<button
|
||||||
onClick={handleMarkAllPurchased}
|
onClick={handleMarkAllPurchased}
|
||||||
className="flex-1 flex items-center justify-center gap-2 px-4 py-3 bg-gradient-to-r from-green-500 to-green-600 text-white rounded-2xl hover:shadow-lg transition-all font-semibold"
|
className="flex-1 flex items-center justify-center gap-2 px-4 py-3 btn-success text-white rounded-2xl hover:shadow-lg transition-all font-semibold"
|
||||||
>
|
>
|
||||||
<Check className="w-5 h-5" />
|
<Check className="w-5 h-5" />
|
||||||
{t('shopping.allPurchased')}
|
{t('shopping.allPurchased')}
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
onClick={handleClearAll}
|
onClick={handleClearAll}
|
||||||
className="flex-1 flex items-center justify-center gap-2 px-4 py-3 bg-gradient-to-r from-red-500 to-red-600 text-white rounded-2xl hover:shadow-lg transition-all font-semibold"
|
className="flex-1 flex items-center justify-center gap-2 px-4 py-3 btn-danger text-white rounded-2xl hover:shadow-lg transition-all font-semibold"
|
||||||
>
|
>
|
||||||
<Trash2 className="w-5 h-5" />
|
<Trash2 className="w-5 h-5" />
|
||||||
{t('shopping.clear')}
|
{t('shopping.clear')}
|
||||||
|
|||||||
@@ -139,5 +139,34 @@
|
|||||||
"markButton": "Mark",
|
"markButton": "Mark",
|
||||||
"clearAll": "Clear list?",
|
"clearAll": "Clear list?",
|
||||||
"clearAllMessage": "All items will be permanently removed from the list."
|
"clearAllMessage": "All items will be permanently removed from the list."
|
||||||
|
},
|
||||||
|
"profile": {
|
||||||
|
"title": "Profile",
|
||||||
|
"info": "Information",
|
||||||
|
"username": "Username",
|
||||||
|
"email": "Email",
|
||||||
|
"family": "Family",
|
||||||
|
"familyName": "Family name",
|
||||||
|
"members": "Members",
|
||||||
|
"you": "You",
|
||||||
|
"unknownUser": "User",
|
||||||
|
"settings": "Settings",
|
||||||
|
"language": "Language",
|
||||||
|
"theme": "Theme",
|
||||||
|
"dangerZone": "Danger zone",
|
||||||
|
"leaveFamily": "Leave family",
|
||||||
|
"leaveDescription": "If you leave the family, you will lose access to the budget. If you are the last member, the family will be deleted along with all data.",
|
||||||
|
"leaveConfirm": "Are you sure you want to leave the family?",
|
||||||
|
"leaving": "Leaving...",
|
||||||
|
"leaveError": "Error leaving family",
|
||||||
|
"renameError": "Error renaming family",
|
||||||
|
"themes": {
|
||||||
|
"light": "Light",
|
||||||
|
"dark": "Dark",
|
||||||
|
"sunset": "Sunset",
|
||||||
|
"ocean": "Ocean",
|
||||||
|
"forest": "Forest",
|
||||||
|
"purple": "Purple"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -139,5 +139,34 @@
|
|||||||
"markButton": "Пометить",
|
"markButton": "Пометить",
|
||||||
"clearAll": "Очистить список?",
|
"clearAll": "Очистить список?",
|
||||||
"clearAllMessage": "Все покупки будут удалены из списка безвозвратно."
|
"clearAllMessage": "Все покупки будут удалены из списка безвозвратно."
|
||||||
|
},
|
||||||
|
"profile": {
|
||||||
|
"title": "Личный кабинет",
|
||||||
|
"info": "Информация",
|
||||||
|
"username": "Имя пользователя",
|
||||||
|
"email": "Email",
|
||||||
|
"family": "Семья",
|
||||||
|
"familyName": "Название семьи",
|
||||||
|
"members": "Участники",
|
||||||
|
"you": "Вы",
|
||||||
|
"unknownUser": "Пользователь",
|
||||||
|
"settings": "Настройки",
|
||||||
|
"language": "Язык",
|
||||||
|
"theme": "Тема",
|
||||||
|
"dangerZone": "Опасная зона",
|
||||||
|
"leaveFamily": "Покинуть семью",
|
||||||
|
"leaveDescription": "Если вы покинете семью, вы потеряете доступ к бюджету. Если вы последний участник, семья будет удалена вместе со всеми данными.",
|
||||||
|
"leaveConfirm": "Вы уверены, что хотите покинуть семью?",
|
||||||
|
"leaving": "Выход...",
|
||||||
|
"leaveError": "Ошибка при выходе из семьи",
|
||||||
|
"renameError": "Ошибка при переименовании семьи",
|
||||||
|
"themes": {
|
||||||
|
"light": "Светлая",
|
||||||
|
"dark": "Тёмная",
|
||||||
|
"sunset": "Закат",
|
||||||
|
"ocean": "Океан",
|
||||||
|
"forest": "Лес",
|
||||||
|
"purple": "Фиолетовая"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,110 @@
|
|||||||
@import "tailwindcss";
|
@import "tailwindcss";
|
||||||
|
|
||||||
|
:root,
|
||||||
|
[data-theme="light"] {
|
||||||
|
--gradient-start: #667eea;
|
||||||
|
--gradient-end: #764ba2;
|
||||||
|
--glass-bg: rgba(255, 255, 255, 0.8);
|
||||||
|
--text-primary: #1f2937;
|
||||||
|
--text-secondary: #6b7280;
|
||||||
|
--category-from: #8b5cf6;
|
||||||
|
--category-to: #3b82f6;
|
||||||
|
--btn-primary-from: #8b5cf6;
|
||||||
|
--btn-primary-to: #6366f1;
|
||||||
|
--btn-success-from: #22c55e;
|
||||||
|
--btn-success-to: #16a34a;
|
||||||
|
--btn-danger-from: #ef4444;
|
||||||
|
--btn-danger-to: #ec4899;
|
||||||
|
--card-bg: rgba(255, 255, 255, 0.8);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="dark"] {
|
||||||
|
--gradient-start: #000000;
|
||||||
|
--gradient-end: #000000;
|
||||||
|
--glass-bg: rgba(17, 17, 17, 0.95);
|
||||||
|
--text-primary: #f9fafb;
|
||||||
|
--text-secondary: #d1d5db;
|
||||||
|
--category-from: #6366f1;
|
||||||
|
--category-to: #8b5cf6;
|
||||||
|
--btn-primary-from: #6366f1;
|
||||||
|
--btn-primary-to: #8b5cf6;
|
||||||
|
--btn-success-from: #059669;
|
||||||
|
--btn-success-to: #10b981;
|
||||||
|
--btn-danger-from: #dc2626;
|
||||||
|
--btn-danger-to: #be185d;
|
||||||
|
--card-bg: rgba(31, 31, 31, 0.9);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="sunset"] {
|
||||||
|
--gradient-start: #f97316;
|
||||||
|
--gradient-end: #ec4899;
|
||||||
|
--glass-bg: rgba(255, 255, 255, 0.85);
|
||||||
|
--text-primary: #1f2937;
|
||||||
|
--text-secondary: #6b7280;
|
||||||
|
--category-from: #f97316;
|
||||||
|
--category-to: #ec4899;
|
||||||
|
--btn-primary-from: #f97316;
|
||||||
|
--btn-primary-to: #ea580c;
|
||||||
|
--btn-success-from: #22c55e;
|
||||||
|
--btn-success-to: #16a34a;
|
||||||
|
--btn-danger-from: #ef4444;
|
||||||
|
--btn-danger-to: #dc2626;
|
||||||
|
--card-bg: rgba(255, 255, 255, 0.85);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="ocean"] {
|
||||||
|
--gradient-start: #3b82f6;
|
||||||
|
--gradient-end: #06b6d4;
|
||||||
|
--glass-bg: rgba(255, 255, 255, 0.85);
|
||||||
|
--text-primary: #1f2937;
|
||||||
|
--text-secondary: #6b7280;
|
||||||
|
--category-from: #3b82f6;
|
||||||
|
--category-to: #06b6d4;
|
||||||
|
--btn-primary-from: #3b82f6;
|
||||||
|
--btn-primary-to: #2563eb;
|
||||||
|
--btn-success-from: #22c55e;
|
||||||
|
--btn-success-to: #16a34a;
|
||||||
|
--btn-danger-from: #ef4444;
|
||||||
|
--btn-danger-to: #dc2626;
|
||||||
|
--card-bg: rgba(255, 255, 255, 0.85);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="forest"] {
|
||||||
|
--gradient-start: #22c55e;
|
||||||
|
--gradient-end: #14b8a6;
|
||||||
|
--glass-bg: rgba(255, 255, 255, 0.85);
|
||||||
|
--text-primary: #1f2937;
|
||||||
|
--text-secondary: #6b7280;
|
||||||
|
--category-from: #22c55e;
|
||||||
|
--category-to: #14b8a6;
|
||||||
|
--btn-primary-from: #22c55e;
|
||||||
|
--btn-primary-to: #16a34a;
|
||||||
|
--btn-success-from: #22c55e;
|
||||||
|
--btn-success-to: #16a34a;
|
||||||
|
--btn-danger-from: #ef4444;
|
||||||
|
--btn-danger-to: #dc2626;
|
||||||
|
--card-bg: rgba(255, 255, 255, 0.85);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="purple"] {
|
||||||
|
--gradient-start: #8b5cf6;
|
||||||
|
--gradient-end: #ec4899;
|
||||||
|
--glass-bg: rgba(255, 255, 255, 0.85);
|
||||||
|
--text-primary: #1f2937;
|
||||||
|
--text-secondary: #6b7280;
|
||||||
|
--category-from: #8b5cf6;
|
||||||
|
--category-to: #ec4899;
|
||||||
|
--btn-primary-from: #8b5cf6;
|
||||||
|
--btn-primary-to: #7c3aed;
|
||||||
|
--btn-success-from: #22c55e;
|
||||||
|
--btn-success-to: #16a34a;
|
||||||
|
--btn-danger-from: #ef4444;
|
||||||
|
--btn-danger-to: #dc2626;
|
||||||
|
--card-bg: rgba(255, 255, 255, 0.85);
|
||||||
|
}
|
||||||
|
|
||||||
.gradient-bg {
|
.gradient-bg {
|
||||||
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
|
background: linear-gradient(135deg, var(--gradient-start) 0%, var(--gradient-end) 100%);
|
||||||
}
|
}
|
||||||
|
|
||||||
.gradient-bg-light {
|
.gradient-bg-light {
|
||||||
@@ -18,10 +121,104 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.glass-effect {
|
.glass-effect {
|
||||||
background: rgb(255 255 255 / 0.8);
|
background: var(--glass-bg);
|
||||||
backdrop-filter: blur(12px);
|
backdrop-filter: blur(12px);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.category-icon {
|
||||||
|
background: linear-gradient(135deg, var(--category-from) 0%, var(--category-to) 100%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary {
|
||||||
|
background: linear-gradient(135deg, var(--btn-primary-from) 0%, var(--btn-primary-to) 100%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-success {
|
||||||
|
background: linear-gradient(135deg, var(--btn-success-from) 0%, var(--btn-success-to) 100%);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-danger {
|
||||||
|
background: linear-gradient(135deg, var(--btn-danger-from) 0%, var(--btn-danger-to) 100%);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="dark"] .glass-effect {
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="dark"] .text-gray-800,
|
||||||
|
[data-theme="dark"] .text-gray-900 {
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="dark"] .text-gray-600,
|
||||||
|
[data-theme="dark"] .text-gray-500 {
|
||||||
|
color: var(--text-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="dark"] .bg-gray-100,
|
||||||
|
[data-theme="dark"] .bg-gray-50 {
|
||||||
|
background-color: rgba(55, 55, 55, 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="dark"] .bg-gray-200 {
|
||||||
|
background-color: rgba(75, 75, 75, 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="dark"] .border-gray-200,
|
||||||
|
[data-theme="dark"] .border-gray-300 {
|
||||||
|
border-color: rgba(75, 75, 75, 0.8);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="dark"] input,
|
||||||
|
[data-theme="dark"] textarea {
|
||||||
|
background-color: rgba(40, 40, 40, 0.9);
|
||||||
|
color: var(--text-primary);
|
||||||
|
border-color: rgba(75, 75, 75, 0.8);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="dark"] input::placeholder,
|
||||||
|
[data-theme="dark"] textarea::placeholder {
|
||||||
|
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 {
|
.animate-fadeIn {
|
||||||
animation: fadeIn 0.2s ease-in-out;
|
animation: fadeIn 0.2s ease-in-out;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ export default function AdminPanel() {
|
|||||||
<div className="max-w-md w-full">
|
<div className="max-w-md w-full">
|
||||||
<div className="glass-effect rounded-2xl shadow-2xl p-6 sm:p-8 text-center">
|
<div className="glass-effect rounded-2xl shadow-2xl p-6 sm:p-8 text-center">
|
||||||
<div className="flex items-center justify-center mb-6">
|
<div className="flex items-center justify-center mb-6">
|
||||||
<div className="p-4 bg-linear-to-br from-red-500 to-orange-500 text-white rounded-2xl">
|
<div className="p-4 btn-danger text-white rounded-2xl">
|
||||||
<Shield className="w-10 h-10 sm:w-12 sm:h-12" />
|
<Shield className="w-10 h-10 sm:w-12 sm:h-12" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -137,7 +137,7 @@ export default function AdminPanel() {
|
|||||||
|
|
||||||
<div className="glass-effect rounded-3xl shadow-xl p-6 sm:p-10 mb-6 max-w-2xl mx-auto">
|
<div className="glass-effect rounded-3xl shadow-xl p-6 sm:p-10 mb-6 max-w-2xl mx-auto">
|
||||||
<div className="flex items-center justify-center gap-3 mb-8">
|
<div className="flex items-center justify-center gap-3 mb-8">
|
||||||
<div className="p-3 bg-linear-to-br from-green-500 to-green-600 rounded-2xl">
|
<div className="p-3 btn-success rounded-2xl">
|
||||||
<Plus className="w-8 h-8 text-white" />
|
<Plus className="w-8 h-8 text-white" />
|
||||||
</div>
|
</div>
|
||||||
<h2 className="text-2xl sm:text-3xl font-bold text-gray-800">
|
<h2 className="text-2xl sm:text-3xl font-bold text-gray-800">
|
||||||
@@ -174,7 +174,7 @@ export default function AdminPanel() {
|
|||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
onClick={handleCreateFamily}
|
onClick={handleCreateFamily}
|
||||||
className="w-full flex items-center justify-center gap-2 px-6 py-4 bg-linear-to-r from-green-500 to-green-600 text-white rounded-2xl hover:shadow-xl transition-all duration-300 font-semibold text-lg"
|
className="w-full flex items-center justify-center gap-2 px-6 py-4 btn-success text-white rounded-2xl hover:shadow-xl transition-all duration-300 font-semibold text-lg"
|
||||||
>
|
>
|
||||||
<Plus className="w-6 h-6" />
|
<Plus className="w-6 h-6" />
|
||||||
{t('admin.createButton')}
|
{t('admin.createButton')}
|
||||||
@@ -184,7 +184,7 @@ export default function AdminPanel() {
|
|||||||
|
|
||||||
<div className="glass-effect rounded-3xl shadow-xl p-6 sm:p-10 max-w-3xl mx-auto">
|
<div className="glass-effect rounded-3xl shadow-xl p-6 sm:p-10 max-w-3xl mx-auto">
|
||||||
<div className="flex items-center justify-center gap-3 mb-8">
|
<div className="flex items-center justify-center gap-3 mb-8">
|
||||||
<div className="p-3 bg-linear-to-br from-purple-500 to-blue-500 rounded-2xl">
|
<div className="p-3 category-icon rounded-2xl">
|
||||||
<Users className="w-8 h-8 text-white" />
|
<Users className="w-8 h-8 text-white" />
|
||||||
</div>
|
</div>
|
||||||
<h2 className="text-2xl sm:text-3xl font-bold text-gray-800">
|
<h2 className="text-2xl sm:text-3xl font-bold text-gray-800">
|
||||||
@@ -194,8 +194,8 @@ export default function AdminPanel() {
|
|||||||
|
|
||||||
{families.length === 0 ? (
|
{families.length === 0 ? (
|
||||||
<div className="text-center py-16 sm:py-20">
|
<div className="text-center py-16 sm:py-20">
|
||||||
<div className="inline-flex p-6 bg-linear-to-br from-purple-100 to-blue-100 rounded-3xl mb-6">
|
<div className="inline-flex p-6 bg-gray-100 rounded-3xl mb-6">
|
||||||
<Users className="w-20 h-20 text-purple-400" />
|
<Users className="w-20 h-20 text-gray-400" />
|
||||||
</div>
|
</div>
|
||||||
<p className="text-gray-600 text-lg sm:text-xl mb-2 font-semibold">
|
<p className="text-gray-600 text-lg sm:text-xl mb-2 font-semibold">
|
||||||
{t('admin.noFamilies')}
|
{t('admin.noFamilies')}
|
||||||
@@ -209,10 +209,10 @@ export default function AdminPanel() {
|
|||||||
{families.map((family) => (
|
{families.map((family) => (
|
||||||
<div
|
<div
|
||||||
key={family.id}
|
key={family.id}
|
||||||
className="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-3 p-5 bg-linear-to-r from-purple-50 to-blue-50 rounded-2xl border-2 border-purple-200 card-hover"
|
className="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-3 p-5 bg-gray-50 rounded-2xl border-2 border-gray-200 card-hover"
|
||||||
>
|
>
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<div className="p-3 bg-linear-to-br from-purple-500 to-blue-500 text-white rounded-xl shadow-md">
|
<div className="p-3 category-icon text-white rounded-xl shadow-md">
|
||||||
<Users className="w-6 h-6" />
|
<Users className="w-6 h-6" />
|
||||||
</div>
|
</div>
|
||||||
<span className="text-lg sm:text-xl font-bold text-gray-900">
|
<span className="text-lg sm:text-xl font-bold text-gray-900">
|
||||||
@@ -221,7 +221,7 @@ export default function AdminPanel() {
|
|||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
onClick={() => handleDeleteFamily(family.id)}
|
onClick={() => handleDeleteFamily(family.id)}
|
||||||
className="w-full sm:w-auto flex items-center justify-center gap-2 px-5 py-3 bg-red-500 hover:bg-red-600 text-white rounded-xl transition-all font-semibold shadow-md hover:shadow-lg"
|
className="w-full sm:w-auto flex items-center justify-center gap-2 px-5 py-3 btn-danger text-white rounded-xl transition-all font-semibold shadow-md hover:shadow-lg"
|
||||||
>
|
>
|
||||||
<Trash2 className="w-5 h-5" />
|
<Trash2 className="w-5 h-5" />
|
||||||
{t('common.delete')}
|
{t('common.delete')}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import {
|
|||||||
UserPlus,
|
UserPlus,
|
||||||
Copy,
|
Copy,
|
||||||
Check,
|
Check,
|
||||||
|
User,
|
||||||
} from 'lucide-react';
|
} from 'lucide-react';
|
||||||
import ShoppingListModal from '../components/ShoppingListModal';
|
import ShoppingListModal from '../components/ShoppingListModal';
|
||||||
|
|
||||||
@@ -267,13 +268,22 @@ export default function FamilyView() {
|
|||||||
<div className="min-h-screen gradient-bg py-8 sm:py-12 px-4">
|
<div className="min-h-screen gradient-bg py-8 sm:py-12 px-4">
|
||||||
<div className="max-w-5xl mx-auto">
|
<div className="max-w-5xl mx-auto">
|
||||||
<div className="mb-6 sm:mb-8">
|
<div className="mb-6 sm:mb-8">
|
||||||
<button
|
<div className="flex items-center gap-3 mb-6">
|
||||||
onClick={handleOpenInviteModal}
|
<button
|
||||||
className="inline-flex items-center gap-2 px-4 py-2 bg-white/20 hover:bg-white/30 text-white rounded-2xl backdrop-blur-md mb-6 transition-all duration-300 group"
|
onClick={handleOpenInviteModal}
|
||||||
>
|
className="inline-flex items-center gap-2 px-4 py-2 bg-white/20 hover:bg-white/30 text-white rounded-2xl backdrop-blur-md transition-all duration-300 group"
|
||||||
<UserPlus className="w-5 h-5 group-hover:scale-110 transition-transform" />
|
>
|
||||||
<span className="font-medium">{t('family.inviteMember')}</span>
|
<UserPlus className="w-5 h-5 group-hover:scale-110 transition-transform" />
|
||||||
</button>
|
<span className="font-medium">{t('family.inviteMember')}</span>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => navigate('/profile')}
|
||||||
|
className="inline-flex items-center gap-2 px-4 py-2 bg-white/20 hover:bg-white/30 text-white rounded-2xl backdrop-blur-md transition-all duration-300 group"
|
||||||
|
>
|
||||||
|
<User className="w-5 h-5 group-hover:scale-110 transition-transform" />
|
||||||
|
<span className="font-medium">{t('profile.title')}</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
<div className="text-center">
|
<div className="text-center">
|
||||||
<div className="inline-flex p-4 bg-white/20 backdrop-blur-md rounded-2xl mb-4">
|
<div className="inline-flex p-4 bg-white/20 backdrop-blur-md rounded-2xl mb-4">
|
||||||
<Wallet className="w-12 h-12 text-white" />
|
<Wallet className="w-12 h-12 text-white" />
|
||||||
@@ -298,7 +308,7 @@ export default function FamilyView() {
|
|||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
onClick={() => setShowShoppingList(true)}
|
onClick={() => setShowShoppingList(true)}
|
||||||
className="w-full flex items-center justify-center gap-2 px-6 py-3 bg-gradient-to-r from-green-500 to-emerald-600 text-white rounded-2xl hover:shadow-xl transition-all duration-300 font-semibold"
|
className="w-full flex items-center justify-center gap-2 px-6 py-3 btn-success text-white rounded-2xl hover:shadow-xl transition-all duration-300 font-semibold"
|
||||||
>
|
>
|
||||||
<ShoppingCart className="w-5 h-5" />
|
<ShoppingCart className="w-5 h-5" />
|
||||||
{t('family.shoppingList')}
|
{t('family.shoppingList')}
|
||||||
@@ -329,7 +339,7 @@ export default function FamilyView() {
|
|||||||
>
|
>
|
||||||
<div className="flex items-center justify-between gap-3 mb-4">
|
<div className="flex items-center justify-between gap-3 mb-4">
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<div className="p-2 bg-linear-to-br from-purple-500 to-blue-500 text-white rounded-xl shadow-lg">
|
<div className="p-2 category-icon text-white rounded-xl shadow-lg">
|
||||||
<Tag className="w-6 h-6" />
|
<Tag className="w-6 h-6" />
|
||||||
</div>
|
</div>
|
||||||
<h2 className="text-xl sm:text-2xl font-bold text-gray-900">
|
<h2 className="text-xl sm:text-2xl font-bold text-gray-900">
|
||||||
@@ -340,7 +350,7 @@ export default function FamilyView() {
|
|||||||
{showAddExpense !== category.id && (
|
{showAddExpense !== category.id && (
|
||||||
<button
|
<button
|
||||||
onClick={() => setShowAddExpense(category.id)}
|
onClick={() => setShowAddExpense(category.id)}
|
||||||
className="flex items-center gap-2 px-4 py-2 bg-linear-to-r from-red-500 to-pink-500 text-white rounded-xl hover:shadow-lg transition-all duration-300 font-semibold whitespace-nowrap text-sm"
|
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" />
|
<TrendingDown className="w-4 h-4" />
|
||||||
<span className="hidden sm:inline">{t('category.addExpense')}</span>
|
<span className="hidden sm:inline">{t('category.addExpense')}</span>
|
||||||
@@ -397,7 +407,7 @@ export default function FamilyView() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{showHistory === category.id && (
|
{showHistory === category.id && (
|
||||||
<div className="mt-4 bg-linear-to-br from-blue-50 to-purple-50 p-4 rounded-2xl border-2 border-blue-200">
|
<div className="mt-4 glass-effect p-4 rounded-2xl border-2 border-gray-200">
|
||||||
<div className="flex items-center justify-between mb-4">
|
<div className="flex items-center justify-between mb-4">
|
||||||
<h3 className="font-semibold text-gray-800 text-lg flex items-center gap-2">
|
<h3 className="font-semibold text-gray-800 text-lg flex items-center gap-2">
|
||||||
<History className="w-5 h-5" />
|
<History className="w-5 h-5" />
|
||||||
@@ -418,7 +428,7 @@ export default function FamilyView() {
|
|||||||
{categoryExpenses.map((expense) => (
|
{categoryExpenses.map((expense) => (
|
||||||
<div
|
<div
|
||||||
key={expense.id}
|
key={expense.id}
|
||||||
className="bg-white p-3 rounded-xl shadow-sm border border-gray-200"
|
className="expense-history-item p-3 rounded-xl shadow-sm border"
|
||||||
>
|
>
|
||||||
<div className="flex justify-between items-start mb-2">
|
<div className="flex justify-between items-start mb-2">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
@@ -435,7 +445,7 @@ export default function FamilyView() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{expense.description && (
|
{expense.description && (
|
||||||
<div className="flex items-start gap-2 text-sm text-gray-600 bg-gray-50 p-2 rounded-lg">
|
<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" />
|
<MessageSquare className="w-4 h-4 mt-0.5 flex-shrink-0" />
|
||||||
<span>{expense.description}</span>
|
<span>{expense.description}</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -448,7 +458,7 @@ export default function FamilyView() {
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{showAddExpense === category.id && (
|
{showAddExpense === category.id && (
|
||||||
<div className="bg-linear-to-br from-purple-50 to-blue-50 p-6 rounded-2xl border-2 border-purple-200">
|
<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">
|
<h3 className="font-semibold text-gray-800 mb-4 text-center">
|
||||||
{t('expense.addTitle')}
|
{t('expense.addTitle')}
|
||||||
</h3>
|
</h3>
|
||||||
@@ -480,7 +490,7 @@ export default function FamilyView() {
|
|||||||
<div className="flex gap-3">
|
<div className="flex gap-3">
|
||||||
<button
|
<button
|
||||||
onClick={() => handleAddExpense(category.id)}
|
onClick={() => handleAddExpense(category.id)}
|
||||||
className="flex-1 flex items-center justify-center gap-2 px-5 py-3 bg-linear-to-r from-green-500 to-green-600 text-white rounded-2xl hover:shadow-xl transition-all font-semibold"
|
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"
|
||||||
>
|
>
|
||||||
<Plus className="w-5 h-5" />
|
<Plus className="w-5 h-5" />
|
||||||
{t('common.add')}
|
{t('common.add')}
|
||||||
@@ -502,7 +512,7 @@ export default function FamilyView() {
|
|||||||
|
|
||||||
<div className="glass-effect rounded-3xl shadow-xl p-6 sm:p-8 max-w-3xl mx-auto">
|
<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">
|
<div className="flex items-center justify-center gap-3 mb-8">
|
||||||
<div className="p-3 bg-linear-to-br from-purple-500 to-blue-500 rounded-2xl">
|
<div className="p-3 category-icon rounded-2xl">
|
||||||
<DollarSign className="w-8 h-8 text-white" />
|
<DollarSign className="w-8 h-8 text-white" />
|
||||||
</div>
|
</div>
|
||||||
<h2 className="text-2xl sm:text-3xl font-bold text-gray-800">
|
<h2 className="text-2xl sm:text-3xl font-bold text-gray-800">
|
||||||
@@ -511,7 +521,7 @@ export default function FamilyView() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{showAddCategory ? (
|
{showAddCategory ? (
|
||||||
<div className="mb-8 p-6 bg-linear-to-br from-purple-50 to-blue-50 rounded-2xl border-2 border-purple-200">
|
<div className="mb-8 p-6 glass-effect rounded-2xl border-2 border-gray-200">
|
||||||
<h3 className="font-bold text-gray-800 mb-5 text-center text-lg">
|
<h3 className="font-bold text-gray-800 mb-5 text-center text-lg">
|
||||||
{t('category.newCategory')}
|
{t('category.newCategory')}
|
||||||
</h3>
|
</h3>
|
||||||
@@ -533,7 +543,7 @@ export default function FamilyView() {
|
|||||||
<div className="flex gap-3">
|
<div className="flex gap-3">
|
||||||
<button
|
<button
|
||||||
onClick={handleAddCategory}
|
onClick={handleAddCategory}
|
||||||
className="flex-1 flex items-center justify-center gap-2 px-6 py-4 bg-linear-to-r from-green-500 to-green-600 text-white rounded-2xl hover:shadow-xl transition-all font-semibold"
|
className="flex-1 flex items-center justify-center gap-2 px-6 py-4 btn-success text-white rounded-2xl hover:shadow-xl transition-all font-semibold"
|
||||||
>
|
>
|
||||||
<Plus className="w-5 h-5" />
|
<Plus className="w-5 h-5" />
|
||||||
{t('common.create')}
|
{t('common.create')}
|
||||||
@@ -550,7 +560,7 @@ export default function FamilyView() {
|
|||||||
) : (
|
) : (
|
||||||
<button
|
<button
|
||||||
onClick={() => setShowAddCategory(true)}
|
onClick={() => setShowAddCategory(true)}
|
||||||
className="w-full flex items-center justify-center gap-2 px-6 py-4 bg-linear-to-r from-purple-600 to-blue-600 text-white rounded-2xl hover:shadow-xl transition-all duration-300 font-semibold"
|
className="w-full flex items-center justify-center gap-2 px-6 py-4 btn-primary text-white rounded-2xl hover:shadow-xl transition-all duration-300 font-semibold"
|
||||||
>
|
>
|
||||||
<Plus className="w-5 h-5" />
|
<Plus className="w-5 h-5" />
|
||||||
{t('category.addCategory')}
|
{t('category.addCategory')}
|
||||||
@@ -568,10 +578,10 @@ export default function FamilyView() {
|
|||||||
|
|
||||||
{showInviteModal && (
|
{showInviteModal && (
|
||||||
<div className="fixed inset-0 bg-black/60 backdrop-blur-sm flex items-center justify-center z-50 p-4">
|
<div className="fixed inset-0 bg-black/60 backdrop-blur-sm flex items-center justify-center z-50 p-4">
|
||||||
<div className="bg-white rounded-3xl shadow-2xl w-full max-w-md p-6 sm:p-8">
|
<div className="glass-effect rounded-3xl shadow-2xl w-full max-w-md p-6 sm:p-8">
|
||||||
<div className="flex items-center justify-between mb-6">
|
<div className="flex items-center justify-between mb-6">
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<div className="p-3 bg-gradient-to-br from-purple-500 to-blue-500 rounded-2xl">
|
<div className="p-3 category-icon rounded-2xl">
|
||||||
<UserPlus className="w-6 h-6 text-white" />
|
<UserPlus className="w-6 h-6 text-white" />
|
||||||
</div>
|
</div>
|
||||||
<h2 className="text-xl font-bold text-gray-800">{t('invite.title')}</h2>
|
<h2 className="text-xl font-bold text-gray-800">{t('invite.title')}</h2>
|
||||||
@@ -592,7 +602,7 @@ export default function FamilyView() {
|
|||||||
<button
|
<button
|
||||||
onClick={handleCreateInviteLink}
|
onClick={handleCreateInviteLink}
|
||||||
disabled={inviteLoading}
|
disabled={inviteLoading}
|
||||||
className="w-full flex items-center justify-center gap-2 px-6 py-4 bg-gradient-to-r from-purple-600 to-blue-600 text-white rounded-2xl hover:shadow-xl transition-all font-semibold disabled:opacity-50"
|
className="w-full flex items-center justify-center gap-2 px-6 py-4 btn-primary text-white rounded-2xl hover:shadow-xl transition-all font-semibold disabled:opacity-50"
|
||||||
>
|
>
|
||||||
{inviteLoading ? (
|
{inviteLoading ? (
|
||||||
<>
|
<>
|
||||||
@@ -621,8 +631,8 @@ export default function FamilyView() {
|
|||||||
onClick={handleCopyInviteLink}
|
onClick={handleCopyInviteLink}
|
||||||
className={`w-full flex items-center justify-center gap-2 px-6 py-4 rounded-2xl transition-all font-semibold ${
|
className={`w-full flex items-center justify-center gap-2 px-6 py-4 rounded-2xl transition-all font-semibold ${
|
||||||
copied
|
copied
|
||||||
? 'bg-green-500 text-white'
|
? 'btn-success text-white'
|
||||||
: 'bg-gradient-to-r from-purple-600 to-blue-600 text-white hover:shadow-xl'
|
: 'btn-primary text-white hover:shadow-xl'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{copied ? (
|
{copied ? (
|
||||||
|
|||||||
@@ -109,15 +109,15 @@ export default function InvitePage() {
|
|||||||
if (error) {
|
if (error) {
|
||||||
return (
|
return (
|
||||||
<div className="min-h-screen flex items-center justify-center gradient-bg px-4">
|
<div className="min-h-screen flex items-center justify-center gradient-bg px-4">
|
||||||
<div className="bg-white rounded-3xl shadow-2xl p-8 max-w-md w-full text-center">
|
<div className="glass-effect rounded-3xl shadow-2xl p-8 max-w-md w-full text-center">
|
||||||
<div className="p-4 bg-red-100 rounded-2xl inline-block mb-6">
|
<div className="p-4 btn-danger rounded-2xl inline-block mb-6">
|
||||||
<AlertCircle className="w-12 h-12 text-red-500" />
|
<AlertCircle className="w-12 h-12 text-white" />
|
||||||
</div>
|
</div>
|
||||||
<h1 className="text-2xl font-bold text-gray-800 mb-4">{t('common.error')}</h1>
|
<h1 className="text-2xl font-bold text-gray-800 mb-4">{t('common.error')}</h1>
|
||||||
<p className="text-gray-600 mb-6">{error}</p>
|
<p className="text-gray-600 mb-6">{error}</p>
|
||||||
<button
|
<button
|
||||||
onClick={() => navigate('/')}
|
onClick={() => navigate('/')}
|
||||||
className="px-6 py-3 bg-gradient-to-r from-purple-600 to-blue-600 text-white rounded-2xl font-semibold hover:shadow-xl transition-all"
|
className="px-6 py-3 btn-primary text-white rounded-2xl font-semibold hover:shadow-xl transition-all"
|
||||||
>
|
>
|
||||||
{t('common.toHome')}
|
{t('common.toHome')}
|
||||||
</button>
|
</button>
|
||||||
@@ -128,14 +128,14 @@ export default function InvitePage() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="min-h-screen flex items-center justify-center gradient-bg px-4">
|
<div className="min-h-screen flex items-center justify-center gradient-bg px-4">
|
||||||
<div className="bg-white rounded-3xl shadow-2xl p-8 max-w-md w-full text-center">
|
<div className="glass-effect rounded-3xl shadow-2xl p-8 max-w-md w-full text-center">
|
||||||
<div className="p-4 bg-gradient-to-br from-purple-500 to-blue-500 rounded-2xl inline-block mb-6">
|
<div className="p-4 category-icon rounded-2xl inline-block mb-6">
|
||||||
<Users className="w-12 h-12 text-white" />
|
<Users className="w-12 h-12 text-white" />
|
||||||
</div>
|
</div>
|
||||||
<h1 className="text-2xl font-bold text-gray-800 mb-2">
|
<h1 className="text-2xl font-bold text-gray-800 mb-2">
|
||||||
{t('invite.pageTitle')}
|
{t('invite.pageTitle')}
|
||||||
</h1>
|
</h1>
|
||||||
<p className="text-3xl font-bold text-purple-600 mb-6">
|
<p className="text-3xl font-bold text-gray-800 mb-6">
|
||||||
{familyName}
|
{familyName}
|
||||||
</p>
|
</p>
|
||||||
<p className="text-gray-600 mb-8">
|
<p className="text-gray-600 mb-8">
|
||||||
@@ -143,7 +143,7 @@ export default function InvitePage() {
|
|||||||
</p>
|
</p>
|
||||||
<button
|
<button
|
||||||
onClick={handleGoogleLogin}
|
onClick={handleGoogleLogin}
|
||||||
className="w-full flex items-center justify-center gap-3 px-6 py-4 bg-gradient-to-r from-purple-600 to-blue-600 text-white rounded-2xl font-semibold hover:shadow-xl transition-all"
|
className="w-full flex items-center justify-center gap-3 px-6 py-4 btn-primary text-white rounded-2xl font-semibold hover:shadow-xl transition-all"
|
||||||
>
|
>
|
||||||
<UserPlus className="w-5 h-5" />
|
<UserPlus className="w-5 h-5" />
|
||||||
{t('invite.loginAndJoin')}
|
{t('invite.loginAndJoin')}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { useState } from 'react';
|
|||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { authApi } from '../api/client';
|
import { authApi } from '../api/client';
|
||||||
import { Loader2, Wallet } from 'lucide-react';
|
import { Loader2, Wallet } from 'lucide-react';
|
||||||
|
import { FcGoogle } from 'react-icons/fc';
|
||||||
|
|
||||||
export default function Login() {
|
export default function Login() {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
@@ -27,7 +28,7 @@ export default function Login() {
|
|||||||
<div className="w-full max-w-md">
|
<div className="w-full max-w-md">
|
||||||
<div className="glass-effect rounded-3xl shadow-2xl p-8 sm:p-10">
|
<div className="glass-effect rounded-3xl shadow-2xl p-8 sm:p-10">
|
||||||
<div className="flex flex-col items-center text-center mb-8">
|
<div className="flex flex-col items-center text-center mb-8">
|
||||||
<div className="p-4 bg-linear-to-br from-purple-500 to-blue-500 text-white rounded-2xl mb-4 shadow-lg">
|
<div className="p-4 category-icon text-white rounded-2xl mb-4 shadow-lg">
|
||||||
<Wallet className="w-12 h-12" />
|
<Wallet className="w-12 h-12" />
|
||||||
</div>
|
</div>
|
||||||
<h1 className="text-3xl sm:text-4xl font-bold text-gray-900 mb-2">
|
<h1 className="text-3xl sm:text-4xl font-bold text-gray-900 mb-2">
|
||||||
@@ -53,24 +54,7 @@ export default function Login() {
|
|||||||
<Loader2 className="w-6 h-6 animate-spin" />
|
<Loader2 className="w-6 h-6 animate-spin" />
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<svg className="w-6 h-6" viewBox="0 0 24 24">
|
<FcGoogle className="w-6 h-6" />
|
||||||
<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>
|
|
||||||
{t('login.googleButton')}
|
{t('login.googleButton')}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
@@ -79,4 +63,4 @@ export default function Login() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ export default function NoFamily() {
|
|||||||
<div className="w-full max-w-md">
|
<div className="w-full max-w-md">
|
||||||
<div className="glass-effect rounded-3xl shadow-2xl p-8 sm:p-10">
|
<div className="glass-effect rounded-3xl shadow-2xl p-8 sm:p-10">
|
||||||
<div className="flex flex-col items-center text-center mb-6">
|
<div className="flex flex-col items-center text-center mb-6">
|
||||||
<div className="p-4 bg-linear-to-br from-purple-500 to-blue-500 text-white rounded-2xl mb-4 shadow-lg">
|
<div className="p-4 category-icon text-white rounded-2xl mb-4 shadow-lg">
|
||||||
<Users className="w-12 h-12" />
|
<Users className="w-12 h-12" />
|
||||||
</div>
|
</div>
|
||||||
<h1 className="text-2xl sm:text-3xl font-bold text-gray-900 mb-2">
|
<h1 className="text-2xl sm:text-3xl font-bold text-gray-900 mb-2">
|
||||||
@@ -186,7 +186,7 @@ export default function NoFamily() {
|
|||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
disabled={loading || !familyName.trim()}
|
disabled={loading || !familyName.trim()}
|
||||||
className="w-full flex items-center justify-center gap-2 px-6 py-4 bg-linear-to-r from-purple-600 to-blue-600 text-white rounded-2xl hover:shadow-xl transition-all duration-300 font-semibold disabled:opacity-50 disabled:cursor-not-allowed"
|
className="w-full flex items-center justify-center gap-2 px-6 py-4 btn-primary text-white rounded-2xl hover:shadow-xl transition-all duration-300 font-semibold disabled:opacity-50 disabled:cursor-not-allowed"
|
||||||
>
|
>
|
||||||
{loading ? (
|
{loading ? (
|
||||||
<Loader2 className="w-5 h-5 animate-spin" />
|
<Loader2 className="w-5 h-5 animate-spin" />
|
||||||
|
|||||||
375
frontend/src/pages/Profile.tsx
Normal file
375
frontend/src/pages/Profile.tsx
Normal file
@@ -0,0 +1,375 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { useNavigate } from 'react-router-dom';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { familyApi, userApi, authApi } from '../api/client';
|
||||||
|
import { useStore } from '../store/useStore';
|
||||||
|
import type { Theme } from '../types';
|
||||||
|
import {
|
||||||
|
User as UserIcon,
|
||||||
|
Users,
|
||||||
|
Settings,
|
||||||
|
AlertTriangle,
|
||||||
|
ArrowLeft,
|
||||||
|
Loader2,
|
||||||
|
Check,
|
||||||
|
Palette,
|
||||||
|
Languages,
|
||||||
|
LogOut,
|
||||||
|
Edit3,
|
||||||
|
Save,
|
||||||
|
X,
|
||||||
|
} from 'lucide-react';
|
||||||
|
|
||||||
|
const THEMES: { id: Theme; gradient: string }[] = [
|
||||||
|
{ id: 'light', gradient: 'bg-gradient-to-r from-gray-100 to-gray-200' },
|
||||||
|
{ id: 'dark', gradient: 'bg-gradient-to-r from-black to-gray-900' },
|
||||||
|
{ id: 'sunset', gradient: 'bg-gradient-to-r from-orange-400 to-pink-500' },
|
||||||
|
{ id: 'ocean', gradient: 'bg-gradient-to-r from-blue-400 to-cyan-500' },
|
||||||
|
{ id: 'forest', gradient: 'bg-gradient-to-r from-green-400 to-teal-500' },
|
||||||
|
{ id: 'purple', gradient: 'bg-gradient-to-r from-purple-500 to-pink-500' },
|
||||||
|
];
|
||||||
|
|
||||||
|
export default function Profile() {
|
||||||
|
const { t, i18n } = useTranslation();
|
||||||
|
const navigate = useNavigate();
|
||||||
|
const { user, selectedFamily, setSelectedFamily, setUser, preferences, setPreferences, familyMembers, setFamilyMembers } = useStore();
|
||||||
|
|
||||||
|
const [membersLoading, setMembersLoading] = useState(false);
|
||||||
|
const [leavingFamily, setLeavingFamily] = useState(false);
|
||||||
|
const [editingName, setEditingName] = useState(false);
|
||||||
|
const [newFamilyName, setNewFamilyName] = useState('');
|
||||||
|
const [savingName, setSavingName] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (user?.family_id) {
|
||||||
|
loadFamily();
|
||||||
|
}
|
||||||
|
}, [user?.family_id]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (user?.family_id && selectedFamily) {
|
||||||
|
loadMembers();
|
||||||
|
}
|
||||||
|
}, [user?.family_id, selectedFamily]);
|
||||||
|
|
||||||
|
const loadFamily = async () => {
|
||||||
|
if (!user?.family_id) return;
|
||||||
|
try {
|
||||||
|
const response = await familyApi.getById(user.family_id);
|
||||||
|
setSelectedFamily(response.data);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Error loading family:', err);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const loadMembers = async () => {
|
||||||
|
if (!user?.family_id) return;
|
||||||
|
try {
|
||||||
|
setMembersLoading(true);
|
||||||
|
const response = await familyApi.getMembers(user.family_id);
|
||||||
|
console.log('Loaded members:', response.data);
|
||||||
|
setFamilyMembers(response.data);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Error loading members:', err);
|
||||||
|
} finally {
|
||||||
|
setMembersLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleLeaveFamily = async () => {
|
||||||
|
if (!confirm(t('profile.leaveConfirm'))) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
setLeavingFamily(true);
|
||||||
|
await userApi.leaveFamily();
|
||||||
|
|
||||||
|
const meResponse = await authApi.me();
|
||||||
|
setUser(meResponse.data);
|
||||||
|
setSelectedFamily(null);
|
||||||
|
setFamilyMembers([]);
|
||||||
|
|
||||||
|
navigate('/');
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Error leaving family:', err);
|
||||||
|
alert(t('profile.leaveError'));
|
||||||
|
} finally {
|
||||||
|
setLeavingFamily(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleThemeChange = (theme: Theme) => {
|
||||||
|
setPreferences({ theme });
|
||||||
|
document.documentElement.setAttribute('data-theme', theme);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleLocaleChange = (locale: 'ru' | 'en') => {
|
||||||
|
setPreferences({ locale });
|
||||||
|
i18n.changeLanguage(locale);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleStartEditName = () => {
|
||||||
|
setNewFamilyName(selectedFamily?.name || '');
|
||||||
|
setEditingName(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleSaveName = async () => {
|
||||||
|
if (!selectedFamily || !newFamilyName.trim()) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
setSavingName(true);
|
||||||
|
const response = await familyApi.update(selectedFamily.id, { name: newFamilyName.trim() });
|
||||||
|
setSelectedFamily(response.data);
|
||||||
|
setEditingName(false);
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Error updating family name:', err);
|
||||||
|
alert(t('profile.renameError'));
|
||||||
|
} finally {
|
||||||
|
setSavingName(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleBack = () => {
|
||||||
|
if (user?.family_id) {
|
||||||
|
navigate(`/family/${user.family_id}`);
|
||||||
|
} else {
|
||||||
|
navigate('/');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen gradient-bg py-8 sm:py-12 px-4">
|
||||||
|
<div className="max-w-2xl mx-auto">
|
||||||
|
<button
|
||||||
|
onClick={handleBack}
|
||||||
|
className="inline-flex items-center gap-2 px-4 py-2 bg-white/20 hover:bg-white/30 text-white rounded-2xl backdrop-blur-md mb-6 transition-all duration-300"
|
||||||
|
>
|
||||||
|
<ArrowLeft className="w-5 h-5" />
|
||||||
|
<span className="font-medium">{t('common.back')}</span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<div className="text-center mb-8">
|
||||||
|
<div className="inline-flex p-4 bg-white/20 backdrop-blur-md rounded-2xl mb-4">
|
||||||
|
<UserIcon className="w-12 h-12 text-white" />
|
||||||
|
</div>
|
||||||
|
<h1 className="text-4xl font-bold text-white mb-2">{t('profile.title')}</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-6">
|
||||||
|
<div className="glass-effect rounded-2xl shadow-lg p-6">
|
||||||
|
<div className="flex items-center gap-3 mb-4">
|
||||||
|
<div className="p-2 category-icon text-white rounded-xl">
|
||||||
|
<UserIcon className="w-6 h-6" />
|
||||||
|
</div>
|
||||||
|
<h2 className="text-xl font-bold text-gray-800">{t('profile.info')}</h2>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-3">
|
||||||
|
<div className="flex justify-between items-center py-2 border-b border-gray-200">
|
||||||
|
<span className="text-gray-600">{t('profile.username')}</span>
|
||||||
|
<span className="font-medium text-gray-900">{user?.username || '-'}</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex justify-between items-center py-2 border-b border-gray-200">
|
||||||
|
<span className="text-gray-600">{t('profile.email')}</span>
|
||||||
|
<span className="font-medium text-gray-900">{user?.email || '-'}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{selectedFamily && (
|
||||||
|
<div className="glass-effect rounded-2xl shadow-lg p-6">
|
||||||
|
<div className="flex items-center gap-3 mb-4">
|
||||||
|
<div className="p-2 btn-success text-white rounded-xl">
|
||||||
|
<Users className="w-6 h-6" />
|
||||||
|
</div>
|
||||||
|
<h2 className="text-xl font-bold text-gray-800">{t('profile.family')}</h2>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="mb-4">
|
||||||
|
<div className="flex justify-between items-center py-2 border-b border-gray-200">
|
||||||
|
<span className="text-gray-600">{t('profile.familyName')}</span>
|
||||||
|
{editingName ? (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={newFamilyName}
|
||||||
|
onChange={(e) => setNewFamilyName(e.target.value)}
|
||||||
|
className="px-3 py-1 border border-gray-300 rounded-lg focus:border-purple-500 focus:ring-1 focus:ring-purple-200"
|
||||||
|
autoFocus
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
onClick={handleSaveName}
|
||||||
|
disabled={savingName}
|
||||||
|
className="p-1.5 bg-green-500 text-white rounded-lg hover:bg-green-600 transition-colors"
|
||||||
|
>
|
||||||
|
{savingName ? <Loader2 className="w-4 h-4 animate-spin" /> : <Save className="w-4 h-4" />}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => setEditingName(false)}
|
||||||
|
className="p-1.5 bg-gray-200 text-gray-600 rounded-lg hover:bg-gray-300 transition-colors"
|
||||||
|
>
|
||||||
|
<X className="w-4 h-4" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="font-medium text-gray-900">{selectedFamily.name}</span>
|
||||||
|
<button
|
||||||
|
onClick={handleStartEditName}
|
||||||
|
className="p-1.5 text-gray-500 hover:text-purple-600 hover:bg-purple-50 rounded-lg transition-colors"
|
||||||
|
>
|
||||||
|
<Edit3 className="w-4 h-4" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="mb-2">
|
||||||
|
<h3 className="text-sm font-medium text-gray-600 mb-3">{t('profile.members')}</h3>
|
||||||
|
{membersLoading ? (
|
||||||
|
<div className="flex items-center justify-center py-4">
|
||||||
|
<Loader2 className="w-5 h-5 animate-spin text-gray-400" />
|
||||||
|
</div>
|
||||||
|
) : familyMembers.length === 0 ? (
|
||||||
|
<div className="text-center py-4 text-gray-500 text-sm">
|
||||||
|
{t('profile.noMembers') || 'Нет участников'}
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="space-y-2">
|
||||||
|
{familyMembers.map((member) => (
|
||||||
|
<div
|
||||||
|
key={member.id}
|
||||||
|
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">
|
||||||
|
{(member.username || member.email || '?')[0].toUpperCase()}
|
||||||
|
</div>
|
||||||
|
<span className="font-medium text-gray-800">
|
||||||
|
{member.username || member.email || t('profile.unknownUser')}
|
||||||
|
</span>
|
||||||
|
{member.id === user?.id && (
|
||||||
|
<span className="text-xs bg-purple-200 text-purple-700 px-2 py-0.5 rounded-full">
|
||||||
|
{t('profile.you')}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{member.is_admin && (
|
||||||
|
<span className="text-xs bg-amber-100 text-amber-700 px-2 py-0.5 rounded-full">
|
||||||
|
Admin
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="glass-effect rounded-2xl shadow-lg p-6">
|
||||||
|
<div className="flex items-center gap-3 mb-4">
|
||||||
|
<div className="p-2 btn-primary text-white rounded-xl">
|
||||||
|
<Settings className="w-6 h-6" />
|
||||||
|
</div>
|
||||||
|
<h2 className="text-xl font-bold text-gray-800">{t('profile.settings')}</h2>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-6">
|
||||||
|
<div>
|
||||||
|
<div className="flex items-center gap-2 mb-3">
|
||||||
|
<Languages className="w-4 h-4 text-gray-600" />
|
||||||
|
<h3 className="text-sm font-medium text-gray-600">{t('profile.language')}</h3>
|
||||||
|
</div>
|
||||||
|
<div className="flex gap-3">
|
||||||
|
<button
|
||||||
|
onClick={() => handleLocaleChange('ru')}
|
||||||
|
className={`flex-1 py-3 px-4 rounded-xl font-medium transition-all ${
|
||||||
|
preferences.locale === 'ru'
|
||||||
|
? 'btn-primary text-white shadow-lg'
|
||||||
|
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<span className="mr-2">🇷🇺</span>
|
||||||
|
Русский
|
||||||
|
{preferences.locale === 'ru' && <Check className="w-4 h-4 inline ml-2" />}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => handleLocaleChange('en')}
|
||||||
|
className={`flex-1 py-3 px-4 rounded-xl font-medium transition-all ${
|
||||||
|
preferences.locale === 'en'
|
||||||
|
? 'btn-primary text-white shadow-lg'
|
||||||
|
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<span className="mr-2">🇬🇧</span>
|
||||||
|
English
|
||||||
|
{preferences.locale === 'en' && <Check className="w-4 h-4 inline ml-2" />}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<div className="flex items-center gap-2 mb-3">
|
||||||
|
<Palette className="w-4 h-4 text-gray-600" />
|
||||||
|
<h3 className="text-sm font-medium text-gray-600">{t('profile.theme')}</h3>
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-3 gap-3">
|
||||||
|
{THEMES.map((theme) => (
|
||||||
|
<button
|
||||||
|
key={theme.id}
|
||||||
|
onClick={() => handleThemeChange(theme.id)}
|
||||||
|
className={`relative p-1 rounded-xl transition-all ${
|
||||||
|
preferences.theme === theme.id
|
||||||
|
? 'ring-2 ring-purple-500 ring-offset-2'
|
||||||
|
: 'hover:scale-105'
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<div className={`h-12 rounded-lg ${theme.gradient}`} />
|
||||||
|
<span className="text-xs text-gray-600 mt-1 block">{t(`profile.themes.${theme.id}`)}</span>
|
||||||
|
{preferences.theme === theme.id && (
|
||||||
|
<div className="absolute top-2 right-2 w-5 h-5 bg-white rounded-full flex items-center justify-center shadow">
|
||||||
|
<Check className="w-3 h-3 text-purple-600" />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{selectedFamily && (
|
||||||
|
<div className="glass-effect rounded-2xl shadow-lg p-6 border-2 border-red-200">
|
||||||
|
<div className="flex items-center gap-3 mb-4">
|
||||||
|
<div className="p-2 btn-danger text-white rounded-xl">
|
||||||
|
<AlertTriangle className="w-6 h-6" />
|
||||||
|
</div>
|
||||||
|
<h2 className="text-xl font-bold text-gray-800">{t('profile.dangerZone')}</h2>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p className="text-gray-600 mb-4">{t('profile.leaveDescription')}</p>
|
||||||
|
|
||||||
|
<button
|
||||||
|
onClick={handleLeaveFamily}
|
||||||
|
disabled={leavingFamily}
|
||||||
|
className="w-full flex items-center justify-center gap-2 px-6 py-3 btn-danger text-white rounded-xl transition-all font-semibold disabled:opacity-50"
|
||||||
|
>
|
||||||
|
{leavingFamily ? (
|
||||||
|
<>
|
||||||
|
<Loader2 className="w-5 h-5 animate-spin" />
|
||||||
|
{t('profile.leaving')}
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<LogOut className="w-5 h-5" />
|
||||||
|
{t('profile.leaveFamily')}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,5 +1,11 @@
|
|||||||
import { create } from 'zustand';
|
import { create } from 'zustand';
|
||||||
import type { Family, Category, User } from '../types';
|
import type { Family, Category, User, FamilyMember, Theme, Locale } from '../types';
|
||||||
|
|
||||||
|
const getStoredPreferences = () => {
|
||||||
|
const theme = (localStorage.getItem('theme') as Theme) || 'light';
|
||||||
|
const locale = (localStorage.getItem('locale') as Locale) || 'ru';
|
||||||
|
return { theme, locale };
|
||||||
|
};
|
||||||
|
|
||||||
interface AppState {
|
interface AppState {
|
||||||
user: User | null;
|
user: User | null;
|
||||||
@@ -8,12 +14,16 @@ interface AppState {
|
|||||||
selectedFamily: Family | null;
|
selectedFamily: Family | null;
|
||||||
families: Family[];
|
families: Family[];
|
||||||
categories: Category[];
|
categories: Category[];
|
||||||
|
familyMembers: FamilyMember[];
|
||||||
|
preferences: { theme: Theme; locale: Locale };
|
||||||
|
|
||||||
setUser: (user: User | null) => void;
|
setUser: (user: User | null) => void;
|
||||||
setIsLoading: (loading: boolean) => void;
|
setIsLoading: (loading: boolean) => void;
|
||||||
setSelectedFamily: (family: Family | null) => void;
|
setSelectedFamily: (family: Family | null) => void;
|
||||||
setFamilies: (families: Family[]) => void;
|
setFamilies: (families: Family[]) => void;
|
||||||
setCategories: (categories: Category[]) => void;
|
setCategories: (categories: Category[]) => void;
|
||||||
|
setFamilyMembers: (members: FamilyMember[]) => void;
|
||||||
|
setPreferences: (prefs: Partial<{ theme: Theme; locale: Locale }>) => void;
|
||||||
logout: () => void;
|
logout: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -24,6 +34,8 @@ export const useStore = create<AppState>((set) => ({
|
|||||||
selectedFamily: null,
|
selectedFamily: null,
|
||||||
families: [],
|
families: [],
|
||||||
categories: [],
|
categories: [],
|
||||||
|
familyMembers: [],
|
||||||
|
preferences: getStoredPreferences(),
|
||||||
|
|
||||||
setUser: (user) => set({ user, isAuthenticated: !!user }),
|
setUser: (user) => set({ user, isAuthenticated: !!user }),
|
||||||
|
|
||||||
@@ -35,11 +47,21 @@ export const useStore = create<AppState>((set) => ({
|
|||||||
|
|
||||||
setCategories: (categories) => set({ categories }),
|
setCategories: (categories) => set({ categories }),
|
||||||
|
|
||||||
|
setFamilyMembers: (familyMembers) => set({ familyMembers }),
|
||||||
|
|
||||||
|
setPreferences: (prefs) => set((state) => {
|
||||||
|
const newPrefs = { ...state.preferences, ...prefs };
|
||||||
|
if (prefs.theme) localStorage.setItem('theme', prefs.theme);
|
||||||
|
if (prefs.locale) localStorage.setItem('locale', prefs.locale);
|
||||||
|
return { preferences: newPrefs };
|
||||||
|
}),
|
||||||
|
|
||||||
logout: () => set({
|
logout: () => set({
|
||||||
user: null,
|
user: null,
|
||||||
isAuthenticated: false,
|
isAuthenticated: false,
|
||||||
selectedFamily: null,
|
selectedFamily: null,
|
||||||
families: [],
|
families: [],
|
||||||
categories: []
|
categories: [],
|
||||||
|
familyMembers: [],
|
||||||
}),
|
}),
|
||||||
}));
|
}));
|
||||||
|
|||||||
@@ -130,3 +130,22 @@ export interface JoinFamilyResponse {
|
|||||||
family_id: number;
|
family_id: number;
|
||||||
message: string;
|
message: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type Theme = 'light' | 'dark' | 'sunset' | 'ocean' | 'forest' | 'purple';
|
||||||
|
export type Locale = 'ru' | 'en';
|
||||||
|
|
||||||
|
export interface FamilyMember {
|
||||||
|
id: number;
|
||||||
|
username: string | null;
|
||||||
|
email: string | null;
|
||||||
|
is_admin: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UserPreferences {
|
||||||
|
theme: Theme;
|
||||||
|
locale: Locale;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface LeaveFamilyResponse {
|
||||||
|
family_deleted: boolean;
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user