From 79ff0a3813e63a88164df3238ea6f16f8c08ad6c Mon Sep 17 00:00:00 2001
From: dm1sh <me@dmitriy.icu>
Date: Sat, 12 Aug 2023 12:28:38 +0300
Subject: [PATCH] Removed orphane code and root package-lock

---
 front/src/assets/userCategories.ts           |  2 +-
 front/src/components/AnnouncementDetails.tsx | 10 +++++-----
 front/src/hooks/api/useTrashboxes.ts         |  2 --
 package-lock.json                            |  6 ------
 4 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 package-lock.json

diff --git a/front/src/assets/userCategories.ts b/front/src/assets/userCategories.ts
index f98a907..fc579be 100644
--- a/front/src/assets/userCategories.ts
+++ b/front/src/assets/userCategories.ts
@@ -13,7 +13,7 @@ const UserCategoriesNames: Record<UserCategory, string> = {
 
 const userCategoriesInfos: Record<UserCategory, (ann: Announcement) => string> = {
     givingOut: (ann: Announcement) => (
-        `Годен до ${new Date(ann.bestBy).toLocaleDateString('ru')}`
+        `Годен до ${ann.bestBy}`
     ),
     needDispose: (ann: Announcement) => (
         `Было заинтересно ${ann.bookedBy} чел.`
diff --git a/front/src/components/AnnouncementDetails.tsx b/front/src/components/AnnouncementDetails.tsx
index 3a9ed35..6693693 100644
--- a/front/src/components/AnnouncementDetails.tsx
+++ b/front/src/components/AnnouncementDetails.tsx
@@ -38,7 +38,7 @@ const View = ({
 
         <span>{categoryNames[category]}</span>
         <span className='m-2'>&#x2022;</span>{/* dot */}
-        <span>Годен до {new Date(bestBy).toLocaleString('ru-RU')}</span>
+        <span>Годен до {bestBy}</span>
 
         <p className='mb-0'>{description}</p>
 
@@ -84,10 +84,10 @@ function Control({
         <>
             <p>Забронировали {bookedBy + (bookButton.disabled ? 1 : 0)} чел.</p>
             {(myId === userId) ? (
-                <>
-                    <Button variant='success' onClick={showDispose}>Утилизировать</Button>
-                    <Button variant='success' onClick={() => void handleRemove(id)} {...removeButton} />
-                </>
+                <div className='m-0'>
+                    <Button className='m-1' variant='success' onClick={showDispose}>Утилизировать</Button>
+                    <Button className='m-1' variant='success' onClick={() => void handleRemove(id)} {...removeButton} />
+                </div>
             ) : (
                 <Button variant='success' onClick={() => void handleBook(id)} {...bookButton} />
             )}
diff --git a/front/src/hooks/api/useTrashboxes.ts b/front/src/hooks/api/useTrashboxes.ts
index df88fc7..12bf209 100644
--- a/front/src/hooks/api/useTrashboxes.ts
+++ b/front/src/hooks/api/useTrashboxes.ts
@@ -7,8 +7,6 @@ import { Category } from '../../assets/category'
 import { composeTrashboxURL, processTrashbox } from '../../api/trashbox'
 
 const useTrashboxes = (position: LatLng, category: Category): UseFetchReturn<Trashbox[]> => (
-    // TODO: Remove once available
-    // eslint-disable-next-line react-hooks/rules-of-hooks
     useFetch(
         composeTrashboxURL(position, category),
         'GET',
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 544905a..0000000
--- a/package-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "porridger_tmp",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}