AaronPo/the-biergarten-app
1
0
Fork 0
mirror of https://github.com/aaronpo97/the-biergarten-app.git synced 2026-02-16 10:42:08 +00:00
Code Issues Packages Projects 1 Releases Wiki Activity

Merge pull request #6 from aaronpo97/dev

Browse Source 
More dev work.
This commit is contained in:
Aaron Po
2023-02-20 16:43:47 -05:00
committed by GitHub
parent 67531ff35f 86e013bf57
commit 8836d1fc9b
68 changed files with 5341 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -38,3 +38,6 @@ next-env.d.ts
# http requests
*.http
# uploaded images
public/uploads

13
components/BeerById/BeerCommentForm.tsx
View File

@@ -1,7 +1,7 @@
import sendCreateBeerCommentRequest from '@/requests/sendCreateBeerCommentRequest';
import { BeerCommentQueryResultArrayT } from '@/services/BeerComment/schema/BeerCommentQueryResult';
import BeerCommentValidationSchema from '@/services/BeerComment/schema/CreateBeerCommentValidationSchema';
import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
import { BeerPostQueryResult } from '@/services/BeerPost/schema/BeerPostQueryResult';
import { zodResolver } from '@hookform/resolvers/zod';
import { useRouter } from 'next/router';
import { Dispatch, SetStateAction, FunctionComponent, useState, useEffect } from 'react';
@@ -26,7 +26,6 @@ const BeerCommentForm: FunctionComponent<BeerCommentFormProps> = ({ beerPost })
z.infer<typeof BeerCommentValidationSchema>
>({
defaultValues: {
beerPostId: beerPost.id,
rating: 0,
},
resolver: zodResolver(BeerCommentValidationSchema),
@@ -35,8 +34,8 @@ const BeerCommentForm: FunctionComponent<BeerCommentFormProps> = ({ beerPost })
const [rating, setRating] = useState(0);
useEffect(() => {
setRating(0);
reset({ beerPostId: beerPost.id, rating: 0, content: '' });
}, [beerPost.id, reset]);
reset({ rating: 0, content: '' });
}, [reset]);
const router = useRouter();
const onSubmit: SubmitHandler<z.infer<typeof BeerCommentValidationSchema>> = async (
@@ -44,7 +43,11 @@ const BeerCommentForm: FunctionComponent<BeerCommentFormProps> = ({ beerPost })
) => {
setValue('rating', 0);
setRating(0);
await sendCreateBeerCommentRequest(data);
await sendCreateBeerCommentRequest({
content: data.content,
rating: data.rating,
beerPostId: beerPost.id,
});
reset();
router.replace(router.asPath, undefined, { scroll: false });
};

73
components/BeerById/BeerInfoHeader.tsx
View File

@@ -2,50 +2,29 @@ import Link from 'next/link';
import formatDistanceStrict from 'date-fns/formatDistanceStrict';
import format from 'date-fns/format';
import { FC, useContext, useEffect, useState } from 'react';
import { FaRegThumbsUp, FaThumbsUp } from 'react-icons/fa';
import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
import { BeerPostQueryResult } from '@/services/BeerPost/schema/BeerPostQueryResult';
import UserContext from '@/contexts/userContext';
import sendCheckIfUserLikesBeerPostRequest from '@/requests/sendCheckIfUserLikesBeerPostRequest';
import sendLikeRequest from '../../requests/sendLikeRequest';
import BeerPostLikeButton from './BeerPostLikeButton';
const BeerInfoHeader: FC<{ beerPost: BeerPostQueryResult }> = ({ beerPost }) => {
const BeerInfoHeader: FC<{ beerPost: BeerPostQueryResult; initialLikeCount: number }> = ({
beerPost,
initialLikeCount,
}) => {
const createdAtDate = new Date(beerPost.createdAt);
const [timeDistance, setTimeDistance] = useState('');
const { user } = useContext(UserContext);
const [loading, setLoading] = useState(true);
const [isLiked, setIsLiked] = useState(false);
const [likeCount, setLikeCount] = useState(initialLikeCount);
useEffect(() => {
if (!user) {
setLoading(false);
return;
}
sendCheckIfUserLikesBeerPostRequest(beerPost.id)
.then((currentLikeStatus) => {
setIsLiked(currentLikeStatus);
setLoading(false);
})
.catch((e) => {
console.error(e);
setLoading(false);
});
}, [user, beerPost.id]);
setLikeCount(initialLikeCount);
}, [initialLikeCount]);
useEffect(() => {
setTimeDistance(formatDistanceStrict(new Date(beerPost.createdAt), new Date()));
}, [beerPost.createdAt]);
const handleLike = async () => {
try {
await sendLikeRequest(beerPost);
setIsLiked(!isLiked);
} catch (e) {
console.error(e);
}
};
return (
<div className="card flex flex-col justify-center bg-base-300">
<div className="card-body">
@@ -75,8 +54,8 @@ const BeerInfoHeader: FC<{ beerPost: BeerPostQueryResult }> = ({ beerPost }) =>
<p>{beerPost.description}</p>
<div className="mt-5 flex justify-between">
<div>
<div className="mb-1">
<div className="space-y-1">
<div>
<Link
className="link-hover link text-lg font-bold"
href={`/beers/types/${beerPost.type.id}`}
@@ -88,31 +67,15 @@ const BeerInfoHeader: FC<{ beerPost: BeerPostQueryResult }> = ({ beerPost }) =>
<span className="mr-4 text-lg font-medium">{beerPost.abv}% ABV</span>
<span className="text-lg font-medium">{beerPost.ibu} IBU</span>
</div>
<div>
<span>
Liked by {likeCount} user{likeCount !== 1 && 's'}
</span>
</div>
</div>
<div className="card-actions">
<div className="card-actions items-end">
{user && (
<button
type="button"
className={`btn gap-2 rounded-2xl ${
!isLiked ? 'btn-ghost outline' : 'btn-primary'
}`}
onClick={() => {
handleLike();
}}
disabled={loading}
>
{isLiked ? (
<>
<FaThumbsUp className="text-2xl" />
<span>Liked</span>
</>
) : (
<>
<FaRegThumbsUp className="text-2xl" />
<span>Like</span>
</>
)}
</button>
<BeerPostLikeButton beerPostId={beerPost.id} setLikeCount={setLikeCount} />
)}
</div>
</div>

69
components/BeerById/BeerPostLikeButton.tsx Normal file
View File

@@ -0,0 +1,69 @@
import UserContext from '@/contexts/userContext';
import sendLikeRequest from '@/requests/sendLikeRequest';
import { Dispatch, FC, SetStateAction, useContext, useEffect, useState } from 'react';
import { FaThumbsUp, FaRegThumbsUp } from 'react-icons/fa';
import sendCheckIfUserLikesBeerPostRequest from '@/requests/sendCheckIfUserLikesBeerPostRequest';
const BeerPostLikeButton: FC<{
beerPostId: string;
setLikeCount: Dispatch<SetStateAction<number>>;
}> = ({ beerPostId, setLikeCount }) => {
const [loading, setLoading] = useState(true);
const [isLiked, setIsLiked] = useState(false);
const { user } = useContext(UserContext);
useEffect(() => {
if (!user) {
setLoading(false);
return;
}
sendCheckIfUserLikesBeerPostRequest(beerPostId)
.then((currentLikeStatus) => {
setIsLiked(currentLikeStatus);
setLoading(false);
})
.catch(() => {
setLoading(false);
});
}, [user, beerPostId]);
const handleLike = async () => {
try {
setLoading(true);
await sendLikeRequest(beerPostId);
setIsLiked(!isLiked);
setLikeCount((prevCount) => prevCount + (isLiked ? -1 : 1));
setLoading(false);
} catch (error) {
setLoading(false);
}
};
return (
<button
type="button"
className={`btn gap-2 rounded-2xl ${
!isLiked ? 'btn-ghost outline' : 'btn-primary'
}`}
onClick={() => {
handleLike();
}}
disabled={loading}
>
{isLiked ? (
<>
<FaThumbsUp className="text-2xl" />
Liked
</>
) : (
<>
<FaRegThumbsUp className="text-2xl" />
Like
</>
)}
</button>
);
};
export default BeerPostLikeButton;

2
components/BeerById/CommentCard.tsx
View File

@@ -13,7 +13,7 @@ const CommentCard: React.FC<{
}, [comment.createdAt]);
return (
<div className="card-body h-[1/9]">
<div className="card-body h-64">
<div className="flex justify-between">
<div>
<h3 className="text-2xl font-semibold">{comment.postedBy.username}</h3>

46
components/BeerForm.tsx
View File

@@ -1,12 +1,13 @@
import sendCreateBeerPostRequest from '@/requests/sendCreateBeerPostRequest';
import BeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema';
import CreateBeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema';
import BreweryPostQueryResult from '@/services/BreweryPost/types/BreweryPostQueryResult';
import { zodResolver } from '@hookform/resolvers/zod';
import { BeerType } from '@prisma/client';
import router from 'next/router';
import { FunctionComponent } from 'react';
import { FunctionComponent, useState } from 'react';
import { useForm, SubmitHandler } from 'react-hook-form';
import { z } from 'zod';
import ErrorAlert from './ui/alerts/ErrorAlert';
import Button from './ui/forms/Button';
import FormError from './ui/forms/FormError';
import FormInfo from './ui/forms/FormInfo';
@@ -16,7 +17,7 @@ import FormSelect from './ui/forms/FormSelect';
import FormTextArea from './ui/forms/FormTextArea';
import FormTextInput from './ui/forms/FormTextInput';
type BeerPostT = z.infer<typeof BeerPostValidationSchema>;
type BeerPostT = z.infer<typeof CreateBeerPostValidationSchema>;
interface BeerFormProps {
formType: 'edit' | 'create';
@@ -37,7 +38,7 @@ const BeerForm: FunctionComponent<BeerFormProps> = ({
handleSubmit,
formState: { errors },
} = useForm<BeerPostT>({
resolver: zodResolver(BeerPostValidationSchema),
resolver: zodResolver(CreateBeerPostValidationSchema),
defaultValues: {
name: defaultValues?.name,
description: defaultValues?.description,
@@ -46,7 +47,12 @@ const BeerForm: FunctionComponent<BeerFormProps> = ({
},
});
const [error, setError] = useState('');
const [isSubmitting, setIsSubmitting] = useState(false);
const onSubmit: SubmitHandler<BeerPostT> = async (data) => {
setIsSubmitting(true);
switch (formType) {
case 'create': {
try {
@@ -54,8 +60,9 @@ const BeerForm: FunctionComponent<BeerFormProps> = ({
router.push(`/beers/${response.id}`);
break;
} catch (e) {
// eslint-disable-next-line no-console
console.error(e);
if (e instanceof Error) {
setError(e.message);
}
break;
}
}
@@ -68,6 +75,9 @@ const BeerForm: FunctionComponent<BeerFormProps> = ({
return (
<form className="form-control" onSubmit={handleSubmit(onSubmit)}>
<div className="my-5">
{error && <ErrorAlert error={error} setError={setError} />}
</div>
<FormInfo>
<FormLabel htmlFor="name">Name</FormLabel>
<FormError>{errors.name?.message}</FormError>
@@ -79,6 +89,7 @@ const BeerForm: FunctionComponent<BeerFormProps> = ({
error={!!errors.name}
type="text"
id="name"
disabled={isSubmitting}
/>
</FormSegment>
{formType === 'create' && breweries.length && (
@@ -89,6 +100,7 @@ const BeerForm: FunctionComponent<BeerFormProps> = ({
</FormInfo>
<FormSegment>
<FormSelect
disabled={isSubmitting}
formRegister={register('breweryId')}
error={!!errors.breweryId}
id="breweryId"
@@ -110,6 +122,7 @@ const BeerForm: FunctionComponent<BeerFormProps> = ({
<FormError>{errors.abv?.message}</FormError>
</FormInfo>
<FormTextInput
disabled={isSubmitting}
placeholder="12"
formValidationSchema={register('abv', { valueAsNumber: true })}
error={!!errors.abv}
@@ -123,6 +136,7 @@ const BeerForm: FunctionComponent<BeerFormProps> = ({
<FormError>{errors.ibu?.message}</FormError>
</FormInfo>
<FormTextInput
disabled={isSubmitting}
placeholder="52"
formValidationSchema={register('ibu', { valueAsNumber: true })}
error={!!errors.ibu}
@@ -138,6 +152,7 @@ const BeerForm: FunctionComponent<BeerFormProps> = ({
</FormInfo>
<FormSegment>
<FormTextArea
disabled={isSubmitting}
placeholder="Ratione cumque quas quia aut impedit ea culpa facere. Ut in sit et quas reiciendis itaque."
error={!!errors.description}
formValidationSchema={register('description')}
@@ -152,6 +167,7 @@ const BeerForm: FunctionComponent<BeerFormProps> = ({
</FormInfo>
<FormSegment>
<FormSelect
disabled={isSubmitting}
formRegister={register('typeId')}
error={!!errors.typeId}
id="typeId"
@@ -164,11 +180,19 @@ const BeerForm: FunctionComponent<BeerFormProps> = ({
/>
</FormSegment>
<Button type="submit">{`${
formType === 'edit'
? `Edit ${defaultValues?.name || 'beer post'}`
: 'Create beer post'
} `}</Button>
{!isSubmitting && (
<Button type="submit" isSubmitting={isSubmitting}>{`${
formType === 'edit'
? `Edit ${defaultValues?.name || 'beer post'}`
: 'Create beer post'
}`}</Button>
)}
{isSubmitting && (
<Button type="submit" isSubmitting={isSubmitting}>
Submitting
</Button>
)}
</form>
);
};

9
components/BeerIndex/BeerCard.tsx
View File

@@ -1,14 +1,19 @@
import Link from 'next/link';
import { FC } from 'react';
import Image from 'next/image';
import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
import { BeerPostQueryResult } from '@/services/BeerPost/schema/BeerPostQueryResult';
const BeerCard: FC<{ post: BeerPostQueryResult }> = ({ post }) => {
return (
<div className="card bg-base-300" key={post.id}>
<figure className="card-image h-96">
{post.beerImages.length > 0 && (
<Image src={post.beerImages[0].url} alt={post.name} width="1029" height="110" />
<Image
src={post.beerImages[0].path}
alt={post.name}
width="1029"
height="110"
/>
)}
</figure>

16
components/Login/LoginForm.tsx
View File

@@ -2,8 +2,10 @@ import sendLoginUserRequest from '@/requests/sendLoginUserRequest';
import LoginValidationSchema from '@/services/User/schema/LoginValidationSchema';
import { zodResolver } from '@hookform/resolvers/zod';
import { useRouter } from 'next/router';
import { useState } from 'react';
import { useForm, SubmitHandler } from 'react-hook-form';
import { z } from 'zod';
import ErrorAlert from '../ui/alerts/ErrorAlert';
import FormError from '../ui/forms/FormError';
import FormInfo from '../ui/forms/FormInfo';
import FormLabel from '../ui/forms/FormLabel';
@@ -13,7 +15,7 @@ import FormTextInput from '../ui/forms/FormTextInput';
type LoginT = z.infer<typeof LoginValidationSchema>;
const LoginForm = () => {
const router = useRouter();
const { register, handleSubmit, formState } = useForm<LoginT>({
const { register, handleSubmit, formState, reset } = useForm<LoginT>({
resolver: zodResolver(LoginValidationSchema),
defaultValues: {
username: '',
@@ -23,18 +25,23 @@ const LoginForm = () => {
const { errors } = formState;
const [responseError, setResponseError] = useState<string>('');
const onSubmit: SubmitHandler<LoginT> = async (data) => {
try {
const response = await sendLoginUserRequest(data);
router.push(`/users/${response.id}`);
} catch (error) {
console.error(error);
if (error instanceof Error) {
setResponseError(error.message);
reset();
}
}
};
return (
<form className="form-control w-9/12 space-y-5" onSubmit={handleSubmit(onSubmit)}>
<form className="form-control w-full space-y-5" onSubmit={handleSubmit(onSubmit)}>
<div>
<FormInfo>
<FormLabel htmlFor="username">username</FormLabel>
@@ -65,8 +72,9 @@ const LoginForm = () => {
</FormSegment>
</div>
{responseError && <ErrorAlert error={responseError} setError={setResponseError} />}
<div className="w-full">
<button type="submit" className="btn btn-primary w-full">
<button type="submit" className="btn-primary btn w-full">
Login
</button>
</div>

32
components/ui/Navbar.tsx
View File

@@ -2,9 +2,10 @@
/* eslint-disable jsx-a11y/label-has-associated-control */
/* eslint-disable jsx-a11y/label-has-for */
import UserContext from '@/contexts/userContext';
import Link from 'next/link';
import { useRouter } from 'next/router';
import { useEffect, useState } from 'react';
import { useContext, useEffect, useState } from 'react';
interface Page {
slug: string;
@@ -14,19 +15,36 @@ const Navbar = () => {
const router = useRouter();
const [currentURL, setCurrentURL] = useState('/');
const { user } = useContext(UserContext);
useEffect(() => {
setCurrentURL(router.asPath);
}, [router.asPath]);
const pages: Page[] = [
const authenticatedPages: readonly Page[] = [
{ slug: '/account', name: 'Account' },
{ slug: '/api/users/logout', name: 'Logout' },
];
const unauthenticatedPages: readonly Page[] = [
{ slug: '/login', name: 'Login' },
{ slug: '/register', name: 'Register' },
];
const otherPages: readonly Page[] = [
{ slug: '/beers', name: 'Beers' },
{ slug: '/breweries', name: 'Breweries' },
];
const pages: readonly Page[] = [
...otherPages,
...(user ? authenticatedPages : unauthenticatedPages),
];
return (
<nav className="navbar bg-primary">
<nav className="navbar bg-primary text-primary-content">
<div className="flex-1">
<Link className="btn btn-ghost text-3xl normal-case" href="/">
<Link className="btn-ghost btn text-3xl normal-case" href="/">
<span className="cursor-pointer text-xl font-bold">The Biergarten App</span>
</Link>
</div>
@@ -39,7 +57,7 @@ const Navbar = () => {
<span
className={`text-lg uppercase ${
currentURL === page.slug ? 'font-extrabold' : 'font-semibold'
} text-base-content`}
} text-primary-content`}
>
{page.name}
</span>
@@ -51,7 +69,7 @@ const Navbar = () => {
</div>
<div className="flex-none lg:hidden">
<div className="dropdown-end dropdown">
<label tabIndex={0} className="btn btn-ghost btn-circle">
<label tabIndex={0} className="btn-ghost btn-circle btn">
<span className="w-10 rounded-full">
<svg
xmlns="http://www.w3.org/2000/svg"
@@ -75,7 +93,7 @@ const Navbar = () => {
{pages.map((page) => (
<li key={page.slug}>
<Link href={page.slug}>
<span className="select-none">{page.name}</span>
<span className="select-none text-primary-content">{page.name}</span>
</Link>
</li>
))}

32
components/ui/alerts/ErrorAlert.tsx Normal file
View File

@@ -0,0 +1,32 @@
import { Dispatch, FC, SetStateAction } from 'react';
import { FiAlertTriangle } from 'react-icons/fi';
interface ErrorAlertProps {
error: string;
setError: Dispatch<SetStateAction<string>>;
}
const ErrorAlert: FC<ErrorAlertProps> = ({ error, setError }) => {
return (
<div className="alert alert-error shadow-lg">
<div>
<FiAlertTriangle className="h-6 w-6" />
<span>{error}</span>
</div>
<div className="flex-none">
<button
className="btn-ghost btn-sm btn"
type="button"
onClick={() => {
setError('');
}}
>
OK
</button>
</div>
</div>
);
};
export default ErrorAlert;

12
components/ui/forms/Button.tsx
View File

@@ -3,11 +3,19 @@ import { FunctionComponent } from 'react';
interface FormButtonProps {
children: string;
type: 'button' | 'submit' | 'reset';
isSubmitting?: boolean;
}
const Button: FunctionComponent<FormButtonProps> = ({ children, type }) => (
const Button: FunctionComponent<FormButtonProps> = ({
children,
type,
isSubmitting = false,
}) => (
// eslint-disable-next-line react/button-has-type
<button type={type} className="btn btn-primary mt-4 w-full rounded-xl">
<button
type={type}
className={`btn btn-primary mt-4 w-full rounded-xl ${isSubmitting ? 'loading' : ''}`}
>
{children}
</button>
);

3
components/ui/forms/FormSelect.tsx
View File

@@ -8,6 +8,7 @@ interface FormSelectProps {
error: boolean;
placeholder: string;
message: string;
disabled?: boolean;
}
/**
@@ -40,6 +41,7 @@ const FormSelect: FunctionComponent<FormSelectProps> = ({
formRegister,
placeholder,
message,
disabled = false,
}) => (
<select
id={id}
@@ -47,6 +49,7 @@ const FormSelect: FunctionComponent<FormSelectProps> = ({
error ? 'select-error' : ''
}`}
placeholder={placeholder}
disabled={disabled}
{...formRegister}
>
<option value="">{message}</option>

1
config/auth/withPageAuthRequired.ts
View File

@@ -12,6 +12,7 @@ const withPageAuthRequired =
}
return await fn(context);
} catch (error) {
console.log(error);
return {
redirect: {
destination: '/login',

27
config/cloudinary/index.ts Normal file
View File

@@ -0,0 +1,27 @@
/* eslint-disable @typescript-eslint/naming-convention */
import { v2 as cloudinary } from 'cloudinary';
import { CloudinaryStorage } from 'multer-storage-cloudinary';
import ServerError from '../util/ServerError';
const { CLOUDINARY_CLOUD_NAME, CLOUDINARY_KEY, CLOUDINARY_SECRET } = process.env;
if (!(CLOUDINARY_CLOUD_NAME && CLOUDINARY_KEY && CLOUDINARY_SECRET)) {
throw new ServerError(
'The cloudinary credentials were not found in the environment variables.',
500,
);
}
cloudinary.config({
cloud_name: CLOUDINARY_CLOUD_NAME,
api_key: CLOUDINARY_KEY,
api_secret: CLOUDINARY_SECRET,
});
// @ts-expect-error
const storage = new CloudinaryStorage({ cloudinary, params: { folder: 'BeerApp' } });
/** Configuration object for Cloudinary image upload. */
const cloudinaryConfig = { cloudinary, storage };
export default cloudinaryConfig;

24
config/nextConnect/NextConnectConfig.ts → config/nextConnect/NextConnectOptions.ts
View File

@@ -1,14 +1,20 @@
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiRequest, NextApiResponse } from 'next';
import { Options } from 'next-connect';
import type { NextApiRequest, NextApiResponse } from 'next';
import type { RequestHandler } from 'next-connect/dist/types/node';
import type { HandlerOptions } from 'next-connect/dist/types/types';
import { z } from 'zod';
import logger from '../pino/logger';
import ServerError from '../util/ServerError';
const NextConnectConfig: Options<
NextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
> = {
type NextConnectOptionsT = HandlerOptions<
RequestHandler<
NextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>
>;
const NextConnectOptions: NextConnectOptionsT = {
onNoMatch(req, res) {
res.status(405).json({
message: 'Method not allowed.',
@@ -17,6 +23,10 @@ const NextConnectConfig: Options<
});
},
onError(error, req, res) {
if (process.env.NODE_ENV !== 'production') {
logger.error(error);
}
const message = error instanceof Error ? error.message : 'Internal server error.';
const statusCode = error instanceof ServerError ? error.statusCode : 500;
res.status(statusCode).json({
@@ -27,4 +37,4 @@ const NextConnectConfig: Options<
},
};
export default NextConnectConfig;
export default NextConnectOptions;

31
config/nextConnect/middleware/checkIfBeerPostOwner.ts Normal file
View File

@@ -0,0 +1,31 @@
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import ServerError from '@/config/util/ServerError';
import getBeerPostById from '@/services/BeerPost/getBeerPostById';
import { NextApiResponse } from 'next';
import { NextHandler } from 'next-connect';
interface CheckIfBeerPostOwnerRequest extends UserExtendedNextApiRequest {
query: { id: string };
}
const checkIfBeerPostOwner = async <RequestType extends CheckIfBeerPostOwnerRequest>(
req: RequestType,
res: NextApiResponse,
next: NextHandler,
) => {
const { id } = req.query;
const user = req.user!;
const beerPost = await getBeerPostById(id);
if (!beerPost) {
throw new ServerError('Beer post not found', 404);
}
if (beerPost.postedBy.id !== user.id) {
throw new ServerError('You are not authorized to edit this beer post', 403);
}
return next();
};
export default checkIfBeerPostOwner;

6
config/auth/middleware/getCurrentUser.ts → config/nextConnect/middleware/getCurrentUser.ts
View File

@@ -2,8 +2,8 @@ import { NextApiResponse } from 'next';
import { NextHandler } from 'next-connect';
import findUserById from '@/services/User/findUserById';
import ServerError from '@/config/util/ServerError';
import { getLoginSession } from '../session';
import { UserExtendedNextApiRequest } from '../types';
import { getLoginSession } from '../../auth/session';
import { UserExtendedNextApiRequest } from '../../auth/types';
/** Get the current user from the session. Adds the user to the request object. */
const getCurrentUser = async (
@@ -19,7 +19,7 @@ const getCurrentUser = async (
}
req.user = user;
await next();
return next();
};
export default getCurrentUser;

5
config/zod/middleware/validateRequest.ts → config/nextConnect/middleware/validateRequest.ts
View File

@@ -28,10 +28,11 @@ const validateRequest =
}) =>
async (req: NextApiRequest, res: NextApiResponse, next: NextHandler) => {
if (bodySchema) {
const parsed = bodySchema.safeParse(req.body);
const parsed = bodySchema.safeParse(JSON.parse(JSON.stringify(req.body)));
if (!parsed.success) {
throw new ServerError('Invalid request body.', 400);
}
req.body = parsed.data;
}
if (querySchema) {
@@ -42,7 +43,7 @@ const validateRequest =
req.query = parsed.data;
}
next();
return next();
};
export default validateRequest;

6
config/pino/logger.ts
View File

@@ -1,9 +1,5 @@
import pino from 'pino';
const logger = pino({
transport: {
target: 'pino-pretty',
},
});
const logger = pino();
export default logger;

2
hooks/useUser.ts
View File

@@ -3,6 +3,7 @@ import APIResponseValidationSchema from '@/validation/APIResponseValidationSchem
import useSWR from 'swr';
const useUser = () => {
// check cookies for user
const {
data: user,
error,
@@ -11,6 +12,7 @@ const useUser = () => {
const response = await fetch(url);
if (!response.ok) {
document.cookie = 'token=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
throw new Error(response.statusText);
}

4264
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

9
package.json
View File

@@ -10,6 +10,7 @@
"format": "npx prettier . --write",
"prestart": "npm run build",
"prismaDev": "dotenv -e .env.local prisma migrate dev",
"vercel-build": "DISABLE_ERD=true npx prisma generate && npx prisma migrate deploy && next build",
"seed": "npx ts-node ./prisma/seed/index.ts"
},
"dependencies": {
@@ -18,10 +19,13 @@
"@next/font": "13.1.6",
"@prisma/client": "^4.9.0",
"argon2": "^0.30.3",
"cloudinary": "^1.33.0",
"cookie": "0.5.0",
"date-fns": "^2.29.3",
"multer": "^1.4.5-lts.1",
"multer-storage-cloudinary": "^4.0.0",
"next": "13.1.6",
"next-connect": "^0.13.0",
"next-connect": "^1.0.0-next.3",
"passport": "^0.6.0",
"passport-local": "^1.0.0",
"pino": "^8.8.0",
@@ -36,7 +40,9 @@
},
"devDependencies": {
"@faker-js/faker": "^7.6.0",
"@mermaid-js/mermaid-cli": "^9.3.0",
"@types/cookie": "^0.5.1",
"@types/multer": "^1.4.7",
"@types/node": "^18.13.0",
"@types/passport-local": "^1.0.35",
"@types/react": "18.0.27",
@@ -55,6 +61,7 @@
"prettier-plugin-jsdoc": "^0.4.2",
"prettier-plugin-tailwindcss": "^0.2.2",
"prisma": "^4.9.0",
"prisma-erd-generator": "^1.2.5",
"tailwindcss": "^3.2.4",
"ts-node": "^10.9.1",
"typescript": "^4.9.5"

16
pages/account/index.tsx Normal file
View File

@@ -0,0 +1,16 @@
import Layout from '@/components/ui/Layout';
import { NextPage } from 'next';
interface AccountPageProps {}
const AccountPage: NextPage<AccountPageProps> = () => {
return (
<Layout>
<div>
<h1>Account Page</h1>
</div>
</Layout>
);
};
export default AccountPage;

26
pages/api/beers/[id]/comments.ts → pages/api/beers/[id]/comments/index.ts
View File

@@ -1,25 +1,28 @@
import validateRequest from '@/config/zod/middleware/validateRequest';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import createNewBeerComment from '@/services/BeerComment/createNewBeerComment';
import { BeerCommentQueryResultT } from '@/services/BeerComment/schema/BeerCommentQueryResult';
import BeerCommentValidationSchema from '@/services/BeerComment/schema/CreateBeerCommentValidationSchema';
import nextConnect from 'next-connect';
import { createRouter } from 'next-connect';
import { z } from 'zod';
import getCurrentUser from '@/config/auth/middleware/getCurrentUser';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import { NextApiResponse } from 'next';
interface CreateCommentRequest extends UserExtendedNextApiRequest {
body: z.infer<typeof BeerCommentValidationSchema>;
query: { id: string };
}
const createComment = async (
req: CreateCommentRequest,
res: NextApiResponse<z.infer<typeof APIResponseValidationSchema>>,
) => {
const { content, rating, beerPostId } = req.body;
const { content, rating } = req.body;
const beerPostId = req.query.id;
const newBeerComment: BeerCommentQueryResultT = await createNewBeerComment({
content,
@@ -36,10 +39,19 @@ const createComment = async (
});
};
const handler = nextConnect(NextConnectConfig).post(
validateRequest({ bodySchema: BeerCommentValidationSchema }),
const router = createRouter<
CreateCommentRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>();
router.post(
validateRequest({
bodySchema: BeerCommentValidationSchema,
querySchema: z.object({ id: z.string().uuid() }),
}),
getCurrentUser,
createComment,
);
const handler = router.handler(NextConnectOptions);
export default handler;

98
pages/api/beers/[id]/images/index.ts Normal file
View File

@@ -0,0 +1,98 @@
import DBClient from '@/prisma/DBClient';
import { BeerImage } from '@prisma/client';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import { createRouter, expressWrapper } from 'next-connect';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import multer from 'multer';
import cloudinaryConfig from '@/config/cloudinary';
import { NextApiResponse } from 'next';
import { z } from 'zod';
import ServerError from '@/config/util/ServerError';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
const { storage } = cloudinaryConfig;
const fileFilter: multer.Options['fileFilter'] = (req, file, cb) => {
const { mimetype } = file;
const isImage = mimetype.startsWith('image/');
if (!isImage) {
cb(null, false);
}
cb(null, true);
};
const uploadMiddleware = expressWrapper(
multer({ storage, fileFilter, limits: { files: 3 } }).array('images'),
);
const BeerPostImageValidationSchema = z.object({
caption: z.string(),
alt: z.string(),
});
interface UploadBeerPostImagesRequest extends UserExtendedNextApiRequest {
files?: Express.Multer.File[];
query: { id: string };
body: z.infer<typeof BeerPostImageValidationSchema>;
}
const processImageData = async (
req: UploadBeerPostImagesRequest,
res: NextApiResponse<z.infer<typeof APIResponseValidationSchema>>,
) => {
const { files, user, body } = req;
if (!files || !files.length) {
throw new ServerError('No images uploaded', 400);
}
const beerImagePromises: Promise<BeerImage>[] = [];
files.forEach((file) => {
beerImagePromises.push(
DBClient.instance.beerImage.create({
data: {
alt: body.alt,
postedBy: { connect: { id: user!.id } },
beerPost: { connect: { id: req.query.id } },
path: file.path,
caption: body.caption,
},
}),
);
});
const beerImages = await Promise.all(beerImagePromises);
res.status(200).json({
success: true,
message: `Successfully uploaded ${beerImages.length} image${
beerImages.length > 1 ? 's' : ''
}`,
statusCode: 200,
});
};
const router = createRouter<
UploadBeerPostImagesRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>();
router.post(
getCurrentUser,
// @ts-expect-error
uploadMiddleware,
validateRequest({ bodySchema: BeerPostImageValidationSchema }),
processImageData,
);
const handler = router.handler(NextConnectOptions);
export default handler;
export const config = { api: { bodyParser: false } };

24
pages/api/beers/[id]/like/index.ts
View File

@@ -1,16 +1,16 @@
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import getBeerPostById from '@/services/BeerPost/getBeerPostById';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import validateRequest from '@/config/zod/middleware/validateRequest';
import getCurrentUser from '@/config/auth/middleware/getCurrentUser';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import nextConnect from 'next-connect';
import { createRouter } from 'next-connect';
import { z } from 'zod';
import { NextApiResponse } from 'next';
import ServerError from '@/config/util/ServerError';
import createBeerPostLike from '@/services/BeerPostLike/createBeerPostLike';
import removeBeerPostLikeById from '@/services/BeerPostLike/removeBeerPostLikeById';
import findBeerPostLikeById from '@/services/BeerPostLike/findBeerPostLikeById';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
const sendLikeRequest = async (
req: UserExtendedNextApiRequest,
@@ -24,7 +24,7 @@ const sendLikeRequest = async (
throw new ServerError('Could not find a beer post with that id', 404);
}
const alreadyLiked = await findBeerPostLikeById(id);
const alreadyLiked = await findBeerPostLikeById(beer.id, user.id);
const jsonResponse = {
success: true as const,
@@ -43,14 +43,16 @@ const sendLikeRequest = async (
res.status(200).json(jsonResponse);
};
const handler = nextConnect(NextConnectConfig).post(
const router = createRouter<
UserExtendedNextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>();
router.post(
getCurrentUser,
validateRequest({
querySchema: z.object({
id: z.string().uuid(),
}),
}),
validateRequest({ querySchema: z.object({ id: z.string().uuid() }) }),
sendLikeRequest,
);
const handler = router.handler(NextConnectOptions);
export default handler;

24
pages/api/beers/[id]/like/is-liked.ts
View File

@@ -1,11 +1,11 @@
import getCurrentUser from '@/config/auth/middleware/getCurrentUser';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import validateRequest from '@/config/zod/middleware/validateRequest';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import DBClient from '@/prisma/DBClient';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';
import nextConnect from 'next-connect';
import { createRouter } from 'next-connect';
import { z } from 'zod';
const checkIfLiked = async (
@@ -18,7 +18,7 @@ const checkIfLiked = async (
const alreadyLiked = await DBClient.instance.beerPostLike.findFirst({
where: {
beerPostId: id,
userId: user.id,
likedById: user.id,
},
});
@@ -30,10 +30,20 @@ const checkIfLiked = async (
});
};
const handler = nextConnect(NextConnectConfig).get(
const router = createRouter<
UserExtendedNextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>();
router.get(
getCurrentUser,
validateRequest({ querySchema: z.object({ id: z.string().uuid() }) }),
validateRequest({
querySchema: z.object({
id: z.string().uuid(),
}),
}),
checkIfLiked,
);
const handler = router.handler(NextConnectOptions);
export default handler;

22
pages/api/beers/create.ts
View File

@@ -1,16 +1,16 @@
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import validateRequest from '@/config/zod/middleware/validateRequest';
import nextConnect from 'next-connect';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import { createRouter } from 'next-connect';
import createNewBeerPost from '@/services/BeerPost/createNewBeerPost';
import BeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema';
import CreateBeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';
import { z } from 'zod';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import getCurrentUser from '@/config/auth/middleware/getCurrentUser';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
interface CreateBeerPostRequest extends UserExtendedNextApiRequest {
body: z.infer<typeof BeerPostValidationSchema>;
body: z.infer<typeof CreateBeerPostValidationSchema>;
}
const createBeerPost = async (
@@ -37,10 +37,16 @@ const createBeerPost = async (
});
};
const handler = nextConnect(NextConnectConfig).post(
validateRequest({ bodySchema: BeerPostValidationSchema }),
const router = createRouter<
CreateBeerPostRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>();
router.post(
validateRequest({ bodySchema: CreateBeerPostValidationSchema }),
getCurrentUser,
createBeerPost,
);
const handler = router.handler(NextConnectOptions);
export default handler;

13
pages/api/users/current.ts
View File

@@ -1,9 +1,9 @@
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';
import getCurrentUser from '@/config/auth/middleware/getCurrentUser';
import nextConnect from 'next-connect';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import { createRouter } from 'next-connect';
import { z } from 'zod';
const sendCurrentUser = async (req: UserExtendedNextApiRequest, res: NextApiResponse) => {
@@ -16,9 +16,12 @@ const sendCurrentUser = async (req: UserExtendedNextApiRequest, res: NextApiResp
});
};
const handler = nextConnect<
const router = createRouter<
UserExtendedNextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>(NextConnectConfig).get(getCurrentUser, sendCurrentUser);
>();
router.get(getCurrentUser, sendCurrentUser);
const handler = router.handler(NextConnectOptions);
export default handler;

39
pages/api/users/login.ts
View File

@@ -1,36 +1,35 @@
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import passport from 'passport';
import nextConnect from 'next-connect';
import { createRouter, expressWrapper } from 'next-connect';
import localStrat from '@/config/auth/localStrat';
import { setLoginSession } from '@/config/auth/session';
import { NextApiResponse } from 'next';
import { z } from 'zod';
import ServerError from '@/config/util/ServerError';
import LoginValidationSchema from '@/services/User/schema/LoginValidationSchema';
import { UserExtendedNextApiRequest } from '../../../config/auth/types';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
export default nextConnect<
const router = createRouter<
UserExtendedNextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>(NextConnectConfig)
.use(passport.initialize())
.use((req, res, next) => {
const parsed = LoginValidationSchema.safeParse(req.body);
if (!parsed.success) {
throw new ServerError('Username and password are required.', 400);
}
>();
router.post(
validateRequest({ bodySchema: LoginValidationSchema }),
expressWrapper(async (req, res, next) => {
passport.initialize();
passport.use(localStrat);
passport.authenticate('local', { session: false }, (error, token) => {
if (error) {
next(error);
} else {
req.user = token;
next();
return;
}
req.user = token;
next();
})(req, res, next);
})
.post(async (req, res) => {
}),
async (req, res) => {
const user = req.user!;
await setLoginSession(res, user);
@@ -40,4 +39,8 @@ export default nextConnect<
statusCode: 200,
success: true,
});
});
},
);
const handler = router.handler(NextConnectOptions);
export default handler;

19
pages/api/users/logout.ts
View File

@@ -1,16 +1,18 @@
import { getLoginSession } from '@/config/auth/session';
import { removeTokenCookie } from '@/config/auth/cookie';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiRequest, NextApiResponse } from 'next';
import nextConnect from 'next-connect';
import { createRouter } from 'next-connect';
import { z } from 'zod';
import ServerError from '@/config/util/ServerError';
const handler = nextConnect<
const router = createRouter<
NextApiRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>(NextConnectConfig).all(async (req, res) => {
>();
router.all(async (req, res) => {
const session = await getLoginSession(req);
if (!session) {
@@ -18,10 +20,9 @@ const handler = nextConnect<
}
removeTokenCookie(res);
res.status(200).json({
message: 'Logged out.',
statusCode: 200,
success: true,
});
res.redirect('/');
});
const handler = router.handler(NextConnectOptions);
export default handler;

24
pages/api/users/register.ts
View File

@@ -1,13 +1,15 @@
import { setLoginSession } from '@/config/auth/session';
import { NextApiRequest, NextApiResponse } from 'next';
import { z } from 'zod';
import ServerError from '@/config/util/ServerError';
import nc from 'next-connect';
import { createRouter } from 'next-connect';
import createNewUser from '@/services/User/createNewUser';
import CreateUserValidationSchema from '@/services/User/schema/CreateUserValidationSchema';
import NextConnectConfig from '@/config/nextConnect/NextConnectConfig';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import findUserByUsername from '@/services/User/findUserByUsername';
import findUserByEmail from '@/services/User/findUserByEmail';
import validateRequest from '@/config/zod/middleware/validateRequest';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
interface RegisterUserRequest extends NextApiRequest {
body: z.infer<typeof CreateUserValidationSchema>;
@@ -34,6 +36,11 @@ const registerUser = async (req: RegisterUserRequest, res: NextApiResponse) => {
}
const user = await createNewUser(req.body);
await setLoginSession(res, {
id: user.id,
username: user.username,
});
res.status(201).json({
message: 'User created successfully.',
payload: user,
@@ -42,9 +49,12 @@ const registerUser = async (req: RegisterUserRequest, res: NextApiResponse) => {
});
};
const handler = nc(NextConnectConfig).post(
validateRequest({ bodySchema: CreateUserValidationSchema }),
registerUser,
);
const router = createRouter<
RegisterUserRequest,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>();
router.post(validateRequest({ bodySchema: CreateUserValidationSchema }), registerUser);
const handler = router.handler(NextConnectOptions);
export default handler;

96
pages/beers/[id].tsx
View File

@@ -4,41 +4,47 @@ import BeerRecommendations from '@/components/BeerById/BeerRecommendations';
import CommentCard from '@/components/BeerById/CommentCard';
import Layout from '@/components/ui/Layout';
import UserContext from '@/contexts/userContext';
import DBClient from '@/prisma/DBClient';
import getAllBeerComments from '@/services/BeerComment/getAllBeerComments';
import { BeerCommentQueryResultArrayT } from '@/services/BeerComment/schema/BeerCommentQueryResult';
import getBeerPostById from '@/services/BeerPost/getBeerPostById';
import getBeerRecommendations from '@/services/BeerPost/getBeerRecommendations';
import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
import { BeerPostQueryResult } from '@/services/BeerPost/schema/BeerPostQueryResult';
import { BeerPost } from '@prisma/client';
import { NextPage, GetServerSideProps } from 'next';
import Head from 'next/head';
import Image from 'next/image';
import Link from 'next/link';
import { useRouter } from 'next/router';
import { useState, useEffect, useContext } from 'react';
interface BeerPageProps {
beerPost: BeerPostQueryResult;
beerRecommendations: (BeerPost & {
brewery: {
id: string;
name: string;
};
beerImages: {
id: string;
alt: string;
url: string;
}[];
brewery: { id: string; name: string };
beerImages: { id: string; alt: string; url: string }[];
})[];
beerComments: BeerCommentQueryResultArrayT;
commentsPageCount: number;
likeCount: number;
}
const BeerByIdPage: NextPage<BeerPageProps> = ({
beerPost,
beerRecommendations,
beerComments,
commentsPageCount,
likeCount,
}) => {
const { user } = useContext(UserContext);
const [comments, setComments] = useState(beerComments);
const router = useRouter();
const commentsPageNum = router.query.comments_page
? parseInt(router.query.comments_page as string, 10)
: 1;
useEffect(() => {
setComments(beerComments);
}, [beerComments]);
@@ -49,11 +55,11 @@ const BeerByIdPage: NextPage<BeerPageProps> = ({
<title>{beerPost.name}</title>
<meta name="description" content={beerPost.description} />
</Head>
<main>
<div>
{beerPost.beerImages[0] && (
<Image
alt={beerPost.beerImages[0].alt}
src={beerPost.beerImages[0].url}
src={beerPost.beerImages[0].path}
height={1080}
width={1920}
className="h-[42rem] w-full object-cover"
@@ -61,10 +67,10 @@ const BeerByIdPage: NextPage<BeerPageProps> = ({
)}
<div className="my-12 flex w-full items-center justify-center ">
<div className="w-10/12 space-y-3">
<BeerInfoHeader beerPost={beerPost} />
<div className="mt-4 flex space-x-3">
<div className="w-[60%] space-y-3">
<div className="w-11/12 space-y-3 lg:w-9/12">
<BeerInfoHeader beerPost={beerPost} initialLikeCount={likeCount} />
<div className="mt-4 flex flex-col space-y-3 sm:flex-row sm:space-y-0 sm:space-x-3">
<div className="w-full space-y-3 sm:w-[60%]">
<div className="card h-96 bg-base-300">
<div className="card-body h-full">
{user ? (
@@ -78,19 +84,52 @@ const BeerByIdPage: NextPage<BeerPageProps> = ({
)}
</div>
</div>
<div className="card h-[135rem] bg-base-300">
<div className="card bg-base-300 pb-6">
{comments.map((comment) => (
<CommentCard key={comment.id} comment={comment} />
))}
<div className="flex items-center justify-center">
<div className="btn-group grid w-6/12 grid-cols-2">
<Link
className={`btn-outline btn ${
commentsPageNum === 1
? 'btn-disabled pointer-events-none'
: 'pointer-events-auto'
}`}
href={{
pathname: `/beers/${beerPost.id}`,
query: { comments_page: commentsPageNum - 1 },
}}
scroll={false}
>
Next Comments
</Link>
<Link
className={`btn-outline btn ${
commentsPageNum === commentsPageCount
? 'btn-disabled pointer-events-none'
: 'pointer-events-auto'
}`}
href={{
pathname: `/beers/${beerPost.id}`,
query: { comments_page: commentsPageNum + 1 },
}}
scroll={false}
>
Previous Comments
</Link>
</div>
</div>
</div>
</div>
<div className="w-[40%]">
<div className="sm:w-[40%]">
<BeerRecommendations beerRecommendations={beerRecommendations} />
</div>
</div>
</div>
</div>
</main>
</div>
</Layout>
);
};
@@ -98,21 +137,34 @@ const BeerByIdPage: NextPage<BeerPageProps> = ({
export const getServerSideProps: GetServerSideProps<BeerPageProps> = async (context) => {
const beerPost = await getBeerPostById(context.params!.id! as string);
const beerCommentPageNum = parseInt(context.query.comments_page as string, 10) || 1;
if (!beerPost) {
return { notFound: true };
}
const { type, brewery, id } = beerPost;
const beerRecommendations = await getBeerRecommendations({ type, brewery, id });
const pageSize = 5;
const beerComments = await getAllBeerComments(
{ id: beerPost.id },
{ pageSize: 9, pageNum: 1 },
{ pageSize, pageNum: beerCommentPageNum },
);
const beerRecommendations = await getBeerRecommendations({ type, brewery, id });
const numberOfPosts = await DBClient.instance.beerComment.count({
where: { beerPostId: beerPost.id },
});
const pageCount = numberOfPosts ? Math.ceil(numberOfPosts / pageSize) : 0;
const likeCount = await DBClient.instance.beerPostLike.count({
where: { beerPostId: beerPost.id },
});
const props = {
beerPost: JSON.parse(JSON.stringify(beerPost)),
beerRecommendations: JSON.parse(JSON.stringify(beerRecommendations)),
beerComments: JSON.parse(JSON.stringify(beerComments)),
commentsPageCount: JSON.parse(JSON.stringify(pageCount)),
likeCount: JSON.parse(JSON.stringify(likeCount)),
};
return { props };

5
pages/beers/create.tsx
View File

@@ -1,5 +1,6 @@
import BeerForm from '@/components/BeerForm';
import Layout from '@/components/ui/Layout';
import withPageAuthRequired from '@/config/auth/withPageAuthRequired';
import DBClient from '@/prisma/DBClient';
import getAllBreweryPosts from '@/services/BreweryPost/getAllBreweryPosts';
@@ -30,7 +31,7 @@ const Create: NextPage<CreateBeerPageProps> = ({ breweries, types }) => {
);
};
export const getServerSideProps = async () => {
export const getServerSideProps = withPageAuthRequired(async () => {
const breweryPosts = await getAllBreweryPosts();
const beerTypes = await DBClient.instance.beerType.findMany();
@@ -40,6 +41,6 @@ export const getServerSideProps = async () => {
types: JSON.parse(JSON.stringify(beerTypes)),
},
};
};
});
export default Create;

7
pages/beers/index.tsx
View File

@@ -6,7 +6,8 @@ import DBClient from '@/prisma/DBClient';
import Layout from '@/components/ui/Layout';
import Pagination from '@/components/BeerIndex/Pagination';
import BeerCard from '@/components/BeerIndex/BeerCard';
import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
import { BeerPostQueryResult } from '@/services/BeerPost/schema/BeerPostQueryResult';
import Head from 'next/head';
interface BeerPageProps {
initialBeerPosts: BeerPostQueryResult[];
@@ -20,6 +21,10 @@ const BeerPage: NextPage<BeerPageProps> = ({ initialBeerPosts, pageCount }) => {
const pageNum = parseInt(query.page_num as string, 10) || 1;
return (
<Layout>
<Head>
<title>Beer</title>
<meta name="description" content="Beer posts" />
</Head>
<div className="flex items-center justify-center bg-base-100">
<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">

2
pages/breweries/[id].tsx
View File

@@ -1,4 +1,4 @@
import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
import { BeerPostQueryResult } from '@/services/BeerPost/schema/BeerPostQueryResult';
import getBreweryPostById from '@/services/BreweryPost/getBreweryPostById';
import { GetServerSideProps, NextPage } from 'next';

31
pages/login/index.tsx
View File

@@ -4,6 +4,10 @@ import { useRouter } from 'next/router';
import Layout from '@/components/ui/Layout';
import useUser from '@/hooks/useUser';
import LoginForm from '@/components/Login/LoginForm';
import Image from 'next/image';
import { FaUserCircle } from 'react-icons/fa';
import Head from 'next/head';
const LoginPage: NextPage = () => {
const { user } = useUser();
@@ -19,12 +23,31 @@ const LoginPage: NextPage = () => {
return (
<Layout>
<Head>
<title>Login</title>
<meta name="description" content="Login to your account" />
</Head>
<div className="flex h-full flex-row">
<div className="flex h-full w-[40%] flex-col items-center justify-center bg-base-100">
<h1>Login</h1>
<div className="hidden h-full flex-col items-center justify-center bg-base-100 lg:flex lg:w-[60%]">
<Image
src="https://picsum.photos/1040/1080"
alt="Login Image"
width={4920}
height={4080}
className="h-full w-full object-cover"
/>
</div>
<div className="flex h-full w-[60%] flex-col items-center justify-center bg-base-300">
<LoginForm />
<div className="flex h-full w-full flex-col items-center space-y-5 bg-base-300 lg:w-[40%]">
<div className="mt-44 w-9/12">
<div className=" flex flex-col items-center space-y-2">
<FaUserCircle className="text-3xl" />
<h1 className="text-4xl font-bold">Login</h1>
</div>
<div className="mt-10">
<LoginForm />
</div>
</div>
</div>
</div>
</Layout>

168
pages/register/index.tsx Normal file
View File

@@ -0,0 +1,168 @@
import ErrorAlert from '@/components/ui/alerts/ErrorAlert';
import Button from '@/components/ui/forms/Button';
import FormError from '@/components/ui/forms/FormError';
import FormInfo from '@/components/ui/forms/FormInfo';
import FormLabel from '@/components/ui/forms/FormLabel';
import FormSegment from '@/components/ui/forms/FormSegment';
import FormTextInput from '@/components/ui/forms/FormTextInput';
import Layout from '@/components/ui/Layout';
import sendRegisterUserRequest from '@/requests/sendRegisterUserRequest';
import CreateUserValidationSchema from '@/services/User/schema/CreateUserValidationSchema';
import { zodResolver } from '@hookform/resolvers/zod';
import { NextPage } from 'next';
import { useRouter } from 'next/router';
import { useState } from 'react';
import { useForm } from 'react-hook-form';
import { FaUserCircle } from 'react-icons/fa';
import { z } from 'zod';
interface RegisterUserProps {}
const RegisterUserPage: NextPage<RegisterUserProps> = () => {
const router = useRouter();
const { reset, register, handleSubmit, formState } = useForm<
z.infer<typeof CreateUserValidationSchema>
>({
resolver: zodResolver(CreateUserValidationSchema),
});
const { errors } = formState;
const [serverResponseError, setServerResponseError] = useState('');
const onSubmit = async (data: z.infer<typeof CreateUserValidationSchema>) => {
try {
await sendRegisterUserRequest(data);
reset();
router.push('/', undefined, { shallow: true });
} catch (error) {
setServerResponseError(
error instanceof Error
? error.message
: 'Something went wrong. We could not register your account.',
);
}
};
return (
<Layout>
<div
className="flex h-full flex-col items-center justify-center space-y-6"
onSubmit={handleSubmit(onSubmit)}
>
<div className="flex flex-col items-center space-y-2">
<FaUserCircle className="text-3xl" />
<h1 className="text-4xl font-bold">Register</h1>
</div>
<form className="form-control w-7/12 space-y-5" noValidate>
{serverResponseError && (
<ErrorAlert error={serverResponseError} setError={setServerResponseError} />
)}
<div>
<div className="flex flex-row space-x-3">
<div className="w-[50%]">
<FormInfo>
<FormLabel htmlFor="firstName">First name</FormLabel>
<FormError>{errors.firstName?.message}</FormError>
</FormInfo>
<FormSegment>
<FormTextInput
id="firstName"
type="text"
formValidationSchema={register('firstName')}
error={!!errors.firstName}
placeholder="first name"
/>
</FormSegment>
</div>
<div className="w-[50%]">
<FormInfo>
<FormLabel htmlFor="lastName">Last name</FormLabel>
<FormError>{errors.lastName?.message}</FormError>
</FormInfo>
<FormSegment>
<FormTextInput
id="lastName"
type="text"
formValidationSchema={register('lastName')}
error={!!errors.lastName}
placeholder="last name"
/>
</FormSegment>
</div>
</div>
<FormInfo>
<FormLabel htmlFor="username">username</FormLabel>
<FormError>{errors.username?.message}</FormError>
</FormInfo>
<FormSegment>
<FormTextInput
id="username"
type="text"
formValidationSchema={register('username')}
error={!!errors.username}
placeholder="username"
/>
</FormSegment>
<FormInfo>
<FormLabel htmlFor="email">email</FormLabel>
<FormError>{errors.email?.message}</FormError>
</FormInfo>
<FormSegment>
<FormTextInput
id="email"
type="email"
formValidationSchema={register('email')}
error={!!errors.email}
placeholder="email"
/>
</FormSegment>
<FormInfo>
<FormLabel htmlFor="password">password</FormLabel>
<FormError>{errors.password?.message}</FormError>
</FormInfo>
<FormSegment>
<FormTextInput
id="password"
type="password"
formValidationSchema={register('password')}
error={!!errors.password}
placeholder="password"
/>
</FormSegment>
<FormInfo>
<FormLabel htmlFor="confirmPassword">confirm password</FormLabel>
<FormError>{errors.confirmPassword?.message}</FormError>
</FormInfo>
<FormSegment>
<FormTextInput
id="confirmPassword"
type="password"
formValidationSchema={register('confirmPassword')}
error={!!errors.confirmPassword}
placeholder="confirm password"
/>
</FormSegment>
<FormInfo>
<FormLabel htmlFor="dateOfBirth">Date of birth</FormLabel>
<FormError>{errors.dateOfBirth?.message}</FormError>
</FormInfo>
<FormSegment>
<FormTextInput
id="dateOfBirth"
type="date"
formValidationSchema={register('dateOfBirth')}
error={!!errors.dateOfBirth}
placeholder="date of birth"
/>
</FormSegment>
<Button type="submit">Register User</Button>
</div>
</form>
</div>
</Layout>
);
};
export default RegisterUserPage;

14
prisma/DBClient.ts
View File

@@ -1,11 +1,17 @@
import { PrismaClient } from '@prisma/client';
const globalForPrisma = global as unknown as { prisma: PrismaClient };
const DBClient = {
instance: new PrismaClient(),
instance:
globalForPrisma.prisma ||
new PrismaClient({
log: ['info', 'warn'],
}),
};
export type IDBClient = typeof DBClient;
Object.freeze(DBClient);
if (process.env.NODE_ENV !== 'production') {
globalForPrisma.prisma = DBClient.instance;
}
export default DBClient;

1
prisma/ERD.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 104 KiB

30
prisma/migrations/20230211021836_/migration.sql Normal file
View File

@@ -0,0 +1,30 @@
/*
Warnings:
- You are about to drop the column `url` on the `BeerImage` table. All the data in the column will be lost.
- You are about to drop the column `url` on the `BreweryImage` table. All the data in the column will be lost.
- Added the required column `caption` to the `BeerImage` table without a default value. This is not possible if the table is not empty.
- Added the required column `path` to the `BeerImage` table without a default value. This is not possible if the table is not empty.
- Added the required column `postedById` to the `BeerImage` table without a default value. This is not possible if the table is not empty.
- Added the required column `caption` to the `BreweryImage` table without a default value. This is not possible if the table is not empty.
- Added the required column `path` to the `BreweryImage` table without a default value. This is not possible if the table is not empty.
- Added the required column `postedById` to the `BreweryImage` table without a default value. This is not possible if the table is not empty.
*/
-- AlterTable
ALTER TABLE "BeerImage" DROP COLUMN "url",
ADD COLUMN "caption" TEXT NOT NULL,
ADD COLUMN "path" TEXT NOT NULL,
ADD COLUMN "postedById" TEXT NOT NULL;
-- AlterTable
ALTER TABLE "BreweryImage" DROP COLUMN "url",
ADD COLUMN "caption" TEXT NOT NULL,
ADD COLUMN "path" TEXT NOT NULL,
ADD COLUMN "postedById" TEXT NOT NULL;
-- AddForeignKey
ALTER TABLE "BeerImage" ADD CONSTRAINT "BeerImage_postedById_fkey" FOREIGN KEY ("postedById") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "BreweryImage" ADD CONSTRAINT "BreweryImage_postedById_fkey" FOREIGN KEY ("postedById") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

16
prisma/migrations/20230213214022_/migration.sql Normal file
View File

@@ -0,0 +1,16 @@
/*
Warnings:
- You are about to drop the column `userId` on the `BeerPostLike` table. All the data in the column will be lost.
- Added the required column `likedById` to the `BeerPostLike` table without a default value. This is not possible if the table is not empty.
*/
-- DropForeignKey
ALTER TABLE "BeerPostLike" DROP CONSTRAINT "BeerPostLike_userId_fkey";
-- AlterTable
ALTER TABLE "BeerPostLike" DROP COLUMN "userId",
ADD COLUMN "likedById" TEXT NOT NULL;
-- AddForeignKey
ALTER TABLE "BeerPostLike" ADD CONSTRAINT "BeerPostLike_likedById_fkey" FOREIGN KEY ("likedById") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

23
prisma/schema.prisma
View File

@@ -5,6 +5,13 @@ generator client {
provider = "prisma-client-js"
}
generator erdSVG {
provider = "prisma-erd-generator"
output = "./ERD.svg"
includeRelationFromFields = true
theme = "neutral"
}
datasource db {
provider = "postgresql"
url = env("DATABASE_URL")
@@ -26,6 +33,8 @@ model User {
beerComments BeerComment[]
breweryComments BreweryComment[]
BeerPostLikes BeerPostLike[]
BeerImage BeerImage[]
BreweryImage BreweryImage[]
}
model BeerPost {
@@ -51,8 +60,8 @@ model BeerPostLike {
id String @id @default(uuid())
beerPost BeerPost @relation(fields: [beerPostId], references: [id], onDelete: Cascade)
beerPostId String
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
userId String
likedBy User @relation(fields: [likedById], references: [id], onDelete: Cascade)
likedById String
createdAt DateTime @default(now()) @db.Timestamptz(3)
updatedAt DateTime? @updatedAt @db.Timestamptz(3)
}
@@ -109,18 +118,24 @@ model BeerImage {
id String @id @default(uuid())
beerPost BeerPost @relation(fields: [beerPostId], references: [id], onDelete: Cascade)
beerPostId String
url String
path String
alt String
caption String
createdAt DateTime @default(now()) @db.Timestamptz(3)
updatedAt DateTime? @updatedAt @db.Timestamptz(3)
postedBy User @relation(fields: [postedById], references: [id], onDelete: Cascade)
postedById String
}
model BreweryImage {
id String @id @default(uuid())
breweryPost BreweryPost @relation(fields: [breweryPostId], references: [id], onDelete: Cascade)
breweryPostId String
url String
path String
createdAt DateTime @default(now()) @db.Timestamptz(3)
updatedAt DateTime? @updatedAt @db.Timestamptz(3)
caption String
alt String
postedBy User @relation(fields: [postedById], references: [id], onDelete: Cascade)
postedById String
}

5
prisma/seed/clean/cleanDatabase.ts
View File

@@ -8,6 +8,11 @@ const cleanDatabase = async () => {
await prisma.$executeRaw`TRUNCATE TABLE "BreweryPost" CASCADE`;
await prisma.$executeRaw`TRUNCATE TABLE "BeerComment" CASCADE`;
await prisma.$executeRaw`TRUNCATE TABLE "BreweryComment" CASCADE`;
await prisma.$executeRaw`TRUNCATE TABLE "BeerPostLike" CASCADE`;
await prisma.$executeRaw`TRUNCATE TABLE "BeerImage" CASCADE`;
await prisma.$executeRaw`TRUNCATE TABLE "BreweryImage" CASCADE`;
await prisma.$disconnect();
};
export default cleanDatabase;

12
prisma/seed/create/createNewBeerImages.ts
View File

@@ -1,15 +1,16 @@
// eslint-disable-next-line import/no-extraneous-dependencies
import { faker } from '@faker-js/faker';
import { BeerPost, BeerImage } from '@prisma/client';
import { BeerPost, BeerImage, User } from '@prisma/client';
import DBClient from '../../DBClient';
interface CreateNewBeerImagesArgs {
numberOfImages: number;
beerPosts: BeerPost[];
joinData: { beerPosts: BeerPost[]; users: User[] };
}
const createNewBeerImages = async ({
numberOfImages,
beerPosts,
joinData: { beerPosts, users },
}: CreateNewBeerImagesArgs) => {
const prisma = DBClient.instance;
const createdAt = faker.date.past(1);
@@ -18,12 +19,15 @@ const createNewBeerImages = async ({
// eslint-disable-next-line no-plusplus
for (let i = 0; i < numberOfImages; i++) {
const beerPost = beerPosts[Math.floor(Math.random() * beerPosts.length)];
const user = users[Math.floor(Math.random() * users.length)];
beerImagesPromises.push(
prisma.beerImage.create({
data: {
url: 'https://picsum.photos/900/1600',
path: 'https://picsum.photos/1040/1080',
alt: 'Placeholder beer image.',
caption: 'Placeholder beer image caption.',
beerPost: { connect: { id: beerPost.id } },
postedBy: { connect: { id: user.id } },
createdAt,
},
}),

2
prisma/seed/create/createNewBeerPostLikes.ts
View File

@@ -22,7 +22,7 @@ const createNewBeerPostLikes = async ({
DBClient.instance.beerPostLike.create({
data: {
beerPost: { connect: { id: beerPost.id } },
user: { connect: { id: user.id } },
likedBy: { connect: { id: user.id } },
},
}),
);

15
prisma/seed/create/createNewBreweryImages.ts
View File

@@ -1,15 +1,19 @@
// eslint-disable-next-line import/no-extraneous-dependencies
import { faker } from '@faker-js/faker';
import { BreweryPost, BreweryImage } from '@prisma/client';
import { BreweryPost, BreweryImage, User } from '@prisma/client';
import DBClient from '../../DBClient';
interface CreateBreweryImagesArgs {
numberOfImages: number;
breweryPosts: BreweryPost[];
joinData: {
breweryPosts: BreweryPost[];
users: User[];
};
}
const createNewBreweryImages = async ({
numberOfImages,
breweryPosts,
joinData: { breweryPosts, users },
}: CreateBreweryImagesArgs) => {
const prisma = DBClient.instance;
const createdAt = faker.date.past(1);
@@ -18,13 +22,16 @@ const createNewBreweryImages = async ({
// eslint-disable-next-line no-plusplus
for (let i = 0; i < numberOfImages; i++) {
const breweryPost = breweryPosts[Math.floor(Math.random() * breweryPosts.length)];
const user = users[Math.floor(Math.random() * users.length)];
breweryImagesPromises.push(
prisma.breweryImage.create({
data: {
url: 'https://picsum.photos/900/1600',
path: 'https://picsum.photos/1040/1080',
alt: 'Placeholder brewery image.',
caption: 'Placeholder brewery image caption.',
breweryPost: { connect: { id: breweryPost.id } },
postedBy: { connect: { id: user.id } },
createdAt,
},
}),

2
prisma/seed/create/createNewUsers.ts
View File

@@ -18,7 +18,7 @@ const createNewUsers = async ({ numberOfUsers }: CreateNewUsersArgs) => {
// eslint-disable-next-line no-plusplus
for (let i = 0; i < numberOfUsers; i++) {
const randomValue = crypto.randomBytes(2).toString('hex');
const randomValue = crypto.randomBytes(4).toString('hex');
const firstName = faker.name.firstName();
const lastName = faker.name.lastName();
const username = `${firstName[0]}.${lastName}.${randomValue}`;

4
prisma/seed/index.ts
View File

@@ -54,11 +54,11 @@ import createNewUsers from './create/createNewUsers';
}),
createNewBeerImages({
numberOfImages: 1000,
beerPosts,
joinData: { beerPosts, users },
}),
createNewBreweryImages({
numberOfImages: 1000,
breweryPosts,
joinData: { breweryPosts, users },
}),
]);

8
requests/sendCreateBeerCommentRequest.ts
View File

@@ -3,11 +3,15 @@ import BeerCommentValidationSchema from '@/services/BeerComment/schema/CreateBee
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { z } from 'zod';
const BeerCommentValidationSchemaWithId = BeerCommentValidationSchema.extend({
beerPostId: z.string().uuid(),
});
const sendCreateBeerCommentRequest = async ({
beerPostId,
content,
rating,
}: z.infer<typeof BeerCommentValidationSchema>) => {
}: z.infer<typeof BeerCommentValidationSchemaWithId>) => {
const response = await fetch(`/api/beers/${beerPostId}/comments`, {
method: 'POST',
headers: {
@@ -29,7 +33,6 @@ const sendCreateBeerCommentRequest = async ({
const parsedResponse = APIResponseValidationSchema.safeParse(data);
if (!parsedResponse.success) {
console.log(parsedResponse.error);
throw new Error('Invalid API response');
}
@@ -37,7 +40,6 @@ const sendCreateBeerCommentRequest = async ({
const parsedPayload = BeerCommentQueryResult.safeParse(parsedResponse.data.payload);
if (!parsedPayload.success) {
console.log(parsedPayload.error);
throw new Error('Invalid API response payload');
}

32
requests/sendCreateBeerPostRequest.ts
View File

@@ -1,40 +1,36 @@
import BeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema';
import { beerPostQueryResultSchema } from '@/services/BeerPost/schema/BeerPostQueryResult';
import CreateBeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { z } from 'zod';
const sendCreateBeerPostRequest = async (
data: z.infer<typeof BeerPostValidationSchema>,
data: z.infer<typeof CreateBeerPostValidationSchema>,
) => {
const response = await fetch('/api/beers/create', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(data),
});
const json = await response.json();
const parsed = APIResponseValidationSchema.safeParse(json);
if (!parsed.success) {
throw new Error('Invalid API response');
}
const { payload } = parsed.data;
const { payload, success, message } = parsed.data;
if (
!(
payload &&
typeof payload === 'object' &&
'id' in payload &&
typeof payload.id === 'string'
)
) {
throw new Error('Invalid API response');
if (!success) {
throw new Error(message);
}
return payload;
const parsedPayload = beerPostQueryResultSchema.safeParse(payload);
if (!parsedPayload.success) {
throw new Error('Invalid API response payload');
}
return parsedPayload.data;
};
export default sendCreateBeerPostRequest;

5
requests/sendLikeRequest.ts
View File

@@ -1,8 +1,7 @@
import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
const sendLikeRequest = async (beerPost: BeerPostQueryResult) => {
const response = await fetch(`/api/beers/${beerPost.id}/like`, {
const sendLikeRequest = async (beerPostId: string) => {
const response = await fetch(`/api/beers/${beerPostId}/like`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',

3
requests/sendLoginUserRequest.ts
View File

@@ -17,6 +17,9 @@ const sendLoginUserRequest = async (data: { username: string; password: string }
throw new Error('API response validation failed');
}
if (!parsed.data.success) {
throw new Error(parsed.data.message);
}
const parsedPayload = BasicUserInfoSchema.safeParse(parsed.data.payload);
if (!parsedPayload.success) {
throw new Error('API response payload validation failed');

35
requests/sendRegisterUserRequest.ts Normal file
View File

@@ -0,0 +1,35 @@
import CreateUserValidationSchema from '@/services/User/schema/CreateUserValidationSchema';
import GetUserSchema from '@/services/User/schema/GetUserSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { z } from 'zod';
async function sendRegisterUserRequest(data: z.infer<typeof CreateUserValidationSchema>) {
const response = await fetch('/api/users/register', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify(data),
});
const json = await response.json();
const parsed = APIResponseValidationSchema.safeParse(json);
if (!parsed.success) {
throw new Error('API response validation failed.');
}
if (!parsed.data.success) {
throw new Error(parsed.data.message);
}
const parsedPayload = GetUserSchema.safeParse(parsed.data.payload);
if (!parsedPayload.success) {
throw new Error('API response payload validation failed.');
}
return parsedPayload.data;
}
export default sendRegisterUserRequest;

5
services/BeerComment/createNewBeerComment.ts
View File

@@ -2,8 +2,9 @@ import DBClient from '@/prisma/DBClient';
import { z } from 'zod';
import BeerCommentValidationSchema from './schema/CreateBeerCommentValidationSchema';
const CreateBeerCommentWithUserSchema = BeerCommentValidationSchema.extend({
const CreateNewBeerCommentServiceSchema = BeerCommentValidationSchema.extend({
userId: z.string().uuid(),
beerPostId: z.string().uuid(),
});
const createNewBeerComment = async ({
@@ -11,7 +12,7 @@ const createNewBeerComment = async ({
rating,
beerPostId,
userId,
}: z.infer<typeof CreateBeerCommentWithUserSchema>) => {
}: z.infer<typeof CreateNewBeerCommentServiceSchema>) => {
return DBClient.instance.beerComment.create({
data: {
content,

22
services/BeerComment/getAllBeerComments.ts
View File

@@ -1,5 +1,5 @@
import DBClient from '@/prisma/DBClient';
import BeerPostQueryResult from '../BeerPost/schema/BeerPostQueryResult';
import { BeerPostQueryResult } from '@/services/BeerPost/schema/BeerPostQueryResult';
import { BeerCommentQueryResultArrayT } from './schema/BeerCommentQueryResult';
const getAllBeerComments = async (
@@ -9,27 +9,17 @@ const getAllBeerComments = async (
const skip = (pageNum - 1) * pageSize;
const beerComments: BeerCommentQueryResultArrayT =
await DBClient.instance.beerComment.findMany({
where: {
beerPostId: id,
},
skip,
take: pageSize,
where: { beerPostId: id },
select: {
id: true,
content: true,
rating: true,
createdAt: true,
postedBy: {
select: {
id: true,
username: true,
createdAt: true,
},
},
postedBy: { select: { id: true, username: true, createdAt: true } },
},
orderBy: {
createdAt: 'desc',
},
skip,
take: pageSize,
orderBy: { createdAt: 'desc' },
});
return beerComments;
};

2
services/BeerComment/schema/BeerCommentQueryResult.ts
View File

@@ -4,7 +4,7 @@ export const BeerCommentQueryResult = z.object({
id: z.string().uuid(),
content: z.string().min(1).max(300),
rating: z.number().int().min(1).max(5),
createdAt: z.date().or(z.string().datetime()),
createdAt: z.coerce.date(),
postedBy: z.object({
id: z.string().uuid(),
username: z.string().min(1).max(50),

11
services/BeerComment/schema/CreateBeerCommentValidationSchema.ts
View File

@@ -3,20 +3,13 @@ import { z } from 'zod';
const BeerCommentValidationSchema = z.object({
content: z
.string()
.min(1, {
message: 'Comment must not be empty.',
})
.max(300, {
message: 'Comment must be less than 300 characters.',
}),
.min(1, { message: 'Comment must not be empty.' })
.max(300, { message: 'Comment must be less than 300 characters.' }),
rating: z
.number()
.int()
.min(1, { message: 'Rating must be greater than 1.' })
.max(5, { message: 'Rating must be less than 5.' }),
beerPostId: z.string().uuid({
message: 'Beer post ID must be a valid UUID.',
}),
});
export default BeerCommentValidationSchema;

19
services/BeerPost/createNewBeerPost.ts
View File

@@ -1,8 +1,9 @@
import DBClient from '@/prisma/DBClient';
import { z } from 'zod';
import BeerPostValidationSchema from './schema/CreateBeerPostValidationSchema';
import { BeerPostQueryResult } from './schema/BeerPostQueryResult';
import CreateBeerPostValidationSchema from './schema/CreateBeerPostValidationSchema';
const CreateBeerPostWithUserSchema = BeerPostValidationSchema.extend({
const CreateBeerPostWithUserSchema = CreateBeerPostValidationSchema.extend({
userId: z.string().uuid(),
});
@@ -15,7 +16,7 @@ const createNewBeerPost = async ({
breweryId,
userId,
}: z.infer<typeof CreateBeerPostWithUserSchema>) => {
const newBeerPost = await DBClient.instance.beerPost.create({
const newBeerPost: BeerPostQueryResult = await DBClient.instance.beerPost.create({
data: {
name,
description,
@@ -25,6 +26,18 @@ const createNewBeerPost = async ({
postedBy: { connect: { id: userId } },
brewery: { connect: { id: breweryId } },
},
select: {
id: true,
name: true,
description: true,
abv: true,
ibu: true,
createdAt: true,
beerImages: { select: { id: true, path: true, caption: true, alt: true } },
brewery: { select: { id: true, name: true } },
type: { select: { id: true, name: true } },
postedBy: { select: { id: true, username: true } },
},
});
return newBeerPost;
};

31
services/BeerPost/getAllBeerPosts.ts
View File

@@ -1,5 +1,5 @@
import DBClient from '@/prisma/DBClient';
import BeerPostQueryResult from './schema/BeerPostQueryResult';
import { BeerPostQueryResult } from '@/services/BeerPost/schema/BeerPostQueryResult';
const prisma = DBClient.instance;
@@ -10,35 +10,14 @@ const getAllBeerPosts = async (pageNum: number, pageSize: number) => {
select: {
id: true,
name: true,
type: {
select: {
name: true,
id: true,
},
},
ibu: true,
abv: true,
brewery: {
select: {
name: true,
id: true,
},
},
description: true,
createdAt: true,
postedBy: {
select: {
id: true,
username: true,
},
},
beerImages: {
select: {
url: true,
id: true,
alt: true,
},
},
type: { select: { name: true, id: true } },
brewery: { select: { name: true, id: true } },
postedBy: { select: { id: true, username: true } },
beerImages: { select: { path: true, caption: true, id: true, alt: true } },
},
take: pageSize,
skip,

49
services/BeerPost/getBeerPostById.ts
View File

@@ -1,60 +1,23 @@
import DBClient from '@/prisma/DBClient';
import BeerPostQueryResult from './schema/BeerPostQueryResult';
import { BeerPostQueryResult } from '@/services/BeerPost/schema/BeerPostQueryResult';
const prisma = DBClient.instance;
const getBeerPostById = async (id: string) => {
const beerPost: BeerPostQueryResult | null = await prisma.beerPost.findFirst({
select: {
beerComments: {
select: {
id: true,
content: true,
createdAt: true,
postedBy: {
select: {
username: true,
id: true,
},
},
rating: true,
},
},
id: true,
name: true,
brewery: {
select: {
name: true,
id: true,
},
},
ibu: true,
abv: true,
type: {
select: {
name: true,
id: true,
},
},
beerImages: {
select: {
alt: true,
url: true,
id: true,
},
},
createdAt: true,
description: true,
postedBy: {
select: {
username: true,
id: true,
},
},
},
where: {
id,
postedBy: { select: { username: true, id: true } },
brewery: { select: { name: true, id: true } },
type: { select: { name: true, id: true } },
beerImages: { select: { alt: true, path: true, caption: true, id: true } },
},
where: { id },
});
return beerPost;

4
services/BeerPost/getBeerRecommendations.ts
View File

@@ -1,5 +1,5 @@
import DBClient from '@/prisma/DBClient';
import BeerPostQueryResult from './schema/BeerPostQueryResult';
import { BeerPostQueryResult } from '@/services/BeerPost/schema/BeerPostQueryResult';
const getBeerRecommendations = async (
beerPost: Pick<BeerPostQueryResult, 'type' | 'brewery' | 'id'>,
@@ -10,7 +10,7 @@ const getBeerRecommendations = async (
NOT: { id: beerPost.id },
},
include: {
beerImages: { select: { id: true, url: true, alt: true } },
beerImages: { select: { id: true, path: true, caption: true, alt: true } },
brewery: { select: { id: true, name: true } },
},
});

59
services/BeerPost/schema/BeerPostQueryResult.ts
View File

@@ -1,27 +1,36 @@
export default interface BeerPostQueryResult {
id: string;
name: string;
brewery: {
id: string;
name: string;
};
description: string;
beerImages: {
url: string;
id: string;
alt: string;
}[];
import { z } from 'zod';
ibu: number;
abv: number;
type: {
id: string;
name: string;
};
postedBy: {
id: string;
username: string;
};
export const beerPostQueryResultSchema = z.object({
id: z.string(),
name: z.string(),
brewery: z.object({
id: z.string(),
name: z.string(),
}),
description: z.string(),
beerImages: z.array(
z.object({
path: z.string(),
caption: z.string(),
id: z.string(),
alt: z.string(),
}),
),
ibu: z.number(),
abv: z.number(),
type: z.object({
id: z.string(),
name: z.string(),
}),
postedBy: z.object({
id: z.string(),
username: z.string(),
}),
createdAt: z.coerce.date(),
});
createdAt: Date;
}
export const beerPostQueryResultArraySchema = z.array(beerPostQueryResultSchema);
export type BeerPostQueryResult = z.infer<typeof beerPostQueryResultSchema>;
export type BeerPostQueryResultArray = z.infer<typeof beerPostQueryResultArraySchema>;

4
services/BeerPost/schema/CreateBeerPostValidationSchema.ts
View File

@@ -1,6 +1,6 @@
import { z } from 'zod';
const BeerPostValidationSchema = z.object({
const CreateBeerPostValidationSchema = z.object({
name: z
.string({
required_error: 'Beer name is required.',
@@ -40,4 +40,4 @@ const BeerPostValidationSchema = z.object({
.uuid({ message: 'Invalid brewery id.' }),
});
export default BeerPostValidationSchema;
export default CreateBeerPostValidationSchema;

2
services/BeerPostLike/createBeerPostLike.ts
View File

@@ -12,7 +12,7 @@ const createBeerPostLike = async ({
return DBClient.instance.beerPostLike.create({
data: {
beerPost: { connect: { id } },
user: { connect: { id: user.id } },
likedBy: { connect: { id: user.id } },
},
});
};

4
services/BeerPostLike/findBeerPostLikeById.ts
View File

@@ -1,6 +1,6 @@
import DBClient from '@/prisma/DBClient';
const findBeerPostLikeById = async (id: string) =>
DBClient.instance.beerPostLike.findUnique({ where: { id } });
const findBeerPostLikeById = async (beerPostId: string, likedById: string) =>
DBClient.instance.beerPostLike.findFirst({ where: { beerPostId, likedById } });
export default findBeerPostLikeById;

78
services/User/schema/CreateUserValidationSchema.ts
View File

@@ -2,36 +2,52 @@ import sub from 'date-fns/sub';
import { z } from 'zod';
const minimumDateOfBirth = sub(new Date(), { years: 19 });
const CreateUserValidationSchema = z.object({
email: z.string().email({ message: 'Email must be a valid email address.' }),
// use special characters, numbers, and uppercase letters
password: z
.string()
.min(8, { message: 'Password must be at least 8 characters.' })
.refine((password) => /[A-Z]/.test(password), {
message: 'Password must contain at least one uppercase letter.',
})
.refine((password) => /[0-9]/.test(password), {
message: 'Password must contain at least one number.',
})
.refine((password) => /[^a-zA-Z0-9]/.test(password), {
message: 'Password must contain at least one special character.',
}),
firstName: z.string().min(1, { message: 'First name must not be empty.' }),
lastName: z.string().min(1, { message: 'Last name must not be empty.' }),
username: z
.string()
.min(1, { message: 'Username must not be empty.' })
.max(20, { message: 'Username must be less than 20 characters.' }),
dateOfBirth: z.string().refine(
(dateOfBirth) => {
const parsedDateOfBirth = new Date(dateOfBirth);
return parsedDateOfBirth <= minimumDateOfBirth;
},
{ message: 'You must be at least 19 years old to register.' },
),
});
const CreateUserValidationSchema = z
.object({
email: z.string().email({ message: 'Email must be a valid email address.' }),
// use special characters, numbers, and uppercase letters
password: z
.string()
.min(8, { message: 'Password must be at least 8 characters.' })
.refine((password) => /[A-Z]/.test(password), {
message: 'Password must contain at least one uppercase letter.',
})
.refine((password) => /[0-9]/.test(password), {
message: 'Password must contain at least one number.',
})
.refine((password) => /[^a-zA-Z0-9]/.test(password), {
message: 'Password must contain at least one special character.',
}),
confirmPassword: z.string(),
firstName: z
.string()
.min(1, { message: 'First name must not be empty.' })
.max(20, { message: 'First name must be less than 20 characters.' })
.refine((firstName) => /^[a-zA-Z]+$/.test(firstName), {
message: 'First name must only contain letters.',
}),
lastName: z
.string()
.min(1, { message: 'Last name must not be empty.' })
.max(20, { message: 'Last name must be less than 20 characters.' })
.refine((lastName) => /^[a-zA-Z]+$/.test(lastName), {
message: 'Last name must only contain letters.',
}),
username: z
.string()
.min(1, { message: 'Username must not be empty.' })
.max(20, { message: 'Username must be less than 20 characters.' }),
dateOfBirth: z.string().refine(
(dateOfBirth) => {
const parsedDateOfBirth = new Date(dateOfBirth);
return parsedDateOfBirth <= minimumDateOfBirth;
},
{ message: 'You must be at least 19 years old to register.' },
),
})
.refine((data) => data.password === data.confirmPassword, {
message: 'Passwords do not match.',
path: ['confirmPassword'],
});
export default CreateUserValidationSchema;

6
services/User/schema/GetUserSchema.ts
View File

@@ -3,12 +3,12 @@ import { z } from 'zod';
const GetUserSchema = z.object({
id: z.string().uuid(),
username: z.string(),
createdAt: z.date().or(z.string()),
updatedAt: z.date().or(z.string()).optional(),
createdAt: z.coerce.date(),
updatedAt: z.coerce.date().optional(),
email: z.string().email(),
firstName: z.string(),
lastName: z.string(),
dateOfBirth: z.date().or(z.string()),
dateOfBirth: z.coerce.date(),
});
export default GetUserSchema;