diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b0f9a68..9f5ef4e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -29,4 +29,4 @@ jobs: uses: wearerequired/lint-action@v2 with: eslint: true - prettier: true \ No newline at end of file + prettier: true diff --git a/package.json b/package.json index 77d3520..62e2b27 100644 --- a/package.json +++ b/package.json @@ -40,5 +40,4 @@ "prettier --write" ] } - } diff --git a/src/pages/api/lawProblem.ts b/src/pages/api/lawProblem.ts index 9c4219b..0b26a62 100644 --- a/src/pages/api/lawProblem.ts +++ b/src/pages/api/lawProblem.ts @@ -1,10 +1,10 @@ -import type { NextApiRequest, NextApiResponse } from 'next'; +import type { NextApiRequest, NextApiResponse } from "next"; import { getRandomLawProblem } from "../../server/mongodb/actions/lawProblem"; import requestWrapper from "../../server/utils/middleware"; const handler = async (req: NextApiRequest, res: NextApiResponse) => { const randomProblem = await getRandomLawProblem(); res.status(200).json({ randomProblem }); -} +}; export default requestWrapper(handler, "GET"); diff --git a/src/pages/api/mathProblem.ts b/src/pages/api/mathProblem.ts index e712991..f42a59c 100644 --- a/src/pages/api/mathProblem.ts +++ b/src/pages/api/mathProblem.ts @@ -1,4 +1,4 @@ -import type { NextApiRequest, NextApiResponse } from 'next'; +import type { NextApiRequest, NextApiResponse } from "next"; import { getRandomMathProblem } from "../../server/mongodb/actions/numericalProblem"; import requestWrapper from "../../server/utils/middleware"; diff --git a/src/pages/api/mcatReadingProblem.ts b/src/pages/api/mcatReadingProblem.ts index 26bf295..fd2df0d 100644 --- a/src/pages/api/mcatReadingProblem.ts +++ b/src/pages/api/mcatReadingProblem.ts @@ -1,4 +1,4 @@ -import type { NextApiRequest, NextApiResponse } from 'next'; +import type { NextApiRequest, NextApiResponse } from "next"; import { getRandomReadingProblem } from "../../server/mongodb/actions/mcatProblem"; import requestWrapper from "../../server/utils/middleware"; diff --git a/src/pages/api/mcatScienceImageProblem.ts b/src/pages/api/mcatScienceImageProblem.ts index 374ff65..18b3fc3 100644 --- a/src/pages/api/mcatScienceImageProblem.ts +++ b/src/pages/api/mcatScienceImageProblem.ts @@ -1,4 +1,4 @@ -import type { NextApiRequest, NextApiResponse } from 'next'; +import type { NextApiRequest, NextApiResponse } from "next"; import { getRandomScienceImagesProblem } from "../../server/mongodb/actions/mcatProblem"; import requestWrapper from "../../server/utils/middleware"; diff --git a/src/pages/api/mcatScienceProblem.ts b/src/pages/api/mcatScienceProblem.ts index e3a2ec9..083a9cf 100644 --- a/src/pages/api/mcatScienceProblem.ts +++ b/src/pages/api/mcatScienceProblem.ts @@ -1,4 +1,4 @@ -import type { NextApiRequest, NextApiResponse } from 'next'; +import type { NextApiRequest, NextApiResponse } from "next"; import { getRandomScienceProblem } from "../../server/mongodb/actions/mcatProblem"; import requestWrapper from "../../server/utils/middleware"; diff --git a/src/pages/api/physicsImgProblem.ts b/src/pages/api/physicsImgProblem.ts index f664285..e63f45a 100644 --- a/src/pages/api/physicsImgProblem.ts +++ b/src/pages/api/physicsImgProblem.ts @@ -1,4 +1,4 @@ -import type { NextApiRequest, NextApiResponse } from 'next'; +import type { NextApiRequest, NextApiResponse } from "next"; import { getRandomPhysicsImgProblem } from "../../server/mongodb/actions/numericalProblem"; import requestWrapper from "../../server/utils/middleware"; diff --git a/src/pages/api/physicsProblem.ts b/src/pages/api/physicsProblem.ts index 418c063..21a821b 100644 --- a/src/pages/api/physicsProblem.ts +++ b/src/pages/api/physicsProblem.ts @@ -1,4 +1,4 @@ -import type { NextApiRequest, NextApiResponse } from 'next'; +import type { NextApiRequest, NextApiResponse } from "next"; import { getRandomPhysicsProblem } from "../../server/mongodb/actions/numericalProblem"; import requestWrapper from "../../server/utils/middleware"; diff --git a/src/screens/Home/Home.tsx b/src/screens/Home/Home.tsx index 888d747..77dec45 100644 --- a/src/screens/Home/Home.tsx +++ b/src/screens/Home/Home.tsx @@ -61,7 +61,6 @@ export default function Home() { .then((data) => { console.log(data); setProblem(data["randomProblem"]); - }); }; @@ -75,7 +74,6 @@ export default function Home() { setAnswerCandidates(problem["Answer Candidates"]); } setFinalAnswer(problem["Final Answer"]); - } }, [problem]); @@ -126,7 +124,7 @@ export default function Home() {

- {!isNumericalProblem(problem) && Answer Candidates:} + {!isNumericalProblem(problem) && Answer Candidates:} {!isNumericalProblem(problem) && answerCandidates && answerCandidates.map((answer, index) => { diff --git a/src/server/utils/middleware.ts b/src/server/utils/middleware.ts index fc464b4..fcd9095 100644 --- a/src/server/utils/middleware.ts +++ b/src/server/utils/middleware.ts @@ -1,7 +1,7 @@ -import type { NextApiRequest, NextApiResponse } from 'next'; -import connectDb from '../mongodb/connectDb'; +import type { NextApiRequest, NextApiResponse } from "next"; +import connectDb from "../mongodb/connectDb"; -type RequestMethod = 'GET' | 'POST' | 'PUT' | 'DELETE'; +type RequestMethod = "GET" | "POST" | "PUT" | "DELETE"; export default function requestWrapper( handler: (req: NextApiRequest, res: NextApiResponse) => void | Promise, @@ -11,18 +11,18 @@ export default function requestWrapper( if (req.method !== method) { return res.status(400).json({ success: false, - message: 'Request Failure: Invalid method for request', + message: "Request Failure: Invalid method for request", }); } - if (method !== 'GET') { + if (method !== "GET") { try { req.body = JSON.parse(req.body); } catch (error) { console.log(error); return res.status(400).json({ success: false, - message: 'Invalid request body', + message: "Invalid request body", }); } } @@ -36,7 +36,7 @@ export default function requestWrapper( console.error(error); return res.status(500).json({ success: false, - message: 'Server Error', + message: "Server Error", }); } diff --git a/src/server/utils/request.ts b/src/server/utils/request.ts index c77bc52..c46933d 100644 --- a/src/server/utils/request.ts +++ b/src/server/utils/request.ts @@ -1,4 +1,7 @@ -const sendRequest = async (route: string, method: "GET" | "POST" | "PUT" | "DELETE"): Promise => { +const sendRequest = async ( + route: string, + method: "GET" | "POST" | "PUT" | "DELETE" +): Promise => { let result: Response; if (method === "GET") { result = await fetch(route);