Merge branch 'develop' into fix-form-psevdonim

Studio-Yandex-Practicum · Sep 8, 2024 · b8c0dc5 · b8c0dc5
2 parents 2509f4a + ab74c38
commit b8c0dc5
Show file tree

Hide file tree

Showing 16 changed files with 80 additions and 19 deletions.
diff --git a/src/__generated__/api-typings/models/Project.ts b/src/__generated__/api-typings/models/Project.ts
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}`}
@@ -222,6 +222,8 @@ export const AuthorOverview: React.FC<IAuthorOverview> = (props) => {
                       size="s"
                       border='bottom-left'
                       href={item.link}
+                      target='_blank'
+                      rel='noopener noreferrer'
                       icon={(
                         <Icon
                           glyph="arrow-right"

diff --git a/src/components/donation-link/donation-link.module.css b/src/components/donation-link/donation-link.module.css
@@ -32,7 +32,8 @@
     border-top-right-radius: 200% 100%;
   }
 
-  &:hover {
+  &:hover,
+  &.active { 
     &::before,
     &::after {
       visibility: visible;

diff --git a/src/components/donation-link/donation-link.tsx b/src/components/donation-link/donation-link.tsx
@@ -1,5 +1,6 @@
 import cn from 'classnames/bind';
 import Link from 'next/link';
+import { useRouter } from 'next/router';
 
 import { Icon } from 'components/ui/icon';
 
@@ -11,10 +12,12 @@ const cx = cn.bind(styles);
 
 export const DonationLink = (props: Pick<LinkProps, 'href'>): JSX.Element => {
   const { href } = props;
+  const router = useRouter();
+  const isActive = router.asPath === href;
 
   return (
     <Link href={href}>
-      <a className={cx('link')}>
+      <a className={cx('link', { active: isActive })}>
         <Icon glyph="plus" className={cx('icon')}/>
         <span className={cx('text')}>
           Поддержать

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,7 +15,9 @@ export interface FestivalEventCardProps {
   title: string
   description?: string
   credits: CreditsRole[]
+  aboutUrl?: string
   actionUrl?: Url | null
+  actionText?: string | null
   className?: string
 }
 
@@ -29,7 +31,9 @@ export const FestivalEventCard: React.VFC<FestivalEventCardProps> = (props) => {
     title,
     description,
     credits,
+    aboutUrl,
     actionUrl,
+    actionText,
     className
   } = props;
 
@@ -73,8 +77,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 && actionText && (
           <Button
             size="s"
             border="bottom-left"
@@ -90,10 +113,11 @@ export const FestivalEventCard: React.VFC<FestivalEventCardProps> = (props) => {
             target="_blank"
             upperCase
           >
-            Регистрация
+            {actionText}
           </Button>
-        </div>
-      )}
+        )}
+      </div>
+
     </article>
   );
 };
diff --git a/src/components/festival-schedule/festival-schedule.tsx b/src/components/festival-schedule/festival-schedule.tsx
@@ -94,7 +94,9 @@ 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}
+                  actionText={event.actionText}
                   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/components/project-layout/description/project-layout-description.tsx b/src/components/project-layout/description/project-layout-description.tsx
@@ -5,21 +5,22 @@ import { ProjectLayoutStorey } from '../storey';
 import styles from './project-layout-description.module.css';
 
 interface IProjectLayoutDescriptionProps {
-  children: string
+  descriptionCaption: string
+  description: string
 }
 
 const cx = classNames.bind(styles);
 
-export const ProjectLayoutDescription = ({ children }: IProjectLayoutDescriptionProps): JSX.Element => {
+export const ProjectLayoutDescription = ({ descriptionCaption, description }: IProjectLayoutDescriptionProps): JSX.Element => {
 
   return (
     <ProjectLayoutStorey type="description">
       <section>
         <h2 className={cx('title')}>
-          О проекте
+          {descriptionCaption}
         </h2>
         <p className={cx('text')}>
-          {children}
+          {description}
         </p>
       </section>
     </ProjectLayoutStorey>

diff --git a/src/core/project/types.ts b/src/core/project/types.ts
@@ -10,6 +10,7 @@ export type Project = {
 export type ProjectDetailed = {
   title: string
   intro: string
+  descriptionCaption: string
   description: string
   image: string
   contents: BaseContent[]

diff --git a/src/core/schedule/types.ts b/src/core/schedule/types.ts
@@ -19,4 +19,6 @@ export type FestivalEvent = {
   date: DateTimeIsoString
   registrationOpeningDate: DateTimeIsoString
   registrationUrl?: Url | null
+  actionText: string | null
+  performanceId: number | null
 }
diff --git a/src/pages/form/form.tsx b/src/pages/form/form.tsx
@@ -154,6 +154,7 @@ const validate = (values: ParticipationFormFields) => {
 
 const Participation = () => {
   const [errorOccurred, setErrorOccurred] = useState(false);
+  const [requestActive, setRequestActive] = useState(false);
   const form = useForm<ParticipationFormFields>({
     initialValues: initialFormValues,
     validate: validate,
@@ -196,13 +197,16 @@ const Participation = () => {
       return;
     }
     try {
+      setRequestActive(true);
       const participationData = form.values.anonym === false ? { ...form.values, nickname: '' } : form.values;
       await postParticipation(participationData);
       router.push('/form/success');
     } catch (error) {
       handleSubmitError(error);
 
       return;
+    } finally {
+      setRequestActive(false);
     }
   };
 
@@ -401,9 +405,11 @@ const Participation = () => {
                   border="full"
                   upperCase
                   fullWidth
-                  disabled={!canSubmit}
+                  disabled={!canSubmit || requestActive}
                 >
-                  Отправить
+                  {
+                    requestActive ? 'Отправляется' : 'Отправить'
+                  }
                 </Button>
               </Form.Actions>
               <Form.Disclaimer>

diff --git a/src/pages/projects/[id].tsx b/src/pages/projects/[id].tsx
@@ -16,6 +16,7 @@ const Project = (props: InferGetServerSidePropsType<typeof getServerSideProps>)
   const {
     title,
     intro,
+    descriptionCaption,
     description,
     image,
     contents,
@@ -39,9 +40,7 @@ const Project = (props: InferGetServerSidePropsType<typeof getServerSideProps>)
           intro={intro}
           image={image}
         />
-        <ProjectLayout.Description>
-          {description}
-        </ProjectLayout.Description>
+        <ProjectLayout.Description {...{ descriptionCaption, description }}/>
         <ConstructorContent
           variant="project"
           // @ts-expect-error: TODO: В документации API нет описания ответов с блоками конструктора

diff --git a/src/services/api/projects.ts b/src/services/api/projects.ts
@@ -25,6 +25,7 @@ function mapDTOtoProjectDetailed(dto: ProjectDTO): ProjectDetailed {
     title: dto.title,
     intro: dto.intro,
     description: dto.description,
+    descriptionCaption: dto.description_caption,
     image: dto.image,
     contents: dto.contents,
   };

diff --git a/src/services/api/schedule-adapter.ts b/src/services/api/schedule-adapter.ts
@@ -73,6 +73,8 @@ function mapDTOToFestivalEvents(dto: EventsDTO): PaginatedFestivalEvents {
       date: event.date_time,
       registrationOpeningDate: event.opening_date_time,
       registrationUrl: event.action_url,
+      actionText: event.action_text,
+      performanceId: event.performance_id
     })),
     pagination,
   };