From 52a0d72549cff9a71affd0085a82219298179f19 Mon Sep 17 00:00:00 2001 From: katarinazaprazna Date: Tue, 25 Jun 2024 13:48:08 +0200 Subject: [PATCH] Implement core UI changes --- next/components/cards/FileRowCard.tsx | 14 ++++++++--- .../page-contents/RegulationPageContent.tsx | 25 ++++++++----------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/next/components/cards/FileRowCard.tsx b/next/components/cards/FileRowCard.tsx index 3d6b73316..91c364dc3 100644 --- a/next/components/cards/FileRowCard.tsx +++ b/next/components/cards/FileRowCard.tsx @@ -1,12 +1,14 @@ import React from 'react' import cn from 'utils/cn' -import { DownloadIcon } from '@/assets/ui-icons' +import { AttachmentIcon, DownloadIcon } from '@/assets/ui-icons' import { FileCardProps } from '@/components/cards/FileCard' import MLink from '@/components/common/MLink/MLink' import { isDefined } from '@/utils/isDefined' import { useTranslation } from '@/utils/useTranslation' +import HorizontalDivider from '../common/Divider/HorizontalDivider' + /** * Figma: https://www.figma.com/file/17wbd0MDQcMW9NbXl6UPs8/DS-ESBS%2BBK%3A-Component-library?node-id=867%3A2067&mode=dev */ @@ -24,8 +26,11 @@ const FileRowCard = ({ return (
-
-
+
+
+ +
+
)}
-
+
+
) } diff --git a/next/components/page-contents/RegulationPageContent.tsx b/next/components/page-contents/RegulationPageContent.tsx index ccc99ec1a..44ab72e87 100644 --- a/next/components/page-contents/RegulationPageContent.tsx +++ b/next/components/page-contents/RegulationPageContent.tsx @@ -1,4 +1,5 @@ import { Typography } from '@bratislava/component-library' +import classNames from 'classnames' import React, { Fragment } from 'react' import FileRowCard from '@/components/cards/FileRowCard' @@ -67,23 +68,21 @@ const RegulationPageContent = ({ regulation }: RegulationPageContentProps) => {
-
+
{t('Regulation.mainDocument')} {/* TODO refactor to use standard component */} {mainDocument?.data?.attributes ? ( -
- -
+ ) : ( {t('Regulation.noAttachmentsMessage')} )} @@ -95,11 +94,10 @@ const RegulationPageContent = ({ regulation }: RegulationPageContentProps) => { {/* TODO refactor to use standard component */} {attachmentFiles?.length ? ( -
+
{attachmentFiles .map(({ media: attachementMedia, title: attachmentTitle }) => { if (!attachementMedia.data.attributes) return null - return ( { formatFileExtension(attachementMedia.data.attributes.ext) ?? undefined } downloadLink={attachementMedia.data.attributes.url} - className="-mx-4 px-4 [&>*]:border-b-0" /> ) })