contests

src/App.tsx

@@ -8,8 +8,17 @@ import Home from './pages/Home';
 import Mission from './pages/Mission';
 import ArticleEditor from './pages/ArticleEditor';
 import Article from './pages/Article';
+import { useEffect } from 'react';
+import { loadTokensFromLocalStorage } from './redux/slices/auth';
+import { useAppDispatch } from './redux/hooks';
 
 function App() {
+    const dispatch = useAppDispatch();
+
+    useEffect(() => {
+        dispatch(loadTokensFromLocalStorage());
+    }, []);
+
     return (
         <div className="w-full h-full bg-liquid-background flex justify-center">
             <div className="relative w-full max-w-[1600px] h-full ">
@@ -29,3 +38,6 @@ function App() {
 }
 
 export default App;
+function useAppdispatch() {
+    throw new Error('Function not implemented.');
+}

src/axios.ts

@@ -11,6 +11,7 @@ const instance = axios.create({
 instance.interceptors.request.use(
     (config) => {
         const token = localStorage.getItem('jwt'); // или можно брать из Redux через store.getState()
+
         if (token) {
             config.headers.Authorization = `Bearer ${token}`;
         }

src/hooks/useQuery.ts

@@ -0,0 +1,7 @@
+import { useMemo } from 'react';
+import { useLocation } from 'react-router-dom';
+
+export function useQuery() {
+    const { search } = useLocation();
+    return useMemo(() => new URLSearchParams(search), [search]);
+}

src/pages/Mission.tsx

@@ -8,6 +8,7 @@ import { fetchMySubmitsByMission, submitMission } from '../redux/slices/submit';
 import { fetchMissionById } from '../redux/slices/missions';
 import Header from '../views/mission/statement/Header';
 import MissionSubmissions from '../views/mission/statement/MissionSubmissions';
+import { useQuery } from '../hooks/useQuery';
 
 const Mission = () => {
     const dispatch = useAppDispatch();
@@ -16,6 +17,10 @@ const Mission = () => {
     const { missionId } = useParams<{ missionId: string }>();
     const mission = useAppSelector((state) => state.missions.currentMission);
     const missionIdNumber = Number(missionId);
+
+    const query = useQuery();
+    const back = query.get('back') ?? undefined;
+
     if (!missionId || isNaN(missionIdNumber)) {
         return <Navigate to="/home" replace />;
     }
@@ -38,7 +43,9 @@ const Mission = () => {
             const hasWaiting = submissionsRef.current.some(
                 (s: any) =>
                     s.solution.status == 'Waiting' ||
-                    s.solution.testerState === 'Waiting',
+                    s.solution.testerState === 'Waiting' ||
+                    s.solution.status === 'Compiling' ||
+                    s.solution.testerState === 'Compiling',
             );
             if (!hasWaiting) {
                 // Всё проверено — стоп
@@ -73,7 +80,9 @@ const Mission = () => {
             const hasWaiting = submissions.some(
                 (s) =>
                     s.solution.status === 'Waiting' ||
-                    s.solution.testerState === 'Waiting',
+                    s.solution.testerState === 'Waiting' ||
+                    s.solution.status === 'Compiling' ||
+                    s.solution.testerState === 'Compiling',
             );
 
             if (hasWaiting) {
@@ -145,7 +154,7 @@ const Mission = () => {
     return (
         <div className="h-screen grid grid-rows-[60px,1fr]">
             <div className="">
-                <Header missionId={missionIdNumber} />
+                <Header missionId={missionIdNumber} back={back} />
             </div>
 
             <div className="grid grid-cols-2 h-full min-h-0 gap-[20px]">

src/redux/slices/auth.ts

@@ -1,25 +1,36 @@
 import { createSlice, createAsyncThunk, PayloadAction } from '@reduxjs/toolkit';
 import axios from '../../axios';
 
-// Типы данных
+// 🔹 Функция для декодирования JWT
+function decodeJwt(token: string) {
+    const [, payload] = token.split('.');
+    const json = atob(payload.replace(/-/g, '+').replace(/_/g, '/'));
+    return JSON.parse(decodeURIComponent(escape(json)));
+}
+
+// 🔹 Типы данных
 interface AuthState {
     jwt: string | null;
     refreshToken: string | null;
     username: string | null;
+    email: string | null; // <-- добавили email
+    id: string | null;
     status: 'idle' | 'loading' | 'successful' | 'failed';
     error: string | null;
 }
 
-// Инициализация состояния
+// 🔹 Инициализация состояния
 const initialState: AuthState = {
     jwt: null,
     refreshToken: null,
     username: null,
+    email: null, // <-- добавили email
+    id: null,
     status: 'idle',
     error: null,
 };
 
-// AsyncThunk: Регистрация
+// 🔹 AsyncThunk: Регистрация
 export const registerUser = createAsyncThunk(
     'auth/register',
     async (
@@ -45,7 +56,7 @@ export const registerUser = createAsyncThunk(
     },
 );
 
-// AsyncThunk: Логин
+// 🔹 AsyncThunk: Логин
 export const loginUser = createAsyncThunk(
     'auth/login',
     async (
@@ -66,7 +77,7 @@ export const loginUser = createAsyncThunk(
     },
 );
 
-// AsyncThunk: Обновление токена
+// 🔹 AsyncThunk: Обновление токена
 export const refreshToken = createAsyncThunk(
     'auth/refresh',
     async ({ refreshToken }: { refreshToken: string }, { rejectWithValue }) => {
@@ -74,7 +85,7 @@ export const refreshToken = createAsyncThunk(
             const response = await axios.post('/authentication/refresh', {
                 refreshToken,
             });
-            return response.data; // { username }
+            return response.data; // { jwt, refreshToken }
         } catch (err: any) {
             return rejectWithValue(
                 err.response?.data?.message || 'Refresh token failed',
@@ -83,7 +94,7 @@ export const refreshToken = createAsyncThunk(
     },
 );
 
-// AsyncThunk: Получение информации о пользователе
+// 🔹 AsyncThunk: Получение информации о пользователе
 export const fetchWhoAmI = createAsyncThunk(
     'auth/whoami',
     async (_, { rejectWithValue }) => {
@@ -98,10 +109,10 @@ export const fetchWhoAmI = createAsyncThunk(
     },
 );
 
-// AsyncThunk: Загрузка токенов из localStorage
+// 🔹 AsyncThunk: Загрузка токенов из localStorage
 export const loadTokensFromLocalStorage = createAsyncThunk(
     'auth/loadTokens',
-    async (_, {}) => {
+    async () => {
         const jwt = localStorage.getItem('jwt');
         const refreshToken = localStorage.getItem('refreshToken');
 
@@ -114,7 +125,7 @@ export const loadTokensFromLocalStorage = createAsyncThunk(
     },
 );
 
-// Slice
+// 🔹 Slice
 const authSlice = createSlice({
     name: 'auth',
     initialState,
@@ -123,6 +134,8 @@ const authSlice = createSlice({
             state.jwt = null;
             state.refreshToken = null;
             state.username = null;
+            state.email = null; // <-- очистка email
+            state.id = null;
             state.status = 'idle';
             state.error = null;
             localStorage.removeItem('jwt');
@@ -136,118 +149,145 @@ const authSlice = createSlice({
             state.status = 'loading';
             state.error = null;
         });
-        builder.addCase(
+        builder.addCase(registerUser.fulfilled, (state, action) => {
-            registerUser.fulfilled,
+            state.status = 'successful';
-            (
+            state.jwt = action.payload.jwt;
-                state,
+            state.refreshToken = action.payload.refreshToken;
-                action: PayloadAction<{ jwt: string; refreshToken: string }>,
+
-            ) => {
+            // 🔸 Декодируем JWT
-                state.status = 'successful';
+            const decoded = decodeJwt(action.payload.jwt);
-                state.jwt = action.payload.jwt;
+            state.username =
-                state.refreshToken = action.payload.refreshToken;
+                decoded[
-                axios.defaults.headers.common[
+                    'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name'
-                    'Authorization'
+                ] || null;
-                ] = `Bearer ${action.payload.jwt}`;
+            state.email =
-                localStorage.setItem('jwt', action.payload.jwt);
+                decoded[
-                localStorage.setItem(
+                    'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'
-                    'refreshToken',
+                ] || null;
-                    action.payload.refreshToken,
+            state.id =
-                );
+                decoded[
-            },
+                    'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier'
-        );
+                ] || null;
-        builder.addCase(
+
-            registerUser.rejected,
+            axios.defaults.headers.common[
-            (state, action: PayloadAction<any>) => {
+                'Authorization'
-                state.status = 'failed';
+            ] = `Bearer ${action.payload.jwt}`;
-                state.error = action.payload;
+            localStorage.setItem('jwt', action.payload.jwt);
-            },
+            localStorage.setItem('refreshToken', action.payload.refreshToken);
-        );
+        });
+        builder.addCase(registerUser.rejected, (state, action) => {
+            state.status = 'failed';
+            state.error = action.payload as string;
+        });
 
         // Логин
         builder.addCase(loginUser.pending, (state) => {
             state.status = 'loading';
             state.error = null;
         });
-        builder.addCase(
+        builder.addCase(loginUser.fulfilled, (state, action) => {
-            loginUser.fulfilled,
+            state.status = 'successful';
-            (
+            state.jwt = action.payload.jwt;
-                state,
+            state.refreshToken = action.payload.refreshToken;
-                action: PayloadAction<{ jwt: string; refreshToken: string }>,
+
-            ) => {
+            // 🔸 Декодируем JWT
-                state.status = 'successful';
+            const decoded = decodeJwt(action.payload.jwt);
-                state.jwt = action.payload.jwt;
+            state.username =
-                state.refreshToken = action.payload.refreshToken;
+                decoded[
-                axios.defaults.headers.common[
+                    'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name'
-                    'Authorization'
+                ] || null;
-                ] = `Bearer ${action.payload.jwt}`;
+            state.email =
-                localStorage.setItem('jwt', action.payload.jwt);
+                decoded[
-                localStorage.setItem(
+                    'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'
-                    'refreshToken',
+                ] || null;
-                    action.payload.refreshToken,
+            state.id =
-                );
+                decoded[
-            },
+                    'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier'
-        );
+                ] || null;
-        builder.addCase(
+
-            loginUser.rejected,
+            axios.defaults.headers.common[
-            (state, action: PayloadAction<any>) => {
+                'Authorization'
-                state.status = 'failed';
+            ] = `Bearer ${action.payload.jwt}`;
-                state.error = action.payload;
+            localStorage.setItem('jwt', action.payload.jwt);
-            },
+            localStorage.setItem('refreshToken', action.payload.refreshToken);
-        );
+        });
+        builder.addCase(loginUser.rejected, (state, action) => {
+            state.status = 'failed';
+            state.error = action.payload as string;
+        });
 
         // Обновление токена
         builder.addCase(refreshToken.pending, (state) => {
             state.status = 'loading';
             state.error = null;
         });
-        builder.addCase(
+        builder.addCase(refreshToken.fulfilled, (state, action) => {
-            refreshToken.fulfilled,
+            state.status = 'successful';
-            (state, action: PayloadAction<{ username: string }>) => {
+            state.jwt = action.payload.jwt;
-                state.status = 'successful';
+            state.refreshToken = action.payload.refreshToken;
-                state.username = action.payload.username;
+
-            },
+            // 🔸 Декодируем JWT
-        );
+            const decoded = decodeJwt(action.payload.jwt);
-        builder.addCase(
+            state.username =
-            refreshToken.rejected,
+                decoded[
-            (state, action: PayloadAction<any>) => {
+                    'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name'
-                state.status = 'failed';
+                ] || null;
-                state.error = action.payload;
+            state.email =
-            },
+                decoded[
-        );
+                    'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'
+                ] || null;
+            state.id =
+                decoded[
+                    'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier'
+                ] || null;
+
+            axios.defaults.headers.common[
+                'Authorization'
+            ] = `Bearer ${action.payload.jwt}`;
+            localStorage.setItem('jwt', action.payload.jwt);
+            localStorage.setItem('refreshToken', action.payload.refreshToken);
+        });
+        builder.addCase(refreshToken.rejected, (state, action) => {
+            state.status = 'failed';
+            state.error = action.payload as string;
+        });
 
         // Получение информации о пользователе
         builder.addCase(fetchWhoAmI.pending, (state) => {
             state.status = 'loading';
             state.error = null;
         });
-        builder.addCase(
+        builder.addCase(fetchWhoAmI.fulfilled, (state, action) => {
-            fetchWhoAmI.fulfilled,
+            state.status = 'successful';
-            (state, action: PayloadAction<{ username: string }>) => {
+            state.username = action.payload.username;
-                state.status = 'successful';
+        });
-                state.username = action.payload.username;
+        builder.addCase(fetchWhoAmI.rejected, (state, action) => {
-            },
+            state.status = 'failed';
-        );
+            state.error = action.payload as string;
-        builder.addCase(
+        });
-            fetchWhoAmI.rejected,
-            (state, action: PayloadAction<any>) => {
-                state.status = 'failed';
-                state.error = action.payload;
-            },
-        );
 
         // Загрузка токенов из localStorage
         builder.addCase(
             loadTokensFromLocalStorage.fulfilled,
-            (
+            (state, action) => {
-                state,
-                action: PayloadAction<{
-                    jwt: string | null;
-                    refreshToken: string | null;
-                }>,
-            ) => {
                 state.jwt = action.payload.jwt;
                 state.refreshToken = action.payload.refreshToken;
+
                 if (action.payload.jwt) {
+                    const decoded = decodeJwt(action.payload.jwt);
+                    state.username =
+                        decoded[
+                            'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name'
+                        ] || null;
+                    state.email =
+                        decoded[
+                            'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'
+                        ] || null;
+                    state.id =
+                        decoded[
+                            'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier'
+                        ] || null;
+
                     axios.defaults.headers.common[
                         'Authorization'
                     ] = `Bearer ${action.payload.jwt}`;

src/redux/slices/contests.ts

@@ -6,9 +6,16 @@ import axios from '../../axios';
 // =====================
 
 export interface Mission {
-    missionId: number;
+    id: number;
+    authorId: number;
     name: string;
-    sortOrder: number;
+    difficulty: number;
+    tags: string[];
+    createdAt: string;
+    updatedAt: string;
+    timeLimitMilliseconds: number;
+    memoryLimitBytes: number;
+    statements: null;
 }
 
 export interface Member {

src/styles/index.css

@@ -23,6 +23,7 @@
     line-height: 1.5;
     background-color: var(--color-liquid-background);
     color: rgba(255, 255, 255, 0.87);
+    overflow-x: hidden;
 }
 
 #root {

src/views/home/contest/Contest.tsx

@@ -18,7 +18,6 @@ const Contest = () => {
     if (contestIdNumber === null) {
         return <Navigate to="/home/contests" replace />;
     }
-
     const dispatch = useAppDispatch();
     const contest = useAppSelector((state) => state.contests.selectedContest);
 

src/views/home/contest/MissionItem.tsx

@@ -1,6 +1,7 @@
 import { cn } from '../../../lib/cn';
 import { IconError, IconSuccess } from '../../../assets/icons/missions';
 import { useNavigate } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 
 export interface MissionItemProps {
     id: number;
@@ -31,6 +32,8 @@ const MissionItem: React.FC<MissionItemProps> = ({
     status,
 }) => {
     const navigate = useNavigate();
+    const location = useLocation();
+    const path = location.pathname + location.search;
 
     return (
         <div
@@ -45,7 +48,7 @@ const MissionItem: React.FC<MissionItemProps> = ({
                 'cursor-pointer brightness-100 hover:brightness-125 transition-all duration-300',
             )}
             onClick={() => {
-                navigate(`/mission/${id}`);
+                navigate(`/mission/${id}?back=${path}`);
             }}
         >
             <div className="text-[18px] font-bold">#{id}</div>

src/views/home/contest/Missions.tsx

@@ -28,8 +28,10 @@ const ContestMissions: FC<ContestMissionsProps> = ({ contest }) => {
                 <div className="w-full">
                     {contest.missions.map((v, i) => (
                         <MissionItem
-                            id={v.missionId}
+                            id={v.id}
                             name={v.name}
+                            timeLimit={v.timeLimitMilliseconds}
+                            memoryLimit={v.memoryLimitBytes}
                             type={i % 2 ? 'second' : 'first'}
                         />
                     ))}

src/views/mission/statement/Header.tsx

@@ -9,9 +9,10 @@ import { useNavigate } from 'react-router-dom';
 
 interface HeaderProps {
     missionId: number;
+    back?: string;
 }
 
-const Header: React.FC<HeaderProps> = ({ missionId }) => {
+const Header: React.FC<HeaderProps> = ({ missionId, back }) => {
     const navigate = useNavigate();
     return (
         <header className="w-full h-[60px] flex items-center px-4 gap-[20px]">
@@ -29,7 +30,8 @@ const Header: React.FC<HeaderProps> = ({ missionId }) => {
                 alt="back"
                 className="h-[24px] w-[24px] cursor-pointer"
                 onClick={() => {
-                    navigate('/home/missions');
+                    if (back) navigate(back);
+                    else navigate('/home/missions');
                 }}
             />
 
@@ -39,7 +41,10 @@ const Header: React.FC<HeaderProps> = ({ missionId }) => {
                     alt="back"
                     className="h-[24px] w-[24px] cursor-pointer"
                     onClick={() => {
-                        navigate(`/mission/${missionId - 1}`);
+                        if (missionId <= 1) return;
+                        if (back)
+                            navigate(`/mission/${missionId - 1}?back=${back}`);
+                        else navigate(`/mission/${missionId - 1}`);
                     }}
                 />
                 <span>{missionId}</span>
@@ -48,7 +53,9 @@ const Header: React.FC<HeaderProps> = ({ missionId }) => {
                     alt="back"
                     className="h-[24px] w-[24px] cursor-pointer"
                     onClick={() => {
-                        navigate(`/mission/${missionId + 1}`);
+                        if (back)
+                            navigate(`/mission/${missionId + 1}?back=${back}`);
+                        else navigate(`/mission/${missionId + 1}`);
                     }}
                 />
             </div>