+
+ );
+};
+
+export default ProfilePage;
diff --git a/services/frontend/src/pages/Profile/widgets/user-achievements.tsx b/services/frontend/src/pages/Profile/widgets/user-achievements.tsx
new file mode 100644
index 0000000..decd815
--- /dev/null
+++ b/services/frontend/src/pages/Profile/widgets/user-achievements.tsx
@@ -0,0 +1,69 @@
+import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
+import { Achievement } from "@/shared/types/user";
+import dayjs from "dayjs";
+
+export const UserAchievements = ({
+ achievements,
+}: {
+ achievements?: Achievement[];
+}) => {
+ return (
+
+
+ Достижения
+ {achievements && ( +
+ {achievements.map((a) => (
+
+
+ ))}
+
+ )}
+
+
+ );
+};
+
+const AchievementDialog = ({
+ achievement,
+ children,
+}: {
+ achievement: Achievement;
+ children: React.ReactNode;
+}) => {
+ return (
+
+ );
+};
diff --git a/services/frontend/src/pages/Profile/widgets/user-info.tsx b/services/frontend/src/pages/Profile/widgets/user-info.tsx
new file mode 100644
index 0000000..3b3b927
--- /dev/null
+++ b/services/frontend/src/pages/Profile/widgets/user-info.tsx
@@ -0,0 +1,21 @@
+import { User } from "@/shared/types/user";
+
+export const UserInfo = ({ user }: { user: User }) => {
+ return (
+
+ 
+
+
+
+ {achievement.name}
++ {dayjs(achievement.received_at).format("D MMM YYYY")} +
+
+ 
+
+ )}
+
+
+ {user.username}
+{user.email}
+
+
+ );
+};
diff --git a/services/frontend/src/pages/UserProfile/index.tsx b/services/frontend/src/pages/UserProfile/index.tsx
deleted file mode 100644
index ec9d1d1..0000000
--- a/services/frontend/src/pages/UserProfile/index.tsx
+++ /dev/null
@@ -1,398 +0,0 @@
-import React from "react";
-import { User } from "lucide-react";
-import { useUserStore } from "@/shared/stores/user";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-
-const UserProfile = () => {
- const user = useUserStore((state) => state.user);
-
- return (
- Аналитика
+
-
-
-
- Информация
-
-
- Статистика
-
-
- Достижения
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
-};
-
-const UserInfo = () => {
- const user = useUserStore((state) => state.user);
-
- return (
-
-
-
-
- {user?.avatar ? (
-
- ) : (
-
-
-
- {user?.username}
-- {user?.role || "Участник"} • На платформе с{" "} - {new Date(user?.createdAt || Date.now()).toLocaleDateString("ru-RU", { - year: "numeric", - month: "long", - })} -
-
-
-
-
-
-
- - Полное имя -
-- {user?.fullName || "Не указано"} -
-
-
-
- - Email -
-{user?.email || "Не указано"}
-
-
-
- - Учебное заведение -
-- {user?.university || "Не указано"} -
-
-
- - Специализация -
-- {user?.specialization || "Не указано"} -
-
-
- - О себе -
-- {user?.bio || "Пользователь пока не добавил информацию о себе."} -
-
-
- );
-};
-
-
-const StatCard = ({ title, value }: { title: string; value: number | string }) => (
-
-
-
-
-
-
- Лучший результат
-
-
-
-
-
-
-
- Решение задач
-
-
-
-
-
-
-
- - {statistics.bestResult.competition} -
-
- Место
-
- {statistics.bestResult.place}
-
-
-
- Баллы
-
- {statistics.bestResult.score}
-
-
-
-
-
-
- Всего задач
-
- {statistics.totalTasks}
-
-
-
- Решено задач
-
- {statistics.solvedTasks}
-
-
-
-
- - Статусы решений -
-
-
-
-
-
-
-
-
-
-
-
-
-
- Верно ({statistics.tasksByStatus.correct})
-
-
-
-
-
- Частично ({statistics.tasksByStatus.partial})
-
-
-
-
-
- Неверно ({statistics.tasksByStatus.wrong})
-
-
- {title}
-{value}
-
-
- );
-};
-
-export default UserProfile;
\ No newline at end of file
diff --git a/services/frontend/src/pages/UserProfile/modules/UserAchievements/index.tsx b/services/frontend/src/pages/UserProfile/modules/UserAchievements/index.tsx
deleted file mode 100644
index a713aa0..0000000
--- a/services/frontend/src/pages/UserProfile/modules/UserAchievements/index.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-const UserAchievements = () => {
- return (
- - Разблокировано {achievements.filter(a => a.unlocked).length} из {achievements.length} -
- -
- {achievements.map((achievement) => (
-
-
-
- ))}
-
- {achievement.imageUrl ? (
-
-
-
-
- ) : (
-
-
- {achievement.name.substring(0, 1)}
-
-
- )}
- - {achievement.name} -
-- {achievement.description} -
-
-
- );
-};
-
-export default UserAchievements
\ No newline at end of file
diff --git a/services/frontend/src/pages/UserProfile/modules/UserStatistics/index.tsx b/services/frontend/src/pages/UserProfile/modules/UserStatistics/index.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/services/frontend/src/shared/types/user.ts b/services/frontend/src/shared/types/user.ts
index 20c51e2..650c8d8 100644
--- a/services/frontend/src/shared/types/user.ts
+++ b/services/frontend/src/shared/types/user.ts
@@ -2,4 +2,13 @@ export interface User {
id: string;
email: string;
username: string;
+ avatar?: string;
+ achievements?: Achievement[];
+}
+
+export interface Achievement {
+ name: string;
+ description: string;
+ received_at: Date;
+ icon?: string;
}
- Разблокировано {achievements.filter(a => a.unlocked).length} из {achievements.length} -
- -
- {achievements.map((achievement) => (
-
-
-
- ))}
-
- {achievement.imageUrl ? (
-
-
-
-
- ) : (
-
-
- {achievement.name.substring(0, 1)}
-
-
- )}
- - {achievement.name} -
-- {achievement.description} -
-