From 864f5a040c317e59ca429f6b5dec19e887a26c05 Mon Sep 17 00:00:00 2001 From: dm1sh Date: Tue, 8 Aug 2023 19:20:00 +0300 Subject: [PATCH] Added address to dispose trashbox request styling fixes --- front/src/api/dispose/types.ts | 2 +- front/src/api/trashbox/index.ts | 4 ++- .../src/components/SelectDisposalTrashbox.tsx | 3 +- front/src/hooks/api/useDispose.ts | 2 +- front/src/hooks/api/usePoetry.ts | 21 ++++++------- front/src/hooks/api/useRemoveAnnouncement.ts | 2 +- front/src/hooks/api/useTrashboxes.ts | 31 ++++++++++--------- 7 files changed, 34 insertions(+), 31 deletions(-) diff --git a/front/src/api/dispose/types.ts b/front/src/api/dispose/types.ts index d16e857..4eedace 100644 --- a/front/src/api/dispose/types.ts +++ b/front/src/api/dispose/types.ts @@ -2,7 +2,7 @@ import { composeDisposeBody } from '.' import { isObject } from '../../utils/types' import { Trashbox } from '../trashbox/types' -type TrashboxDispose = Omit & { Category: string } +type TrashboxDispose = Omit & { Category: string } type DisposeParams = Parameters diff --git a/front/src/api/trashbox/index.ts b/front/src/api/trashbox/index.ts index 311987a..7e45fa5 100644 --- a/front/src/api/trashbox/index.ts +++ b/front/src/api/trashbox/index.ts @@ -2,11 +2,13 @@ import { LatLng } from 'leaflet' import { API_URL } from '../../config' import { Trashbox, TrashboxResponse } from './types' +import { Category } from '../../assets/category' -const composeTrashboxURL = (position: LatLng) => ( +const composeTrashboxURL = (position: LatLng, category: Category) => ( API_URL + '/trashbox?' + new URLSearchParams({ lat: position.lat.toString(), lng: position.lng.toString(), + category: category, }).toString() ) diff --git a/front/src/components/SelectDisposalTrashbox.tsx b/front/src/components/SelectDisposalTrashbox.tsx index 1bf4405..dfa05f6 100644 --- a/front/src/components/SelectDisposalTrashbox.tsx +++ b/front/src/components/SelectDisposalTrashbox.tsx @@ -81,12 +81,13 @@ function SelectDisposalTrashbox({ annId, category, address, closeRefresh }: Sele variant='success' onClick={() => { if (gotResponse(trashboxes) && !gotError(trashboxes)) { - const { Lat, Lng, Name } = trashboxes.data[selectedTrashbox.index] + const { Lat, Lng, Name, Address } = trashboxes.data[selectedTrashbox.index] void handleDispose(annId, { Category: selectedTrashbox.category, Lat, Lng, Name, + Address, }) } }} diff --git a/front/src/hooks/api/useDispose.ts b/front/src/hooks/api/useDispose.ts index 957e20b..cc20841 100644 --- a/front/src/hooks/api/useDispose.ts +++ b/front/src/hooks/api/useDispose.ts @@ -4,7 +4,7 @@ import { useSendWithButton } from '..' import { composeDisposeBody, composeDisposeURL, processDispose } from '../../api/dispose' import { DisposeParams, isDisposeResponse } from '../../api/dispose/types' -const useDispose = (resolve: () => void) => { +function useDispose(resolve: () => void) { const { doSend, button } = useSendWithButton( 'Выбор сделан', 'Зачтено', diff --git a/front/src/hooks/api/usePoetry.ts b/front/src/hooks/api/usePoetry.ts index 631f117..86aac07 100644 --- a/front/src/hooks/api/usePoetry.ts +++ b/front/src/hooks/api/usePoetry.ts @@ -2,17 +2,16 @@ import { composePoetryURL, initialPoetry, processPoetry } from '../../api/poetry import { Poetry, isPoetryResponse } from '../../api/poetry/types' import useFetch, { UseFetchReturn } from '../useFetch' -function usePoetry(): UseFetchReturn { - return ( - useFetch( - composePoetryURL(), - 'GET', - false, - isPoetryResponse, - processPoetry, - initialPoetry, - ) +const usePoetry = (): UseFetchReturn => ( + useFetch( + composePoetryURL(), + 'GET', + false, + isPoetryResponse, + processPoetry, + initialPoetry, ) -} +) + export default usePoetry diff --git a/front/src/hooks/api/useRemoveAnnouncement.ts b/front/src/hooks/api/useRemoveAnnouncement.ts index ed9a92a..b139d03 100644 --- a/front/src/hooks/api/useRemoveAnnouncement.ts +++ b/front/src/hooks/api/useRemoveAnnouncement.ts @@ -4,7 +4,7 @@ import { useSendWithButton } from '..' import { composeRemoveAnnouncementURL, processRemoveAnnouncement } from '../../api/removeAnnouncement' import { isRemoveAnnouncementResponse } from '../../api/removeAnnouncement/types' -const useRemoveAnnouncement = (resolve: () => void) => { +function useRemoveAnnouncement(resolve: () => void) { const { doSend, button } = useSendWithButton( 'Закрыть объявление', 'Закрыто', diff --git a/front/src/hooks/api/useTrashboxes.ts b/front/src/hooks/api/useTrashboxes.ts index 7e28027..bd2929a 100644 --- a/front/src/hooks/api/useTrashboxes.ts +++ b/front/src/hooks/api/useTrashboxes.ts @@ -1,12 +1,12 @@ import { LatLng } from 'leaflet' -import { sampleSize, random } from 'lodash' -import { Trashbox } from '../../api/trashbox/types' -import { UseFetchReturn } from '../useFetch' +import { Trashbox, isTrashboxResponse } from '../../api/trashbox/types' +import useFetch, { UseFetchReturn } from '../useFetch' import { faker } from '@faker-js/faker/locale/ru' -import { Category, categories } from '../../assets/category' -import { useCallback, useMemo } from 'react' +import { Category } from '../../assets/category' +import { useMemo } from 'react' +import { composeTrashboxURL, processTrashbox } from '../../api/trashbox' function genMockTrashbox(pos: LatLng): Trashbox { const loc = faker.location.nearbyGPSCoordinate({ origin: [pos.lat, pos.lng], radius: 1 }) @@ -21,16 +21,17 @@ function genMockTrashbox(pos: LatLng): Trashbox { } const useTrashboxes = (position: LatLng, category: Category): UseFetchReturn => ( - // useFetch( - // composeTrashboxURL(position, category), - // 'GET', - // true, - // isTrashboxResponse, - // processTrashbox, - // [], - // ) - - { + // TODO: Remove once available + // eslint-disable-next-line react-hooks/rules-of-hooks + import.meta.env.PROD ? useFetch( + composeTrashboxURL(position, category), + 'GET', + true, + isTrashboxResponse, + processTrashbox, + [], + ) : { + // eslint-disable-next-line react-hooks/rules-of-hooks data: useMemo(() => new Array(3).fill(3).map(() => genMockTrashbox(position)), [position]), loading: false, error: null,