a-chabin review

ekaterinburgdev · Sep 3, 2023 · 6d25567 · 6d25567 · ekbdev · Sep 3, 2023
1 parent 1fc8bd7
commit 6d25567
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/client/components/Map/Stops/Sidebar/StopsList/Item/MapStopsSidebarStopsListItem.tsx b/client/components/Map/Stops/Sidebar/StopsList/Item/MapStopsSidebarStopsListItem.tsx
@@ -63,10 +63,11 @@ export function MapStopsSidebarStopsListItem({ vehicle }: MapStopsSidebarStopsLi
                 [styles.MapStopsSidebarVehicle_isSelected]: currentVehicleRoute === vehicle.route,
             })}
             onClick={setSelectedVehicle}
-            style={{
-                // @ts-ignore
-                '--vehicle-color': VEHICLE_TYPE_COLORS[vehicle.type],
-            }}
+            style={
+                {
+                    '--vehicle-color': VEHICLE_TYPE_COLORS[vehicle.type],
+                } as React.CSSProperties
+            }
         >
             <div className={cn(styles.MapStopsSidebarVehicleInfo)}>
                 <div className={cn(styles.MapStopsSidebarVehicleRoute)}>{vehicle.route}</div>

diff --git a/client/components/Map/Stops/Sidebar/StopsList/MapStopsSidebarStopsList.tsx b/client/components/Map/Stops/Sidebar/StopsList/MapStopsSidebarStopsList.tsx
@@ -23,7 +23,7 @@ export function MapStopsSidebarStopsList() {
             ))}
             {stopInfo.length === 0 && (
                 <Typography variant="h4">
-                    {t('О нет! В ближайшее время транспорта тут не будет')}
+                    {t('О, нет! В ближайшее время транспорта тут не будет')}
                 </Typography>
             )}
         </MapStopsSidebarRow>

diff --git a/client/components/Map/Vehicles/Sidebar/MapVehiclesSidebar.tsx b/client/components/Map/Vehicles/Sidebar/MapVehiclesSidebar.tsx
@@ -224,10 +224,11 @@ export function MapVehiclesSidebar({
     return (
         <div
             className={cn(styles.MapVehiclesSidebar)}
-            style={{
-                // @ts-ignore
-                '--vehicle-color': VEHICLE_TYPE_COLORS[type],
-            }}
+            style={
+                {
+                    '--vehicle-color': VEHICLE_TYPE_COLORS[type],
+                } as React.CSSProperties
+            }
         >
             <div className={cn(styles.MapVehiclesSidebarWrapper)}>
                 {unitInfo?.image.data && (

diff --git a/common/types/strapi.ts b/common/types/strapi.ts
@@ -6,9 +6,9 @@ export enum StrapiContentTypes {
     UnitInfo = 'unit-info',
 }
 
-export interface StrapiBase<A> {
+export interface StrapiBase<AttributesType> {
     id: number;
-    attributes: A;
+    attributes: AttributesType;
 }
 
 export type StrapiStop = StrapiBase<Stop>;