Skip to content
This repository has been archived by the owner on Jun 9, 2023. It is now read-only.

feat: limit number of events in the chapterCard #2127

Merged
merged 10 commits into from
Jan 8, 2023
Merged

feat: limit number of events in the chapterCard #2127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c6ee137
remove extra code
Dec 21, 2022
a676310
generate apollo api
Dec 21, 2022
52ecc37
graphql slicing doesn't work in queires
Dec 21, 2022
58ee2bf
clean the queries
Dec 21, 2022
93281df
can't generate apollo api that accept paginating the events
Dec 21, 2022
a8a88a1
Merge branch 'freeCodeCamp:main' into feat/limit-the-events-in-chapte…
Jan 4, 2023
b255717
limit the number to three events
Jan 4, 2023
f1c5b8c
remove from the queries
Jan 4, 2023
5860ac0
fix chapter card text and order
Jan 4, 2023
cf54306
Merge branch 'main' into feat/limit-the-events-in-chapterCard
Jan 6, 2023
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
2 changes: 1 addition & 1 deletion client/src/components/ChapterCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export const ChapterCard: React.FC<ChapterCardProps> = ({ chapter }) => {
marginBlockStart={'.5em'}
gridArea="eventheader"
>
New Events
Next Events
</Text>
<GridItem area="event" paddingInline={'1em'}>
{chapter.events.map(({ id, name, start_at }) => (
Expand Down
3 changes: 2 additions & 1 deletion server/src/controllers/Chapter/resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ export class ChapterResolver {
where: {
AND: [{ canceled: false }, { ends_at: { gt: new Date() } }],
},
orderBy: { start_at: 'asc' },
take: 3,
orderBy: { start_at: 'desc' },
},
chapter_users: {
include: {
Expand Down