From 0aaef69a5a8ebdecc6a2fd844708f75b5ec154fa Mon Sep 17 00:00:00 2001
From: dm1sh <me@dmitriy.icu>
Date: Sat, 12 Aug 2023 02:50:26 +0300
Subject: [PATCH] Trashboxes fetching fixes

---
 front/src/api/trashbox/index.ts      |  6 +++---
 front/src/components/LineDot.tsx     |  2 +-
 front/src/components/Poetry.tsx      |  2 +-
 front/src/hooks/api/useTrashboxes.ts | 24 ++----------------------
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/front/src/api/trashbox/index.ts b/front/src/api/trashbox/index.ts
index 7e45fa5..fb51234 100644
--- a/front/src/api/trashbox/index.ts
+++ b/front/src/api/trashbox/index.ts
@@ -6,9 +6,9 @@ import { Category } from '../../assets/category'
 
 const composeTrashboxURL = (position: LatLng, category: Category) => (
     API_URL + '/trashbox?' + new URLSearchParams({
-        lat: position.lat.toString(),
-        lng: position.lng.toString(),
-        category: category,
+        Lat: position.lat.toString(),
+        Lng: position.lng.toString(),
+        Category: category,
     }).toString()
 )
 
diff --git a/front/src/components/LineDot.tsx b/front/src/components/LineDot.tsx
index 66b5ad7..dcb0778 100644
--- a/front/src/components/LineDot.tsx
+++ b/front/src/components/LineDot.tsx
@@ -3,7 +3,7 @@ import { colors, lineNames, lineByName } from '../assets/metro'
 function LineDot({ station }: { station: string }) {
     const line = lineByName(station)
 
-    if (line == undefined) {
+    if (line === undefined) {
         return <></>
     }
 
diff --git a/front/src/components/Poetry.tsx b/front/src/components/Poetry.tsx
index 29659e5..10ea8db 100644
--- a/front/src/components/Poetry.tsx
+++ b/front/src/components/Poetry.tsx
@@ -26,7 +26,7 @@ function Poetry() {
                                 }}
                             />
                             <p><em>{poetry.data.author}</em></p>
-                            <img src={`/poem_pic/${poetry.data.id}`} alt='Иллюстрация' />
+                            <img src={`/poem_pic/${poetry.data.id}.jpg`} alt='Иллюстрация' />
                         </>
                     )
                 ) : (
diff --git a/front/src/hooks/api/useTrashboxes.ts b/front/src/hooks/api/useTrashboxes.ts
index bd2929a..df88fc7 100644
--- a/front/src/hooks/api/useTrashboxes.ts
+++ b/front/src/hooks/api/useTrashboxes.ts
@@ -3,40 +3,20 @@ import { LatLng } from 'leaflet'
 import { Trashbox, isTrashboxResponse } from '../../api/trashbox/types'
 import useFetch, { UseFetchReturn } from '../useFetch'
 
-import { faker } from '@faker-js/faker/locale/ru'
 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 })
-
-    return {
-        Name: faker.company.name(),
-        Address: faker.location.streetAddress(),
-        Categories: faker.lorem.words({ max: 3, min: 1 }).split(' '),
-        Lat: loc[0],
-        Lng: loc[1],
-    }
-}
-
 const useTrashboxes = (position: LatLng, category: Category): UseFetchReturn<Trashbox[]> => (
     // TODO: Remove once available
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    import.meta.env.PROD ? useFetch(
+    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,
-        refetch: () => { return },
-    }
+    )
 )
 
 export default useTrashboxes