Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: APPS-2743 Assemble the EventDetail page #6

Merged
merged 24 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
afaf3c6
update query, and component library
jendiamond Jul 23, 2024
52dfeae
update component library to 3.4.0
jendiamond Jul 23, 2024
1f76e10
update FTVA theme
jendiamond Jul 23, 2024
944d17f
event detail
jendiamond Jul 24, 2024
bff3776
linting
jendiamond Jul 24, 2024
5d553c2
add super basic cypress test
jendiamond Jul 24, 2024
fc0c997
delete screening test data
jendiamond Jul 24, 2024
ea70b53
SectionTeaserCard
jendiamond Jul 24, 2024
dc11030
update parsedFtvaEventSeries
jendiamond Jul 25, 2024
8c1925d
Linting
jendiamond Jul 25, 2024
1dab90b
feat: event detail page styles pt 1
Jul 25, 2024
38c481c
feat: page layout styles
Jul 26, 2024
2df413f
Merge branch 'main' into APPS-2743_assemble-the-event-detail-page
pghorpade Jul 26, 2024
348c410
fix: parsedFtvaEventSeries
Jul 26, 2024
90479ce
Merge remote-tracking branch 'refs/remotes/origin/APPS-2743_assemble-…
Jul 26, 2024
9924ba1
chore: reimport components
Jul 26, 2024
25e931e
Merge branch 'main' into APPS-2743_assemble-the-event-detail-page
pghorpade Jul 27, 2024
473f1fb
fix: posterimages on screening details videos
Jul 27, 2024
d30c88c
fix: preview, ci error
Jul 29, 2024
6c60d0b
feat: comment header and footer as the page layout gets wonky in prev…
pghorpade Jul 29, 2024
c0b2189
update design token library
jendiamond Jul 29, 2024
41b8fb7
feat: fix pinia error in the build and other undefined erors
pghorpade Jul 29, 2024
452fdbd
fix: cypress home page
pghorpade Jul 29, 2024
06e07ce
ci: fix cypress event detail spec file name and assertions
pghorpade Jul 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<script setup>
import { provideTheme } from '@/composables/provideTheme'
provideTheme()
const { enabled, state } = usePreviewMode()
</script>

<template>
<div>
<NuxtLoadingIndicator
Expand Down
3 changes: 3 additions & 0 deletions composables/provideTheme.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export function provideTheme() {
provide('theme', computed(() => 'ftva'))
}
9 changes: 9 additions & 0 deletions cypress/e2e/eventDetailPage.cy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
describe('Event Detail page', () => {
it('Visit a event Detail Page', () => {
cy.visit('/events/la-région-centrale-03-08-24')

cy.get('h3.title-no-link').should('contain', 'TEST - La Région Centrale')

cy.percySnapshot({ widths: [768, 992, 1200] })
})
})
5 changes: 3 additions & 2 deletions cypress/e2e/homepage.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ describe('Website Homepage', () => {
cy.viewport(1200, 1200)

// UCLA brand
cy.get('.site-brand-bar').should('be.visible')
// TODO Un comment this once header and footer are added back to default layout file.
/* cy.get('.site-brand-bar').should('be.visible')
cy.get('.visually-hidden').should('contain', 'UCLA Home')
cy.get('.ucla-logo')
.parent()
.should('have.attr', 'href', 'https://www.ucla.edu')
cy.get('.svg__logo-library')
.parent()
.should('have.attr', 'href', 'https://www.library.ucla.edu')
.should('have.attr', 'href', 'https://www.library.ucla.edu') */

// cy.get('a.logo-ucla')
// .should('have.attr', 'href', 'https://www.library.ucla.edu')
Expand Down
60 changes: 30 additions & 30 deletions gql/queries/FTVAEventDetail.gql
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ query FTVAEventDetail($slug: [String!]) {
typeHandle
slug
uri

imageCarousel {
...on imageCarousel_imageCarousel_BlockType {
image {
Expand All @@ -27,6 +28,28 @@ query FTVAEventDetail($slug: [String!]) {
guestSpeaker
acknowledements: richText

ftvaEventScreeningDetails {
...on ftvaEventScreeningDetails_screeningDetails_BlockType {
screeningTitle
alternateTitle
languageTranslated
year
country
languageInfo
runtime
screeningTags {
title
}
descriptionOfScreening
trailer
image {
...on mediaAndDocuments_Asset {
...Image
}
}
}
}

# SIDEBAR
# BlockEventDetail
startDateWithTime
Expand All @@ -38,43 +61,21 @@ query FTVAEventDetail($slug: [String!]) {
publicUrl
address
}

# BlockInfo / Ticket Info
ftvaTicketInformation {
id
title
uri
}

ftvaEventRegistration {
...on ftvaEventRegistration_eventRegistration_BlockType {
registrationText
registrationUrlLink
}
}

ftvaEventScreeningDetails {
...on ftvaEventScreeningDetails_screeningDetails_BlockType {
screeningTitle
alternateTitle
languageTranslated
year
country
languageInfo
runtime
screeningTags {
title
}
descriptionOfScreening
trailer
image {
...on mediaAndDocuments_Asset {
...Image
}
}
}
}
}

# SectionTeaserCard
ftvaEventSeries: entries(
section: "ftvaEventSeries", orderBy: "postDate",
relatedToEntries: {section: "ftvaEvent", slug: $slug}) {
Expand All @@ -85,12 +86,11 @@ query FTVAEventDetail($slug: [String!]) {
title
ftvaEvent {
... on ftvaEvent_ftvaEvent_Entry {
id
title
startDate: startDateWithTime @formatDateTime(format: "Y-m-d", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "TH:i:s", timezone: "America/Los_Angeles")

ftvaImage {
id
title
startDate: startDateWithTime @formatDateTime(format: "Y-m-d", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "TH:i:s", timezone: "America/Los_Angeles")
media: ftvaImage {
...Image
}
}
Expand Down
8 changes: 4 additions & 4 deletions layouts/default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const classes = computed(() => {
</script>
<template lang="html">
<div :class="classes">
<header
<!--header
v-show="!isMobile"
class="header-main"
>
Expand All @@ -49,17 +49,17 @@ const classes = computed(() => {
title="Film And Telivision Archive"
acronym="FTVA"
/>
</header>
</header-->

<slot />

<footer>
<!--footer>
<footer-primary
v-if="globalStore.footerPrimary"
:form="false"
/>
<footer-sock v-if="globalStore.footerSock" />
</footer>
</footer-->
</div>
</template>
<style lang="scss" scoped>
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "meap-website-nuxt",
"name": "ftva-website-nuxt",
"type": "module",
"scripts": {
"build": "nuxt build",
Expand Down Expand Up @@ -38,7 +38,7 @@
"lodash": "^4.17.21",
"nuxt-graphql-request": "^7.0.5",
"sass": "^1.66.1",
"ucla-library-design-tokens": "^5.12.6",
"ucla-library-website-components": "2.39.0-alpha.100"
"ucla-library-design-tokens": "^5.20.0",
"ucla-library-website-components": "3.5.0"
}
}
Loading
Loading