revert 24f04a7e82

revert try to do better

backend/Cargo.toml

@@ -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"

backend/Dockerfile

@@ -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
 

backend/src/auth.rs

@@ -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,12 +74,20 @@ 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> {
     let salt = SaltString::generate(&mut OsRng);

backend/src/lib.rs

@@ -150,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());
@@ -174,42 +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))
+        .route("/my-family/invite-links/{token}", delete(routes::invite_link::delete_invite_link))
+        .route("/invite/{token}/join", post(routes::invite_link::join_family_via_invite))
         .layer(auth_layer.clone())
         .with_state(db.clone());
 
     let family_protected_routes = Router::new()
-        .route("/families/:family_id/categories", post(routes::category::create_category))
-        .route("/families/:family_id/categories", get(routes::category::get_categories_by_family))
-        .route("/families/:family_id/categories/:category_id", get(routes::category::get_category))
-        .route("/families/:family_id/categories/:category_id", put(routes::category::update_category))
-        .route("/families/:family_id/categories/:category_id", delete(routes::category::delete_category))
-        .route("/families/:family_id/categories/:category_id/expenses", post(routes::expense::create_expense))
-        .route("/families/:family_id/categories/:category_id/expenses", get(routes::expense::get_expenses_by_category))
-        .route("/families/:family_id/categories/:category_id/expenses/:expense_id", get(routes::expense::get_expense))
-        .route("/families/:family_id/categories/:category_id/expenses/:expense_id", put(routes::expense::update_expense))
-        .route("/families/:family_id/categories/:category_id/expenses/:expense_id", delete(routes::expense::delete_expense))
-        .route("/families/:family_id/categories/:category_id/remaining", get(routes::expense::get_remaining_limit))
-        .route("/families/:family_id/shopping-items", post(routes::shopping_item::create_shopping_item))
-        .route("/families/:family_id/shopping-items", get(routes::shopping_item::get_shopping_items_by_family))
-        .route("/families/:family_id/shopping-items/:id", get(routes::shopping_item::get_shopping_item))
-        .route("/families/:family_id/shopping-items/:id", put(routes::shopping_item::update_shopping_item))
-        .route("/families/:family_id/shopping-items/:id", delete(routes::shopping_item::delete_shopping_item))
-        .route("/families/:family_id/shopping-items/:id/purchased", axum::routing::patch(routes::shopping_item::mark_as_purchased))
-        .route("/families/:family_id/shopping-items/mark-all-purchased", post(routes::shopping_item::mark_all_as_purchased))
-        .route("/families/:family_id/shopping-items/clear-all", delete(routes::shopping_item::clear_all))
-        .route("/families/:family_id/members", get(routes::user::get_family_members))
+        .route("/families/{family_id}/categories", post(routes::category::create_category))
+        .route("/families/{family_id}/categories", get(routes::category::get_categories_by_family))
+        .route("/families/{family_id}/categories/{category_id}", get(routes::category::get_category))
+        .route("/families/{family_id}/categories/{category_id}", put(routes::category::update_category))
+        .route("/families/{family_id}/categories/{category_id}", delete(routes::category::delete_category))
+        .route("/families/{family_id}/categories/{category_id}/expenses", post(routes::expense::create_expense))
+        .route("/families/{family_id}/categories/{category_id}/expenses", get(routes::expense::get_expenses_by_category))
+        .route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", get(routes::expense::get_expense))
+        .route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", put(routes::expense::update_expense))
+        .route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", delete(routes::expense::delete_expense))
+        .route("/families/{family_id}/categories/{category_id}/remaining", get(routes::expense::get_remaining_limit))
+        .route("/families/{family_id}/shopping-items", post(routes::shopping_item::create_shopping_item))
+        .route("/families/{family_id}/shopping-items", get(routes::shopping_item::get_shopping_items_by_family))
+        .route("/families/{family_id}/shopping-items/{id}", get(routes::shopping_item::get_shopping_item))
+        .route("/families/{family_id}/shopping-items/{id}", put(routes::shopping_item::update_shopping_item))
+        .route("/families/{family_id}/shopping-items/{id}", delete(routes::shopping_item::delete_shopping_item))
+        .route("/families/{family_id}/shopping-items/{id}/purchased", axum::routing::patch(routes::shopping_item::mark_as_purchased))
+        .route("/families/{family_id}/shopping-items/mark-all-purchased", post(routes::shopping_item::mark_all_as_purchased))
+        .route("/families/{family_id}/shopping-items/clear-all", delete(routes::shopping_item::clear_all))
+        .route("/families/{family_id}/members", get(routes::user::get_family_members))
         .route_layer(axum_middleware::from_fn(middleware::require_family_access))
         .layer(auth_layer.clone())
         .with_state(db.clone());
 
     let public_routes = Router::new()
         .route("/families", get(routes::family::get_all_families))
-        .route("/families/:id", get(routes::family::get_family))
-        .route("/families/:id", put(routes::family::update_family))
-        .route("/families/:id/verify", post(routes::family::verify_family_password))
-        .route("/invite/:token", get(routes::invite_link::validate_invite_link))
+        .route("/families/{id}", get(routes::family::get_family))
+        .route("/families/{id}", put(routes::family::update_family))
+        .route("/families/{id}/verify", post(routes::family::verify_family_password))
+        .route("/invite/{token}", get(routes::invite_link::validate_invite_link))
         .layer(session_layer)
         .with_state(db);
 

backend/src/services/invite_link_service.rs

@@ -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)

backend/src/services/oauth_service.rs

@@ -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")

frontend/package-lock.json

@@ -16,6 +16,7 @@
         "react": "^19.2.0",
         "react-dom": "^19.2.0",
         "react-i18next": "^16.5.3",
+        "react-icons": "^5.5.0",
         "react-router-dom": "^7.10.1",
         "zustand": "^5.0.9"
       },
@@ -3819,6 +3820,15 @@
         }
       }
     },
+    "node_modules/react-icons": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz",
+      "integrity": "sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "*"
+      }
+    },
     "node_modules/react-refresh": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz",

frontend/package.json

@@ -18,6 +18,7 @@
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "react-i18next": "^16.5.3",
+    "react-icons": "^5.5.0",
     "react-router-dom": "^7.10.1",
     "zustand": "^5.0.9"
   },

frontend/src/components/ShoppingListModal.tsx

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

frontend/src/index.css

@@ -181,6 +181,44 @@
   color: var(--text-secondary);
 }
 
+.member-current {
+  background-color: rgb(243, 232, 255);
+  border-color: rgb(216, 180, 254);
+}
+
+[data-theme="dark"] .member-current {
+  background-color: rgba(139, 92, 246, 0.2);
+  border-color: rgba(139, 92, 246, 0.5);
+}
+
+.shopping-purchased {
+  background-color: rgb(240, 253, 244);
+  border-color: rgb(187, 247, 208);
+}
+
+[data-theme="dark"] .shopping-purchased {
+  background-color: rgba(34, 197, 94, 0.15);
+  border-color: rgba(34, 197, 94, 0.4);
+}
+
+.expense-history-item {
+  background-color: rgb(255, 255, 255);
+  border-color: rgb(229, 231, 235);
+}
+
+[data-theme="dark"] .expense-history-item {
+  background-color: rgba(55, 55, 55, 0.6);
+  border-color: rgba(75, 75, 75, 0.8);
+}
+
+.expense-description {
+  background-color: rgb(249, 250, 251);
+}
+
+[data-theme="dark"] .expense-description {
+  background-color: rgba(40, 40, 40, 0.8);
+}
+
 .animate-fadeIn {
   animation: fadeIn 0.2s ease-in-out;
 }

frontend/src/pages/FamilyView.tsx

@@ -428,7 +428,7 @@ export default function FamilyView() {
                         {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">
@@ -445,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>

frontend/src/pages/Login.tsx

@@ -2,6 +2,7 @@ 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();
@@ -53,24 +54,7 @@ export default function Login() {
               <Loader2 className="w-6 h-6 animate-spin" />
             ) : (
               <>
-                <svg className="w-6 h-6" viewBox="0 0 24 24">
-                  <path
-                    fill="#4285F4"
-                    d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
-                  />
-                  <path
-                    fill="#34A853"
-                    d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
-                  />
-                  <path
-                    fill="#FBBC05"
-                    d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
-                  />
-                  <path
-                    fill="#EA4335"
-                    d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
-                  />
-                </svg>
+                <FcGoogle className="w-6 h-6" />
                 {t('login.googleButton')}
               </>
             )}

frontend/src/pages/Profile.tsx

@@ -238,7 +238,7 @@ export default function Profile() {
                     {familyMembers.map((member) => (
                       <div
                         key={member.id}
-                        className={`flex items-center justify-between p-3 rounded-xl ${member.id === user?.id ? 'bg-purple-50 border border-purple-200' : 'bg-gray-50'}`}
+                        className={`flex items-center justify-between p-3 rounded-xl ${member.id === user?.id ? 'member-current border' : 'bg-gray-50'}`}
                       >
                         <div className="flex items-center gap-2">
                           <div className="w-8 h-8 category-icon rounded-full flex items-center justify-center text-white text-sm font-medium">