Merge branch 'main' into APPS-2880_event_detail_image_aspect_ratio

UCLALibrary · Aug 9, 2024 · aa53c60 · aa53c60
2 parents c8c1388 + c2dd3c2
commit aa53c60
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/cypress/e2e/eventDetailPage.cy.js b/cypress/e2e/eventDetailPage.cy.js
@@ -4,6 +4,6 @@ describe('Event Detail page', () => {
 
     cy.get('h3.title-no-link').should('contain', 'TEST - La Région Centrale')
 
-    cy.percySnapshot({ widths: [768, 992, 1200] })
+    cy.percySnapshot('eventdetailpage', { widths: [768, 992, 1200] })
   })
 })
diff --git a/cypress/e2e/homepage.cy.js b/cypress/e2e/homepage.cy.js
@@ -18,6 +18,6 @@ describe('Website Homepage', () => {
     //   .should('have.attr', 'href', 'https://www.library.ucla.edu')
     // NavPrimary
 
-    cy.percySnapshot({ widths: [768, 992, 1200] })
+    // cy.percySnapshot({ widths: [768, 992, 1200] })
   })
 })
diff --git a/gql/queries/FTVAEventDetail.gql b/gql/queries/FTVAEventDetail.gql
@@ -18,14 +18,14 @@ query FTVAEventDetail($slug: [String!]) {
 
     # CardMeta
     title: eventTitle
-    ftvaEventIntroduction
-    eventDescription
-    ftvaEventFilters {
+    guestSpeaker
+    tagLabels: ftvaEventFilters {
       title
       uri
     }
+    introduction: ftvaEventIntroduction
 
-    guestSpeaker
+    eventDescription
     acknowledements: richText
 
     ftvaEventScreeningDetails {

diff --git a/pages/events/[slug].vue b/pages/events/[slug].vue
@@ -140,13 +140,13 @@ const parsedFTVAEventScreeningDetails = computed(() => {
           <CardMeta
             :category="series[0]?.title"
             :title="page?.title"
-            :tag-labels="page.ftvaEventFilters"
-            :introduction="page.ftvaEventIntroduction"
-            :text="page.eventDescription"
+            :guest-speaker="page.guestSpeaker"
+            :tag-labels="page.tagLabels"
+            :introduction="page.introduction"
           />
           <RichText
-            v-if="page.guestSpeaker"
-            :rich-text-content="page.guestSpeaker"
+            v-if="page.eventDescription"
+            :rich-text-content="page.eventDescription"
           />
 
           <RichText