mirror of
https://github.com/aaronpo97/the-biergarten-app.git
synced 2026-02-16 10:42:08 +00:00
feat: begin work on beer type page and associated api routes
This commit is contained in:
@@ -1,5 +1,8 @@
|
||||
class ServerError extends Error {
|
||||
constructor(message: string, public statusCode: number) {
|
||||
constructor(
|
||||
message: string,
|
||||
public statusCode: number,
|
||||
) {
|
||||
super(message);
|
||||
this.name = 'ServerError';
|
||||
}
|
||||
|
||||
74
src/hooks/data-fetching/beer-types/useBeerTypes.ts
Normal file
74
src/hooks/data-fetching/beer-types/useBeerTypes.ts
Normal file
@@ -0,0 +1,74 @@
|
||||
import BeerTypeQueryResult from '@/services/BeerTypes/schema/BeerTypeQueryResult';
|
||||
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
|
||||
import useSWRInfinite from 'swr/infinite';
|
||||
import { z } from 'zod';
|
||||
|
||||
/**
|
||||
* A custom hook using SWR to fetch beer types from the API.
|
||||
*
|
||||
* @param options The options to use when fetching beer types.
|
||||
* @param options.pageSize The number of beer types to fetch per page.
|
||||
* @returns An object with the following properties:
|
||||
*
|
||||
* - `beerTypes`: The beer types fetched from the API.
|
||||
* - `error`: The error that occurred while fetching the data.
|
||||
* - `isAtEnd`: A boolean indicating whether all data has been fetched.
|
||||
* - `isLoading`: A boolean indicating whether the data is being fetched.
|
||||
* - `isLoadingMore`: A boolean indicating whether more data is being fetched.
|
||||
* - `pageCount`: The total number of pages of data.
|
||||
* - `setSize`: A function to set the size of the data.
|
||||
* - `size`: The size of the data.
|
||||
*/
|
||||
const useBeerTypes = ({ pageSize }: { pageSize: number }) => {
|
||||
const fetcher = async (url: string) => {
|
||||
const response = await fetch(url);
|
||||
if (!response.ok) {
|
||||
throw new Error(response.statusText);
|
||||
}
|
||||
|
||||
const json = await response.json();
|
||||
const count = response.headers.get('X-Total-Count');
|
||||
|
||||
const parsed = APIResponseValidationSchema.safeParse(json);
|
||||
|
||||
if (!parsed.success) {
|
||||
throw new Error('API response validation failed');
|
||||
}
|
||||
|
||||
const parsedPayload = z.array(BeerTypeQueryResult).safeParse(parsed.data.payload);
|
||||
if (!parsedPayload.success) {
|
||||
console.log(parsedPayload.error);
|
||||
throw new Error('API response validation failed');
|
||||
}
|
||||
|
||||
const pageCount = Math.ceil(parseInt(count as string, 10) / pageSize);
|
||||
return {
|
||||
beerTypes: parsedPayload.data,
|
||||
pageCount,
|
||||
};
|
||||
};
|
||||
|
||||
const { data, error, isLoading, setSize, size } = useSWRInfinite(
|
||||
(index) => `/api/beers/types?page_num=${index + 1}&page_size=${pageSize}`,
|
||||
fetcher,
|
||||
{ parallel: true },
|
||||
);
|
||||
|
||||
const beerTypes = data?.flatMap((d) => d.beerTypes) ?? [];
|
||||
const pageCount = data?.[0].pageCount ?? 0;
|
||||
const isLoadingMore = size > 0 && data && typeof data[size - 1] === 'undefined';
|
||||
const isAtEnd = !(size < data?.[0].pageCount!);
|
||||
|
||||
return {
|
||||
beerTypes,
|
||||
error: error as unknown,
|
||||
isAtEnd,
|
||||
isLoading,
|
||||
isLoadingMore,
|
||||
pageCount,
|
||||
setSize,
|
||||
size,
|
||||
};
|
||||
};
|
||||
|
||||
export default useBeerTypes;
|
||||
@@ -53,7 +53,7 @@ const editComment = async (
|
||||
id,
|
||||
});
|
||||
|
||||
res.status(200).json({
|
||||
res.status(200).json({
|
||||
success: true,
|
||||
message: 'Comment updated successfully',
|
||||
statusCode: 200,
|
||||
|
||||
82
src/pages/api/beers/types/create.ts
Normal file
82
src/pages/api/beers/types/create.ts
Normal file
@@ -0,0 +1,82 @@
|
||||
import { UserExtendedNextApiRequest } from '@/config/auth/types';
|
||||
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
|
||||
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
|
||||
import DBClient from '@/prisma/DBClient';
|
||||
|
||||
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
|
||||
import { NextApiRequest, NextApiResponse } from 'next';
|
||||
import { createRouter } from 'next-connect';
|
||||
import { z } from 'zod';
|
||||
|
||||
const BeerTypeValidationSchema = z.object({
|
||||
id: z.string().cuid(),
|
||||
name: z.string(),
|
||||
postedBy: z.object({
|
||||
id: z.string().cuid(),
|
||||
username: z.string(),
|
||||
}),
|
||||
createdAt: z.date(),
|
||||
updatedAt: z.date().nullable(),
|
||||
});
|
||||
|
||||
const CreateBeerTypeValidationSchema = BeerTypeValidationSchema.omit({
|
||||
id: true,
|
||||
postedBy: true,
|
||||
createdAt: true,
|
||||
updatedAt: true,
|
||||
});
|
||||
|
||||
interface CreateBeerTypeRequest extends UserExtendedNextApiRequest {
|
||||
body: z.infer<typeof CreateBeerTypeValidationSchema>;
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
interface GetBeerTypeRequest extends NextApiRequest {
|
||||
query: {
|
||||
id: string;
|
||||
};
|
||||
}
|
||||
|
||||
const createBeerType = async (
|
||||
req: CreateBeerTypeRequest,
|
||||
res: NextApiResponse<z.infer<typeof APIResponseValidationSchema>>,
|
||||
) => {
|
||||
const user = req.user!;
|
||||
const { name } = req.body;
|
||||
|
||||
const newBeerType = await DBClient.instance.beerType.create({
|
||||
data: {
|
||||
name,
|
||||
postedBy: { connect: { id: user.id } },
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
name: true,
|
||||
postedBy: { select: { id: true, username: true } },
|
||||
createdAt: true,
|
||||
updatedAt: true,
|
||||
},
|
||||
});
|
||||
|
||||
res.status(200).json({
|
||||
message: 'Beer posts retrieved successfully',
|
||||
statusCode: 200,
|
||||
payload: newBeerType,
|
||||
success: true,
|
||||
});
|
||||
};
|
||||
|
||||
const router = createRouter<
|
||||
CreateBeerTypeRequest,
|
||||
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
|
||||
>();
|
||||
|
||||
router.get(
|
||||
validateRequest({ bodySchema: CreateBeerTypeValidationSchema }),
|
||||
getCurrentUser,
|
||||
createBeerType,
|
||||
);
|
||||
|
||||
const handler = router.handler();
|
||||
|
||||
export default handler;
|
||||
51
src/pages/api/beers/types/index.ts
Normal file
51
src/pages/api/beers/types/index.ts
Normal file
@@ -0,0 +1,51 @@
|
||||
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
|
||||
import DBClient from '@/prisma/DBClient';
|
||||
import getAllBeerTypes from '@/services/BeerTypes/getAllBeerTypes';
|
||||
|
||||
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
|
||||
import { NextApiRequest, NextApiResponse } from 'next';
|
||||
import { createRouter } from 'next-connect';
|
||||
import { z } from 'zod';
|
||||
|
||||
interface GetBeerTypesRequest extends NextApiRequest {
|
||||
query: { page_num: string; page_size: string };
|
||||
}
|
||||
|
||||
const getBeerTypes = async (
|
||||
req: GetBeerTypesRequest,
|
||||
res: NextApiResponse<z.infer<typeof APIResponseValidationSchema>>,
|
||||
) => {
|
||||
const pageNum = parseInt(req.query.page_num, 10);
|
||||
const pageSize = parseInt(req.query.page_size, 10);
|
||||
|
||||
const beerTypes = await getAllBeerTypes(pageNum, pageSize);
|
||||
const beerTypeCount = await DBClient.instance.beerType.count();
|
||||
|
||||
res.setHeader('X-Total-Count', beerTypeCount);
|
||||
|
||||
res.status(200).json({
|
||||
message: 'Beer types retrieved successfully',
|
||||
statusCode: 200,
|
||||
payload: beerTypes,
|
||||
success: true,
|
||||
});
|
||||
};
|
||||
|
||||
const router = createRouter<
|
||||
GetBeerTypesRequest,
|
||||
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
|
||||
>();
|
||||
|
||||
router.get(
|
||||
validateRequest({
|
||||
querySchema: z.object({
|
||||
page_num: z.string().regex(/^\d+$/),
|
||||
page_size: z.string().regex(/^\d+$/),
|
||||
}),
|
||||
}),
|
||||
getBeerTypes,
|
||||
);
|
||||
|
||||
const handler = router.handler();
|
||||
|
||||
export default handler;
|
||||
104
src/pages/beers/types/index.tsx
Normal file
104
src/pages/beers/types/index.tsx
Normal file
@@ -0,0 +1,104 @@
|
||||
import LoadingCard from '@/components/ui/LoadingCard';
|
||||
import Spinner from '@/components/ui/Spinner';
|
||||
import useBeerTypes from '@/hooks/data-fetching/beer-types/useBeerTypes';
|
||||
|
||||
import { NextPage } from 'next';
|
||||
import Head from 'next/head';
|
||||
import { MutableRefObject, useRef } from 'react';
|
||||
import { FaArrowUp } from 'react-icons/fa';
|
||||
import { useInView } from 'react-intersection-observer';
|
||||
|
||||
const BeerTypePage: NextPage = () => {
|
||||
const PAGE_SIZE = 20;
|
||||
const pageRef: MutableRefObject<HTMLDivElement | null> = useRef(null);
|
||||
|
||||
const { beerTypes, isLoading, isLoadingMore, isAtEnd, size, setSize, error } =
|
||||
useBeerTypes({
|
||||
pageSize: PAGE_SIZE,
|
||||
});
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||
const { ref: lastBeerTypeRef } = useInView({
|
||||
onChange: (visible) => {
|
||||
if (!visible || isAtEnd) return;
|
||||
setSize(size + 1);
|
||||
},
|
||||
});
|
||||
|
||||
console.log(error);
|
||||
console.log(beerTypes);
|
||||
return (
|
||||
<>
|
||||
<Head>
|
||||
<title>Beer Types | The Biergarten App</title>
|
||||
<meta
|
||||
name="description"
|
||||
content="Find beers made by breweries near you and around the world."
|
||||
/>
|
||||
</Head>
|
||||
<div className="flex items-center justify-center bg-base-100" ref={pageRef}>
|
||||
<div className="my-10 flex w-10/12 flex-col space-y-4 lg:w-8/12 2xl:w-7/12">
|
||||
<header className="my-10 flex justify-between lg:flex-row">
|
||||
<div>
|
||||
<h1 className="text-4xl font-bold lg:text-6xl">The Biergarten App</h1>
|
||||
<h2 className="text-2xl font-bold lg:text-4xl">Beers</h2>
|
||||
</div>
|
||||
</header>
|
||||
<div className="grid gap-6 xl:grid-cols-2">
|
||||
{!!beerTypes.length && !isLoading && (
|
||||
<>
|
||||
{beerTypes.map((beerType, i) => {
|
||||
return (
|
||||
<div
|
||||
key={beerType.id}
|
||||
ref={beerTypes.length === i + 1 ? lastBeerTypeRef : undefined}
|
||||
>
|
||||
{beerType.name}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</>
|
||||
)}
|
||||
{(isLoading || isLoadingMore) && (
|
||||
<>
|
||||
{Array.from({ length: PAGE_SIZE }, (_, i) => (
|
||||
<LoadingCard key={i} />
|
||||
))}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{(isLoading || isLoadingMore) && (
|
||||
<div className="flex h-32 w-full items-center justify-center">
|
||||
<Spinner size="sm" />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{isAtEnd && !isLoading && (
|
||||
<div className="flex h-20 items-center justify-center text-center">
|
||||
<div
|
||||
className="tooltip tooltip-bottom"
|
||||
data-tip="Scroll back to top of page."
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
className="btn-ghost btn-sm btn"
|
||||
aria-label="Scroll back to top of page."
|
||||
onClick={() => {
|
||||
pageRef.current?.scrollIntoView({
|
||||
behavior: 'smooth',
|
||||
});
|
||||
}}
|
||||
>
|
||||
<FaArrowUp />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default BeerTypePage;
|
||||
24
src/services/BeerTypes/getAllBeerTypes.ts
Normal file
24
src/services/BeerTypes/getAllBeerTypes.ts
Normal file
@@ -0,0 +1,24 @@
|
||||
import DBClient from '@/prisma/DBClient';
|
||||
import { z } from 'zod';
|
||||
import BeerTypeQueryResult from './schema/BeerTypeQueryResult';
|
||||
|
||||
const getAllBeerTypes = async (
|
||||
pageNum: number,
|
||||
pageSize: number,
|
||||
): Promise<z.infer<typeof BeerTypeQueryResult>[]> => {
|
||||
const types = await DBClient.instance.beerType.findMany({
|
||||
take: pageSize,
|
||||
skip: (pageNum - 1) * pageSize,
|
||||
select: {
|
||||
id: true,
|
||||
name: true,
|
||||
postedBy: { select: { id: true, username: true } },
|
||||
createdAt: true,
|
||||
updatedAt: true,
|
||||
},
|
||||
});
|
||||
|
||||
return types;
|
||||
};
|
||||
|
||||
export default getAllBeerTypes;
|
||||
14
src/services/BeerTypes/schema/BeerTypeQueryResult.ts
Normal file
14
src/services/BeerTypes/schema/BeerTypeQueryResult.ts
Normal file
@@ -0,0 +1,14 @@
|
||||
import { z } from 'zod';
|
||||
|
||||
const BeerTypeQueryResult = z.object({
|
||||
id: z.string().cuid(),
|
||||
name: z.string(),
|
||||
postedBy: z.object({
|
||||
id: z.string().cuid(),
|
||||
username: z.string(),
|
||||
}),
|
||||
createdAt: z.coerce.date(),
|
||||
updatedAt: z.coerce.date().nullable(),
|
||||
});
|
||||
|
||||
export default BeerTypeQueryResult;
|
||||
@@ -1,10 +1,6 @@
|
||||
import toast from 'react-hot-toast';
|
||||
|
||||
/**
|
||||
* @param error - The error to display.
|
||||
*
|
||||
* Creates a toast message with the error message.
|
||||
*/
|
||||
/** @param error - The error to display. Creates a toast message with the error message. */
|
||||
const createErrorToast = (error: unknown) => {
|
||||
const errorMessage = error instanceof Error ? error.message : 'Something went wrong.';
|
||||
toast.error(errorMessage);
|
||||
|
||||
@@ -36,9 +36,10 @@ export type ExtendedGetServerSideProps<
|
||||
* @returns A promise that resolves to a `GetServerSidePropsResult` object with props for
|
||||
* the wrapped component.
|
||||
*
|
||||
* If authentication is successful, the `GetServerSidePropsResult` will include props
|
||||
* generated by the wrapped component's `getServerSideProps` method. If authentication
|
||||
* fails, the `GetServerSidePropsResult` will include a redirect to the login page.
|
||||
* - If authentication is successful, the `GetServerSidePropsResult` will include props
|
||||
* generated by the wrapped component's `getServerSideProps` method.
|
||||
* - If authentication fails, the `GetServerSidePropsResult` will include a redirect to the
|
||||
* login page.
|
||||
*/
|
||||
|
||||
const withPageAuthRequired =
|
||||
|
||||
Reference in New Issue
Block a user