chore: app router - /team, /org, /[user] booking pages (excl. embeds) #18186
+611
−837
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dosubot
bot
added
the
teams
Graphite Automations"Add consumer team as reviewer" took an action on this PR • (12/14/24)1 reviewer was added to this PR based on Keith Williams's automation. |
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎ 2 Skipped Deployments
|
hbjORbj
changed the title
hbjORbj
commented
Dec 27, 2024
| @@ -103,3 +104,22 @@ export const _generateMetadata = async ( | |||
| }, | |||
| }; | |||
| }; | |||
|
|
|||
| export const generateMeetingMetadata = async ( | |||
There was a problem hiding this comment.
The key difference is const image = SEO_IMG_OGIMG + constructMeetingImage(meeting);. Using constructMeetingImage is important to generate correct OG images.
hbjORbj
commented
Dec 27, 2024
Comment on lines
+53
to
+54
| follow: !(event?.hidden || !isSEOIndexable), | ||
| index: !(event?.hidden || !isSEOIndexable), |
There was a problem hiding this comment.
noindexandnofolloware not supported in App Router. We need to usefollowandindexinstead.
hbjORbj
commented
Dec 27, 2024
| @@ -249,7 +249,6 @@ | |||
| "APP_ROUTER_AUTH_ERROR_ENABLED", | |||
| "APP_ROUTER_AUTH_PLATFORM_ENABLED", | |||
| "APP_ROUTER_AUTH_OAUTH2_ENABLED", | |||
| "APP_ROUTER_TEAM_ENABLED", | |||
There was a problem hiding this comment.
I confirmed that we do not have env variables for user or org
hbjORbj
commented
Dec 27, 2024
| @@ -20,13 +19,6 @@ export default function Type({ | |||
| }: PageProps) { | |||
| return ( | |||
| <main className={getBookerWrapperClasses({ isEmbed: !!isEmbed })}> | |||
| <BookerSeo | |||
There was a problem hiding this comment.
BookerSeo is not needed anymore as we handle the metadata using app router metadata API (by exporting generateMetadata funtion)
hbjORbj
commented
Dec 27, 2024
| const searchParams = useSearchParams(); | ||
| const { profile, users, hidden, title } = eventData; |
hbjORbj
commented
Dec 27, 2024
| @@ -11,6 +11,8 @@ import { | |||
| selectSecondAvailableTimeSlotNextMonth, | |||
| } from "./lib/testUtils"; | |||
|
|
|||
| test.describe.configure({ mode: "parallel" }); | |||
hbjORbj
commented
Dec 27, 2024
| @@ -66,7 +66,7 @@ async function verifyRobotsMetaTag({ page, orgSlug, urls, expectedContent }: Ver | |||
| await doOnOrgDomain({ orgSlug, page }, async ({ page, goToUrlWithErrorHandling }) => { | |||
| for (const relativeUrl of urls) { | |||
| const { url } = await goToUrlWithErrorHandling(relativeUrl); | |||
| const metaTag = await page.locator('head > meta[name="robots"]'); | |||
| const metaTag = await page.locator('head > meta[name="robots"]').first(); | |||
There was a problem hiding this comment.
Because we didn't completely deprecate NextSeo yet (we can completely deprecate once we are 100% done with migration), we can have two metadata tags with robots in the html.
hbjORbj
commented
Dec 27, 2024
| @@ -132,6 +133,7 @@ export const getServerSideProps: GetServerSideProps<UserPageProps> = async (cont | |||
| const [user] = usersInOrgContext; //to be used when dealing with single user, not dynamic group | |||
|
|
|||
| const profile = { | |||
| id: user.id, | |||
There was a problem hiding this comment.
passing id here to get user's avatar url (needed for OG image generation in generateMetadata function)
hbjORbj
added
organizations
hbjORbj
force-pushed
the
chore/app-router-team-pages
branch
from
a55294c to
876ea41
Compare
|
Some notes to make your review easier: @zomars @emrysal
|
hbjORbj
commented
Dec 28, 2024
Comment on lines
+29
to
33
| const isEmbedSnippetGeneratorPath = pathname.startsWith("/event-types"); | ||
| const isEmbed = | ||
| (pathname.endsWith("/embed") || (searchParams?.get("embedType") ?? null) !== null) && | ||
| !isEmbedSnippetGeneratorPath; | ||
| const embedColorScheme = searchParams?.get("ui.color-scheme"); |
There was a problem hiding this comment.
I synced this file with _document.tsx in pages router
hbjORbj
changed the title
hbjORbj
changed the title
hbjORbj
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Tested /team sub-pages
test.mov
Mandatory Tasks (DO NOT REMOVE)
How should this be tested?