+
v.role != 'Organizer')
+ .filter((v) => v.scheduleType != 'AlwaysOpen')}
+ />
+
+
+
);
diff --git a/src/views/home/account/contests/ContestsBlock.tsx b/src/views/home/account/contests/ContestsBlock.tsx
index f732ffe..1862461 100644
--- a/src/views/home/account/contests/ContestsBlock.tsx
+++ b/src/views/home/account/contests/ContestsBlock.tsx
@@ -1,22 +1,23 @@
import { useState, FC } from 'react';
import { cn } from '../../../../lib/cn';
import { ChevroneDown } from '../../../../assets/icons/groups';
-import MyContestItem from './MyContestItem';
-import RegisterContestItem from './RegisterContestItem';
-import { Contest } from '../../../../redux/slices/contests';
+import { ContestItem } from '../../../../redux/slices/profile';
+import PastContestItem from './PastContestItem';
+import UpcoingContestItem from './UpcomingContestItem';
+import EditContestItem from './EditContestItem';
interface ContestsBlockProps {
- contests: Contest[];
+ contests?: ContestItem[];
title: string;
className?: string;
- type?: 'my' | 'reg';
+ type?: 'edit' | 'upcoming' | 'past';
}
const ContestsBlock: FC
diff --git a/src/views/home/account/RightPanel.tsx b/src/views/home/account/RightPanel.tsx
index b1b63d8..819e202 100644
--- a/src/views/home/account/RightPanel.tsx
+++ b/src/views/home/account/RightPanel.tsx
@@ -1,9 +1,9 @@
-import { PrimaryButton } from '../../../components/button/PrimaryButton';
import { ReverseButton } from '../../../components/button/ReverseButton';
import { useAppDispatch, useAppSelector } from '../../../redux/hooks';
import { logout } from '../../../redux/slices/auth';
import { OpenBook, Clipboard, Cup } from '../../../assets/icons/account';
import { FC } from 'react';
+import { useQuery } from '../../../hooks/useQuery';
interface StatisticItemProps {
icon: string;
@@ -34,32 +34,55 @@ const StatisticItem: FC = ({
);
};
+export const formatDate = (isoDate?: string): string => {
+ if (!isoDate) return '';
+ const date = new Date(isoDate);
+ const day = String(date.getDate()).padStart(2, '0');
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const year = date.getFullYear();
+
+ return `${day}.${month}.${year}`;
+};
+
const RightPanel = () => {
const dispatch = useAppDispatch();
- const name = useAppSelector((state) => state.auth.username);
- const email = useAppSelector((state) => state.auth.email);
+
+ const { data: profileData } = useAppSelector(
+ (state) => state.profile.profile,
+ );
+
+ const myname = useAppSelector((state) => state.auth.username);
+
+ const query = useQuery();
+ const username = query.get('username') ?? myname ?? '';
+
return (
- {}}
- text="Редактировать"
- className="w-full"
- />
+ {}}
+ text="Редактировать"
+ className="w-full"
+ />
+ )} */}
@@ -70,14 +93,14 @@ const RightPanel = () => {
= ({ id, name, tags }) => {
+export const formatDate = (isoDate?: string): string => {
+ if (!isoDate) return '';
+ const date = new Date(isoDate);
+ const day = String(date.getDate()).padStart(2, '0');
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const year = date.getFullYear();
+
+ return `${day}.${month}.${year}`;
+};
+
+const ArticleItem: FC = ({ id, name, createdAt }) => {
const navigate = useNavigate();
return (
@@ -35,18 +44,8 @@ const ArticleItem: FC = ({ id, name, tags }) => {
-
- {name}
+ {profileData?.identity.username}
- {email}
-
-
- Топ 50%
+ {profileData?.identity.email}
+ {`Зарегистрирован ${formatDate(
+ profileData?.identity.createdAt,
+ )}`}
+
+
+ {/* {username == myname && (
+
@@ -87,30 +110,32 @@ const RightPanel = () => {
{
- dispatch(logout());
- }}
- text="Выход"
- color="error"
- />
+ {username == myname && (
+ {
+ dispatch(logout());
+ }}
+ text="Выход"
+ color="error"
+ />
+ )}
);
};
diff --git a/src/views/home/account/articles/ArticlesBlock.tsx b/src/views/home/account/articles/ArticlesBlock.tsx
index eb91f9b..6325347 100644
--- a/src/views/home/account/articles/ArticlesBlock.tsx
+++ b/src/views/home/account/articles/ArticlesBlock.tsx
@@ -3,16 +3,25 @@ import { useAppDispatch, useAppSelector } from '../../../../redux/hooks';
import { setMenuActiveProfilePage } from '../../../../redux/slices/store';
import { cn } from '../../../../lib/cn';
import { ChevroneDown, Edit } from '../../../../assets/icons/groups';
-import { fetchMyArticles } from '../../../../redux/slices/articles';
import { useNavigate } from 'react-router-dom';
export interface ArticleItemProps {
id: number;
name: string;
- tags: string[];
+ createdAt: string;
}
-const ArticleItem: FC
- {tags.map((v, i) => (
- ![]()
= ({ className = '' }) => {
const dispatch = useAppDispatch();
const [active, setActive] = useState(true);
- // ✅ Берём только "мои статьи"
- const articles = useAppSelector(
- (state) => state.articles.fetchMyArticles.articles,
- );
- const status = useAppSelector(
- (state) => state.articles.fetchMyArticles.status,
- );
- const error = useAppSelector(
- (state) => state.articles.fetchMyArticles.error,
+ const { data: articleData } = useAppSelector(
+ (state) => state.profile.articles,
);
useEffect(() => {
dispatch(setMenuActiveProfilePage('articles'));
- dispatch(fetchMyArticles());
}, [dispatch]);
return (
@@ -130,19 +121,21 @@ const ArticlesBlock: FC = ({ className = '' }) => {
)}
{status === 'failed' && (
-
- {v}
-
- ))}
+
+ {`Опубликована ${formatDate(createdAt)}`}
- Ошибка:{' '}
- {error || 'Не удалось загрузить статьи'}
-
+ Ошибка:
)}
{status === 'successful' &&
- articles.length === 0 && (
+ articleData?.articles.items.length === 0 && (
У вас пока нет статей
)}
- {articles.map((v) => (
-
+ v.role != 'Organizer',
+ ) ?? []),
+ ...(constestData?.upcoming.items
+ .filter((v) => v.role != 'Organizer')
+ .filter((v) => v.scheduleType == 'AlwaysOpen') ??
+ []),
+ ]}
/>
{/* Контесты, которые я создал */}
- {myContestsState.status === 'loading' ? (
-
- Загрузка ваших контестов...
-
- ) : myContestsState.error ? (
-
- Ошибка: {myContestsState.error}
-
- ) : (
-
- {contests.map((v, i) => {
- return type == 'my' ? (
-
{
+ if (!started && username != myname) {
+ toastWarning('Контест еще не начался');
+ return;
+ }
+
+ const params = new URLSearchParams({
+ back: '/home/account/contests',
+ });
+ navigate(`/contest/${contestId}?${params}`);
+ }}
+ >
+ 
{
+ e.stopPropagation();
+ navigate(
+ `/contest/create?back=/home/account/contests&contestId=${contestId}`,
+ );
+ }}
+ />
+ )}
+
+ );
+};
+
+export default EditContestItem;
diff --git a/src/views/home/account/contests/MyContestItem.tsx b/src/views/home/account/contests/MyContestItem.tsx
deleted file mode 100644
index eef1bf4..0000000
--- a/src/views/home/account/contests/MyContestItem.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { cn } from '../../../../lib/cn';
-import { Account } from '../../../../assets/icons/auth';
-import { useNavigate } from 'react-router-dom';
-import { Edit } from '../../../../assets/icons/input';
-
-export interface ContestItemProps {
- id: number;
- name: string;
- startAt: string;
- duration: number;
- members: number;
- type: 'first' | 'second';
-}
-
-function formatDate(dateString: string): string {
- const date = new Date(dateString);
-
- const day = date.getDate().toString().padStart(2, '0');
- const month = (date.getMonth() + 1).toString().padStart(2, '0');
- const year = date.getFullYear();
-
- const hours = date.getHours().toString().padStart(2, '0');
- const minutes = date.getMinutes().toString().padStart(2, '0');
-
- return `${day}/${month}/${year}\n${hours}:${minutes}`;
-}
-
-function formatWaitTime(ms: number): string {
- const minutes = Math.floor(ms / 60000);
- const hours = Math.floor(minutes / 60);
- const days = Math.floor(hours / 24);
-
- if (days > 0) {
- const remainder = days % 10;
- let suffix = 'дней';
- if (remainder === 1 && days !== 11) suffix = 'день';
- else if (remainder >= 2 && remainder <= 4 && (days < 10 || days > 20))
- suffix = 'дня';
- return `${days} ${suffix}`;
- } else if (hours > 0) {
- const mins = minutes % 60;
- return mins > 0 ? `${hours} ч ${mins} мин` : `${hours} ч`;
- } else {
- return `${minutes} мин`;
- }
-}
-
-const ContestItem: React.FC{name}
+
+ {username}
+
+ {scheduleType == 'AlwaysOpen' ? (
+
+ Всегда открыт
+
+ ) : (
+
+
+ )}
+
+
+ {formatDate(startsAt)}
+
+ -
+
+ {formatDate(endsAt)}
+
+
+ {formatDurationTime(attemptDurationMinutes)}
+
+
+
+ {new Date() < new Date(startsAt) ? (
+ <>{'Не начался'}
+ ) : (
+ <>
+ {scheduleType == 'AlwaysOpen'
+ ? 'Открыт'
+ : new Date() < new Date(endsAt)
+ ? 'Идет'
+ : 'Завершен'}
+
+ )}
+
+ {username == myname && (
+ {
- navigate(`/contest/${id}`);
- }}
- >
- {
- e.stopPropagation();
- navigate(
- `/contest/create?back=/home/account/contests&contestId=${id}`,
- );
- }}
- />
-
- );
-};
-
-export default ContestItem;
diff --git a/src/views/home/account/contests/PastContestItem.tsx b/src/views/home/account/contests/PastContestItem.tsx
new file mode 100644
index 0000000..a05d5dc
--- /dev/null
+++ b/src/views/home/account/contests/PastContestItem.tsx
@@ -0,0 +1,112 @@
+import { cn } from '../../../../lib/cn';
+import { useNavigate } from 'react-router-dom';
+import { useAppSelector } from '../../../../redux/hooks';
+import { useQuery } from '../../../../hooks/useQuery';
+
+export interface PastContestItemProps {
+ name: string;
+ contestId: number;
+ scheduleType: 'AlwaysOpen' | 'FixedWindow' | 'RollingWindow';
+ visibility: string;
+ startsAt: string;
+ endsAt: string;
+ attemptDurationMinutes: number;
+ role: string;
+ type: 'first' | 'second';
+}
+
+function formatDate(dateString: string): string {
+ const date = new Date(dateString);
+
+ const day = date.getDate().toString().padStart(2, '0');
+ const month = (date.getMonth() + 1).toString().padStart(2, '0');
+ const year = date.getFullYear();
+
+ const hours = date.getHours().toString().padStart(2, '0');
+ const minutes = date.getMinutes().toString().padStart(2, '0');
+
+ return `${day}/${month}/${year}\n${hours}:${minutes}`;
+}
+
+function formatDurationTime(minutes: number): string {
+ const hours = Math.floor(minutes / 60);
+ const days = Math.floor(hours / 24);
+
+ if (days > 0) {
+ const remainder = days % 10;
+ let suffix = 'дней';
+ if (remainder === 1 && days !== 11) suffix = 'день';
+ else if (remainder >= 2 && remainder <= 4 && (days < 10 || days > 20))
+ suffix = 'дня';
+ return `${days} ${suffix}`;
+ } else if (hours > 0) {
+ const mins = minutes % 60;
+ return mins > 0 ? `${hours} ч ${mins} мин` : `${hours} ч`;
+ } else {
+ return `${minutes} мин`;
+ }
+}
+
+const PastContestItem: React.FC{name}
-
- {/* {authors.map((v, i) =>
- {v}
)} */} - valavshonok -
- {formatDate(startAt)}
-
- {formatWaitTime(duration)}
-
- 
-
-
- {members}
- {
+ const params = new URLSearchParams({
+ back: '/home/account/contests',
+ });
+ navigate(`/contest/${contestId}?${params}`);
+ }}
+ >
+
+ );
+};
+
+export default PastContestItem;
diff --git a/src/views/home/account/contests/RegisterContestItem.tsx b/src/views/home/account/contests/RegisterContestItem.tsx
deleted file mode 100644
index f8cbf6c..0000000
--- a/src/views/home/account/contests/RegisterContestItem.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { cn } from '../../../../lib/cn';
-import { Account } from '../../../../assets/icons/auth';
-import { PrimaryButton } from '../../../../components/button/PrimaryButton';
-import { ReverseButton } from '../../../../components/button/ReverseButton';
-import { useNavigate } from 'react-router-dom';
-
-export interface ContestItemProps {
- id: number;
- name: string;
- startAt: string;
- duration: number;
- members: number;
- statusRegister: 'reg' | 'nonreg';
- type: 'first' | 'second';
-}
-
-function formatDate(dateString: string): string {
- const date = new Date(dateString);
-
- const day = date.getDate().toString().padStart(2, '0');
- const month = (date.getMonth() + 1).toString().padStart(2, '0');
- const year = date.getFullYear();
-
- const hours = date.getHours().toString().padStart(2, '0');
- const minutes = date.getMinutes().toString().padStart(2, '0');
-
- return `${day}/${month}/${year}\n${hours}:${minutes}`;
-}
-
-function formatWaitTime(ms: number): string {
- const minutes = Math.floor(ms / 60000);
- const hours = Math.floor(minutes / 60);
- const days = Math.floor(hours / 24);
-
- if (days > 0) {
- const remainder = days % 10;
- let suffix = 'дней';
- if (remainder === 1 && days !== 11) suffix = 'день';
- else if (remainder >= 2 && remainder <= 4 && (days < 10 || days > 20))
- suffix = 'дня';
- return `${days} ${suffix}`;
- } else if (hours > 0) {
- const mins = minutes % 60;
- return mins > 0 ? `${hours} ч ${mins} мин` : `${hours} ч`;
- } else {
- return `${minutes} мин`;
- }
-}
-
-const ContestItem: React.FC{name}
+
+ {username}
+
+ {scheduleType == 'AlwaysOpen' ? (
+
+ Всегда открыт
+
+ ) : (
+
+
+ )}
+
+
+ {formatDate(startsAt)}
+
+ -
+
+ {formatDate(endsAt)}
+
+
+ {formatDurationTime(attemptDurationMinutes)}
+
+
+
+ {scheduleType == 'AlwaysOpen' ? 'Открыт' : 'Завершен'}
+
+ {
- navigate(`/contest/${id}`);
- }}
- >
-
- );
-};
-
-export default ContestItem;
diff --git a/src/views/home/account/contests/UpcomingContestItem.tsx b/src/views/home/account/contests/UpcomingContestItem.tsx
new file mode 100644
index 0000000..0bb8adf
--- /dev/null
+++ b/src/views/home/account/contests/UpcomingContestItem.tsx
@@ -0,0 +1,160 @@
+import { cn } from '../../../../lib/cn';
+import { useNavigate } from 'react-router-dom';
+import { useAppSelector } from '../../../../redux/hooks';
+import { useQuery } from '../../../../hooks/useQuery';
+import { toastWarning } from '../../../../lib/toastNotification';
+
+export interface UpcoingContestItemProps {
+ name: string;
+ contestId: number;
+ scheduleType: 'AlwaysOpen' | 'FixedWindow' | 'RollingWindow';
+ visibility: string;
+ startsAt: string;
+ endsAt: string;
+ attemptDurationMinutes: number;
+ role: string;
+ type: 'first' | 'second';
+}
+
+function formatDate(dateString: string): string {
+ const date = new Date(dateString);
+
+ const day = date.getDate().toString().padStart(2, '0');
+ const month = (date.getMonth() + 1).toString().padStart(2, '0');
+ const year = date.getFullYear();
+
+ const hours = date.getHours().toString().padStart(2, '0');
+ const minutes = date.getMinutes().toString().padStart(2, '0');
+
+ return `${day}/${month}/${year}\n${hours}:${minutes}`;
+}
+
+function formatDurationTime(minutes: number): string {
+ const hours = Math.floor(minutes / 60);
+ const days = Math.floor(hours / 24);
+
+ if (days > 0) {
+ const remainder = days % 10;
+ let suffix = 'дней';
+ if (remainder === 1 && days !== 11) suffix = 'день';
+ else if (remainder >= 2 && remainder <= 4 && (days < 10 || days > 20))
+ suffix = 'дня';
+ return `${days} ${suffix}`;
+ } else if (hours > 0) {
+ const mins = minutes % 60;
+ return mins > 0 ? `${hours} ч ${mins} мин` : `${hours} ч`;
+ } else {
+ return `${minutes} мин`;
+ }
+}
+
+function formatWaitTime(ms: number): string {
+ const minutes = Math.floor(ms / 60000);
+ const hours = Math.floor(minutes / 60);
+ const days = Math.floor(hours / 24);
+
+ if (days > 0) {
+ const remainder = days % 10;
+ let suffix = 'дней';
+ if (remainder === 1 && days !== 11) suffix = 'день';
+ else if (remainder >= 2 && remainder <= 4 && (days < 10 || days > 20))
+ suffix = 'дня';
+ return `${days} ${suffix}`;
+ } else if (hours > 0) {
+ const mins = minutes % 60;
+ return mins > 0 ? `${hours} ч ${mins} мин` : `${hours} ч`;
+ } else {
+ return `${minutes} мин`;
+ }
+}
+
+const UpcoingContestItem: React.FC{name}
-
- {/* {authors.map((v, i) =>
- {v}
)} */} - valavshonok -
- {formatDate(startAt)}
-
- {formatWaitTime(duration)}
- {waitTime > 0 && (
-
- {'До начала\n' + formatWaitTime(waitTime)}
-
- )}
-
-
-
- {members}
-
- {statusRegister == 'reg' ? (
- <>
- {' '}
- {}} text="Регистрация" />
-
- ) : (
- <>
- {' '}
- {}} text="Вы записаны" />
-
- )}
-
- {
+ if (!started) {
+ toastWarning('Контест еще не начался');
+ return;
+ }
+
+ const params = new URLSearchParams({
+ back: '/home/account/contests',
+ });
+ navigate(`/contest/${contestId}?${params}`);
+ }}
+ >
+
+ );
+};
+
+export default UpcoingContestItem;
diff --git a/src/views/home/account/missions/Missions.tsx b/src/views/home/account/missions/Missions.tsx
index 1d8d2fb..b06c5e4 100644
--- a/src/views/home/account/missions/Missions.tsx
+++ b/src/views/home/account/missions/Missions.tsx
@@ -1,12 +1,15 @@
-import { FC, useEffect } from 'react';
+import { FC, useEffect, useState } from 'react';
import { useAppDispatch, useAppSelector } from '../../../../redux/hooks';
import { setMenuActiveProfilePage } from '../../../../redux/slices/store';
import { cn } from '../../../../lib/cn';
import MissionsBlock from './MissionsBlock';
import {
- fetchMyMissions,
+ deleteMission,
setMissionsStatus,
} from '../../../../redux/slices/missions';
+import ConfirmModal from '../../../../components/modal/ConfirmModal';
+import { fetchProfileMissions } from '../../../../redux/slices/profile';
+import { useQuery } from '../../../../hooks/useQuery';
interface ItemProps {
count: number;
@@ -41,12 +44,20 @@ const Item: FC{name}
+
+ {username}
+
+ {scheduleType == 'AlwaysOpen' ? (
+
+ Всегда открыт
+
+ ) : (
+
+
+ )}
+
+
+ {formatDate(startsAt)}
+
+ -
+
+ {formatDate(endsAt)}
+
+
+ {formatDurationTime(attemptDurationMinutes)}
+
+
+ {!started ? (
+
+ {'До начала\n' + formatWaitTime(waitTime)}
+
+ ) : (
+ !finished && (
+
+ {'До конца\n' + formatWaitTime(waitTime)}
+
+ )
+ )}
+
+
+ {new Date() < new Date(startsAt) ? (
+ <>{'Не начался'}
+ ) : (
+ <>{scheduleType == 'AlwaysOpen' ? 'Открыт' : 'Идет'}
+ )}
+
+