From d405d47a1a8edc9ff491a63ac428032fa55cff2d Mon Sep 17 00:00:00 2001 From: sheninthjr Date: Tue, 7 Nov 2023 00:56:10 +0530 Subject: [PATCH] Getting Based On TestType --- apps/client/package.json | 3 +-- apps/client/src/App.tsx | 2 +- apps/client/src/components/GetQuestion.tsx | 6 +++--- apps/client/src/components/TestType.tsx | 14 ++++++++------ packages/prisma/package.json | 2 +- .../migration.sql | 0 packages/prisma/server/routes/QuestionRouter.ts | 10 +++++++++- packages/ui/src/components/TypePost.tsx | 14 +++++++------- yarn.lock | 6 +++--- 9 files changed, 33 insertions(+), 24 deletions(-) rename packages/prisma/prisma/migrations/{20231106163705_init => 20231106184456_init}/migration.sql (100%) diff --git a/apps/client/package.json b/apps/client/package.json index 7b394e2..067ad26 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -17,8 +17,7 @@ "postcss-cli": "^10.1.0", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-router": "^6.18.0", - "react-router-dom": "^6.18.0", + "react-router-dom": "^6.15.0", "ui": "*" }, "devDependencies": { diff --git a/apps/client/src/App.tsx b/apps/client/src/App.tsx index 2575f62..2f232eb 100644 --- a/apps/client/src/App.tsx +++ b/apps/client/src/App.tsx @@ -14,7 +14,7 @@ function App() { }> }> }> - }> + }> diff --git a/apps/client/src/components/GetQuestion.tsx b/apps/client/src/components/GetQuestion.tsx index 83b4c0d..171dc0b 100644 --- a/apps/client/src/components/GetQuestion.tsx +++ b/apps/client/src/components/GetQuestion.tsx @@ -4,7 +4,7 @@ import { useState, useEffect } from "react"; import { useLocation, useParams } from "react-router"; export default function GetQuestion() { - const { type } = useParams(); + const { testType } = useParams(); const location = useLocation(); const searchParams = new URLSearchParams(location.search); const date = searchParams.get("date"); @@ -15,9 +15,10 @@ export default function GetQuestion() { const [pdfUrl, setPdfUrl] = useState(""); const [showPdf, setShowPdf] = useState(false); + const fetchPdf = async () => { try { - const res = await axios.get(`${BASE_URL}/get/${type}?date=${date}&sem=${sem}&year=${year}&setTypeA=${setTypeA}`, { + const res = await axios.get(`${BASE_URL}/get/${testType}?date=${date}&sem=${sem}&year=${year}&setTypeA=${setTypeA}`, { responseType: "blob", }); const blob = new Blob([res.data], { type: "application/pdf" }); @@ -36,7 +37,6 @@ export default function GetQuestion() { const refreshData = () => { fetchPdf(); }; - return (
diff --git a/apps/client/src/components/TestType.tsx b/apps/client/src/components/TestType.tsx index 3990d67..8b64557 100644 --- a/apps/client/src/components/TestType.tsx +++ b/apps/client/src/components/TestType.tsx @@ -1,27 +1,29 @@ import { TypePost } from "ui"; -import { Link } from "react-router-dom"; +import { useNavigate } from "react-router-dom"; export default function TestType() { + const navigate = useNavigate() return ( <> { const urlData = { date, - type, + testType, year, sem, + setTypeA }; - return ( - - ) + if(urlData.testType){ + navigate(`/get/${testType}?date=${date}&sem=${sem}&year=${year}&setTypeA=${setTypeA}`) + } }} /> diff --git a/packages/prisma/package.json b/packages/prisma/package.json index df29929..1be1953 100644 --- a/packages/prisma/package.json +++ b/packages/prisma/package.json @@ -19,7 +19,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "dependencies": { - "@prisma/client": "^5.5.2", + "@prisma/client": "5.5.2", "@types/cors": "^2.8.15", "@types/express": "^4.17.20", "cors": "^2.8.5", diff --git a/packages/prisma/prisma/migrations/20231106163705_init/migration.sql b/packages/prisma/prisma/migrations/20231106184456_init/migration.sql similarity index 100% rename from packages/prisma/prisma/migrations/20231106163705_init/migration.sql rename to packages/prisma/prisma/migrations/20231106184456_init/migration.sql diff --git a/packages/prisma/server/routes/QuestionRouter.ts b/packages/prisma/server/routes/QuestionRouter.ts index 98bff9c..ed9c1df 100644 --- a/packages/prisma/server/routes/QuestionRouter.ts +++ b/packages/prisma/server/routes/QuestionRouter.ts @@ -95,10 +95,18 @@ router.get("/get/:testtype", async (req, res) => { const sem = req.query.sem; const year = req.query.year; const set = req.query.setTypeA; + function reverseDate(inputDate) { + const dateComponents = inputDate.split('-'); + const reversedDate = dateComponents.reverse().join('-'); + return reversedDate; + } + const inputDate = date; + const rDate = reverseDate(inputDate); try { const browser = await puppeteer.launch(); const page = await browser.newPage(); if (testType === "IA1") { + console.log(testType) const skipNo = 4; const partA11Questions = await prisma.unit1.findMany({ skip: Math.floor(Math.random() * skipNo), @@ -247,7 +255,7 @@ router.get("/get/:testtype", async (req, res) => {

Velammal Institute of technology

-

Dept of AI&DS/${testType}/${year}/${sem}/${date}/1.45hr/60Marks/${set}

+

Dept of AI&DS/${testType}/${year}/${sem}/${rDate}/1.45hr/60Marks/${set}

CCS334-BIG DATA ANALYTICS

diff --git a/packages/ui/src/components/TypePost.tsx b/packages/ui/src/components/TypePost.tsx index fa1e573..ad3780e 100644 --- a/packages/ui/src/components/TypePost.tsx +++ b/packages/ui/src/components/TypePost.tsx @@ -4,10 +4,10 @@ export function TypePost(props: { onClick: (date: string, type: string, year: string, sem: string,setTypeA:string) => void; }) { const [date, setDate] = useState(""); - const [type, setType] = useState(""); - const [year, setYear] = useState(""); - const [sem, setSem] = useState(""); - const [setTypeA,setSetTypeA] = useState("") + const [testType, setTestType] = useState("IA1"); + const [year, setYear] = useState("I Year"); + const [sem, setSem] = useState("I Sem"); + const [setTypeA,setSetTypeA] = useState("Set A") return ( <>
@@ -24,8 +24,8 @@ export function TypePost(props: {