some fixes

htmlacademy-univer-javascript-3 · Jun 3, 2024 · 051ac0b · 051ac0b
1 parent fa3e6a0
commit 051ac0b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/pages/not-found-page/not-found-page.css b/src/pages/not-found-page/not-found-page.css
@@ -37,7 +37,7 @@
   display: flex;
   justify-content: center;
   width: 100%;
-  background-image: url('../../../public/img/no-places.png');
+  background-image: url('public/img/no-places.png');
   background-size: cover;
   background-repeat: no-repeat;
 }
diff --git a/src/services/api.ts b/src/services/api.ts
@@ -1,7 +1,7 @@
 import axios, {AxiosError, AxiosInstance, InternalAxiosRequestConfig} from 'axios';
 import {getToken} from './token.ts';
 import {toast} from 'react-toastify';
-import {DetailMessageType, shouldDisplayError} from './error-handle.ts';
+import {DetailMessageType, SERVER_MINIMAL_ERROR_CODE, shouldDisplayError} from './error-handle.ts';
 
 const BACKEND_URL = 'https://14.design.htmlacademy.pro/six-cities';
 const REQUEST_TIMEOUT = 5000;
@@ -29,15 +29,21 @@ export const createAPI = (): AxiosInstance => {
     (response) => response,
     (error: AxiosError<DetailMessageType>) => {
       if (error.response && shouldDisplayError(error.response)) {
-        if (error.response.data.details.length) {
-          const messages = (error.response.data.details);
-          messages.map((property) => {
+
+        if (error.response.status >= SERVER_MINIMAL_ERROR_CODE) {
+
+          toast.error('Ой-ой! Ошибка соединения с сервером. Сервер не доступен!');
+
+        } else if (error.response.data.details.length) {
+          error.response.data.details.map((property) => {
             property.messages.map((message) => {
 
               toast.warning(message);
+
             });
           });
         } else if (error.response.data.message) {
+
           const detailMessage = (error.response.data);
           toast.warn(detailMessage.message);
         }

diff --git a/src/services/error-handle.ts b/src/services/error-handle.ts
@@ -1,6 +1,8 @@
 import {StatusCodes} from 'http-status-codes';
 import {AxiosResponse} from 'axios';
 
+export const SERVER_MINIMAL_ERROR_CODE = 500;
+
 export type DetailMessageType = {
   errorType: string;
   message: string;
@@ -13,8 +15,8 @@ export type DetailMessageType = {
 
 const StatusCodeMapping: Record<number, boolean> = {
   [StatusCodes.BAD_REQUEST]: true,
-  [StatusCodes.UNAUTHORIZED]: false,
-  [StatusCodes.NOT_FOUND]: true
+  [StatusCodes.NOT_FOUND]: true,
 };
 
-export const shouldDisplayError = (response: AxiosResponse) => StatusCodeMapping[response.status];
+export const shouldDisplayError = (response: AxiosResponse) =>
+  response.status >= SERVER_MINIMAL_ERROR_CODE ? true : StatusCodeMapping[response.status];