From dbd342fd3eacc27d7864dcb5e4bf6f977dd29a41 Mon Sep 17 00:00:00 2001 From: Aaron William Po Date: Thu, 9 Feb 2023 04:03:11 -0500 Subject: [PATCH] Refactor codebase, format --- .prettierrc | 2 +- components/BeerById/BeerInfoHeader.tsx | 17 +- components/BeerById/BeerRecommendations.tsx | 11 +- components/Login/LoginForm.tsx | 4 +- components/ui/Navbar.tsx | 4 +- components/ui/forms/Button.tsx | 2 +- config/auth/localStrat.ts | 2 +- config/auth/middleware/getCurrentUser.ts | 2 +- config/auth/types.ts | 2 +- config/zod/middleware/validateRequest.ts | 2 +- contexts/userContext.ts | 2 +- hooks/useUser.ts | 2 +- package-lock.json | 1104 ++++++----------- package.json | 2 +- pages/api/beers/[id]/like/index.ts | 52 +- pages/api/beers/[id]/like/is-liked.ts | 12 +- pages/api/users/login.ts | 2 +- pages/api/users/register.ts | 8 +- .../migrations/20230208021759_/migration.sql | 16 - .../migrations/20230209085224_/migration.sql | 16 + prisma/schema.prisma | 18 +- prisma/seed/create/createNewBeerPostLikes.ts | 6 +- services/BeerComment/createNewBeerComment.ts | 1 + services/BeerPostLike/createBeerPostLike.ts | 20 + services/BeerPostLike/findBeerPostLikeById.ts | 6 + .../BeerPostLike/removeBeerPostLikeById.ts | 11 + 26 files changed, 517 insertions(+), 809 deletions(-) delete mode 100644 prisma/migrations/20230208021759_/migration.sql create mode 100644 prisma/migrations/20230209085224_/migration.sql create mode 100644 services/BeerPostLike/createBeerPostLike.ts create mode 100644 services/BeerPostLike/findBeerPostLikeById.ts create mode 100644 services/BeerPostLike/removeBeerPostLikeById.ts diff --git a/.prettierrc b/.prettierrc index 136d6b5..ad4d5eb 100644 --- a/.prettierrc +++ b/.prettierrc @@ -2,6 +2,6 @@ "semi": true, "trailingComma": "all", "singleQuote": true, - "printWidth": 80, + "printWidth": 90, "plugins": ["prettier-plugin-jsdoc"] } diff --git a/components/BeerById/BeerInfoHeader.tsx b/components/BeerById/BeerInfoHeader.tsx index 0a167a7..7d8b7e9 100644 --- a/components/BeerById/BeerInfoHeader.tsx +++ b/components/BeerById/BeerInfoHeader.tsx @@ -9,9 +9,7 @@ import UserContext from '@/contexts/userContext'; import sendCheckIfUserLikesBeerPostRequest from '@/requests/sendCheckIfUserLikesBeerPostRequest'; import sendLikeRequest from '../../requests/sendLikeRequest'; -const BeerInfoHeader: FC<{ beerPost: BeerPostQueryResult }> = ({ - beerPost, -}) => { +const BeerInfoHeader: FC<{ beerPost: BeerPostQueryResult }> = ({ beerPost }) => { const createdAtDate = new Date(beerPost.createdAt); const [timeDistance, setTimeDistance] = useState(''); const { user } = useContext(UserContext); @@ -36,9 +34,7 @@ const BeerInfoHeader: FC<{ beerPost: BeerPostQueryResult }> = ({ }, [user, beerPost.id]); useEffect(() => { - setTimeDistance( - formatDistanceStrict(new Date(beerPost.createdAt), new Date()), - ); + setTimeDistance(formatDistanceStrict(new Date(beerPost.createdAt), new Date())); }, [beerPost.createdAt]); const handleLike = async () => { @@ -66,10 +62,7 @@ const BeerInfoHeader: FC<{ beerPost: BeerPostQueryResult }> = ({

posted by{' '} - + {beerPost.postedBy.username}{' '} = ({
- - {beerPost.abv}% ABV - + {beerPost.abv}% ABV {beerPost.ibu} IBU
diff --git a/components/BeerById/BeerRecommendations.tsx b/components/BeerById/BeerRecommendations.tsx index 64119b0..1bda780 100644 --- a/components/BeerById/BeerRecommendations.tsx +++ b/components/BeerById/BeerRecommendations.tsx @@ -14,17 +14,10 @@ const BeerRecommendations: FunctionComponent = ({ {beerRecommendations.map((beerPost) => (
- +

{beerPost.name}

- +

{beerPost.brewery.name}

diff --git a/components/Login/LoginForm.tsx b/components/Login/LoginForm.tsx index 12fb75b..08288df 100644 --- a/components/Login/LoginForm.tsx +++ b/components/Login/LoginForm.tsx @@ -1,5 +1,5 @@ import sendLoginUserRequest from '@/requests/sendLoginUserRequest'; -import LoginValidationSchema from '@/services/user/schema/LoginValidationSchema'; +import LoginValidationSchema from '@/services/User/schema/LoginValidationSchema'; import { zodResolver } from '@hookform/resolvers/zod'; import { useRouter } from 'next/router'; import { useForm, SubmitHandler } from 'react-hook-form'; @@ -66,7 +66,7 @@ const LoginForm = () => {
-
diff --git a/components/ui/Navbar.tsx b/components/ui/Navbar.tsx index 51a82d3..c712b61 100644 --- a/components/ui/Navbar.tsx +++ b/components/ui/Navbar.tsx @@ -26,7 +26,7 @@ const Navbar = () => { return (