Fix links in copyright

ekaterinburgdev · Nov 5, 2023 · 35b1b68 · 35b1b68 · ekbdev · Nov 5, 2023
1 parent 01f94fa
commit 35b1b68
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 23 deletions.
diff --git a/components/Layers/Filters.config.tsx b/components/Layers/Filters.config.tsx
@@ -1,51 +1,50 @@
-import React from 'react';
+import { DTPFilter } from 'components/Layers/DTP/Filter/DTPFilter';
+import { DesignCodeFilter } from 'components/Layers/DesignCode/Filter/DesignCodeFilter';
 import { HouseAgeFilter } from 'components/Layers/Houses/Filter/Age/HouseAgeFilter';
 import { HouseFloorFilter } from 'components/Layers/Houses/Filter/Floor/HouseFloorFilter';
 import { HouseWearTearFilter } from 'components/Layers/Houses/Filter/WearTear/HouseWearTearFilter';
-import { DesignCodeFilter } from 'components/Layers/DesignCode/Filter/DesignCodeFilter';
-import { OknFilter } from 'components/Layers/OKN/Filter/Okn/OknFilter';
 import { LinesFilter } from 'components/Layers/Lines/Filter/LinesFilter';
-import { DTPFilter } from 'components/Layers/DTP/Filter/DTPFilter';
-import { SOURCES_BY_TYPE } from 'constants/sources';
+import { OknFilter } from 'components/Layers/OKN/Filter/Okn/OknFilter';
 import { QuarterFilter } from 'components/Layers/Quarter/Filter/QuarterFilter';
+import { SOURCES_BY_TYPE } from 'constants/sources';
 import { FilterConfig, FilterType } from '../../types/Filters.types';
 
 // @ts-ignore
 export const FILTERS_CONFIG: FilterConfig = {
     [FilterType.HouseAge]: {
         title: 'Возраст домов',
         component: <HouseAgeFilter />,
-        source: SOURCES_BY_TYPE.howoldthishouse,
+        source: [SOURCES_BY_TYPE.howoldthishouse],
         isVerified: false,
     },
     [FilterType.HouseFloor]: {
         title: 'Этажность домов',
         component: <HouseFloorFilter />,
-        source: SOURCES_BY_TYPE.howoldthishouse,
+        source: [SOURCES_BY_TYPE.mingkh, SOURCES_BY_TYPE.domaekb],
         isVerified: false,
     },
     [FilterType.HouseWearTear]: {
         title: 'Степень износа домов',
         component: <HouseWearTearFilter />,
-        source: SOURCES_BY_TYPE.howoldthishouse,
+        source: [SOURCES_BY_TYPE.mingkh, SOURCES_BY_TYPE.domaekb],
         isVerified: false,
     },
     [FilterType.OKN]: {
         title: 'Объекты культурного наследия',
         component: <OknFilter />,
-        source: SOURCES_BY_TYPE.okn,
+        source: [SOURCES_BY_TYPE.okn],
         isVerified: false,
     },
     [FilterType.DesignCode]: {
         title: '«Дизайн-код Екатеринбурга»',
         component: <DesignCodeFilter />,
-        source: SOURCES_BY_TYPE.ekaterinburgdesign,
+        source: [SOURCES_BY_TYPE.ekaterinburgdesign],
         isVerified: true,
     },
     [FilterType.DTP]: {
         title: 'ДТП',
         component: <DTPFilter />,
-        source: SOURCES_BY_TYPE.dtp,
+        source: [SOURCES_BY_TYPE.dtp],
         isVerified: true,
     },
     [FilterType.Line]: {
@@ -56,6 +55,7 @@ export const FILTERS_CONFIG: FilterConfig = {
     [FilterType.Quarter]: {
         title: 'Квартальные',
         component: <QuarterFilter />,
+        source: [SOURCES_BY_TYPE.ekb_quarter],
         isVerified: true,
     },
 };
diff --git a/components/Layers/Quarter/CardContent/CardContent.tsx b/components/Layers/Quarter/CardContent/CardContent.tsx
@@ -54,7 +54,7 @@ export function QuarterCardContent({ placemark }: QuarterCardContentProps) {
             </Section>
 
             <Section>
-                <Sources sources={['ekb']} />
+                <Sources sources={['ekb_quarter']} />
             </Section>
             <Section>
                 <div className={sectionStyles.block_inline}>

diff --git a/components/UI/Copyright/Copyright.tsx b/components/UI/Copyright/Copyright.tsx
@@ -16,14 +16,15 @@ export function Copyright() {
             <a href="https://www.openstreetmap.org/" target="_blank" rel="noreferrer">
                 OpenStreetMap
             </a>
-            {copyright && (
-                <>
-                    {' · '}
-                    <a href={copyright} target="_blank" rel="noreferrer">
-                        {new URL(copyright.link).host}
-                    </a>
-                </>
-            )}
+            {copyright &&
+                copyright.map((elem) => (
+                    <>
+                        {' · '}
+                        <a href={elem.link} target="_blank" rel="noreferrer">
+                            {elem.name}
+                        </a>
+                    </>
+                ))}
         </div>
     );
 }
diff --git a/constants/sources.ts b/constants/sources.ts
@@ -21,15 +21,15 @@ export const SOURCES_BY_TYPE = {
     },
     ekaterinburgdesign: {
         name: 'Дизайн-код Ектеринбурга',
-        link: 'https://ekaterinburg.design',
+        link: 'https://map.ekaterinburg.design',
         data: 'https://map.ekaterinburg.design/api/map',
     },
     dtp: {
         name: 'Карта ДТП',
         link: 'https://dtp-stat.ru/',
         data: 'https://dtp-stat.ru/opendata',
     },
-    ekb: {
+    ekb_quarter: {
         name: 'екатеринбург.рф',
         link: 'https://екатеринбург.рф/справка/квартальные',
         data: null,

diff --git a/types/Filters.types.ts b/types/Filters.types.ts
@@ -20,7 +20,7 @@ export enum FilterType {
 export interface FilterConfigItem {
     title: string;
     component: ReactNode;
-    source?: Source;
+    source?: Source[];
     isVerified: boolean;
 }