Skip to content

Commit 8ac1293

Browse files
REACT-DEVELOPER-IBROKHIMREACT-DEVELOPER-IBROKHIM
committed
fix: added new certificate left overs
1 parent 3ede503 commit 8ac1293

File tree

6 files changed

+458
-38
lines changed

6 files changed

+458
-38
lines changed

Diff for: ‎client/src/assets/images/pattern.png

3.11 MB
Loading

Diff for: ‎client/src/components/documents/driver-card/card/back/index.jsx

+21-14
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,30 @@ const DriverCardBack = ({ document }) => {
1010
<p className="text-[45px] mt-[20px]">DRIVER QUALIFICATION CARD</p>
1111
<div className="flex justify-between p-[30px]">
1212
<div>
13-
<div className="text-[45px] text-left mt-[30px] flex flex-col gap-[15px]">
14-
<p>1.Номер сертификата</p>
13+
<div className="text-[35px] font-semibold text-left mt-[30px] flex flex-col gap-[10px]">
14+
<p>1.Фамилия</p>
1515
<p>2.Имя</p>
16-
<p>3.Фамилия</p>
17-
<p>4.Дата рождения</p>
18-
<p>5.Oтчество</p>
19-
<p>7.Категории транспортных средств</p>
20-
<p>8.Страна выдачи</p>
21-
<p>9.Организация-эмитент</p>
16+
<p>3.Дата рождения</p>
17+
<p>4a.Дата выдачи</p>
18+
<p>4b.Срок действия</p>
19+
<p>4c.Наименование органа,выдавшего сертификат</p>
20+
<p>5a.Номер водительского удостоверения</p>
21+
<p>5b.Идентификационный номер</p>
22+
<p>6.Подпись</p>
23+
<p>7.Фото</p>
24+
<p>8.Категории транспортных средств</p>
25+
<p>9.Срок действия соответствующей категории</p>
26+
<p>10.Вносится отметка сертификатя СРС</p>
2227
</div>
23-
<QRCode
24-
className="mb-[20px] mt-[30px]"
25-
value={`https://www.xalqarologistika.uz/check-certificates/${id}`}
26-
/>
2728
</div>
2829
<div className="text-[45px]">
2930
<table className="border-2 border-black">
3031
<tr>
3132
<th className="px-[30px] border-2 border-black">
32-
Category <br /> Категории
33+
8. Category <br /> Категории
3334
</th>
3435
<th className="px-[30px] border-2 border-black">
35-
Until <br /> До
36+
9. Until <br /> До
3637
</th>
3738
</tr>
3839
<tr>
@@ -68,6 +69,12 @@ const DriverCardBack = ({ document }) => {
6869
<td className="px-[30px] border-2 border-black"></td>
6970
</tr>
7071
</table>
72+
<div className="flex justify-end text-[40px] gap-[10px] mb-[20px] mt-[30px]">
73+
10.
74+
<QRCode
75+
value={`https://www.xalqarologistika.uz/check-certificates/${id}`}
76+
/>
77+
</div>
7178
</div>
7279
</div>
7380
</div>

Diff for: ‎client/src/components/documents/driver-card/card/front/index.jsx

+42-24
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
import React from "react";
22
import flag from "@assets/images/flag.png";
33

4-
const DriverCardFront = ({ document }) => {
5-
const { name, surname, to, birthDate, id, signature, driverLicenceNumber } =
6-
document;
4+
const DriverCardFront = ({ document, type }) => {
5+
const {
6+
name,
7+
surname,
8+
to,
9+
birthDate,
10+
from,
11+
id,
12+
signature,
13+
driverLicenceNumber,
14+
} = document;
715
console.log(document);
816
return (
9-
<div className={`w-[2480px] h-[3508px] flex justify-center mt-[10px]`}>
17+
<div
18+
className={`w-[2480px] ${type !== "search" && "h-[3508px]"} flex justify-center mt-[10px]`}
19+
>
1020
<div className="w-[1600px] h-[1000px] border-[6px] border-gray-400 mt-[10px] rounded-[50px] bg-silk bg-cover bg-no-repeat text-center px-[30px]">
1121
<p className="text-[48px] font-bold mt-[30px]">
1222
CERTIFICATE OF PROFESSIONAL COMPETENCE OF THE DRIVER
@@ -16,32 +26,40 @@ const DriverCardFront = ({ document }) => {
1626
<div className="text-[60px] py-[15px] px-[40px] border-[6px] border-black rounded-[100%]">
1727
UZ
1828
</div>
19-
<p className="text-[50px] font-bold ml-[-200px]">1.Nr. {id}</p>
2029
<img src={flag} alt="NT2022" className="w-[200px]" />
2130
</div>
22-
<div className="h-[570px] flex items-center mt-[60px] gap-[40px]">
23-
<div className="h-full aspect-[3/4] bg-white border-[2px] border-black"></div>
24-
<div className="h-full bg-blue font-bold text-left text-[43px] flex flex-col flex-1 gap-[10px]">
31+
<div className="h-[570px] flex items-center mt-[60px] mx-[50px] gap-[40px]">
32+
<div className="h-full w-[370px] flex flex-col">
33+
<div className="w-[370px] h-[700px] flex-1 bg-white border-[2px] border-black"></div>
34+
<p className="text-[50px] mt-5">8.C/CE</p>
35+
</div>
36+
<div className="h-full bg-blue font-bold text-left text-[45px] flex flex-col flex-1 gap-[15px]">
37+
<p>1.{surname}</p>
2538
<p>2.{name}</p>
26-
<p>3.{surname}</p>
27-
<p>4.{birthDate}</p>
28-
<p>5.{driverLicenceNumber}</p>
29-
<p>7.C/CE</p>
30-
<p>8.REPUBLIC OF UZBEKISTAN</p>
31-
<p>9.NAMANGANTRANS 2022</p>
32-
<p>Until (date) {to}</p>
33-
<div className="w-[300px] h-[100px] bg-white border-[2px] border-black">
34-
<img
35-
width={"100%"}
36-
height={"80%"}
37-
src={signature}
38-
alt=""
39-
className="scale-[0.7]"
40-
/>
39+
<p>3.{birthDate}</p>
40+
<div className="flex gap-10">
41+
<p>4a.{from}</p>
42+
<p>4b.{to}</p>
43+
</div>
44+
<p>4c.LTD "NAMANGANTRANS 2022"</p>
45+
<div className="flex gap-10">
46+
<p>5a.{driverLicenceNumber}</p> <p>5b.{id}</p>
47+
</div>
48+
<div className="flex items-center gap-5 mt-[85px]">
49+
7.
50+
<div className="w-[300px] h-[100px] bg-white border-[2px] border-black">
51+
<img
52+
width={"100%"}
53+
height={"80%"}
54+
src={signature}
55+
alt=""
56+
className="scale-[0.7]"
57+
/>
58+
</div>
4159
</div>
4260
</div>
4361
<div className="h-full flex flex-col items-end justify-end">
44-
<div className="bg-blue-500 text-white text-[35px] py-[20px] px-[40px] flex items-center justify-center rounded-ee-[30px] rounded-ss-[30px] mb-[500px] mr-[55px]">
62+
<div className="bg-blue-500 text-white text-[35px] py-[20px] px-[40px] flex items-center justify-center rounded-ee-[30px] rounded-ss-[30px] mb-[500px]">
4563
NT2022
4664
</div>
4765
</div>

0 commit comments

Comments
 (0)