-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into 728-bug-incorrect-banner-size-on-settings…
…-page
- Loading branch information
Showing
313 changed files
with
7,834 additions
and
8,474 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,16 @@ | ||
| { | ||
| "trailingComma": "es5", | ||
| "semi": false, | ||
| "semi": true, | ||
| "singleQuote": true, | ||
| "printWidth": 70, | ||
| "bracketSameLine": true, | ||
| "plugins": ["prettier-plugin-tailwindcss"] | ||
| "printWidth": 80, | ||
| "tabWidth": 2, | ||
| "useTabs": false, | ||
| "bracketSpacing": true, | ||
| "bracketSameLine": false, | ||
| "arrowParens": "always", | ||
| "endOfLine": "lf", | ||
| "quoteProps": "as-needed", | ||
| "jsxSingleQuote": false, | ||
| "proseWrap": "preserve", | ||
| "htmlWhitespaceSensitivity": "css" | ||
| } |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,50 @@ | ||
| import { SearchPageProps } from '@/lib/types' | ||
| import { fetchOrganization } from '@/lib/services/organizationService' | ||
| import { fetchEvent } from '@/lib/services/eventService' | ||
| import { redirect } from 'next/navigation' | ||
| import { | ||
| generalMetadata, | ||
| archiveMetadata, | ||
| } from '@/lib/utils/metadata' | ||
| import { Metadata } from 'next' | ||
|
|
||
| export default async function ArchivePage({ | ||
| searchParams, | ||
| }: SearchPageProps) { | ||
| import { SearchPageProps } from '@/lib/types'; | ||
| import { fetchOrganization } from '@/lib/services/organizationService'; | ||
| import { fetchEvent } from '@/lib/services/eventService'; | ||
| import { redirect } from 'next/navigation'; | ||
| import { generalMetadata, archiveMetadata } from '@/lib/utils/metadata'; | ||
| import { Metadata } from 'next'; | ||
|
|
||
| export default async function ArchivePage({ searchParams }: SearchPageProps) { | ||
| if (searchParams.organization) { | ||
| const organization = await fetchOrganization({ | ||
| organizationSlug: searchParams.organization, | ||
| }) | ||
| }); | ||
|
|
||
| if (!organization) { | ||
| return redirect('/404') | ||
| return redirect('/404'); | ||
| } | ||
|
|
||
| return redirect(`/${organization.slug}/videos`) | ||
| return redirect(`/${organization.slug}/videos`); | ||
| } | ||
|
|
||
| if (searchParams.event) { | ||
| const event = await fetchEvent({ | ||
| eventSlug: searchParams.event, | ||
| }) | ||
| }); | ||
|
|
||
| const organization = await fetchOrganization({ | ||
| organizationId: event?.organizationId as string, | ||
| }) | ||
| }); | ||
|
|
||
| if (!event || !organization) { | ||
| return redirect('/404') | ||
| return redirect('/404'); | ||
| } | ||
|
|
||
| return redirect(`/${organization.slug}/videos`) | ||
| return redirect(`/${organization.slug}/videos`); | ||
| } | ||
|
|
||
| return <>Page moved</> | ||
| return <>Page moved</>; | ||
| } | ||
|
|
||
| export async function generateMetadata({ | ||
| searchParams, | ||
| }: SearchPageProps): Promise<Metadata> { | ||
| if (!searchParams.event) return generalMetadata | ||
| if (!searchParams.event) return generalMetadata; | ||
| const event = await fetchEvent({ | ||
| eventSlug: searchParams.event, | ||
| }) | ||
| }); | ||
|
|
||
| if (!event) return generalMetadata | ||
| return archiveMetadata({ event }) | ||
| if (!event) return generalMetadata; | ||
| return archiveMetadata({ event }); | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,41 @@ | ||
| import { WatchPageProps } from '@/lib/types' | ||
| import { Metadata } from 'next' | ||
| import { apiUrl } from '@/lib/utils/utils' | ||
| import { notFound } from 'next/navigation' | ||
| import { generalMetadata, watchMetadata } from '@/lib/utils/metadata' | ||
| import { fetchSession } from '@/lib/services/sessionService' | ||
| import { redirect } from 'next/navigation' | ||
| import { fetchOrganization } from '@/lib/services/organizationService' | ||
| import { generateThumbnailAction } from '@/lib/actions/sessions' | ||
| export default async function Watch({ | ||
| searchParams, | ||
| }: WatchPageProps) { | ||
| if (!searchParams.session) return notFound() | ||
| import { WatchPageProps } from '@/lib/types'; | ||
| import { Metadata } from 'next'; | ||
| import { apiUrl } from '@/lib/utils/utils'; | ||
| import { notFound } from 'next/navigation'; | ||
| import { generalMetadata, watchMetadata } from '@/lib/utils/metadata'; | ||
| import { fetchSession } from '@/lib/services/sessionService'; | ||
| import { redirect } from 'next/navigation'; | ||
| import { fetchOrganization } from '@/lib/services/organizationService'; | ||
| import { generateThumbnailAction } from '@/lib/actions/sessions'; | ||
| export default async function Watch({ searchParams }: WatchPageProps) { | ||
| if (!searchParams.session) return notFound(); | ||
| const video = await fetchSession({ | ||
| session: searchParams.session, | ||
| }) | ||
| }); | ||
|
|
||
| if (!video) return notFound() | ||
| if (!video) return notFound(); | ||
| const organization = await fetchOrganization({ | ||
| organizationId: video.organizationId as string, | ||
| }) | ||
| }); | ||
| if (!organization) { | ||
| return notFound() | ||
| return notFound(); | ||
| } | ||
|
|
||
| redirect( | ||
| `/${organization.slug}/watch?session=${searchParams.session}` | ||
| ) | ||
| return 'loading...' | ||
| redirect(`/${organization.slug}/watch?session=${searchParams.session}`); | ||
| return 'loading...'; | ||
| } | ||
|
|
||
| export async function generateMetadata({ | ||
| searchParams, | ||
| }: WatchPageProps): Promise<Metadata> { | ||
| const response = await fetch( | ||
| `${apiUrl()}/sessions/${searchParams.session}` | ||
| ) | ||
| const responseData = await response.json() | ||
| const video = responseData.data | ||
| const response = await fetch(`${apiUrl()}/sessions/${searchParams.session}`); | ||
| const responseData = await response.json(); | ||
| const video = responseData.data; | ||
|
|
||
| if (!searchParams.session) return generalMetadata | ||
| if (!searchParams.session) return generalMetadata; | ||
|
|
||
| if (!video) return generalMetadata | ||
| const thumbnail = | ||
| video.coverImage ?? (await generateThumbnailAction(video)) | ||
| if (!video) return generalMetadata; | ||
| const thumbnail = video.coverImage ?? (await generateThumbnailAction(video)); | ||
|
|
||
| return watchMetadata({ session: video, thumbnail }) | ||
| return watchMetadata({ session: video, thumbnail }); | ||
| } |
Oops, something went wrong.