-
- У вас нет уведомлений
-
+
+ {data && data.notifications ? (
+ data.notifications.slice(0, 10).map(({ message, details, date, type }, index) => (
+
+
+
+
+ {message}
+
+
+ {details ? details : "Детали отсутствуют"}
+
+
{getFormatDate(date)}
+
+
+
+ ))
+ ) : (
+
+ У вас нет уведомлений
+
+ )}
+
+ Показать все
+
);
diff --git a/src/features/update-client-form/ui/UpdateClientForm.tsx b/src/features/update-client-form/ui/UpdateClientForm.tsx
index b6ae02d..b7853d7 100644
--- a/src/features/update-client-form/ui/UpdateClientForm.tsx
+++ b/src/features/update-client-form/ui/UpdateClientForm.tsx
@@ -4,7 +4,7 @@ import { Controller, SubmitHandler, useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { Icons } from "@/shared/ui/icons";
-import { useLauncherVersionsBuilds, useUpdateLauncher } from "@/shared/hooks";
+import { useLauncherBuildVersions, useLauncherUpload } from "@/shared/hooks";
import { cn } from "@/shared/lib/utils";
import { Button } from "@/shared/ui/button";
import { Form, FormControl, FormItem, FormLabel, FormMessage } from "@/shared/ui/form";
@@ -19,9 +19,9 @@ interface UpdateClientFormProps extends React.HTMLAttributes
{
}
export function UpdateClientForm({ className, onOpenChange, ...props }: UpdateClientFormProps) {
- const { data: versions } = useLauncherVersionsBuilds();
+ const { data: versions } = useLauncherBuildVersions();
- const { mutateAsync, isPending } = useUpdateLauncher();
+ const { mutateAsync, isPending } = useLauncherUpload();
const form = useForm({
values: { version: "", title: "", description: "", launcherBuild: "" },
diff --git a/src/nextjs.d.ts b/src/nextjs.d.ts
new file mode 100644
index 0000000..41cb5e8
--- /dev/null
+++ b/src/nextjs.d.ts
@@ -0,0 +1 @@
+type Nullable = BaseType | null;
diff --git a/src/shared/api/contracts/gameservers/requests.ts b/src/shared/api/contracts/gameservers/requests.ts
new file mode 100644
index 0000000..0300fc3
--- /dev/null
+++ b/src/shared/api/contracts/gameservers/requests.ts
@@ -0,0 +1,25 @@
+import { ResponseBaseEntity } from "@/shared/api/schemas";
+import { GameServerBaseEntity } from "@/shared/api/contracts";
+
+export type TGetGameServersRequest = {
+ profileName: string;
+};
+export type TGetGameServersResponse = ResponseBaseEntity & {
+ data: GameServerBaseEntity[];
+};
+
+export type TPostGameServersRequest = {
+ profileName: string;
+ name: string;
+ address: string;
+ port: number;
+};
+export type TPostGameServersResponse = ResponseBaseEntity & {
+ data: GameServerBaseEntity;
+};
+
+export type TDeleteGameServersRequest = {
+ profileName: string;
+ serverName: string;
+};
+export type TDeleteGameServersResponse = ResponseBaseEntity & {};
diff --git a/src/shared/api/contracts/gameservers/schemas.ts b/src/shared/api/contracts/gameservers/schemas.ts
new file mode 100644
index 0000000..8ab7f9d
--- /dev/null
+++ b/src/shared/api/contracts/gameservers/schemas.ts
@@ -0,0 +1,9 @@
+export type GameServerBaseEntity = {
+ name: string;
+ address: string;
+ port: number;
+ version: string;
+ isOnline: boolean;
+ online: number;
+ maxOnline: number;
+};
diff --git a/src/shared/api/contracts/gameservers/zod.ts b/src/shared/api/contracts/gameservers/zod.ts
new file mode 100644
index 0000000..56660ed
--- /dev/null
+++ b/src/shared/api/contracts/gameservers/zod.ts
@@ -0,0 +1,9 @@
+import { z } from "zod";
+
+export const AddGameServerScheme = z.object({
+ name: z.string().min(1, { message: "Вы не заполнили поле" }),
+ address: z.string().min(1, { message: "Вы не заполнили поле" }),
+ port: z.number({ invalid_type_error: "Вы не заполнили поле" }),
+});
+
+export type AddGameServerSchemeType = z.infer;
diff --git a/src/shared/api/contracts/index.ts b/src/shared/api/contracts/index.ts
index 78ea342..a1c3efc 100644
--- a/src/shared/api/contracts/index.ts
+++ b/src/shared/api/contracts/index.ts
@@ -16,3 +16,12 @@ export * from "@/shared/api/contracts/settings/platform/requests";
// Контракты для белого списка
export * from "@/shared/api/contracts/whitelist/schemas";
export * from "@/shared/api/contracts/whitelist/requests";
+
+// Контракты для игровых серверов
+export * from "@/shared/api/contracts/gameservers/schemas";
+export * from "@/shared/api/contracts/gameservers/requests";
+export * from "@/shared/api/contracts/gameservers/zod";
+
+// Контракты для уведомлений
+export * from "@/shared/api/contracts/notification/schemas";
+export * from "@/shared/api/contracts/notification/requests";
diff --git a/src/shared/api/contracts/integrations/requests.ts b/src/shared/api/contracts/integrations/requests.ts
index 508ea16..0d53289 100644
--- a/src/shared/api/contracts/integrations/requests.ts
+++ b/src/shared/api/contracts/integrations/requests.ts
@@ -6,8 +6,8 @@ import {
SentryBaseEntity,
TextureServiceBaseEntity,
} from "@/shared/api/contracts";
-import { ResponseBaseEntity } from "@/shared/api/schemas";
import { TexturesServiceType } from "@/shared/enums";
+import { ResponseBaseEntity } from "@/shared/api/schemas"; // Получение списка серверов для авторизации
// Получение списка серверов для авторизации
export type TGetAuthIntegrationsRequest = {};
@@ -22,20 +22,26 @@ export type TGetActiveAuthIntegrationsResponse = ResponseBaseEntity & {
};
// Получение списка веток
-export type TGetInstallClientBranchesRequest = {};
-export type TGetInstallClientBranchesResponse = ResponseBaseEntity & {
+export type TGetLauncherGithubVersionsRequest = {};
+export type TGetLauncherGithubVersionsResponse = ResponseBaseEntity & {
data: BranchBaseEntity[];
};
+// Получение списка платформ
+export type TGetLauncherBuildPlatformsRequest = {};
+export type TGetLauncherBuildPlatformsResponse = ResponseBaseEntity & {
+ data: string[];
+};
+
// Получение списка билдов лаунчера
-export type TGetLauncherVersionBuildsRequest = {};
-export type TGetLauncherVersionBuildsResponse = ResponseBaseEntity & {
+export type TGetLauncherBuildVersionsRequest = {};
+export type TGetLauncherBuildVersionsResponse = ResponseBaseEntity & {
data: LauncherBuildsBaseEntity[];
};
// Обновление лаунчера
-export type TPostLauncherUpdateRequest = FormData;
-export type TPostLauncherUpdateResponse = ResponseBaseEntity & {};
+export type TPostLauncherUploadRequest = FormData;
+export type TPostLauncherUploadResponse = ResponseBaseEntity & {};
// Изменение сервера авторизации
export type TPostAuthIntegrationsRequest = {
diff --git a/src/shared/api/contracts/notification/requests.ts b/src/shared/api/contracts/notification/requests.ts
new file mode 100644
index 0000000..789fb61
--- /dev/null
+++ b/src/shared/api/contracts/notification/requests.ts
@@ -0,0 +1,10 @@
+import { ResponseBaseEntity } from "@/shared/api/schemas";
+import { NotificationBaseEntity } from "@/shared/api/contracts/notification/schemas";
+
+export type TGetNotificationRequest = {};
+export type TGetNotificationResponse = ResponseBaseEntity & {
+ data: {
+ notifications: NotificationBaseEntity[];
+ amount: number;
+ };
+};
diff --git a/src/shared/api/contracts/notification/schemas.ts b/src/shared/api/contracts/notification/schemas.ts
new file mode 100644
index 0000000..f0b2551
--- /dev/null
+++ b/src/shared/api/contracts/notification/schemas.ts
@@ -0,0 +1,8 @@
+import { NotificationStatus } from "@/shared/enums/notificationType";
+
+export type NotificationBaseEntity = {
+ message: string;
+ details: string;
+ type: NotificationStatus;
+ date: string;
+};
diff --git a/src/shared/enums/entityState.ts b/src/shared/enums/entityState.ts
new file mode 100644
index 0000000..8d79e8e
--- /dev/null
+++ b/src/shared/enums/entityState.ts
@@ -0,0 +1,13 @@
+export enum EntityState {
+ ENTITY_STATE_CREATED = 0, // Профиль создан
+ ENTITY_STATE_LOADING = 1, // Профиль загружается
+ ENTITY_STATE_ACTIVE = 2, // Профиль активен
+ ENTITY_STATE_DISABLED = 3, // Профиль отключен
+}
+
+export enum EntityStateOption {
+ "OPTION_0" = "Создан", // Профиль создан
+ "OPTION_1" = "Загружается", // Профиль загружается
+ "OPTION_2" = "Активен", // Профиль активен
+ "OPTION_3" = "Недоступен", // Профиль активен
+}
diff --git a/src/shared/enums/index.ts b/src/shared/enums/index.ts
index 4640083..c51c11f 100644
--- a/src/shared/enums/index.ts
+++ b/src/shared/enums/index.ts
@@ -1,6 +1,7 @@
export * from "./auth";
+export * from "./entityState";
export * from "./integration";
+export * from "./notificationType";
export * from "./storages";
export * from "./systems";
export * from "./textures";
-export * from "./profileState";
diff --git a/src/shared/enums/notificationType.ts b/src/shared/enums/notificationType.ts
new file mode 100644
index 0000000..0595bfa
--- /dev/null
+++ b/src/shared/enums/notificationType.ts
@@ -0,0 +1,8 @@
+export enum NotificationStatus {
+ TRACE,
+ DEBUG,
+ INFORMATION,
+ WARNING,
+ ERROR,
+ FATAL,
+}
diff --git a/src/shared/enums/profileState.ts b/src/shared/enums/profileState.ts
deleted file mode 100644
index 777200c..0000000
--- a/src/shared/enums/profileState.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export enum ProfileState {
- PROFILE_STATE_CREATED = 0, // Профиль создан
- PROFILE_STATE_LOADING = 1, // Профиль загружается
- PROFILE_STATE_ACTIVE = 2, // Профиль активен
-}
-
-export enum ProfileStateOption {
- "OPTION_0" = "Создан", // Профиль создан
- "OPTION_1" = "Загружается", // Профиль загружается
- "OPTION_2" = "Активен", // Профиль активен
-}
diff --git a/src/shared/hooks/index.ts b/src/shared/hooks/index.ts
index 2cddc69..811e8c5 100644
--- a/src/shared/hooks/index.ts
+++ b/src/shared/hooks/index.ts
@@ -1,3 +1,4 @@
export * from "./useProfiles";
export * from "./useAuthorization";
export * from "./useIntegrations";
+export * from "./useNotification";
diff --git a/src/shared/hooks/useIntegrations.ts b/src/shared/hooks/useIntegrations.ts
index 6ce95ee..b195f5b 100644
--- a/src/shared/hooks/useIntegrations.ts
+++ b/src/shared/hooks/useIntegrations.ts
@@ -1,11 +1,9 @@
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { isAxiosError } from "axios";
-
import {
TGetActiveAuthIntegrationsResponse,
TPostAuthIntegrationsRequest,
- TPostLauncherUpdateRequest,
+ TPostLauncherUploadRequest,
TPutConnectDiscordRequest,
TPutConnectTexturesRequest,
TPutSentryConnectRequest,
@@ -13,10 +11,33 @@ import {
import { integrationService } from "@/shared/services/IntegrationService";
import { useToast } from "@/shared/ui/use-toast";
import { TexturesServiceType } from "@/shared/enums";
+import { isAxiosError } from "@/shared/lib/utils";
+
+export const integrationsKeys = {
+ all: ["integrations"] as const,
+
+ auth: () => [...integrationsKeys.all, "auth"] as const,
+ authEditing: () => [...integrationsKeys.auth(), "editing"] as const,
+
+ launcherGithubVersions: () => [...integrationsKeys.all, "github-versions"] as const,
+ launcherBuildVersions: () => [...integrationsKeys.all, "build-versions"] as const,
+ launcherUpload: () => [...integrationsKeys.all, "launcher-upload"] as const,
+ launcherPlatforms: () => [...integrationsKeys.all, "launcher-platforms"] as const,
+
+ sentry: () => [...integrationsKeys.all, "sentry"] as const,
+ sentryEditing: () => [...integrationsKeys.sentry(), "editing"] as const,
+
+ textures: () => [...integrationsKeys.all, "textures"] as const,
+ texturesEditing: (type: TexturesServiceType) =>
+ [...integrationsKeys.textures(), `editing-${type}`] as const,
+
+ discord: () => [...integrationsKeys.all, "discord"] as const,
+ discordEditing: () => [...integrationsKeys.discord(), "editing"] as const,
+};
export const useAuthIntegrations = () => {
return useQuery({
- queryKey: ["integrations/findAll"],
+ queryKey: integrationsKeys.all,
queryFn: () => integrationService.getAuthIntegrations(),
select: ({ data }) => data,
});
@@ -25,16 +46,17 @@ export const useAuthIntegrations = () => {
export const useGetActiveAuthIntegrations = (): TGetActiveAuthIntegrationsResponse => {
const queryClient = useQueryClient();
- const data = queryClient.getQueryData([
- "integrations/findActive",
- ]);
+ const data = queryClient.getQueryData(
+ integrationsKeys.auth(),
+ );
if (!data) return {} as TGetActiveAuthIntegrationsResponse;
return data;
};
+
export const useActiveAuthIntegrations = () => {
return useQuery({
- queryKey: ["integrations/findActive"],
+ queryKey: integrationsKeys.auth(),
queryFn: () => integrationService.getActiveAuthIntegration(),
select: ({ data }) => data,
});
@@ -45,51 +67,52 @@ export const useEditIntegration = () => {
const queryClient = useQueryClient();
return useMutation({
- mutationKey: ["update-integration"],
+ mutationKey: integrationsKeys.authEditing(),
mutationFn: (data: TPostAuthIntegrationsRequest) =>
integrationService.putAuthIntegrations(data),
onSuccess: async (data) => {
- await queryClient.invalidateQueries({ queryKey: ["integrations/findActive"] });
+ await queryClient.invalidateQueries({ queryKey: integrationsKeys.auth() });
toast({
title: "Успешно",
description: data.message,
});
},
onError: (error) => {
- if (isAxiosError(error)) {
- toast({
- variant: "destructive",
- title: (error.response && error.response.data.message) || "Ошибка!",
- description: error.response && error.response.data.errors[0],
- });
- }
+ isAxiosError({ toast, error });
},
});
};
-export const useGithubLauncherVersions = () => {
- const { data, isLoading } = useQuery({
- queryKey: ["clientBranches"],
- queryFn: () => integrationService.getInstallClientBranches(),
+export const useLauncherGithubVersions = () => {
+ return useQuery({
+ queryKey: integrationsKeys.launcherGithubVersions(),
+ queryFn: () => integrationService.getLauncherGithubVersions(),
+ select: (data) => data.data.data,
});
+};
- return { data: data?.data, isLoading };
+export const useLauncherPlatforms = () => {
+ return useQuery({
+ queryKey: integrationsKeys.launcherPlatforms(),
+ queryFn: () => integrationService.getLauncherBuildPlatforms(),
+ select: (data) => data.data.data,
+ });
};
-export const useLauncherVersionsBuilds = () => {
+export const useLauncherBuildVersions = () => {
return useQuery({
- queryKey: ["clientBuilds"],
- queryFn: () => integrationService.getVersionBuilds(),
- select: (data) => data.data,
+ queryKey: integrationsKeys.launcherBuildVersions(),
+ queryFn: () => integrationService.getLauncherBuildVersions(),
+ select: (data) => data.data.data,
});
};
-export const useUpdateLauncher = () => {
+export const useLauncherUpload = () => {
const { toast } = useToast();
return useMutation({
- mutationKey: ["update-launcher"],
- mutationFn: (data: TPostLauncherUpdateRequest) => integrationService.postUpdateLauncher(data),
+ mutationKey: integrationsKeys.launcherUpload(),
+ mutationFn: (data: TPostLauncherUploadRequest) => integrationService.postLauncherUpload(data),
onSuccess: async (data) => {
toast({
title: "Успешно",
@@ -97,31 +120,24 @@ export const useUpdateLauncher = () => {
});
},
onError: (error) => {
- if (isAxiosError(error)) {
- toast({
- variant: "destructive",
- title: (error.response && error.response.data.message) || "Ошибка!",
- description: error.response && error.response.data.errors[0],
- });
- }
+ isAxiosError({ toast, error });
},
});
};
export const useSentry = () => {
- const { data, isLoading } = useQuery({
- queryKey: ["get-sentry"],
- queryFn: () => integrationService.getSentryConnect({}),
+ return useQuery({
+ queryKey: integrationsKeys.sentry(),
+ queryFn: () => integrationService.getSentryConnect(),
+ select: (data) => data.data,
});
-
- return { data: data?.data, isLoading };
};
export const useEditSentry = () => {
const { toast } = useToast();
return useMutation({
- mutationKey: ["update-sentry"],
+ mutationKey: integrationsKeys.sentryEditing(),
mutationFn: (data: TPutSentryConnectRequest) => integrationService.putSentryConnect(data),
onSuccess: async (data) => {
toast({
@@ -130,20 +146,14 @@ export const useEditSentry = () => {
});
},
onError: (error) => {
- if (isAxiosError(error)) {
- toast({
- variant: "destructive",
- title: (error.response && error.response.data.message) || "Ошибка!",
- description: error.response && error.response.data.errors[0],
- });
- }
+ isAxiosError({ toast, error });
},
});
};
export const useConnectTextures = (type: TexturesServiceType) => {
return useQuery({
- queryKey: [`get-connect-textures-${type}`],
+ queryKey: integrationsKeys.texturesEditing(type),
queryFn: () => integrationService.getConnectTextures({ type }),
select: ({ data }) => data,
});
@@ -154,32 +164,32 @@ export const useEditConnectTextures = () => {
const queryClient = useQueryClient();
return useMutation({
- mutationKey: ["update-connect-textures"],
+ mutationKey: integrationsKeys.textures(),
mutationFn: (data: TPutConnectTexturesRequest) => integrationService.putConnectTextures(data),
- onSuccess: async (data) => {
- await queryClient.invalidateQueries({ queryKey: ["get-connect-textures-skins"] });
- await queryClient.invalidateQueries({ queryKey: ["get-connect-textures-cloaks"] });
+ onSuccess: async (data, variables) => {
+ if (variables.type === TexturesServiceType.TEXTURES_SERVICE_SKINS)
+ await queryClient.invalidateQueries({
+ queryKey: integrationsKeys.texturesEditing(TexturesServiceType.TEXTURES_SERVICE_SKINS),
+ });
+ if (variables.type === TexturesServiceType.TEXTURES_SERVICE_CLOAKS)
+ await queryClient.invalidateQueries({
+ queryKey: integrationsKeys.texturesEditing(TexturesServiceType.TEXTURES_SERVICE_CLOAKS),
+ });
toast({
title: "Успешно",
description: data.message,
});
},
onError: (error) => {
- if (isAxiosError(error)) {
- toast({
- variant: "destructive",
- title: (error.response && error.response.data.message) || "Ошибка!",
- description: error.response && error.response.data.errors[0],
- });
- }
+ isAxiosError({ toast, error });
},
});
};
export const useDiscord = () => {
return useQuery({
- queryKey: ["get-discord"],
- queryFn: () => integrationService.getConnectDiscord({}),
+ queryKey: integrationsKeys.discord(),
+ queryFn: () => integrationService.getConnectDiscord(),
select: ({ data }) => data,
});
};
@@ -188,7 +198,7 @@ export const useEditDiscord = () => {
const { toast } = useToast();
return useMutation({
- mutationKey: ["update-discord"],
+ mutationKey: integrationsKeys.discordEditing(),
mutationFn: (data: TPutConnectDiscordRequest) => integrationService.putConnectDiscord(data),
onSuccess: async (data) => {
toast({
@@ -197,13 +207,7 @@ export const useEditDiscord = () => {
});
},
onError: (error) => {
- if (isAxiosError(error)) {
- toast({
- variant: "destructive",
- title: (error.response && error.response.data.message) || "Ошибка!",
- description: error.response && error.response.data.errors[0],
- });
- }
+ isAxiosError({ toast, error });
},
});
};
diff --git a/src/shared/hooks/useNotification.ts b/src/shared/hooks/useNotification.ts
new file mode 100644
index 0000000..282cb94
--- /dev/null
+++ b/src/shared/hooks/useNotification.ts
@@ -0,0 +1,15 @@
+import { useQuery } from "@tanstack/react-query";
+
+import { notificationService } from "@/shared/services/NotifiactionService";
+
+export const notificationsKeys = {
+ all: ["notifications"] as const,
+};
+
+export const useNotifications = () => {
+ return useQuery({
+ queryKey: notificationsKeys.all,
+ queryFn: () => notificationService.getNotification(),
+ select: (data) => data.data.data,
+ });
+};
diff --git a/src/shared/hooks/useProfiles.ts b/src/shared/hooks/useProfiles.ts
index 0bc3823..349fe88 100644
--- a/src/shared/hooks/useProfiles.ts
+++ b/src/shared/hooks/useProfiles.ts
@@ -1,23 +1,37 @@
-import type { UseQueryOptions } from "@tanstack/react-query";
+import { AxiosResponse } from "axios";
+import type { UseQueryOptions, UseQueryResult } from "@tanstack/react-query";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { isAxiosError } from "axios";
-
import {
ProfileBaseEntity,
TDeleteProfileRequest,
TDeleteProfilesRequest,
TGameVersionsRequest,
+ TGameVersionsResponse,
TGetProfileRequest,
TPostProfilesRequest,
TPutProfileRequest,
} from "@/shared/api/contracts";
import { profileService } from "@/shared/services/ProfileService";
import { useToast } from "@/shared/ui/use-toast";
+import { isAxiosError } from "@/shared/lib/utils";
+
+export const profileKeys = {
+ all: ["profiles"] as const,
+ creating: () => [...profileKeys.all, "creating"] as const,
+ reading: () => [...profileKeys.all, "reading"] as const,
+ editing: () => [...profileKeys.all, "editing"] as const,
+ deleting: () => [...profileKeys.all, "deleting"] as const,
+ deletingAll: () => [...profileKeys.all, "deletingAll"] as const,
+
+ entities: () => [...profileKeys.all, "entities"] as const,
+
+ gameVersions: (version: string) => [...profileKeys.entities(), version, "versions"] as const,
+};
export const useProfiles = () => {
return useQuery({
- queryKey: ["profiles"],
+ queryKey: profileKeys.all,
queryFn: () => profileService.getProfiles(),
select: (data) => data.data,
});
@@ -28,29 +42,21 @@ export const useProfile = () => {
const queryClient = useQueryClient();
return useMutation({
- mutationKey: ["get-profile"],
+ mutationKey: profileKeys.reading(),
mutationFn: (data: TGetProfileRequest) => profileService.getProfile(data),
onSettled: async () => {
- await queryClient.invalidateQueries({ queryKey: ["profiles"] });
+ await queryClient.invalidateQueries({ queryKey: profileKeys.all });
},
onError: (error) => {
- if (isAxiosError(error)) {
- toast({
- variant: "destructive",
- title: (error.response && error.response.data.message) || "Ошибка!",
- description: error.response && error.response.data.errors[0],
- });
- }
+ isAxiosError({ toast, error });
},
});
};
export const useCurrentProfile = () => {
- const { data } = useQuery({
- queryKey: ["profile"],
+ return useQuery({
+ queryKey: profileKeys.reading(),
});
-
- return data;
};
export const useCreateProfile = () => {
@@ -58,24 +64,17 @@ export const useCreateProfile = () => {
const queryClient = useQueryClient();
return useMutation({
- mutationKey: ["create-profile"],
+ mutationKey: profileKeys.creating(),
mutationFn: (data: TPostProfilesRequest) => profileService.createProfile(data),
-
onSuccess: async (data) => {
- await queryClient.invalidateQueries({ queryKey: ["profiles"] });
+ await queryClient.invalidateQueries({ queryKey: profileKeys.all });
toast({
title: "Успешно",
description: `Профиль "${data.data.name}" успешно создан`,
});
},
onError: (error) => {
- if (isAxiosError(error)) {
- toast({
- variant: "destructive",
- title: (error.response && error.response.data.message) || "Ошибка!",
- description: error.response && error.response.data.errors[0],
- });
- }
+ isAxiosError({ toast, error });
},
});
};
@@ -84,7 +83,7 @@ export const useEditProfile = () => {
const { toast } = useToast();
return useMutation({
- mutationKey: ["edit-profile"],
+ mutationKey: profileKeys.editing(),
mutationFn: (data: TPutProfileRequest) => profileService.editProfile(data),
onSuccess: (data) => {
toast({
@@ -93,13 +92,7 @@ export const useEditProfile = () => {
});
},
onError: (error) => {
- if (isAxiosError(error)) {
- toast({
- variant: "destructive",
- title: (error.response && error.response.data.message) || "Ошибка!",
- description: error.response && error.response.data.errors[0],
- });
- }
+ isAxiosError({ toast, error });
},
});
};
@@ -109,11 +102,11 @@ export const useDeleteProfile = () => {
const queryClient = useQueryClient();
return useMutation({
- mutationKey: ["delete-profile"],
+ mutationKey: profileKeys.deleting(),
mutationFn: (body: TDeleteProfileRequest) => profileService.deleteProfile(body),
onSettled: async () => {
- await queryClient.invalidateQueries({ queryKey: ["profiles"] });
- await queryClient.setQueryData(["profile"], () => null);
+ await queryClient.invalidateQueries({ queryKey: profileKeys.all });
+ await queryClient.setQueryData(profileKeys.reading(), () => null);
},
onSuccess: async (data) => {
toast({
@@ -122,13 +115,7 @@ export const useDeleteProfile = () => {
});
},
onError: (error) => {
- if (isAxiosError(error)) {
- toast({
- variant: "destructive",
- title: (error.response && error.response.data.message) || "Ошибка!",
- description: error.response && error.response.data.errors[0],
- });
- }
+ isAxiosError({ toast, error });
},
});
};
@@ -138,10 +125,10 @@ export const useDeleteProfiles = () => {
const queryClient = useQueryClient();
return useMutation({
- mutationKey: ["delete-profiles"],
+ mutationKey: profileKeys.deletingAll(),
mutationFn: (body: TDeleteProfilesRequest) => profileService.deleteProfiles(body),
onSettled: async () => {
- await queryClient.invalidateQueries({ queryKey: ["profiles"] });
+ await queryClient.invalidateQueries({ queryKey: profileKeys.all });
},
onSuccess: async (data) => {
toast({
@@ -150,29 +137,20 @@ export const useDeleteProfiles = () => {
});
},
onError: (error) => {
- if (isAxiosError(error)) {
- toast({
- variant: "destructive",
- title: (error.response && error.response.data.message) || "Ошибка!",
- description: error.response && error.response.data.errors[0],
- });
- }
+ isAxiosError({ toast, error });
},
});
};
export const useGetGameVersions = (
body: TGameVersionsRequest,
- options?: Partial,
-) => {
+ options?: Partial<
+ UseQueryOptions, Error, TGameVersionsResponse["data"]>
+ >,
+): UseQueryResult => {
return useQuery({
- queryKey: [
- "get-game-versions",
- { gameLoader: body.gameLoader, minecraftVersion: body.minecraftVersion },
- ],
+ queryKey: profileKeys.gameVersions(body.minecraftVersion),
queryFn: async () => await profileService.getGameVersions(body),
- // @ts-ignore
- // TODO: Исправить типизацию
select: (data) => data.data.data,
...options,
});
diff --git a/src/shared/hooks/useServers.ts b/src/shared/hooks/useServers.ts
new file mode 100644
index 0000000..04a6714
--- /dev/null
+++ b/src/shared/hooks/useServers.ts
@@ -0,0 +1,72 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+
+import { toast, useToast } from "@/shared/ui/use-toast";
+import { gameServerService } from "@/shared/services/GameServerService";
+import {
+ TDeleteGameServersRequest,
+ TGetGameServersRequest,
+ TPostGameServersRequest,
+} from "@/shared/api/contracts";
+import { isAxiosError } from "@/shared/lib/isAxiosError/isAxiosError";
+
+export const serversKeys = {
+ all: ["servers"] as const,
+ creating: () => [...serversKeys.all, "creating"] as const,
+ reading: () => [...serversKeys.all, "reading"] as const,
+ editing: () => [...serversKeys.all, "editing"] as const,
+ deleting: () => [...serversKeys.all, "deleting"] as const,
+ deletingAll: () => [...serversKeys.all, "deletingAll"] as const,
+
+ entities: () => [...serversKeys.all, "entities"] as const,
+};
+
+export const useGameServers = (profile: TGetGameServersRequest) => {
+ return useQuery({
+ queryKey: serversKeys.entities(),
+ queryFn: () => gameServerService.getServers(profile),
+ select: (data) => data?.data,
+ });
+};
+
+export const useCreateGameServer = () => {
+ const { toast } = useToast();
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationKey: serversKeys.creating(),
+ mutationFn: (data: TPostGameServersRequest) => gameServerService.addServer(data),
+ onSuccess: async (data) => {
+ await queryClient.invalidateQueries({
+ queryKey: serversKeys.entities(),
+ });
+ toast({
+ title: "Успешно",
+ description: `Сервер "${data.data.name}" успешно добавлен`,
+ });
+ },
+ onError: (error) => {
+ isAxiosError({ toast, error });
+ },
+ });
+};
+
+export const useDeleteGameServer = () => {
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationKey: serversKeys.deleting(),
+ mutationFn: (data: TDeleteGameServersRequest) => gameServerService.deleteServer(data),
+ onSuccess: async () => {
+ await queryClient.invalidateQueries({
+ queryKey: serversKeys.entities(),
+ });
+ toast({
+ title: "Успешно",
+ description: "Сервер успешно удален",
+ });
+ },
+ onError: (error) => {
+ isAxiosError({ toast, error });
+ },
+ });
+};
diff --git a/src/shared/lib/getProgressColor/getProgressColor.ts b/src/shared/lib/getProgressColor/getProgressColor.ts
new file mode 100644
index 0000000..5977c35
--- /dev/null
+++ b/src/shared/lib/getProgressColor/getProgressColor.ts
@@ -0,0 +1,20 @@
+const colorRanges = [
+ { max: 10, color: "bg-green-600" },
+ { max: 20, color: "bg-green-500" },
+ { max: 30, color: "bg-green-400" },
+ { max: 40, color: "bg-yellow-600" },
+ { max: 50, color: "bg-yellow-500" },
+ { max: 60, color: "bg-yellow-400" },
+ { max: 70, color: "bg-orange-600" },
+ { max: 80, color: "bg-orange-500" },
+ { max: 90, color: "bg-red-600" },
+ { max: 100, color: "bg-red-500" },
+];
+
+export const getProgressColor = (value: number) => {
+ for (let range of colorRanges) {
+ if (value < range.max) {
+ return range.color;
+ }
+ }
+};
diff --git a/src/shared/lib/isAxiosError/isAxiosError.ts b/src/shared/lib/isAxiosError/isAxiosError.ts
new file mode 100644
index 0000000..5341d19
--- /dev/null
+++ b/src/shared/lib/isAxiosError/isAxiosError.ts
@@ -0,0 +1,18 @@
+import { isAxiosError as isAxiosErrorBase } from "axios";
+
+import { useToast } from "@/shared/ui/use-toast";
+
+interface isAxiosErrorParams {
+ toast: ReturnType["toast"];
+ error: Error;
+}
+
+export const isAxiosError = ({ toast, error }: isAxiosErrorParams) => {
+ if (isAxiosErrorBase(error)) {
+ toast({
+ variant: "destructive",
+ title: (error.response && error.response.data.message) || "Ошибка!",
+ description: error.response && error.response.data.errors[0],
+ });
+ }
+};
diff --git a/src/shared/lib/utils.ts b/src/shared/lib/utils.ts
index 5fa6d21..43d57a5 100644
--- a/src/shared/lib/utils.ts
+++ b/src/shared/lib/utils.ts
@@ -37,3 +37,5 @@ export const isTokenExpired = (token?: string): boolean => {
};
export * from "./getFormatDate/getFormatDate";
+export * from "./getProgressColor/getProgressColor";
+export * from "./isAxiosError/isAxiosError";
diff --git a/src/shared/routes/index.ts b/src/shared/routes/index.ts
index 7db2837..f5dcef2 100644
--- a/src/shared/routes/index.ts
+++ b/src/shared/routes/index.ts
@@ -6,6 +6,7 @@ export const AUTH_PAGES = {
export const DASHBOARD_PAGES = {
HOME: "/dashboard",
+ NOTIFICATION: "/dashboard/notification",
ACCOUNT: "/dashboard/account",
SETTINGS: "/dashboard/settings",
SERVERS: "/dashboard/servers",
diff --git a/src/shared/services/GameServerService.ts b/src/shared/services/GameServerService.ts
new file mode 100644
index 0000000..3c6a70e
--- /dev/null
+++ b/src/shared/services/GameServerService.ts
@@ -0,0 +1,40 @@
+import { $api } from "@/core/api";
+import {
+ TDeleteGameServersRequest,
+ TDeleteGameServersResponse,
+ TGetGameServersRequest,
+ TGetGameServersResponse,
+ TPostGameServersRequest,
+ TPostGameServersResponse,
+} from "@/shared/api/contracts";
+
+class GameServerService {
+ private BASE_URL = "/servers";
+
+ async getServers({ profileName }: TGetGameServersRequest): Promise {
+ const { data } = await $api.get(`${this.BASE_URL}/${profileName}`);
+
+ return data;
+ }
+
+ async addServer({
+ profileName,
+ ...body
+ }: TPostGameServersRequest): Promise {
+ const { data } = await $api.post(
+ `${this.BASE_URL}/${profileName}`,
+ body,
+ );
+ return data;
+ }
+
+ async deleteServer(body: TDeleteGameServersRequest): Promise {
+ const { data } = await $api.delete(
+ `${this.BASE_URL}/${body.profileName}/${body.serverName}`,
+ );
+
+ return data;
+ }
+}
+
+export const gameServerService = new GameServerService();
diff --git a/src/shared/services/IntegrationService.ts b/src/shared/services/IntegrationService.ts
index cd1ede7..d279e08 100644
--- a/src/shared/services/IntegrationService.ts
+++ b/src/shared/services/IntegrationService.ts
@@ -6,18 +6,19 @@ import {
TGetActiveAuthIntegrationsResponse,
TGetAuthIntegrationsRequest,
TGetAuthIntegrationsResponse,
+ TGetLauncherBuildPlatformsResponse,
TGetConnectDiscordRequest,
TGetConnectDiscordResponse,
TGetConnectTexturesRequest,
TGetConnectTexturesResponse,
- TGetInstallClientBranchesResponse,
- TGetLauncherVersionBuildsResponse,
+ TGetLauncherGithubVersionsResponse,
+ TGetLauncherBuildVersionsResponse,
TGetSentryConnectRequest,
TGetSentryConnectResponse,
TPostAuthIntegrationsRequest,
TPostAuthIntegrationsResponse,
- TPostLauncherUpdateRequest,
- TPostLauncherUpdateResponse,
+ TPostLauncherUploadRequest,
+ TPostLauncherUploadResponse,
TPutConnectDiscordRequest,
TPutConnectDiscordResponse,
TPutConnectTexturesRequest,
@@ -61,24 +62,24 @@ class IntegrationService {
return data;
}
- async getInstallClientBranches(): Promise {
- const { data } = await $api.get(
+ async getLauncherGithubVersions(): Promise> {
+ return await $api.get(
`${this.BASE_URL_GITHUB}/launcher/versions`,
);
+ }
- return data;
+ async getLauncherBuildVersions(): Promise> {
+ return await $api.get(`${this.BASE_URL_LAUNCHER}/builds`);
}
- async getVersionBuilds(): Promise {
- const { data } = await $api.get(
- `${this.BASE_URL_LAUNCHER}/builds`,
+ async getLauncherBuildPlatforms(): Promise> {
+ return await $api.get(
+ `${this.BASE_URL_LAUNCHER}/platforms`,
);
-
- return data;
}
- async postUpdateLauncher(body: TPostLauncherUpdateRequest): Promise {
- const { data } = await $api.post(
+ async postLauncherUpload(body: TPostLauncherUploadRequest): Promise {
+ const { data } = await $api.post(
`${this.BASE_URL_LAUNCHER}/upload`,
body,
);
@@ -86,7 +87,7 @@ class IntegrationService {
return data;
}
- async getSentryConnect(params: TGetSentryConnectRequest): Promise {
+ async getSentryConnect(params?: TGetSentryConnectRequest): Promise {
const { data } = await $api.get(this.BASE_URL_SENTRY, { params });
return data;
@@ -122,9 +123,7 @@ class IntegrationService {
return data;
}
- async getConnectDiscord({
- ...params
- }: TGetConnectDiscordRequest): Promise {
+ async getConnectDiscord(params?: TGetConnectDiscordRequest): Promise {
const { data } = await $api.get(this.BASE_URL_DISCORD, { params });
return data;
diff --git a/src/shared/services/NotifiactionService.ts b/src/shared/services/NotifiactionService.ts
new file mode 100644
index 0000000..a5caf7c
--- /dev/null
+++ b/src/shared/services/NotifiactionService.ts
@@ -0,0 +1,17 @@
+import { AxiosResponse } from "axios";
+
+import { $api } from "@/core/api";
+
+import { TGetNotificationRequest, TGetNotificationResponse } from "@/shared/api/contracts";
+
+class NotificationService {
+ private BASE_URL = "/notifications";
+
+ async getNotification(
+ params?: TGetNotificationRequest,
+ ): Promise> {
+ return await $api.get(this.BASE_URL, { params });
+ }
+}
+
+export const notificationService = new NotificationService();
diff --git a/src/shared/types/index.ts b/src/shared/types/index.ts
index c37ea0d..54b3687 100644
--- a/src/shared/types/index.ts
+++ b/src/shared/types/index.ts
@@ -3,3 +3,8 @@ export type TMenuItem = {
text: string;
path: string;
};
+
+export type SelectOption = {
+ label: string;
+ value: string;
+};
diff --git a/src/shared/ui/MobileNavigation/ui/MobileNavigation.tsx b/src/shared/ui/MobileNavigation/ui/MobileNavigation.tsx
index 64bbd79..639efbd 100644
--- a/src/shared/ui/MobileNavigation/ui/MobileNavigation.tsx
+++ b/src/shared/ui/MobileNavigation/ui/MobileNavigation.tsx
@@ -6,10 +6,13 @@ import Image from "next/image";
import { Menu } from "lucide-react";
+import { config } from "@/core/configs";
+
import { cn } from "@/shared/lib/utils";
import { Sheet, SheetContent, SheetTrigger } from "@/shared/ui/sheet";
import { Button } from "@/shared/ui/button";
import { TMenuItem } from "@/shared/types";
+
import logo from "@/assets/logos/logo.svg";
import classes from "./styles.module.css";
@@ -33,7 +36,7 @@ export const MobileNavigation = ({ menu }: MobileNavigationParams) => {