mirror of
https://github.com/aaronpo97/the-biergarten-app.git
synced 2026-02-16 10:42:08 +00:00
Update pages to include links to beer styles
This commit is contained in:
@@ -74,7 +74,7 @@ const BeerInfoHeader: FC<BeerInfoHeaderProps> = ({ beerPost }) => {
|
|||||||
<div>
|
<div>
|
||||||
<Link
|
<Link
|
||||||
className="link-hover link text-lg font-bold"
|
className="link-hover link text-lg font-bold"
|
||||||
href={`/beers/types/${beerPost.style.id}`}
|
href={`/beers/styles/${beerPost.style.id}`}
|
||||||
>
|
>
|
||||||
{beerPost.style.name}
|
{beerPost.style.name}
|
||||||
</Link>
|
</Link>
|
||||||
|
|||||||
@@ -70,7 +70,12 @@ const BeerRecommendationsSection: FC<{
|
|||||||
|
|
||||||
<div>
|
<div>
|
||||||
<div>
|
<div>
|
||||||
|
<Link
|
||||||
|
className="link link-hover"
|
||||||
|
href={`/beers/styles/${post.style.id}`}
|
||||||
|
>
|
||||||
<span className="text-lg font-medium">{post.style.name}</span>
|
<span className="text-lg font-medium">{post.style.name}</span>
|
||||||
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
<div className="space-x-2">
|
<div className="space-x-2">
|
||||||
<span>{post.abv.toFixed(1)}% ABV</span>
|
<span>{post.abv.toFixed(1)}% ABV</span>
|
||||||
|
|||||||
101
src/components/BeerStyleById/BeerStyleHeader.tsx
Normal file
101
src/components/BeerStyleById/BeerStyleHeader.tsx
Normal file
@@ -0,0 +1,101 @@
|
|||||||
|
import Link from 'next/link';
|
||||||
|
import format from 'date-fns/format';
|
||||||
|
import { FC, useContext } from 'react';
|
||||||
|
|
||||||
|
import UserContext from '@/contexts/UserContext';
|
||||||
|
import { FaRegEdit } from 'react-icons/fa';
|
||||||
|
|
||||||
|
import { z } from 'zod';
|
||||||
|
import useTimeDistance from '@/hooks/utilities/useTimeDistance';
|
||||||
|
import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult';
|
||||||
|
|
||||||
|
interface BeerInfoHeaderProps {
|
||||||
|
beerStyle: z.infer<typeof BeerStyleQueryResult>;
|
||||||
|
}
|
||||||
|
|
||||||
|
const BeerStyleHeader: FC<BeerInfoHeaderProps> = ({ beerStyle }) => {
|
||||||
|
const createdAt = new Date(beerStyle.createdAt);
|
||||||
|
const timeDistance = useTimeDistance(createdAt);
|
||||||
|
|
||||||
|
const { user } = useContext(UserContext);
|
||||||
|
const idMatches = user && beerStyle.postedBy.id === user.id;
|
||||||
|
const isPostOwner = !!(user && idMatches);
|
||||||
|
|
||||||
|
// const { likeCount, mutate } = useBeerStyleLikeCount(beerStyle.id);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<article className="card flex flex-col justify-center bg-base-300">
|
||||||
|
<div className="card-body">
|
||||||
|
<header className="flex justify-between">
|
||||||
|
<div className="space-y-2">
|
||||||
|
<div>
|
||||||
|
<h1 className="text-2xl font-bold lg:text-4xl">{beerStyle.name}</h1>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h3 className="italic">
|
||||||
|
{' posted by '}
|
||||||
|
<Link
|
||||||
|
href={`/users/${beerStyle.postedBy.id}`}
|
||||||
|
className="link-hover link"
|
||||||
|
>
|
||||||
|
{`${beerStyle.postedBy.username} `}
|
||||||
|
</Link>
|
||||||
|
{timeDistance && (
|
||||||
|
<span
|
||||||
|
className="tooltip tooltip-bottom"
|
||||||
|
data-tip={format(createdAt, 'MM/dd/yyyy')}
|
||||||
|
>
|
||||||
|
{`${timeDistance} ago`}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{isPostOwner && (
|
||||||
|
<div className="tooltip tooltip-left" data-tip={`Edit '${beerStyle.name}'`}>
|
||||||
|
<Link href={`/beers/${beerStyle.id}/edit`} className="btn-ghost btn-xs btn">
|
||||||
|
<FaRegEdit className="text-xl" />
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</header>
|
||||||
|
<div className="space-y-2">
|
||||||
|
<p>{beerStyle.description}</p>
|
||||||
|
<div className="flex w-25 space-x-3 flex-row">
|
||||||
|
<div className="text-sm font-bold">
|
||||||
|
ABV Range:{' '}
|
||||||
|
<span>
|
||||||
|
{beerStyle.abvRange[0].toFixed(1)}% - {beerStyle.abvRange[0].toFixed(1)}%
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="text-sm font-bold">
|
||||||
|
IBU Range:{' '}
|
||||||
|
<span>
|
||||||
|
{beerStyle.ibuRange[0].toFixed(1)} - {beerStyle.ibuRange[1].toFixed(1)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="font-semibold">
|
||||||
|
Recommended Glassware:{' '}
|
||||||
|
<span className="text-sm font-bold italic">{beerStyle.glassware.name}</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex justify-between">
|
||||||
|
<div className="card-actions items-end">
|
||||||
|
{/* {user && (
|
||||||
|
<BeerStyleLikeButton
|
||||||
|
beerStyle={beerStyle}
|
||||||
|
likeCount={likeCount}
|
||||||
|
mutate={mutate}
|
||||||
|
/>
|
||||||
|
)} */}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default BeerStyleHeader;
|
||||||
@@ -76,7 +76,12 @@ const BreweryBeersSection: FC<BreweryCommentsSectionProps> = ({ breweryPost }) =
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<span className="text-lg font-medium">{beerPost.style.name}</span>
|
<Link
|
||||||
|
className="text-lg font-medium link link-hover"
|
||||||
|
href={`/beers/styles/${beerPost.style.id}`}
|
||||||
|
>
|
||||||
|
{beerPost.style.name}
|
||||||
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
<div className="space-x-2">
|
<div className="space-x-2">
|
||||||
<span>{beerPost.abv}% ABV</span>
|
<span>{beerPost.abv}% ABV</span>
|
||||||
|
|||||||
@@ -1,33 +1,65 @@
|
|||||||
import getBeerStyleById from '@/services/BeerStyles/getBeerStyleById';
|
import { NextPage, GetServerSideProps } from 'next';
|
||||||
import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult';
|
import Head from 'next/head';
|
||||||
import { GetServerSideProps, NextPage } from 'next';
|
|
||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
|
|
||||||
|
import useMediaQuery from '@/hooks/utilities/useMediaQuery';
|
||||||
|
import { Tab } from '@headlessui/react';
|
||||||
|
import getBeerStyleById from '@/services/BeerStyles/getBeerStyleById';
|
||||||
|
import BeerStyleHeader from '@/components/BeerStyleById/BeerStyleHeader';
|
||||||
|
import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult';
|
||||||
|
|
||||||
interface BeerStylePageProps {
|
interface BeerStylePageProps {
|
||||||
beerStyle: z.infer<typeof BeerStyleQueryResult>;
|
beerStyle: z.infer<typeof BeerStyleQueryResult>;
|
||||||
}
|
}
|
||||||
|
|
||||||
const BeerStylePage: NextPage<BeerStylePageProps> = ({ beerStyle }) => {
|
const BeerByIdPage: NextPage<BeerStylePageProps> = ({ beerStyle }) => {
|
||||||
|
const isDesktop = useMediaQuery('(min-width: 1024px)');
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<>
|
||||||
<h1>{beerStyle.name}</h1>
|
<Head>
|
||||||
<p>{beerStyle.description}</p>
|
<title>{beerStyle.name}</title>
|
||||||
|
<meta name="description" content={beerStyle.description} />
|
||||||
|
</Head>
|
||||||
|
<>
|
||||||
|
<main className="mb-12 mt-10 flex w-full items-center justify-center">
|
||||||
|
<div className="w-11/12 space-y-3 xl:w-9/12 2xl:w-8/12">
|
||||||
|
<BeerStyleHeader beerStyle={beerStyle} />
|
||||||
|
|
||||||
|
{isDesktop ? (
|
||||||
|
<div className="mt-4 flex flex-row space-x-3 space-y-0">
|
||||||
|
<div className="w-[60%]">{/* Comments go here */}</div>
|
||||||
|
<div className="w-[40%]">{/* Recommendations go here */}</div>
|
||||||
</div>
|
</div>
|
||||||
|
) : (
|
||||||
|
<Tab.Group>
|
||||||
|
<Tab.List className="tabs tabs-boxed items-center justify-center rounded-2xl">
|
||||||
|
<Tab className="tab tab-md w-1/2 uppercase ui-selected:tab-active">
|
||||||
|
Comments
|
||||||
|
</Tab>
|
||||||
|
<Tab className="tab tab-md w-1/2 uppercase ui-selected:tab-active">
|
||||||
|
Beers in this Style
|
||||||
|
</Tab>
|
||||||
|
</Tab.List>
|
||||||
|
<Tab.Panels className="mt-2">
|
||||||
|
<Tab.Panel>{/* Comments go here */}</Tab.Panel>
|
||||||
|
<Tab.Panel>{/* Recommendations go here */}</Tab.Panel>
|
||||||
|
</Tab.Panels>
|
||||||
|
</Tab.Group>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</>
|
||||||
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default BeerStylePage;
|
export default BeerByIdPage;
|
||||||
|
|
||||||
export const getServerSideProps: GetServerSideProps<BeerStylePageProps> = async (
|
export const getServerSideProps: GetServerSideProps = async ({ params }) => {
|
||||||
context,
|
const id = params!.id as string;
|
||||||
) => {
|
const beerStyle = await getBeerStyleById(id);
|
||||||
const beerStyle = await getBeerStyleById(context.params!.id! as string);
|
|
||||||
|
|
||||||
if (!beerStyle) {
|
|
||||||
return {
|
|
||||||
notFound: true,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return { props: { beerStyle: JSON.parse(JSON.stringify(beerStyle)) } };
|
return { props: { beerStyle: JSON.parse(JSON.stringify(beerStyle)) } };
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { MutableRefObject, useRef } from 'react';
|
|||||||
import { FaArrowUp } from 'react-icons/fa';
|
import { FaArrowUp } from 'react-icons/fa';
|
||||||
import { useInView } from 'react-intersection-observer';
|
import { useInView } from 'react-intersection-observer';
|
||||||
|
|
||||||
import BeerStyleCard from '@/components/BeerStyle/BeerStyleCard';
|
import BeerStyleCard from '@/components/BeerStyleIndex/BeerStyleCard';
|
||||||
import SmLoadingCard from '@/components/ui/SmLoadingCard';
|
import SmLoadingCard from '@/components/ui/SmLoadingCard';
|
||||||
import Spinner from '@/components/ui/Spinner';
|
import Spinner from '@/components/ui/Spinner';
|
||||||
import useBeerStyles from '@/hooks/data-fetching/beer-styles/useBeerStyles';
|
import useBeerStyles from '@/hooks/data-fetching/beer-styles/useBeerStyles';
|
||||||
|
|||||||
Reference in New Issue
Block a user