Skip to content

Commit 4441aa8

Browse files
ShahriyarMammadovShahriyarMammadov
committed
form field added
1 parent 18dd3f9 commit 4441aa8

File tree

7 files changed

+126
-55
lines changed

7 files changed

+126
-55
lines changed

‎index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<head>
55
<meta charset="UTF-8" />
6-
<link rel="icon" type="image/svg+xml" href="src/assets/td logo 1.png" />
6+
<link rel="icon" type="image/svg+xml" href="src/assets/td logo.png" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>Təbiət Dostları Azərbaycan</title>
99
</head>

‎src/assets/td logo.png

40.8 KB
Loading

‎src/components/imageGallery/index.jsx

+12-39
Original file line numberDiff line numberDiff line change
@@ -14,69 +14,52 @@ const Gallery = () => {
1414
<div id="imageGallery" className="container">
1515
<div className="grid-container">
1616
<LightGallery speed={500} plugins={[lgThumbnail, lgZoom]}>
17-
18-
<a
19-
href="https://scontent-fra5-1.xx.fbcdn.net/v/t31.18172-8/14556581_1156937037692785_7204613824185875652_o.jpg?_nc_cat=110&ccb=1-7&_nc_sid=5f2048&_nc_ohc=RSfKLJ2VZtAQ7kNvgHNYC6k&_nc_ht=scontent-fra5-1.xx&oh=00_AYCCUogrexP06qPDVTjhN8MfNBwLQHmsjDcIVXsxFNg7GA&oe=66730CC9"
17+
<a
18+
href="https://scontent-fra5-1.xx.fbcdn.net/v/t31.18172-8/14556581_1156937037692785_7204613824185875652_o.jpg?_nc_cat=110&ccb=1-7&_nc_sid=5f2048&_nc_ohc=RSfKLJ2VZtAQ7kNvgHNYC6k&_nc_ht=scontent-fra5-1.xx&oh=00_AYCCUogrexP06qPDVTjhN8MfNBwLQHmsjDcIVXsxFNg7GA&oe=66730CC9"
2019
className="grid-content"
2120
data-aos="fade-up-right"
2221
>
23-
<img
24-
src="https://scontent-fra5-1.xx.fbcdn.net/v/t31.18172-8/14556581_1156937037692785_7204613824185875652_o.jpg?_nc_cat=110&ccb=1-7&_nc_sid=5f2048&_nc_ohc=RSfKLJ2VZtAQ7kNvgHNYC6k&_nc_ht=scontent-fra5-1.xx&oh=00_AYCCUogrexP06qPDVTjhN8MfNBwLQHmsjDcIVXsxFNg7GA&oe=66730CC9"
25-
alt="Image 3"
26-
/>
22+
<img src="https://scontent-fra5-1.xx.fbcdn.net/v/t31.18172-8/14556581_1156937037692785_7204613824185875652_o.jpg?_nc_cat=110&ccb=1-7&_nc_sid=5f2048&_nc_ohc=RSfKLJ2VZtAQ7kNvgHNYC6k&_nc_ht=scontent-fra5-1.xx&oh=00_AYCCUogrexP06qPDVTjhN8MfNBwLQHmsjDcIVXsxFNg7GA&oe=66730CC9" />
2723
<div className="overlay">
2824
<FaLink className="link" />
2925
<p>+</p>
30-
<p className="text">SHUTTERBURG</p>
3126
</div>
3227
</a>
33-
28+
3429
<a
3530
href="https://scontent-fra3-2.xx.fbcdn.net/v/t39.30808-6/315816344_5554684151251363_593827422766000480_n.jpg?stp=cp6_dst-jpg&_nc_cat=104&ccb=1-7&_nc_sid=5f2048&_nc_ohc=-nbHYswlGigQ7kNvgHw7b0w&_nc_ht=scontent-fra3-2.xx&oh=00_AYBNUarBklp1WkWbmnkHvW-1EkJPjlZbJ0SYNqIeGUqxyQ&oe=6651560D"
3631
className="grid-content"
3732
data-aos="fade-up-right"
3833
>
39-
<img
40-
src="https://scontent-fra3-2.xx.fbcdn.net/v/t39.30808-6/315816344_5554684151251363_593827422766000480_n.jpg?stp=cp6_dst-jpg&_nc_cat=104&ccb=1-7&_nc_sid=5f2048&_nc_ohc=-nbHYswlGigQ7kNvgHw7b0w&_nc_ht=scontent-fra3-2.xx&oh=00_AYBNUarBklp1WkWbmnkHvW-1EkJPjlZbJ0SYNqIeGUqxyQ&oe=6651560D"
41-
alt="Image 1"
42-
/>
34+
<img src="https://scontent-fra3-2.xx.fbcdn.net/v/t39.30808-6/315816344_5554684151251363_593827422766000480_n.jpg?stp=cp6_dst-jpg&_nc_cat=104&ccb=1-7&_nc_sid=5f2048&_nc_ohc=-nbHYswlGigQ7kNvgHw7b0w&_nc_ht=scontent-fra3-2.xx&oh=00_AYBNUarBklp1WkWbmnkHvW-1EkJPjlZbJ0SYNqIeGUqxyQ&oe=6651560D" />
4335
<div className="overlay">
4436
<FaLink className="link" />
4537
<p>+</p>
46-
<p className="text">SHUTTERBURG</p>
4738
</div>
4839
</a>
4940

5041
<a
51-
href="https://scontent-fra5-2.xx.fbcdn.net/v/t39.30808-6/305999305_5360790500640730_9101772964790477336_n.jpg?_nc_cat=107&ccb=1-7&_nc_sid=5f2048&_nc_ohc=On_8SOQvFtoQ7kNvgFFTNhR&_nc_ht=scontent-fra5-2.xx&oh=00_AYDb644hI9U-xzwT9-0nba9QdCKx9RbUHSzcV0KCAh7YRg&oe=66516588"
42+
href="https://scontent-fra5-2.xx.fbcdn.net/v/t39.30808-6/305999305_5360790500640730_9101772964790477336_n.jpg?_nc_cat=107&ccb=1-7&_nc_sid=5f2048&_nc_ohc=On_8SOQvFtoQ7kNvgFFTNhR&_nc_ht=scontent-fra5-2.xx&oh=00_AYDb644hI9U-xzwT9-0nba9QdCKx9RbUHSzcV0KCAh7YRg&oe=66516588"
5243
className="grid-content"
5344
data-aos="fade-up-left"
5445
>
55-
<img
56-
src="https://scontent-fra5-2.xx.fbcdn.net/v/t39.30808-6/305999305_5360790500640730_9101772964790477336_n.jpg?_nc_cat=107&ccb=1-7&_nc_sid=5f2048&_nc_ohc=On_8SOQvFtoQ7kNvgFFTNhR&_nc_ht=scontent-fra5-2.xx&oh=00_AYDb644hI9U-xzwT9-0nba9QdCKx9RbUHSzcV0KCAh7YRg&oe=66516588"
57-
alt="Image 2"
58-
/>
46+
<img src="https://scontent-fra5-2.xx.fbcdn.net/v/t39.30808-6/305999305_5360790500640730_9101772964790477336_n.jpg?_nc_cat=107&ccb=1-7&_nc_sid=5f2048&_nc_ohc=On_8SOQvFtoQ7kNvgFFTNhR&_nc_ht=scontent-fra5-2.xx&oh=00_AYDb644hI9U-xzwT9-0nba9QdCKx9RbUHSzcV0KCAh7YRg&oe=66516588" />
5947
<div className="overlay">
6048
<FaLink className="link" />
6149
<p>+</p>
62-
<p className="text">SHUTTERBURG</p>
6350
</div>
6451
</a>
6552

6653
<a
67-
href="https://scontent-fra5-2.xx.fbcdn.net/v/t39.30808-6/428608097_786516220183982_8957019932085284311_n.jpg?_nc_cat=106&ccb=1-7&_nc_sid=5f2048&_nc_ohc=hnCV5q5skd4Q7kNvgHekTk8&_nc_ht=scontent-fra5-2.xx&oh=00_AYCBmbG1GDh2-fOPHdj68l-ngDROWP0pnfu8Y4p5IECXDg&oe=665181A6"
54+
href="https://scontent-fra5-2.xx.fbcdn.net/v/t39.30808-6/428608097_786516220183982_8957019932085284311_n.jpg?_nc_cat=106&ccb=1-7&_nc_sid=5f2048&_nc_ohc=hnCV5q5skd4Q7kNvgHekTk8&_nc_ht=scontent-fra5-2.xx&oh=00_AYCBmbG1GDh2-fOPHdj68l-ngDROWP0pnfu8Y4p5IECXDg&oe=665181A6"
6855
className="grid-content"
6956
data-aos="fade-up-left"
7057
>
71-
<img
72-
src="https://scontent-fra5-2.xx.fbcdn.net/v/t39.30808-6/428608097_786516220183982_8957019932085284311_n.jpg?_nc_cat=106&ccb=1-7&_nc_sid=5f2048&_nc_ohc=hnCV5q5skd4Q7kNvgHekTk8&_nc_ht=scontent-fra5-2.xx&oh=00_AYCBmbG1GDh2-fOPHdj68l-ngDROWP0pnfu8Y4p5IECXDg&oe=665181A6"
73-
alt="Image 2"
74-
/>
58+
<img src="https://scontent-fra5-2.xx.fbcdn.net/v/t39.30808-6/428608097_786516220183982_8957019932085284311_n.jpg?_nc_cat=106&ccb=1-7&_nc_sid=5f2048&_nc_ohc=hnCV5q5skd4Q7kNvgHekTk8&_nc_ht=scontent-fra5-2.xx&oh=00_AYCBmbG1GDh2-fOPHdj68l-ngDROWP0pnfu8Y4p5IECXDg&oe=665181A6" />
7559

7660
<div className="overlay">
7761
<FaLink className="link" />
7862
<p>+</p>
79-
<p className="text">SHUTTERBURG</p>
8063
</div>
8164
</a>
8265

@@ -85,36 +68,26 @@ const Gallery = () => {
8568
className="grid-content"
8669
data-aos="fade-up-left"
8770
>
88-
<img
89-
src="https://scontent-fra5-2.xx.fbcdn.net/v/t39.30808-6/428608225_786514146850856_2900606633291968442_n.jpg?_nc_cat=107&ccb=1-7&_nc_sid=5f2048&_nc_ohc=8DGGd3pn05wQ7kNvgEdql4c&_nc_ht=scontent-fra5-2.xx&oh=00_AYBYz0VoHaMxIC_vAfcdvE6yuHeurSsFz5dpejY07acq7Q&oe=66518D98"
90-
alt="Image 2"
91-
/>
71+
<img src="https://scontent-fra5-2.xx.fbcdn.net/v/t39.30808-6/428608225_786514146850856_2900606633291968442_n.jpg?_nc_cat=107&ccb=1-7&_nc_sid=5f2048&_nc_ohc=8DGGd3pn05wQ7kNvgEdql4c&_nc_ht=scontent-fra5-2.xx&oh=00_AYBYz0VoHaMxIC_vAfcdvE6yuHeurSsFz5dpejY07acq7Q&oe=66518D98" />
9272

9373
<div className="overlay">
9474
<FaLink className="link" />
9575
<p>+</p>
96-
<p className="text">SHUTTERBURG</p>
9776
</div>
9877
</a>
9978

10079
<a
101-
href="https://scontent-fra3-2.xx.fbcdn.net/v/t39.30808-6/279250486_4986466378073146_2781716502558755654_n.jpg?_nc_cat=104&ccb=1-7&_nc_sid=5f2048&_nc_ohc=Wz-rLUy6CYkQ7kNvgFgv8Sj&_nc_ht=scontent-fra3-2.xx&oh=00_AYDwHUCA92EuNzCDIJ1ZxhkDiGG06tBGS_tq60Z6NAPoLQ&oe=66518B3A"
80+
href="https://scontent-fra3-2.xx.fbcdn.net/v/t39.30808-6/279250486_4986466378073146_2781716502558755654_n.jpg?_nc_cat=104&ccb=1-7&_nc_sid=5f2048&_nc_ohc=Wz-rLUy6CYkQ7kNvgFgv8Sj&_nc_ht=scontent-fra3-2.xx&oh=00_AYDwHUCA92EuNzCDIJ1ZxhkDiGG06tBGS_tq60Z6NAPoLQ&oe=66518B3A"
10281
className="grid-content"
10382
data-aos="fade-up-left"
10483
>
105-
<img
106-
src="https://scontent-fra3-2.xx.fbcdn.net/v/t39.30808-6/279250486_4986466378073146_2781716502558755654_n.jpg?_nc_cat=104&ccb=1-7&_nc_sid=5f2048&_nc_ohc=Wz-rLUy6CYkQ7kNvgFgv8Sj&_nc_ht=scontent-fra3-2.xx&oh=00_AYDwHUCA92EuNzCDIJ1ZxhkDiGG06tBGS_tq60Z6NAPoLQ&oe=66518B3A"
107-
alt="Image 2"
108-
/>
84+
<img src="https://scontent-fra3-2.xx.fbcdn.net/v/t39.30808-6/279250486_4986466378073146_2781716502558755654_n.jpg?_nc_cat=104&ccb=1-7&_nc_sid=5f2048&_nc_ohc=Wz-rLUy6CYkQ7kNvgFgv8Sj&_nc_ht=scontent-fra3-2.xx&oh=00_AYDwHUCA92EuNzCDIJ1ZxhkDiGG06tBGS_tq60Z6NAPoLQ&oe=66518B3A" />
10985

11086
<div className="overlay">
11187
<FaLink className="link" />
11288
<p>+</p>
113-
<p className="text">SHUTTERBURG</p>
11489
</div>
11590
</a>
116-
117-
11891
</LightGallery>
11992
</div>
12093
</div>

‎src/components/memberShip/memberShipAboutText/index.jsx

+11-4
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ const MemberShipAboutPage = ({ setReading }) => {
9494
<br />
9595
<b>Partnyor üzv: </b> 90₼.
9696
<br />
97-
<b>Sponsor üzv:</b> 500₼ + <br />
97+
<b>Sponsor üzv:</b> 500₼ + <br />
9898
<br />* Tələbə bileti təşkilata təqdim edilməlidir. <br />
9999
<br />
100100
<b>** QEYD:</b> Sponsor-Üzv olaraq Təbiət Doslarına dəstək olmaq
@@ -107,13 +107,20 @@ const MemberShipAboutPage = ({ setReading }) => {
107107
<br />
108108
<b>!!! TƏLƏSİN - SON GÜN 30 İYUN !!!</b>
109109
<br /> <br />
110-
30 iyun tarixinə kimi üzv olan şəxslər <ins>30% </ins> endirim əldə etmiş olacaqlar.
110+
30 iyun tarixinə kimi üzv olan şəxslər <ins>30% </ins> endirim əldə
111+
etmiş olacaqlar.
111112
<br /> <br />
112-
Fərdi üzvlük <del>40₼</del> <ins>28₼</ins> (Tələbə <del>30₼</del> <ins>21₼</ins> )
113+
Fərdi üzvlük <del>40₼</del> <ins>28₼</ins> (Tələbə <del>30₼</del>{" "}
114+
<ins>21₼</ins> )
113115
<br />
114116
Ailəvi üzvlük <del>70₼</del> <ins>49₼</ins>
115117
<br />
116-
Partnyor üzv <del>90₼</del> <ins>63₼</ins>
118+
Partnyor üzv <del>90₼</del> <ins>63₼</ins>
119+
</p>
120+
<br />
121+
<p>
122+
Üzvlük haqqını <b>5411 2498 1243 7882</b> kart nömrəsinə transfer
123+
etməyinizi xahiş edirik.
117124
</p>
118125
</div>
119126
);

‎src/components/memberShip/memberShipForm/index.jsx

+96-10
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ const MemberShipForm = () => {
4040
const [backOfLicence, setBackOfLicence] = useState(null);
4141
const [emailSubscribtion, setEmailSubscribtion] = useState(null);
4242
const [memberType, setMemberType] = useState(null);
43+
const [paymentReceipt, setPaymentReceipt] = useState(null);
44+
const [studentCard, setStudentCard] = useState(null);
4345

4446
const [validationError, setValidationError] = useState(null);
4547

@@ -92,6 +94,10 @@ const MemberShipForm = () => {
9294

9395
if (type === "front") {
9496
setFrontOfLicence(uploadedFileUrl);
97+
} else if (type === "paymentReceipt") {
98+
setPaymentReceipt(uploadedFileUrl);
99+
} else if (type === "studentCard") {
100+
setStudentCard(uploadedFileUrl);
95101
} else {
96102
setBackOfLicence(uploadedFileUrl);
97103
}
@@ -119,12 +125,13 @@ const MemberShipForm = () => {
119125
favoriteColor: favoriteColor,
120126
backOfLicence: backOfLicence,
121127
frontOfLicence: frontOfLicence,
128+
paymentReceipt: paymentReceipt,
122129
emailSubscription: emailSubscribtion,
130+
studentCard: studentCard,
123131
};
124132

125133
const validationError = memberShipFormValidation(memberShipData);
126134
if (validationError) {
127-
console.error(validationError);
128135
setValidationError(validationError);
129136
return;
130137
}
@@ -134,7 +141,6 @@ const MemberShipForm = () => {
134141
memberShipData
135142
);
136143

137-
console.log(data);
138144
setLoading(false);
139145
setResult(true);
140146
} catch (error) {
@@ -143,8 +149,6 @@ const MemberShipForm = () => {
143149
}
144150
};
145151

146-
console.log(backOfLicence);
147-
148152
return (
149153
<div id="memberShipForm">
150154
<div className="content">
@@ -571,9 +575,8 @@ const MemberShipForm = () => {
571575
{/* vesiqe sekilleri */}
572576
<Form.Item valuePropName="fileList" getValueFromEvent={normFile}>
573577
<p>
574-
Qeydiyyatı tamamlamaq üçün şəxsiyyət vəsiqənizin hər iki üzünü
575-
ya şəkil (məs: .png, .jpg) ya sənəd (məs: .pdf) formatında
576-
yükləyin <span>*</span>
578+
Şəxsiyyət vəsiqənizin hər iki üzünü ya şəkil (məs: .png, .jpg)
579+
ya sənəd (məs: .pdf) formatında yükləyin <span>*</span>
577580
</p>
578581

579582
<div className="uploadsInput">
@@ -659,13 +662,96 @@ const MemberShipForm = () => {
659662
</div>
660663
</Form.Item>
661664

665+
<Form.Item>
666+
<div>
667+
<p>Tələbə biletinizi yükləyin (əgər tələbəsinizsə) </p>
668+
669+
{studentCard ? (
670+
<Image
671+
src={`https://nfazcloudrailway.up.railway.app/uploads/${studentCard}`}
672+
alt={studentCard}
673+
style={{ width: "150px" }}
674+
/>
675+
) : (
676+
<div>
677+
<Upload
678+
maxCount={1}
679+
action={`https://nfazcloudrailway.up.railway.app/upload`}
680+
listType="picture-card"
681+
name="file"
682+
onChange={(info) => {
683+
handleFileChange(info, "studentCard");
684+
}}
685+
>
686+
<button
687+
style={{
688+
border: 0,
689+
background: "none",
690+
}}
691+
type="button"
692+
>
693+
<PlusOutlined />
694+
<div
695+
style={{
696+
marginTop: 8,
697+
}}
698+
>
699+
tələbə bileti
700+
</div>
701+
</button>
702+
</Upload>
703+
</div>
704+
)}
705+
</div>
706+
</Form.Item>
707+
662708
<Form.Item>
663709
<div>
664710
<p>
665-
Üzvlük haqqı <b>5411 2498 1243 7882</b> nömrəli karta transfer
666-
edildi <span>*</span>
667-
<Checkbox style={{ margin: "10px" }}></Checkbox>
711+
Qeydiyyatı tamamlamaq üçün üzvlük haqqını{" "}
712+
<b>5411 2498 1243 7882</b> nömrəli karta transfer etdikdən
713+
sonra qəbzi yükləyin <span style={{ color: "red" }}>*</span>
668714
</p>
715+
716+
{paymentReceipt ? (
717+
<Image
718+
src={`https://nfazcloudrailway.up.railway.app/uploads/${paymentReceipt}`}
719+
alt={paymentReceipt}
720+
style={{ width: "150px" }}
721+
/>
722+
) : (
723+
<div>
724+
<Upload
725+
maxCount={1}
726+
action={`https://nfazcloudrailway.up.railway.app/upload`}
727+
listType="picture-card"
728+
name="file"
729+
onChange={(info) => {
730+
handleFileChange(info, "paymentReceipt");
731+
}}
732+
>
733+
<button
734+
style={{
735+
border: 0,
736+
background: "none",
737+
}}
738+
type="button"
739+
>
740+
<PlusOutlined />
741+
<div
742+
style={{
743+
marginTop: 8,
744+
}}
745+
>
746+
ödəniş qəbzi
747+
</div>
748+
</button>
749+
</Upload>
750+
{validationError?.index === 11 ? (
751+
<p className="errorText">{validationError?.error}</p>
752+
) : null}
753+
</div>
754+
)}
669755
</div>
670756
</Form.Item>
671757

‎src/components/memberShip/sponsorMemberShipForm/index.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.sponsorAboutText {
33
background-color: white;
44
text-align: center;
5-
padding: 60px 10px 0 10px;
5+
padding: 60px 35px 0 35px;
66
margin: 0 20px 0 20px;
77

88
@media only screen and (max-width: 800px) {

‎src/validation/memberShipFormValidation/index.jsx

+5
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,10 @@ export const memberShipFormValidation = (data) => {
7979
return { error: "Email abunəliyi seçilməyib", index: 10 };
8080
}
8181

82+
if (!data.paymentReceipt) {
83+
console.log(data.paymentReceipt);
84+
return { error: "Ödəniş qəbzi əlavə edilməyib", index: 11 };
85+
}
86+
8287
return null;
8388
};

0 commit comments

Comments
 (0)