From 9437c440546f39a9cbe5020752e1cc9fc88f8a91 Mon Sep 17 00:00:00 2001
From: dm1sh <me@dmitriy.icu>
Date: Thu, 13 Jul 2023 18:17:57 +0300
Subject: [PATCH] Switched category data struct from Map to object Moved
 lineByName function

---
 front/src/assets/category.ts                 | 63 ++++++++++----------
 front/src/assets/metro.ts                    |  6 +-
 front/src/components/AnnouncementDetails.tsx |  2 +-
 front/src/components/Filters.tsx             |  8 +--
 front/src/components/LineDot.tsx             |  3 +-
 front/src/pages/AddPage.tsx                  |  7 +--
 front/src/pages/HomePage.tsx                 |  2 +-
 front/src/utils/metro.ts                     |  7 ---
 8 files changed, 46 insertions(+), 52 deletions(-)
 delete mode 100644 front/src/utils/metro.ts

diff --git a/front/src/assets/category.ts b/front/src/assets/category.ts
index 407bdfe..92d452d 100644
--- a/front/src/assets/category.ts
+++ b/front/src/assets/category.ts
@@ -1,41 +1,40 @@
 import { isLiteralUnion } from "../utils/types"
 
 const categories = ["PORRIDGE", "conspects", "milk", "bred", "wathing", "cloth",
-"fruits_vegatables", "soup", "dinner", "conserves", "pens", "other_things"] as const
+    "fruits_vegatables", "soup", "dinner", "conserves", "pens", "other_things"] as const
 type Category = typeof categories[number]
 
-const isCategory = (obj: unknown): obj is Category => isLiteralUnion(obj, categories) 
+const isCategory = (obj: unknown): obj is Category => isLiteralUnion(obj, categories)
 
-const categoryGraphics = new Map<Category, string>([
-    ["PORRIDGE", "static/PORRIDGE.jpg"],
-    ["conspects", "static/conspects.jpg"],
-    ["milk", "static/milk.jpg"],
-    ["bred", "static/bred.jpg"],
-    ["wathing", "static/wathing.jpg"],
-    ["cloth", "static/cloth.jpg"],
-    ["fruits_vegatables", "static/fruits_vegatables.jpg"],
-    ["soup", "static/soup.jpg"],
-    ["dinner", "static/dinner.jpg"],
-    ["conserves", "static/conserves.jpg"],
-    ["pens", "static/pens.jpg"],
-    ["other_things", "static/other_things.jpg"]
+const categoryGraphics: Record<Category, string> = {
+    "PORRIDGE": "static/PORRIDGE.jpg",
+    "conspects": "static/conspects.jpg",
+    "milk": "static/milk.jpg",
+    "bred": "static/bred.jpg",
+    "wathing": "static/wathing.jpg",
+    "cloth": "static/cloth.jpg",
+    "fruits_vegatables": "static/fruits_vegatables.jpg",
+    "soup": "static/soup.jpg",
+    "dinner": "static/dinner.jpg",
+    "conserves": "static/conserves.jpg",
+    "pens": "static/pens.jpg",
+    "other_things": "static/other_things.jpg",
+}
 
-])
-
-const categoryNames = new Map<Category, string>([
-    ["PORRIDGE", "PORRIDGE"],
-    ["conspects", "Конспекты"],
-    ["milk", "Молочные продукты"],
-    ["bred", "Хлебобулочные изделия"],
-    ["wathing", "Моющие средства"],
-    ["cloth", "Одежда"],
-    ["fruits_vegatables", "Фрукты и овощи"],
-    ["soup", "Супы"],
-    ["dinner", "Ужин"],
-    ["conserves", "Консервы"],
-    ["pens", "Канцелярия"],
-    ["other_things", "Всякая всячина"]
-])
+const categoryNames: Record<Category, string> = {
+    "PORRIDGE": "PORRIDGE",
+    "conspects": "Конспекты",
+    "milk": "Молочные продукты",
+    "bred": "Хлебобулочные изделия",
+    "wathing": "Моющие средства",
+    "cloth": "Одежда",
+    "fruits_vegatables": "Фрукты и овощи",
+    "soup": "Супы",
+    "dinner": "Ужин",
+    "conserves": "Консервы",
+    "pens": "Канцелярия",
+    "other_things": "Всякая всячина",
+}
 
 export type { Category }
-export { categoryNames, categoryGraphics, isCategory }
+export { categories, categoryNames, categoryGraphics, isCategory }
diff --git a/front/src/assets/metro.ts b/front/src/assets/metro.ts
index 1ee7c7e..f2f966b 100644
--- a/front/src/assets/metro.ts
+++ b/front/src/assets/metro.ts
@@ -101,5 +101,9 @@ const lineNames: Record<Lines, string> = {
     violet: "Фиолетовая",
 }
 
+const lineByName = (name: string) =>
+    lines.find(line => stations[line].has(name))
+
+
 export type { Lines }
-export { lines, stations, colors, lineNames }
+export { lines, stations, colors, lineNames, lineByName }
diff --git a/front/src/components/AnnouncementDetails.tsx b/front/src/components/AnnouncementDetails.tsx
index 6ff79e6..f6de7ff 100644
--- a/front/src/components/AnnouncementDetails.tsx
+++ b/front/src/components/AnnouncementDetails.tsx
@@ -29,7 +29,7 @@ function AnnouncementDetails({ close, announcement: { id, name, category, bestBy
                 <Modal.Body>
                     <h1>{name}</h1>
 
-                    <span>{categoryNames.get(category)}</span>
+                    <span>{categoryNames[category]}</span>
                     <span className='m-2'>&#x2022;</span>{/* dot */}
                     <span>Годен до {new Date(bestBy).toLocaleString('ru-RU')}</span>
 
diff --git a/front/src/components/Filters.tsx b/front/src/components/Filters.tsx
index 774d110..55252ce 100644
--- a/front/src/components/Filters.tsx
+++ b/front/src/components/Filters.tsx
@@ -1,6 +1,6 @@
 import { Button, Form, Modal } from "react-bootstrap"
 
-import { categoryNames } from "../assets/category"
+import { categories, categoryNames } from "../assets/category"
 import { stations, lines, lineNames } from '../assets/metro'
 import { FiltersType } from "../utils/filters"
 import { SetState } from "../utils/types"
@@ -49,9 +49,9 @@ function Filters({ filter, setFilter, filterShown, setFilterShown }: FiltersProp
                             <option value="">
                                 Выберите категорию
                             </option>
-                            {Array.from(categoryNames).map(
-                                ([category, categoryName]) =>
-                                    <option key={category} value={category}>{categoryName}</option>
+                            {categories.map(
+                                category =>
+                                    <option key={category} value={category}>{categoryNames[category]}</option>
                             )}
                         </Form.Select>
                     </Form.Group>
diff --git a/front/src/components/LineDot.tsx b/front/src/components/LineDot.tsx
index 8ba6651..a3f16de 100644
--- a/front/src/components/LineDot.tsx
+++ b/front/src/components/LineDot.tsx
@@ -1,5 +1,4 @@
-import { colors, lineNames } from '../assets/metro'
-import { lineByName } from '../utils/metro'
+import { colors, lineNames, lineByName } from '../assets/metro'
 
 function LineDot({ station }: { station: string }) {
     const line = lineByName(station)
diff --git a/front/src/pages/AddPage.tsx b/front/src/pages/AddPage.tsx
index a8c2059..4a7b162 100644
--- a/front/src/pages/AddPage.tsx
+++ b/front/src/pages/AddPage.tsx
@@ -6,7 +6,7 @@ import { latLng } from "leaflet"
 import { ClickHandler, LocationMarker, TrashboxMarkers } from "../components"
 import { useAddAnnouncement, useTrashboxes } from "../hooks/api"
 
-import { categoryNames } from "../assets/category"
+import { categories, categoryNames } from "../assets/category"
 import { stations, lines, lineNames } from "../assets/metro"
 import { isObject } from "../utils/types"
 import { handleHTTPErrors } from "../utils"
@@ -87,9 +87,8 @@ function AddPage() {
                             <option value="" hidden>
                                 Выберите категорию
                             </option>
-                            {Array.from(categoryNames).map(
-                                ([category, categoryName]) =>
-                                    <option key={category} value={category}>{categoryName}</option>
+                            {categories.map(category =>
+                                <option key={category} value={category}>{categoryNames[category]}</option>
                             )}
                         </Form.Select>
                     </Form.Group>
diff --git a/front/src/pages/HomePage.tsx b/front/src/pages/HomePage.tsx
index f232f51..cfcf2c3 100644
--- a/front/src/pages/HomePage.tsx
+++ b/front/src/pages/HomePage.tsx
@@ -15,7 +15,7 @@ function generateStories(announcements: Announcement[]): Story[] {
     return announcements.map(announcement => {
         return ({
             id: announcement.id,
-            url: announcement.src || categoryGraphics.get(announcement.category),
+            url: announcement.src || categoryGraphics[announcement.category],
             type: announcement.src?.endsWith("mp4") ? "video" : undefined,
             seeMore: ({ close }: { close: () => void }) => <AnnouncementDetails close={close} announcement={announcement} />
         })
diff --git a/front/src/utils/metro.ts b/front/src/utils/metro.ts
deleted file mode 100644
index 0873219..0000000
--- a/front/src/utils/metro.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { stations, lines } from "../assets/metro"
-
-function lineByName(name: string) {
-    return lines.find(line => stations[line].has(name))
-}
-
-export { lineByName }