Added address to dispose trashbox request

styling fixes

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<Trashbox, 'Categories' | 'Address'> & { Category: string }
+type TrashboxDispose = Omit<Trashbox, 'Categories'> & { Category: string }
 
 type DisposeParams = Parameters<typeof composeDisposeBody>
 

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()
 )
 

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,
                             })
                         }
                     }}

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(
         'Выбор сделан',
         'Зачтено',

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<Poetry> {
+const usePoetry = (): UseFetchReturn<Poetry> => (
-    return (
+    useFetch(
-        useFetch(
+        composePoetryURL(),
-            composePoetryURL(),
+        'GET',
-            'GET',
+        false,
-            false,
+        isPoetryResponse,
-            isPoetryResponse,
+        processPoetry,
-            processPoetry,
+        initialPoetry,
-            initialPoetry,
-        )
     )
-}
+)
+
 
 export default usePoetry

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(
         'Закрыть объявление',
         'Закрыто',

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 { Trashbox, isTrashboxResponse } from '../../api/trashbox/types'
-import { UseFetchReturn } from '../useFetch'
+import useFetch, { UseFetchReturn } from '../useFetch'
 
 import { faker } from '@faker-js/faker/locale/ru'
-import { Category, categories } from '../../assets/category'
+import { Category } from '../../assets/category'
-import { useCallback, useMemo } from 'react'
+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<Trashbox[]> => (
-    // useFetch(
+    // TODO: Remove once available
-    //     composeTrashboxURL(position, category),
+    // eslint-disable-next-line react-hooks/rules-of-hooks
-    //     'GET',
+    import.meta.env.PROD ? useFetch(
-    //     true,
+        composeTrashboxURL(position, category),
-    //     isTrashboxResponse,
+        'GET',
-    //     processTrashbox,
+        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,