Initial approach where I replaced all the entries for checkAccess

This commit is contained in:
Joao Ramos
2024-07-25 09:13:13 +01:00
parent 19d16c9cef
commit f6b4d6ad52
7 changed files with 3435 additions and 2720 deletions

View File

@@ -16,6 +16,7 @@ import ShortUniqueId from "short-unique-id";
import Button from "../Low/Button"; import Button from "../Low/Button";
import Input from "../Low/Input"; import Input from "../Low/Input";
import Select from "../Low/Select"; import Select from "../Low/Select";
import { checkAccess } from "@/utils/permissions";
interface Props { interface Props {
user: User; user: User;
@@ -137,13 +138,13 @@ export default function TicketDisplay({ user, ticket, onClose }: Props) {
options={[ options={[
{ value: "me", label: "Assign to me" }, { value: "me", label: "Assign to me" },
...users ...users
.filter((x) => ["admin", "developer", "agent"].includes(x.type)) .filter((x) => checkAccess(x, ["admin", "developer", "agent"]))
.map((u) => ({ .map((u) => ({
value: u.id, value: u.id,
label: `${u.name} - ${u.email}`, label: `${u.name} - ${u.email}`,
})), })),
]} ]}
disabled={user.type === "agent"} disabled={checkAccess(user, ["agent"])}
value={ value={
assignedTo assignedTo
? { ? {

View File

@@ -1,12 +1,13 @@
import {User} from "@/interfaces/user"; import { User } from "@/interfaces/user";
import {Dialog, Transition} from "@headlessui/react"; import { Dialog, Transition } from "@headlessui/react";
import axios from "axios"; import axios from "axios";
import clsx from "clsx"; import clsx from "clsx";
import Image from "next/image"; import Image from "next/image";
import Link from "next/link"; import Link from "next/link";
import {useRouter} from "next/router"; import { useRouter } from "next/router";
import {Fragment} from "react"; import { Fragment } from "react";
import {BsXLg} from "react-icons/bs"; import { BsXLg } from "react-icons/bs";
import { checkAccess, getTypesOfUser } from "@/utils/permissions";
interface Props { interface Props {
isOpen: boolean; isOpen: boolean;
@@ -16,7 +17,13 @@ interface Props {
disableNavigation?: boolean; disableNavigation?: boolean;
} }
export default function MobileMenu({isOpen, onClose, path, user, disableNavigation}: Props) { export default function MobileMenu({
isOpen,
onClose,
path,
user,
disableNavigation,
}: Props) {
const router = useRouter(); const router = useRouter();
const logout = async () => { const logout = async () => {
@@ -35,7 +42,8 @@ export default function MobileMenu({isOpen, onClose, path, user, disableNavigati
enterTo="opacity-100" enterTo="opacity-100"
leave="ease-in duration-200" leave="ease-in duration-200"
leaveFrom="opacity-100" leaveFrom="opacity-100"
leaveTo="opacity-0"> leaveTo="opacity-0"
>
<div className="fixed inset-0 bg-black bg-opacity-25" /> <div className="fixed inset-0 bg-black bg-opacity-25" />
</Transition.Child> </Transition.Child>
@@ -48,14 +56,30 @@ export default function MobileMenu({isOpen, onClose, path, user, disableNavigati
enterTo="opacity-100 scale-100" enterTo="opacity-100 scale-100"
leave="ease-in duration-200" leave="ease-in duration-200"
leaveFrom="opacity-100 scale-100" leaveFrom="opacity-100 scale-100"
leaveTo="opacity-0 scale-95"> leaveTo="opacity-0 scale-95"
>
<Dialog.Panel className="flex h-screen w-full transform flex-col gap-8 overflow-hidden bg-white text-left align-middle text-black shadow-xl transition-all"> <Dialog.Panel className="flex h-screen w-full transform flex-col gap-8 overflow-hidden bg-white text-left align-middle text-black shadow-xl transition-all">
<Dialog.Title as="header" className="-md:flex w-full items-center justify-between px-8 py-2 shadow-sm md:hidden"> <Dialog.Title
as="header"
className="-md:flex w-full items-center justify-between px-8 py-2 shadow-sm md:hidden"
>
<Link href={disableNavigation ? "" : "/"}> <Link href={disableNavigation ? "" : "/"}>
<Image src="/logo_title.png" alt="EnCoach logo" width={69} height={69} /> <Image
src="/logo_title.png"
alt="EnCoach logo"
width={69}
height={69}
/>
</Link> </Link>
<div className="cursor-pointer" onClick={onClose} tabIndex={0}> <div
<BsXLg className="text-mti-purple-light text-2xl" onClick={onClose} /> className="cursor-pointer"
onClick={onClose}
tabIndex={0}
>
<BsXLg
className="text-mti-purple-light text-2xl"
onClick={onClose}
/>
</div> </div>
</Dialog.Title> </Dialog.Title>
<div className="flex h-full flex-col gap-6 px-8 text-lg"> <div className="flex h-full flex-col gap-6 px-8 text-lg">
@@ -63,18 +87,22 @@ export default function MobileMenu({isOpen, onClose, path, user, disableNavigati
href={disableNavigation ? "" : "/"} href={disableNavigation ? "" : "/"}
className={clsx( className={clsx(
"w-fit transition duration-300 ease-in-out", "w-fit transition duration-300 ease-in-out",
path === "/" && "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ", path === "/" &&
)}> "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold "
)}
>
Dashboard Dashboard
</Link> </Link>
{(user.type === "student" || user.type === "teacher" || user.type === "developer") && ( {checkAccess(user, ["student", "teacher", "developer"]) && (
<> <>
<Link <Link
href={disableNavigation ? "" : "/exam"} href={disableNavigation ? "" : "/exam"}
className={clsx( className={clsx(
"w-fit transition duration-300 ease-in-out", "w-fit transition duration-300 ease-in-out",
path === "/exam" && "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ", path === "/exam" &&
)}> "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold "
)}
>
Exams Exams
</Link> </Link>
<Link <Link
@@ -82,8 +110,9 @@ export default function MobileMenu({isOpen, onClose, path, user, disableNavigati
className={clsx( className={clsx(
"w-fit transition duration-300 ease-in-out", "w-fit transition duration-300 ease-in-out",
path === "/exercises" && path === "/exercises" &&
"text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ", "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold "
)}> )}
>
Exercises Exercises
</Link> </Link>
</> </>
@@ -92,46 +121,67 @@ export default function MobileMenu({isOpen, onClose, path, user, disableNavigati
href={disableNavigation ? "" : "/stats"} href={disableNavigation ? "" : "/stats"}
className={clsx( className={clsx(
"w-fit transition duration-300 ease-in-out", "w-fit transition duration-300 ease-in-out",
path === "/stats" && "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ", path === "/stats" &&
)}> "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold "
)}
>
Stats Stats
</Link> </Link>
<Link <Link
href={disableNavigation ? "" : "/record"} href={disableNavigation ? "" : "/record"}
className={clsx( className={clsx(
"w-fit transition duration-300 ease-in-out", "w-fit transition duration-300 ease-in-out",
path === "/record" && "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ", path === "/record" &&
)}> "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold "
)}
>
Record Record
</Link> </Link>
{["admin", "developer", "agent", "corporate", "mastercorporate"].includes(user.type) && ( {checkAccess(user, [
"admin",
"developer",
"agent",
"corporate",
"mastercorporate",
]) && (
<Link <Link
href={disableNavigation ? "" : "/payment-record"} href={disableNavigation ? "" : "/payment-record"}
className={clsx( className={clsx(
"w-fit transition duration-300 ease-in-out", "w-fit transition duration-300 ease-in-out",
path === "/payment-record" && path === "/payment-record" &&
"text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ", "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold "
)}> )}
>
Payment Record Payment Record
</Link> </Link>
)} )}
{["admin", "developer", "corporate", "teacher", "mastercorporate"].includes(user.type) && ( {checkAccess(user, [
"admin",
"developer",
"corporate",
"teacher",
"mastercorporate",
]) && (
<Link <Link
href={disableNavigation ? "" : "/settings"} href={disableNavigation ? "" : "/settings"}
className={clsx( className={clsx(
"w-fit transition duration-300 ease-in-out", "w-fit transition duration-300 ease-in-out",
path === "/settings" && "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ", path === "/settings" &&
)}> "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold "
)}
>
Settings Settings
</Link> </Link>
)} )}
{["admin", "developer", "agent"].includes(user.type) && ( {checkAccess(user, ["admin", "developer", "agent"]) && (
<Link <Link
href={disableNavigation ? "" : "/tickets"} href={disableNavigation ? "" : "/tickets"}
className={clsx( className={clsx(
"w-fit transition duration-300 ease-in-out", "w-fit transition duration-300 ease-in-out",
path === "/tickets" && "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ", path === "/tickets" &&
)}> "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold "
)}
>
Tickets Tickets
</Link> </Link>
)} )}
@@ -139,14 +189,19 @@ export default function MobileMenu({isOpen, onClose, path, user, disableNavigati
href={disableNavigation ? "" : "/profile"} href={disableNavigation ? "" : "/profile"}
className={clsx( className={clsx(
"w-fit transition duration-300 ease-in-out", "w-fit transition duration-300 ease-in-out",
path === "/profile" && "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ", path === "/profile" &&
)}> "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold "
)}
>
Profile Profile
</Link> </Link>
<span <span
className={clsx("w-fit cursor-pointer justify-self-end transition duration-300 ease-in-out")} className={clsx(
onClick={logout}> "w-fit cursor-pointer justify-self-end transition duration-300 ease-in-out"
)}
onClick={logout}
>
Logout Logout
</span> </span>
</div> </div>

View File

@@ -1,15 +1,26 @@
import useStats from "@/hooks/useStats"; import useStats from "@/hooks/useStats";
import {CorporateInformation, CorporateUser, EMPLOYMENT_STATUS, User} from "@/interfaces/user"; import {
import {groupBySession, averageScore} from "@/utils/stats"; CorporateInformation,
import {RadioGroup} from "@headlessui/react"; CorporateUser,
EMPLOYMENT_STATUS,
User,
} from "@/interfaces/user";
import { groupBySession, averageScore } from "@/utils/stats";
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, BsPerson, BsPersonAdd, BsStar} from "react-icons/bs"; import {
import {toast} from "react-toastify"; BsFileEarmarkText,
BsPencil,
BsPerson,
BsPersonAdd,
BsStar,
} from "react-icons/bs";
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,17 +28,21 @@ 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";
import useCodes from "@/hooks/useCodes"; import useCodes from "@/hooks/useCodes";
import { checkAccess, getTypesOfUser } from "@/utils/permissions";
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 {
@@ -63,39 +78,86 @@ 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}) => ({ const CURRENCIES_OPTIONS = CURRENCIES.map(({ label, currency }) => ({
value: currency, value: currency,
label, label,
})); }));
const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers, onViewCorporate, disabled = false, disabledFields = {}}: Props) => { const UserCard = ({
const [expiryDate, setExpiryDate] = useState<Date | null | undefined>(user.subscriptionExpirationDate); user,
loggedInUser,
onClose,
onViewStudents,
onViewTeachers,
onViewCorporate,
disabled = false,
disabledFields = {},
}: 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
: user.type === "agent" : user.type === "agent"
? user.agentInformation?.companyName ? user.agentInformation?.companyName
: undefined, : undefined
);
const [arabName, setArabName] = useState(
user.type === "agent" ? user.agentInformation?.companyArabName : undefined
); );
const [arabName, setArabName] = useState(user.type === "agent" ? user.agentInformation?.companyArabName : undefined);
const [commercialRegistration, setCommercialRegistration] = useState( const [commercialRegistration, setCommercialRegistration] = useState(
user.type === "agent" ? user.agentInformation?.commercialRegistration : undefined, user.type === "agent"
? user.agentInformation?.commercialRegistration
: undefined
); );
const [userAmount, setUserAmount] = useState(user.type === "corporate" ? user.corporateInformation?.companyInformation.userAmount : undefined); const [userAmount, setUserAmount] = useState(
const [paymentValue, setPaymentValue] = useState(user.type === "corporate" ? user.corporateInformation?.payment?.value : undefined); user.type === "corporate"
const [paymentCurrency, setPaymentCurrency] = useState(user.type === "corporate" ? user.corporateInformation?.payment?.currency : "EUR"); ? user.corporateInformation?.companyInformation.userAmount
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 [paymentValue, setPaymentValue] = useState(
const {users} = useUsers(); user.type === "corporate"
const {codes} = useCodes(user.id); ? 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();
const { codes } = useCodes(user.id);
useEffect(() => { useEffect(() => {
if (users && users.length > 0) { if (users && users.length > 0) {
@@ -111,11 +173,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,
@@ -140,7 +205,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,
@@ -150,13 +217,15 @@ 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" });
}); });
}; };
const generalProfileItems = [ const generalProfileItems = [
{ {
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",
}, },
@@ -176,12 +245,16 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
user.type === "corporate" user.type === "corporate"
? [ ? [
{ {
icon: <BsPerson className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />, icon: (
<BsPerson className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />
),
value: codes.length, value: codes.length,
label: "Users Used", label: "Users Used",
}, },
{ {
icon: <BsPersonAdd className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />, icon: (
<BsPersonAdd className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />
),
value: user.corporateInformation.companyInformation.userAmount, value: user.corporateInformation.companyInformation.userAmount,
label: "Number of Users", label: "Number of Users",
}, },
@@ -190,7 +263,14 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
return ( return (
<> <>
<ProfileSummary user={user} items={user.type === "corporate" ? corporateProfileItems : generalProfileItems} /> <ProfileSummary
user={user}
items={
user.type === "corporate"
? corporateProfileItems
: generalProfileItems
}
/>
{user.type === "agent" && ( {user.type === "agent" && (
<> <>
@@ -260,7 +340,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"
@@ -273,14 +355,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",
@@ -292,7 +377,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,
}), }),
}} }}
@@ -303,16 +392,22 @@ 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(
"px-4 py-4 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 w-full text-sm font-normal placeholder:text-mti-gray-cool bg-white rounded-full border border-mti-gray-platinum focus:outline-none",
(!["developer", "admin"].includes(loggedInUser.type) || disabledFields.countryManager) && (checkAccess(
"!bg-mti-gray-platinum/40 !text-mti-gray-dim cursor-not-allowed", loggedInUser,
getTypesOfUser(["developer", "admin"])
) ||
disabledFields.countryManager) &&
"!bg-mti-gray-platinum/40 !text-mti-gray-dim cursor-not-allowed"
)} )}
options={[ options={[
{value: "", label: "No referral"}, { value: "", label: "No referral" },
...users ...users
.filter((u) => u.type === "agent") .filter((u) => u.type === "agent")
.map((x) => ({ .map((x) => ({
@@ -327,7 +422,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",
@@ -339,19 +434,30 @@ 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) || disabledFields.countryManager} isDisabled={
checkAccess(
loggedInUser,
getTypesOfUser(["developer", "admin"])
) || disabledFields.countryManager
}
/> />
)} )}
</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)}
@@ -393,8 +499,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"
@@ -414,31 +525,39 @@ 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
/> />
)} )}
<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 !== 'mastercorporate' && ( {user.type !== "corporate" && user.type !== "mastercorporate" && (
<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",
"transition duration-300 ease-in-out", "transition duration-300 ease-in-out",
!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>
)} )}
@@ -461,49 +580,55 @@ 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",
"transition duration-300 ease-in-out", "transition duration-300 ease-in-out",
!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",
"transition duration-300 ease-in-out", "transition duration-300 ease-in-out",
!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",
"transition duration-300 ease-in-out", "transition duration-300 ease-in-out",
!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>
)} )}
@@ -512,11 +637,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>
@@ -525,9 +659,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-white border-mti-gray-platinum", ? "!bg-mti-green-ultralight !border-mti-green-light"
)}> : expirationDateColor(expiryDate),
"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>
@@ -538,12 +675,14 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
"p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer", "p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
"hover:border-mti-purple tooltip", "hover:border-mti-purple tooltip",
expirationDateColor(expiryDate), expirationDateColor(expiryDate),
"transition duration-300 ease-in-out", "transition duration-300 ease-in-out"
)} )}
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"
@@ -555,18 +694,22 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
</div> </div>
</div> </div>
</div> </div>
{(loggedInUser.type === "developer" || loggedInUser.type === "admin") && ( {checkAccess(loggedInUser, ["developer", "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,
@@ -577,10 +720,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,
}), }),
}} }}
@@ -588,13 +735,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,
@@ -605,10 +756,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,
}), }),
}} }}
@@ -623,26 +778,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,19 +1,19 @@
/* 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 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 {shouldRedirectHome} from "@/utils/navigation.disabled"; import { shouldRedirectHome } from "@/utils/navigation.disabled";
import {useState} from "react"; import { useState } from "react";
import {Module} from "@/interfaces"; import { Module } from "@/interfaces";
import {RadioGroup, Tab} from "@headlessui/react"; import { RadioGroup, Tab } from "@headlessui/react";
import clsx from "clsx"; import clsx from "clsx";
import {MODULE_ARRAY} from "@/utils/moduleUtils"; import { MODULE_ARRAY } from "@/utils/moduleUtils";
import {capitalize} from "lodash"; import { capitalize } from "lodash";
import Button from "@/components/Low/Button"; import Button from "@/components/Low/Button";
import {Exercise, ReadingPart} from "@/interfaces/exam"; import { Exercise, ReadingPart } from "@/interfaces/exam";
import Input from "@/components/Low/Input"; import Input from "@/components/Low/Input";
import axios from "axios"; import axios from "axios";
import ReadingGeneration from "./(generation)/ReadingGeneration"; import ReadingGeneration from "./(generation)/ReadingGeneration";
@@ -21,8 +21,9 @@ import ListeningGeneration from "./(generation)/ListeningGeneration";
import WritingGeneration from "./(generation)/WritingGeneration"; import WritingGeneration from "./(generation)/WritingGeneration";
import LevelGeneration from "./(generation)/LevelGeneration"; import LevelGeneration from "./(generation)/LevelGeneration";
import SpeakingGeneration from "./(generation)/SpeakingGeneration"; import SpeakingGeneration from "./(generation)/SpeakingGeneration";
import { checkAccess, getTypesOfUser } from "@/utils/permissions";
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) {
@@ -30,28 +31,31 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
redirect: { redirect: {
destination: "/login", destination: "/login",
permanent: false, permanent: false,
} },
}; };
} }
if (shouldRedirectHome(user) || user.type !== "developer") { if (
shouldRedirectHome(user) ||
checkAccess(user, getTypesOfUser(["developer"]))
) {
return { return {
redirect: { redirect: {
destination: "/", destination: "/",
permanent: false, permanent: false,
} },
}; };
} }
return { return {
props: {user: req.session.user}, props: { user: req.session.user },
}; };
}, sessionOptions); }, sessionOptions);
export default function Generation() { export default function Generation() {
const [module, setModule] = useState<Module>("reading"); const [module, setModule] = useState<Module>("reading");
const {user} = useUser({redirectTo: "/login"}); const { user } = useUser({ redirectTo: "/login" });
return ( return (
<> <>
@@ -69,14 +73,17 @@ export default function Generation() {
<Layout user={user} className="gap-6"> <Layout user={user} className="gap-6">
<h1 className="text-2xl font-semibold">Exam Generation</h1> <h1 className="text-2xl font-semibold">Exam Generation</h1>
<div className="flex flex-col gap-3"> <div className="flex flex-col gap-3">
<label className="font-normal text-base text-mti-gray-dim">Module</label> <label className="font-normal text-base text-mti-gray-dim">
Module
</label>
<RadioGroup <RadioGroup
value={module} value={module}
onChange={setModule} onChange={setModule}
className="flex flex-row -2xl:flex-wrap w-full gap-4 -md:justify-center justify-between"> className="flex flex-row -2xl:flex-wrap w-full gap-4 -md:justify-center justify-between"
>
{[...MODULE_ARRAY].map((x) => ( {[...MODULE_ARRAY].map((x) => (
<RadioGroup.Option value={x} key={x}> <RadioGroup.Option value={x} key={x}>
{({checked}) => ( {({ checked }) => (
<span <span
className={clsx( className={clsx(
"px-6 py-4 w-64 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer", "px-6 py-4 w-64 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
@@ -100,8 +107,9 @@ export default function Generation() {
x === "level" && x === "level" &&
(!checked (!checked
? "bg-white border-mti-gray-platinum" ? "bg-white border-mti-gray-platinum"
: "bg-ielts-level/70 border-ielts-level text-white"), : "bg-ielts-level/70 border-ielts-level text-white")
)}> )}
>
{capitalize(x)} {capitalize(x)}
</span> </span>
)} )}

View File

@@ -1,25 +1,33 @@
/* 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 Navbar from "@/components/Navbar"; import Navbar from "@/components/Navbar";
import {BsFileEarmarkText, BsPencil, BsStar, BsBook, BsHeadphones, BsPen, BsMegaphone} from "react-icons/bs"; import {
import {withIronSessionSsr} from "iron-session/next"; BsFileEarmarkText,
import {sessionOptions} from "@/lib/session"; BsPencil,
import {useEffect, useState} from "react"; BsStar,
BsBook,
BsHeadphones,
BsPen,
BsMegaphone,
} from "react-icons/bs";
import { withIronSessionSsr } from "iron-session/next";
import { sessionOptions } from "@/lib/session";
import { useEffect, useState } from "react";
import useStats from "@/hooks/useStats"; import useStats from "@/hooks/useStats";
import {averageScore, groupBySession, totalExams} from "@/utils/stats"; import { averageScore, groupBySession, totalExams } from "@/utils/stats";
import useUser from "@/hooks/useUser"; import useUser from "@/hooks/useUser";
import Diagnostic from "@/components/Diagnostic"; import Diagnostic from "@/components/Diagnostic";
import {ToastContainer} from "react-toastify"; import { ToastContainer } from "react-toastify";
import {capitalize} from "lodash"; import { capitalize } from "lodash";
import {Module} from "@/interfaces"; import { Module } from "@/interfaces";
import ProgressBar from "@/components/Low/ProgressBar"; import ProgressBar from "@/components/Low/ProgressBar";
import Layout from "@/components/High/Layout"; import Layout from "@/components/High/Layout";
import {calculateAverageLevel} from "@/utils/score"; import { calculateAverageLevel } from "@/utils/score";
import axios from "axios"; import axios from "axios";
import DemographicInformationInput from "@/components/DemographicInformationInput"; import DemographicInformationInput from "@/components/DemographicInformationInput";
import moment from "moment"; import moment from "moment";
import Link from "next/link"; import Link from "next/link";
import {MODULE_ARRAY} from "@/utils/moduleUtils"; import { MODULE_ARRAY } from "@/utils/moduleUtils";
import ProfileSummary from "@/components/ProfileSummary"; import ProfileSummary from "@/components/ProfileSummary";
import StudentDashboard from "@/dashboards/Student"; import StudentDashboard from "@/dashboards/Student";
import AdminDashboard from "@/dashboards/Admin"; import AdminDashboard from "@/dashboards/Admin";
@@ -28,16 +36,22 @@ import TeacherDashboard from "@/dashboards/Teacher";
import AgentDashboard from "@/dashboards/Agent"; import AgentDashboard from "@/dashboards/Agent";
import MasterCorporateDashboard from "@/dashboards/MasterCorporate"; import MasterCorporateDashboard from "@/dashboards/MasterCorporate";
import PaymentDue from "./(status)/PaymentDue"; import PaymentDue from "./(status)/PaymentDue";
import {useRouter} from "next/router"; import { useRouter } from "next/router";
import {PayPalScriptProvider} from "@paypal/react-paypal-js"; import { PayPalScriptProvider } from "@paypal/react-paypal-js";
import {CorporateUser, MasterCorporateUser, Type, userTypes} from "@/interfaces/user"; import {
CorporateUser,
MasterCorporateUser,
Type,
userTypes,
} from "@/interfaces/user";
import Select from "react-select"; import Select from "react-select";
import {USER_TYPE_LABELS} from "@/resources/user"; import { USER_TYPE_LABELS } from "@/resources/user";
import { checkAccess, getTypesOfUser } from "@/utils/permissions";
export const getServerSideProps = withIronSessionSsr(({req, res}) => { export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
const user = req.session.user; const user = req.session.user;
const envVariables: {[key: string]: string} = {}; const envVariables: { [key: string]: string } = {};
Object.keys(process.env) Object.keys(process.env)
.filter((x) => x.startsWith("NEXT_PUBLIC")) .filter((x) => x.startsWith("NEXT_PUBLIC"))
.forEach((x: string) => { .forEach((x: string) => {
@@ -54,21 +68,21 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
} }
return { return {
props: {user: req.session.user, envVariables}, props: { user: req.session.user, envVariables },
}; };
}, sessionOptions); }, sessionOptions);
interface Props { interface Props {
user: any; user: any;
envVariables: {[key: string]: string}; envVariables: { [key: string]: string };
} }
export default function Home(props: Props) { export default function Home(props: Props) {
const {envVariables} = props; const { envVariables } = props;
const [showDiagnostics, setShowDiagnostics] = useState(false); const [showDiagnostics, setShowDiagnostics] = useState(false);
const [showDemographicInput, setShowDemographicInput] = useState(false); const [showDemographicInput, setShowDemographicInput] = useState(false);
const [selectedScreen, setSelectedScreen] = useState<Type>("admin"); const [selectedScreen, setSelectedScreen] = useState<Type>("admin");
const {user, mutateUser} = useUser({redirectTo: "/login"}); const { user, mutateUser } = useUser({ redirectTo: "/login" });
const router = useRouter(); const router = useRouter();
useEffect(() => { useEffect(() => {
@@ -77,7 +91,7 @@ export default function Home(props: Props) {
!user.demographicInformation || !user.demographicInformation ||
!user.demographicInformation.country || !user.demographicInformation.country ||
!user.demographicInformation.gender || !user.demographicInformation.gender ||
!user.demographicInformation.phone, !user.demographicInformation.phone
); );
setShowDiagnostics(user.isFirstLogin && user.type === "student"); setShowDiagnostics(user.isFirstLogin && user.type === "student");
} }
@@ -92,7 +106,12 @@ export default function Home(props: Props) {
return true; return true;
}; };
if (user && (user.status === "paymentDue" || user.status === "disabled" || checkIfUserExpired())) { if (
user &&
(user.status === "paymentDue" ||
user.status === "disabled" ||
checkIfUserExpired())
) {
return ( return (
<> <>
<Head> <Head>
@@ -107,12 +126,19 @@ export default function Home(props: Props) {
{user.status === "disabled" && ( {user.status === "disabled" && (
<Layout user={user} navDisabled> <Layout user={user} navDisabled>
<div className="flex flex-col items-center justify-center text-center w-full gap-4"> <div className="flex flex-col items-center justify-center text-center w-full gap-4">
<span className="font-bold text-lg">Your account has been disabled!</span> <span className="font-bold text-lg">
<span>Please contact an administrator if you believe this to be a mistake.</span> Your account has been disabled!
</span>
<span>
Please contact an administrator if you believe this to be a
mistake.
</span>
</div> </div>
</Layout> </Layout>
)} )}
{(user.status === "paymentDue" || checkIfUserExpired()) && <PaymentDue hasExpired user={user} reload={router.reload} />} {(user.status === "paymentDue" || checkIfUserExpired()) && (
<PaymentDue hasExpired user={user} reload={router.reload} />
)}
</> </>
); );
} }
@@ -169,24 +195,44 @@ export default function Home(props: Props) {
<ToastContainer /> <ToastContainer />
{user && ( {user && (
<Layout user={user}> <Layout user={user}>
{user.type === "student" && <StudentDashboard user={user} />} {checkAccess(user, ["student"]) && <StudentDashboard user={user} />}
{user.type === "teacher" && <TeacherDashboard user={user} />} {checkAccess(user, ["teacher"]) && <TeacherDashboard user={user} />}
{user.type === "corporate" && <CorporateDashboard user={user} />} {checkAccess(user, ["corporate"]) && (
{user.type === "mastercorporate" && <MasterCorporateDashboard user={user} />} <CorporateDashboard user={user as CorporateUser} />
{user.type === "agent" && <AgentDashboard user={user} />} )}
{user.type === "admin" && <AdminDashboard user={user} />} {checkAccess(user, ["mastercorporate"]) && (
{user.type === "developer" && ( <MasterCorporateDashboard user={user as MasterCorporateUser} />
)}
{checkAccess(user, ["agent"]) && <AgentDashboard user={user} />}
{checkAccess(user, ["admin"]) && <AdminDashboard user={user} />}
{checkAccess(user, ["developer"]) && (
<> <>
<Select <Select
options={userTypes.map((u) => ({value: u, label: USER_TYPE_LABELS[u]}))} options={userTypes.map((u) => ({
value={{value: selectedScreen, label: USER_TYPE_LABELS[selectedScreen]}} value: u,
onChange={(value) => (value ? setSelectedScreen(value.value) : setSelectedScreen("admin"))} label: USER_TYPE_LABELS[u],
}))}
value={{
value: selectedScreen,
label: USER_TYPE_LABELS[selectedScreen],
}}
onChange={(value) =>
value
? setSelectedScreen(value.value)
: setSelectedScreen("admin")
}
/> />
{selectedScreen === "student" && <StudentDashboard user={user} />} {selectedScreen === "student" && <StudentDashboard user={user} />}
{selectedScreen === "teacher" && <TeacherDashboard user={user} />} {selectedScreen === "teacher" && <TeacherDashboard user={user} />}
{selectedScreen === "corporate" && <CorporateDashboard user={user as unknown as CorporateUser} />} {selectedScreen === "corporate" && (
{selectedScreen === "mastercorporate" && <MasterCorporateDashboard user={user as unknown as MasterCorporateUser} />} <CorporateDashboard user={user as unknown as CorporateUser} />
)}
{selectedScreen === "mastercorporate" && (
<MasterCorporateDashboard
user={user as unknown as MasterCorporateUser}
/>
)}
{selectedScreen === "agent" && <AgentDashboard user={user} />} {selectedScreen === "agent" && <AgentDashboard user={user} />}
{selectedScreen === "admin" && <AdminDashboard user={user} />} {selectedScreen === "admin" && <AdminDashboard user={user} />}
</> </>

File diff suppressed because it is too large Load Diff

View File

@@ -1,39 +1,56 @@
/* 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,
DemographicInformation,
} 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}) => { import { checkAccess, getTypesOfUser } from "@/utils/permissions";
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 +72,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
} }
return { return {
props: {user: req.session.user}, props: { user: req.session.user },
}; };
}, sessionOptions); }, sessionOptions);
@@ -64,9 +81,11 @@ interface Props {
mutateUser: Function; 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) { 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,49 +94,88 @@ 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
>(
checkAccess(user, ["developer", "student"]) ? user.desiredLevels : undefined
); );
const [focus, setFocus] = useState<"academic" | "general">(user.focus); const [focus, setFocus] = useState<"academic" | "general">(user.focus);
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 [employment, setEmployment] = useState<EmploymentStatus | undefined>( const [phone, setPhone] = useState<string>(
user.type === "corporate" || user.type === "mastercorporate" ? undefined : user.demographicInformation?.employment, user.demographicInformation?.phone || ""
);
const [gender, setGender] = useState<Gender | undefined>(
user.demographicInformation?.gender || undefined
);
const [employment, setEmployment] = useState<EmploymentStatus | undefined>(
checkAccess(user, ["corporate", "mastercorporate"])
? undefined
: (user.demographicInformation as DemographicInformation)?.employment
);
const [passport_id, setPassportID] = useState<string | undefined>(
checkAccess(user, ["student"])
? (user.demographicInformation as 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?.companyArabName : 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); 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>) => {
@@ -137,15 +195,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?";
@@ -176,7 +239,7 @@ function UserProfile({user, mutateUser}: Props) {
passport_id, passport_id,
timezone, timezone,
}, },
...(user.type === "corporate" ? {corporateInformation} : {}), ...(user.type === "corporate" ? { corporateInformation } : {}),
...(user.type === "agent" ...(user.type === "agent"
? { ? {
agentInformation: { agentInformation: {
@@ -190,7 +253,7 @@ function UserProfile({user, mutateUser}: Props) {
.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;
} }
@@ -206,7 +269,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(
@@ -215,22 +280,30 @@ function UserProfile({user, mutateUser}: Props) {
!user.subscriptionExpirationDate !user.subscriptionExpirationDate
? "!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}>
@@ -239,7 +312,10 @@ function UserProfile({user, mutateUser}: Props) {
<div className="flex -md:flex-col-reverse -md:items-center w-full justify-between"> <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"> <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> <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> <DoubleColumnRow>
{user.type !== "corporate" ? ( {user.type !== "corporate" ? (
<Input <Input
@@ -335,7 +411,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
@@ -368,26 +446,37 @@ 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>
<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">Focus</label> <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"> <div className="grid grid-cols-1 md:grid-cols-2 gap-y-4 gap-x-16 w-full">
<button <button
onClick={() => setFocus("academic")} onClick={() => setFocus("academic")}
className={clsx( className={clsx(
"w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-center items-center gap-12 bg-white", "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", "hover:bg-mti-purple-light hover:text-white",
focus === "academic" && "!bg-mti-purple-light !text-white", focus === "academic" &&
"transition duration-300 ease-in-out", "!bg-mti-purple-light !text-white",
)}> "transition duration-300 ease-in-out"
)}
>
Academic Academic
</button> </button>
<button <button
@@ -395,9 +484,11 @@ function UserProfile({user, mutateUser}: Props) {
className={clsx( className={clsx(
"w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-center items-center gap-12 bg-white", "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", "hover:bg-mti-purple-light hover:text-white",
focus === "general" && "!bg-mti-purple-light !text-white", focus === "general" &&
"transition duration-300 ease-in-out", "!bg-mti-purple-light !text-white",
)}> "transition duration-300 ease-in-out"
)}
>
General General
</button> </button>
</div> </div>
@@ -405,22 +496,31 @@ function UserProfile({user, mutateUser}: Props) {
</> </>
)} )}
{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={{
value: preferredGender, value: preferredGender,
label: capitalize(preferredGender), label: capitalize(preferredGender),
}} }}
onChange={(value) => (value ? setPreferredGender(value.value as InstructorGender) : null)} 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>
@@ -429,12 +529,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>
@@ -459,7 +565,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
/> />
@@ -503,14 +611,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"
@@ -520,7 +634,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"
@@ -530,11 +649,15 @@ 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
@@ -548,7 +671,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
@@ -559,7 +685,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} />
@@ -572,37 +701,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>
@@ -621,11 +775,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>
@@ -635,7 +798,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 (
<> <>