Skip to content

Commit

Permalink
SUL23-596: Displays for ascending and descending events (#227)
Browse files Browse the repository at this point in the history 
* SUL23-596: Displays for ascending and descending events

* dependency update
  • Loading branch information
@pookmish
pookmish authored Oct 11, 2024
1 parent 231606d commit fa85511
Show file tree
Hide file tree
Showing 8 changed files with 1,467 additions and 1,706 deletions.
4 changes: 2 additions & 2 deletions app/sitemap.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import {graphqlClient} from "@/lib/gql/fetcher"
import {NodeUnion} from "@/lib/gql/__generated__/drupal.d"

// https://nextjs.org/docs/app/api-reference/file-conventions/route-segment-config
export const revalidate = false
export const revalidate = 604800
export const dynamic = "force-static"

const Sitemap = async (): Promise<MetadataRoute.Sitemap> => {
const nodeQuery = await graphqlClient({next: {tags: ["paths"]}}).Nodes()
const nodeQuery = await graphqlClient({cache: "no-cache"}).Nodes()
const nodes: NodeUnion[] = []

nodeQuery.nodeStanfordCourses.nodes.map(node => nodes.push(node as NodeUnion))
Expand Down
30 changes: 15 additions & 15 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,54 +16,54 @@
"@formkit/auto-animate": "^0.8.2",
"@heroicons/react": "^2.1.5",
"@mui/base": "5.0.0-beta.58",
"@next/third-parties": "^14.2.13",
"@next/third-parties": "^14.2.15",
"@tailwindcss/container-queries": "^0.1.1",
"@tailwindcss/typography": "^0.5.15",
"@tanstack/react-query": "^5.56.2",
"@types/node": "^22.6.1",
"@types/react": "^18.3.8",
"@tanstack/react-query": "^5.59.11",
"@types/node": "^22.7.5",
"@types/react": "^18.3.11",
"autoprefixer": "^10.4.20",
"axios": "^1.7.7",
"critters": "^0.0.24",
"critters": "^0.0.25",
"decanter": "^7.3.0",
"graphql": "^16.9.0",
"graphql-request": "^7.1.0",
"graphql-tag": "^2.12.6",
"html-react-parser": "^5.1.16",
"html-react-parser": "^5.1.18",
"jsona": "^1.12.1",
"next": "^14.2.13",
"next": "^14.2.15",
"next-drupal": "^1.6.0",
"postcss": "^8.4.47",
"react": "^18.3.1",
"react-aria": "^3.34.3",
"react-aria": "^3.35.0",
"react-dom": "^18.3.1",
"react-error-boundary": "^4.0.13",
"react-focus-lock": "^2.13.2",
"react-obfuscate": "^3.7.0",
"react-obfuscate-email": "^1.1.5",
"react-stately": "^3.32.2",
"react-stately": "^3.33.0",
"react-super-responsive-table": "^5.2.3",
"react-tiny-oembed": "^1.1.0",
"sharp": "^0.33.5",
"tailwind-merge": "^2.5.2",
"tailwind-merge": "^2.5.3",
"tailwindcss": "^3.4.13",
"typescript": "^5.6.2",
"typescript": "^5.6.3",
"usehooks-ts": "^3.1.0"
},
"devDependencies": {
"@graphql-codegen/cli": "5.0.2",
"@graphql-codegen/cli": "5.0.3",
"@graphql-codegen/import-types-preset": "^3.0.0",
"@graphql-codegen/typescript-graphql-request": "^6.2.0",
"@graphql-codegen/typescript-operations": "4.2.3",
"@graphql-codegen/typescript-operations": "4.3.0",
"@types/qs": "^6.9.16",
"eslint": "^8.57.1",
"eslint-config-next": "^14.2.13",
"eslint-config-next": "^14.2.15",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-deprecation": "^3.0.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-unused-imports": "4.1.4",
"prettier": "^3.3.3",
"prettier-plugin-tailwindcss": "^0.6.6"
"prettier-plugin-tailwindcss": "^0.6.8"
},
"packageManager": "[email protected]"
}
85 changes: 44 additions & 41 deletions src/components/paragraph/stanford-lists.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ import {cache, HTMLAttributes, JSX} from "react"
import {
Maybe,
NodeUnion,
NodeStanfordPublication,
NodeStanfordPerson,
NodeStanfordNews,
NodeStanfordEvent,
NodeStanfordCourse,
NodeStanfordPage,
StanfordBasicPagesSortKeys,
StanfordBasicPagesQueryVariables,
ParagraphStanfordList,
SortDirection,
} from "@/lib/gql/__generated__/drupal.d"
import {graphqlClient} from "@/lib/gql/fetcher"
import View from "@/components/views/view"
Expand Down Expand Up @@ -136,10 +135,6 @@ const getViewPagedItems = cache(

const tags = ["views"]
switch (`${viewId}--${displayId}`) {
case "sul_shared_tag_events--card_grid":
tags.push("views:stanford_event")
break

case "sul_study_places--study_places":
case "sul_study_places--study_places_table":
tags.push("views:sul_study_place")
Expand All @@ -164,9 +159,12 @@ const getViewPagedItems = cache(
tags.push("views:stanford_course")
break

case "stanford_events--cards":
case "stanford_events--list_page":
case "stanford_events--past_events_list_block":
case "sul_events--cards":
case "sul_events--list_page":
case "sul_events--past_events_list_block":
case "sul_events--shared_tags_cards":
case "sul_events--cards_desc":
case "sul_events--shared_tags_cards_desc":
tags.push("views:stanford_event")
break

Expand All @@ -190,14 +188,10 @@ const getViewPagedItems = cache(
let contextualFilters = getContextualFilters(["term_node_taxonomy_name_depth"], contextualFilter)
let graphqlResponse

const sortDir = displayId.includes("desc") ? SortDirection.Desc : SortDirection.Asc

try {
switch (`${viewId}--${displayId}`) {
case "sul_shared_tag_events--card_grid":
contextualFilters = getContextualFilters(["term_node_taxonomy_name_depth"], contextualFilter)
graphqlResponse = await client.sulSharedTagEventsCardGridGraphql({contextualFilters, ...queryVariables})
items = graphqlResponse.sulSharedTagEventsCardGridGraphql?.results as unknown as NodeUnion[]
break

case "sul_study_places--study_places":
case "sul_study_places--study_places_table":
graphqlResponse = await client.sulStudyPlaces()
Expand All @@ -223,18 +217,26 @@ const getViewPagedItems = cache(
totalItems = graphqlResponse.stanfordBasicPages?.pageInfo.total || 0
break

case "stanford_courses--default_list_viewfield_block":
case "stanford_courses--vertical_teaser_viewfield_block":
graphqlResponse = await client.stanfordCourses({
contextualFilters,
...queryVariables,
})
items = graphqlResponse.stanfordCourses?.results as unknown as NodeStanfordCourse[]
totalItems = graphqlResponse.stanfordCourses?.pageInfo.total || 0
// case "stanford_courses--default_list_viewfield_block":
// case "stanford_courses--vertical_teaser_viewfield_block":
// graphqlResponse = await client.stanfordCourses({
// contextualFilters,
// ...queryVariables,
// })
// items = graphqlResponse.stanfordCourses?.results as unknown as NodeStanfordCourse[]
// totalItems = graphqlResponse.stanfordCourses?.pageInfo.total || 0
// break

case "sul_events--shared_tags_cards":
case "sul_events--shared_tags_cards_desc":
contextualFilters = getContextualFilters(["term_node_taxonomy_name_depth"], contextualFilter)
graphqlResponse = await client.sulEventsSharedTags({contextualFilters, sortDir, ...queryVariables})
items = graphqlResponse.sulEventsSharedTags?.results as unknown as NodeUnion[]
break

case "stanford_events--cards":
case "stanford_events--list_page":
case "sul_events--cards_desc":
case "sul_events--cards":
case "sul_events--list_page":
contextualFilters = getContextualFilters(
[
"term_node_taxonomy_name_depth",
Expand All @@ -244,21 +246,22 @@ const getViewPagedItems = cache(
],
contextualFilter
)
graphqlResponse = await client.stanfordEvents({
graphqlResponse = await client.sulEvents({
contextualFilters,
sortDir,
...queryVariables,
})
items = graphqlResponse.stanfordEvents?.results as unknown as NodeStanfordEvent[]
totalItems = graphqlResponse.stanfordEvents?.pageInfo.total || 0
items = graphqlResponse.sulEvents?.results as unknown as NodeStanfordEvent[]
totalItems = graphqlResponse.sulEvents?.pageInfo.total || 0
break

case "stanford_events--past_events_list_block":
graphqlResponse = await client.stanfordEventsPastEvents({
case "sul_events--past_events_list_block":
graphqlResponse = await client.sulEvents({
contextualFilters,
...queryVariables,
})
items = graphqlResponse.stanfordEventsPastEvents?.results as unknown as NodeStanfordEvent[]
totalItems = graphqlResponse.stanfordEventsPastEvents?.pageInfo.total || 0
items = graphqlResponse.sulEvents?.results as unknown as NodeStanfordEvent[]
totalItems = graphqlResponse.sulEvents?.pageInfo.total || 0
break

case "stanford_news--block_1":
Expand All @@ -282,15 +285,15 @@ const getViewPagedItems = cache(
totalItems = graphqlResponse.stanfordPerson?.pageInfo.total || 0
break

case "stanford_publications--apa_list":
case "stanford_publications--chicago_list":
graphqlResponse = await client.stanfordPublications({
contextualFilters,
...queryVariables,
})
items = graphqlResponse.stanfordPublications?.results as unknown as NodeStanfordPublication[]
totalItems = graphqlResponse.stanfordPublications?.pageInfo.total || 0
break
// case "stanford_publications--apa_list":
// case "stanford_publications--chicago_list":
// graphqlResponse = await client.stanfordPublications({
// contextualFilters,
// ...queryVariables,
// })
// items = graphqlResponse.stanfordPublications?.results as unknown as NodeStanfordPublication[]
// totalItems = graphqlResponse.stanfordPublications?.pageInfo.total || 0
// break

case "stanford_shared_tags--card_grid":
contextualFilters = getContextualFilters(["term_node_taxonomy_name_depth", "type"], contextualFilter)
Expand Down
30 changes: 15 additions & 15 deletions src/components/views/view.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import NewsCardView from "@/components/views/stanford-news/news-card-view"
import NewsListView from "@/components/views/stanford-news/news-list-view"
import PersonCardView from "@/components/views/stanford-person/person-card-view"
import EventsCardView from "@/components/views/stanford-events/events-card-view"
import EventsListView from "@/components/views/stanford-events/events-list-view"
import PageCardView from "@/components/views/stanford-page/page-card-view"
import StudyPlacesFilteredCards from "@/components/views/sul-study-place/study-places-filtered-cards"
import SulBranchLocationTableView from "@/components/views/sul-branch-locations/filtering-table/branch-locations-table"
Expand Down Expand Up @@ -66,7 +65,11 @@ const View = async ({viewId, displayId, items, totalItems, loadPage, hasHeading}
case "stanford_person--grid_list_all":
return <PersonCardView items={items as NodeStanfordPerson[]} hasHeading={hasHeading} />

case "stanford_events--cards":
case "sul_events--cards":
case "sul_events--cards_desc":
case "sul_events--shared_tags_cards":
case "sul_events--shared_tags_cards_desc":
case "sul_events--list_page":
return (
<EventsCardView
items={items as NodeStanfordEvent[]}
Expand All @@ -76,26 +79,23 @@ const View = async ({viewId, displayId, items, totalItems, loadPage, hasHeading}
/>
)

case "stanford_events--past_events_list_block":
case "stanford_events--list_page":
return (
<EventsListView
items={items as NodeStanfordEvent[]}
hasHeading={hasHeading}
totalItems={totalItems}
loadPage={loadPage}
/>
)
// case "sul_events--past_events_list_block":
// case "sul_events--list_page":
// return (
// <EventsListView
// items={items as NodeStanfordEvent[]}
// hasHeading={hasHeading}
// totalItems={totalItems}
// loadPage={loadPage}
// />
// )

case "stanford_basic_pages--viewfield_block_1":
return <PageCardView items={items as NodeStanfordPage[]} hasHeading={hasHeading} />

case "stanford_shared_tags--card_grid":
return <SharedTagsCardView items={items as NodeStanfordNews[]} hasHeading={hasHeading} />

case "sul_shared_tag_events--card_grid":
return <SharedTagsCardView items={items as NodeStanfordEvent[]} hasHeading={hasHeading} />

case "sul_study_places--study_places":
return <StudyPlacesFilteredCards items={items as NodeSulStudyPlace[]} />

Expand Down
Loading

0 comments on commit fa85511

Please sign in to comment.