mirror of
https://github.com/aaronpo97/the-biergarten-app.git
synced 2026-02-16 18:52:06 +00:00
Did more work to beer post page, seed
Worked on comments and beer recs features. Fine tuning database seed amounts.
This commit is contained in:
@@ -7,12 +7,37 @@ import Head from 'next/head';
|
||||
import Image from 'next/image';
|
||||
import BeerInfoHeader from '@/components/BeerById/BeerInfoHeader';
|
||||
import CommentCard from '@/components/BeerById/CommentCard';
|
||||
import { useState } from 'react';
|
||||
|
||||
import { BeerPost } from '@prisma/client';
|
||||
import BeerCommentQueryResult from '@/services/BeerPost/types/BeerCommentQueryResult';
|
||||
import BeerCommentForm from '../../components/BeerById/BeerCommentForm';
|
||||
import BeerRecommendations from '../../components/BeerById/BeerRecommendations';
|
||||
import getBeerRecommendations from '../../services/BeerPost/getBeerRecommendations';
|
||||
import getAllBeerComments from '../../services/BeerPost/getAllBeerComments';
|
||||
|
||||
interface BeerPageProps {
|
||||
beerPost: BeerPostQueryResult;
|
||||
beerRecommendations: (BeerPost & {
|
||||
brewery: {
|
||||
id: string;
|
||||
name: string;
|
||||
};
|
||||
beerImages: {
|
||||
id: string;
|
||||
alt: string;
|
||||
url: string;
|
||||
}[];
|
||||
})[];
|
||||
beerComments: BeerCommentQueryResult[];
|
||||
}
|
||||
|
||||
const BeerByIdPage: NextPage<BeerPageProps> = ({ beerPost }) => {
|
||||
const BeerByIdPage: NextPage<BeerPageProps> = ({
|
||||
beerPost,
|
||||
beerRecommendations,
|
||||
beerComments,
|
||||
}) => {
|
||||
const [comments, setComments] = useState(beerComments);
|
||||
return (
|
||||
<Layout>
|
||||
<Head>
|
||||
@@ -24,6 +49,8 @@ const BeerByIdPage: NextPage<BeerPageProps> = ({ beerPost }) => {
|
||||
<Image
|
||||
alt={beerPost.beerImages[0].alt}
|
||||
src={beerPost.beerImages[0].url}
|
||||
height={1080}
|
||||
width={1920}
|
||||
className="h-[42rem] w-full object-cover"
|
||||
/>
|
||||
)}
|
||||
@@ -33,15 +60,19 @@ const BeerByIdPage: NextPage<BeerPageProps> = ({ beerPost }) => {
|
||||
<BeerInfoHeader beerPost={beerPost} />
|
||||
<div className="mt-4 flex space-x-3">
|
||||
<div className="w-[60%] space-y-3">
|
||||
<div className="card h-[22rem] bg-base-300"></div>
|
||||
<div className="card h-[44rem] overflow-y-auto bg-base-300">
|
||||
{beerPost.beerComments.map((comment) => (
|
||||
<div className="card h-96 bg-base-300">
|
||||
<div className="card-body">
|
||||
<BeerCommentForm beerPost={beerPost} setComments={setComments} />
|
||||
</div>
|
||||
</div>
|
||||
<div className="card bg-base-300">
|
||||
{comments.map((comment) => (
|
||||
<CommentCard key={comment.id} comment={comment} />
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
<div className="w-[40%]">
|
||||
<div className="card h-full bg-base-300"></div>
|
||||
<BeerRecommendations beerRecommendations={beerRecommendations} />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -53,9 +84,22 @@ const BeerByIdPage: NextPage<BeerPageProps> = ({ beerPost }) => {
|
||||
|
||||
export const getServerSideProps: GetServerSideProps<BeerPageProps> = async (context) => {
|
||||
const beerPost = await getBeerPostById(context.params!.id! as string);
|
||||
return !beerPost
|
||||
? { notFound: true }
|
||||
: { props: { beerPost: JSON.parse(JSON.stringify(beerPost)) } };
|
||||
|
||||
if (!beerPost) {
|
||||
return { notFound: true };
|
||||
}
|
||||
|
||||
const { type, brewery, id } = beerPost;
|
||||
const beerComments = await getAllBeerComments({ id }, { pageSize: 3, pageNum: 1 });
|
||||
const beerRecommendations = await getBeerRecommendations({ type, brewery });
|
||||
|
||||
const props = {
|
||||
beerPost: JSON.parse(JSON.stringify(beerPost)),
|
||||
beerRecommendations: JSON.parse(JSON.stringify(beerRecommendations)),
|
||||
beerComments: JSON.parse(JSON.stringify(beerComments)),
|
||||
};
|
||||
|
||||
return { props };
|
||||
};
|
||||
|
||||
export default BeerByIdPage;
|
||||
|
||||
@@ -21,13 +21,15 @@ const BeerPage: NextPage<BeerPageProps> = ({ initialBeerPosts, pageCount }) => {
|
||||
return (
|
||||
<Layout>
|
||||
<div className="flex items-center justify-center bg-base-100">
|
||||
<main className="mt-10 flex w-10/12 flex-col space-y-4">
|
||||
<main className="my-10 flex w-10/12 flex-col space-y-4">
|
||||
<div className="grid gap-5 md:grid-cols-2 xl:grid-cols-3">
|
||||
{initialBeerPosts.map((post) => {
|
||||
return <BeerCard post={post} key={post.id} />;
|
||||
})}
|
||||
</div>
|
||||
<Pagination pageNum={pageNum} pageCount={pageCount} />
|
||||
<div className="flex justify-center">
|
||||
<Pagination pageNum={pageNum} pageCount={pageCount} />
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
</Layout>
|
||||
|
||||
Reference in New Issue
Block a user