пароль на семьи

2025-12-15 16:51:09 +03:00
parent 1e393c79b5
commit 27d8d8ff4c
12 changed files with 330 additions and 28 deletions
--- a/frontend/src/api/client.ts
+++ b/frontend/src/api/client.ts
@@ -9,6 +9,8 @@ import type {
  CreateFamilyRequest,
  CreateCategoryRequest,
  CreateExpenseRequest,
+  VerifyFamilyPasswordRequest,
+  VerifyFamilyPasswordResponse,
 } from '../types';

 const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || 'http://localhost:3000';
@@ -41,6 +43,9 @@ export const familyApi = {

  delete: (id: number) =>
    apiClient.delete(`/families/${id}`),
+
+  verifyPassword: (id: number, data: VerifyFamilyPasswordRequest) =>
+    apiClient.post<VerifyFamilyPasswordResponse>(`/families/${id}/verify`, data),
 };

 export const categoryApi = {
--- a/frontend/src/pages/AdminPanel.tsx
+++ b/frontend/src/pages/AdminPanel.tsx
@@ -13,6 +13,7 @@ export default function AdminPanel() {
  const [loginError, setLoginError] = useState('');

  const [newFamilyName, setNewFamilyName] = useState('');
+  const [newFamilyPassword, setNewFamilyPassword] = useState('');
  const [families, setFamilies] = useState<Array<{ id: number; name: string }>>([]);

  useEffect(() => {
@@ -64,11 +65,15 @@ export default function AdminPanel() {
  };

  const handleCreateFamily = async () => {
-    if (!newFamilyName.trim()) return;
+    if (!newFamilyName.trim() || !newFamilyPassword.trim()) {
+      alert('Заполните название и пароль семьи');
+      return;
+    }

    try {
-      await familyApi.create({ name: newFamilyName });
+      await familyApi.create({ name: newFamilyName, password: newFamilyPassword });
      setNewFamilyName('');
+      setNewFamilyPassword('');
      loadFamilies();
    } catch (err) {
      alert('Ошибка создания семьи');
@@ -168,17 +173,24 @@ export default function AdminPanel() {
            Создать новую семью
          </h2>

-          <div className="flex gap-2">
+          <div className="space-y-3">
            <input
              type="text"
              placeholder="Название семьи"
              value={newFamilyName}
              onChange={(e) => setNewFamilyName(e.target.value)}
-              className="flex-1 px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+              className="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+            />
+            <input
+              type="password"
+              placeholder="Пароль семьи"
+              value={newFamilyPassword}
+              onChange={(e) => setNewFamilyPassword(e.target.value)}
+              className="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent"
            />
            <button
              onClick={handleCreateFamily}
-              className="px-6 py-2 bg-green-600 text-white rounded-lg hover:bg-green-700 transition"
+              className="w-full px-6 py-2 bg-green-600 text-white rounded-lg hover:bg-green-700 transition"
            >
              Создать
            </button>
--- a/frontend/src/pages/FamilyView.tsx
+++ b/frontend/src/pages/FamilyView.tsx
@@ -97,18 +97,25 @@ export default function FamilyView() {

  const handleResetLimit = async (categoryId: number) => {
    if (!familyId) return;
-    const newLimit = prompt('Введите новый лимит:');
-    if (!newLimit) return;
+    if (!confirm('Удалить все траты по этой категории?')) return;

    try {
-      await categoryApi.resetLimit(
+      const expensesResponse = await expenseApi.getAllByCategory(
        parseInt(familyId),
-        categoryId,
-        parseFloat(newLimit)
+        categoryId
      );
+
+      for (const expense of expensesResponse.data) {
+        await expenseApi.delete(
+          parseInt(familyId),
+          categoryId,
+          expense.id
+        );
+      }
+
      loadCategories();
    } catch (err) {
-      alert('Ошибка сброса лимита');
+      alert('Ошибка сброса трат');
      console.error(err);
    }
  };
@@ -280,7 +287,7 @@ export default function FamilyView() {
                    onClick={() => handleResetLimit(category.id)}
                    className="px-4 py-1 bg-yellow-500 text-white rounded hover:bg-yellow-600"
                  >
-                    Сбросить лимит
+                    Обнулить траты
                  </button>
                  <button
                    onClick={() => handleDeleteCategory(category.id)}
--- a/frontend/src/pages/Home.tsx
+++ b/frontend/src/pages/Home.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { familyApi } from '../api/client';
+import { familyApi, categoryApi } from '../api/client';
 import { useStore } from '../store/useStore';
 import type { Family } from '../types';

@@ -10,6 +10,11 @@ export default function Home() {
  const [loading, setLoading] = useState(true);
  const [error, setError] = useState('');

+  const [showPasswordDialog, setShowPasswordDialog] = useState(false);
+  const [selectedFamilyForAuth, setSelectedFamilyForAuth] = useState<Family | null>(null);
+  const [familyPassword, setFamilyPassword] = useState('');
+  const [passwordError, setPasswordError] = useState('');
+
  useEffect(() => {
    loadFamilies();
  }, []);
@@ -27,9 +32,54 @@ export default function Home() {
    }
  };

-  const handleSelectFamily = (family: Family) => {
-    setSelectedFamily(family);
-    navigate(`/family/${family.id}`);
+  const handleSelectFamily = async (family: Family) => {
+    try {
+      await categoryApi.getAllByFamily(family.id);
+      setSelectedFamily(family);
+      navigate(`/family/${family.id}`);
+    } catch (err: any) {
+      if (err.response?.status === 403) {
+        setSelectedFamilyForAuth(family);
+        setShowPasswordDialog(true);
+        setPasswordError('');
+        setFamilyPassword('');
+      } else {
+        setError('Ошибка доступа к семье');
+      }
+    }
+  };
+
+  const handleVerifyPassword = async () => {
+    if (!selectedFamilyForAuth || !familyPassword.trim()) {
+      setPasswordError('Введите пароль');
+      return;
+    }
+
+    try {
+      const response = await familyApi.verifyPassword(selectedFamilyForAuth.id, {
+        password: familyPassword,
+      });
+
+      if (response.data.valid) {
+        setSelectedFamily(selectedFamilyForAuth);
+        setShowPasswordDialog(false);
+        navigate(`/family/${selectedFamilyForAuth.id}`);
+      }
+    } catch (err: any) {
+      if (err.response?.status === 401) {
+        setPasswordError('Неверный пароль');
+      } else {
+        setPasswordError('Ошибка проверки пароля');
+      }
+      console.error(err);
+    }
+  };
+
+  const handleCancelPasswordDialog = () => {
+    setShowPasswordDialog(false);
+    setSelectedFamilyForAuth(null);
+    setFamilyPassword('');
+    setPasswordError('');
  };

  const handleGoToAdmin = () => {
@@ -90,6 +140,50 @@ export default function Home() {
            </div>
          )}
        </div>
+
+        {showPasswordDialog && selectedFamilyForAuth && (
+          <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center p-4 z-50">
+            <div className="bg-white rounded-lg shadow-xl p-8 max-w-md w-full">
+              <h2 className="text-2xl font-bold text-gray-900 mb-4">
+                Введите пароль для семьи
+              </h2>
+              <p className="text-gray-600 mb-6">
+                {selectedFamilyForAuth.name}
+              </p>
+
+              {passwordError && (
+                <div className="mb-4 p-3 bg-red-100 border border-red-400 text-red-700 rounded">
+                  {passwordError}
+                </div>
+              )}
+
+              <input
+                type="password"
+                placeholder="Пароль"
+                value={familyPassword}
+                onChange={(e) => setFamilyPassword(e.target.value)}
+                onKeyDown={(e) => e.key === 'Enter' && handleVerifyPassword()}
+                className="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent mb-4"
+                autoFocus
+              />
+
+              <div className="flex gap-2">
+                <button
+                  onClick={handleVerifyPassword}
+                  className="flex-1 px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition"
+                >
+                  Войти
+                </button>
+                <button
+                  onClick={handleCancelPasswordDialog}
+                  className="flex-1 px-4 py-2 bg-gray-300 text-gray-700 rounded-lg hover:bg-gray-400 transition"
+                >
+                  Отмена
+                </button>
+              </div>
+            </div>
+          </div>
+        )}
      </div>
    </div>
  );
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -36,6 +36,15 @@ export interface LoginResponse {

 export interface CreateFamilyRequest {
  name: string;
+  password: string;
+}
+
+export interface VerifyFamilyPasswordRequest {
+  password: string;
+}
+
+export interface VerifyFamilyPasswordResponse {
+  valid: boolean;
 }

 export interface CreateCategoryRequest {