Skip to content

Update to 2025.1.2 #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GamerVII-NET merged 2 commits into from
Aug 18, 2025
Merged

Update to 2025.1.2 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9da9878
Merge pull request #136 from Gml-Launcher/master
GamerVII-NET Aug 17, 2025
0193aae
Добавлена обработка файлов и оптимизация передачи данных
Gamer-VII Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/entities/ProfileCard/ui/ProfileCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export const ProfileCard = ({ profile }: ProfileCardParams) => {
formUpdate.append('jvmArguments', profile?.jvmArguments);
formUpdate.append('gameArguments', profile?.gameArguments);
formUpdate.append('priority', profile?.priority?.toString() ?? '0');
formUpdate.append('recommendedRam', (profile?.recommendedRam ?? 1024).toString());

// Обработка загрузки иконки
if (body.icon && body.icon[0]) {
Expand Down
47 changes: 39 additions & 8 deletions src/features/edit-profile-form/ui/EditProfileForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@ import { SubmitHandler, useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';

import { useEditProfile } from '@/shared/hooks';
import {
EditProfileFormSchemaType,
EditProfileSchema,
ProfileExtendedBaseEntity,
} from '@/shared/api/contracts';
import { EditProfileFormSchemaType, EditProfileSchema, ProfileExtendedBaseEntity } from '@/shared/api/contracts';
import { Form, FormField, FormMessage } from '@/shared/ui/form';
import { Input } from '@/shared/ui/input';
import { Textarea } from '@/shared/ui/textarea';
Expand Down Expand Up @@ -52,15 +48,50 @@ export const EditProfileForm = (props: EditProfileFormProps) => {
formUpdate.append('displayName', body.displayName);
formUpdate.append('originalName', profile?.profileName || '');
formUpdate.append('description', body.description);
formUpdate.append('icon', body.icon?.[0]);

const iconFile =
body.icon && typeof body.icon !== 'string' && body.icon[0] instanceof File
? body.icon[0]
: undefined;
if (iconFile) {
formUpdate.append('icon', iconFile);
} else if (profile?.iconBase64) {
try {
const iconBlob = await fetch(`data:image/png;base64,${profile.iconBase64}`).then((r) =>
r.blob(),
);
formUpdate.append('icon', new File([iconBlob], 'icon.png', { type: 'image/png' }));
} catch (e) {
console.error('Error converting existing icon to file:', e);
}
}

formUpdate.append('enabled', body.isEnabled?.toString() ?? 'true');
formUpdate.append('priority', body.priority?.toString() ?? '0');
formUpdate.append('recommendedRam', body.recommendedRam?.toString() ?? '50');

if (body.background && body.background[0]) {
formUpdate.append('background', body.background[0]);
const backgroundFile =
body.background && typeof body.background !== 'string' && body.background[0] instanceof File
? body.background[0]
: undefined;
if (backgroundFile) {
formUpdate.append('background', backgroundFile);
} else if (profile?.background && profile.background.trim() !== '') {
try {
const backgroundResponse = await fetch(profile.background);
const backgroundBlob = await backgroundResponse.blob();
formUpdate.append(
'background',
new File([backgroundBlob], 'background.png', { type: 'image/png' }),
);
} catch (error) {
console.error('Error fetching existing background image:', error);
}
}

const needUpdateImages = Boolean(iconFile) || Boolean(backgroundFile);
formUpdate.append('needUpdateImages', needUpdateImages.toString());

if (body.jvmArguments) {
formUpdate.append('jvmArguments', body.jvmArguments);
}
Expand Down