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

Refactor: begin reorganizing services dir.

Browse Source 
- Renamed files and directories to reflect the new structure
- Moved comment-related services to the 'comments' directory
- Moved image-related services to the 'images' directory
- Moved like-related services to the 'likes' directory
- Moved post-related services to the 'posts' directory
- Moved user-related services to the 'users' directory
This commit is contained in:
Aaron William Po
2023-12-10 14:11:49 -05:00
parent 830e9dc845
commit fd641c36ab
163 changed files with 177 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/api/beers/[id]/index.ts
View File

@@ -13,7 +13,7 @@ import {
deleteBeerPost,
} from '@/controllers/posts/beerPosts';
import EditBeerPostValidationSchema from '@/services/BeerPost/schema/EditBeerPostValidationSchema';
import EditBeerPostValidationSchema from '@/services/posts/BeerPost/schema/EditBeerPostValidationSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';

2
src/pages/api/beers/create.ts
View File

@@ -1,7 +1,7 @@
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import { createRouter } from 'next-connect';
import CreateBeerPostValidationSchema from '@/services/BeerPost/schema/CreateBeerPostValidationSchema';
import CreateBeerPostValidationSchema from '@/services/posts/BeerPost/schema/CreateBeerPostValidationSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';
import { z } from 'zod';

2
src/pages/api/beers/search.ts
View File

@@ -5,7 +5,7 @@ import { NextApiRequest, NextApiResponse } from 'next';
import { createRouter } from 'next-connect';
import { z } from 'zod';
import DBClient from '@/prisma/DBClient';
import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
const SearchSchema = z.object({
search: z.string().min(1),

2
src/pages/api/beers/styles/create.ts
View File

@@ -2,7 +2,7 @@ import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import { createBeerStyle } from '@/controllers/posts/beerStyles';
import { CreateBeerStyleRequest } from '@/controllers/posts/beerStyles/types';
import CreateBeerStyleValidationSchema from '@/services/BeerStyles/schema/CreateBeerStyleValidationSchema';
import CreateBeerStyleValidationSchema from '@/services/posts/BeerStyles/schema/CreateBeerStyleValidationSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';
import { createRouter } from 'next-connect';

4
src/pages/api/breweries/[id]/index.ts
View File

@@ -7,8 +7,8 @@ import { createRouter, NextHandler } from 'next-connect';
import { z } from 'zod';
import ServerError from '@/config/util/ServerError';
import DBClient from '@/prisma/DBClient';
import getBreweryPostById from '@/services/BreweryPost/getBreweryPostById';
import EditBreweryPostValidationSchema from '@/services/BreweryPost/schema/EditBreweryPostValidationSchema';
import getBreweryPostById from '@/services/posts/BreweryPost/getBreweryPostById';
import EditBreweryPostValidationSchema from '@/services/posts/BreweryPost/schema/EditBreweryPostValidationSchema';
interface BreweryPostRequest extends UserExtendedNextApiRequest {
query: { id: string };

4
src/pages/api/breweries/create.ts
View File

@@ -5,8 +5,8 @@ import { NextApiResponse } from 'next';
import { z } from 'zod';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import CreateBreweryPostSchema from '@/services/BreweryPost/schema/CreateBreweryPostSchema';
import createNewBreweryPost from '@/services/BreweryPost/createNewBreweryPost';
import CreateBreweryPostSchema from '@/services/posts/BreweryPost/schema/CreateBreweryPostSchema';
import createNewBreweryPost from '@/services/posts/BreweryPost/createNewBreweryPost';
import geocode from '@/config/mapbox/geocoder';
import ServerError from '@/config/util/ServerError';
import DBClient from '@/prisma/DBClient';

2
src/pages/api/breweries/map/index.ts
View File

@@ -1,6 +1,6 @@
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import DBClient from '@/prisma/DBClient';
import BreweryPostMapQueryResult from '@/services/BreweryPost/schema/BreweryPostMapQueryResult';
import BreweryPostMapQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostMapQueryResult';
import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';

2
src/pages/api/users/[id]/index.ts
View File

@@ -4,7 +4,7 @@ import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import { editUserInfo, deleteAccount } from '@/controllers/users/auth';
import { checkIfUserCanEditUser } from '@/controllers/users/profile';
import { EditUserRequest } from '@/controllers/users/profile/types';
import EditUserSchema from '@/services/User/schema/EditUserSchema';
import EditUserSchema from '@/services/users/User/schema/EditUserSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';

2
src/pages/api/users/confirm.ts
View File

@@ -9,7 +9,7 @@ import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import { TokenValidationRequest } from '@/controllers/users/auth/types';
import { confirmUser } from '@/controllers/users/auth';
import TokenValidationSchema from '@/services/User/schema/TokenValidationSchema';
import TokenValidationSchema from '@/services/users/User/schema/TokenValidationSchema';
const router = createRouter<
TokenValidationRequest,

2
src/pages/api/users/edit-password.ts
View File

@@ -3,7 +3,7 @@ import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import { updatePassword } from '@/controllers/users/auth';
import { UpdatePasswordRequest } from '@/controllers/users/auth/types';
import { UpdatePasswordSchema } from '@/services/User/schema/CreateUserValidationSchemas';
import { UpdatePasswordSchema } from '@/services/users/User/schema/CreateUserValidationSchemas';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';
import { createRouter } from 'next-connect';

2
src/pages/api/users/login.ts
View File

@@ -3,7 +3,7 @@ import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import { createRouter } from 'next-connect';
import { NextApiResponse } from 'next';
import { z } from 'zod';
import LoginValidationSchema from '@/services/User/schema/LoginValidationSchema';
import LoginValidationSchema from '@/services/users/User/schema/LoginValidationSchema';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import { authenticateUser, loginUser } from '@/controllers/users/auth';

2
src/pages/api/users/register.ts
View File

@@ -1,7 +1,7 @@
import { NextApiResponse } from 'next';
import { z } from 'zod';
import { createRouter } from 'next-connect';
import { CreateUserValidationSchema } from '@/services/User/schema/CreateUserValidationSchemas';
import { CreateUserValidationSchema } from '@/services/users/User/schema/CreateUserValidationSchemas';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';

4
src/pages/beers/[id]/edit.tsx
View File

@@ -3,8 +3,8 @@ import Head from 'next/head';
import React from 'react';
import withPageAuthRequired from '@/util/withPageAuthRequired';
import getBeerPostById from '@/services/BeerPost/getBeerPostById';
import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
import getBeerPostById from '@/services/posts/BeerPost/getBeerPostById';
import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
import EditBeerPostForm from '@/components/EditBeerPostForm';
import FormPageLayout from '@/components/ui/forms/FormPageLayout';
import { BiBeer } from 'react-icons/bi';

4
src/pages/beers/[id]/index.tsx
View File

@@ -1,8 +1,8 @@
import { NextPage, GetServerSideProps } from 'next';
import Head from 'next/head';
import getBeerPostById from '@/services/BeerPost/getBeerPostById';
import getBeerPostById from '@/services/posts/BeerPost/getBeerPostById';
import BeerPostQueryResult from '@/services/BeerPost/schema/BeerPostQueryResult';
import BeerPostQueryResult from '@/services/posts/BeerPost/schema/BeerPostQueryResult';
import { z } from 'zod';

4
src/pages/beers/styles/[id]/index.tsx
View File

@@ -5,9 +5,9 @@ import { z } from 'zod';
import useMediaQuery from '@/hooks/utilities/useMediaQuery';
import { Tab } from '@headlessui/react';
import getBeerStyleById from '@/services/BeerStyles/getBeerStyleById';
import getBeerStyleById from '@/services/posts/BeerStyles/getBeerStyleById';
import BeerStyleHeader from '@/components/BeerStyleById/BeerStyleHeader';
import BeerStyleQueryResult from '@/services/BeerStyles/schema/BeerStyleQueryResult';
import BeerStyleQueryResult from '@/services/posts/BeerStyles/schema/BeerStyleQueryResult';
import BeerStyleCommentSection from '@/components/BeerStyleById/BeerStyleCommentSection';
import BeerStyleBeerSection from '@/components/BeerStyleById/BeerStyleBeerSection';

4
src/pages/breweries/[id]/beers/create.tsx
View File

@@ -3,12 +3,12 @@ import FormPageLayout from '@/components/ui/forms/FormPageLayout';
import withPageAuthRequired from '@/util/withPageAuthRequired';
import DBClient from '@/prisma/DBClient';
import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
import { BeerStyle } from '@prisma/client';
import { NextPage } from 'next';
import { BiBeer } from 'react-icons/bi';
import { z } from 'zod';
import getBreweryPostById from '@/services/BreweryPost/getBreweryPostById';
import getBreweryPostById from '@/services/posts/BreweryPost/getBreweryPostById';
interface CreateBeerPageProps {
brewery: z.infer<typeof BreweryPostQueryResult>;

6
src/pages/breweries/[id]/edit.tsx
View File

@@ -5,9 +5,9 @@ import FormPageLayout from '@/components/ui/forms/FormPageLayout';
import FormSegment from '@/components/ui/forms/FormSegment';
import FormTextArea from '@/components/ui/forms/FormTextArea';
import FormTextInput from '@/components/ui/forms/FormTextInput';
import getBreweryPostById from '@/services/BreweryPost/getBreweryPostById';
import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
import EditBreweryPostValidationSchema from '@/services/BreweryPost/schema/EditBreweryPostValidationSchema';
import getBreweryPostById from '@/services/posts/BreweryPost/getBreweryPostById';
import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
import EditBreweryPostValidationSchema from '@/services/posts/BreweryPost/schema/EditBreweryPostValidationSchema';
import withPageAuthRequired from '@/util/withPageAuthRequired';
import { zodResolver } from '@hookform/resolvers/zod';
import { NextPage } from 'next';

4
src/pages/breweries/[id]/index.tsx
View File

@@ -1,5 +1,5 @@
import getBreweryPostById from '@/services/BreweryPost/getBreweryPostById';
import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
import getBreweryPostById from '@/services/posts/BreweryPost/getBreweryPostById';
import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
import { GetServerSideProps, NextPage } from 'next';
import { z } from 'zod';

2
src/pages/breweries/index.tsx
View File

@@ -3,7 +3,7 @@ import LoadingCard from '@/components/ui/LoadingCard';
import Spinner from '@/components/ui/Spinner';
import UserContext from '@/contexts/UserContext';
import useBreweryPosts from '@/hooks/data-fetching/brewery-posts/useBreweryPosts';
import BreweryPostQueryResult from '@/services/BreweryPost/schema/BreweryPostQueryResult';
import BreweryPostQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostQueryResult';
import { NextPage } from 'next';
import Head from 'next/head';
import { useContext, MutableRefObject, useRef } from 'react';

2
src/pages/breweries/map.tsx
View File

@@ -7,7 +7,7 @@ import LocationMarker from '@/components/ui/LocationMarker';
import Link from 'next/link';
import Head from 'next/head';
import useGeolocation from '@/hooks/utilities/useGeolocation';
import BreweryPostMapQueryResult from '@/services/BreweryPost/schema/BreweryPostMapQueryResult';
import BreweryPostMapQueryResult from '@/services/posts/BreweryPost/schema/BreweryPostMapQueryResult';
import { z } from 'zod';
import useBreweryMapPagePosts from '@/hooks/data-fetching/brewery-posts/useBreweryMapPagePosts';
import ControlPanel from '@/components/ui/maps/ControlPanel';

4
src/pages/users/[id].tsx
View File

@@ -1,6 +1,6 @@
import useMediaQuery from '@/hooks/utilities/useMediaQuery';
import findUserById from '@/services/User/findUserById';
import GetUserSchema from '@/services/User/schema/GetUserSchema';
import findUserById from '@/services/users/User/findUserById';
import GetUserSchema from '@/services/users/User/schema/GetUserSchema';
import Head from 'next/head';
import { FC } from 'react';

2
src/pages/users/account/edit-profile.tsx
View File

@@ -21,7 +21,7 @@ import UpdateProfileForm from '@/components/Account/UpdateProfileForm';
import useGetUsersFollowedByUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowedByUser';
import useGetUsersFollowingUser from '@/hooks/data-fetching/user-follows/useGetUsersFollowingUser';
import UpdateProfileSchema from '@/services/User/schema/UpdateProfileSchema';
import UpdateProfileSchema from '@/services/users/User/schema/UpdateProfileSchema';
import sendUpdateUserAvatarRequest from '@/requests/Account/sendUpdateUserAvatarRequest';
import sendUpdateUserProfileRequest from '@/requests/Account/sendUpdateUserProfileRequest';
import Spinner from '@/components/ui/Spinner';

2
src/pages/users/forgot-password.tsx
View File

@@ -4,7 +4,7 @@ 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 { BaseCreateUserSchema } from '@/services/User/schema/CreateUserValidationSchemas';
import { BaseCreateUserSchema } from '@/services/users/User/schema/CreateUserValidationSchemas';
import createErrorToast from '@/util/createErrorToast';
import { zodResolver } from '@hookform/resolvers/zod';
import { NextPage } from 'next';

2
src/pages/users/reset-password.tsx
View File

@@ -1,7 +1,7 @@
import { setLoginSession } from '@/config/auth/session';
import { verifyResetPasswordToken } from '@/config/jwt';
import ServerError from '@/config/util/ServerError';
import findUserById from '@/services/User/findUserById';
import findUserById from '@/services/users/User/findUserById';
import { GetServerSideProps, NextApiResponse, NextPage } from 'next';