Merge branch 'develop' into faeture/payment-history

src/pages/(admin)/Lists/UserList.tsx

@@ -242,14 +242,15 @@ export default function UserList({user, filter}: {user: User; filter?: (user: Us
 			cell: (info) => info.getValue() || "Not available",
 			enableSorting: true,
 		}),
-		columnHelper.accessor("demographicInformation.employment", {
+		columnHelper.accessor((x) => (x.type === "corporate" ? x.demographicInformation?.position : x.demographicInformation?.employment), {
+			id: "employment",
 			header: (
 				<button className="flex gap-2 items-center" onClick={() => setSorter((prev) => selectSorter(prev, "employment"))}>
-					<span>Employment</span>
+					<span>Employment/Position</span>
 					<SorterArrow name="employment" />
 				</button>
 			) as any,
-			cell: (info) => capitalize(info.getValue()) || "Not available",
+			cell: (info) => (info.row.original.type === "corporate" ? info.getValue() : capitalize(info.getValue())) || "Not available",
 			enableSorting: true,
 		}),
 		columnHelper.accessor("demographicInformation.gender", {
@@ -419,13 +420,14 @@ export default function UserList({user, filter}: {user: User; filter?: (user: Us
 		}
 
 		if (sorter === "employment" || sorter === reverseString("employment")) {
-			if (!a.demographicInformation?.employment && b.demographicInformation?.employment) return sorter === "employment" ? -1 : 1;
-			if (a.demographicInformation?.employment && !b.demographicInformation?.employment) return sorter === "employment" ? 1 : -1;
-			if (!a.demographicInformation?.employment && !b.demographicInformation?.employment) return 0;
+			const aSortingItem = a.type === "corporate" ? a.demographicInformation?.position : a.demographicInformation?.employment;
+			const bSortingItem = b.type === "corporate" ? b.demographicInformation?.position : b.demographicInformation?.employment;
 
-			return sorter === "employment"
-				? a.demographicInformation!.employment.localeCompare(b.demographicInformation!.employment)
-				: b.demographicInformation!.employment.localeCompare(a.demographicInformation!.employment);
+			if (!aSortingItem && bSortingItem) return sorter === "employment" ? -1 : 1;
+			if (aSortingItem && !bSortingItem) return sorter === "employment" ? 1 : -1;
+			if (!aSortingItem && !bSortingItem) return 0;
+
+			return sorter === "employment" ? aSortingItem!.localeCompare(bSortingItem!) : bSortingItem!.localeCompare(aSortingItem!);
 		}
 
 		if (sorter === "gender" || sorter === reverseString("gender")) {

src/pages/(generation)/LevelGeneration.tsx

@@ -1,6 +1,7 @@
 import {LevelExam, MultipleChoiceExercise} from "@/interfaces/exam";
 import useExamStore from "@/stores/examStore";
 import {getExamById} from "@/utils/exams";
+import {playSound} from "@/utils/sound";
 import {Tab} from "@headlessui/react";
 import axios from "axios";
 import clsx from "clsx";
@@ -18,6 +19,7 @@ const TaskTab = ({exam, setExam}: {exam?: LevelExam; setExam: (exam: LevelExam)
 		axios
 			.get(`/api/exam/level/generate/level`)
 			.then((result) => {
+				playSound("check");
 				console.log(result.data);
 				setExam(result.data);
 			})
@@ -135,6 +137,7 @@ const LevelGeneration = () => {
 		axios
 			.post(`/api/exam/level`, exam)
 			.then((result) => {
+				playSound("sent");
 				console.log(`Generated Exam ID: ${result.data.id}`);
 				toast.success("This new exam has been generated successfully! Check the ID in our browser's console.");
 				setResultingExam(result.data);

src/pages/(generation)/ListeningGeneration.tsx

@@ -1,9 +1,13 @@
 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 {playSound} from "@/utils/sound";
 import {convertCamelCaseToReadable} from "@/utils/string";
 import {Tab} from "@headlessui/react";
 import axios from "axios";
 import clsx from "clsx";
+import {useRouter} from "next/router";
 import {useState} from "react";
 import {BsArrowRepeat} from "react-icons/bs";
 import {toast} from "react-toastify";
@@ -20,8 +24,11 @@ const PartTab = ({part, types, index, setPart}: {part?: ListeningPart; types: st
 		setPart(undefined);
 		setIsLoading(true);
 		axios
-			.get(`/api/exam/listening/generate/listening_passage_${index}${topic || types ? `?${url.toString()}` : ""}`)
-			.then((result) => setPart(result.data))
+			.get(`/api/exam/listening/generate/listening_section_${index}${topic || types ? `?${url.toString()}` : ""}`)
+			.then((result) => {
+				playSound("check");
+				setPart(result.data);
+			})
 			.catch((error) => {
 				console.log(error);
 				toast.error("Something went wrong!");
@@ -67,27 +74,101 @@ const PartTab = ({part, types, index, setPart}: {part?: ListeningPart; types: st
 							</span>
 						))}
 					</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>
 			)}
 		</Tab.Panel>
 	);
 };
 
+interface ListeningPart {
+	exercises: Exercise[];
+	text:
+		| {
+				conversation: {
+					gender: string;
+					name: string;
+					text: string;
+					voice: string;
+				}[];
+		  }
+		| string;
+}
+
 const ListeningGeneration = () => {
 	const [part1, setPart1] = useState<ListeningPart>();
 	const [part2, setPart2] = 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 availableTypes = [
-		{type: "fillBlanks", label: "Fill the Blanks"},
 		{type: "multipleChoice", label: "Multiple Choice"},
-		{type: "trueFalse", label: "True or False"},
-		{type: "writeBlanks", label: "Write the Blanks"},
+		{type: "writeBlanksQuestions", label: "Write the Blanks: Questions"},
+		{type: "writeBlanksFill", label: "Write the Blanks: Fill"},
+		{type: "writeBlanksForm", label: "Write the Blanks: Form"},
 	];
 
+	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 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) => {
+				playSound("sent");
+				console.log(`Generated Exam ID: ${result.data.id}`);
+				toast.success("This new exam has been generated successfully! Check the ID in our browser's console.");
+				setResultingExam(result.data);
+
+				setPart1(undefined);
+				setPart2(undefined);
+				setPart3(undefined);
+				setTypes([]);
+			})
+			.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 (
 		<>
 			<div className="flex flex-col gap-3">
@@ -121,7 +202,7 @@ const ListeningGeneration = () => {
 								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
 							)
 						}>
-						Passage 1
+						Section 1
 					</Tab>
 					<Tab
 						className={({selected}) =>
@@ -132,7 +213,7 @@ const ListeningGeneration = () => {
 								selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-listening",
 							)
 						}>
-						Passage 2
+						Section 2
 					</Tab>
 					<Tab
 						className={({selected}) =>
@@ -143,7 +224,18 @@ const ListeningGeneration = () => {
 								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.List>
 				<Tab.Panels>
@@ -151,22 +243,44 @@ const ListeningGeneration = () => {
 						{part: part1, setPart: setPart1},
 						{part: part2, setPart: setPart2},
 						{part: part3, setPart: setPart3},
+						{part: part4, setPart: setPart4},
 					].map(({part, setPart}, index) => (
 						<PartTab part={part} types={types} index={index + 1} key={index} setPart={setPart} />
 					))}
 				</Tab.Panels>
 			</Tab.Group>
-			<button
-				disabled={!part1 || !part2 || !part3}
-				data-tip="Please generate all three passages"
-				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",
-					"hover:bg-ielts-listening disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
-					"transition ease-in-out duration-300",
-					(!part1 || !part2 || !part3) && "tooltip",
-				)}>
-				Submit
-			</button>
+			<div className="w-full flex justify-end gap-4">
+				{resultingExam && (
+					<button
+						disabled={isLoading}
+						onClick={() => loadExam(resultingExam.id)}
+						className={clsx(
+							"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",
+						"transition ease-in-out duration-300",
+						(!part1 || !part2 || !part3 || !part4) && "tooltip",
+					)}>
+					{isLoading ? (
+						<div className="flex items-center justify-center">
+							<BsArrowRepeat className="text-white animate-spin" size={25} />
+						</div>
+					) : (
+						"Submit"
+					)}
+				</button>
+			</div>
 		</>
 	);
 };

src/pages/(generation)/ReadingGeneration.tsx

@@ -2,6 +2,7 @@ import Input from "@/components/Low/Input";
 import {ReadingExam, ReadingPart} from "@/interfaces/exam";
 import useExamStore from "@/stores/examStore";
 import {getExamById} from "@/utils/exams";
+import {playSound} from "@/utils/sound";
 import {convertCamelCaseToReadable} from "@/utils/string";
 import {Tab} from "@headlessui/react";
 import axios from "axios";
@@ -25,7 +26,10 @@ const PartTab = ({part, types, index, setPart}: {part?: ReadingPart; types: stri
 		setIsLoading(true);
 		axios
 			.get(`/api/exam/reading/generate/reading_passage_${index}${topic || types ? `?${url.toString()}` : ""}`)
-			.then((result) => setPart(result.data))
+			.then((result) => {
+				playSound("check");
+				setPart(result.data);
+			})
 			.catch((error) => {
 				console.log(error);
 				toast.error("Something went wrong!");
@@ -136,6 +140,7 @@ const ReadingGeneration = () => {
 		axios
 			.post(`/api/exam/reading`, exam)
 			.then((result) => {
+				playSound("sent");
 				console.log(`Generated Exam ID: ${result.data.id}`);
 				toast.success("This new exam has been generated successfully! Check the ID in our browser's console.");
 				setResultingExam(result.data);

src/pages/(generation)/SpeakingGeneration.tsx

@@ -0,0 +1,234 @@
+import Input from "@/components/Low/Input";
+import {Exercise, SpeakingExam} from "@/interfaces/exam";
+import useExamStore from "@/stores/examStore";
+import {getExamById} from "@/utils/exams";
+import {playSound} from "@/utils/sound";
+import {convertCamelCaseToReadable} from "@/utils/string";
+import {Tab} from "@headlessui/react";
+import axios from "axios";
+import clsx from "clsx";
+import {useRouter} from "next/router";
+import {useState} from "react";
+import {BsArrowRepeat} from "react-icons/bs";
+import {toast} from "react-toastify";
+
+const PartTab = ({part, index, setPart}: {part?: SpeakingPart; index: number; setPart: (part?: SpeakingPart) => void}) => {
+	const [isLoading, setIsLoading] = useState(false);
+
+	const generate = () => {
+		setPart(undefined);
+		setIsLoading(true);
+		axios
+			.get(`/api/exam/speaking/generate/speaking_task_${index}`)
+			.then((result) => {
+				playSound("check");
+				setPart(result.data);
+			})
+			.catch((error) => {
+				console.log(error);
+				toast.error("Something went wrong!");
+			})
+			.finally(() => setIsLoading(false));
+	};
+
+	return (
+		<Tab.Panel className="w-full bg-ielts-speaking/20 min-h-[600px] h-full rounded-xl p-6 flex flex-col gap-4">
+			<div className="flex gap-4 items-end">
+				<button
+					onClick={generate}
+					disabled={isLoading}
+					data-tip="The passage is currently being generated"
+					className={clsx(
+						"bg-ielts-speaking/70 border border-ielts-speaking text-white w-full rounded-xl h-[70px]",
+						"hover:bg-ielts-speaking disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
+						"transition ease-in-out duration-300",
+						isLoading && "tooltip",
+					)}>
+					{isLoading ? (
+						<div className="flex items-center justify-center">
+							<BsArrowRepeat className="text-white animate-spin" size={25} />
+						</div>
+					) : (
+						"Generate"
+					)}
+				</button>
+			</div>
+			{isLoading && (
+				<div className="w-fit h-fit mt-12 self-center animate-pulse flex flex-col gap-8 items-center">
+					<span className={clsx("loading loading-infinity w-32 text-ielts-speaking")} />
+					<span className={clsx("font-bold text-2xl text-ielts-speaking")}>Generating...</span>
+				</div>
+			)}
+			{part && (
+				<div className="flex flex-col gap-2 w-full overflow-y-scroll scrollbar-hide h-96">
+					<h3 className="text-xl font-semibold">{part.topic}</h3>
+					{part.question && <span className="w-full">{part.question}</span>}
+					{part.questions && (
+						<div className="flex flex-col gap-1">
+							{part.questions.map((question, index) => (
+								<span className="w-full" key={index}>
+									- {question}
+								</span>
+							))}
+						</div>
+					)}
+					{part.prompts && (
+						<div className="flex flex-col gap-1">
+							<span className="font-medium">You should talk about the following things:</span>
+							{part.prompts.map((prompt, index) => (
+								<span className="w-full" key={index}>
+									- {prompt}
+								</span>
+							))}
+						</div>
+					)}
+				</div>
+			)}
+		</Tab.Panel>
+	);
+};
+
+interface SpeakingPart {
+	prompts?: string[];
+	question?: string;
+	questions?: string[];
+	topic: string;
+}
+
+const SpeakingGeneration = () => {
+	const [part1, setPart1] = useState<SpeakingPart>();
+	const [part2, setPart2] = useState<SpeakingPart>();
+	const [part3, setPart3] = useState<SpeakingPart>();
+	const [isLoading, setIsLoading] = useState(false);
+	const [resultingExam, setResultingExam] = useState<SpeakingExam>();
+
+	const router = useRouter();
+
+	const setExams = useExamStore((state) => state.setExams);
+	const setSelectedModules = useExamStore((state) => state.setSelectedModules);
+
+	const submitExam = () => {
+		if (!part1 || !part2 || !part3) return toast.error("Please generate all for tasks!");
+
+		setIsLoading(true);
+
+		axios
+			.post(`/api/exam/speaking/generate/speaking`, {exercises: [part1, part2, part3]})
+			.then((result) => {
+				playSound("sent");
+				console.log(`Generated Exam ID: ${result.data.id}`);
+				toast.success("This new exam has been generated successfully! Check the ID in our browser's console.");
+				setResultingExam(result.data);
+
+				setPart1(undefined);
+				setPart2(undefined);
+				setPart3(undefined);
+			})
+			.catch((error) => {
+				console.log(error);
+				toast.error("Something went wrong!");
+			})
+			.finally(() => setIsLoading(false));
+	};
+
+	const loadExam = async (examId: string) => {
+		const exam = await getExamById("speaking", 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(["speaking"]);
+
+		router.push("/exercises");
+	};
+
+	return (
+		<>
+			<Tab.Group>
+				<Tab.List className="flex space-x-1 rounded-xl bg-ielts-speaking/20 p-1">
+					<Tab
+						className={({selected}) =>
+							clsx(
+								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/70",
+								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking 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-speaking",
+							)
+						}>
+						Task 1
+					</Tab>
+					<Tab
+						className={({selected}) =>
+							clsx(
+								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/70",
+								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking 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-speaking",
+							)
+						}>
+						Task 2
+					</Tab>
+					<Tab
+						className={({selected}) =>
+							clsx(
+								"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/70",
+								"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking 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-speaking",
+							)
+						}>
+						Task 3
+					</Tab>
+				</Tab.List>
+				<Tab.Panels>
+					{[
+						{part: part1, setPart: setPart1},
+						{part: part2, setPart: setPart2},
+						{part: part3, setPart: setPart3},
+					].map(({part, setPart}, index) => (
+						<PartTab part={part} index={index + 1} key={index} setPart={setPart} />
+					))}
+				</Tab.Panels>
+			</Tab.Group>
+			<div className="w-full flex justify-end gap-4">
+				{resultingExam && (
+					<button
+						disabled={isLoading}
+						onClick={() => loadExam(resultingExam.id)}
+						className={clsx(
+							"bg-white border border-ielts-speaking text-ielts-speaking w-full max-w-[200px] rounded-xl h-[70px] self-end",
+							"hover:bg-ielts-speaking hover:text-white disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
+							"transition ease-in-out duration-300",
+						)}>
+						Perform Exam
+					</button>
+				)}
+				<button
+					disabled={!part1 || !part2 || !part3 || isLoading}
+					data-tip="Please generate all three passages"
+					onClick={submitExam}
+					className={clsx(
+						"bg-ielts-speaking/70 border border-ielts-speaking text-white w-full max-w-[200px] rounded-xl h-[70px] self-end",
+						"hover:bg-ielts-speaking disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
+						"transition ease-in-out duration-300",
+						(!part1 || !part2 || !part3) && "tooltip",
+					)}>
+					{isLoading ? (
+						<div className="flex items-center justify-center">
+							<BsArrowRepeat className="text-white animate-spin" size={25} />
+						</div>
+					) : (
+						"Submit"
+					)}
+				</button>
+			</div>
+		</>
+	);
+};
+
+export default SpeakingGeneration;

src/pages/(generation)/WritingGeneration.tsx

@@ -2,6 +2,7 @@ import Input from "@/components/Low/Input";
 import {WritingExam} from "@/interfaces/exam";
 import useExamStore from "@/stores/examStore";
 import {getExamById} from "@/utils/exams";
+import {playSound} from "@/utils/sound";
 import {Tab} from "@headlessui/react";
 import axios from "axios";
 import clsx from "clsx";
@@ -18,7 +19,10 @@ const TaskTab = ({task, index, setTask}: {task?: string; index: number; setTask:
 		setIsLoading(true);
 		axios
 			.get(`/api/exam/writing/generate/writing_task${index}_general`)
-			.then((result) => setTask(result.data.question))
+			.then((result) => {
+				playSound("check");
+				setTask(result.data.question);
+			})
 			.catch((error) => {
 				console.log(error);
 				toast.error("Something went wrong!");
@@ -132,6 +136,7 @@ const WritingGeneration = () => {
 			.post(`/api/exam/writing`, exam)
 			.then((result) => {
 				console.log(`Generated Exam ID: ${result.data.id}`);
+				playSound("sent");
 				toast.success("This new exam has been generated successfully! Check the ID in our browser's console.");
 				setResultingExam(result.data);
 

src/pages/api/exam/[module]/generate/[endpoint].ts

@@ -15,15 +15,15 @@ const db = getFirestore(app);
 export default withIronSessionApiRoute(handler, sessionOptions);
 
 async function handler(req: NextApiRequest, res: NextApiResponse) {
-	if (!req.session.user) {
-		res.status(401).json({ok: false});
-		return;
-	}
+	if (req.method === "GET") return get(req, res);
+	if (req.method === "POST") return post(req, res);
 
-	if (req.session.user.type !== "developer") {
-		res.status(403).json({ok: false});
-		return;
-	}
+	return res.status(404).json({ok: false});
+}
+
+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 url = `${process.env.BACKEND_URL}/${endpoint}`;
@@ -34,3 +34,21 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 
 	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);
+}

src/pages/generation.tsx

@@ -20,6 +20,7 @@ import ReadingGeneration from "./(generation)/ReadingGeneration";
 import ListeningGeneration from "./(generation)/ListeningGeneration";
 import WritingGeneration from "./(generation)/WritingGeneration";
 import LevelGeneration from "./(generation)/LevelGeneration";
+import SpeakingGeneration from "./(generation)/SpeakingGeneration";
 
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
@@ -115,6 +116,7 @@ export default function Generation() {
 					{module === "reading" && <ReadingGeneration />}
 					{module === "listening" && <ListeningGeneration />}
 					{module === "writing" && <WritingGeneration />}
+					{module === "speaking" && <SpeakingGeneration />}
 					{module === "level" && <LevelGeneration />}
 				</Layout>
 			)}

src/pages/index.tsx

@@ -68,7 +68,7 @@ export default function Home({envVariables}: {envVariables: {[key: string]: stri
 	useEffect(() => {
 		if (user) {
 			setShowDemographicInput(!user.demographicInformation);
-			setShowDiagnostics(user.isFirstLogin);
+			setShowDiagnostics(user.isFirstLogin && user.type === "student");
 		}
 	}, [user]);
 

src/pages/profile.tsx

@@ -63,6 +63,7 @@ export default function Home() {
 	const [phone, setPhone] = useState<string>();
 	const [gender, setGender] = useState<Gender>();
 	const [employment, setEmployment] = useState<EmploymentStatus>();
+	const [position, setPosition] = useState<string>();
 
 	const profilePictureInput = useRef(null);
 
@@ -86,7 +87,8 @@ export default function Home() {
 			setCountry(user.demographicInformation?.country);
 			setPhone(user.demographicInformation?.phone);
 			setGender(user.demographicInformation?.gender);
-			setEmployment(user.demographicInformation?.employment);
+			setEmployment(user.type === "corporate" ? undefined : user.demographicInformation?.employment);
+			setPosition(user.type === "corporate" ? user.demographicInformation?.position : undefined);
 		}
 	}, [user]);
 
@@ -135,7 +137,8 @@ export default function Home() {
 			demographicInformation: {
 				phone,
 				country,
-				employment,
+				employment: user?.type === "corporate" ? undefined : employment,
+				position: user?.type === "corporate" ? position : undefined,
 				gender,
 			},
 		});
@@ -247,30 +250,43 @@ export default function Home() {
 										/>
 									</div>
 									<div className="flex flex-col md:flex-row gap-8 w-full">
-										<div className="relative flex flex-col gap-3 w-full">
-											<label className="font-normal text-base text-mti-gray-dim">Employment Status *</label>
-											<RadioGroup
-												value={employment}
-												onChange={setEmployment}
-												className="grid grid-cols-2 items-center gap-4 place-items-center">
-												{EMPLOYMENT_STATUS.map(({status, label}) => (
-													<RadioGroup.Option value={status} key={status}>
-														{({checked}) => (
-															<span
-																className={clsx(
-																	"px-6 py-4 w-40 md:w-48 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-																	"transition duration-300 ease-in-out",
-																	!checked
-																		? "bg-white border-mti-gray-platinum"
-																		: "bg-mti-purple-light border-mti-purple-dark text-white",
-																)}>
-																{label}
-															</span>
-														)}
-													</RadioGroup.Option>
-												))}
-											</RadioGroup>
-										</div>
+										{user.type === "corporate" && (
+											<Input
+												name="position"
+												onChange={setPosition}
+												defaultValue={position}
+												type="text"
+												label="Position"
+												placeholder="CEO, Head of Marketing..."
+												required
+											/>
+										)}
+										{user.type !== "corporate" && (
+											<div className="relative flex flex-col gap-3 w-full">
+												<label className="font-normal text-base text-mti-gray-dim">Employment Status *</label>
+												<RadioGroup
+													value={employment}
+													onChange={setEmployment}
+													className="grid grid-cols-2 items-center gap-4 place-items-center">
+													{EMPLOYMENT_STATUS.map(({status, label}) => (
+														<RadioGroup.Option value={status} key={status}>
+															{({checked}) => (
+																<span
+																	className={clsx(
+																		"px-6 py-4 w-40 md:w-48 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
+																		"transition duration-300 ease-in-out",
+																		!checked
+																			? "bg-white border-mti-gray-platinum"
+																			: "bg-mti-purple-light border-mti-purple-dark text-white",
+																	)}>
+																	{label}
+																</span>
+															)}
+														</RadioGroup.Option>
+													))}
+												</RadioGroup>
+											</div>
+										)}
 										<div className="flex flex-col gap-8 w-full">
 											<div className="relative flex flex-col gap-3 w-full">
 												<label className="font-normal text-base text-mti-gray-dim">Gender *</label>