diff --git a/services/backend/api/v1/task/views.py b/services/backend/api/v1/task/views.py index 6cf535d..00aa38d 100644 --- a/services/backend/api/v1/task/views.py +++ b/services/backend/api/v1/task/views.py @@ -210,7 +210,7 @@ def get_competition_results(request, competition_id: UUID): task_name=task.title, result=result, max_points=task.points, - position=task.in_competition_positions + position=task.in_competition_position )) return status.OK, data diff --git a/services/frontend/public/lottie.png b/services/frontend/public/lottie.png new file mode 100644 index 0000000..e2f59b6 Binary files /dev/null and b/services/frontend/public/lottie.png differ diff --git a/services/frontend/src/components/layout/header.tsx b/services/frontend/src/components/layout/header.tsx index 3bc9470..fd6d5af 100644 --- a/services/frontend/src/components/layout/header.tsx +++ b/services/frontend/src/components/layout/header.tsx @@ -30,13 +30,14 @@ export const Header = () => {
- Материалы - + @@ -53,7 +54,7 @@ export const Header = () => {
- + Материалы diff --git a/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/FileSolution/index.tsx b/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/FileSolution/index.tsx index 992f117..0e9db9e 100644 --- a/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/FileSolution/index.tsx +++ b/services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/FileSolution/index.tsx @@ -60,11 +60,15 @@ const FileSolution: React.FC = ({ }; - const fileName = selectedFile + const fullFileName = selectedFile ? selectedFile.name : existingFileUrl ? existingFileUrl.split('/').pop() || 'file' : ''; + + const fileName = fullFileName.length > 20 + ? fullFileName.substring(0, 20) + '...' + : fullFileName; const hasFile = !!selectedFile || !!existingFileUrl; diff --git a/services/frontend/src/pages/Profile/widgets/user-info.tsx b/services/frontend/src/pages/Profile/widgets/user-info.tsx index e0ddc94..3e025fd 100644 --- a/services/frontend/src/pages/Profile/widgets/user-info.tsx +++ b/services/frontend/src/pages/Profile/widgets/user-info.tsx @@ -3,15 +3,14 @@ import { User } from "@/shared/types/user"; export const UserInfo = ({ user }: { user: User }) => { return (
- {user.avatar && ( -
- {user.username} -
- )} +
+ {user.username} +
+

{user.username}

{user.email}

diff --git a/services/frontend/src/pages/Review/modules/review-dialog.tsx b/services/frontend/src/pages/Review/modules/review-dialog.tsx index 59e7402..9ef4c42 100644 --- a/services/frontend/src/pages/Review/modules/review-dialog.tsx +++ b/services/frontend/src/pages/Review/modules/review-dialog.tsx @@ -148,7 +148,12 @@ const ReviewDescription = ({ review }: { review: Review }) => { const ReviewContent = ({ review }: { review: Review }) => { const extension = review.content.split(".").at(-1); - const filename = review.content.split("/").at(-1); + const fullFilename = review.content.split("/").at(-1); + + const filename = fullFilename ? + (fullFilename.length > 20 ? fullFilename.substring(0, 20) + '...' : fullFilename) + : ''; + const { data: content, isLoading } = useQuery({ queryKey: ["review-file", review.id],