Compare commits
44 Commits
514ced6e19
...
arrelin-pa
| Author | SHA1 | Date | |
|---|---|---|---|
| c7b9a14ff6 | |||
| 75fa8bd4e2 | |||
| 5bcabb2736 | |||
| 30b1c97043 | |||
|
|
b88eb4a9e3 | ||
| 8334c848f1 | |||
|
|
24f04a7e82 | ||
| f00ddc7d10 | |||
|
|
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 | ||
| 24bd4aade4 | |||
|
|
71f772f2b9 | ||
|
|
a3e941b19f |
42
.github/workflows/docker-publish.yml
vendored
42
.github/workflows/docker-publish.yml
vendored
@@ -8,40 +8,24 @@ on:
|
||||
jobs:
|
||||
build-and-push:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Compute lowercase owner
|
||||
run: echo "OWNER_LC=${GITHUB_REPOSITORY_OWNER,,}" >> "$GITHUB_ENV"
|
||||
|
||||
- name: Login to GHCR
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Login to Gitea Registry
|
||||
run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 192.168.31.100:3847 -u ${{ secrets.REGISTRY_USER }} --password-stdin
|
||||
|
||||
- name: Build and push backend image
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
context: ./backend
|
||||
push: true
|
||||
tags: |
|
||||
ghcr.io/${{ env.OWNER_LC }}/family_budget-backend:latest
|
||||
ghcr.io/${{ env.OWNER_LC }}/family_budget-backend:${{ github.sha }}
|
||||
run: |
|
||||
docker build -t 192.168.31.100:3847/arrelin/family_budget-backend:latest -t 192.168.31.100:3847/arrelin/family_budget-backend:${{ gitea.sha }} ./backend
|
||||
docker push 192.168.31.100:3847/arrelin/family_budget-backend:latest
|
||||
docker push 192.168.31.100:3847/arrelin/family_budget-backend:${{ gitea.sha }}
|
||||
|
||||
- name: Build and push frontend image
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
context: ./frontend
|
||||
push: true
|
||||
tags: |
|
||||
ghcr.io/${{ env.OWNER_LC }}/family_budget-frontend:latest
|
||||
ghcr.io/${{ env.OWNER_LC }}/family_budget-frontend:${{ github.sha }}
|
||||
run: |
|
||||
docker build -t 192.168.31.100:3847/arrelin/family_budget-frontend:latest -t 192.168.31.100:3847/arrelin/family_budget-frontend:${{ gitea.sha }} ./frontend
|
||||
docker push 192.168.31.100:3847/arrelin/family_budget-frontend:latest
|
||||
docker push 192.168.31.100:3847/arrelin/family_budget-frontend:${{ gitea.sha }}
|
||||
|
||||
- name: Logout
|
||||
run: docker logout 192.168.31.100:3847
|
||||
|
||||
@@ -4,24 +4,24 @@ version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
tokio = { version = "1.48.0", features = ["full"] }
|
||||
sea-orm = { version = "1.0", features = ["sqlx-postgres", "runtime-tokio-rustls", "macros"] }
|
||||
sea-orm-migration = { version = "1.0", default-features = false, features = ["sqlx-postgres", "runtime-tokio-rustls"] }
|
||||
tokio = { version = "1.49.0", features = ["full"] }
|
||||
sea-orm = { version = "1.1.19", features = ["sqlx-postgres", "runtime-tokio-rustls", "macros"] }
|
||||
sea-orm-migration = { version = "1.1.19", default-features = false, features = ["sqlx-postgres", "runtime-tokio-rustls"] }
|
||||
dotenvy = "0.15.7"
|
||||
axum = { version = "0.7", features = ["json"] }
|
||||
tower-http = { version = "0.5", features = ["cors"] }
|
||||
axum = { version = "0.8.8", features = ["json"] }
|
||||
tower-http = { version = "0.6.8", features = ["cors"] }
|
||||
chrono = { version = "0.4.42", features = ["serde"] }
|
||||
serde = { version = "1.0.228", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
utoipa = { version = "5.4.0", features = ["axum_extras", "chrono", "decimal_float"] }
|
||||
utoipa-swagger-ui = { version = "8.0", features = ["axum"] }
|
||||
axum-login = "0.15"
|
||||
tower-sessions = "0.12"
|
||||
tower-sessions-sqlx-store = { version = "0.12", features = ["postgres"] }
|
||||
utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
|
||||
axum-login = "0.18.0"
|
||||
tower-sessions = "0.14.0"
|
||||
tower-sessions-sqlx-store = { version = "0.15.0", features = ["postgres"] }
|
||||
argon2 = "0.5"
|
||||
async-trait = "0.1"
|
||||
thiserror = "2.0"
|
||||
time = "0.3"
|
||||
oauth2 = { version = "5.0.0", features = ["reqwest"] }
|
||||
reqwest = { version = "0.12.28", features = ["json"] }
|
||||
rand = "0.8"
|
||||
reqwest = { version = "0.13.1", features = ["json"] }
|
||||
rand = "0.9.2"
|
||||
@@ -1,4 +1,8 @@
|
||||
FROM rust:1.92.0 AS builder
|
||||
FROM archlinux:latest AS builder
|
||||
|
||||
RUN pacman -Syu --noconfirm && \
|
||||
pacman -S --noconfirm rust cargo && \
|
||||
pacman -Scc --noconfirm
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
@@ -11,12 +15,11 @@ COPY src ./src
|
||||
RUN touch src/main.rs
|
||||
RUN cargo build --release
|
||||
|
||||
FROM debian:bookworm-slim
|
||||
FROM archlinux:latest
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
libssl3 \
|
||||
ca-certificates \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
RUN pacman -Syu --noconfirm && \
|
||||
pacman -S --noconfirm openssl ca-certificates && \
|
||||
pacman -Scc --noconfirm
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
|
||||
@@ -40,19 +40,20 @@ pub struct Credentials {
|
||||
pub password: String,
|
||||
}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl AuthnBackend for AuthBackend {
|
||||
type User = user::Model;
|
||||
type Credentials = Credentials;
|
||||
type Error = Error;
|
||||
|
||||
async fn authenticate(
|
||||
fn authenticate(
|
||||
&self,
|
||||
creds: Self::Credentials,
|
||||
) -> Result<Option<Self::User>, Self::Error> {
|
||||
) -> impl Future<Output = Result<Option<Self::User>, Self::Error>> + Send {
|
||||
let db = self.db.clone();
|
||||
async move {
|
||||
let user = User::find()
|
||||
.filter(user::Column::Username.eq(&creds.username))
|
||||
.one(&self.db)
|
||||
.one(&db)
|
||||
.await?;
|
||||
|
||||
if let Some(user) = user {
|
||||
@@ -73,11 +74,19 @@ impl AuthnBackend for AuthBackend {
|
||||
Err(Error::InvalidCredentials)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn get_user(&self, user_id: &UserId<Self>) -> Result<Option<Self::User>, Self::Error> {
|
||||
let user = User::find_by_id(*user_id).one(&self.db).await?;
|
||||
fn get_user(
|
||||
&self,
|
||||
user_id: &UserId<Self>,
|
||||
) -> impl Future<Output = Result<Option<Self::User>, Self::Error>> + Send {
|
||||
let db = self.db.clone();
|
||||
let user_id = *user_id;
|
||||
async move {
|
||||
let user = User::find_by_id(user_id).one(&db).await?;
|
||||
Ok(user)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn hash_password(password: &str) -> Result<String, Error> {
|
||||
|
||||
@@ -63,6 +63,8 @@ pub use middleware::{require_admin, require_family_access};
|
||||
routes::invite_link::delete_invite_link,
|
||||
routes::invite_link::validate_invite_link,
|
||||
routes::invite_link::join_family_via_invite,
|
||||
routes::user::leave_family,
|
||||
routes::user::get_family_members,
|
||||
),
|
||||
components(
|
||||
schemas(
|
||||
@@ -94,6 +96,8 @@ pub use middleware::{require_admin, require_family_access};
|
||||
routes::invite_link::InviteLinkResponse,
|
||||
routes::invite_link::ValidateInviteResponse,
|
||||
routes::invite_link::JoinFamilyResponse,
|
||||
routes::user::LeaveFamilyResponse,
|
||||
routes::user::FamilyMember,
|
||||
)
|
||||
),
|
||||
tags(
|
||||
@@ -102,7 +106,8 @@ pub use middleware::{require_admin, require_family_access};
|
||||
(name = "categories", description = "Category management endpoints"),
|
||||
(name = "expenses", description = "Expense 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(
|
||||
title = "Family Budget API",
|
||||
@@ -145,7 +150,7 @@ pub async fn create_app(db: DatabaseConnection) -> Result<Router, DbErr> {
|
||||
|
||||
let admin_family_routes = Router::new()
|
||||
.route("/families", post(routes::family::create_family))
|
||||
.route("/families/:id", delete(routes::family::delete_family))
|
||||
.route("/families/{id}", delete(routes::family::delete_family))
|
||||
.route_layer(axum_middleware::from_fn(middleware::require_admin))
|
||||
.layer(auth_layer.clone())
|
||||
.with_state(db.clone());
|
||||
@@ -154,6 +159,7 @@ pub async fn create_app(db: DatabaseConnection) -> Result<Router, DbErr> {
|
||||
.route("/login", post(routes::auth::login))
|
||||
.route("/logout", post(routes::auth::logout))
|
||||
.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("/auth/family-login", post(routes::auth::family_login))
|
||||
.layer(auth_layer.clone())
|
||||
@@ -168,41 +174,42 @@ pub async fn create_app(db: DatabaseConnection) -> Result<Router, DbErr> {
|
||||
let invite_link_routes = Router::new()
|
||||
.route("/my-family/invite-links", post(routes::invite_link::create_invite_link))
|
||||
.route("/my-family/invite-links", get(routes::invite_link::get_my_invite_links))
|
||||
.route("/my-family/invite-links/:token", delete(routes::invite_link::delete_invite_link))
|
||||
.route("/invite/:token/join", post(routes::invite_link::join_family_via_invite))
|
||||
.layer(auth_layer)
|
||||
.route("/my-family/invite-links/{token}", delete(routes::invite_link::delete_invite_link))
|
||||
.route("/invite/{token}/join", post(routes::invite_link::join_family_via_invite))
|
||||
.layer(auth_layer.clone())
|
||||
.with_state(db.clone());
|
||||
|
||||
let family_protected_routes = Router::new()
|
||||
.route("/families/:family_id/categories", post(routes::category::create_category))
|
||||
.route("/families/:family_id/categories", get(routes::category::get_categories_by_family))
|
||||
.route("/families/:family_id/categories/:category_id", get(routes::category::get_category))
|
||||
.route("/families/:family_id/categories/:category_id", put(routes::category::update_category))
|
||||
.route("/families/:family_id/categories/:category_id", delete(routes::category::delete_category))
|
||||
.route("/families/:family_id/categories/:category_id/expenses", post(routes::expense::create_expense))
|
||||
.route("/families/:family_id/categories/:category_id/expenses", get(routes::expense::get_expenses_by_category))
|
||||
.route("/families/:family_id/categories/:category_id/expenses/:expense_id", get(routes::expense::get_expense))
|
||||
.route("/families/:family_id/categories/:category_id/expenses/:expense_id", put(routes::expense::update_expense))
|
||||
.route("/families/:family_id/categories/:category_id/expenses/:expense_id", delete(routes::expense::delete_expense))
|
||||
.route("/families/:family_id/categories/:category_id/remaining", get(routes::expense::get_remaining_limit))
|
||||
.route("/families/:family_id/shopping-items", post(routes::shopping_item::create_shopping_item))
|
||||
.route("/families/:family_id/shopping-items", get(routes::shopping_item::get_shopping_items_by_family))
|
||||
.route("/families/:family_id/shopping-items/:id", get(routes::shopping_item::get_shopping_item))
|
||||
.route("/families/:family_id/shopping-items/:id", put(routes::shopping_item::update_shopping_item))
|
||||
.route("/families/:family_id/shopping-items/:id", delete(routes::shopping_item::delete_shopping_item))
|
||||
.route("/families/:family_id/shopping-items/:id/purchased", axum::routing::patch(routes::shopping_item::mark_as_purchased))
|
||||
.route("/families/:family_id/shopping-items/mark-all-purchased", post(routes::shopping_item::mark_all_as_purchased))
|
||||
.route("/families/:family_id/shopping-items/clear-all", delete(routes::shopping_item::clear_all))
|
||||
.route("/families/{family_id}/categories", post(routes::category::create_category))
|
||||
.route("/families/{family_id}/categories", get(routes::category::get_categories_by_family))
|
||||
.route("/families/{family_id}/categories/{category_id}", get(routes::category::get_category))
|
||||
.route("/families/{family_id}/categories/{category_id}", put(routes::category::update_category))
|
||||
.route("/families/{family_id}/categories/{category_id}", delete(routes::category::delete_category))
|
||||
.route("/families/{family_id}/categories/{category_id}/expenses", post(routes::expense::create_expense))
|
||||
.route("/families/{family_id}/categories/{category_id}/expenses", get(routes::expense::get_expenses_by_category))
|
||||
.route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", get(routes::expense::get_expense))
|
||||
.route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", put(routes::expense::update_expense))
|
||||
.route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", delete(routes::expense::delete_expense))
|
||||
.route("/families/{family_id}/categories/{category_id}/remaining", get(routes::expense::get_remaining_limit))
|
||||
.route("/families/{family_id}/shopping-items", post(routes::shopping_item::create_shopping_item))
|
||||
.route("/families/{family_id}/shopping-items", get(routes::shopping_item::get_shopping_items_by_family))
|
||||
.route("/families/{family_id}/shopping-items/{id}", get(routes::shopping_item::get_shopping_item))
|
||||
.route("/families/{family_id}/shopping-items/{id}", put(routes::shopping_item::update_shopping_item))
|
||||
.route("/families/{family_id}/shopping-items/{id}", delete(routes::shopping_item::delete_shopping_item))
|
||||
.route("/families/{family_id}/shopping-items/{id}/purchased", axum::routing::patch(routes::shopping_item::mark_as_purchased))
|
||||
.route("/families/{family_id}/shopping-items/mark-all-purchased", post(routes::shopping_item::mark_all_as_purchased))
|
||||
.route("/families/{family_id}/shopping-items/clear-all", delete(routes::shopping_item::clear_all))
|
||||
.route("/families/{family_id}/members", get(routes::user::get_family_members))
|
||||
.route_layer(axum_middleware::from_fn(middleware::require_family_access))
|
||||
.layer(session_layer.clone())
|
||||
.layer(auth_layer.clone())
|
||||
.with_state(db.clone());
|
||||
|
||||
let public_routes = Router::new()
|
||||
.route("/families", get(routes::family::get_all_families))
|
||||
.route("/families/:id", get(routes::family::get_family))
|
||||
.route("/families/:id", put(routes::family::update_family))
|
||||
.route("/families/:id/verify", post(routes::family::verify_family_password))
|
||||
.route("/invite/:token", get(routes::invite_link::validate_invite_link))
|
||||
.route("/families/{id}", get(routes::family::get_family))
|
||||
.route("/families/{id}", put(routes::family::update_family))
|
||||
.route("/families/{id}/verify", post(routes::family::verify_family_password))
|
||||
.route("/invite/{token}", get(routes::invite_link::validate_invite_link))
|
||||
.layer(session_layer)
|
||||
.with_state(db);
|
||||
|
||||
|
||||
@@ -5,3 +5,4 @@ pub mod auth;
|
||||
pub mod shopping_item;
|
||||
pub mod oauth;
|
||||
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,
|
||||
};
|
||||
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;
|
||||
|
||||
@@ -72,4 +73,11 @@ impl FamilyService {
|
||||
let family: family::ActiveModel = family.into();
|
||||
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 rand::distributions::Alphanumeric;
|
||||
use rand::distr::Alphanumeric;
|
||||
use rand::Rng;
|
||||
use crate::models::invite_link::{self, Entity as InviteLink, Model as InviteLinkModel};
|
||||
use crate::models::{user, User};
|
||||
@@ -8,7 +8,7 @@ pub struct InviteLinkService;
|
||||
|
||||
impl InviteLinkService {
|
||||
pub fn generate_token() -> String {
|
||||
rand::thread_rng()
|
||||
rand::rng()
|
||||
.sample_iter(&Alphanumeric)
|
||||
.take(32)
|
||||
.map(char::from)
|
||||
|
||||
@@ -4,6 +4,7 @@ pub mod expense_service;
|
||||
pub mod shopping_item_service;
|
||||
pub mod oauth_service;
|
||||
pub mod invite_link_service;
|
||||
pub mod user_service;
|
||||
|
||||
pub use family_service::FamilyService;
|
||||
pub use category_service::CategoryService;
|
||||
@@ -11,3 +12,4 @@ pub use expense_service::ExpenseService;
|
||||
pub use shopping_item_service::ShoppingItemService;
|
||||
pub use oauth_service::OAuthService;
|
||||
pub use invite_link_service::InviteLinkService;
|
||||
pub use user_service::UserService;
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
use oauth2::{
|
||||
basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl,
|
||||
AuthorizationCode, TokenResponse, Scope, CsrfToken,
|
||||
};
|
||||
use oauth2::{basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl, AuthorizationCode, TokenResponse, Scope, CsrfToken, Client, StandardRevocableToken, EndpointSet, EndpointNotSet};
|
||||
use oauth2::basic::{BasicErrorResponse, BasicRevocationErrorResponse, BasicTokenIntrospectionResponse, BasicTokenResponse};
|
||||
use reqwest::Client as HttpClient;
|
||||
use sea_orm::{DatabaseConnection, EntityTrait, ColumnTrait, QueryFilter, ActiveModelTrait, Set};
|
||||
use serde::Deserialize;
|
||||
@@ -34,11 +32,7 @@ impl OAuthService {
|
||||
let redirect_url = std::env::var("GOOGLE_REDIRECT_URL")
|
||||
.unwrap_or_else(|_| "http://localhost:8080/api/auth/google/callback".to_string());
|
||||
|
||||
let client = BasicClient::new(ClientId::new(client_id))
|
||||
.set_client_secret(ClientSecret::new(client_secret))
|
||||
.set_auth_uri(AuthUrl::new("https://accounts.google.com/o/oauth2/v2/auth".to_string()).unwrap())
|
||||
.set_token_uri(TokenUrl::new("https://oauth2.googleapis.com/token".to_string()).unwrap())
|
||||
.set_redirect_uri(RedirectUrl::new(redirect_url).unwrap());
|
||||
let client = Self::getClient(client_id, client_secret, redirect_url);
|
||||
|
||||
let (auth_url, csrf_token) = client
|
||||
.authorize_url(CsrfToken::new_random)
|
||||
@@ -58,11 +52,7 @@ impl OAuthService {
|
||||
let redirect_url = std::env::var("GOOGLE_REDIRECT_URL")
|
||||
.unwrap_or_else(|_| "http://localhost:8080/api/auth/google/callback".to_string());
|
||||
|
||||
let client = BasicClient::new(ClientId::new(client_id))
|
||||
.set_client_secret(ClientSecret::new(client_secret))
|
||||
.set_auth_uri(AuthUrl::new("https://accounts.google.com/o/oauth2/v2/auth".to_string()).unwrap())
|
||||
.set_token_uri(TokenUrl::new("https://oauth2.googleapis.com/token".to_string()).unwrap())
|
||||
.set_redirect_uri(RedirectUrl::new(redirect_url).unwrap());
|
||||
let client = Self::getClient(client_id, client_secret, redirect_url);
|
||||
|
||||
let http_client = oauth2::reqwest::ClientBuilder::new()
|
||||
.build()
|
||||
@@ -77,6 +67,23 @@ impl OAuthService {
|
||||
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> {
|
||||
let response = self.http_client
|
||||
.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
|
||||
}
|
||||
}
|
||||
@@ -15,7 +15,7 @@ services:
|
||||
restart: unless-stopped
|
||||
|
||||
backend:
|
||||
image: ghcr.io/${OWNER:-${COMPOSE_PROJECT_NAME}}/family_budget-backend:latest
|
||||
image: 192.168.31.100:3847/arrelin/family_budget-backend:latest
|
||||
container_name: family_budget_backend
|
||||
environment:
|
||||
DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}
|
||||
@@ -32,7 +32,7 @@ services:
|
||||
restart: unless-stopped
|
||||
|
||||
frontend:
|
||||
image: ghcr.io/${OWNER:-${COMPOSE_PROJECT_NAME}}/family_budget-frontend:latest
|
||||
image: 192.168.31.100:3847/arrelin/family_budget-frontend:latest
|
||||
container_name: family_budget_frontend
|
||||
depends_on:
|
||||
- backend
|
||||
|
||||
118
frontend/package-lock.json
generated
118
frontend/package-lock.json
generated
@@ -10,9 +10,13 @@
|
||||
"dependencies": {
|
||||
"@tailwindcss/postcss": "^4.1.18",
|
||||
"axios": "^1.13.2",
|
||||
"i18next": "^25.8.0",
|
||||
"i18next-browser-languagedetector": "^8.2.0",
|
||||
"lucide-react": "^0.561.0",
|
||||
"react": "^19.2.0",
|
||||
"react-dom": "^19.2.0",
|
||||
"react-i18next": "^16.5.3",
|
||||
"react-icons": "^5.5.0",
|
||||
"react-router-dom": "^7.10.1",
|
||||
"zustand": "^5.0.9"
|
||||
},
|
||||
@@ -280,6 +284,15 @@
|
||||
"@babel/core": "^7.0.0-0"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/runtime": {
|
||||
"version": "7.28.6",
|
||||
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz",
|
||||
"integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=6.9.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/template": {
|
||||
"version": "7.27.2",
|
||||
"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
|
||||
@@ -2988,6 +3001,55 @@
|
||||
"hermes-estree": "0.25.1"
|
||||
}
|
||||
},
|
||||
"node_modules/html-parse-stringify": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
|
||||
"integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"void-elements": "3.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/i18next": {
|
||||
"version": "25.8.0",
|
||||
"resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.0.tgz",
|
||||
"integrity": "sha512-urrg4HMFFMQZ2bbKRK7IZ8/CTE7D8H4JRlAwqA2ZwDRFfdd0K/4cdbNNLgfn9mo+I/h9wJu61qJzH7jCFAhUZQ==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "individual",
|
||||
"url": "https://locize.com"
|
||||
},
|
||||
{
|
||||
"type": "individual",
|
||||
"url": "https://locize.com/i18next.html"
|
||||
},
|
||||
{
|
||||
"type": "individual",
|
||||
"url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.28.4"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"typescript": "^5"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"typescript": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/i18next-browser-languagedetector": {
|
||||
"version": "8.2.0",
|
||||
"resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.2.0.tgz",
|
||||
"integrity": "sha512-P+3zEKLnOF0qmiesW383vsLdtQVyKtCNA9cjSoKCppTKPQVfKd2W8hbVo5ZhNJKDqeM7BOcvNoKJOjpHh4Js9g==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.23.2"
|
||||
}
|
||||
},
|
||||
"node_modules/ignore": {
|
||||
"version": "5.3.2",
|
||||
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
|
||||
@@ -3731,6 +3793,42 @@
|
||||
"react": "^19.2.1"
|
||||
}
|
||||
},
|
||||
"node_modules/react-i18next": {
|
||||
"version": "16.5.3",
|
||||
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-16.5.3.tgz",
|
||||
"integrity": "sha512-fo+/NNch37zqxOzlBYrWMx0uy/yInPkRfjSuy4lqKdaecR17nvCHnEUt3QyzA8XjQ2B/0iW/5BhaHR3ZmukpGw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.28.4",
|
||||
"html-parse-stringify": "^3.0.1",
|
||||
"use-sync-external-store": "^1.6.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"i18next": ">= 25.6.2",
|
||||
"react": ">= 16.8.0",
|
||||
"typescript": "^5"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"react-dom": {
|
||||
"optional": true
|
||||
},
|
||||
"react-native": {
|
||||
"optional": true
|
||||
},
|
||||
"typescript": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/react-icons": {
|
||||
"version": "5.5.0",
|
||||
"resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz",
|
||||
"integrity": "sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"react": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/react-refresh": {
|
||||
"version": "0.18.0",
|
||||
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz",
|
||||
@@ -3977,7 +4075,7 @@
|
||||
"version": "5.9.3",
|
||||
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
|
||||
"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
|
||||
"dev": true,
|
||||
"devOptional": true,
|
||||
"license": "Apache-2.0",
|
||||
"bin": {
|
||||
"tsc": "bin/tsc",
|
||||
@@ -4059,6 +4157,15 @@
|
||||
"punycode": "^2.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/use-sync-external-store": {
|
||||
"version": "1.6.0",
|
||||
"resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
|
||||
"integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/vite": {
|
||||
"version": "7.2.7",
|
||||
"resolved": "https://registry.npmjs.org/vite/-/vite-7.2.7.tgz",
|
||||
@@ -4134,6 +4241,15 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/void-elements": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
|
||||
"integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/which": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
|
||||
|
||||
@@ -12,9 +12,13 @@
|
||||
"dependencies": {
|
||||
"@tailwindcss/postcss": "^4.1.18",
|
||||
"axios": "^1.13.2",
|
||||
"i18next": "^25.8.0",
|
||||
"i18next-browser-languagedetector": "^8.2.0",
|
||||
"lucide-react": "^0.561.0",
|
||||
"react": "^19.2.0",
|
||||
"react-dom": "^19.2.0",
|
||||
"react-i18next": "^16.5.3",
|
||||
"react-icons": "^5.5.0",
|
||||
"react-router-dom": "^7.10.1",
|
||||
"zustand": "^5.0.9"
|
||||
},
|
||||
|
||||
@@ -1,19 +1,30 @@
|
||||
import { useEffect } from 'react';
|
||||
import { BrowserRouter, Routes, Route, Navigate, useLocation } from 'react-router-dom';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import Login from './pages/Login';
|
||||
import FamilyView from './pages/FamilyView';
|
||||
import AdminPanel from './pages/AdminPanel';
|
||||
import NoFamily from './pages/NoFamily';
|
||||
import InvitePage from './pages/InvitePage';
|
||||
import Profile from './pages/Profile';
|
||||
import { useStore } from './store/useStore';
|
||||
import { authApi } from './api/client';
|
||||
import { Loader2 } from 'lucide-react';
|
||||
|
||||
function AppContent() {
|
||||
const { t, i18n } = useTranslation();
|
||||
const { user, isAuthenticated, isLoading, setUser, setIsLoading } = useStore();
|
||||
const location = useLocation();
|
||||
|
||||
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();
|
||||
}, []);
|
||||
|
||||
@@ -41,7 +52,7 @@ function AppContent() {
|
||||
<div className="min-h-screen flex items-center justify-center gradient-bg">
|
||||
<div className="flex items-center gap-3 text-white">
|
||||
<Loader2 className="w-8 h-8 animate-spin" />
|
||||
<span className="text-xl font-medium">Загрузка...</span>
|
||||
<span className="text-xl font-medium">{t('common.loading')}</span>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
@@ -59,6 +70,7 @@ function AppContent() {
|
||||
return (
|
||||
<Routes>
|
||||
<Route path="/adminpanel" element={<AdminPanel />} />
|
||||
<Route path="/profile" element={<Profile />} />
|
||||
<Route path="*" element={<NoFamily />} />
|
||||
</Routes>
|
||||
);
|
||||
@@ -68,6 +80,7 @@ function AppContent() {
|
||||
<Routes>
|
||||
<Route path="/" element={<Navigate to={`/family/${user.family_id}`} replace />} />
|
||||
<Route path="/family/:familyId" element={<FamilyView />} />
|
||||
<Route path="/profile" element={<Profile />} />
|
||||
<Route path="/adminpanel" element={<AdminPanel />} />
|
||||
<Route path="*" element={<Navigate to={`/family/${user.family_id}`} replace />} />
|
||||
</Routes>
|
||||
|
||||
@@ -24,6 +24,8 @@ import type {
|
||||
InviteLinkResponse,
|
||||
ValidateInviteResponse,
|
||||
JoinFamilyResponse,
|
||||
FamilyMember,
|
||||
LeaveFamilyResponse,
|
||||
} from '../types';
|
||||
|
||||
const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || '';
|
||||
@@ -70,6 +72,14 @@ export const familyApi = {
|
||||
|
||||
verifyPassword: (id: number, data: VerifyFamilyPasswordRequest) =>
|
||||
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 = {
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { X, AlertTriangle } from 'lucide-react';
|
||||
|
||||
interface ConfirmModalProps {
|
||||
@@ -13,18 +14,21 @@ interface ConfirmModalProps {
|
||||
export default function ConfirmModal({
|
||||
title,
|
||||
message,
|
||||
confirmText = 'Подтвердить',
|
||||
cancelText = 'Отмена',
|
||||
confirmText,
|
||||
cancelText,
|
||||
onConfirm,
|
||||
onCancel,
|
||||
variant = 'danger',
|
||||
}: ConfirmModalProps) {
|
||||
const { t } = useTranslation();
|
||||
const defaultConfirmText = confirmText || t('common.confirm');
|
||||
const defaultCancelText = cancelText || t('common.cancel');
|
||||
const getVariantStyles = () => {
|
||||
switch (variant) {
|
||||
case 'danger':
|
||||
return {
|
||||
icon: 'bg-red-100 text-red-600',
|
||||
confirmButton: 'bg-gradient-to-r from-red-500 to-red-600 hover:shadow-lg',
|
||||
icon: 'btn-danger',
|
||||
confirmButton: 'btn-danger hover:shadow-lg',
|
||||
};
|
||||
case 'warning':
|
||||
return {
|
||||
@@ -33,8 +37,8 @@ export default function ConfirmModal({
|
||||
};
|
||||
case 'info':
|
||||
return {
|
||||
icon: 'bg-blue-100 text-blue-600',
|
||||
confirmButton: 'bg-gradient-to-r from-blue-500 to-blue-600 hover:shadow-lg',
|
||||
icon: 'btn-primary',
|
||||
confirmButton: 'btn-primary hover:shadow-lg',
|
||||
};
|
||||
}
|
||||
};
|
||||
@@ -43,10 +47,10 @@ export default function ConfirmModal({
|
||||
|
||||
return (
|
||||
<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="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" />
|
||||
</div>
|
||||
<div className="flex-1">
|
||||
@@ -67,13 +71,13 @@ export default function ConfirmModal({
|
||||
onClick={onCancel}
|
||||
className="flex-1 px-6 py-3 bg-gray-200 hover:bg-gray-300 text-gray-700 rounded-2xl transition-all font-semibold"
|
||||
>
|
||||
{cancelText}
|
||||
{defaultCancelText}
|
||||
</button>
|
||||
<button
|
||||
onClick={onConfirm}
|
||||
className={`flex-1 px-6 py-3 text-white rounded-2xl transition-all font-semibold ${styles.confirmButton}`}
|
||||
>
|
||||
{confirmText}
|
||||
{defaultConfirmText}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { shoppingItemApi } from '../api/client';
|
||||
import type { ShoppingItem } from '../types';
|
||||
import {
|
||||
@@ -23,6 +24,7 @@ type ConfirmAction =
|
||||
| { type: 'clear-all' };
|
||||
|
||||
export default function ShoppingListModal({ familyId, onClose }: ShoppingListModalProps) {
|
||||
const { t } = useTranslation();
|
||||
const [items, setItems] = useState<ShoppingItem[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [newItemName, setNewItemName] = useState('');
|
||||
@@ -41,7 +43,7 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
setItems(response.data);
|
||||
} catch (err) {
|
||||
console.error('Error loading shopping items:', err);
|
||||
alert('Ошибка загрузки списка покупок');
|
||||
alert(t('shopping.loadError'));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -56,7 +58,7 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
loadItems();
|
||||
} catch (err) {
|
||||
console.error('Error adding item:', err);
|
||||
alert('Ошибка добавления покупки');
|
||||
alert(t('shopping.addError'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -66,7 +68,7 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
loadItems();
|
||||
} catch (err) {
|
||||
console.error('Error toggling purchased status:', err);
|
||||
alert('Ошибка изменения статуса');
|
||||
alert(t('shopping.toggleError'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -80,7 +82,7 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
loadItems();
|
||||
} catch (err) {
|
||||
console.error('Error deleting item:', err);
|
||||
alert('Ошибка удаления покупки');
|
||||
alert(t('shopping.deleteError'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -99,7 +101,7 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
loadItems();
|
||||
} catch (err) {
|
||||
console.error('Error updating item:', err);
|
||||
alert('Ошибка обновления покупки');
|
||||
alert(t('shopping.updateError'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -118,7 +120,7 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
loadItems();
|
||||
} catch (err) {
|
||||
console.error('Error marking all as purchased:', err);
|
||||
alert('Ошибка обновления списка');
|
||||
alert(t('shopping.markAllError'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -132,7 +134,7 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
loadItems();
|
||||
} catch (err) {
|
||||
console.error('Error clearing all items:', err);
|
||||
alert('Ошибка очистки списка');
|
||||
alert(t('shopping.clearError'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -160,22 +162,22 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
switch (confirmAction.type) {
|
||||
case 'delete-item':
|
||||
return {
|
||||
title: 'Удалить покупку?',
|
||||
message: 'Покупка будет удалена из списка безвозвратно.',
|
||||
confirmText: 'Удалить',
|
||||
title: t('confirm.deleteItem'),
|
||||
message: t('confirm.deleteItemMessage'),
|
||||
confirmText: t('common.delete'),
|
||||
};
|
||||
case 'mark-all':
|
||||
return {
|
||||
title: 'Пометить все как купленные?',
|
||||
message: 'Все покупки в списке будут отмечены как купленные.',
|
||||
confirmText: 'Пометить',
|
||||
title: t('confirm.markAll'),
|
||||
message: t('confirm.markAllMessage'),
|
||||
confirmText: t('confirm.markButton'),
|
||||
variant: 'info' as const,
|
||||
};
|
||||
case 'clear-all':
|
||||
return {
|
||||
title: 'Очистить список?',
|
||||
message: 'Все покупки будут удалены из списка безвозвратно.',
|
||||
confirmText: 'Очистить',
|
||||
title: t('confirm.clearAll'),
|
||||
message: t('confirm.clearAllMessage'),
|
||||
confirmText: t('shopping.clear'),
|
||||
};
|
||||
}
|
||||
};
|
||||
@@ -187,13 +189,13 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
return (
|
||||
<>
|
||||
<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="bg-gradient-to-r from-green-500 to-emerald-600 p-6 flex items-center justify-between">
|
||||
<div className="glass-effect rounded-3xl shadow-2xl max-w-2xl w-full max-h-[90vh] overflow-hidden flex flex-col">
|
||||
<div className="btn-success p-6 flex items-center justify-between">
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="p-3 bg-white/20 backdrop-blur-md rounded-2xl">
|
||||
<ShoppingCart className="w-8 h-8 text-white" />
|
||||
</div>
|
||||
<h2 className="text-3xl font-bold text-white">Список покупок</h2>
|
||||
<h2 className="text-3xl font-bold text-white">{t('shopping.title')}</h2>
|
||||
</div>
|
||||
<button
|
||||
onClick={onClose}
|
||||
@@ -208,7 +210,7 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
<div className="flex gap-2">
|
||||
<input
|
||||
type="text"
|
||||
placeholder="Добавить покупку..."
|
||||
placeholder={t('shopping.addPlaceholder')}
|
||||
value={newItemName}
|
||||
onChange={(e) => setNewItemName(e.target.value)}
|
||||
onKeyPress={(e) => e.key === 'Enter' && handleAddItem()}
|
||||
@@ -216,10 +218,10 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
/>
|
||||
<button
|
||||
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" />
|
||||
<span className="hidden sm:inline">Добавить</span>
|
||||
<span className="hidden sm:inline">{t('common.add')}</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -232,7 +234,7 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
<div className="space-y-6">
|
||||
{unpurchasedItems.length > 0 && (
|
||||
<div>
|
||||
<h3 className="text-lg font-semibold text-gray-700 mb-3">К покупке</h3>
|
||||
<h3 className="text-lg font-semibold text-gray-700 mb-3">{t('shopping.toBuy')}</h3>
|
||||
<div className="space-y-2">
|
||||
{unpurchasedItems.map((item) => (
|
||||
<div
|
||||
@@ -295,12 +297,12 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
|
||||
{purchasedItems.length > 0 && (
|
||||
<div>
|
||||
<h3 className="text-lg font-semibold text-gray-700 mb-3">Куплено</h3>
|
||||
<h3 className="text-lg font-semibold text-gray-700 mb-3">{t('shopping.purchased')}</h3>
|
||||
<div className="space-y-2">
|
||||
{purchasedItems.map((item) => (
|
||||
<div
|
||||
key={item.id}
|
||||
className="bg-green-50 p-4 rounded-2xl border-2 border-green-200"
|
||||
className="shopping-purchased p-4 rounded-2xl border-2"
|
||||
>
|
||||
<div className="flex items-center justify-between">
|
||||
<div className="flex items-center gap-3">
|
||||
@@ -328,7 +330,7 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
{items.length === 0 && (
|
||||
<div className="text-center py-12 text-gray-500">
|
||||
<ShoppingCart className="w-16 h-16 mx-auto mb-4 opacity-30" />
|
||||
<p className="text-lg">Список покупок пуст</p>
|
||||
<p className="text-lg">{t('shopping.empty')}</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
@@ -340,17 +342,17 @@ export default function ShoppingListModal({ familyId, onClose }: ShoppingListMod
|
||||
<div className="flex gap-3">
|
||||
<button
|
||||
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" />
|
||||
Все куплено
|
||||
{t('shopping.allPurchased')}
|
||||
</button>
|
||||
<button
|
||||
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" />
|
||||
Очистить
|
||||
{t('shopping.clear')}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
26
frontend/src/i18n/index.ts
Normal file
26
frontend/src/i18n/index.ts
Normal file
@@ -0,0 +1,26 @@
|
||||
import i18n from 'i18next';
|
||||
import { initReactI18next } from 'react-i18next';
|
||||
import LanguageDetector from 'i18next-browser-languagedetector';
|
||||
|
||||
import ru from './locales/ru.json';
|
||||
import en from './locales/en.json';
|
||||
|
||||
i18n
|
||||
.use(LanguageDetector)
|
||||
.use(initReactI18next)
|
||||
.init({
|
||||
resources: {
|
||||
ru: { translation: ru },
|
||||
en: { translation: en },
|
||||
},
|
||||
fallbackLng: 'ru',
|
||||
interpolation: {
|
||||
escapeValue: false,
|
||||
},
|
||||
detection: {
|
||||
order: ['navigator', 'htmlTag', 'localStorage'],
|
||||
caches: ['localStorage'],
|
||||
},
|
||||
});
|
||||
|
||||
export default i18n;
|
||||
172
frontend/src/i18n/locales/en.json
Normal file
172
frontend/src/i18n/locales/en.json
Normal file
@@ -0,0 +1,172 @@
|
||||
{
|
||||
"common": {
|
||||
"loading": "Loading...",
|
||||
"error": "Error",
|
||||
"cancel": "Cancel",
|
||||
"confirm": "Confirm",
|
||||
"delete": "Delete",
|
||||
"add": "Add",
|
||||
"create": "Create",
|
||||
"save": "Save",
|
||||
"back": "Back",
|
||||
"toHome": "Home",
|
||||
"logout": "Log out",
|
||||
"exit": "Exit",
|
||||
"currency": "$"
|
||||
},
|
||||
"login": {
|
||||
"title": "Family Budget",
|
||||
"subtitle": "Sign in to continue",
|
||||
"googleButton": "Sign in with Google",
|
||||
"authError": "Error getting authorization link"
|
||||
},
|
||||
"noFamily": {
|
||||
"welcome": "Welcome!",
|
||||
"createFamily": "Create your family",
|
||||
"familyName": "Family name",
|
||||
"familyNameRequired": "Family name *",
|
||||
"familyNamePlaceholder": "For example: Smith Family",
|
||||
"password": "Password",
|
||||
"passwordOptional": "(optional)",
|
||||
"passwordPlaceholder": "For access protection",
|
||||
"passwordHint": "Password will be needed to access the family budget",
|
||||
"createButton": "Create family",
|
||||
"adminPanel": "Admin panel",
|
||||
"enterFamilyName": "Enter family name",
|
||||
"alreadyInFamily": "You are already in a family",
|
||||
"createError": "Error creating family",
|
||||
"joiningFamily": "Joining family...",
|
||||
"invalidInvite": "Invite link is invalid or expired",
|
||||
"joinError": "Error joining family"
|
||||
},
|
||||
"family": {
|
||||
"defaultName": "Family",
|
||||
"totalLimit": "Total limit",
|
||||
"totalRemaining": "Total remaining",
|
||||
"shoppingList": "Shopping list",
|
||||
"inviteMember": "Invite member",
|
||||
"loadError": "Error loading categories"
|
||||
},
|
||||
"category": {
|
||||
"remaining": "Remaining:",
|
||||
"limit": "Limit:",
|
||||
"percentRemaining": "% remaining",
|
||||
"addExpense": "Add expense",
|
||||
"expense": "Expense",
|
||||
"reset": "Reset",
|
||||
"history": "History",
|
||||
"management": "Category management",
|
||||
"newCategory": "New category",
|
||||
"categoryName": "Category name",
|
||||
"categoryLimit": "Limit ($)",
|
||||
"addCategory": "Add category",
|
||||
"deleteConfirm": "Delete category?",
|
||||
"resetConfirm": "Delete all expenses for this category?",
|
||||
"createError": "Error creating category",
|
||||
"deleteError": "Error deleting category",
|
||||
"resetError": "Error resetting expenses"
|
||||
},
|
||||
"expense": {
|
||||
"addTitle": "Add expense",
|
||||
"amount": "Amount ($)",
|
||||
"amountPlaceholder": "0.00",
|
||||
"description": "Description",
|
||||
"descriptionPlaceholder": "Optional",
|
||||
"historyTitle": "Expense history",
|
||||
"noExpenses": "No expenses",
|
||||
"addError": "Error adding expense",
|
||||
"historyError": "Error loading expense history"
|
||||
},
|
||||
"invite": {
|
||||
"title": "Invite member",
|
||||
"description": "Create an invite link to add a new member to the family. The link will be valid for 7 days.",
|
||||
"createLink": "Create link",
|
||||
"creating": "Creating...",
|
||||
"sendLink": "Send this link to the person you want to invite:",
|
||||
"copyLink": "Copy link",
|
||||
"copied": "Copied!",
|
||||
"createError": "Error creating invite link",
|
||||
"pageTitle": "Family invitation",
|
||||
"pageDescription": "You have been invited to join a family budget. Sign in with Google to accept the invitation.",
|
||||
"loginAndJoin": "Sign in and join",
|
||||
"validating": "Validating invitation...",
|
||||
"joining": "Joining family...",
|
||||
"invalid": "Link is invalid or has expired",
|
||||
"notFound": "Link not found",
|
||||
"alreadyInFamily": "You are already in a family",
|
||||
"joinError": "Error joining family"
|
||||
},
|
||||
"admin": {
|
||||
"title": "Admin panel",
|
||||
"subtitle": "Family management",
|
||||
"accessDenied": "Access denied",
|
||||
"requiresAdmin": "Administrator rights required",
|
||||
"createFamily": "Create new family",
|
||||
"familyName": "Family name",
|
||||
"familyNamePlaceholder": "For example: Smith Family",
|
||||
"familyPassword": "Family password",
|
||||
"familyPasswordPlaceholder": "Protect your family with a password",
|
||||
"createButton": "Create family",
|
||||
"familyList": "Family list",
|
||||
"noFamilies": "No families found",
|
||||
"createFirst": "Create the first family",
|
||||
"fillNameAndPassword": "Fill in the family name and password",
|
||||
"createError": "Error creating family",
|
||||
"deleteConfirm": "Delete family?",
|
||||
"deleteError": "Error deleting family"
|
||||
},
|
||||
"shopping": {
|
||||
"title": "Shopping list",
|
||||
"addPlaceholder": "Add item...",
|
||||
"toBuy": "To buy",
|
||||
"purchased": "Purchased",
|
||||
"empty": "Shopping list is empty",
|
||||
"allPurchased": "All purchased",
|
||||
"clear": "Clear",
|
||||
"loadError": "Error loading shopping list",
|
||||
"addError": "Error adding item",
|
||||
"toggleError": "Error changing status",
|
||||
"deleteError": "Error deleting item",
|
||||
"updateError": "Error updating item",
|
||||
"markAllError": "Error updating list",
|
||||
"clearError": "Error clearing list"
|
||||
},
|
||||
"confirm": {
|
||||
"deleteItem": "Delete item?",
|
||||
"deleteItemMessage": "The item will be permanently removed from the list.",
|
||||
"markAll": "Mark all as purchased?",
|
||||
"markAllMessage": "All items in the list will be marked as purchased.",
|
||||
"markButton": "Mark",
|
||||
"clearAll": "Clear 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"
|
||||
}
|
||||
}
|
||||
}
|
||||
172
frontend/src/i18n/locales/ru.json
Normal file
172
frontend/src/i18n/locales/ru.json
Normal file
@@ -0,0 +1,172 @@
|
||||
{
|
||||
"common": {
|
||||
"loading": "Загрузка...",
|
||||
"error": "Ошибка",
|
||||
"cancel": "Отмена",
|
||||
"confirm": "Подтвердить",
|
||||
"delete": "Удалить",
|
||||
"add": "Добавить",
|
||||
"create": "Создать",
|
||||
"save": "Сохранить",
|
||||
"back": "Назад",
|
||||
"toHome": "На главную",
|
||||
"logout": "Выйти",
|
||||
"exit": "Выход",
|
||||
"currency": "₽"
|
||||
},
|
||||
"login": {
|
||||
"title": "Семейный бюджет",
|
||||
"subtitle": "Войдите, чтобы продолжить",
|
||||
"googleButton": "Войти через Google",
|
||||
"authError": "Ошибка при получении ссылки для авторизации"
|
||||
},
|
||||
"noFamily": {
|
||||
"welcome": "Добро пожаловать!",
|
||||
"createFamily": "Создайте свою семью",
|
||||
"familyName": "Название семьи",
|
||||
"familyNameRequired": "Название семьи *",
|
||||
"familyNamePlaceholder": "Например: Семья Ивановых",
|
||||
"password": "Пароль",
|
||||
"passwordOptional": "(необязательно)",
|
||||
"passwordPlaceholder": "Для защиты доступа",
|
||||
"passwordHint": "Пароль понадобится для доступа к бюджету семьи",
|
||||
"createButton": "Создать семью",
|
||||
"adminPanel": "Админ панель",
|
||||
"enterFamilyName": "Введите название семьи",
|
||||
"alreadyInFamily": "Вы уже состоите в семье",
|
||||
"createError": "Ошибка при создании семьи",
|
||||
"joiningFamily": "Присоединение к семье...",
|
||||
"invalidInvite": "Ссылка-приглашение недействительна или истекла",
|
||||
"joinError": "Ошибка при присоединении к семье"
|
||||
},
|
||||
"family": {
|
||||
"defaultName": "Семья",
|
||||
"totalLimit": "Общий лимит",
|
||||
"totalRemaining": "Общий остаток",
|
||||
"shoppingList": "Список покупок",
|
||||
"inviteMember": "Пригласить участника",
|
||||
"loadError": "Ошибка загрузки категорий"
|
||||
},
|
||||
"category": {
|
||||
"remaining": "Остаток:",
|
||||
"limit": "Лимит:",
|
||||
"percentRemaining": "% осталось",
|
||||
"addExpense": "Добавить расход",
|
||||
"expense": "Расход",
|
||||
"reset": "Обнулить",
|
||||
"history": "История",
|
||||
"management": "Управление категориями",
|
||||
"newCategory": "Новая категория",
|
||||
"categoryName": "Название категории",
|
||||
"categoryLimit": "Лимит (₽)",
|
||||
"addCategory": "Добавить категорию",
|
||||
"deleteConfirm": "Удалить категорию?",
|
||||
"resetConfirm": "Удалить все траты по этой категории?",
|
||||
"createError": "Ошибка создания категории",
|
||||
"deleteError": "Ошибка удаления категории",
|
||||
"resetError": "Ошибка сброса трат"
|
||||
},
|
||||
"expense": {
|
||||
"addTitle": "Добавить расход",
|
||||
"amount": "Сумма (₽)",
|
||||
"amountPlaceholder": "0.00",
|
||||
"description": "Описание",
|
||||
"descriptionPlaceholder": "Опционально",
|
||||
"historyTitle": "История трат",
|
||||
"noExpenses": "Нет трат",
|
||||
"addError": "Ошибка добавления расхода",
|
||||
"historyError": "Ошибка загрузки истории трат"
|
||||
},
|
||||
"invite": {
|
||||
"title": "Пригласить участника",
|
||||
"description": "Создайте ссылку-приглашение, чтобы добавить нового участника в семью. Ссылка будет действительна 7 дней.",
|
||||
"createLink": "Создать ссылку",
|
||||
"creating": "Создание...",
|
||||
"sendLink": "Отправьте эту ссылку участнику, которого хотите пригласить:",
|
||||
"copyLink": "Скопировать ссылку",
|
||||
"copied": "Скопировано!",
|
||||
"createError": "Ошибка создания ссылки-приглашения",
|
||||
"pageTitle": "Приглашение в семью",
|
||||
"pageDescription": "Вас пригласили присоединиться к семейному бюджету. Войдите через Google, чтобы принять приглашение.",
|
||||
"loginAndJoin": "Войти и присоединиться",
|
||||
"validating": "Проверка приглашения...",
|
||||
"joining": "Присоединение к семье...",
|
||||
"invalid": "Ссылка недействительна или срок её действия истёк",
|
||||
"notFound": "Ссылка не найдена",
|
||||
"alreadyInFamily": "Вы уже состоите в семье",
|
||||
"joinError": "Ошибка при присоединении к семье"
|
||||
},
|
||||
"admin": {
|
||||
"title": "Админ панель",
|
||||
"subtitle": "Управление семьями",
|
||||
"accessDenied": "Доступ запрещен",
|
||||
"requiresAdmin": "Требуются права администратора",
|
||||
"createFamily": "Создать новую семью",
|
||||
"familyName": "Название семьи",
|
||||
"familyNamePlaceholder": "Например: Семья Ивановых",
|
||||
"familyPassword": "Пароль семьи",
|
||||
"familyPasswordPlaceholder": "Защитите семью паролем",
|
||||
"createButton": "Создать семью",
|
||||
"familyList": "Список семей",
|
||||
"noFamilies": "Семьи не найдены",
|
||||
"createFirst": "Создайте первую семью",
|
||||
"fillNameAndPassword": "Заполните название и пароль семьи",
|
||||
"createError": "Ошибка создания семьи",
|
||||
"deleteConfirm": "Удалить семью?",
|
||||
"deleteError": "Ошибка удаления семьи"
|
||||
},
|
||||
"shopping": {
|
||||
"title": "Список покупок",
|
||||
"addPlaceholder": "Добавить покупку...",
|
||||
"toBuy": "К покупке",
|
||||
"purchased": "Куплено",
|
||||
"empty": "Список покупок пуст",
|
||||
"allPurchased": "Все куплено",
|
||||
"clear": "Очистить",
|
||||
"loadError": "Ошибка загрузки списка покупок",
|
||||
"addError": "Ошибка добавления покупки",
|
||||
"toggleError": "Ошибка изменения статуса",
|
||||
"deleteError": "Ошибка удаления покупки",
|
||||
"updateError": "Ошибка обновления покупки",
|
||||
"markAllError": "Ошибка обновления списка",
|
||||
"clearError": "Ошибка очистки списка"
|
||||
},
|
||||
"confirm": {
|
||||
"deleteItem": "Удалить покупку?",
|
||||
"deleteItemMessage": "Покупка будет удалена из списка безвозвратно.",
|
||||
"markAll": "Пометить все как купленные?",
|
||||
"markAllMessage": "Все покупки в списке будут отмечены как купленные.",
|
||||
"markButton": "Пометить",
|
||||
"clearAll": "Очистить список?",
|
||||
"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";
|
||||
|
||||
: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 {
|
||||
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
|
||||
background: linear-gradient(135deg, var(--gradient-start) 0%, var(--gradient-end) 100%);
|
||||
}
|
||||
|
||||
.gradient-bg-light {
|
||||
@@ -18,10 +121,104 @@
|
||||
}
|
||||
|
||||
.glass-effect {
|
||||
background: rgb(255 255 255 / 0.8);
|
||||
background: var(--glass-bg);
|
||||
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 {
|
||||
animation: fadeIn 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { StrictMode } from 'react'
|
||||
import { createRoot } from 'react-dom/client'
|
||||
import './i18n'
|
||||
import './index.css'
|
||||
import App from './App.tsx'
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { authApi, familyApi } from '../api/client';
|
||||
import { useStore } from '../store/useStore';
|
||||
import {
|
||||
@@ -14,6 +15,7 @@ import {
|
||||
} from 'lucide-react';
|
||||
|
||||
export default function AdminPanel() {
|
||||
const { t } = useTranslation();
|
||||
const navigate = useNavigate();
|
||||
const { user, logout: storeLogout } = useStore();
|
||||
|
||||
@@ -46,7 +48,7 @@ export default function AdminPanel() {
|
||||
|
||||
const handleCreateFamily = async () => {
|
||||
if (!newFamilyName.trim() || !newFamilyPassword.trim()) {
|
||||
alert('Заполните название и пароль семьи');
|
||||
alert(t('admin.fillNameAndPassword'));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -56,19 +58,19 @@ export default function AdminPanel() {
|
||||
setNewFamilyPassword('');
|
||||
loadFamilies();
|
||||
} catch (err) {
|
||||
alert('Ошибка создания семьи');
|
||||
alert(t('admin.createError'));
|
||||
console.error(err);
|
||||
}
|
||||
};
|
||||
|
||||
const handleDeleteFamily = async (id: number) => {
|
||||
if (!confirm('Удалить семью?')) return;
|
||||
if (!confirm(t('admin.deleteConfirm'))) return;
|
||||
|
||||
try {
|
||||
await familyApi.delete(id);
|
||||
loadFamilies();
|
||||
} catch (err) {
|
||||
alert('Ошибка удаления семьи');
|
||||
alert(t('admin.deleteError'));
|
||||
console.error(err);
|
||||
}
|
||||
};
|
||||
@@ -79,22 +81,22 @@ export default function AdminPanel() {
|
||||
<div className="max-w-md w-full">
|
||||
<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="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" />
|
||||
</div>
|
||||
</div>
|
||||
<h1 className="text-2xl sm:text-3xl font-bold text-gray-900 mb-2">
|
||||
Доступ запрещен
|
||||
{t('admin.accessDenied')}
|
||||
</h1>
|
||||
<p className="text-gray-600 mb-6 text-sm sm:text-base">
|
||||
Требуются права администратора
|
||||
{t('admin.requiresAdmin')}
|
||||
</p>
|
||||
<button
|
||||
onClick={() => navigate('/')}
|
||||
className="w-full flex items-center justify-center gap-2 px-4 py-3 bg-gray-200 hover:bg-gray-300 text-gray-700 rounded-xl transition-all duration-300 font-medium"
|
||||
>
|
||||
<ArrowLeft className="w-5 h-5" />
|
||||
Назад
|
||||
{t('common.back')}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -110,10 +112,10 @@ export default function AdminPanel() {
|
||||
<Shield className="w-12 h-12 text-white" />
|
||||
</div>
|
||||
<h1 className="text-4xl sm:text-5xl font-bold text-white mb-2">
|
||||
Админ панель
|
||||
{t('admin.title')}
|
||||
</h1>
|
||||
<p className="text-purple-100 text-base sm:text-lg mb-6">
|
||||
Управление семьями
|
||||
{t('admin.subtitle')}
|
||||
</p>
|
||||
<div className="flex justify-center gap-3">
|
||||
<button
|
||||
@@ -121,25 +123,25 @@ export default function AdminPanel() {
|
||||
className="inline-flex items-center gap-2 px-5 py-3 bg-red-500/80 hover:bg-red-600 text-white rounded-2xl backdrop-blur-md transition-all duration-300 hover:shadow-lg font-medium"
|
||||
>
|
||||
<LogOut className="w-5 h-5" />
|
||||
Выход
|
||||
{t('common.exit')}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => navigate('/')}
|
||||
className="inline-flex items-center gap-2 px-5 py-3 bg-white/20 hover:bg-white/30 text-white rounded-2xl backdrop-blur-md transition-all duration-300 hover:shadow-lg font-medium"
|
||||
>
|
||||
<Home className="w-5 h-5" />
|
||||
На главную
|
||||
{t('common.toHome')}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<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="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" />
|
||||
</div>
|
||||
<h2 className="text-2xl sm:text-3xl font-bold text-gray-800">
|
||||
Создать новую семью
|
||||
{t('admin.createFamily')}
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
@@ -147,11 +149,11 @@ export default function AdminPanel() {
|
||||
<div>
|
||||
<label className="flex items-center justify-center gap-2 text-sm font-semibold text-gray-700 mb-3">
|
||||
<Users className="w-5 h-5 text-purple-600" />
|
||||
Название семьи
|
||||
{t('admin.familyName')}
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
placeholder="Например: Семья Ивановых"
|
||||
placeholder={t('admin.familyNamePlaceholder')}
|
||||
value={newFamilyName}
|
||||
onChange={(e) => setNewFamilyName(e.target.value)}
|
||||
className="w-full px-5 py-4 border-2 border-gray-300 rounded-2xl focus:ring-2 focus:ring-purple-500 focus:border-purple-500 transition-all font-medium text-center"
|
||||
@@ -160,11 +162,11 @@ export default function AdminPanel() {
|
||||
<div>
|
||||
<label className="flex items-center justify-center gap-2 text-sm font-semibold text-gray-700 mb-3">
|
||||
<Lock className="w-5 h-5 text-purple-600" />
|
||||
Пароль семьи
|
||||
{t('admin.familyPassword')}
|
||||
</label>
|
||||
<input
|
||||
type="password"
|
||||
placeholder="Защитите семью паролем"
|
||||
placeholder={t('admin.familyPasswordPlaceholder')}
|
||||
value={newFamilyPassword}
|
||||
onChange={(e) => setNewFamilyPassword(e.target.value)}
|
||||
className="w-full px-5 py-4 border-2 border-gray-300 rounded-2xl focus:ring-2 focus:ring-purple-500 focus:border-purple-500 transition-all font-medium text-center"
|
||||
@@ -172,34 +174,34 @@ export default function AdminPanel() {
|
||||
</div>
|
||||
<button
|
||||
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" />
|
||||
Создать семью
|
||||
{t('admin.createButton')}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<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="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" />
|
||||
</div>
|
||||
<h2 className="text-2xl sm:text-3xl font-bold text-gray-800">
|
||||
Список семей
|
||||
{t('admin.familyList')}
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
{families.length === 0 ? (
|
||||
<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">
|
||||
<Users className="w-20 h-20 text-purple-400" />
|
||||
<div className="inline-flex p-6 bg-gray-100 rounded-3xl mb-6">
|
||||
<Users className="w-20 h-20 text-gray-400" />
|
||||
</div>
|
||||
<p className="text-gray-600 text-lg sm:text-xl mb-2 font-semibold">
|
||||
Семьи не найдены
|
||||
{t('admin.noFamilies')}
|
||||
</p>
|
||||
<p className="text-gray-500 text-sm sm:text-base">
|
||||
Создайте первую семью
|
||||
{t('admin.createFirst')}
|
||||
</p>
|
||||
</div>
|
||||
) : (
|
||||
@@ -207,10 +209,10 @@ export default function AdminPanel() {
|
||||
{families.map((family) => (
|
||||
<div
|
||||
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="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" />
|
||||
</div>
|
||||
<span className="text-lg sm:text-xl font-bold text-gray-900">
|
||||
@@ -219,10 +221,10 @@ export default function AdminPanel() {
|
||||
</div>
|
||||
<button
|
||||
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" />
|
||||
Удалить
|
||||
{t('common.delete')}
|
||||
</button>
|
||||
</div>
|
||||
))}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useParams, useNavigate } from 'react-router-dom';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { categoryApi, expenseApi, inviteLinkApi } from '../api/client';
|
||||
import { useStore } from '../store/useStore';
|
||||
import type { Category, Expense, InviteLinkResponse } from '../types';
|
||||
@@ -20,10 +21,12 @@ import {
|
||||
UserPlus,
|
||||
Copy,
|
||||
Check,
|
||||
User,
|
||||
} from 'lucide-react';
|
||||
import ShoppingListModal from '../components/ShoppingListModal';
|
||||
|
||||
export default function FamilyView() {
|
||||
const { t } = useTranslation();
|
||||
const { familyId } = useParams<{ familyId: string }>();
|
||||
const navigate = useNavigate();
|
||||
const { selectedFamily } = useStore();
|
||||
@@ -82,7 +85,7 @@ export default function FamilyView() {
|
||||
setRemainingLimits(limits);
|
||||
console.log('All data loaded successfully');
|
||||
} catch (err: any) {
|
||||
const errorMsg = err.response?.data?.message || err.message || 'Ошибка загрузки категорий';
|
||||
const errorMsg = err.response?.data?.message || err.message || t('family.loadError');
|
||||
setError(errorMsg);
|
||||
console.error('Error loading categories:', err);
|
||||
} finally {
|
||||
@@ -103,28 +106,28 @@ export default function FamilyView() {
|
||||
setShowAddCategory(false);
|
||||
loadCategories();
|
||||
} catch (err: any) {
|
||||
const errorMsg = err.response?.data?.message || err.response?.statusText || err.message || 'Ошибка создания категории';
|
||||
alert(`Ошибка создания категории: ${errorMsg} (Статус: ${err.response?.status})`);
|
||||
const errorMsg = err.response?.data?.message || err.response?.statusText || err.message || t('category.createError');
|
||||
alert(`${t('category.createError')}: ${errorMsg}`);
|
||||
console.error('Full error:', err);
|
||||
}
|
||||
};
|
||||
|
||||
const handleDeleteCategory = async (categoryId: number) => {
|
||||
if (!familyId) return;
|
||||
if (!confirm('Удалить категорию?')) return;
|
||||
if (!confirm(t('category.deleteConfirm'))) return;
|
||||
|
||||
try {
|
||||
await categoryApi.delete(parseInt(familyId), categoryId);
|
||||
loadCategories();
|
||||
} catch (err) {
|
||||
alert('Ошибка удаления категории');
|
||||
alert(t('category.deleteError'));
|
||||
console.error(err);
|
||||
}
|
||||
};
|
||||
|
||||
const handleResetLimit = async (categoryId: number) => {
|
||||
if (!familyId) return;
|
||||
if (!confirm('Удалить все траты по этой категории?')) return;
|
||||
if (!confirm(t('category.resetConfirm'))) return;
|
||||
|
||||
try {
|
||||
const expensesResponse = await expenseApi.getAllByCategory(
|
||||
@@ -142,7 +145,7 @@ export default function FamilyView() {
|
||||
|
||||
loadCategories();
|
||||
} catch (err) {
|
||||
alert('Ошибка сброса трат');
|
||||
alert(t('category.resetError'));
|
||||
console.error(err);
|
||||
}
|
||||
};
|
||||
@@ -160,7 +163,7 @@ export default function FamilyView() {
|
||||
setShowAddExpense(null);
|
||||
loadCategories();
|
||||
} catch (err) {
|
||||
alert('Ошибка добавления расхода');
|
||||
alert(t('expense.addError'));
|
||||
console.error(err);
|
||||
}
|
||||
};
|
||||
@@ -181,7 +184,7 @@ export default function FamilyView() {
|
||||
setCategoryExpenses(response.data);
|
||||
setShowHistory(categoryId);
|
||||
} catch (err) {
|
||||
alert('Ошибка загрузки истории трат');
|
||||
alert(t('expense.historyError'));
|
||||
console.error(err);
|
||||
}
|
||||
};
|
||||
@@ -192,7 +195,7 @@ export default function FamilyView() {
|
||||
const response = await inviteLinkApi.create({ expires_in_hours: 168 });
|
||||
setInviteLink(response.data);
|
||||
} catch (err) {
|
||||
alert('Ошибка создания ссылки-приглашения');
|
||||
alert(t('invite.createError'));
|
||||
console.error(err);
|
||||
} finally {
|
||||
setInviteLoading(false);
|
||||
@@ -221,7 +224,7 @@ export default function FamilyView() {
|
||||
<div className="min-h-screen flex items-center justify-center gradient-bg">
|
||||
<div className="flex items-center gap-3 text-white">
|
||||
<Loader2 className="w-8 h-8 animate-spin" />
|
||||
<span className="text-xl font-medium">Загрузка...</span>
|
||||
<span className="text-xl font-medium">{t('common.loading')}</span>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
@@ -265,30 +268,39 @@ export default function FamilyView() {
|
||||
<div className="min-h-screen gradient-bg py-8 sm:py-12 px-4">
|
||||
<div className="max-w-5xl mx-auto">
|
||||
<div className="mb-6 sm:mb-8">
|
||||
<div className="flex items-center gap-3 mb-6">
|
||||
<button
|
||||
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 mb-6 transition-all duration-300 group"
|
||||
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">Пригласить участника</span>
|
||||
<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="inline-flex p-4 bg-white/20 backdrop-blur-md rounded-2xl mb-4">
|
||||
<Wallet className="w-12 h-12 text-white" />
|
||||
</div>
|
||||
<h1 className="text-4xl sm:text-5xl font-bold text-white mb-6">
|
||||
{selectedFamily?.name || 'Семья'}
|
||||
{selectedFamily?.name || t('family.defaultName')}
|
||||
</h1>
|
||||
<div className="max-w-2xl mx-auto glass-effect rounded-2xl shadow-lg p-5">
|
||||
<div className="grid grid-cols-2 gap-4 mb-4">
|
||||
<div className="text-center">
|
||||
<p className="text-gray-600 font-medium text-sm mb-2">Общий лимит</p>
|
||||
<p className="text-gray-600 font-medium text-sm mb-2">{t('family.totalLimit')}</p>
|
||||
<p className="text-2xl sm:text-3xl font-bold text-gray-900">
|
||||
{getTotalLimit().toFixed(2)} ₽
|
||||
</p>
|
||||
</div>
|
||||
<div className="text-center border-l-2 border-gray-300">
|
||||
<p className="text-gray-600 font-medium text-sm mb-2">Общий остаток</p>
|
||||
<p className="text-gray-600 font-medium text-sm mb-2">{t('family.totalRemaining')}</p>
|
||||
<p className="text-2xl sm:text-3xl font-bold text-gray-900">
|
||||
{getTotalRemaining().toFixed(2)} ₽
|
||||
</p>
|
||||
@@ -296,10 +308,10 @@ export default function FamilyView() {
|
||||
</div>
|
||||
<button
|
||||
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" />
|
||||
Список покупок
|
||||
{t('family.shoppingList')}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -327,7 +339,7 @@ export default function FamilyView() {
|
||||
>
|
||||
<div className="flex items-center justify-between gap-3 mb-4">
|
||||
<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" />
|
||||
</div>
|
||||
<h2 className="text-xl sm:text-2xl font-bold text-gray-900">
|
||||
@@ -338,24 +350,24 @@ export default function FamilyView() {
|
||||
{showAddExpense !== category.id && (
|
||||
<button
|
||||
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" />
|
||||
<span className="hidden sm:inline">Добавить расход</span>
|
||||
<span className="sm:hidden">Расход</span>
|
||||
<span className="hidden sm:inline">{t('category.addExpense')}</span>
|
||||
<span className="sm:hidden">{t('category.expense')}</span>
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="space-y-3 mb-4">
|
||||
<div className="flex justify-between items-baseline">
|
||||
<span className="text-gray-600 font-medium text-sm">Остаток:</span>
|
||||
<span className="text-gray-600 font-medium text-sm">{t('category.remaining')}</span>
|
||||
<span className="text-2xl sm:text-3xl font-bold text-gray-900">
|
||||
{remaining.toFixed(2)} ₽
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex justify-between items-baseline text-gray-500 text-sm">
|
||||
<span>Лимит:</span>
|
||||
<span>{t('category.limit')}</span>
|
||||
<span className="text-base font-semibold">{limit.toFixed(2)} ₽</span>
|
||||
</div>
|
||||
|
||||
@@ -366,7 +378,7 @@ export default function FamilyView() {
|
||||
/>
|
||||
</div>
|
||||
<p className="text-xs text-gray-500 text-center font-medium">
|
||||
{percentage.toFixed(0)}% осталось
|
||||
{percentage.toFixed(0)}{t('category.percentRemaining')}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -376,30 +388,30 @@ export default function FamilyView() {
|
||||
className="flex-1 flex items-center justify-center gap-1.5 px-3 py-2 bg-yellow-500 hover:bg-yellow-600 text-white rounded-xl transition-all font-semibold shadow-md hover:shadow-lg text-sm"
|
||||
>
|
||||
<RotateCcw className="w-4 h-4" />
|
||||
<span>Обнулить</span>
|
||||
<span>{t('category.reset')}</span>
|
||||
</button>
|
||||
<button
|
||||
onClick={() => handleShowHistory(category.id)}
|
||||
className="flex-1 flex items-center justify-center gap-1.5 px-3 py-2 bg-blue-500 hover:bg-blue-600 text-white rounded-xl transition-all font-semibold shadow-md hover:shadow-lg text-sm"
|
||||
>
|
||||
<History className="w-4 h-4" />
|
||||
<span>История</span>
|
||||
<span>{t('category.history')}</span>
|
||||
</button>
|
||||
<button
|
||||
onClick={() => handleDeleteCategory(category.id)}
|
||||
className="flex-1 flex items-center justify-center gap-1.5 px-3 py-2 bg-red-500 hover:bg-red-600 text-white rounded-xl transition-all font-semibold shadow-md hover:shadow-lg text-sm"
|
||||
>
|
||||
<Trash2 className="w-4 h-4" />
|
||||
<span>Удалить</span>
|
||||
<span>{t('common.delete')}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{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">
|
||||
<h3 className="font-semibold text-gray-800 text-lg flex items-center gap-2">
|
||||
<History className="w-5 h-5" />
|
||||
История трат
|
||||
{t('expense.historyTitle')}
|
||||
</h3>
|
||||
<button
|
||||
onClick={() => setShowHistory(null)}
|
||||
@@ -410,13 +422,13 @@ export default function FamilyView() {
|
||||
</div>
|
||||
|
||||
{categoryExpenses.length === 0 ? (
|
||||
<p className="text-center text-gray-500 py-4">Нет трат</p>
|
||||
<p className="text-center text-gray-500 py-4">{t('expense.noExpenses')}</p>
|
||||
) : (
|
||||
<div className="space-y-2 max-h-96 overflow-y-auto">
|
||||
{categoryExpenses.map((expense) => (
|
||||
<div
|
||||
key={expense.id}
|
||||
className="bg-white p-3 rounded-xl shadow-sm border border-gray-200"
|
||||
className="expense-history-item p-3 rounded-xl shadow-sm border"
|
||||
>
|
||||
<div className="flex justify-between items-start mb-2">
|
||||
<div className="flex items-center gap-2">
|
||||
@@ -433,7 +445,7 @@ export default function FamilyView() {
|
||||
</div>
|
||||
</div>
|
||||
{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" />
|
||||
<span>{expense.description}</span>
|
||||
</div>
|
||||
@@ -446,14 +458,14 @@ export default function FamilyView() {
|
||||
)}
|
||||
|
||||
{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">
|
||||
Добавить расход
|
||||
{t('expense.addTitle')}
|
||||
</h3>
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-2">
|
||||
Сумма (₽)
|
||||
{t('expense.amount')}
|
||||
</label>
|
||||
<input
|
||||
type="number"
|
||||
@@ -465,11 +477,11 @@ export default function FamilyView() {
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-2">
|
||||
Описание
|
||||
{t('expense.description')}
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
placeholder="Опционально"
|
||||
placeholder={t('expense.descriptionPlaceholder')}
|
||||
value={expenseDescription}
|
||||
onChange={(e) => setExpenseDescription(e.target.value)}
|
||||
className="w-full px-4 py-3 border-2 border-gray-300 rounded-2xl focus:border-purple-500 focus:ring-2 focus:ring-purple-200 transition-all"
|
||||
@@ -478,10 +490,10 @@ export default function FamilyView() {
|
||||
<div className="flex gap-3">
|
||||
<button
|
||||
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" />
|
||||
Добавить
|
||||
{t('common.add')}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setShowAddExpense(null)}
|
||||
@@ -500,30 +512,30 @@ export default function FamilyView() {
|
||||
|
||||
<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="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" />
|
||||
</div>
|
||||
<h2 className="text-2xl sm:text-3xl font-bold text-gray-800">
|
||||
Управление категориями
|
||||
{t('category.management')}
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
{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">
|
||||
Новая категория
|
||||
{t('category.newCategory')}
|
||||
</h3>
|
||||
<div className="space-y-4">
|
||||
<input
|
||||
type="text"
|
||||
placeholder="Название категории"
|
||||
placeholder={t('category.categoryName')}
|
||||
value={newCategoryName}
|
||||
onChange={(e) => setNewCategoryName(e.target.value)}
|
||||
className="w-full px-5 py-4 border-2 border-gray-300 rounded-2xl focus:border-purple-500 focus:ring-2 focus:ring-purple-200 transition-all font-medium"
|
||||
/>
|
||||
<input
|
||||
type="number"
|
||||
placeholder="Лимит (₽)"
|
||||
placeholder={t('category.categoryLimit')}
|
||||
value={newCategoryLimit}
|
||||
onChange={(e) => setNewCategoryLimit(e.target.value)}
|
||||
className="w-full px-5 py-4 border-2 border-gray-300 rounded-2xl focus:border-purple-500 focus:ring-2 focus:ring-purple-200 transition-all font-medium text-center"
|
||||
@@ -531,16 +543,16 @@ export default function FamilyView() {
|
||||
<div className="flex gap-3">
|
||||
<button
|
||||
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" />
|
||||
Создать
|
||||
{t('common.create')}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setShowAddCategory(false)}
|
||||
className="px-6 py-4 bg-gray-200 hover:bg-gray-300 text-gray-700 rounded-2xl transition-all font-medium"
|
||||
>
|
||||
Отмена
|
||||
{t('common.cancel')}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -548,10 +560,10 @@ export default function FamilyView() {
|
||||
) : (
|
||||
<button
|
||||
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" />
|
||||
Добавить категорию
|
||||
{t('category.addCategory')}
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
@@ -566,13 +578,13 @@ export default function FamilyView() {
|
||||
|
||||
{showInviteModal && (
|
||||
<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 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" />
|
||||
</div>
|
||||
<h2 className="text-xl font-bold text-gray-800">Пригласить участника</h2>
|
||||
<h2 className="text-xl font-bold text-gray-800">{t('invite.title')}</h2>
|
||||
</div>
|
||||
<button
|
||||
onClick={() => setShowInviteModal(false)}
|
||||
@@ -585,23 +597,22 @@ export default function FamilyView() {
|
||||
{!inviteLink ? (
|
||||
<div className="text-center">
|
||||
<p className="text-gray-600 mb-6">
|
||||
Создайте ссылку-приглашение, чтобы добавить нового участника в семью.
|
||||
Ссылка будет действительна 7 дней.
|
||||
{t('invite.description')}
|
||||
</p>
|
||||
<button
|
||||
onClick={handleCreateInviteLink}
|
||||
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 ? (
|
||||
<>
|
||||
<Loader2 className="w-5 h-5 animate-spin" />
|
||||
Создание...
|
||||
{t('invite.creating')}
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<UserPlus className="w-5 h-5" />
|
||||
Создать ссылку
|
||||
{t('invite.createLink')}
|
||||
</>
|
||||
)}
|
||||
</button>
|
||||
@@ -609,7 +620,7 @@ export default function FamilyView() {
|
||||
) : (
|
||||
<div>
|
||||
<p className="text-gray-600 mb-4 text-center">
|
||||
Отправьте эту ссылку участнику, которого хотите пригласить:
|
||||
{t('invite.sendLink')}
|
||||
</p>
|
||||
<div className="bg-gray-100 rounded-2xl p-4 mb-4">
|
||||
<p className="text-sm text-gray-800 break-all font-mono">
|
||||
@@ -620,19 +631,19 @@ export default function FamilyView() {
|
||||
onClick={handleCopyInviteLink}
|
||||
className={`w-full flex items-center justify-center gap-2 px-6 py-4 rounded-2xl transition-all font-semibold ${
|
||||
copied
|
||||
? 'bg-green-500 text-white'
|
||||
: 'bg-gradient-to-r from-purple-600 to-blue-600 text-white hover:shadow-xl'
|
||||
? 'btn-success text-white'
|
||||
: 'btn-primary text-white hover:shadow-xl'
|
||||
}`}
|
||||
>
|
||||
{copied ? (
|
||||
<>
|
||||
<Check className="w-5 h-5" />
|
||||
Скопировано!
|
||||
{t('invite.copied')}
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<Copy className="w-5 h-5" />
|
||||
Скопировать ссылку
|
||||
{t('invite.copyLink')}
|
||||
</>
|
||||
)}
|
||||
</button>
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useParams, useNavigate } from 'react-router-dom';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { inviteLinkApi, authApi } from '../api/client';
|
||||
import { useStore } from '../store/useStore';
|
||||
import { Loader2, Users, UserPlus, AlertCircle } from 'lucide-react';
|
||||
|
||||
export default function InvitePage() {
|
||||
const { t } = useTranslation();
|
||||
const { token } = useParams<{ token: string }>();
|
||||
const navigate = useNavigate();
|
||||
const { isAuthenticated, setUser } = useStore();
|
||||
@@ -37,10 +39,10 @@ export default function InvitePage() {
|
||||
setIsValid(true);
|
||||
setFamilyName(response.data.family_name);
|
||||
} else {
|
||||
setError('Ссылка недействительна или срок её действия истёк');
|
||||
setError(t('invite.invalid'));
|
||||
}
|
||||
} catch (err) {
|
||||
setError('Ссылка не найдена');
|
||||
setError(t('invite.notFound'));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -61,9 +63,9 @@ export default function InvitePage() {
|
||||
}
|
||||
} catch (err: any) {
|
||||
if (err.response?.status === 400) {
|
||||
setError('Вы уже состоите в семье');
|
||||
setError(t('invite.alreadyInFamily'));
|
||||
} else {
|
||||
setError('Ошибка при присоединении к семье');
|
||||
setError(t('invite.joinError'));
|
||||
}
|
||||
} finally {
|
||||
setJoining(false);
|
||||
@@ -78,7 +80,7 @@ export default function InvitePage() {
|
||||
const response = await authApi.getGoogleAuthUrl(window.location.href);
|
||||
window.location.href = response.data.url;
|
||||
} catch (err) {
|
||||
setError('Ошибка при получении ссылки для авторизации');
|
||||
setError(t('login.authError'));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -87,7 +89,7 @@ export default function InvitePage() {
|
||||
<div className="min-h-screen flex items-center justify-center gradient-bg">
|
||||
<div className="flex items-center gap-3 text-white">
|
||||
<Loader2 className="w-8 h-8 animate-spin" />
|
||||
<span className="text-xl font-medium">Проверка приглашения...</span>
|
||||
<span className="text-xl font-medium">{t('invite.validating')}</span>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
@@ -98,7 +100,7 @@ export default function InvitePage() {
|
||||
<div className="min-h-screen flex items-center justify-center gradient-bg">
|
||||
<div className="flex items-center gap-3 text-white">
|
||||
<Loader2 className="w-8 h-8 animate-spin" />
|
||||
<span className="text-xl font-medium">Присоединение к семье...</span>
|
||||
<span className="text-xl font-medium">{t('invite.joining')}</span>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
@@ -107,17 +109,17 @@ export default function InvitePage() {
|
||||
if (error) {
|
||||
return (
|
||||
<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="p-4 bg-red-100 rounded-2xl inline-block mb-6">
|
||||
<AlertCircle className="w-12 h-12 text-red-500" />
|
||||
<div className="glass-effect rounded-3xl shadow-2xl p-8 max-w-md w-full text-center">
|
||||
<div className="p-4 btn-danger rounded-2xl inline-block mb-6">
|
||||
<AlertCircle className="w-12 h-12 text-white" />
|
||||
</div>
|
||||
<h1 className="text-2xl font-bold text-gray-800 mb-4">Ошибка</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>
|
||||
<button
|
||||
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')}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -126,26 +128,25 @@ export default function InvitePage() {
|
||||
|
||||
return (
|
||||
<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="p-4 bg-gradient-to-br from-purple-500 to-blue-500 rounded-2xl inline-block mb-6">
|
||||
<div className="glass-effect rounded-3xl shadow-2xl p-8 max-w-md w-full text-center">
|
||||
<div className="p-4 category-icon rounded-2xl inline-block mb-6">
|
||||
<Users className="w-12 h-12 text-white" />
|
||||
</div>
|
||||
<h1 className="text-2xl font-bold text-gray-800 mb-2">
|
||||
Приглашение в семью
|
||||
{t('invite.pageTitle')}
|
||||
</h1>
|
||||
<p className="text-3xl font-bold text-purple-600 mb-6">
|
||||
<p className="text-3xl font-bold text-gray-800 mb-6">
|
||||
{familyName}
|
||||
</p>
|
||||
<p className="text-gray-600 mb-8">
|
||||
Вас пригласили присоединиться к семейному бюджету.
|
||||
Войдите через Google, чтобы принять приглашение.
|
||||
{t('invite.pageDescription')}
|
||||
</p>
|
||||
<button
|
||||
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" />
|
||||
Войти и присоединиться
|
||||
{t('invite.loginAndJoin')}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
import { useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { authApi } from '../api/client';
|
||||
import { Loader2, Wallet } from 'lucide-react';
|
||||
import { FcGoogle } from 'react-icons/fc';
|
||||
|
||||
export default function Login() {
|
||||
const { t } = useTranslation();
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState('');
|
||||
|
||||
@@ -14,7 +17,7 @@ export default function Login() {
|
||||
const response = await authApi.getGoogleAuthUrl(currentUrl);
|
||||
window.location.href = response.data.url;
|
||||
} catch (err) {
|
||||
setError('Ошибка при получении ссылки для авторизации');
|
||||
setError(t('login.authError'));
|
||||
console.error(err);
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -25,14 +28,14 @@ export default function Login() {
|
||||
<div className="w-full max-w-md">
|
||||
<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="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" />
|
||||
</div>
|
||||
<h1 className="text-3xl sm:text-4xl font-bold text-gray-900 mb-2">
|
||||
Семейный бюджет
|
||||
{t('login.title')}
|
||||
</h1>
|
||||
<p className="text-gray-600">
|
||||
Войдите, чтобы продолжить
|
||||
{t('login.subtitle')}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -51,25 +54,8 @@ export default function Login() {
|
||||
<Loader2 className="w-6 h-6 animate-spin" />
|
||||
) : (
|
||||
<>
|
||||
<svg className="w-6 h-6" viewBox="0 0 24 24">
|
||||
<path
|
||||
fill="#4285F4"
|
||||
d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
|
||||
/>
|
||||
<path
|
||||
fill="#34A853"
|
||||
d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
|
||||
/>
|
||||
<path
|
||||
fill="#FBBC05"
|
||||
d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
|
||||
/>
|
||||
<path
|
||||
fill="#EA4335"
|
||||
d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
|
||||
/>
|
||||
</svg>
|
||||
Войти через Google
|
||||
<FcGoogle className="w-6 h-6" />
|
||||
{t('login.googleButton')}
|
||||
</>
|
||||
)}
|
||||
</button>
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useStore } from '../store/useStore';
|
||||
import { authApi, familyApi, inviteLinkApi } from '../api/client';
|
||||
import { Users, LogOut, Settings, Plus, Loader2, Eye, EyeOff } from 'lucide-react';
|
||||
|
||||
export default function NoFamily() {
|
||||
const { t } = useTranslation();
|
||||
const navigate = useNavigate();
|
||||
const { user, logout, setUser } = useStore();
|
||||
|
||||
@@ -37,9 +39,9 @@ export default function NoFamily() {
|
||||
}
|
||||
} catch (err: any) {
|
||||
if (err.response?.status === 400) {
|
||||
setError('Ссылка-приглашение недействительна или истекла');
|
||||
setError(t('noFamily.invalidInvite'));
|
||||
} else {
|
||||
setError('Ошибка при присоединении к семье');
|
||||
setError(t('noFamily.joinError'));
|
||||
}
|
||||
} finally {
|
||||
setJoiningFamily(false);
|
||||
@@ -64,7 +66,7 @@ export default function NoFamily() {
|
||||
e.preventDefault();
|
||||
|
||||
if (!familyName.trim()) {
|
||||
setError('Введите название семьи');
|
||||
setError(t('noFamily.enterFamilyName'));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -87,12 +89,12 @@ export default function NoFamily() {
|
||||
if (err && typeof err === 'object' && 'response' in err) {
|
||||
const axiosError = err as { response?: { status?: number } };
|
||||
if (axiosError.response?.status === 409) {
|
||||
setError('Вы уже состоите в семье');
|
||||
setError(t('noFamily.alreadyInFamily'));
|
||||
} else {
|
||||
setError('Ошибка при создании семьи');
|
||||
setError(t('noFamily.createError'));
|
||||
}
|
||||
} else {
|
||||
setError('Ошибка при создании семьи');
|
||||
setError(t('noFamily.createError'));
|
||||
}
|
||||
console.error(err);
|
||||
} finally {
|
||||
@@ -105,7 +107,7 @@ export default function NoFamily() {
|
||||
<div className="min-h-screen flex items-center justify-center gradient-bg">
|
||||
<div className="flex items-center gap-3 text-white">
|
||||
<Loader2 className="w-8 h-8 animate-spin" />
|
||||
<span className="text-xl font-medium">Присоединение к семье...</span>
|
||||
<span className="text-xl font-medium">{t('noFamily.joiningFamily')}</span>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
@@ -116,11 +118,11 @@ export default function NoFamily() {
|
||||
<div className="w-full max-w-md">
|
||||
<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="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" />
|
||||
</div>
|
||||
<h1 className="text-2xl sm:text-3xl font-bold text-gray-900 mb-2">
|
||||
Добро пожаловать!
|
||||
{t('noFamily.welcome')}
|
||||
</h1>
|
||||
<p className="text-gray-600">
|
||||
<span className="font-semibold text-purple-600">{user?.email || user?.username}</span>
|
||||
@@ -129,7 +131,7 @@ export default function NoFamily() {
|
||||
|
||||
<form onSubmit={handleCreateFamily} className="mb-6">
|
||||
<h2 className="text-lg font-semibold text-gray-800 mb-4 text-center">
|
||||
Создайте свою семью
|
||||
{t('noFamily.createFamily')}
|
||||
</h2>
|
||||
|
||||
{error && (
|
||||
@@ -141,14 +143,14 @@ export default function NoFamily() {
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<label htmlFor="familyName" className="block text-sm font-medium text-gray-700 mb-1">
|
||||
Название семьи *
|
||||
{t('noFamily.familyNameRequired')}
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
id="familyName"
|
||||
value={familyName}
|
||||
onChange={(e) => setFamilyName(e.target.value)}
|
||||
placeholder="Например: Семья Ивановых"
|
||||
placeholder={t('noFamily.familyNamePlaceholder')}
|
||||
className="w-full px-4 py-3 border-2 border-gray-300 rounded-xl focus:border-purple-500 focus:outline-none transition-colors"
|
||||
disabled={loading}
|
||||
/>
|
||||
@@ -156,7 +158,7 @@ export default function NoFamily() {
|
||||
|
||||
<div>
|
||||
<label htmlFor="password" className="block text-sm font-medium text-gray-700 mb-1">
|
||||
Пароль <span className="text-gray-400">(необязательно)</span>
|
||||
{t('noFamily.password')} <span className="text-gray-400">{t('noFamily.passwordOptional')}</span>
|
||||
</label>
|
||||
<div className="relative">
|
||||
<input
|
||||
@@ -164,7 +166,7 @@ export default function NoFamily() {
|
||||
id="password"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
placeholder="Для защиты доступа"
|
||||
placeholder={t('noFamily.passwordPlaceholder')}
|
||||
className="w-full px-4 py-3 pr-12 border-2 border-gray-300 rounded-xl focus:border-purple-500 focus:outline-none transition-colors"
|
||||
disabled={loading}
|
||||
/>
|
||||
@@ -177,21 +179,21 @@ export default function NoFamily() {
|
||||
</button>
|
||||
</div>
|
||||
<p className="mt-1 text-xs text-gray-500">
|
||||
Пароль понадобится для доступа к бюджету семьи
|
||||
{t('noFamily.passwordHint')}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<button
|
||||
type="submit"
|
||||
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 ? (
|
||||
<Loader2 className="w-5 h-5 animate-spin" />
|
||||
) : (
|
||||
<>
|
||||
<Plus className="w-5 h-5" />
|
||||
Создать семью
|
||||
{t('noFamily.createButton')}
|
||||
</>
|
||||
)}
|
||||
</button>
|
||||
@@ -206,7 +208,7 @@ export default function NoFamily() {
|
||||
className="w-full flex items-center justify-center gap-2 px-6 py-3 bg-gray-100 hover:bg-gray-200 text-gray-700 rounded-2xl transition-all duration-300 font-medium"
|
||||
>
|
||||
<Settings className="w-5 h-5" />
|
||||
Админ панель
|
||||
{t('noFamily.adminPanel')}
|
||||
</button>
|
||||
)}
|
||||
<button
|
||||
@@ -214,7 +216,7 @@ export default function NoFamily() {
|
||||
className="w-full flex items-center justify-center gap-2 px-6 py-3 bg-gray-100 hover:bg-gray-200 text-gray-700 rounded-2xl transition-all duration-300 font-medium"
|
||||
>
|
||||
<LogOut className="w-5 h-5" />
|
||||
Выйти
|
||||
{t('common.logout')}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
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 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 {
|
||||
user: User | null;
|
||||
@@ -8,12 +14,16 @@ interface AppState {
|
||||
selectedFamily: Family | null;
|
||||
families: Family[];
|
||||
categories: Category[];
|
||||
familyMembers: FamilyMember[];
|
||||
preferences: { theme: Theme; locale: Locale };
|
||||
|
||||
setUser: (user: User | null) => void;
|
||||
setIsLoading: (loading: boolean) => void;
|
||||
setSelectedFamily: (family: Family | null) => void;
|
||||
setFamilies: (families: Family[]) => void;
|
||||
setCategories: (categories: Category[]) => void;
|
||||
setFamilyMembers: (members: FamilyMember[]) => void;
|
||||
setPreferences: (prefs: Partial<{ theme: Theme; locale: Locale }>) => void;
|
||||
logout: () => void;
|
||||
}
|
||||
|
||||
@@ -24,6 +34,8 @@ export const useStore = create<AppState>((set) => ({
|
||||
selectedFamily: null,
|
||||
families: [],
|
||||
categories: [],
|
||||
familyMembers: [],
|
||||
preferences: getStoredPreferences(),
|
||||
|
||||
setUser: (user) => set({ user, isAuthenticated: !!user }),
|
||||
|
||||
@@ -35,11 +47,21 @@ export const useStore = create<AppState>((set) => ({
|
||||
|
||||
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({
|
||||
user: null,
|
||||
isAuthenticated: false,
|
||||
selectedFamily: null,
|
||||
families: [],
|
||||
categories: []
|
||||
categories: [],
|
||||
familyMembers: [],
|
||||
}),
|
||||
}));
|
||||
|
||||
@@ -130,3 +130,22 @@ export interface JoinFamilyResponse {
|
||||
family_id: number;
|
||||
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