Skip to content

Commit 8ec58a4

Browse files
committed
Merge remote-tracking branch 'origin/dev' into hot-fix/change-recent-url-icon-display
2 parents d3129b9 + 3dc6a31 commit 8ec58a4

File tree

11 files changed

+318
-169
lines changed

11 files changed

+318
-169
lines changed

messages/en-GB.json

+6
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,17 @@
9292
"BY_REVIEWER": "By {buyer_id}"
9393
},
9494
"REPLY_TO_REVIEW": {
95+
"REPLY_TO_REVIEW_STATIC_HEADER": "Reply to Review",
96+
"REPLY_TO_REVIEW_SUBHEADER": "The review you are replying to",
97+
"GIVE_REPLY_TO_REVIEW_SUBHEADER": "Give reply to review",
9598
"REPLY_TO_REVIEW_HEADER": "Reply to Review left for {seller_id}",
9699
"BY_REVIEWER": "By {buyer_id}",
97100
"REPLY_TO_REVIEW_MESSAGE": "Leave your reply to the above review",
98101
"FACE_SELECTION_REVIEW_MESSAGE": "Select the face that shows how you feel about your interaction with this pioneer",
99102
"ADDITIONAL_COMMENTS_PLACEHOLDER": "Enter additional comments here",
100103
"FEEDBACK_PHOTO_UPLOAD_LABEL": "Feedback photo upload",
101104
"VALIDATION": {
105+
"LOADING_REVIEW_FAILURE": "Error loading review",
102106
"SELF_REVIEW_PROHIBITED": "Self-review is prohibited"
103107
}
104108
}
@@ -188,6 +192,7 @@
188192
"PIONEER_LABEL": "Pioneer",
189193
"BUY": "Buy",
190194
"NAVIGATE": "Navigate",
195+
"NO_COMMENT": "No comment provided",
191196
"SEARCH_CENTER": "Set Search Centre",
192197
"CHECK_REVIEWS": "Check Reviews",
193198
"SEARCH_REVIEWS": "Search Reviews",
@@ -204,6 +209,7 @@
204209
"PHOTO": {
205210
"UPLOAD_PHOTO_LABEL": "Upload photo",
206211
"UPLOAD_PHOTO_PLACEHOLDER": "Upload image to help attract buyers (PNG, JPG, JPEG, WEBP)",
212+
"UPLOAD_PHOTO_REVIEW_PLACEHOLDER": "Upload an image to support your review (PNG, JPG, JPEG, WEBP)",
207213
"IMAGE_DROP_UPLOAD_MESSAGE": "Drop your image here or browse",
208214
"SUPPORTS_FILE_MESSAGE": "Supports: PNG, JPG, JPEG, WEBP",
209215
"MISC_LABELS": {

messages/en.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,17 @@
9292
"BY_REVIEWER": "By {buyer_id}"
9393
},
9494
"REPLY_TO_REVIEW": {
95+
"REPLY_TO_REVIEW_STATIC_HEADER": "Reply to Review",
96+
"REPLY_TO_REVIEW_SUBHEADER": "The review you are replying to",
97+
"GIVE_REPLY_TO_REVIEW_SUBHEADER": "Give reply to review",
9598
"REPLY_TO_REVIEW_HEADER": "Reply to Review left for {seller_id}",
9699
"BY_REVIEWER": "By {buyer_id}",
97100
"REPLY_TO_REVIEW_MESSAGE": "Leave your reply to the above review",
98101
"FACE_SELECTION_REVIEW_MESSAGE": "Select the face which shows how you feel about your interaction with this pioneer",
99102
"ADDITIONAL_COMMENTS_PLACEHOLDER": "Enter additional comments here",
100103
"FEEDBACK_PHOTO_UPLOAD_LABEL": "Feedback photo upload",
101104
"VALIDATION": {
105+
"LOADING_REVIEW_FAILURE": "Error loading review",
102106
"SELF_REVIEW_PROHIBITED": "Self-review is prohibited"
103107
}
104108
}
@@ -188,10 +192,11 @@
188192
"PIONEER_LABEL": "Pioneer",
189193
"BUY": "Buy",
190194
"NAVIGATE": "Navigate",
195+
"NO_COMMENT": "No comment provided",
191196
"SEARCH_CENTER": "Set Search Center",
192197
"CHECK_REVIEWS": "Check Reviews",
193198
"SEARCH_REVIEWS": "Search Reviews",
194-
"SEARCH_LOADING": "Search Loading...",
199+
"SEARCH_LOADING": "Search loading...",
195200
"REPLY": "Reply",
196201
"SAVE": "Save",
197202
"CONFIRM_DIALOG": "You have unsaved changes. Do you really want to leave?",
@@ -204,6 +209,7 @@
204209
"PHOTO": {
205210
"UPLOAD_PHOTO_LABEL": "Upload photo",
206211
"UPLOAD_PHOTO_PLACEHOLDER": "Upload image to help attract buyers (PNG, JPG, JPEG, WEBP)",
212+
"UPLOAD_PHOTO_REVIEW_PLACEHOLDER": "Upload an image to support your review (PNG, JPG, JPEG, WEBP)",
207213
"IMAGE_DROP_UPLOAD_MESSAGE": "Drop your image here or browse",
208214
"SUPPORTS_FILE_MESSAGE": "Supports: PNG, JPG, JPEG, WEBP",
209215
"MISC_LABELS": {

messages/es.json

+6
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,17 @@
9292
"BY_REVIEWER": "Por {buyer_id}"
9393
},
9494
"REPLY_TO_REVIEW": {
95+
"REPLY_TO_REVIEW_STATIC_HEADER": "Responder a la reseña",
96+
"REPLY_TO_REVIEW_SUBHEADER": "La reseña a la que estás respondiendo",
97+
"GIVE_REPLY_TO_REVIEW_SUBHEADER": "Dar respuesta a la reseña",
9598
"REPLY_TO_REVIEW_HEADER": "Responder a la reseña dejada para {seller_id}",
9699
"BY_REVIEWER": "Por {buyer_id}",
97100
"REPLY_TO_REVIEW_MESSAGE": "Deja tu respuesta a la reseña anterior",
98101
"FACE_SELECTION_REVIEW_MESSAGE": "Seleccione la cara que muestre cómo se siente acerca de su interacción con este pionero",
99102
"ADDITIONAL_COMMENTS_PLACEHOLDER": "Introduce comentarios adicionales aquí",
100103
"FEEDBACK_PHOTO_UPLOAD_LABEL": "Subir foto de retroalimentación",
101104
"VALIDATION": {
105+
"LOADING_REVIEW_FAILURE": "Error al cargar la reseña",
102106
"SELF_REVIEW_PROHIBITED": "La autoevaluación está prohibida"
103107
}
104108
}
@@ -188,6 +192,7 @@
188192
"PIONEER_LABEL": "Pionero",
189193
"BUY": "Comprar",
190194
"NAVIGATE": "Navegar",
195+
"NO_COMMENT": "No se proporcionó comentario",
191196
"SEARCH_CENTER": "Establecer Centro de Búsqueda",
192197
"CHECK_REVIEWS": "Ver Reseñas",
193198
"SEARCH_REVIEWS": "Buscar reseñas",
@@ -204,6 +209,7 @@
204209
"PHOTO": {
205210
"UPLOAD_PHOTO_LABEL": "Subir foto",
206211
"UPLOAD_PHOTO_PLACEHOLDER": "Sube una imagen para ayudar a atraer compradores (PNG, JPG, JPEG, WEBP)",
212+
"UPLOAD_PHOTO_REVIEW_PLACEHOLDER": "Sube una imagen para respaldar tu reseña (PNG, JPG, JPEG, WEBP)",
207213
"IMAGE_DROP_UPLOAD_MESSAGE": "Suelta tu imagen aquí o busca",
208214
"SUPPORTS_FILE_MESSAGE": "Soporta: PNG, JPG, JPEG, WEBP",
209215
"MISC_LABELS": {

messages/ewe-BJ.json

+6
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,17 @@
9292
"BY_REVIEWER": "Dze {buyer_id}"
9393
},
9494
"REPLY_TO_REVIEW": {
95+
"REPLY_TO_REVIEW_STATIC_HEADER": "Nye anyi hã nu wò mli",
96+
"REPLY_TO_REVIEW_SUBHEADER": "Nudɔla si wòyi dzudzɔmenyã gã eye wò woe vɔna",
97+
"GIVE_REPLY_TO_REVIEW_SUBHEADER": "Fia dzi yɔ nudɔla me",
9598
"REPLY_TO_REVIEW_HEADER": "Le ŋutɔ sia sɔlɔɖe ɖe doaɖe {seller_id}",
9699
"BY_REVIEWER": "Dze {buyer_id}",
97100
"REPLY_TO_REVIEW_MESSAGE": "Xɔ le ŋutɔ sia sɔlɔɖe ɖe doaɖe lɔme",
98101
"FACE_SELECTION_REVIEW_MESSAGE": "Tia amenuveve aƒe si le eme wò dzo be wò nɔnye le etsɔ nu kplii ame siaa",
99102
"ADDITIONAL_COMMENTS_PLACEHOLDER": "Xɔ le vavaŋuto ŋutɔ kple kple",
100103
"FEEDBACK_PHOTO_UPLOAD_LABEL": "Photo na vovɔ",
101104
"VALIDATION": {
105+
"LOADING_REVIEW_FAILURE": "Dzudzɔmenyã meyinaa nuwò dzi o",
102106
"SELF_REVIEW_PROHIBITED": "Wòdzɔ wò nɔnɔ kple wòkplɔ míaɖu o"
103107
}
104108
}
@@ -188,6 +192,7 @@
188192
"PIONEER_LABEL": "Pione",
189193
"BUY": "Gbe",
190194
"NAVIGATE": "Nyɔɖo",
195+
"NO_COMMENT": "Mekɔme mɛkpɔ",
191196
"SEARCH_CENTER": "Fetɔ ƒe Gbɔtɔwo",
192197
"CHECK_REVIEWS": "Vɔ si ɖe tsoɖe",
193198
"SEARCH_REVIEWS": "Dii reviewwo",
@@ -204,6 +209,7 @@
204209
"PHOTO": {
205210
"UPLOAD_PHOTO_LABEL": "Ɖe ŋutɔ vinyo",
206211
"UPLOAD_PHOTO_PLACEHOLDER": "Zu fɛnyɔwo kple vɔs ɖe amegãwo me fia wò (PNG, JPG, JPEG, WEBP)",
212+
"UPLOAD_PHOTO_REVIEW_PLACEHOLDER": "Dɔ ƒe gbegblẽ nyuie si akpe vovovɔ (PNG, JPG, JPEG, WEBP)",
207213
"IMAGE_DROP_UPLOAD_MESSAGE": "Kpɔ siwo be ɖe ƒe ɣe ŋutɔ foto alo tɔkɔ",
208214
"SUPPORTS_FILE_MESSAGE": "Ɖe vɔ: PNG, JPG, JPEG, WEBP",
209215
"MISC_LABELS": {

messages/hau-NG.json

+6
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,17 @@
9292
"BY_REVIEWER": "Ta {buyer_id}"
9393
},
9494
"REPLY_TO_REVIEW": {
95+
"REPLY_TO_REVIEW_STATIC_HEADER": "Amsa Bita",
96+
"REPLY_TO_REVIEW_SUBHEADER": "Bitar da kake maida martani",
97+
"GIVE_REPLY_TO_REVIEW_SUBHEADER": "Bayar da amsa ga bita",
9598
"REPLY_TO_REVIEW_HEADER": "Amsa wa bita",
9699
"BY_REVIEWER": "Ta {buyer_id}",
97100
"REPLY_TO_REVIEW_MESSAGE": "Bar amsar ku ga bita ta sama",
98101
"FACE_SELECTION_REVIEW_MESSAGE": "Zaɓi fuskar da ke nuna yadda kake ji game da mu'amalarka da wannan jagora",
99102
"ADDITIONAL_COMMENTS_PLACEHOLDER": "Shigar da karin sharhi a nan",
100103
"FEEDBACK_PHOTO_UPLOAD_LABEL": "Loda Hoto Martani",
101104
"VALIDATION": {
105+
"LOADING_REVIEW_FAILURE": "Kuskure wajen ɗaukar bita",
102106
"SELF_REVIEW_PROHIBITED": "Binciken kai an hana"
103107
}
104108
}
@@ -188,6 +192,7 @@
188192
"PIONEER_LABEL": "Pione",
189193
"BUY": "Saya",
190194
"NAVIGATE": "Kewaya",
195+
"NO_COMMENT": "Ba a ba da tsokaci ba",
191196
"SEARCH_CENTER": "Saita Cibiyar Bincike",
192197
"CHECK_REVIEWS": "Duba Sake Dubawa",
193198
"SEARCH_REVIEWS": "Binciken sharhi",
@@ -204,6 +209,7 @@
204209
"PHOTO": {
205210
"UPLOAD_PHOTO_LABEL": "Loda hoto",
206211
"UPLOAD_PHOTO_PLACEHOLDER": "Dora hoto don taimakawa jan hankalin masu saye (PNG, JPG, JPEG, WEBP)",
212+
"UPLOAD_PHOTO_REVIEW_PLACEHOLDER": "Loda hoto don tallafawa bita (PNG, JPG, JPEG, WEBP)",
207213
"IMAGE_DROP_UPLOAD_MESSAGE": "Ajiye hotonku anan ko shiga yanar gizo",
208214
"SUPPORTS_FILE_MESSAGE": "Goyon baya: PNG, JPG, JPEG, WEBP",
209215
"MISC_LABELS": {

messages/ko.json

+6
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,17 @@
9292
"BY_REVIEWER": "{buyer_id}에 의해"
9393
},
9494
"REPLY_TO_REVIEW": {
95+
"REPLY_TO_REVIEW_STATIC_HEADER": "리뷰에 답글 달기",
96+
"REPLY_TO_REVIEW_SUBHEADER": "답변 중인 리뷰",
97+
"GIVE_REPLY_TO_REVIEW_SUBHEADER": "리뷰에 답변하기",
9598
"REPLY_TO_REVIEW_HEADER": "{seller_id}에 남긴 리뷰에 답장하기",
9699
"BY_REVIEWER": "{buyer_id}에 의해",
97100
"REPLY_TO_REVIEW_MESSAGE": "위 리뷰에 대한 답장을 남기세요",
98101
"FACE_SELECTION_REVIEW_MESSAGE": "이 개척자와의 상호작용에 대한 기분을 나타내는 얼굴을 선택하세요",
99102
"ADDITIONAL_COMMENTS_PLACEHOLDER": "추가 의견을 입력하세요",
100103
"FEEDBACK_PHOTO_UPLOAD_LABEL": "피드백 사진 업로드",
101104
"VALIDATION": {
105+
"LOADING_REVIEW_FAILURE": "리뷰 로딩 오류",
102106
"SELF_REVIEW_PROHIBITED": "자기 평가는 금지되어 있습니다"
103107
}
104108
}
@@ -188,6 +192,7 @@
188192
"PIONEER_LABEL": "개척자",
189193
"BUY": "구매",
190194
"NAVIGATE": "탐색",
195+
"NO_COMMENT": "댓글이 제공되지 않았습니다",
191196
"SEARCH_CENTER": "검색 센터 설정",
192197
"CHECK_REVIEWS": "리뷰 확인",
193198
"SEARCH_REVIEWS": "리뷰 검색",
@@ -204,6 +209,7 @@
204209
"PHOTO": {
205210
"UPLOAD_PHOTO_LABEL": "사진 업로드",
206211
"UPLOAD_PHOTO_PLACEHOLDER": "구매자의 관심을 끌기 위해 이미지를 업로드하세요 (PNG, JPG, JPEG, WEBP)",
212+
"UPLOAD_PHOTO_REVIEW_PLACEHOLDER": "리뷰를 지원하는 이미지를 업로드하세요 (PNG, JPG, JPEG, WEBP)",
207213
"IMAGE_DROP_UPLOAD_MESSAGE": "여기에 이미지를 드롭하거나 찾아보기",
208214
"SUPPORTS_FILE_MESSAGE": "지원: PNG, JPG, JPEG, WEBP",
209215
"MISC_LABELS": {

src/app/[locale]/seller/registration/page.tsx

+60-31
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import logger from '../../../../../logger.config.mjs';
2828

2929
const SellerRegistrationForm = () => {
3030
const HEADER = 'font-bold text-lg md:text-2xl';
31+
const SUBHEADER = 'font-bold mb-2';
3132
const router = useRouter();
3233
const t = useTranslations();
3334
const placeholderSeller = itemData.seller;
@@ -264,8 +265,52 @@ const SellerRegistrationForm = () => {
264265
</div>
265266

266267
<div className="mb-4">
268+
<h2 className={SUBHEADER}>
269+
{t('SCREEN.SELLER_REGISTRATION.SELLER_DETAILS_LABEL')}
270+
</h2>
271+
<p className='text-gray-400 text-sm'>{t('SCREEN.SELLER_REGISTRATION.SELLER_DETAILS_PLACEHOLDER')}</p>
272+
<div className="mb-2">
273+
<TextArea
274+
name="sellerDescription"
275+
value={formData.sellerDescription}
276+
onChange={handleChange}
277+
styles={{ height: '200px' }}
278+
/>
279+
</div>
280+
</div>
281+
<Link
282+
href={{
283+
pathname: "/map-center", // Path to MapCenter component
284+
query: { entryType: 'sell' } // Passing 'sell' as entryType
285+
}}
286+
>
287+
<Button
288+
label={t('SCREEN.SELLER_REGISTRATION.SELLER_SELL_CENTER')}
289+
styles={{
290+
color: '#ffc153',
291+
height: '40px',
292+
padding: '10px',
293+
marginLeft: 'auto',
294+
}}
295+
/>
296+
</Link>
297+
<div className="mb-4 mt-3 ml-auto w-min">
298+
<Button
299+
label={t('SHARED.SAVE')}
300+
disabled={!isSaveEnabled}
301+
styles={{
302+
color: '#ffc153',
303+
height: '40px',
304+
padding: '10px 15px',
305+
}}
306+
onClick={handleSave}
307+
/>
308+
</div>
309+
310+
<div className='spacing-7'>
267311
{/* seller registration form fields toggle */}
268-
<ToggleCollapse header={t('SCREEN.SELLER_REGISTRATION.SELLER_SETTINGS_LABEL')}
312+
<ToggleCollapse
313+
header={t('SCREEN.SELLER_REGISTRATION.SELLER_ADVANCED_SETTINGS_LABEL')}
269314
open={true}>
270315
<div className="mb-4">
271316
<Input
@@ -290,32 +335,6 @@ const SellerRegistrationForm = () => {
290335
value={formData.sellerAddress}
291336
onChange={handleChange}
292337
/>
293-
<Link
294-
href={{
295-
pathname: "/map-center", // Path to MapCenter component
296-
query: { entryType: 'sell' } // Passing 'sell' as entryType
297-
}}
298-
>
299-
<Button
300-
label={t('SCREEN.SELLER_REGISTRATION.SELLER_SELL_CENTER')}
301-
styles={{
302-
color: '#ffc153',
303-
height: '40px',
304-
padding: '10px',
305-
marginLeft: 'auto',
306-
}}
307-
/>
308-
</Link>
309-
<div className="mb-2 mt-4">
310-
<TextArea
311-
label={t('SCREEN.SELLER_REGISTRATION.SELLER_DETAILS_PLACEHOLDER')}
312-
describe={t('SCREEN.SELLER_REGISTRATION.SELLER_DETAILS_PLACEHOLDER')}
313-
name="sellerDescription"
314-
value={formData.sellerDescription}
315-
onChange={handleChange}
316-
styles={{ height: '200px' }}
317-
/>
318-
</div>
319338
</div>
320339
<div className="mb-4">
321340
<FileInput
@@ -337,9 +356,7 @@ const SellerRegistrationForm = () => {
337356
/>
338357
</div>
339358
</ToggleCollapse>
340-
</div>
341359

342-
<div className='spacing-7'>
343360
{/* seller review toggle */}
344361
<ToggleCollapse
345362
header={t('SCREEN.SELLER_REGISTRATION.REVIEWS_SUMMARY_LABEL')}
@@ -367,10 +384,10 @@ const SellerRegistrationForm = () => {
367384
</div>
368385
</ToggleCollapse>
369386

370-
{/* user settings info toggle */}
387+
{/* contact details info toggle */}
371388
<ToggleCollapse
372389
header={t('SCREEN.BUY_FROM_SELLER.SELLER_CONTACT_DETAILS_LABEL')}
373-
open={false}>
390+
open={false}>
374391
<div className="text-sm mb-3">
375392
<span className="font-bold">
376393
{t('SHARED.USER_INFORMATION.PI_USERNAME_LABEL') + ': '}
@@ -395,6 +412,18 @@ const SellerRegistrationForm = () => {
395412
</span>
396413
<span>{ userSettings ? userSettings.email : ""}</span>
397414
</div>
415+
<div className="mb-4 mt-3 ml-auto w-min">
416+
<Button
417+
label={t('SHARED.SAVE')}
418+
disabled={!isSaveEnabled}
419+
styles={{
420+
color: '#ffc153',
421+
height: '40px',
422+
padding: '10px 15px',
423+
}}
424+
onClick={handleSave}
425+
/>
426+
</div>
398427
</ToggleCollapse>
399428

400429
</div>

0 commit comments

Comments
 (0)