devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into improvement-37/writing-evaluation-perfect-answer

Browse Source
This commit is contained in:
Tiago Ribeiro
2023-12-09 14:47:06 +00:00
parent e2e38284a7 77af0b3495
commit e0ecc5be05
15 changed files with 334 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/DemographicInformationInput.tsx
View File

@@ -62,7 +62,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
<form className="flex flex-col items-center justify-items-center gap-6 w-full h-full -md:px-4 lg:w-1/2 mb-32" onSubmit={save}>
{user.type === "agent" && (
<div className="w-full flex gap-8">
<Input type="text" onChange={setCompanyName} name="companyName" label="Company Name" required />
<Input type="text" onChange={setCompanyName} name="companyName" label="Corporate Name" required />
<Input
type="text"
onChange={setCommercialRegistration}

12
src/components/UserCard.tsx
View File

@@ -58,7 +58,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
);
const [userAmount, setUserAmount] = useState(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 : 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 {stats} = useStats(user.id);
@@ -146,11 +146,11 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
<>
<div className="grid grid-cols-1 md:grid-cols-2 gap-8 w-full">
<Input
label="Company Name"
label="Corporate Name"
type="text"
name="companyName"
onChange={setCompanyName}
placeholder="Enter company name"
placeholder="Enter corporate name"
defaultValue={companyName}
required
/>
@@ -159,7 +159,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
type="text"
name="commercialRegistration"
onChange={setCommercialRegistration}
placeholder="Enter company name"
placeholder="Enter commercial registration"
defaultValue={commercialRegistration}
required
/>
@@ -171,11 +171,11 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
<>
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 w-full">
<Input
label="Company Name"
label="Corporate Name"
type="text"
name="companyName"
onChange={setCompanyName}
placeholder="Enter company name"
placeholder="Enter corporate name"
defaultValue={companyName}
/>
<Input