Added a field for the agent where they can put their arab name

This commit is contained in:
Tiago Ribeiro
2024-04-20 16:01:35 +01:00
parent 36b861266f
commit a958e2ff0d
3 changed files with 1585 additions and 1203 deletions

View File

@@ -1,15 +1,15 @@
import useStats from "@/hooks/useStats"; import useStats from "@/hooks/useStats";
import {EMPLOYMENT_STATUS, User} from "@/interfaces/user"; import { EMPLOYMENT_STATUS, User } from "@/interfaces/user";
import {groupBySession, averageScore} from "@/utils/stats"; import { groupBySession, averageScore } from "@/utils/stats";
import {RadioGroup} from "@headlessui/react"; import { RadioGroup } from "@headlessui/react";
import axios from "axios"; import axios from "axios";
import clsx from "clsx"; import clsx from "clsx";
import moment from "moment"; import moment from "moment";
import {Divider} from "primereact/divider"; import { Divider } from "primereact/divider";
import {useEffect, useState} from "react"; import { useEffect, useState } from "react";
import ReactDatePicker from "react-datepicker"; import ReactDatePicker from "react-datepicker";
import {BsFileEarmarkText, BsPencil, BsStar} from "react-icons/bs"; import { BsFileEarmarkText, BsPencil, BsStar } from "react-icons/bs";
import {toast} from "react-toastify"; import { toast } from "react-toastify";
import Button from "./Low/Button"; import Button from "./Low/Button";
import Checkbox from "./Low/Checkbox"; import Checkbox from "./Low/Checkbox";
import CountrySelect from "./Low/CountrySelect"; import CountrySelect from "./Low/CountrySelect";
@@ -17,16 +17,19 @@ import Input from "./Low/Input";
import ProfileSummary from "./ProfileSummary"; import ProfileSummary from "./ProfileSummary";
import Select from "react-select"; import Select from "react-select";
import useUsers from "@/hooks/useUsers"; import useUsers from "@/hooks/useUsers";
import {USER_TYPE_LABELS} from "@/resources/user"; import { USER_TYPE_LABELS } from "@/resources/user";
import {CURRENCIES} from "@/resources/paypal"; import { CURRENCIES } from "@/resources/paypal";
const expirationDateColor = (date: Date) => { const expirationDateColor = (date: Date) => {
const momentDate = moment(date); const momentDate = moment(date);
const today = moment(new 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(1, "days").isAfter(momentDate))
if (today.add(3, "days").isAfter(momentDate)) return "!bg-mti-rose-ultralight border-mti-rose-light"; return "!bg-mti-red-ultralight border-mti-red-light";
if (today.add(7, "days").isAfter(momentDate)) return "!bg-mti-orange-ultralight border-mti-orange-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";
}; };
interface Props { interface Props {
@@ -59,17 +62,42 @@ const USER_TYPE_OPTIONS = Object.keys(USER_TYPE_LABELS).map((type) => ({
label: USER_TYPE_LABELS[type as keyof typeof USER_TYPE_LABELS], label: USER_TYPE_LABELS[type as keyof typeof USER_TYPE_LABELS],
})); }));
const CURRENCIES_OPTIONS = CURRENCIES.map(({label, currency}) => ({value: currency, label})); const CURRENCIES_OPTIONS = CURRENCIES.map(({ label, currency }) => ({
value: currency,
label,
}));
const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers, onViewCorporate, disabled = false}: Props) => { const UserCard = ({
const [expiryDate, setExpiryDate] = useState<Date | null | undefined>(user.subscriptionExpirationDate); user,
loggedInUser,
onClose,
onViewStudents,
onViewTeachers,
onViewCorporate,
disabled = false,
}: Props) => {
const [expiryDate, setExpiryDate] = useState<Date | null | undefined>(
user.subscriptionExpirationDate,
);
const [type, setType] = useState(user.type); const [type, setType] = useState(user.type);
const [status, setStatus] = useState(user.status); const [status, setStatus] = useState(user.status);
const [referralAgentLabel, setReferralAgentLabel] = useState<string>(); const [referralAgentLabel, setReferralAgentLabel] = useState<string>();
const [position, setPosition] = useState<string | undefined>(user.type === "corporate" ? user.demographicInformation?.position : undefined); const [position, setPosition] = useState<string | undefined>(
const [passport_id, setPassportID] = useState<string | undefined>(user.type === "student" ? user.demographicInformation?.passport_id : undefined); user.type === "corporate"
? user.demographicInformation?.position
: undefined,
);
const [passport_id, setPassportID] = useState<string | undefined>(
user.type === "student"
? user.demographicInformation?.passport_id
: undefined,
);
const [referralAgent, setReferralAgent] = useState(user.type === "corporate" ? user.corporateInformation?.referralAgent : undefined); const [referralAgent, setReferralAgent] = useState(
user.type === "corporate"
? user.corporateInformation?.referralAgent
: undefined,
);
const [companyName, setCompanyName] = useState( const [companyName, setCompanyName] = useState(
user.type === "corporate" user.type === "corporate"
? user.corporateInformation?.companyInformation.name ? user.corporateInformation?.companyInformation.name
@@ -77,16 +105,41 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
? user.agentInformation?.companyName ? user.agentInformation?.companyName
: undefined, : undefined,
); );
const [commercialRegistration, setCommercialRegistration] = useState( const [arabName, setArabName] = useState(
user.type === "agent" ? user.agentInformation?.commercialRegistration : undefined, user.type === "agent" ? user.agentInformation?.arabName : undefined,
); );
const [userAmount, setUserAmount] = useState(user.type === "corporate" ? user.corporateInformation?.companyInformation.userAmount : undefined); const [commercialRegistration, setCommercialRegistration] = useState(
const [paymentValue, setPaymentValue] = useState(user.type === "corporate" ? user.corporateInformation?.payment?.value : undefined); user.type === "agent"
const [paymentCurrency, setPaymentCurrency] = useState(user.type === "corporate" ? user.corporateInformation?.payment?.currency : "EUR"); ? user.agentInformation?.commercialRegistration
const [monthlyDuration, setMonthlyDuration] = useState(user.type === "corporate" ? user.corporateInformation?.monthlyDuration : undefined); : undefined,
const [commissionValue, setCommission] = useState(user.type === "corporate" ? user.corporateInformation?.payment?.commission : undefined); );
const {stats} = useStats(user.id); const [userAmount, setUserAmount] = useState(
const {users} = useUsers(); user.type === "corporate"
? user.corporateInformation?.companyInformation.userAmount
: undefined,
);
const [paymentValue, setPaymentValue] = useState(
user.type === "corporate"
? user.corporateInformation?.payment?.value
: undefined,
);
const [paymentCurrency, setPaymentCurrency] = useState(
user.type === "corporate"
? user.corporateInformation?.payment?.currency
: "EUR",
);
const [monthlyDuration, setMonthlyDuration] = useState(
user.type === "corporate"
? user.corporateInformation?.monthlyDuration
: undefined,
);
const [commissionValue, setCommission] = useState(
user.type === "corporate"
? user.corporateInformation?.payment?.commission
: undefined,
);
const { stats } = useStats(user.id);
const { users } = useUsers();
useEffect(() => { useEffect(() => {
if (users && users.length > 0) { if (users && users.length > 0) {
@@ -102,11 +155,14 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
const updateUser = () => { const updateUser = () => {
if (user.type === "corporate" && (!paymentValue || paymentValue < 0)) if (user.type === "corporate" && (!paymentValue || paymentValue < 0))
return toast.error("Please set a price for the user's package before updating!"); return toast.error(
if (!confirm(`Are you sure you want to update ${user.name}'s account?`)) return; "Please set a price for the user's package before updating!",
);
if (!confirm(`Are you sure you want to update ${user.name}'s account?`))
return;
axios axios
.post<{user?: User; ok?: boolean}>(`/api/users/update?id=${user.id}`, { .post<{ user?: User; ok?: boolean }>(`/api/users/update?id=${user.id}`, {
...user, ...user,
subscriptionExpirationDate: expiryDate, subscriptionExpirationDate: expiryDate,
type, type,
@@ -116,6 +172,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
? { ? {
companyName, companyName,
commercialRegistration, commercialRegistration,
arabName,
} }
: undefined, : undefined,
corporateInformation: corporateInformation:
@@ -130,7 +187,9 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
payment: { payment: {
value: paymentValue, value: paymentValue,
currency: paymentCurrency, currency: paymentCurrency,
...(referralAgent === "" ? {} : {commission: commissionValue}), ...(referralAgent === ""
? {}
: { commission: commissionValue }),
}, },
} }
: undefined, : undefined,
@@ -140,7 +199,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
onClose(true); onClose(true);
}) })
.catch(() => { .catch(() => {
toast.error("Something went wrong!", {toastId: "update-error"}); toast.error("Something went wrong!", { toastId: "update-error" });
}); });
}; };
@@ -150,17 +209,23 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
user={user} user={user}
items={[ items={[
{ {
icon: <BsFileEarmarkText className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />, icon: (
<BsFileEarmarkText className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />
),
value: Object.keys(groupBySession(stats)).length, value: Object.keys(groupBySession(stats)).length,
label: "Exams", label: "Exams",
}, },
{ {
icon: <BsPencil className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />, icon: (
<BsPencil className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />
),
value: stats.length, value: stats.length,
label: "Modules", label: "Modules",
}, },
{ {
icon: <BsStar className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />, icon: (
<BsStar className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />
),
value: `${stats.length > 0 ? averageScore(stats) : 0}%`, value: `${stats.length > 0 ? averageScore(stats) : 0}%`,
label: "Average Score", label: "Average Score",
}, },
@@ -169,13 +234,23 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
{user.type === "agent" && ( {user.type === "agent" && (
<> <>
<div className="grid grid-cols-1 md:grid-cols-2 gap-8 w-full"> <div className="grid grid-cols-1 md:grid-cols-3 gap-8 w-full">
<Input <Input
label="Corporate Name" label="Arab Name"
type="text"
name="arabName"
onChange={setArabName}
placeholder="Enter their arab name"
defaultValue={arabName}
required
disabled={disabled}
/>
<Input
label="Company Name"
type="text" type="text"
name="companyName" name="companyName"
onChange={setCompanyName} onChange={setCompanyName}
placeholder="Enter corporate name" placeholder="Enter their company's name"
defaultValue={companyName} defaultValue={companyName}
required required
disabled={disabled} disabled={disabled}
@@ -225,7 +300,9 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
disabled={disabled} disabled={disabled}
/> />
<div className="flex flex-col gap-3 w-full lg:col-span-3"> <div className="flex flex-col gap-3 w-full lg:col-span-3">
<label className="font-normal text-base text-mti-gray-dim">Pricing</label> <label className="font-normal text-base text-mti-gray-dim">
Pricing
</label>
<div className="w-full grid grid-cols-6 gap-2"> <div className="w-full grid grid-cols-6 gap-2">
<Input <Input
name="paymentValue" name="paymentValue"
@@ -238,14 +315,17 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
<Select <Select
className={clsx( className={clsx(
"px-4 py-4 col-span-3 w-full text-sm font-normal placeholder:text-mti-gray-cool bg-white rounded-full border border-mti-gray-platinum focus:outline-none", "px-4 py-4 col-span-3 w-full text-sm font-normal placeholder:text-mti-gray-cool bg-white rounded-full border border-mti-gray-platinum focus:outline-none",
disabled && "!bg-mti-gray-platinum/40 !text-mti-gray-dim cursor-not-allowed", disabled &&
"!bg-mti-gray-platinum/40 !text-mti-gray-dim cursor-not-allowed",
)} )}
options={CURRENCIES_OPTIONS} options={CURRENCIES_OPTIONS}
value={CURRENCIES_OPTIONS.find((c) => c.value === paymentCurrency)} value={CURRENCIES_OPTIONS.find(
(c) => c.value === paymentCurrency,
)}
onChange={(value) => setPaymentCurrency(value?.value)} onChange={(value) => setPaymentCurrency(value?.value)}
menuPortalTarget={document?.body} menuPortalTarget={document?.body}
styles={{ styles={{
menuPortal: (base) => ({...base, zIndex: 9999}), menuPortal: (base) => ({ ...base, zIndex: 9999 }),
control: (styles) => ({ control: (styles) => ({
...styles, ...styles,
paddingLeft: "4px", paddingLeft: "4px",
@@ -257,7 +337,11 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
}), }),
option: (styles, state) => ({ option: (styles, state) => ({
...styles, ...styles,
backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white", backgroundColor: state.isFocused
? "#D5D9F0"
: state.isSelected
? "#7872BF"
: "white",
color: state.isFocused ? "black" : styles.color, color: state.isFocused ? "black" : styles.color,
}), }),
}} }}
@@ -268,7 +352,9 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
</div> </div>
<div className="flex gap-3 w-full"> <div className="flex gap-3 w-full">
<div className="flex flex-col gap-3 w-8/12"> <div className="flex flex-col gap-3 w-8/12">
<label className="font-normal text-base text-mti-gray-dim">Country Manager</label> <label className="font-normal text-base text-mti-gray-dim">
Country Manager
</label>
{referralAgentLabel && ( {referralAgentLabel && (
<Select <Select
className={clsx( className={clsx(
@@ -277,8 +363,13 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
"!bg-mti-gray-platinum/40 !text-mti-gray-dim cursor-not-allowed", "!bg-mti-gray-platinum/40 !text-mti-gray-dim cursor-not-allowed",
)} )}
options={[ options={[
{value: "", label: "No referral"}, { value: "", label: "No referral" },
...users.filter((u) => u.type === "agent").map((x) => ({value: x.id, label: `${x.name} - ${x.email}`})), ...users
.filter((u) => u.type === "agent")
.map((x) => ({
value: x.id,
label: `${x.name} - ${x.email}`,
})),
]} ]}
defaultValue={{ defaultValue={{
value: referralAgent, value: referralAgent,
@@ -287,7 +378,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
menuPortalTarget={document?.body} menuPortalTarget={document?.body}
onChange={(value) => setReferralAgent(value?.value)} onChange={(value) => setReferralAgent(value?.value)}
styles={{ styles={{
menuPortal: (base) => ({...base, zIndex: 9999}), menuPortal: (base) => ({ ...base, zIndex: 9999 }),
control: (styles) => ({ control: (styles) => ({
...styles, ...styles,
paddingLeft: "4px", paddingLeft: "4px",
@@ -299,19 +390,27 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
}), }),
option: (styles, state) => ({ option: (styles, state) => ({
...styles, ...styles,
backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white", backgroundColor: state.isFocused
? "#D5D9F0"
: state.isSelected
? "#7872BF"
: "white",
color: state.isFocused ? "black" : styles.color, color: state.isFocused ? "black" : styles.color,
}), }),
}} }}
// editing country manager should only be available for dev/admin // editing country manager should only be available for dev/admin
isDisabled={!["developer", "admin"].includes(loggedInUser.type)} isDisabled={
!["developer", "admin"].includes(loggedInUser.type)
}
/> />
)} )}
</div> </div>
<div className="flex flex-col gap-3 w-4/12"> <div className="flex flex-col gap-3 w-4/12">
{referralAgent !== "" && loggedInUser.type !== "corporate" ? ( {referralAgent !== "" && loggedInUser.type !== "corporate" ? (
<> <>
<label className="font-normal text-base text-mti-gray-dim">Commission</label> <label className="font-normal text-base text-mti-gray-dim">
Commission
</label>
<Input <Input
name="commissionValue" name="commissionValue"
onChange={(e) => setCommission(e ? parseInt(e) : undefined)} onChange={(e) => setCommission(e ? parseInt(e) : undefined)}
@@ -353,8 +452,13 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
<div className="flex flex-col md:flex-row gap-8 w-full"> <div className="flex flex-col md:flex-row gap-8 w-full">
<div className="flex flex-col gap-3 w-full"> <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">
<CountrySelect disabled value={user.demographicInformation?.country} /> Country
</label>
<CountrySelect
disabled
value={user.demographicInformation?.country}
/>
</div> </div>
<Input <Input
type="tel" type="tel"
@@ -374,7 +478,11 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
label="Passport/National ID" label="Passport/National ID"
onChange={() => null} onChange={() => null}
placeholder="Enter National ID or Passport number" placeholder="Enter National ID or Passport number"
value={user.type === "student" ? user.demographicInformation?.passport_id : undefined} value={
user.type === "student"
? user.demographicInformation?.passport_id
: undefined
}
disabled disabled
required required
/> />
@@ -383,14 +491,17 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
<div className="flex flex-col md:flex-row gap-8 w-full"> <div className="flex flex-col md:flex-row gap-8 w-full">
{user.type !== "corporate" && ( {user.type !== "corporate" && (
<div className="relative flex flex-col gap-3 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> <label className="font-normal text-base text-mti-gray-dim">
Employment Status
</label>
<RadioGroup <RadioGroup
value={user.demographicInformation?.employment} value={user.demographicInformation?.employment}
className="grid grid-cols-2 items-center gap-4 place-items-center" className="grid grid-cols-2 items-center gap-4 place-items-center"
disabled={disabled}> disabled={disabled}
{EMPLOYMENT_STATUS.map(({status, label}) => ( >
{EMPLOYMENT_STATUS.map(({ status, label }) => (
<RadioGroup.Option value={status} key={status}> <RadioGroup.Option value={status} key={status}>
{({checked}) => ( {({ checked }) => (
<span <span
className={clsx( 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", "px-6 py-4 w-40 md:w-48 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
@@ -398,7 +509,8 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
!checked !checked
? "bg-white border-mti-gray-platinum" ? "bg-white border-mti-gray-platinum"
: "bg-mti-purple-light border-mti-purple-dark text-white", : "bg-mti-purple-light border-mti-purple-dark text-white",
)}> )}
>
{label} {label}
</span> </span>
)} )}
@@ -421,13 +533,16 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
)} )}
<div className="flex flex-col gap-8 w-full"> <div className="flex flex-col gap-8 w-full">
<div className="relative flex flex-col gap-3 w-full"> <div className="relative flex flex-col gap-3 w-full">
<label className="font-normal text-base text-mti-gray-dim">Gender</label> <label className="font-normal text-base text-mti-gray-dim">
Gender
</label>
<RadioGroup <RadioGroup
value={user.demographicInformation?.gender} value={user.demographicInformation?.gender}
className="flex flex-row gap-4 justify-between" className="flex flex-row gap-4 justify-between"
disabled={disabled}> disabled={disabled}
>
<RadioGroup.Option value="male"> <RadioGroup.Option value="male">
{({checked}) => ( {({ checked }) => (
<span <span
className={clsx( className={clsx(
"px-6 py-4 w-28 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer", "px-6 py-4 w-28 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
@@ -435,13 +550,14 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
!checked !checked
? "bg-white border-mti-gray-platinum" ? "bg-white border-mti-gray-platinum"
: "bg-mti-purple-light border-mti-purple-dark text-white", : "bg-mti-purple-light border-mti-purple-dark text-white",
)}> )}
>
Male Male
</span> </span>
)} )}
</RadioGroup.Option> </RadioGroup.Option>
<RadioGroup.Option value="female"> <RadioGroup.Option value="female">
{({checked}) => ( {({ checked }) => (
<span <span
className={clsx( className={clsx(
"px-6 py-4 w-28 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer", "px-6 py-4 w-28 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
@@ -449,13 +565,14 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
!checked !checked
? "bg-white border-mti-gray-platinum" ? "bg-white border-mti-gray-platinum"
: "bg-mti-purple-light border-mti-purple-dark text-white", : "bg-mti-purple-light border-mti-purple-dark text-white",
)}> )}
>
Female Female
</span> </span>
)} )}
</RadioGroup.Option> </RadioGroup.Option>
<RadioGroup.Option value="other"> <RadioGroup.Option value="other">
{({checked}) => ( {({ checked }) => (
<span <span
className={clsx( className={clsx(
"px-6 py-4 w-28 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer", "px-6 py-4 w-28 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
@@ -463,7 +580,8 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
!checked !checked
? "bg-white border-mti-gray-platinum" ? "bg-white border-mti-gray-platinum"
: "bg-mti-purple-light border-mti-purple-dark text-white", : "bg-mti-purple-light border-mti-purple-dark text-white",
)}> )}
>
Other Other
</span> </span>
)} )}
@@ -472,11 +590,20 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
</div> </div>
<div className="flex flex-col gap-3"> <div className="flex flex-col gap-3">
<div className="flex justify-between items-center"> <div className="flex justify-between items-center">
<label className="font-normal text-base text-mti-gray-dim">Expiry Date</label> <label className="font-normal text-base text-mti-gray-dim">
Expiry Date
</label>
<Checkbox <Checkbox
isChecked={!!expiryDate} isChecked={!!expiryDate}
onChange={(checked) => setExpiryDate(checked ? user.subscriptionExpirationDate || new Date() : null)} onChange={(checked) =>
disabled={disabled}> setExpiryDate(
checked
? user.subscriptionExpirationDate || new Date()
: null,
)
}
disabled={disabled}
>
Enabled Enabled
</Checkbox> </Checkbox>
</div> </div>
@@ -485,9 +612,12 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
className={clsx( className={clsx(
"p-6 w-full flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer", "p-6 w-full flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
"transition duration-300 ease-in-out", "transition duration-300 ease-in-out",
!expiryDate ? "!bg-mti-green-ultralight !border-mti-green-light" : expirationDateColor(expiryDate), !expiryDate
? "!bg-mti-green-ultralight !border-mti-green-light"
: expirationDateColor(expiryDate),
"bg-white border-mti-gray-platinum", "bg-white border-mti-gray-platinum",
)}> )}
>
{!expiryDate && "Unlimited"} {!expiryDate && "Unlimited"}
{expiryDate && moment(expiryDate).format("DD/MM/YYYY")} {expiryDate && moment(expiryDate).format("DD/MM/YYYY")}
</div> </div>
@@ -503,7 +633,9 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
filterDate={(date) => filterDate={(date) =>
moment(date).isAfter(new Date()) && moment(date).isAfter(new Date()) &&
(loggedInUser.subscriptionExpirationDate (loggedInUser.subscriptionExpirationDate
? moment(date).isBefore(moment(loggedInUser.subscriptionExpirationDate)) ? moment(date).isBefore(
moment(loggedInUser.subscriptionExpirationDate),
)
: true) : true)
} }
dateFormat="dd/MM/yyyy" dateFormat="dd/MM/yyyy"
@@ -515,18 +647,23 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
</div> </div>
</div> </div>
</div> </div>
{(loggedInUser.type === "developer" || loggedInUser.type === "admin") && ( {(loggedInUser.type === "developer" ||
loggedInUser.type === "admin") && (
<> <>
<Divider className="w-full !m-0" /> <Divider className="w-full !m-0" />
<div className="flex flex-col md:flex-row gap-8 w-full"> <div className="flex flex-col md:flex-row gap-8 w-full">
<div className="flex flex-col gap-3 w-full"> <div className="flex flex-col gap-3 w-full">
<label className="font-normal text-base text-mti-gray-dim">Status</label> <label className="font-normal text-base text-mti-gray-dim">
Status
</label>
<Select <Select
className="px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed bg-white rounded-full border border-mti-gray-platinum focus:outline-none" className="px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed bg-white rounded-full border border-mti-gray-platinum focus:outline-none"
options={USER_STATUS_OPTIONS} options={USER_STATUS_OPTIONS}
menuPortalTarget={document?.body} menuPortalTarget={document?.body}
value={USER_STATUS_OPTIONS.find((o) => o.value === status)} value={USER_STATUS_OPTIONS.find((o) => o.value === status)}
onChange={(value) => setStatus(value?.value as typeof user.status)} onChange={(value) =>
setStatus(value?.value as typeof user.status)
}
styles={{ styles={{
control: (styles) => ({ control: (styles) => ({
...styles, ...styles,
@@ -537,10 +674,14 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
outline: "none", outline: "none",
}, },
}), }),
menuPortal: (base) => ({...base, zIndex: 9999}), menuPortal: (base) => ({ ...base, zIndex: 9999 }),
option: (styles, state) => ({ option: (styles, state) => ({
...styles, ...styles,
backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white", backgroundColor: state.isFocused
? "#D5D9F0"
: state.isSelected
? "#7872BF"
: "white",
color: state.isFocused ? "black" : styles.color, color: state.isFocused ? "black" : styles.color,
}), }),
}} }}
@@ -548,13 +689,17 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
/> />
</div> </div>
<div className="flex flex-col gap-3 w-full"> <div className="flex flex-col gap-3 w-full">
<label className="font-normal text-base text-mti-gray-dim">Type</label> <label className="font-normal text-base text-mti-gray-dim">
Type
</label>
<Select <Select
className="px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed bg-white rounded-full border border-mti-gray-platinum focus:outline-none" className="px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed bg-white rounded-full border border-mti-gray-platinum focus:outline-none"
options={USER_TYPE_OPTIONS} options={USER_TYPE_OPTIONS}
menuPortalTarget={document?.body} menuPortalTarget={document?.body}
value={USER_TYPE_OPTIONS.find((o) => o.value === type)} value={USER_TYPE_OPTIONS.find((o) => o.value === type)}
onChange={(value) => setType(value?.value as typeof user.type)} onChange={(value) =>
setType(value?.value as typeof user.type)
}
styles={{ styles={{
control: (styles) => ({ control: (styles) => ({
...styles, ...styles,
@@ -565,10 +710,14 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
outline: "none", outline: "none",
}, },
}), }),
menuPortal: (base) => ({...base, zIndex: 9999}), menuPortal: (base) => ({ ...base, zIndex: 9999 }),
option: (styles, state) => ({ option: (styles, state) => ({
...styles, ...styles,
backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white", backgroundColor: state.isFocused
? "#D5D9F0"
: state.isSelected
? "#7872BF"
: "white",
color: state.isFocused ? "black" : styles.color, color: state.isFocused ? "black" : styles.color,
}), }),
}} }}
@@ -583,26 +732,49 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
<div className="flex gap-4 justify-between mt-4 w-full"> <div className="flex gap-4 justify-between mt-4 w-full">
<div className="self-start flex gap-4 justify-start items-center w-full"> <div className="self-start flex gap-4 justify-start items-center w-full">
{onViewCorporate && ["student", "teacher"].includes(user.type) && ( {onViewCorporate && ["student", "teacher"].includes(user.type) && (
<Button className="w-full max-w-[200px]" variant="outline" color="rose" onClick={onViewCorporate}> <Button
className="w-full max-w-[200px]"
variant="outline"
color="rose"
onClick={onViewCorporate}
>
View Corporate View Corporate
</Button> </Button>
)} )}
{onViewStudents && ["corporate", "teacher"].includes(user.type) && ( {onViewStudents && ["corporate", "teacher"].includes(user.type) && (
<Button className="w-full max-w-[200px]" variant="outline" color="rose" onClick={onViewStudents}> <Button
className="w-full max-w-[200px]"
variant="outline"
color="rose"
onClick={onViewStudents}
>
View Students View Students
</Button> </Button>
)} )}
{onViewTeachers && ["student", "corporate"].includes(user.type) && ( {onViewTeachers && ["student", "corporate"].includes(user.type) && (
<Button className="w-full max-w-[200px]" variant="outline" color="rose" onClick={onViewTeachers}> <Button
className="w-full max-w-[200px]"
variant="outline"
color="rose"
onClick={onViewTeachers}
>
View Teachers View Teachers
</Button> </Button>
)} )}
</div> </div>
<div className="self-end flex gap-4 w-full justify-end"> <div className="self-end flex gap-4 w-full justify-end">
<Button className="w-full max-w-[200px]" variant="outline" onClick={onClose}> <Button
className="w-full max-w-[200px]"
variant="outline"
onClick={onClose}
>
Close Close
</Button> </Button>
<Button disabled={disabled} onClick={updateUser} className="w-full max-w-[200px]"> <Button
disabled={disabled}
onClick={updateUser}
className="w-full max-w-[200px]"
>
Update Update
</Button> </Button>
</div> </div>

View File

@@ -1,7 +1,13 @@
import {Module} from "."; import { Module } from ".";
import {InstructorGender} from "./exam"; import { InstructorGender } from "./exam";
export type User = StudentUser | TeacherUser | CorporateUser | AgentUser | AdminUser | DeveloperUser; export type User =
| StudentUser
| TeacherUser
| CorporateUser
| AgentUser
| AdminUser
| DeveloperUser;
export type UserStatus = "active" | "disabled" | "paymentDue"; export type UserStatus = "active" | "disabled" | "paymentDue";
export interface BasicUser { export interface BasicUser {
@@ -11,8 +17,8 @@ export interface BasicUser {
id: string; id: string;
isFirstLogin: boolean; isFirstLogin: boolean;
focus: "academic" | "general"; focus: "academic" | "general";
levels: {[key in Module]: number}; levels: { [key in Module]: number };
desiredLevels: {[key in Module]: number}; desiredLevels: { [key in Module]: number };
type: Type; type: Type;
bio: string; bio: string;
isVerified: boolean; isVerified: boolean;
@@ -71,6 +77,7 @@ export interface CorporateInformation {
export interface AgentInformation { export interface AgentInformation {
companyName: string; companyName: string;
commercialRegistration: string; commercialRegistration: string;
arabName?: string;
} }
export interface CompanyInformation { export interface CompanyInformation {
@@ -96,15 +103,22 @@ export interface DemographicCorporateInformation {
} }
export type Gender = "male" | "female" | "other"; export type Gender = "male" | "female" | "other";
export type EmploymentStatus = "employed" | "student" | "self-employed" | "unemployed" | "retired" | "other"; export type EmploymentStatus =
export const EMPLOYMENT_STATUS: {status: EmploymentStatus; label: string}[] = [ | "employed"
{status: "student", label: "Student"}, | "student"
{status: "employed", label: "Employed"}, | "self-employed"
{status: "unemployed", label: "Unemployed"}, | "unemployed"
{status: "self-employed", label: "Self-employed"}, | "retired"
{status: "retired", label: "Retired"}, | "other";
{status: "other", label: "Other"}, export const EMPLOYMENT_STATUS: { status: EmploymentStatus; label: string }[] =
]; [
{ status: "student", label: "Student" },
{ status: "employed", label: "Employed" },
{ status: "unemployed", label: "Unemployed" },
{ status: "self-employed", label: "Self-employed" },
{ status: "retired", label: "Retired" },
{ status: "other", label: "Other" },
];
export interface Stat { export interface Stat {
id: string; id: string;
@@ -146,5 +160,18 @@ export interface Code {
passport_id?: string; passport_id?: string;
} }
export type Type = "student" | "teacher" | "corporate" | "admin" | "developer" | "agent"; export type Type =
export const userTypes: Type[] = ["student", "teacher", "corporate", "admin", "developer", "agent"]; | "student"
| "teacher"
| "corporate"
| "admin"
| "developer"
| "agent";
export const userTypes: Type[] = [
"student",
"teacher",
"corporate",
"admin",
"developer",
"agent",
];

View File

@@ -1,39 +1,53 @@
/* eslint-disable @next/next/no-img-element */ /* eslint-disable @next/next/no-img-element */
import Head from "next/head"; import Head from "next/head";
import {withIronSessionSsr} from "iron-session/next"; import { withIronSessionSsr } from "iron-session/next";
import {sessionOptions} from "@/lib/session"; 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 useUser from "@/hooks/useUser";
import {toast, ToastContainer} from "react-toastify"; import { toast, ToastContainer } from "react-toastify";
import Layout from "@/components/High/Layout"; import Layout from "@/components/High/Layout";
import Input from "@/components/Low/Input"; import Input from "@/components/Low/Input";
import Button from "@/components/Low/Button"; import Button from "@/components/Low/Button";
import Link from "next/link"; import Link from "next/link";
import axios from "axios"; import axios from "axios";
import {ErrorMessage} from "@/constants/errors"; import { ErrorMessage } from "@/constants/errors";
import clsx from "clsx"; 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 CountrySelect from "@/components/Low/CountrySelect";
import {shouldRedirectHome} from "@/utils/navigation.disabled"; import { shouldRedirectHome } from "@/utils/navigation.disabled";
import moment from "moment"; import moment from "moment";
import {BsCamera, BsQuestionCircleFill} from "react-icons/bs"; import { BsCamera, BsQuestionCircleFill } from "react-icons/bs";
import {USER_TYPE_LABELS} from "@/resources/user"; import { USER_TYPE_LABELS } from "@/resources/user";
import useGroups from "@/hooks/useGroups"; import useGroups from "@/hooks/useGroups";
import useUsers from "@/hooks/useUsers"; import useUsers from "@/hooks/useUsers";
import {convertBase64} from "@/utils"; import { convertBase64 } from "@/utils";
import {Divider} from "primereact/divider"; import { Divider } from "primereact/divider";
import GenderInput from "@/components/High/GenderInput"; import GenderInput from "@/components/High/GenderInput";
import EmploymentStatusInput from "@/components/High/EmploymentStatusInput"; import EmploymentStatusInput from "@/components/High/EmploymentStatusInput";
import TimezoneSelect from "@/components/Low/TImezoneSelect"; import TimezoneSelect from "@/components/Low/TImezoneSelect";
import Modal from "@/components/Modal"; import Modal from "@/components/Modal";
import {Module} from "@/interfaces"; import { Module } from "@/interfaces";
import ModuleLevelSelector from "@/components/Medium/ModuleLevelSelector"; import ModuleLevelSelector from "@/components/Medium/ModuleLevelSelector";
import Select from "@/components/Low/Select"; import Select from "@/components/Low/Select";
import {InstructorGender} from "@/interfaces/exam"; import { InstructorGender } from "@/interfaces/exam";
import {capitalize} from "lodash"; import { capitalize } from "lodash";
import TopicModal from "@/components/Medium/TopicModal"; import TopicModal from "@/components/Medium/TopicModal";
import {v4} from "uuid"; import { v4 } from "uuid";
export const getServerSideProps = withIronSessionSsr(({req, res}) => { export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
const user = req.session.user; const user = req.session.user;
if (!user || !user.isVerified) { if (!user || !user.isVerified) {
@@ -55,7 +69,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
} }
return { return {
props: {user: req.session.user}, props: { user: req.session.user },
}; };
}, sessionOptions); }, sessionOptions);
@@ -64,9 +78,11 @@ interface Props {
mutateUser: Function; mutateUser: Function;
} }
const DoubleColumnRow = ({children}: {children: ReactNode}) => <div className="flex flex-col md: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) { function UserProfile({ user, mutateUser }: Props) {
const [bio, setBio] = useState(user.bio || ""); const [bio, setBio] = useState(user.bio || "");
const [name, setName] = useState(user.name || ""); const [name, setName] = useState(user.name || "");
const [email, setEmail] = useState(user.email || ""); const [email, setEmail] = useState(user.email || "");
@@ -75,46 +91,89 @@ function UserProfile({user, mutateUser}: Props) {
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [profilePicture, setProfilePicture] = useState(user.profilePicture); const [profilePicture, setProfilePicture] = useState(user.profilePicture);
const [desiredLevels, setDesiredLevels] = useState<{[key in Module]: number} | undefined>( const [desiredLevels, setDesiredLevels] = useState<
["developer", "student"].includes(user.type) ? user.desiredLevels : undefined, { [key in Module]: number } | undefined
>(
["developer", "student"].includes(user.type)
? user.desiredLevels
: undefined,
); );
const [country, setCountry] = useState<string>(user.demographicInformation?.country || ""); const [country, setCountry] = useState<string>(
const [phone, setPhone] = useState<string>(user.demographicInformation?.phone || ""); user.demographicInformation?.country || "",
const [gender, setGender] = useState<Gender | undefined>(user.demographicInformation?.gender || undefined); );
const [phone, setPhone] = useState<string>(
user.demographicInformation?.phone || "",
);
const [gender, setGender] = useState<Gender | undefined>(
user.demographicInformation?.gender || undefined,
);
const [employment, setEmployment] = useState<EmploymentStatus | undefined>( const [employment, setEmployment] = useState<EmploymentStatus | undefined>(
user.type === "corporate" ? undefined : user.demographicInformation?.employment, user.type === "corporate"
? undefined
: user.demographicInformation?.employment,
);
const [passport_id, setPassportID] = useState<string | undefined>(
user.type === "student"
? user.demographicInformation?.passport_id
: undefined,
); );
const [passport_id, setPassportID] = useState<string | undefined>(user.type === "student" ? user.demographicInformation?.passport_id : undefined);
const [preferredGender, setPreferredGender] = useState<InstructorGender | undefined>( const [preferredGender, setPreferredGender] = useState<
user.type === "student" || user.type === "developer" ? user.preferredGender || "varied" : undefined, InstructorGender | undefined
>(
user.type === "student" || user.type === "developer"
? user.preferredGender || "varied"
: undefined,
); );
const [preferredTopics, setPreferredTopics] = useState<string[] | 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 [position, setPosition] = useState<string | undefined>(
const [corporateInformation, setCorporateInformation] = useState(user.type === "corporate" ? user.corporateInformation : undefined); user.type === "corporate"
const [companyName, setCompanyName] = useState<string | undefined>(user.type === "agent" ? user.agentInformation?.companyName : undefined); ? user.demographicInformation?.position
const [commercialRegistration, setCommercialRegistration] = useState<string | undefined>( : undefined,
user.type === "agent" ? user.agentInformation?.commercialRegistration : 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?.arabName : 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); const [isPreferredTopicsOpen, setIsPreferredTopicsOpen] = useState(false);
const {groups} = useGroups(); const { groups } = useGroups();
const {users} = useUsers(); const { users } = useUsers();
const profilePictureInput = useRef(null); const profilePictureInput = useRef(null);
const expirationDateColor = (date: Date) => { const expirationDateColor = (date: Date) => {
const momentDate = moment(date); const momentDate = moment(date);
const today = moment(new 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(1, "days").isAfter(momentDate))
if (today.add(3, "days").isAfter(momentDate)) return "!bg-mti-rose-ultralight border-mti-rose-light"; return "!bg-mti-red-ultralight border-mti-red-light";
if (today.add(7, "days").isAfter(momentDate)) return "!bg-mti-orange-ultralight border-mti-orange-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>) => { const uploadProfilePicture = async (event: ChangeEvent<HTMLInputElement>) => {
@@ -134,15 +193,20 @@ function UserProfile({user, mutateUser}: Props) {
} }
if (newPassword && !password) { 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); setIsLoading(false);
return; return;
} }
if (email !== user?.email) { 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 = 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?" ? "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?"; : "Are you sure you want to update your e-mail address?";
@@ -172,12 +236,21 @@ function UserProfile({user, mutateUser}: Props) {
passport_id, passport_id,
timezone, timezone,
}, },
...(user.type === "corporate" ? {corporateInformation} : {}), ...(user.type === "corporate" ? { corporateInformation } : {}),
...(user.type === "agent"
? {
agentInformation: {
companyName,
commercialRegistration,
arabName,
},
}
: {}),
}) })
.then((response) => { .then((response) => {
if (response.status === 200) { if (response.status === 200) {
toast.success("Your profile has been updated!"); toast.success("Your profile has been updated!");
mutateUser((response.data as {user: User}).user); mutateUser((response.data as { user: User }).user);
setIsLoading(false); setIsLoading(false);
return; return;
} }
@@ -193,7 +266,9 @@ function UserProfile({user, mutateUser}: Props) {
const ExpirationDate = () => ( const ExpirationDate = () => (
<div className="flex flex-col gap-3 w-full"> <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 <Link
href="/payment" href="/payment"
className={clsx( className={clsx(
@@ -203,21 +278,29 @@ function UserProfile({user, mutateUser}: Props) {
? "!bg-mti-green-ultralight !border-mti-green-light" ? "!bg-mti-green-ultralight !border-mti-green-light"
: expirationDateColor(user.subscriptionExpirationDate), : expirationDateColor(user.subscriptionExpirationDate),
"bg-white border-mti-gray-platinum", "bg-white border-mti-gray-platinum",
)}> )}
>
{!user.subscriptionExpirationDate && "Unlimited"} {!user.subscriptionExpirationDate && "Unlimited"}
{user.subscriptionExpirationDate && moment(user.subscriptionExpirationDate).format("DD/MM/YYYY")} {user.subscriptionExpirationDate &&
moment(user.subscriptionExpirationDate).format("DD/MM/YYYY")}
</Link> </Link>
</div> </div>
); );
const TimezoneInput = () => ( const TimezoneInput = () => (
<div className="flex flex-col gap-3 w-full"> <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} /> <TimezoneSelect value={timezone} onChange={setTimezone} />
</div> </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 ( return (
<Layout user={user}> <Layout user={user}>
@@ -230,7 +313,7 @@ function UserProfile({user, mutateUser}: Props) {
<DoubleColumnRow> <DoubleColumnRow>
{user.type !== "corporate" ? ( {user.type !== "corporate" ? (
<Input <Input
label="Name" label={user.type === "agent" ? "English name" : "Name"}
type="text" type="text"
name="name" name="name"
onChange={(e) => setName(e)} onChange={(e) => setName(e)}
@@ -246,7 +329,10 @@ function UserProfile({user, mutateUser}: Props) {
onChange={(e) => onChange={(e) =>
setCorporateInformation((prev) => ({ setCorporateInformation((prev) => ({
...prev!, ...prev!,
companyInformation: {...prev!.companyInformation, name: e}, companyInformation: {
...prev!.companyInformation,
name: e,
},
})) }))
} }
placeholder="Enter your company's name" placeholder="Enter your company's name"
@@ -255,6 +341,18 @@ function UserProfile({user, mutateUser}: Props) {
/> />
)} )}
{user.type === "agent" && (
<Input
label="Arab name"
type="text"
name="arabName"
onChange={(e) => setArabName(e)}
placeholder="Enter your arab name"
defaultValue={arabName}
required
/>
)}
<Input <Input
label="E-mail Address" label="E-mail Address"
type="email" type="email"
@@ -285,11 +383,11 @@ function UserProfile({user, mutateUser}: Props) {
{user.type === "agent" && ( {user.type === "agent" && (
<div className="grid grid-cols-1 md:grid-cols-2 gap-8 w-full"> <div className="grid grid-cols-1 md:grid-cols-2 gap-8 w-full">
<Input <Input
label="Corporate Name" label="Company Name"
type="text" type="text"
name="companyName" name="companyName"
onChange={() => null} onChange={() => null}
placeholder="Enter corporate name" placeholder="Enter your company's name"
defaultValue={companyName} defaultValue={companyName}
disabled disabled
/> />
@@ -307,7 +405,9 @@ function UserProfile({user, mutateUser}: Props) {
<DoubleColumnRow> <DoubleColumnRow>
<div className="flex flex-col gap-3 w-full"> <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} /> <CountrySelect value={country} onChange={setCountry} />
</div> </div>
<Input <Input
@@ -340,29 +440,48 @@ function UserProfile({user, mutateUser}: Props) {
<Divider /> <Divider />
{desiredLevels && ["developer", "student"].includes(user.type) && ( {desiredLevels &&
["developer", "student"].includes(user.type) && (
<div className="flex flex-col gap-3 w-full"> <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 <ModuleLevelSelector
levels={desiredLevels} levels={desiredLevels}
setLevels={setDesiredLevels as Dispatch<SetStateAction<{[key in Module]: number}>>} setLevels={
setDesiredLevels as Dispatch<
SetStateAction<{ [key in Module]: number }>
>
}
/> />
</div> </div>
)} )}
{preferredGender && ["developer", "student"].includes(user.type) && ( {preferredGender &&
["developer", "student"].includes(user.type) && (
<> <>
<Divider /> <Divider />
<DoubleColumnRow> <DoubleColumnRow>
<div className="flex flex-col gap-3 w-full"> <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 <Select
value={{value: preferredGender, label: capitalize(preferredGender)}} value={{
onChange={(value) => (value ? setPreferredGender(value.value as InstructorGender) : null)} value: preferredGender,
label: capitalize(preferredGender),
}}
onChange={(value) =>
value
? setPreferredGender(
value.value as InstructorGender,
)
: null
}
options={[ options={[
{value: "male", label: "Male"}, { value: "male", label: "Male" },
{value: "female", label: "Female"}, { value: "female", label: "Female" },
{value: "varied", label: "Varied"}, { value: "varied", label: "Varied" },
]} ]}
/> />
</div> </div>
@@ -371,12 +490,18 @@ function UserProfile({user, mutateUser}: Props) {
Preferred Topics{" "} Preferred Topics{" "}
<span <span
className="tooltip" 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 /> <BsQuestionCircleFill />
</span> </span>
</label> </label>
<Button className="w-full" variant="outline" onClick={() => setIsPreferredTopicsOpen(true)}> <Button
Select Topics ({preferredTopics?.length || "All"} selected) className="w-full"
variant="outline"
onClick={() => setIsPreferredTopicsOpen(true)}
>
Select Topics ({preferredTopics?.length || "All"}{" "}
selected)
</Button> </Button>
</div> </div>
</DoubleColumnRow> </DoubleColumnRow>
@@ -388,10 +513,10 @@ function UserProfile({user, mutateUser}: Props) {
selectTopics={setPreferredTopics} selectTopics={setPreferredTopics}
initialTopics={preferredTopics || []} initialTopics={preferredTopics || []}
/> />
</>
)}
<Divider /> <Divider />
</>
)}
{user.type === "corporate" && ( {user.type === "corporate" && (
<> <>
@@ -401,7 +526,9 @@ function UserProfile({user, mutateUser}: Props) {
name="companyUsers" name="companyUsers"
onChange={() => null} onChange={() => null}
label="Number of users" label="Number of users"
defaultValue={user.corporateInformation.companyInformation.userAmount} defaultValue={
user.corporateInformation.companyInformation.userAmount
}
disabled disabled
required required
/> />
@@ -445,14 +572,20 @@ function UserProfile({user, mutateUser}: Props) {
</> </>
)} )}
{user.type === "corporate" && user.corporateInformation.referralAgent && ( {user.type === "corporate" &&
user.corporateInformation.referralAgent && (
<> <>
<Divider /> <Divider />
<DoubleColumnRow> <DoubleColumnRow>
<Input <Input
name="agentName" name="agentName"
onChange={() => null} onChange={() => null}
defaultValue={users.find((x) => x.id === user.corporateInformation.referralAgent)?.name} defaultValue={
users.find(
(x) =>
x.id === user.corporateInformation.referralAgent,
)?.name
}
type="text" type="text"
label="Country Manager's Name" label="Country Manager's Name"
placeholder="Not available" placeholder="Not available"
@@ -462,7 +595,12 @@ function UserProfile({user, mutateUser}: Props) {
<Input <Input
name="agentEmail" name="agentEmail"
onChange={() => null} onChange={() => null}
defaultValue={users.find((x) => x.id === user.corporateInformation.referralAgent)?.email} defaultValue={
users.find(
(x) =>
x.id === user.corporateInformation.referralAgent,
)?.email
}
type="text" type="text"
label="Country Manager's E-mail" label="Country Manager's E-mail"
placeholder="Not available" placeholder="Not available"
@@ -472,11 +610,16 @@ function UserProfile({user, mutateUser}: Props) {
</DoubleColumnRow> </DoubleColumnRow>
<DoubleColumnRow> <DoubleColumnRow>
<div className="flex flex-col gap-2 w-full"> <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 <CountrySelect
value={ value={
users.find((x) => x.id === user.corporateInformation.referralAgent)?.demographicInformation users.find(
?.country (x) =>
x.id ===
user.corporateInformation.referralAgent,
)?.demographicInformation?.country
} }
onChange={() => null} onChange={() => null}
disabled disabled
@@ -490,7 +633,10 @@ function UserProfile({user, mutateUser}: Props) {
onChange={() => null} onChange={() => null}
placeholder="Not available" placeholder="Not available"
defaultValue={ defaultValue={
users.find((x) => x.id === user.corporateInformation.referralAgent)?.demographicInformation?.phone users.find(
(x) =>
x.id === user.corporateInformation.referralAgent,
)?.demographicInformation?.phone
} }
disabled disabled
required required
@@ -501,7 +647,10 @@ function UserProfile({user, mutateUser}: Props) {
{user.type !== "corporate" && ( {user.type !== "corporate" && (
<DoubleColumnRow> <DoubleColumnRow>
<EmploymentStatusInput value={employment} onChange={setEmployment} /> <EmploymentStatusInput
value={employment}
onChange={setEmployment}
/>
<div className="flex flex-col gap-8 w-full"> <div className="flex flex-col gap-8 w-full">
<GenderInput value={gender} onChange={setGender} /> <GenderInput value={gender} onChange={setGender} />
@@ -514,37 +663,62 @@ function UserProfile({user, mutateUser}: Props) {
<div className="flex flex-col gap-6 w-48"> <div className="flex flex-col gap-6 w-48">
<div <div
className="flex flex-col gap-3 items-center h-fit cursor-pointer group" 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="relative overflow-hidden h-48 w-48 rounded-full">
<div <div
className={clsx( 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", "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", "transition ease-in-out duration-300",
)}> )}
>
<BsCamera className="text-6xl text-mti-purple-ultralight/80" /> <BsCamera className="text-6xl text-mti-purple-ultralight/80" />
</div> </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> </div>
<input type="file" className="hidden" onChange={uploadProfilePicture} accept="image/*" ref={profilePictureInput} /> <input
type="file"
className="hidden"
onChange={uploadProfilePicture}
accept="image/*"
ref={profilePictureInput}
/>
<span <span
onClick={() => (profilePictureInput.current as any)?.click()} 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 Change picture
</span> </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> </div>
{user.type === "agent" && ( {user.type === "agent" && (
<div className="flag items-center h-fit"> <div className="flag items-center h-fit">
<img <img
alt={user.demographicInformation?.country.toLowerCase() + "_flag"} alt={
user.demographicInformation?.country.toLowerCase() + "_flag"
}
src={`https://flagcdn.com/w320/${user.demographicInformation?.country.toLowerCase()}.png`} src={`https://flagcdn.com/w320/${user.demographicInformation?.country.toLowerCase()}.png`}
width="320" width="320"
/> />
</div> </div>
)} )}
{manualDownloadLink && ( {manualDownloadLink && (
<a href={manualDownloadLink} className="max-w-[200px] self-end w-full" download> <a
<Button color="purple" variant="outline" className="max-w-[200px] self-end w-full"> 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 Download Manual
</Button> </Button>
</a> </a>
@@ -563,11 +737,20 @@ function UserProfile({user, mutateUser}: Props) {
<div className="self-end flex justify-between w-full gap-8 absolute bottom-8 left-0 px-8"> <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"> <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 Back
</Button> </Button>
</Link> </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 Save Changes
</Button> </Button>
</div> </div>
@@ -577,7 +760,7 @@ function UserProfile({user, mutateUser}: Props) {
} }
export default function Home() { export default function Home() {
const {user, mutateUser} = useUser({redirectTo: "/login"}); const { user, mutateUser } = useUser({ redirectTo: "/login" });
return ( return (
<> <>