Merge pull request #572 from Studio-Yandex-Practicum/develop

Release
Studio-Yandex-Practicum · Sep 3, 2024 · fcee41b · fcee41b
2 parents 767e926 + 10c6137
commit fcee41b
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 7 deletions.
diff --git a/src/components/author-page/overview/overview.tsx b/src/components/author-page/overview/overview.tsx
@@ -198,7 +198,7 @@ export const AuthorOverview: React.FC<IAuthorOverview> = (props) => {
                     <Button
                       size='sm'
                       border='right-bottom-left'
-                      href={`library/?festival=${item.year}&program=${item.id}`}
+                      href={`library/?year=${item.year}&program=${item.id}`}
                       animation='invert'
                     >
                       {`${item.name} ${item.year}`}

diff --git a/src/components/festival-event-card/festival-event-card.module.css b/src/components/festival-event-card/festival-event-card.module.css
@@ -112,12 +112,21 @@
 
 .actions {
   display: flex;
-  align-items: flex-start;
-  justify-content: flex-end;
+  flex-direction: row;
+  align-items: stretch;
+  justify-content: space-between;
   grid-area: actions;
+
+  @media (min-width: $tablet-portrait) {
+    width: fit-content;
+    flex-direction: column;
+    justify-content: flex-start;
+    gap: 16px;
+  }
 }
 
 .button {
+  justify-content: flex-start;
   padding: 0 2px 2px 0;
 }
 

diff --git a/src/components/festival-event-card/festival-event-card.tsx b/src/components/festival-event-card/festival-event-card.tsx
@@ -15,6 +15,7 @@ export interface FestivalEventCardProps {
   title: string
   description?: string
   credits: CreditsRole[]
+  aboutUrl?: string
   actionUrl?: Url | null
   className?: string
 }
@@ -29,6 +30,7 @@ export const FestivalEventCard: React.VFC<FestivalEventCardProps> = (props) => {
     title,
     description,
     credits,
+    aboutUrl,
     actionUrl,
     className
   } = props;
@@ -73,8 +75,27 @@ export const FestivalEventCard: React.VFC<FestivalEventCardProps> = (props) => {
         className={cx('credits')}
         roles={credits}
       />
-      {actionUrl && (
-        <div className={cx('actions')}>
+      <div className={cx('actions')}>
+        {aboutUrl && (
+          <Button
+            size="s"
+            border="bottom-left"
+            icon={(
+              <Icon
+                glyph="arrow-right"
+                width="100%"
+                height="100%"
+              />
+            )}
+            href={aboutUrl}
+            className={cx('button')}
+            target="_blank"
+            upperCase
+          >
+            О спектакле
+          </Button>
+        )}
+        {actionUrl && (
           <Button
             size="s"
             border="bottom-left"
@@ -92,8 +113,9 @@ export const FestivalEventCard: React.VFC<FestivalEventCardProps> = (props) => {
           >
             Регистрация
           </Button>
-        </div>
-      )}
+        )}
+      </div>
+
     </article>
   );
 };
diff --git a/src/components/festival-schedule/festival-schedule.tsx b/src/components/festival-schedule/festival-schedule.tsx
@@ -94,6 +94,7 @@ export const FestivalSchedule: React.VFC<FestivalScheduleProps> = withSWRFallbac
                   title={event.title}
                   image={event.artworkUrl}
                   description={event.description}
+                  aboutUrl={event.performanceId !== null ? (`/performances/${event.performanceId}`) : undefined}
                   actionUrl={event.registrationUrl}
                   credits={event.team}
                 />

diff --git a/src/components/history-page/title/history-title-card.tsx b/src/components/history-page/title/history-title-card.tsx
@@ -22,6 +22,9 @@ export const HistoryTitleCard = ({ item }: {item: ICard}) => {
           type='button'
           size='xxl'
           border='none'
+          className={cn({
+            [style.buttonDefault]: !item.buttonProps, 
+          })}
           {...(item.count && item.buttonProps)}
         >
           {item.count ? item.count.toString() : '0'}

diff --git a/src/components/history-page/title/history-title.module.css b/src/components/history-page/title/history-title.module.css
@@ -61,6 +61,10 @@
   display: flex;
 }
 
+.buttonDefault {
+  cursor: default;
+}
+
 .button.link.subtitle {
   overflow: hidden;
   padding: 0;

diff --git a/src/core/schedule/types.ts b/src/core/schedule/types.ts
@@ -19,4 +19,5 @@ export type FestivalEvent = {
   date: DateTimeIsoString
   registrationOpeningDate: DateTimeIsoString
   registrationUrl?: Url | null
+  performanceId: number | null
 }
diff --git a/src/services/api/schedule-adapter.ts b/src/services/api/schedule-adapter.ts
@@ -73,6 +73,7 @@ function mapDTOToFestivalEvents(dto: EventsDTO): PaginatedFestivalEvents {
       date: event.date_time,
       registrationOpeningDate: event.opening_date_time,
       registrationUrl: event.action_url,
+      performanceId: event.performance_id
     })),
     pagination,
   };