@@ -122,13 +159,12 @@ function Calendar() {
return (
{day}
@@ -160,6 +196,33 @@ export function PageHeader({ title, subtitle, badge, eyebrow = "Раздел" }:
}
export function AppShell({ children }: AppShellProps) {
+ const { user, loading } = useUser();
+ const router = useRouter();
+
+ useEffect(() => {
+ // Если загрузка завершена и пользователь не авторизован - редирект на логин
+ if (!loading && !user) {
+ router.push('/login');
+ }
+ }, [user, loading, router]);
+
+ // Показываем загрузку, пока проверяем авторизацию
+ if (loading) {
+ return (
+
+ );
+ }
+
+ // Если пользователь не авторизован, ничего не показываем (уже редиректим)
+ if (!user) {
+ return null;
+ }
+
return (
diff --git a/frontend/src/components/Providers.tsx b/frontend/src/components/Providers.tsx
new file mode 100644
index 00000000..111347b8
--- /dev/null
+++ b/frontend/src/components/Providers.tsx
@@ -0,0 +1,8 @@
+"use client";
+
+import { UserProvider } from "@/contexts/UserContext";
+import { ReactNode } from "react";
+
+export function Providers({ children }: { children: ReactNode }) {
+ return {children};
+}
diff --git a/frontend/src/contexts/UserContext.tsx b/frontend/src/contexts/UserContext.tsx
new file mode 100644
index 00000000..8dc0268b
--- /dev/null
+++ b/frontend/src/contexts/UserContext.tsx
@@ -0,0 +1,86 @@
+"use client";
+
+import { createContext, useContext, useEffect, useState, ReactNode } from "react";
+import { apiClient } from "@/lib/api";
+import type { User } from "@/types/api";
+
+interface UserContextType {
+ user: User | null;
+ loading: boolean;
+ error: string | null;
+ refreshUser: () => Promise;
+ logout: () => void;
+}
+
+const UserContext = createContext(undefined);
+
+export function UserProvider({ children }: { children: ReactNode }) {
+ const [user, setUser] = useState(null);
+ const [loading, setLoading] = useState(true);
+ const [error, setError] = useState(null);
+
+ const loadUser = async () => {
+ try {
+ setLoading(true);
+ setError(null);
+
+ // Проверяем наличие токена
+ const token = typeof window !== 'undefined' ? localStorage.getItem('access_token') : null;
+ if (!token) {
+ setUser(null);
+ setLoading(false);
+ return;
+ }
+
+ // Загружаем данные пользователя
+ const userData = await apiClient.getCurrentUser();
+ setUser(userData);
+ } catch (err: any) {
+ console.error('Ошибка загрузки пользователя:', err);
+ setError(err.message);
+ setUser(null);
+
+ // Если ошибка 401 - токен невалиден, очищаем
+ if (err.message?.includes('401')) {
+ apiClient.clearToken();
+ }
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ const refreshUser = async () => {
+ await loadUser();
+ };
+
+ const logout = () => {
+ apiClient.clearToken();
+ setUser(null);
+ if (typeof window !== 'undefined') {
+ window.location.href = '/login';
+ }
+ };
+
+ // Загружаем пользователя при монтировании
+ useEffect(() => {
+ loadUser();
+ }, []);
+
+ const value: UserContextType = {
+ user,
+ loading,
+ error,
+ refreshUser,
+ logout,
+ };
+
+ return {children};
+}
+
+export function useUser() {
+ const context = useContext(UserContext);
+ if (context === undefined) {
+ throw new Error('useUser must be used within a UserProvider');
+ }
+ return context;
+}
diff --git a/frontend/src/types/api.ts b/frontend/src/types/api.ts
index aa11503a..91df4095 100644
--- a/frontend/src/types/api.ts
+++ b/frontend/src/types/api.ts
@@ -1,16 +1,52 @@
// Common types
+export interface Skill {
+ id: number;
+ name: string;
+ description?: string;
+}
+
+export interface EmployeeAction {
+ id: number;
+ employee: number;
+ action_type: string;
+ description?: string;
+ date: string;
+ created_at: string;
+}
+
+export interface EmployeeDepartment {
+ id: number;
+ name: string;
+ role_id?: number;
+ role_name?: string;
+ is_head: boolean;
+ via_assignment?: boolean;
+}
+
export interface User {
id: number;
email: string;
phone_number?: string;
first_name: string;
last_name: string;
- middle_name?: string;
+ patronymic?: string; // отчество (было middle_name)
position?: Position;
- department?: Department;
+ departments?: EmployeeDepartment[]; // массив отделов с ролями (было department)
avatar?: string;
is_active: boolean;
telegram?: string;
+ whatsapp?: string;
+ wechat?: string;
+ gender?: string;
+ birth_date?: string;
+ skills?: Skill[];
+ actions?: EmployeeAction[];
+ email_verified?: boolean;
+ created_at?: string;
+ updated_at?: string;
+ last_login?: string;
+ date_joined?: string;
+ auth?: Record; // глобальные права пользователя
}
export interface Department {
@@ -63,7 +99,7 @@ export interface Document {
tags?: string[];
}
-// Requests types
+// Requests types
export interface Request {
id: number;
title: string;
@@ -157,7 +193,7 @@ export interface RegisterData {
password: string;
first_name: string;
last_name: string;
- middle_name?: string;
+ patronymic?: string; // было middle_name
telegram?: string;
whatsapp?: string;
wechat?: string;
+