Skip to content

Fixed: GML-71, GML-72, GML-73, GML-74 and fix command scroll #156

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
Scondic merged 5 commits into from
Jan 5, 2026
Merged

Fixed: GML-71, GML-72, GML-73, GML-74 and fix command scroll #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
167f32b
add Discord integration and update dependencies and fix command scroll
Jan 5, 2026
4dc4fc2
GML-71: Fix form validation and revalidate modes for CreateProfileFor…
Scondic Jan 5, 2026
81d0a4e
GML-72: Fix column rendering and loader icon (#152)
Scondic Jan 5, 2026
b8e06fc
GML-73: Fix integration links and added link to youtrack (#154)
Scondic Jan 5, 2026
44429c2
GML-74: Fix visible mods for AddingModsDialog (#155)
Scondic Jan 5, 2026
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
5,261 changes: 2,133 additions & 3,128 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "25.3.3",
"private": true,
"scripts": {
"dev": "next dev",
"dev": "next dev -H 0.0.0.0 --port 3000",
"build": "next build",
"start": "next start",
"lint": "next lint",
Expand All @@ -13,33 +13,33 @@
"@faker-js/faker": "9.0.0",
"@hookform/resolvers": "3.9.0",
"@microsoft/signalr": "8.0.7",
"@radix-ui/react-accordion": "1.2.7",
"@radix-ui/react-alert-dialog": "1.1.1",
"@radix-ui/react-avatar": "1.1.2",
"@radix-ui/react-checkbox": "1.1.1",
"@radix-ui/react-dialog": "1.1.1",
"@radix-ui/react-dropdown-menu": "2.1.1",
"@radix-ui/react-icons": "1.3.0",
"@radix-ui/react-label": "2.1.0",
"@radix-ui/react-menubar": "1.1.1",
"@radix-ui/react-navigation-menu": "1.2.0",
"@radix-ui/react-popover": "1.1.1",
"@radix-ui/react-progress": "1.1.0",
"@radix-ui/react-accordion": "1.2.12",
"@radix-ui/react-alert-dialog": "1.1.15",
"@radix-ui/react-avatar": "1.1.11",
"@radix-ui/react-checkbox": "1.1.5",
"@radix-ui/react-dialog": "1.1.15",
"@radix-ui/react-dropdown-menu": "2.1.16",
"@radix-ui/react-icons": "1.3.2",
"@radix-ui/react-label": "2.1.8",
"@radix-ui/react-menubar": "1.1.16",
"@radix-ui/react-navigation-menu": "1.2.14",
"@radix-ui/react-popover": "1.1.15",
"@radix-ui/react-progress": "1.1.8",
"@radix-ui/react-scroll-area": "1.1.0",
"@radix-ui/react-select": "2.1.1",
"@radix-ui/react-separator": "1.1.0",
"@radix-ui/react-select": "2.1.7",
"@radix-ui/react-separator": "1.1.8",
"@radix-ui/react-slider": "1.1.2",
"@radix-ui/react-slot": "1.1.0",
"@radix-ui/react-switch": "1.1.0",
"@radix-ui/react-tabs": "1.1.0",
"@radix-ui/react-tooltip": "1.1.2",
"@radix-ui/react-slot": "1.1.2",
"@radix-ui/react-switch": "1.1.4",
"@radix-ui/react-tabs": "1.1.13",
"@radix-ui/react-tooltip": "1.1.8",
"@tanstack/react-query": "5.50.1",
"@tanstack/react-query-devtools": "5.50.1",
"@tanstack/react-table": "8.19.2",
"@tanstack/react-table": "8.19.4",
"axios": "^1.11.0",
"class-variance-authority": "0.7.0",
"clsx": "2.1.1",
"cmdk": "1.0.0",
"cmdk": "1.1.1",
"colord": "2.9.3",
"date-fns": "3.6.0",
"js-cookie": "3.0.5",
Expand Down
4 changes: 4 additions & 0 deletions src/assets/logos/discord.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions src/features/create-profile-form/ui/CreateProfileForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ export function CreateProfileForm(props: CreateProfileFormProps) {
version: profile?.clientVersion || '',
},
resolver: zodResolver(CreateProfileSchema),
mode: 'onChange',
reValidateMode: 'onChange',
});

const versions = useGetGameVersions({
Expand Down Expand Up @@ -158,7 +160,7 @@ export function CreateProfileForm(props: CreateProfileFormProps) {
disabled={!form.getFieldState('version').isDirty || loaderVersion.isFetching}
>
<SelectTrigger>
<SelectValue placeholder="Выберите игровой загрузчик" />
<SelectValue placeholder="Выберите игровой загрузчик"/>
</SelectTrigger>
<SelectContent>
{enumValues(GameLoaderOption).map(([loader, value]) => (
Expand Down Expand Up @@ -217,7 +219,7 @@ export function CreateProfileForm(props: CreateProfileFormProps) {
loaderVersion.isFetching
}
>
{isPending && <Icons.spinner className="mr-2 h-4 w-4 animate-spin" />}
{isPending && <Icons.spinner className="mr-2 h-4 w-4 animate-spin"/>}
Создать
</Button>
</div>
Expand Down
46 changes: 18 additions & 28 deletions src/features/download-client-form/ui/DownloadClientForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Controller, useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
import React from "react";

import { ClientDownloadFormSchemaType, ClientDownloadSchema } from '../lib/static';
import { useOnSubmit } from '../lib/hooks/useOnSubmit';
Expand All @@ -12,19 +13,19 @@ import { Form, FormControl, FormItem, FormLabel, FormMessage } from '@/shared/ui
import { Icons } from '@/shared/ui/icons';
import { Input } from '@/shared/ui/input';
import { Progress } from '@/shared/ui/progress';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/shared/ui/select';
import { FormCombobox } from "@/shared/ui/FormCombobox";

interface DownloadClientFormProps extends React.HTMLAttributes<HTMLDivElement> {
connectionHub: ReturnType<typeof useConnectionHub>['connectionHub'];
state: ReturnType<typeof useConnectionHub>['download'];
}

export function DownloadClientForm({
className,
connectionHub,
state,
...props
}: DownloadClientFormProps) {
className,
connectionHub,
state,
...props
}: DownloadClientFormProps) {
const { percent, isDownload } = state;

const { onSubmit } = useOnSubmit({ connectionHub, state });
Expand All @@ -46,26 +47,15 @@ export function DownloadClientForm({
name="branch"
render={({ field }) => (
<FormItem className="flex-1">
<FormLabel>Выберите версию</FormLabel>
<FormControl>
<Select
onValueChange={field.onChange}
defaultValue={field.value}
disabled={field.disabled}
>
<SelectTrigger>
<SelectValue placeholder="Выберите версию" />
</SelectTrigger>
<SelectContent>
{branches &&
branches.map(({ version }) => (
<SelectItem key={version} value={version}>
{version}
</SelectItem>
))}
</SelectContent>
</Select>
</FormControl>
<FormLabel>Версия</FormLabel>
<FormCombobox
name={field.name}
value={field.value}
placeholder="Выберите версию"
placeholderInputSearch="Поиск версии"
options={branches && branches.map(({ version }) => version) || []}
setValue={form.setValue}
/>
{form.formState.errors.branch && (
<FormMessage>{form.formState.errors.branch.message}</FormMessage>
)}
Expand Down Expand Up @@ -111,12 +101,12 @@ export function DownloadClientForm({
<p className="text-gray-700 dark:text-gray-200 text-sm">
Загрузка завершена на {percent}% из 100%
</p>
<Progress className="h-2" value={percent} />
<Progress className="h-2" value={percent}/>
</div>
)}

<Button className="w-fit ml-auto" disabled={isDownload || !form.formState.isDirty}>
{isDownload && <Icons.spinner className="mr-2 h-4 w-4 animate-spin" />}
{isDownload && <Icons.spinner className="mr-2 h-4 w-4 animate-spin"/>}
Скачать исходники
</Button>
</div>
Expand Down
19 changes: 4 additions & 15 deletions src/features/update-client-form/ui/UpdateClientForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,10 @@ import Link from 'next/link';
import { ClientUpdateFormSchemaType, ClientUpdateSchema } from '../lib/static';

import { Icons } from '@/shared/ui/icons';
import {
useLauncherActualVersion,
useLauncherBuildVersions,
useLauncherUpload,
} from '@/shared/hooks';
import { useLauncherActualVersion, useLauncherBuildVersions, useLauncherUpload } from '@/shared/hooks';
import { cn, getApiBaseUrl, getFormatDate } from '@/shared/lib/utils';
import { Button } from '@/shared/ui/button';
import {
Form,
FormControl,
FormDescription,
FormItem,
FormLabel,
FormMessage,
} from '@/shared/ui/form';
import { Form, FormControl, FormDescription, FormItem, FormLabel, FormMessage } from '@/shared/ui/form';
import { Textarea } from '@/shared/ui/textarea';
import { Input } from '@/shared/ui/input';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/shared/ui/select';
Expand Down Expand Up @@ -64,7 +53,7 @@ export function UpdateClientForm({ className, onOpenChange, ...props }: UpdateCl
<FormControl>
<Select onValueChange={field.onChange} defaultValue={field.value}>
<SelectTrigger>
<SelectValue placeholder="Выберите версию билда" />
<SelectValue placeholder="Выберите версию билда"/>
</SelectTrigger>
<SelectContent>
{versions &&
Expand Down Expand Up @@ -147,7 +136,7 @@ export function UpdateClientForm({ className, onOpenChange, ...props }: UpdateCl

<div className="flex gap-x-4 justify-end items-center">
<Button className="w-fit" disabled={isPending || !form.formState.isDirty}>
{isPending && <Icons.spinner className="mr-2 h-4 w-4 animate-spin" />}
{isPending && <Icons.spinner className="mr-2 h-4 w-4 animate-spin"/>}
Обновить
</Button>
</div>
Expand Down
62 changes: 34 additions & 28 deletions src/shared/api/contracts/profiles/zod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,36 @@ import { z } from 'zod';

export const ModDetailsEntitySchema = z.object({
title: z
.string()
.min(2, { message: 'Название мода должно быть больше 2 символов' })
.max(100, { message: 'Название мода не должно быть больше 100 символов' }),
.string()
.min(2, { message: 'Название мода должно быть больше 2 символов' })
.max(100, { message: 'Название мода не должно быть больше 100 символов' }),
description: z
.string()
.min(2, { message: 'Описание мода должно быть больше 2 символов' })
.max(1000, { message: 'Описание мода не должно быть больше 1000 символов' }),
.string()
.min(2, { message: 'Описание мода должно быть больше 2 символов' })
.max(1000, { message: 'Описание мода не должно быть больше 1000 символов' }),
});

export const CreateProfileSchema = z.object({
name: z
.string()
.min(2, { message: 'Длина имени должна быть больше 2 символов' })
.max(100, { message: 'Длина имени не должна быть больше 100 символов' }),
.string()
.min(1, { message: 'Обязательное поле' })
.regex(/^[a-zA-Z0-9-]*$/, {
message: 'Название профиля может содержать только английские буквы, цифры и тире',
})
.min(2, { message: 'Длина имени должна быть от 2 до 100 символов' })
.max(100, { message: 'Длина имени должна быть от 2 до 100 символов' }),
displayName: z
.string()
.min(2, { message: 'Длина имени должна быть больше 2 символов' })
.max(100, { message: 'Длина имени не должна быть больше 100 символов' }),
.string()
.min(1, { message: 'Обязательное поле' })
.min(2, { message: 'Длина имени должна быть больше 2 символов' })
.max(100, { message: 'Длина имени не должна быть больше 100 символов' }),
description: z
.string()
.min(2, { message: 'Длина описания должна быть больше 2 символов' })
.max(1000, {
message: 'Длина описания не должна быть больше 1000 символов',
}),
.string()
.min(1, { message: 'Обязательное поле' })
.min(2, { message: 'Длина описания должна быть больше 2 символов' })
.max(1000, {
message: 'Длина описания не должна быть больше 1000 символов',
}),
version: z.string({
errorMap: () => ({
message: 'Не выбрана версия игры',
Expand All @@ -38,19 +44,19 @@ export const CreateProfileSchema = z.object({

export const EditProfileSchema = z.object({
name: z
.string()
.min(2, { message: 'Длина имени должна быть больше 2 символов' })
.max(100, { message: 'Длина имени не должна быть больше 100 символов' }),
.string()
.min(2, { message: 'Длина имени должна быть больше 2 символов' })
.max(100, { message: 'Длина имени не должна быть больше 100 символов' }),
displayName: z
.string()
.min(2, { message: 'Длина имени должна быть больше 2 символов' })
.max(100, { message: 'Длина имени не должна быть больше 100 символов' }),
.string()
.min(2, { message: 'Длина имени должна быть больше 2 символов' })
.max(100, { message: 'Длина имени не должна быть больше 100 символов' }),
description: z
.string()
.min(2, { message: 'Длина описания должна быть больше 2 символов' })
.max(255, {
message: 'Длина описания не должна быть больше 255 символов',
}),
.string()
.min(2, { message: 'Длина описания должна быть больше 2 символов' })
.max(255, {
message: 'Длина описания не должна быть больше 255 символов',
}),
jvmArguments: z.string().optional(),
gameArguments: z.string().optional(),
priority: z.coerce.number().optional(),
Expand Down
1 change: 1 addition & 0 deletions src/shared/constants/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export const HREF_GET_WORDPRESS_AUTH_PHP =
export const HREF_DOCUMENTATION_CUSTOM_ENDPOINT =
'https://wiki.recloud.tech/docs/gml-launcher/backend/authorization/custom';
export const HREF_DISCORD = 'https://discord.com/invite/b5xgqfWgNt';
export const HREF_YOUTRACK = 'https://youtrack.recloud.tech/agiles/173-5/current';
export const HREF_RECLOUD_PRO =
'https://market.recloud.tech/#:~:text=Gml%20Лаунчер%20%7C-,Тариф%20Pro,-(месяц)';

Expand Down
38 changes: 26 additions & 12 deletions src/shared/converters/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import quilt from '@/assets/logos/quilt.png';

export const convertGameLoaderImage = (loader: GameLoaderOption) => {
const converter: Record<GameLoaderOption, ReactElement> = {
[GameLoaderOption.VANILLA]: <Image src={vanilla} alt="Minecraft" width={24} height={24} />,
[GameLoaderOption.FORGE]: <Image src={forge} alt="Forge" width={24} height={24} />,
[GameLoaderOption.FABRIC]: <Image src={fabric} alt="Fabric" width={24} height={24} />,
[GameLoaderOption.NEOFORGE]: <Image src={neoForge} alt="NeoForge" width={18} height={18} />,
[GameLoaderOption.QUILT]: <Image src={quilt} alt="Quilt" width={18} height={18} />,
[GameLoaderOption.VANILLA]: <Image src={vanilla} alt="Minecraft" width={24} height={24}/>,
[GameLoaderOption.FORGE]: <Image src={forge} alt="Forge" width={24} height={24}/>,
[GameLoaderOption.FABRIC]: <Image src={fabric} alt="Fabric" width={24} height={24}/>,
[GameLoaderOption.NEOFORGE]: <Image src={neoForge} alt="NeoForge" width={18} height={18}/>,
[GameLoaderOption.QUILT]: <Image src={quilt} alt="Quilt" width={18} height={18}/>,
[GameLoaderOption.LITELOADER]: (
<Image src={liteLoader} alt="Liteloader" width={24} height={24} />
<Image src={liteLoader} alt="Liteloader" width={24} height={24}/>
),
};

Expand All @@ -27,24 +27,38 @@ export const convertGameLoaderImage = (loader: GameLoaderOption) => {
export const convertApiGameLoaderImage = (loader: GameLoaderType) => {
const converter: Record<GameLoaderType, ReactElement> = {
[GameLoaderType.VANILLA]: (
<Image src={vanilla} alt="Minecraft" className="min-w-4" width={24} height={24} />
<Image src={vanilla} alt="Minecraft" className="min-w-4" width={24} height={24}/>
),
[GameLoaderType.FORGE]: (
<Image src={forge} alt="Forge" className="min-w-6" width={24} height={24} />
<Image src={forge} alt="Forge" className="min-w-6" width={24} height={24}/>
),
[GameLoaderType.FABRIC]: (
<Image src={fabric} alt="Fabric" className="min-w-4" width={24} height={24} />
<Image src={fabric} alt="Fabric" className="min-w-4" width={24} height={24}/>
),
[GameLoaderType.NEOFORGE]: (
<Image src={neoForge} alt="NeoForge" className="min-w-4" width={18} height={18} />
<Image src={neoForge} alt="NeoForge" className="min-w-4" width={18} height={18}/>
),
[GameLoaderType.QUILT]: (
<Image src={quilt} alt="Quilt" className="min-w-4" width={18} height={18} />
<Image src={quilt} alt="Quilt" className="min-w-4" width={18} height={18}/>
),
[GameLoaderType.LITELOADER]: (
<Image src={liteLoader} alt="Liteloader" className="min-w-4" width={24} height={24} />
<Image src={liteLoader} alt="Liteloader" className="min-w-4" width={24} height={24}/>
),
};

return converter[loader];
};


export const convertApiGameLoaderName = (loader: GameLoaderType) => {
const converter: Record<GameLoaderType, string> = {
[GameLoaderType.VANILLA]: 'Minecraft',
[GameLoaderType.FORGE]: 'Forge',
[GameLoaderType.FABRIC]: 'Fabric',
[GameLoaderType.NEOFORGE]: 'NeoForge',
[GameLoaderType.QUILT]: 'Quilt',
[GameLoaderType.LITELOADER]: 'Liteloader',
};

return converter[loader];
};
Loading