Compare commits
7 Commits
dev
...
c55f7a972c
| Author | SHA1 | Date | |
|---|---|---|---|
| c55f7a972c | |||
| 5693701aa5 | |||
| d9f449f0b8 | |||
| 04da2b565a | |||
| 070edbfc42 | |||
|
|
a4480db444 | ||
| f2baf189e4 |
35
.gitea/workflows/build-and-push.yaml
Normal file
35
.gitea/workflows/build-and-push.yaml
Normal file
@@ -0,0 +1,35 @@
|
||||
name: Build and Push Docker Image
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ main ]
|
||||
|
||||
env:
|
||||
REGISTRY: git.nullptr.top
|
||||
IMAGE_NAME: git.nullptr.top/liquidcode/liquidcode-frontend
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Log in to Container Registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ${{ env.REGISTRY }}
|
||||
username: liquidcode-ci-service
|
||||
password: ${{ secrets.SERVICE_ACCOUNT_TOKEN }}
|
||||
|
||||
- name: Build and Push Docker image
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
context: .
|
||||
push: true
|
||||
tags: ${{ env.IMAGE_NAME }}:latest,${{ env.IMAGE_NAME }}:${{ gitea.sha }}
|
||||
cache-from: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache
|
||||
cache-to: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache,mode=max
|
||||
29
Dockerfile
Normal file
29
Dockerfile
Normal file
@@ -0,0 +1,29 @@
|
||||
# Build stage
|
||||
FROM node:20-alpine AS build
|
||||
WORKDIR /app
|
||||
|
||||
# Copy package files
|
||||
COPY package.json package-lock.json ./
|
||||
|
||||
# Install dependencies
|
||||
RUN npm ci
|
||||
|
||||
# Copy source code
|
||||
COPY . .
|
||||
|
||||
# Build the application
|
||||
RUN npm run build
|
||||
|
||||
# Production stage
|
||||
FROM node:20-alpine AS runtime
|
||||
WORKDIR /app
|
||||
|
||||
# Install a simple HTTP server to serve static files
|
||||
RUN npm install -g serve
|
||||
|
||||
# Copy built application from build stage
|
||||
COPY --from=build /app/dist ./dist
|
||||
|
||||
EXPOSE 3000
|
||||
|
||||
CMD ["serve", "-s", "dist", "-l", "3000"]
|
||||
@@ -2,9 +2,9 @@
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/logo.svg" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>LiquidCode</title>
|
||||
<title>Vite + React + TS</title>
|
||||
|
||||
<link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro&display=swap" rel="stylesheet">
|
||||
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
<svg width="62" height="56" viewBox="0 0 62 56" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M16.7765 44.9299V16.6675C16.7765 7.46416 9.26353 0 0 0V44.9299C0.00729412 45.9589 0.153177 50.4447 3.64706 53.626C4.92353 54.7927 6.27294 55.4377 7.29412 55.8H23.3412C22.4221 55.4377 21.2113 54.7927 20.0588 53.626C16.9151 50.4447 16.7838 45.9589 16.7765 44.9299Z" fill="#0C8092"/>
|
||||
<path d="M35.7412 44.9299V27.5377C35.7412 18.3343 28.2282 10.8701 18.9647 10.8701V44.9299C18.972 45.9589 19.1179 50.4447 22.6118 53.626C23.8882 54.7927 25.2376 55.4377 26.2588 55.8H42.3059C41.3868 55.4377 40.176 54.7927 39.0235 53.626C35.8798 50.4447 35.7485 45.9589 35.7412 44.9299Z" fill="#16A7C6"/>
|
||||
<path d="M58.3529 53.626C54.8591 50.4447 54.7132 45.9589 54.7059 44.9299V39.1325C54.7059 29.9291 47.1929 22.4649 37.9294 22.4649V44.9299C37.9367 45.9589 38.0826 50.4447 41.5765 53.626C42.8529 54.7927 44.2024 55.4377 45.2235 55.8H62C60.9788 55.4377 59.6294 54.7927 58.3529 53.626Z" fill="#00DBD9"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 993 B |
1
public/vite.svg
Normal file
1
public/vite.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
@@ -1,39 +0,0 @@
|
||||
export interface UploadMissionRequest {
|
||||
missionFile: File;
|
||||
difficulty: number;
|
||||
tags?: string[] | null;
|
||||
}
|
||||
|
||||
export const buildUploadMissionFormData = (
|
||||
request: UploadMissionRequest,
|
||||
): FormData => {
|
||||
const formData = new FormData();
|
||||
|
||||
formData.append('missionFile', request.missionFile);
|
||||
formData.append('difficulty', request.difficulty.toString());
|
||||
|
||||
// tags:
|
||||
// - undefined => fromArchive (do not include tags key at all)
|
||||
// - [] => empty list (not reliably representable via multipart without backend support)
|
||||
// - [..] => custom tags, repeated keys
|
||||
if (Array.isArray(request.tags)) {
|
||||
request.tags.forEach((tag) => formData.append('tags', tag));
|
||||
}
|
||||
|
||||
return formData;
|
||||
};
|
||||
|
||||
export const getProblemXmlMissingNameMessage = (responseData: unknown) => {
|
||||
const asText =
|
||||
typeof responseData === 'string'
|
||||
? responseData
|
||||
: responseData == null
|
||||
? ''
|
||||
: JSON.stringify(responseData);
|
||||
|
||||
if (/problem\.xml/i.test(asText) || /Mission name was not found/i.test(asText)) {
|
||||
return 'В архиве отсутствует имя в problem.xml';
|
||||
}
|
||||
|
||||
return null;
|
||||
};
|
||||
@@ -15,8 +15,8 @@ interface ModalProps {
|
||||
}
|
||||
|
||||
const modalbgVariants = {
|
||||
closed: { opacity: 0, backdropFilter: 'blur(0px)' },
|
||||
open: { opacity: 1, backdropFilter: 'blur(6px)' },
|
||||
closed: { opacity: 0 },
|
||||
open: { opacity: 1 },
|
||||
};
|
||||
|
||||
const modalVariants = {
|
||||
@@ -47,15 +47,13 @@ export const Modal: React.FC<ModalProps> = ({
|
||||
exit={modalbgVariants.closed}
|
||||
transition={{ duration: 0.15 }}
|
||||
className={cn(
|
||||
'fixed top-0 left-0 h-svh w-svw z-50',
|
||||
backdrop === 'opaque' && 'bg-[#00000055]',
|
||||
' fixed top-0 left-0 h-svh w-svw backdrop-filter transition-[background-color,backdrop-filter,opacity] z-50',
|
||||
backdrop == 'blur' && open && 'backdrop-blur-sm',
|
||||
backdrop == 'opaque' &&
|
||||
open &&
|
||||
'bg-[#00000055] pointer-events-none',
|
||||
)}
|
||||
style={
|
||||
backdrop === 'blur'
|
||||
? undefined
|
||||
: { backdropFilter: 'none' }
|
||||
}
|
||||
/>
|
||||
></motion.div>
|
||||
)}
|
||||
</AnimatePresence>
|
||||
<div className="fixed top-0 left-0 h-svh w-svw flex items-center justify-center pointer-events-none z-50">
|
||||
|
||||
@@ -50,7 +50,7 @@ const Article = () => {
|
||||
#{article.id}
|
||||
</div>
|
||||
</div>
|
||||
{
|
||||
{article.tags.length && (
|
||||
<div className="flex gap-[10px]">
|
||||
{article.tags.map((v, i) => (
|
||||
<div
|
||||
@@ -61,7 +61,7 @@ const Article = () => {
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
}
|
||||
)}
|
||||
<MarkdownPreview
|
||||
content={article!.content}
|
||||
className="bg-transparent"
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { createSlice, createAsyncThunk, PayloadAction } from '@reduxjs/toolkit';
|
||||
import axios from '../../axios';
|
||||
import { toastError } from '../../lib/toastNotification';
|
||||
|
||||
type Status = 'idle' | 'loading' | 'successful' | 'failed';
|
||||
|
||||
@@ -86,7 +85,7 @@ export const registerUser = createAsyncThunk(
|
||||
});
|
||||
return response.data;
|
||||
} catch (err: any) {
|
||||
return rejectWithValue(err.response?.data?.errors ? err.response?.data?.errors : {"error" : [err.response?.data]});
|
||||
return rejectWithValue(err.response?.data?.errors);
|
||||
}
|
||||
},
|
||||
);
|
||||
@@ -217,11 +216,6 @@ const authSlice = createSlice({
|
||||
builder.addCase(registerUser.rejected, (state, action) => {
|
||||
state.status = 'failed';
|
||||
state.register.errors = action.payload as Record<string, string[]>;
|
||||
Object.values(state.register.errors).forEach((messages) => {
|
||||
messages.forEach((msg) => {
|
||||
toastError(msg);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
// ----------------- Login -----------------
|
||||
|
||||
@@ -1,11 +1,6 @@
|
||||
import { createSlice, createAsyncThunk, PayloadAction } from '@reduxjs/toolkit';
|
||||
import axios from '../../axios';
|
||||
import { toastError } from '../../lib/toastNotification';
|
||||
import {
|
||||
buildUploadMissionFormData,
|
||||
getProblemXmlMissingNameMessage,
|
||||
UploadMissionRequest,
|
||||
} from '../../api/missionsUpload';
|
||||
|
||||
// ─── Типы ────────────────────────────────────────────
|
||||
|
||||
@@ -153,45 +148,27 @@ export const fetchMyMissions = createAsyncThunk(
|
||||
export const uploadMission = createAsyncThunk(
|
||||
'missions/uploadMission',
|
||||
async (
|
||||
request: UploadMissionRequest,
|
||||
{
|
||||
file,
|
||||
name,
|
||||
difficulty,
|
||||
tags,
|
||||
}: { file: File; name: string; difficulty: number; tags: string[] },
|
||||
{ rejectWithValue },
|
||||
) => {
|
||||
try {
|
||||
const formData = buildUploadMissionFormData(request);
|
||||
const formData = new FormData();
|
||||
formData.append('MissionFile', file);
|
||||
formData.append('Name', name);
|
||||
formData.append('Difficulty', difficulty.toString());
|
||||
tags.forEach((tag) => formData.append('Tags', tag));
|
||||
|
||||
const response = await axios.post('/missions/upload', formData, {
|
||||
headers: { 'Content-Type': 'multipart/form-data' },
|
||||
});
|
||||
return response.data; // Mission
|
||||
} catch (err: any) {
|
||||
const status = err?.response?.status;
|
||||
const responseData = err?.response?.data;
|
||||
|
||||
if (status === 400) {
|
||||
const msg = getProblemXmlMissingNameMessage(responseData);
|
||||
if (msg) {
|
||||
return rejectWithValue({
|
||||
errors: {
|
||||
missionFile: [msg],
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (responseData?.errors) {
|
||||
return rejectWithValue(responseData);
|
||||
}
|
||||
|
||||
const fallback =
|
||||
typeof responseData === 'string'
|
||||
? responseData
|
||||
: 'Не удалось загрузить миссию';
|
||||
|
||||
return rejectWithValue({
|
||||
errors: {
|
||||
general: [fallback],
|
||||
},
|
||||
});
|
||||
return rejectWithValue(err.response?.data);
|
||||
}
|
||||
},
|
||||
);
|
||||
@@ -374,19 +351,17 @@ const missionsSlice = createSlice({
|
||||
(state, action: PayloadAction<any>) => {
|
||||
state.statuses.upload = 'failed';
|
||||
|
||||
const errors = action.payload?.errors as
|
||||
| Record<string, string[]>
|
||||
| undefined;
|
||||
if (errors) {
|
||||
const errors = action.payload.errors as Record<
|
||||
string,
|
||||
string[]
|
||||
>;
|
||||
Object.values(errors).forEach((messages) => {
|
||||
messages.forEach((msg) => {
|
||||
toastError(msg);
|
||||
});
|
||||
});
|
||||
|
||||
state.create.errors = errors;
|
||||
} else {
|
||||
toastError('Не удалось загрузить миссию');
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@ const Login = () => {
|
||||
</div>
|
||||
<div className=" relative pointer-events-auto">
|
||||
<div>
|
||||
<div className="text-[35px] text-liquid-white font-bold h-[50px]">
|
||||
<div className="text-[40px] text-liquid-white font-bold h-[50px]">
|
||||
С возвращением
|
||||
</div>
|
||||
<div className="text-[18px] text-liquid-light font-bold h-[23px]">
|
||||
@@ -100,8 +100,15 @@ const Login = () => {
|
||||
error={getErrorPasswordMessage()}
|
||||
/>
|
||||
|
||||
<div className="flex justify-end mt-[10px] h-[20px]">
|
||||
|
||||
<div className="flex justify-end mt-[10px]">
|
||||
<Link
|
||||
to={''}
|
||||
className={
|
||||
'text-liquid-brightmain text-[16px] h-[20px] transition-all hover:underline '
|
||||
}
|
||||
>
|
||||
Забыли пароль?
|
||||
</Link>
|
||||
</div>
|
||||
|
||||
<div className="mt-[10px]">
|
||||
|
||||
@@ -9,7 +9,7 @@ import { registerUser } from '../../../redux/slices/auth';
|
||||
import { setMenuActivePage } from '../../../redux/slices/store';
|
||||
import { Balloon } from '../../../assets/icons/auth';
|
||||
import { Link } from 'react-router-dom';
|
||||
// import { Checkbox } from '../../../components/checkbox/Checkbox';
|
||||
import { Checkbox } from '../../../components/checkbox/Checkbox';
|
||||
|
||||
function isValidEmail(email: string): boolean {
|
||||
const pattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
|
||||
@@ -52,13 +52,12 @@ const Register = () => {
|
||||
const [password, setPassword] = useState<string>('');
|
||||
const [confirmPassword, setConfirmPassword] = useState<string>('');
|
||||
const [submitClicked, setSubmitClicked] = useState<boolean>(false);
|
||||
const [politicChecked, setPoliticChecked] = useState<boolean>(true);
|
||||
const [politicChecked, setPoliticChecked] = useState<boolean>(false);
|
||||
|
||||
const { status, jwt } = useAppSelector((state) => state.auth);
|
||||
// const { errors } = useAppSelector((state) => state.auth.register);
|
||||
|
||||
useEffect(() => {
|
||||
setPoliticChecked(true);
|
||||
dispatch(setMenuActivePage('account'));
|
||||
}, []);
|
||||
|
||||
@@ -143,7 +142,7 @@ const Register = () => {
|
||||
</div>
|
||||
<div className=" relative pointer-events-auto">
|
||||
<div>
|
||||
<div className="text-[35px] text-liquid-white font-bold h-[50px]">
|
||||
<div className="text-[40px] text-liquid-white font-bold h-[50px]">
|
||||
Добро пожаловать
|
||||
</div>
|
||||
<div className="text-[18px] text-liquid-light font-bold h-[23px]">
|
||||
@@ -201,7 +200,7 @@ const Register = () => {
|
||||
/>
|
||||
|
||||
<div className=" flex items-center mt-[10px] h-[24px]">
|
||||
{/* <Checkbox
|
||||
<Checkbox
|
||||
onChange={(value: boolean) => {
|
||||
setPoliticChecked(value);
|
||||
}}
|
||||
@@ -216,13 +215,13 @@ const Register = () => {
|
||||
/>
|
||||
<span className="text-[14px] font-medium text-liquid-light h-[18px] ml-[10px]">
|
||||
Я принимаю{' '}
|
||||
<Link to={'/home'} className={' underline'}>
|
||||
{/* <Link to={'/home'} className={' underline'}>
|
||||
политику конфиденциальности
|
||||
</Link>
|
||||
</Link> */}
|
||||
<span className={' underline cursor-pointer'}>
|
||||
политику конфиденциальности
|
||||
</span>
|
||||
</span> */}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div className="mt-[10px]">
|
||||
|
||||
@@ -14,15 +14,12 @@ import {
|
||||
} from '../../../redux/slices/contests';
|
||||
import ModalCreateContest from './ModalCreate';
|
||||
import Filters from './Filter';
|
||||
import { toastWarning } from '../../../lib/toastNotification';
|
||||
|
||||
const Contests = () => {
|
||||
const dispatch = useAppDispatch();
|
||||
|
||||
const [modalActive, setModalActive] = useState<boolean>(false);
|
||||
|
||||
const jwt = useAppSelector((state) => state.auth.jwt);
|
||||
|
||||
const { contests, status } = useAppSelector(
|
||||
(state) => state.contests.fetchContests,
|
||||
);
|
||||
@@ -52,10 +49,6 @@ const Contests = () => {
|
||||
</div>
|
||||
<SecondaryButton
|
||||
onClick={() => {
|
||||
if (!jwt){
|
||||
toastWarning("Для создания контеста необходимо авторизоваться")
|
||||
return;
|
||||
}
|
||||
setModalActive(true);
|
||||
}}
|
||||
text="Создать контест"
|
||||
|
||||
@@ -10,7 +10,6 @@ import {
|
||||
import { fetchMissions } from '../../../redux/slices/missions';
|
||||
import ModalCreate from './ModalCreate';
|
||||
import Filters from './Filter';
|
||||
import { toastWarning } from '../../../lib/toastNotification';
|
||||
|
||||
export interface Mission {
|
||||
id: number;
|
||||
@@ -30,7 +29,6 @@ const Missions = () => {
|
||||
|
||||
const missions = useAppSelector((state) => state.missions.missions);
|
||||
|
||||
const jwt = useAppSelector((state) => state.auth.jwt);
|
||||
const nameFilter = useAppSelector(
|
||||
(state) => state.store.missions.filterName,
|
||||
);
|
||||
@@ -62,11 +60,6 @@ const Missions = () => {
|
||||
</div>
|
||||
<SecondaryButton
|
||||
onClick={() => {
|
||||
|
||||
if (!jwt){
|
||||
toastWarning("Для загрузки задачи необходимо авторизоваться")
|
||||
return;
|
||||
}
|
||||
setModalActive(true);
|
||||
}}
|
||||
text="Добавить задачу"
|
||||
|
||||
@@ -12,7 +12,6 @@ import { toastSuccess } from '../../../lib/toastNotification';
|
||||
import { cn } from '../../../lib/cn';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { NumberInput } from '../../../components/input/NumberInput';
|
||||
import { DropDownList, DropDownListItem } from '../../../components/input/DropDownList';
|
||||
|
||||
interface ModalCreateProps {
|
||||
active: boolean;
|
||||
@@ -20,37 +19,23 @@ interface ModalCreateProps {
|
||||
}
|
||||
|
||||
const ModalCreate: FC<ModalCreateProps> = ({ active, setActive }) => {
|
||||
type TagsMode = 'fromArchive' | 'none' | 'custom';
|
||||
const [name, setName] = useState<string>('');
|
||||
const [difficulty, setDifficulty] = useState<number>(1);
|
||||
const [file, setFile] = useState<File | null>(null);
|
||||
const [tagInput, setTagInput] = useState<string>('');
|
||||
const [tags, setTags] = useState<string[]>([]);
|
||||
const [tagsMode, setTagsMode] = useState<TagsMode>('fromArchive');
|
||||
|
||||
const status = useAppSelector((state) => state.missions.statuses.upload);
|
||||
const dispatch = useAppDispatch();
|
||||
|
||||
const [clickSubmit, setClickSubmit] = useState<boolean>(false);
|
||||
|
||||
const normalizeTags = (raw: string[]): string[] => {
|
||||
const result: string[] = [];
|
||||
const seen = new Set<string>();
|
||||
for (const t of raw) {
|
||||
const trimmed = t.trim();
|
||||
if (!trimmed) continue;
|
||||
const key = trimmed.toLowerCase();
|
||||
if (seen.has(key)) continue;
|
||||
seen.add(key);
|
||||
result.push(trimmed);
|
||||
}
|
||||
return result;
|
||||
};
|
||||
|
||||
const addTag = () => {
|
||||
const parts = tagInput.split(',').map((v) => v.trim());
|
||||
const next = normalizeTags([...tags, ...parts]);
|
||||
setTags(next);
|
||||
const newTag = tagInput.trim();
|
||||
if (newTag && !tags.includes(newTag)) {
|
||||
setTags([...tags, newTag]);
|
||||
setTagInput('');
|
||||
}
|
||||
};
|
||||
|
||||
const removeTag = (tagToRemove: string) => {
|
||||
@@ -66,27 +51,16 @@ const ModalCreate: FC<ModalCreateProps> = ({ active, setActive }) => {
|
||||
const handleSubmit = async () => {
|
||||
setClickSubmit(true);
|
||||
if (!file) return;
|
||||
|
||||
const payloadTags =
|
||||
tagsMode === 'custom' ? normalizeTags(tags) : undefined;
|
||||
|
||||
dispatch(
|
||||
uploadMission({
|
||||
missionFile: file,
|
||||
difficulty,
|
||||
tags: payloadTags,
|
||||
}),
|
||||
);
|
||||
dispatch(uploadMission({ file, name, difficulty, tags }));
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (status === 'successful') {
|
||||
toastSuccess('Миссия создана!');
|
||||
setName('');
|
||||
setDifficulty(1);
|
||||
setTags([]);
|
||||
setFile(null);
|
||||
setTagInput('');
|
||||
setTagsMode('fromArchive');
|
||||
dispatch(setMissionsStatus({ key: 'upload', status: 'idle' }));
|
||||
setActive(false);
|
||||
}
|
||||
@@ -99,32 +73,12 @@ const ModalCreate: FC<ModalCreateProps> = ({ active, setActive }) => {
|
||||
dispatch(setMissionsStatus({ key: 'upload', status: 'idle' }));
|
||||
}, [active]);
|
||||
|
||||
const getDifficultyErrorMessage = (): string => {
|
||||
const getNameErrorMessage = (): string => {
|
||||
if (!clickSubmit) return '';
|
||||
if (!Number.isFinite(difficulty) || difficulty < 1)
|
||||
return 'Укажите сложность (минимум 1)';
|
||||
if (name == '') return 'Поле не может быть пустым';
|
||||
return '';
|
||||
};
|
||||
|
||||
const tagsModeItems: DropDownListItem[] = [
|
||||
{ text: 'Теги: из архива', value: 'fromArchive' },
|
||||
{ text: 'Теги: без тегов', value: 'none' },
|
||||
{ text: 'Теги: свои', value: 'custom' },
|
||||
];
|
||||
|
||||
const isTagsMode = (v: string): v is TagsMode =>
|
||||
v === 'fromArchive' || v === 'none' || v === 'custom';
|
||||
|
||||
const currentTagsModeItem =
|
||||
tagsModeItems.find((i) => i.value === tagsMode) ?? tagsModeItems[0];
|
||||
|
||||
useEffect(() => {
|
||||
if (tagsMode === 'none') {
|
||||
setTags([]);
|
||||
setTagInput('');
|
||||
}
|
||||
}, [tagsMode]);
|
||||
|
||||
return (
|
||||
<Modal
|
||||
className="bg-liquid-background border-liquid-lighter border-[2px] p-[25px] rounded-[20px] text-liquid-white"
|
||||
@@ -135,6 +89,18 @@ const ModalCreate: FC<ModalCreateProps> = ({ active, setActive }) => {
|
||||
<div className="w-[500px]">
|
||||
<div className="font-bold text-[30px]">Добавить задачу</div>
|
||||
|
||||
<Input
|
||||
name="name"
|
||||
autocomplete="name"
|
||||
className="mt-[10px]"
|
||||
type="text"
|
||||
label="Название"
|
||||
defaultState={name}
|
||||
onChange={setName}
|
||||
placeholder="В яблочко"
|
||||
error={getNameErrorMessage()}
|
||||
/>
|
||||
|
||||
<NumberInput
|
||||
name="difficulty"
|
||||
className="mt-[10px]"
|
||||
@@ -144,7 +110,6 @@ const ModalCreate: FC<ModalCreateProps> = ({ active, setActive }) => {
|
||||
maxValue={3500}
|
||||
onChange={(v) => setDifficulty(v)}
|
||||
placeholder="1"
|
||||
error={getDifficultyErrorMessage()}
|
||||
/>
|
||||
|
||||
<div className="mt-4">
|
||||
@@ -172,38 +137,16 @@ const ModalCreate: FC<ModalCreateProps> = ({ active, setActive }) => {
|
||||
|
||||
{/* Теги */}
|
||||
<div className="mb-[50px] max-w-[600px]">
|
||||
<div className="mt-[20px]">
|
||||
<div className="text-[18px] text-liquid-white font-medium h-[23px] mb-[10px]">
|
||||
Режим тегов
|
||||
</div>
|
||||
<DropDownList
|
||||
items={tagsModeItems}
|
||||
defaultState={currentTagsModeItem}
|
||||
onChange={(v) => {
|
||||
if (isTagsMode(v)) setTagsMode(v);
|
||||
}}
|
||||
weight="w-full"
|
||||
/>
|
||||
{tagsMode === 'none' && (
|
||||
<div className="text-liquid-red text-[14px] mt-[8px] whitespace-pre-line">
|
||||
Пустой список тегов сейчас не поддерживается в multipart.
|
||||
Будет использован режим “из архива”.
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{tagsMode === 'custom' && (
|
||||
<>
|
||||
<div className="grid grid-cols-[1fr,140px] items-end gap-2">
|
||||
<Input
|
||||
name="missionTags"
|
||||
autocomplete="missionTags"
|
||||
name="articleTag"
|
||||
autocomplete="articleTag"
|
||||
className="mt-[20px] max-w-[600px]"
|
||||
type="text"
|
||||
label="Теги (через запятую)"
|
||||
label="Теги"
|
||||
onChange={(v) => setTagInput(v)}
|
||||
defaultState={tagInput}
|
||||
placeholder="arrays, dp"
|
||||
placeholder="arrays"
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === 'Enter') addTag();
|
||||
}}
|
||||
@@ -230,8 +173,6 @@ const ModalCreate: FC<ModalCreateProps> = ({ active, setActive }) => {
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
|
||||
@@ -3,7 +3,6 @@ import Editor from '@monaco-editor/react';
|
||||
import { upload } from '../../../assets/icons/input';
|
||||
import { cn } from '../../../lib/cn';
|
||||
import { DropDownList } from '../../../components/input/DropDownList';
|
||||
import { useParams } from 'react-router-dom';
|
||||
|
||||
const languageMap: Record<string, string> = {
|
||||
c: 'cpp',
|
||||
@@ -24,21 +23,19 @@ const CodeEditor: React.FC<CodeEditorProps> = ({
|
||||
onChange,
|
||||
onChangeLanguage,
|
||||
}) => {
|
||||
const { missionId } = useParams<{ missionId: string }>();
|
||||
|
||||
const [language, setLanguage] = useState<string>('C++');
|
||||
const [code, setCode] = useState<string>('');
|
||||
const [isDragging, setIsDragging] = useState<boolean>(false);
|
||||
|
||||
const items = [
|
||||
{ value: 'c', text: 'C' },
|
||||
{ value: 'C++', text: 'C++' },
|
||||
{ value: 'java', text: 'Java' },
|
||||
{ value: 'python', text: 'Python' },
|
||||
{ value: 'pascal', text: 'Pascal' },
|
||||
{ value: 'kotlin', text: 'Kotlin' },
|
||||
{ value: 'csharp', text: 'C#' },
|
||||
];
|
||||
const [language, setLanguage] = useState<string>('C++');
|
||||
|
||||
const getCodeKey = (missionId?: string) => `mission_${missionId}_code`;
|
||||
|
||||
useEffect(() => {
|
||||
onChange(code);
|
||||
@@ -47,24 +44,6 @@ const CodeEditor: React.FC<CodeEditorProps> = ({
|
||||
onChangeLanguage(language);
|
||||
}, [language]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!missionId || !code) return;
|
||||
|
||||
localStorage.setItem(getCodeKey(missionId), code);
|
||||
}, [code, missionId]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!missionId) return;
|
||||
|
||||
const savedCode = localStorage.getItem(getCodeKey(missionId));
|
||||
|
||||
if (savedCode !== null) {
|
||||
setCode(savedCode);
|
||||
} else {
|
||||
setCode('');
|
||||
}
|
||||
}, [missionId]);
|
||||
|
||||
const handleFileUpload = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||
const file = e.target.files?.[0];
|
||||
if (!file) return;
|
||||
@@ -116,6 +95,7 @@ const CodeEditor: React.FC<CodeEditorProps> = ({
|
||||
onChange={(v) => {
|
||||
setLanguage(v);
|
||||
}}
|
||||
defaultState={{ value: 'C++', text: 'C++' }}
|
||||
/>
|
||||
|
||||
<label
|
||||
|
||||
@@ -78,7 +78,7 @@ const replaceImages = (
|
||||
const doc = parser.parseFromString(html, 'text/html');
|
||||
|
||||
const latexImageNames = Array.from(
|
||||
latex.matchAll(/\\includegraphics(?:\[[^\]]*\])?\{(.+?)\}/g),
|
||||
latex.matchAll(/\\includegraphics\{(.+?)\}/g),
|
||||
).map((match) => match[1]);
|
||||
|
||||
const imgs = doc.querySelectorAll<HTMLImageElement>('img.tex-graphics');
|
||||
|
||||
@@ -5,7 +5,6 @@ import { CopyIcon } from '../../../assets/icons/missions';
|
||||
// import FullLatexRenderer from "./FullLatexRenderer";
|
||||
|
||||
import { useState } from 'react';
|
||||
import { toastSuccess } from '../../../lib/toastNotification';
|
||||
|
||||
interface CopyableDivPropd {
|
||||
content: string;
|
||||
@@ -17,7 +16,7 @@ const CopyableDiv: FC<CopyableDivPropd> = ({ content }) => {
|
||||
const handleCopy = async () => {
|
||||
try {
|
||||
await navigator.clipboard.writeText(content);
|
||||
toastSuccess('Скопировано!');
|
||||
alert('Скопировано!');
|
||||
} catch (err) {}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user