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.

Sign up for GitHub

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

Jump to bottom

off-season-24 merge into main #86

Closed
wants to merge 1 commit into from
Closed

off-season-24 merge into main #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
112 changes: 56 additions & 56 deletions pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import Image from 'next/image';
import Calendar from '@/components/calendar';
import Footer from '@/components/footer';
import Hero from '@/components/hero';
import Player from '@/components/player';
// import Player from '@/components/player';
import RichText from '@/components/richtext';
import { Showlist } from '@/components/showlist';
// import { Showlist } from '@/components/showlist';
import Sponsors, { ISponsorData } from '@/components/sponsors';
import {
fetchContent,
Expand All @@ -16,8 +16,8 @@ import {
} from '@/contentful/client';
import { contentfulImageLoader } from '@/contentful/contentfulImageLoader';
import { IndexDocument, IndexQuery } from '@/contentful/graphql/index.graphql';
import { fetchShowlist } from '@/scripts/google/client';
import { Show, ShowsByDate } from '@/scripts/google/showlistHelpers';
// import { fetchShowlist } from '@/scripts/google/client';
// import { Show, ShowsByDate } from '@/scripts/google/showlistHelpers';

const isPlayerLive = process.env.NEXT_PUBLIC_PLAYER_MODE === 'live';

Expand All @@ -33,7 +33,7 @@ interface IndexProps {
heroButtonText: string;
heroButtonLink: string;
navigationItems: NavigationItem[];
showsByDate: ShowsByDate;
// showsByDate: ShowsByDate;
firstDecorativeImage: {
url?: string;
width?: number;
Expand Down Expand Up @@ -62,17 +62,17 @@ const Index: NextPage<IndexProps & PlayerControls> = ({
heroButtonText,
heroButtonLink,
navigationItems,
showsByDate,
// firstDecorativeImage,
// secondDecorativeImage,
// firstContent,
// secondContent,
// thirdContent,
// showsByDate,
firstDecorativeImage,
secondDecorativeImage,
firstContent,
secondContent,
thirdContent,
sponsors,
playing,
onPlayPause,
muted,
onMute,
// playing,
// onPlayPause,
// muted,
// onMute,
}) => {
return (
<div className="min-h-screen w-full">
Expand All @@ -94,59 +94,59 @@ const Index: NextPage<IndexProps & PlayerControls> = ({
navigationItems={navigationItems}
isCompact={isPlayerLive}
/>
{isPlayerLive && (
{/* isPlayerLive && (
<Player
playing={playing}
onPlayPause={onPlayPause}
muted={muted}
onMute={onMute}
showsByDate={showsByDate}
/>
)}
)} */}

<Showlist showsByDate={showsByDate} />
{/* <Showlist showsByDate={showsByDate} /> */}

{/* First section */}
{/* <main className="flex flex-wrap-reverse items-center justify-center py-4 md:py-8"> */}
{/* <div className="relative m-10 h-48 w-128 max-w-full md:m-8 md:h-96"> */}
{/* <Image */}
{/* src={firstDecorativeImage.url} */}
{/* loader={contentfulImageLoader} */}
{/* layout="fill" */}
{/* objectFit="cover" */}
{/* className="rounded" */}
{/* alt="" */}
{/* /> */}
{/* </div> */}
{/* <section className="m-4 w-128 max-w-full text-lg text-white md:m-8"> */}
{/* <RichText content={firstContent} /> */}
{/* </section> */}
{/* </main> */}
<main className="flex flex-wrap-reverse items-center justify-center py-4 md:py-8">
<div className="relative m-10 h-48 w-128 max-w-full md:m-8 md:h-96">
<Image
src={firstDecorativeImage.url}
loader={contentfulImageLoader}
layout="fill"
objectFit="cover"
className="rounded"
alt=""
/>
</div>
<section className="m-4 w-128 max-w-full text-lg text-white md:m-8">
<RichText content={firstContent} />
</section>
</main>

{/* Second section */}
{/* <div className="min-h-32 flex w-full flex-wrap items-center justify-center bg-blue-dark py-4 md:py-8"> */}
{/* <section className="m-4 w-128 max-w-full text-base text-white md:m-8"> */}
{/* <RichText content={secondContent} /> */}
{/* </section> */}
{/* <Calendar /> */}
{/* </div> */}
<div className="min-h-32 flex w-full flex-wrap items-center justify-center bg-blue-dark py-4 md:py-8">
<section className="m-4 w-128 max-w-full text-base text-white md:m-8">
<RichText content={secondContent} />
</section>
<Calendar />
</div>

{/* Third section */}
{/* <div className="flex flex-wrap items-center justify-center py-4 md:py-8"> */}
{/* <section className="m-4 w-128 max-w-full text-base text-white md:m-8"> */}
{/* <RichText content={thirdContent} /> */}
{/* </section> */}
{/* <div className="relative m-10 h-48 w-128 max-w-full md:m-8 md:h-96"> */}
{/* <Image */}
{/* src={secondDecorativeImage.url} */}
{/* loader={contentfulImageLoader} */}
{/* layout="fill" */}
{/* objectFit="cover" */}
{/* className="rounded" */}
{/* alt="" */}
{/* /> */}
{/* </div> */}
{/* </div> */}
<div className="flex flex-wrap items-center justify-center py-4 md:py-8">
<section className="m-4 w-128 max-w-full text-base text-white md:m-8">
<RichText content={thirdContent} />
</section>
<div className="relative m-10 h-48 w-128 max-w-full md:m-8 md:h-96">
<Image
src={secondDecorativeImage.url}
loader={contentfulImageLoader}
layout="fill"
objectFit="cover"
className="rounded"
alt=""
/>
</div>
</div>
<Sponsors sponsors={sponsors} />
<Footer navigationItems={navigationItems} />
</div>
Expand All @@ -173,7 +173,7 @@ export const getStaticProps: GetStaticProps<IndexProps> = async () => {

const navigationItems = await fetchNavigationItems();

const showsByDate = await fetchShowlist();
// const showsByDate = await fetchShowlist();

return {
props: {
Expand All @@ -183,7 +183,7 @@ export const getStaticProps: GetStaticProps<IndexProps> = async () => {
heroButtonText,
heroButtonLink,
navigationItems,
showsByDate,
// showsByDate,
firstDecorativeImage,
secondDecorativeImage,
firstContent,
Expand Down
Loading