Added the ability to generate Listening exams as well
This commit is contained in:
@@ -37,6 +37,7 @@
|
|||||||
"formidable": "^3.5.0",
|
"formidable": "^3.5.0",
|
||||||
"formidable-serverless": "^1.1.1",
|
"formidable-serverless": "^1.1.1",
|
||||||
"framer-motion": "^9.0.2",
|
"framer-motion": "^9.0.2",
|
||||||
|
"howler": "^2.2.4",
|
||||||
"iron-session": "^6.3.1",
|
"iron-session": "^6.3.1",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"moment": "^2.29.4",
|
"moment": "^2.29.4",
|
||||||
@@ -73,6 +74,7 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/formidable": "^3.4.0",
|
"@types/formidable": "^3.4.0",
|
||||||
|
"@types/howler": "^2.2.11",
|
||||||
"@types/lodash": "^4.14.191",
|
"@types/lodash": "^4.14.191",
|
||||||
"@types/nodemailer": "^6.4.11",
|
"@types/nodemailer": "^6.4.11",
|
||||||
"@types/nodemailer-express-handlebars": "^4.0.3",
|
"@types/nodemailer-express-handlebars": "^4.0.3",
|
||||||
|
|||||||
BIN
public/audio/check.mp3
Normal file
BIN
public/audio/check.mp3
Normal file
Binary file not shown.
@@ -1,9 +1,13 @@
|
|||||||
import Input from "@/components/Low/Input";
|
import Input from "@/components/Low/Input";
|
||||||
import {ListeningPart} from "@/interfaces/exam";
|
import {Exercise, ListeningExam} from "@/interfaces/exam";
|
||||||
|
import useExamStore from "@/stores/examStore";
|
||||||
|
import {getExamById} from "@/utils/exams";
|
||||||
|
import {checkSound} from "@/utils/sound";
|
||||||
import {convertCamelCaseToReadable} from "@/utils/string";
|
import {convertCamelCaseToReadable} from "@/utils/string";
|
||||||
import {Tab} from "@headlessui/react";
|
import {Tab} from "@headlessui/react";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import clsx from "clsx";
|
import clsx from "clsx";
|
||||||
|
import {useRouter} from "next/router";
|
||||||
import {useState} from "react";
|
import {useState} from "react";
|
||||||
import {BsArrowRepeat} from "react-icons/bs";
|
import {BsArrowRepeat} from "react-icons/bs";
|
||||||
import {toast} from "react-toastify";
|
import {toast} from "react-toastify";
|
||||||
@@ -20,8 +24,11 @@ const PartTab = ({part, types, index, setPart}: {part?: ListeningPart; types: st
|
|||||||
setPart(undefined);
|
setPart(undefined);
|
||||||
setIsLoading(true);
|
setIsLoading(true);
|
||||||
axios
|
axios
|
||||||
.get(`/api/exam/listening/generate/listening_passage_${index}${topic || types ? `?${url.toString()}` : ""}`)
|
.get(`/api/exam/listening/generate/listening_section_${index}${topic || types ? `?${url.toString()}` : ""}`)
|
||||||
.then((result) => setPart(result.data))
|
.then((result) => {
|
||||||
|
checkSound();
|
||||||
|
setPart(result.data);
|
||||||
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
toast.error("Something went wrong!");
|
toast.error("Something went wrong!");
|
||||||
@@ -67,16 +74,44 @@ const PartTab = ({part, types, index, setPart}: {part?: ListeningPart; types: st
|
|||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
{typeof part.text === "string" && <span className="w-full h-96">{part.text.replaceAll("\n\n", " ")}</span>}
|
||||||
|
{typeof part.text !== "string" && (
|
||||||
|
<div className="w-full h-96 flex flex-col gap-2">
|
||||||
|
{part.text.conversation.map((x, index) => (
|
||||||
|
<span key={index} className="flex gap-1">
|
||||||
|
<span className="font-semibold">{x.name}:</span>
|
||||||
|
{x.text.replaceAll("\n\n", " ")}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</Tab.Panel>
|
</Tab.Panel>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
interface ListeningPart {
|
||||||
|
exercises: Exercise[];
|
||||||
|
text:
|
||||||
|
| {
|
||||||
|
conversation: {
|
||||||
|
gender: string;
|
||||||
|
name: string;
|
||||||
|
text: string;
|
||||||
|
voice: string;
|
||||||
|
}[];
|
||||||
|
}
|
||||||
|
| string;
|
||||||
|
}
|
||||||
|
|
||||||
const ListeningGeneration = () => {
|
const ListeningGeneration = () => {
|
||||||
const [part1, setPart1] = useState<ListeningPart>();
|
const [part1, setPart1] = useState<ListeningPart>();
|
||||||
const [part2, setPart2] = useState<ListeningPart>();
|
const [part2, setPart2] = useState<ListeningPart>();
|
||||||
const [part3, setPart3] = useState<ListeningPart>();
|
const [part3, setPart3] = useState<ListeningPart>();
|
||||||
|
const [part4, setPart4] = useState<ListeningPart>();
|
||||||
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
|
const [resultingExam, setResultingExam] = useState<ListeningExam>();
|
||||||
const [types, setTypes] = useState<string[]>([]);
|
const [types, setTypes] = useState<string[]>([]);
|
||||||
|
|
||||||
const availableTypes = [
|
const availableTypes = [
|
||||||
@@ -86,8 +121,47 @@ const ListeningGeneration = () => {
|
|||||||
{type: "writeBlanks", label: "Write the Blanks"},
|
{type: "writeBlanks", label: "Write the Blanks"},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
|
const setExams = useExamStore((state) => state.setExams);
|
||||||
|
const setSelectedModules = useExamStore((state) => state.setSelectedModules);
|
||||||
|
|
||||||
const toggleType = (type: string) => setTypes((prev) => (prev.includes(type) ? [...prev.filter((x) => x !== type)] : [...prev, type]));
|
const toggleType = (type: string) => setTypes((prev) => (prev.includes(type) ? [...prev.filter((x) => x !== type)] : [...prev, type]));
|
||||||
|
|
||||||
|
const submitExam = () => {
|
||||||
|
if (!part1 || !part2 || !part3 || !part4) return toast.error("Please generate all for sections!");
|
||||||
|
|
||||||
|
setIsLoading(true);
|
||||||
|
|
||||||
|
axios
|
||||||
|
.post(`/api/exam/listening/generate/listening`, {parts: [part1, part2, part3, part4]})
|
||||||
|
.then((result) => {
|
||||||
|
checkSound();
|
||||||
|
setResultingExam(result.data);
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.log(error);
|
||||||
|
toast.error("Something went wrong!");
|
||||||
|
})
|
||||||
|
.finally(() => setIsLoading(false));
|
||||||
|
};
|
||||||
|
|
||||||
|
const loadExam = async (examId: string) => {
|
||||||
|
const exam = await getExamById("listening", examId.trim());
|
||||||
|
if (!exam) {
|
||||||
|
toast.error("Unknown Exam ID! Please make sure you selected the right module and entered the right exam ID", {
|
||||||
|
toastId: "invalid-exam-id",
|
||||||
|
});
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setExams([exam]);
|
||||||
|
setSelectedModules(["listening"]);
|
||||||
|
|
||||||
|
router.push("/exercises");
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className="flex flex-col gap-3">
|
<div className="flex flex-col gap-3">
|
||||||
@@ -121,7 +195,7 @@ const ListeningGeneration = () => {
|
|||||||
selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
|
selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
|
||||||
)
|
)
|
||||||
}>
|
}>
|
||||||
Passage 1
|
Section 1
|
||||||
</Tab>
|
</Tab>
|
||||||
<Tab
|
<Tab
|
||||||
className={({selected}) =>
|
className={({selected}) =>
|
||||||
@@ -132,7 +206,7 @@ const ListeningGeneration = () => {
|
|||||||
selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
|
selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
|
||||||
)
|
)
|
||||||
}>
|
}>
|
||||||
Passage 2
|
Section 2
|
||||||
</Tab>
|
</Tab>
|
||||||
<Tab
|
<Tab
|
||||||
className={({selected}) =>
|
className={({selected}) =>
|
||||||
@@ -143,7 +217,18 @@ const ListeningGeneration = () => {
|
|||||||
selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
|
selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
|
||||||
)
|
)
|
||||||
}>
|
}>
|
||||||
Passage 3
|
Section 3
|
||||||
|
</Tab>
|
||||||
|
<Tab
|
||||||
|
className={({selected}) =>
|
||||||
|
clsx(
|
||||||
|
"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-listening/70",
|
||||||
|
"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-listening focus:outline-none focus:ring-2",
|
||||||
|
"transition duration-300 ease-in-out",
|
||||||
|
selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
|
||||||
|
)
|
||||||
|
}>
|
||||||
|
Section 4
|
||||||
</Tab>
|
</Tab>
|
||||||
</Tab.List>
|
</Tab.List>
|
||||||
<Tab.Panels>
|
<Tab.Panels>
|
||||||
@@ -151,22 +236,44 @@ const ListeningGeneration = () => {
|
|||||||
{part: part1, setPart: setPart1},
|
{part: part1, setPart: setPart1},
|
||||||
{part: part2, setPart: setPart2},
|
{part: part2, setPart: setPart2},
|
||||||
{part: part3, setPart: setPart3},
|
{part: part3, setPart: setPart3},
|
||||||
|
{part: part4, setPart: setPart4},
|
||||||
].map(({part, setPart}, index) => (
|
].map(({part, setPart}, index) => (
|
||||||
<PartTab part={part} types={types} index={index + 1} key={index} setPart={setPart} />
|
<PartTab part={part} types={types} index={index + 1} key={index} setPart={setPart} />
|
||||||
))}
|
))}
|
||||||
</Tab.Panels>
|
</Tab.Panels>
|
||||||
</Tab.Group>
|
</Tab.Group>
|
||||||
|
<div className="w-full flex justify-end gap-4">
|
||||||
|
{resultingExam && (
|
||||||
<button
|
<button
|
||||||
disabled={!part1 || !part2 || !part3}
|
disabled={isLoading}
|
||||||
data-tip="Please generate all three passages"
|
onClick={() => loadExam(resultingExam.id)}
|
||||||
className={clsx(
|
className={clsx(
|
||||||
"bg-ielts-listening/70 border border-ielts-listening text-white w-full max-w-[200px] px-6 py-6 rounded-xl h-[70px] self-end",
|
"bg-white border border-ielts-listening text-ielts-listening w-full max-w-[200px] rounded-xl h-[70px] self-end",
|
||||||
|
"hover:bg-ielts-listening hover:text-white disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
|
||||||
|
"transition ease-in-out duration-300",
|
||||||
|
)}>
|
||||||
|
Perform Exam
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
<button
|
||||||
|
disabled={!part1 || !part2 || !part3 || !part4 || isLoading}
|
||||||
|
data-tip="Please generate all three passages"
|
||||||
|
onClick={submitExam}
|
||||||
|
className={clsx(
|
||||||
|
"bg-ielts-listening/70 border border-ielts-listening text-white w-full max-w-[200px] rounded-xl h-[70px] self-end",
|
||||||
"hover:bg-ielts-listening disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
|
"hover:bg-ielts-listening disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
|
||||||
"transition ease-in-out duration-300",
|
"transition ease-in-out duration-300",
|
||||||
(!part1 || !part2 || !part3) && "tooltip",
|
(!part1 || !part2 || !part3 || !part4) && "tooltip",
|
||||||
)}>
|
)}>
|
||||||
Submit
|
{isLoading ? (
|
||||||
|
<div className="flex items-center justify-center">
|
||||||
|
<BsArrowRepeat className="text-white animate-spin" size={25} />
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
"Submit"
|
||||||
|
)}
|
||||||
</button>
|
</button>
|
||||||
|
</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -15,15 +15,15 @@ const db = getFirestore(app);
|
|||||||
export default withIronSessionApiRoute(handler, sessionOptions);
|
export default withIronSessionApiRoute(handler, sessionOptions);
|
||||||
|
|
||||||
async function handler(req: NextApiRequest, res: NextApiResponse) {
|
async function handler(req: NextApiRequest, res: NextApiResponse) {
|
||||||
if (!req.session.user) {
|
if (req.method === "GET") return get(req, res);
|
||||||
res.status(401).json({ok: false});
|
if (req.method === "POST") return post(req, res);
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (req.session.user.type !== "developer") {
|
return res.status(404).json({ok: false});
|
||||||
res.status(403).json({ok: false});
|
}
|
||||||
return;
|
|
||||||
}
|
async function get(req: NextApiRequest, res: NextApiResponse) {
|
||||||
|
if (!req.session.user) return res.status(401).json({ok: false});
|
||||||
|
if (req.session.user.type !== "developer") return res.status(403).json({ok: false});
|
||||||
|
|
||||||
const {endpoint, topic, exercises} = req.query as {module: Module; endpoint: string; topic?: string; exercises?: string[]};
|
const {endpoint, topic, exercises} = req.query as {module: Module; endpoint: string; topic?: string; exercises?: string[]};
|
||||||
const url = `${process.env.BACKEND_URL}/${endpoint}`;
|
const url = `${process.env.BACKEND_URL}/${endpoint}`;
|
||||||
@@ -34,3 +34,21 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
|
|||||||
|
|
||||||
res.status(200).json(result.data);
|
res.status(200).json(result.data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function post(req: NextApiRequest, res: NextApiResponse) {
|
||||||
|
if (!req.session.user) return res.status(401).json({ok: false});
|
||||||
|
if (req.session.user.type !== "developer") return res.status(403).json({ok: false});
|
||||||
|
|
||||||
|
const {endpoint, topic, exercises} = req.query as {module: Module; endpoint: string; topic?: string; exercises?: string[]};
|
||||||
|
const url = `${process.env.BACKEND_URL}/${endpoint}`;
|
||||||
|
|
||||||
|
const result = await axios.post(
|
||||||
|
`${url}${topic && exercises ? `?topic=${topic.toLowerCase()}&exercises=${exercises.join("&exercises=")}` : ""}`,
|
||||||
|
req.body,
|
||||||
|
{
|
||||||
|
headers: {Authorization: `Bearer ${process.env.BACKEND_JWT}`},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
res.status(200).json(result.data);
|
||||||
|
}
|
||||||
|
|||||||
9
src/utils/sound.ts
Normal file
9
src/utils/sound.ts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
import {Howl, Howler} from "howler";
|
||||||
|
|
||||||
|
export const checkSound = () => {
|
||||||
|
const sound = new Howl({
|
||||||
|
src: ["audio/check.mp3"],
|
||||||
|
});
|
||||||
|
|
||||||
|
sound.play();
|
||||||
|
};
|
||||||
10
yarn.lock
10
yarn.lock
@@ -1144,6 +1144,11 @@
|
|||||||
"@types/minimatch" "^5.1.2"
|
"@types/minimatch" "^5.1.2"
|
||||||
"@types/node" "*"
|
"@types/node" "*"
|
||||||
|
|
||||||
|
"@types/howler@^2.2.11":
|
||||||
|
version "2.2.11"
|
||||||
|
resolved "https://registry.yarnpkg.com/@types/howler/-/howler-2.2.11.tgz#a75c4ab5666aee5fcfbd5de15d35dbaaa3d3f070"
|
||||||
|
integrity sha512-7aBoUL6RbSIrqKnpEgfa1wSNUBK06mn08siP2QI0zYk7MXfEJAaORc4tohamQYqCqVESoDyRWSdQn2BOKWj2Qw==
|
||||||
|
|
||||||
"@types/http-assert@*":
|
"@types/http-assert@*":
|
||||||
version "1.5.3"
|
version "1.5.3"
|
||||||
resolved "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.3.tgz"
|
resolved "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.3.tgz"
|
||||||
@@ -3149,6 +3154,11 @@ hoist-non-react-statics@^3.3.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
react-is "^16.7.0"
|
react-is "^16.7.0"
|
||||||
|
|
||||||
|
howler@^2.2.4:
|
||||||
|
version "2.2.4"
|
||||||
|
resolved "https://registry.yarnpkg.com/howler/-/howler-2.2.4.tgz#bd3df4a4f68a0118a51e4bd84a2bfc2e93e6e5a1"
|
||||||
|
integrity sha512-iARIBPgcQrwtEr+tALF+rapJ8qSc+Set2GJQl7xT1MQzWaVkFebdJhR3alVlSiUf5U7nAANKuj3aWpwerocD5w==
|
||||||
|
|
||||||
http-parser-js@>=0.5.1:
|
http-parser-js@>=0.5.1:
|
||||||
version "0.5.8"
|
version "0.5.8"
|
||||||
resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"
|
resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"
|
||||||
|
|||||||
Reference in New Issue
Block a user