diff --git a/.prettierrc b/.prettierrc index d5020b0..5e0624c 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,14 +1,14 @@ { - "arrowParens": "always", - "bracketSpacing": false, - "jsxSingleQuote": false, - "printWidth": 90, - "proseWrap": "always", - "quoteProps": "as-needed", - "semi": true, - "singleQuote": true, - "tabWidth": 2, - "trailingComma": "all", - "useTabs": false, - "plugins": ["prettier-plugin-jsdoc"] + "arrowParens": "always", + "bracketSpacing": true, + "jsxSingleQuote": false, + "printWidth": 90, + "proseWrap": "always", + "quoteProps": "as-needed", + "semi": true, + "singleQuote": true, + "tabWidth": 2, + "trailingComma": "all", + "useTabs": false, + "plugins": ["prettier-plugin-jsdoc"] } diff --git a/src/components/BeerById/LoadingComponent.tsx b/src/components/BeerById/LoadingComponent.tsx index 7e953f0..fc2dca4 100644 --- a/src/components/BeerById/LoadingComponent.tsx +++ b/src/components/BeerById/LoadingComponent.tsx @@ -1,4 +1,4 @@ -import {FC} from 'react'; +import { FC } from 'react'; import Spinner from '../ui/Spinner'; import CommentLoadingCardBody from '../BeerBreweryComments/CommentLoadingCardBody'; @@ -6,10 +6,10 @@ interface LoadingComponentProps { length: number; } -const LoadingComponent: FC = ({length}) => { +const LoadingComponent: FC = ({ length }) => { return ( <> - {Array.from({length}).map((_, i) => ( + {Array.from({ length }).map((_, i) => ( ))}
diff --git a/src/components/ui/CommentsComponent.tsx b/src/components/ui/CommentsComponent.tsx index 3555c7a..b680b8d 100644 --- a/src/components/ui/CommentsComponent.tsx +++ b/src/components/ui/CommentsComponent.tsx @@ -1,7 +1,7 @@ -import {FC, MutableRefObject} from 'react'; -import {FaArrowUp} from 'react-icons/fa'; +import { FC, MutableRefObject } from 'react'; +import { FaArrowUp } from 'react-icons/fa'; -import {useInView} from 'react-intersection-observer'; +import { useInView } from 'react-intersection-observer'; import useBeerPostComments from '@/hooks/data-fetching/beer-comments/useBeerPostComments'; @@ -41,7 +41,7 @@ const CommentsComponent: FC = ({ size, mutate, }) => { - const {ref: penultimateCommentRef} = useInView({ + const { ref: penultimateCommentRef } = useInView({ /** * When the second last comment comes into view, call setSize from useBeerPostComments * to load more comments. diff --git a/src/hooks/data-fetching/beer-posts/useBeerPosts.ts b/src/hooks/data-fetching/beer-posts/useBeerPosts.ts index 4cc28a2..7ec1f4b 100644 --- a/src/hooks/data-fetching/beer-posts/useBeerPosts.ts +++ b/src/hooks/data-fetching/beer-posts/useBeerPosts.ts @@ -38,7 +38,7 @@ const useBeerPosts = ({ pageSize }: { pageSize: number }) => { }; const { data, error, isLoading, setSize, size } = useSWRInfinite( - (index) => `/api/beers?pageNum=${index + 1}&pageSize=${pageSize}`, + (index) => `/api/beers?page_num=${index + 1}&page_size=${pageSize}`, fetcher, ); diff --git a/src/hooks/data-fetching/brewery-posts/useBreweryPosts.ts b/src/hooks/data-fetching/brewery-posts/useBreweryPosts.ts index ed73414..9f12c06 100644 --- a/src/hooks/data-fetching/brewery-posts/useBreweryPosts.ts +++ b/src/hooks/data-fetching/brewery-posts/useBreweryPosts.ts @@ -38,7 +38,7 @@ const useBreweryPosts = ({ pageSize }: { pageSize: number }) => { }; const { data, error, isLoading, setSize, size } = useSWRInfinite( - (index) => `/api/breweries?pageNum=${index + 1}&pageSize=${pageSize}`, + (index) => `/api/breweries?page_num=${index + 1}&page_size=${pageSize}`, fetcher, ); diff --git a/src/pages/api/beers/index.ts b/src/pages/api/beers/index.ts index 6d9c3c8..48c1995 100644 --- a/src/pages/api/beers/index.ts +++ b/src/pages/api/beers/index.ts @@ -9,8 +9,8 @@ import { z } from 'zod'; interface GetBeerPostsRequest extends NextApiRequest { query: { - pageNum: string; - pageSize: string; + page_num: string; + page_size: string; }; } @@ -18,8 +18,8 @@ const getBeerPosts = async ( req: GetBeerPostsRequest, res: NextApiResponse>, ) => { - const pageNum = parseInt(req.query.pageNum, 10); - const pageSize = parseInt(req.query.pageSize, 10); + const pageNum = parseInt(req.query.page_num, 10); + const pageSize = parseInt(req.query.page_size, 10); const beerPosts = await getAllBeerPosts(pageNum, pageSize); const beerPostCount = await DBClient.instance.beerPost.count(); @@ -42,8 +42,8 @@ const router = createRouter< router.get( validateRequest({ querySchema: z.object({ - pageNum: z.string().regex(/^\d+$/), - pageSize: z.string().regex(/^\d+$/), + page_num: z.string().regex(/^\d+$/), + page_size: z.string().regex(/^\d+$/), }), }), getBeerPosts, diff --git a/src/pages/api/breweries/index.ts b/src/pages/api/breweries/index.ts index bd1d183..5f2f2aa 100644 --- a/src/pages/api/breweries/index.ts +++ b/src/pages/api/breweries/index.ts @@ -9,8 +9,8 @@ import { z } from 'zod'; interface GetBreweryPostsRequest extends NextApiRequest { query: { - pageNum: string; - pageSize: string; + page_num: string; + page_size: string; }; } @@ -18,8 +18,8 @@ const getBreweryPosts = async ( req: GetBreweryPostsRequest, res: NextApiResponse>, ) => { - const pageNum = parseInt(req.query.pageNum, 10); - const pageSize = parseInt(req.query.pageSize, 10); + const pageNum = parseInt(req.query.page_num, 10); + const pageSize = parseInt(req.query.page_size, 10); const breweryPosts = await getAllBreweryPosts(pageNum, pageSize); const breweryPostCount = await DBClient.instance.breweryPost.count(); @@ -42,8 +42,8 @@ const router = createRouter< router.get( validateRequest({ querySchema: z.object({ - pageNum: z.string().regex(/^\d+$/), - pageSize: z.string().regex(/^\d+$/), + page_num: z.string().regex(/^\d+$/), + page_size: z.string().regex(/^\d+$/), }), }), getBreweryPosts,