Updated the profile to also have the focus in it

src/pages/profile.tsx

@@ -2,15 +2,7 @@
 import Head from "next/head";
 import {withIronSessionSsr} from "iron-session/next";
 import {sessionOptions} from "@/lib/session";
-import {
-  ChangeEvent,
-  Dispatch,
-  ReactNode,
-  SetStateAction,
-  useEffect,
-  useRef,
-  useState,
-} from "react";
+import {ChangeEvent, Dispatch, ReactNode, SetStateAction, useEffect, useRef, useState} from "react";
 import useUser from "@/hooks/useUser";
 import {toast, ToastContainer} from "react-toastify";
 import Layout from "@/components/High/Layout";
@@ -20,13 +12,7 @@ import Link from "next/link";
 import axios from "axios";
 import {ErrorMessage} from "@/constants/errors";
 import clsx from "clsx";
-import {
-  CorporateUser,
-  EmploymentStatus,
-  EMPLOYMENT_STATUS,
-  Gender,
-  User,
-} from "@/interfaces/user";
+import {CorporateUser, EmploymentStatus, EMPLOYMENT_STATUS, Gender, User} from "@/interfaces/user";
 import CountrySelect from "@/components/Low/CountrySelect";
 import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import moment from "moment";
@@ -78,9 +64,7 @@ interface Props {
 	mutateUser: Function;
 }
 
-const DoubleColumnRow = ({ children }: { children: ReactNode }) => (
-  <div className="flex flex-col lg:flex-row gap-8 w-full">{children}</div>
-);
+const DoubleColumnRow = ({children}: {children: ReactNode}) => <div className="flex flex-col lg:flex-row gap-8 w-full">{children}</div>;
 
 function UserProfile({user, mutateUser}: Props) {
 	const [bio, setBio] = useState(user.bio || "");
@@ -91,72 +75,35 @@ function UserProfile({ user, mutateUser }: Props) {
 	const [isLoading, setIsLoading] = useState(false);
 	const [profilePicture, setProfilePicture] = useState(user.profilePicture);
 
-  const [desiredLevels, setDesiredLevels] = useState<
-    { [key in Module]: number } | undefined
-  >(
-    ["developer", "student"].includes(user.type)
-      ? user.desiredLevels
-      : undefined,
+	const [desiredLevels, setDesiredLevels] = useState<{[key in Module]: number} | undefined>(
+		["developer", "student"].includes(user.type) ? user.desiredLevels : undefined,
 	);
+	const [focus, setFocus] = useState<"academic" | "general">(user.focus);
 
-  const [country, setCountry] = useState<string>(
-    user.demographicInformation?.country || "",
-  );
-  const [phone, setPhone] = useState<string>(
-    user.demographicInformation?.phone || "",
-  );
-  const [gender, setGender] = useState<Gender | undefined>(
-    user.demographicInformation?.gender || undefined,
-  );
+	const [country, setCountry] = useState<string>(user.demographicInformation?.country || "");
+	const [phone, setPhone] = useState<string>(user.demographicInformation?.phone || "");
+	const [gender, setGender] = useState<Gender | undefined>(user.demographicInformation?.gender || undefined);
 	const [employment, setEmployment] = useState<EmploymentStatus | undefined>(
-    user.type === "corporate"
-      ? undefined
-      : user.demographicInformation?.employment,
-  );
-  const [passport_id, setPassportID] = useState<string | undefined>(
-    user.type === "student"
-      ? user.demographicInformation?.passport_id
-      : undefined,
+		user.type === "corporate" ? undefined : user.demographicInformation?.employment,
 	);
+	const [passport_id, setPassportID] = useState<string | undefined>(user.type === "student" ? user.demographicInformation?.passport_id : undefined);
 
-  const [preferredGender, setPreferredGender] = useState<
-    InstructorGender | undefined
-  >(
-    user.type === "student" || user.type === "developer"
-      ? user.preferredGender || "varied"
-      : undefined,
+	const [preferredGender, setPreferredGender] = useState<InstructorGender | undefined>(
+		user.type === "student" || user.type === "developer" ? user.preferredGender || "varied" : undefined,
 	);
 	const [preferredTopics, setPreferredTopics] = useState<string[] | undefined>(
-    user.type === "student" || user.type === "developer"
-      ? user.preferredTopics
-      : undefined,
+		user.type === "student" || user.type === "developer" ? user.preferredTopics : undefined,
 	);
 
-  const [position, setPosition] = useState<string | undefined>(
-    user.type === "corporate"
-      ? user.demographicInformation?.position
-      : undefined,
-  );
-  const [corporateInformation, setCorporateInformation] = useState(
-    user.type === "corporate" ? user.corporateInformation : undefined,
-  );
-  const [companyName, setCompanyName] = useState<string | undefined>(
-    user.type === "agent" ? user.agentInformation?.companyName : undefined,
-  );
-  const [commercialRegistration, setCommercialRegistration] = useState<
-    string | undefined
-  >(
-    user.type === "agent"
-      ? user.agentInformation?.commercialRegistration
-      : undefined,
-  );
-  const [arabName, setArabName] = useState<string | undefined>(
-    user.type === "agent" ? user.agentInformation?.companyArabName : undefined,
+	const [position, setPosition] = useState<string | undefined>(user.type === "corporate" ? user.demographicInformation?.position : undefined);
+	const [corporateInformation, setCorporateInformation] = useState(user.type === "corporate" ? user.corporateInformation : undefined);
+	const [companyName, setCompanyName] = useState<string | undefined>(user.type === "agent" ? user.agentInformation?.companyName : undefined);
+	const [commercialRegistration, setCommercialRegistration] = useState<string | undefined>(
+		user.type === "agent" ? user.agentInformation?.commercialRegistration : undefined,
 	);
+	const [arabName, setArabName] = useState<string | undefined>(user.type === "agent" ? user.agentInformation?.companyArabName : undefined);
 
-  const [timezone, setTimezone] = useState<string>(
-    user.demographicInformation?.timezone || moment.tz.guess(),
-  );
+	const [timezone, setTimezone] = useState<string>(user.demographicInformation?.timezone || moment.tz.guess());
 
 	const [isPreferredTopicsOpen, setIsPreferredTopicsOpen] = useState(false);
 
@@ -168,12 +115,9 @@ function UserProfile({ user, mutateUser }: Props) {
 		const momentDate = moment(date);
 		const today = moment(new Date());
 
-    if (today.add(1, "days").isAfter(momentDate))
-      return "!bg-mti-red-ultralight border-mti-red-light";
-    if (today.add(3, "days").isAfter(momentDate))
-      return "!bg-mti-rose-ultralight border-mti-rose-light";
-    if (today.add(7, "days").isAfter(momentDate))
-      return "!bg-mti-orange-ultralight border-mti-orange-light";
+		if (today.add(1, "days").isAfter(momentDate)) return "!bg-mti-red-ultralight border-mti-red-light";
+		if (today.add(3, "days").isAfter(momentDate)) return "!bg-mti-rose-ultralight border-mti-rose-light";
+		if (today.add(7, "days").isAfter(momentDate)) return "!bg-mti-orange-ultralight border-mti-orange-light";
 	};
 
 	const uploadProfilePicture = async (event: ChangeEvent<HTMLInputElement>) => {
@@ -193,20 +137,15 @@ function UserProfile({ user, mutateUser }: Props) {
 		}
 
 		if (newPassword && !password) {
-      toast.error(
-        "To update your password you need to input your current one!",
-      );
+			toast.error("To update your password you need to input your current one!");
 			setIsLoading(false);
 			return;
 		}
 
 		if (email !== user?.email) {
-      const userAdmins = groups
-        .filter((x) => x.participants.includes(user.id))
-        .map((x) => x.admin);
+			const userAdmins = groups.filter((x) => x.participants.includes(user.id)).map((x) => x.admin);
 			const message =
-        users.filter((x) => userAdmins.includes(x.id) && x.type === "corporate")
-          .length > 0
+				users.filter((x) => userAdmins.includes(x.id) && x.type === "corporate").length > 0
 					? "If you change your e-mail address, you will lose all benefits from your university/institute. Are you sure you want to continue?"
 					: "Are you sure you want to update your e-mail address?";
 
@@ -227,6 +166,7 @@ function UserProfile({ user, mutateUser }: Props) {
 				desiredLevels,
 				preferredGender,
 				preferredTopics,
+				focus,
 				demographicInformation: {
 					phone,
 					country,
@@ -266,9 +206,7 @@ function UserProfile({ user, mutateUser }: Props) {
 
 	const ExpirationDate = () => (
 		<div className="flex flex-col gap-3 w-full">
-      <label className="font-normal text-base text-mti-gray-dim">
-        Expiry Date (click to purchase)
-      </label>
+			<label className="font-normal text-base text-mti-gray-dim">Expiry Date (click to purchase)</label>
 			<Link
 				href="/payment"
 				className={clsx(
@@ -278,29 +216,21 @@ function UserProfile({ user, mutateUser }: Props) {
 						? "!bg-mti-green-ultralight !border-mti-green-light"
 						: expirationDateColor(user.subscriptionExpirationDate),
 					"bg-white border-mti-gray-platinum",
-        )}
-      >
+				)}>
 				{!user.subscriptionExpirationDate && "Unlimited"}
-        {user.subscriptionExpirationDate &&
-          moment(user.subscriptionExpirationDate).format("DD/MM/YYYY")}
+				{user.subscriptionExpirationDate && moment(user.subscriptionExpirationDate).format("DD/MM/YYYY")}
 			</Link>
 		</div>
 	);
 
 	const TimezoneInput = () => (
 		<div className="flex flex-col gap-3 w-full">
-      <label className="font-normal text-base text-mti-gray-dim">
-        Timezone
-      </label>
+			<label className="font-normal text-base text-mti-gray-dim">Timezone</label>
 			<TimezoneSelect value={timezone} onChange={setTimezone} />
 		</div>
 	);
 
-  const manualDownloadLink = ["student", "teacher", "corporate"].includes(
-    user.type,
-  )
-    ? `/manuals/${user.type}.pdf`
-    : "";
+	const manualDownloadLink = ["student", "teacher", "corporate"].includes(user.type) ? `/manuals/${user.type}.pdf` : "";
 
 	return (
 		<Layout user={user}>
@@ -309,10 +239,7 @@ function UserProfile({ user, mutateUser }: Props) {
 				<div className="flex -md:flex-col-reverse -md:items-center w-full justify-between">
 					<div className="flex flex-col gap-8 w-full md:w-2/3">
 						<h1 className="text-4xl font-bold mb-6 -md:hidden">Edit Profile</h1>
-            <form
-              className="flex flex-col items-center gap-6 w-full"
-              onSubmit={(e) => e.preventDefault()}
-            >
+						<form className="flex flex-col items-center gap-6 w-full" onSubmit={(e) => e.preventDefault()}>
 							<DoubleColumnRow>
 								{user.type !== "corporate" ? (
 									<Input
@@ -408,9 +335,7 @@ function UserProfile({ user, mutateUser }: Props) {
 
 							<DoubleColumnRow>
 								<div className="flex flex-col gap-3 w-full">
-                  <label className="font-normal text-base text-mti-gray-dim">
-                    Country *
-                  </label>
+									<label className="font-normal text-base text-mti-gray-dim">Country *</label>
 									<CountrySelect value={country} onChange={setCountry} />
 								</div>
 								<Input
@@ -443,44 +368,55 @@ function UserProfile({ user, mutateUser }: Props) {
 
 							<Divider />
 
-              {desiredLevels &&
-                ["developer", "student"].includes(user.type) && (
+							{desiredLevels && ["developer", "student"].includes(user.type) && (
+								<>
 									<div className="flex flex-col gap-3 w-full">
-                    <label className="font-normal text-base text-mti-gray-dim">
-                      Desired Levels
-                    </label>
+										<label className="font-normal text-base text-mti-gray-dim">Desired Levels</label>
 										<ModuleLevelSelector
 											levels={desiredLevels}
-                      setLevels={
-                        setDesiredLevels as Dispatch<
-                          SetStateAction<{ [key in Module]: number }>
-                        >
-                      }
+											setLevels={setDesiredLevels as Dispatch<SetStateAction<{[key in Module]: number}>>}
 										/>
 									</div>
+									<div className="flex flex-col gap-3 w-full">
+										<label className="font-normal text-base text-mti-gray-dim">Focus</label>
+										<div className="grid grid-cols-1 md:grid-cols-2 gap-y-4 gap-x-16 w-full">
+											<button
+												onClick={() => setFocus("academic")}
+												className={clsx(
+													"w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-center items-center gap-12 bg-white",
+													"hover:bg-mti-purple-light hover:text-white",
+													focus === "academic" && "!bg-mti-purple-light !text-white",
+													"transition duration-300 ease-in-out",
+												)}>
+												Academic
+											</button>
+											<button
+												onClick={() => setFocus("general")}
+												className={clsx(
+													"w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-center items-center gap-12 bg-white",
+													"hover:bg-mti-purple-light hover:text-white",
+													focus === "general" && "!bg-mti-purple-light !text-white",
+													"transition duration-300 ease-in-out",
+												)}>
+												General
+											</button>
+										</div>
+									</div>
+								</>
 							)}
 
-              {preferredGender &&
-                ["developer", "student"].includes(user.type) && (
+							{preferredGender && ["developer", "student"].includes(user.type) && (
 								<>
 									<Divider />
 									<DoubleColumnRow>
 										<div className="flex flex-col gap-3 w-full">
-                        <label className="font-normal text-base text-mti-gray-dim">
-                          Speaking Instructor&apos;s Gender
-                        </label>
+											<label className="font-normal text-base text-mti-gray-dim">Speaking Instructor&apos;s Gender</label>
 											<Select
 												value={{
 													value: preferredGender,
 													label: capitalize(preferredGender),
 												}}
-                          onChange={(value) =>
-                            value
-                              ? setPreferredGender(
-                                  value.value as InstructorGender,
-                                )
-                              : null
-                          }
+												onChange={(value) => (value ? setPreferredGender(value.value as InstructorGender) : null)}
 												options={[
 													{value: "male", label: "Male"},
 													{value: "female", label: "Female"},
@@ -493,18 +429,12 @@ function UserProfile({ user, mutateUser }: Props) {
 												Preferred Topics{" "}
 												<span
 													className="tooltip"
-                            data-tip="These topics will be considered for speaking and writing modules, aiming to include at least one exercise containing of the these in the selected exams."
-                          >
+													data-tip="These topics will be considered for speaking and writing modules, aiming to include at least one exercise containing of the these in the selected exams.">
 													<BsQuestionCircleFill />
 												</span>
 											</label>
-                        <Button
-                          className="w-full"
-                          variant="outline"
-                          onClick={() => setIsPreferredTopicsOpen(true)}
-                        >
-                          Select Topics ({preferredTopics?.length || "All"}{" "}
-                          selected)
+											<Button className="w-full" variant="outline" onClick={() => setIsPreferredTopicsOpen(true)}>
+												Select Topics ({preferredTopics?.length || "All"} selected)
 											</Button>
 										</div>
 									</DoubleColumnRow>
@@ -529,9 +459,7 @@ function UserProfile({ user, mutateUser }: Props) {
 											name="companyUsers"
 											onChange={() => null}
 											label="Number of users"
-                      defaultValue={
-                        user.corporateInformation.companyInformation.userAmount
-                      }
+											defaultValue={user.corporateInformation.companyInformation.userAmount}
 											disabled
 											required
 										/>
@@ -575,20 +503,14 @@ function UserProfile({ user, mutateUser }: Props) {
 								</>
 							)}
 
-              {user.type === "corporate" &&
-                user.corporateInformation.referralAgent && (
+							{user.type === "corporate" && user.corporateInformation.referralAgent && (
 								<>
 									<Divider />
 									<DoubleColumnRow>
 										<Input
 											name="agentName"
 											onChange={() => null}
-                        defaultValue={
-                          users.find(
-                            (x) =>
-                              x.id === user.corporateInformation.referralAgent,
-                          )?.name
-                        }
+											defaultValue={users.find((x) => x.id === user.corporateInformation.referralAgent)?.name}
 											type="text"
 											label="Country Manager's Name"
 											placeholder="Not available"
@@ -598,12 +520,7 @@ function UserProfile({ user, mutateUser }: Props) {
 										<Input
 											name="agentEmail"
 											onChange={() => null}
-                        defaultValue={
-                          users.find(
-                            (x) =>
-                              x.id === user.corporateInformation.referralAgent,
-                          )?.email
-                        }
+											defaultValue={users.find((x) => x.id === user.corporateInformation.referralAgent)?.email}
 											type="text"
 											label="Country Manager's E-mail"
 											placeholder="Not available"
@@ -613,16 +530,11 @@ function UserProfile({ user, mutateUser }: Props) {
 									</DoubleColumnRow>
 									<DoubleColumnRow>
 										<div className="flex flex-col gap-2 w-full">
-                        <label className="font-normal text-base text-mti-gray-dim">
-                          Country Manager&apos;s Country *
-                        </label>
+											<label className="font-normal text-base text-mti-gray-dim">Country Manager&apos;s Country *</label>
 											<CountrySelect
 												value={
-                            users.find(
-                              (x) =>
-                                x.id ===
-                                user.corporateInformation.referralAgent,
-                            )?.demographicInformation?.country
+													users.find((x) => x.id === user.corporateInformation.referralAgent)?.demographicInformation
+														?.country
 												}
 												onChange={() => null}
 												disabled
@@ -636,10 +548,7 @@ function UserProfile({ user, mutateUser }: Props) {
 											onChange={() => null}
 											placeholder="Not available"
 											defaultValue={
-                          users.find(
-                            (x) =>
-                              x.id === user.corporateInformation.referralAgent,
-                          )?.demographicInformation?.phone
+												users.find((x) => x.id === user.corporateInformation.referralAgent)?.demographicInformation?.phone
 											}
 											disabled
 											required
@@ -650,10 +559,7 @@ function UserProfile({ user, mutateUser }: Props) {
 
 							{user.type !== "corporate" && (
 								<DoubleColumnRow>
-                  <EmploymentStatusInput
-                    value={employment}
-                    onChange={setEmployment}
-                  />
+									<EmploymentStatusInput value={employment} onChange={setEmployment} />
 
 									<div className="flex flex-col gap-8 w-full">
 										<GenderInput value={gender} onChange={setGender} />
@@ -666,62 +572,37 @@ function UserProfile({ user, mutateUser }: Props) {
 					<div className="flex flex-col gap-6 w-48">
 						<div
 							className="flex flex-col gap-3 items-center h-fit cursor-pointer group"
-              onClick={() => (profilePictureInput.current as any)?.click()}
-            >
+							onClick={() => (profilePictureInput.current as any)?.click()}>
 							<div className="relative overflow-hidden h-48 w-48 rounded-full">
 								<div
 									className={clsx(
 										"absolute top-0 left-0 bg-mti-purple-light/60 w-full h-full z-20 flex items-center justify-center opacity-0 group-hover:opacity-100",
 										"transition ease-in-out duration-300",
-                  )}
-                >
+									)}>
 									<BsCamera className="text-6xl text-mti-purple-ultralight/80" />
 								</div>
-                <img
-                  src={profilePicture}
-                  alt={user.name}
-                  className="aspect-square drop-shadow-xl self-end object-cover"
-                />
+								<img src={profilePicture} alt={user.name} className="aspect-square drop-shadow-xl self-end object-cover" />
 							</div>
-              <input
-                type="file"
-                className="hidden"
-                onChange={uploadProfilePicture}
-                accept="image/*"
-                ref={profilePictureInput}
-              />
+							<input type="file" className="hidden" onChange={uploadProfilePicture} accept="image/*" ref={profilePictureInput} />
 							<span
 								onClick={() => (profilePictureInput.current as any)?.click()}
-                className="cursor-pointer text-mti-purple-light text-sm"
-              >
+								className="cursor-pointer text-mti-purple-light text-sm">
 								Change picture
 							</span>
-              <h6 className="font-normal text-base text-mti-gray-taupe">
-                {USER_TYPE_LABELS[user.type]}
-              </h6>
+							<h6 className="font-normal text-base text-mti-gray-taupe">{USER_TYPE_LABELS[user.type]}</h6>
 						</div>
 						{user.type === "agent" && (
 							<div className="flag items-center h-fit">
 								<img
-                  alt={
-                    user.demographicInformation?.country.toLowerCase() + "_flag"
-                  }
+									alt={user.demographicInformation?.country.toLowerCase() + "_flag"}
 									src={`https://flagcdn.com/w320/${user.demographicInformation?.country.toLowerCase()}.png`}
 									width="320"
 								/>
 							</div>
 						)}
 						{manualDownloadLink && (
-              <a
-                href={manualDownloadLink}
-                className="max-w-[200px] self-end w-full"
-                download
-              >
-                <Button
-                  color="purple"
-                  variant="outline"
-                  className="max-w-[200px] self-end w-full"
-                >
+							<a href={manualDownloadLink} className="max-w-[200px] self-end w-full" download>
+								<Button color="purple" variant="outline" className="max-w-[200px] self-end w-full">
 									Download Manual
 								</Button>
 							</a>
@@ -740,20 +621,11 @@ function UserProfile({ user, mutateUser }: Props) {
 
 				<div className="self-end flex justify-between w-full gap-8 absolute bottom-8 left-0 px-8">
 					<Link href="/" className="max-w-[200px] self-end w-full">
-            <Button
-              color="purple"
-              variant="outline"
-              className="max-w-[200px] self-end w-full"
-            >
+						<Button color="purple" variant="outline" className="max-w-[200px] self-end w-full">
 							Back
 						</Button>
 					</Link>
-          <Button
-            color="purple"
-            className="max-w-[200px] self-end w-full"
-            onClick={updateUser}
-            disabled={isLoading}
-          >
+					<Button color="purple" className="max-w-[200px] self-end w-full" onClick={updateUser} disabled={isLoading}>
 						Save Changes
 					</Button>
 				</div>