Skip to content

Commit d86b418

Browse files
omotoshoayomikunomotoshoayomikun
committed
Merge branch 'dev' into feature/filter_search
2 parents d94eeac + 72d29df commit d86b418

30 files changed

+1656
-70
lines changed

‎context/AppContextProvider.tsx

+9-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,15 @@ const AppContextProvider = ({ children }: AppContextProviderProps) => {
8080
try {
8181
setIsSigningInUser(true);
8282
const pioneerAuth: AuthResult = await window.Pi.authenticate(['username', 'payments'], onIncompletePaymentFound);
83-
const res = await axiosClient.post("/users/authenticate", {pioneerAuth});
83+
const res = await axiosClient.post(
84+
"/users/authenticate",
85+
{}, // empty body
86+
{
87+
headers: {
88+
Authorization: `Bearer ${pioneerAuth.accessToken}`,
89+
},
90+
}
91+
);
8492

8593
if (res.status === 200) {
8694
setAuthToken(res.data?.token);

‎i18n/i18n.ts

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Can be imported from a shared config
2+
export const locales = [
3+
'ar',
4+
'en',
5+
'en-GB',
6+
'es',
7+
'ewe-BJ',
8+
'fon-BJ',
9+
'fr',
10+
'hau-NG',
11+
'yor-NG',
12+
'ja',
13+
'ko',
14+
'vi',
15+
'zh-CN',
16+
'zh-TW'
17+
] as const;
18+
19+
export const defaultLocale = 'en';

‎src/i18n.ts renamed to ‎i18n/request.ts

+2-21
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,6 @@
11
import { notFound } from 'next/navigation';
22
import { getRequestConfig } from 'next-intl/server';
3-
4-
// Can be imported from a shared config
5-
export const locales = [
6-
'ar',
7-
'en',
8-
'en-GB',
9-
'es',
10-
'ewe-BJ',
11-
'fon-BJ',
12-
'fr',
13-
'hau-NG',
14-
'yor-NG',
15-
'ja',
16-
'ko',
17-
'vi',
18-
'zh-CN',
19-
'zh-TW'
20-
] as const;
21-
22-
export const defaultLocale = 'en';
3+
import { locales } from './i18n';
234

245
export default getRequestConfig(async ({ locale }) => {
256
// Validate that the incoming `locale` parameter is valid
@@ -28,4 +9,4 @@ export default getRequestConfig(async ({ locale }) => {
289
return {
2910
messages: (await import(`../messages/${locale}.json`)).default,
3011
};
31-
});
12+
});

‎messages/ar.json

+45-1
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,52 @@
6060
"SELLER_ADDRESS_LOCATION_PLACEHOLDER": "علامة الموقع على الخريطة تظهر مكان بيعي",
6161
"SELLER_SETTINGS_LABEL": "إعدادات البائع",
6262
"SELLER_SELL_CENTER": "تحديد مركز البيع",
63+
"SELLER_ONLINE_SHOPPING_LABEL": "التسوق عبر الإنترنت",
64+
"MAPPI_ALLOWANCE_LABEL": "المخصص المتبقي في Mappi",
65+
"FULFILLMENT_METHOD_TYPE": {
66+
"FULFILLMENT_METHOD_TYPE_LABEL": "طريقة الإتمام",
67+
"FULFILLMENT_METHOD_TYPE_OPTIONS": {
68+
"COLLECTION_BY_BUYER": "جمع من قبل المشتري",
69+
"DELIVERED_TO_BUYER": "تسليم إلى المشتري"
70+
}
71+
},
72+
"FULFILLMENT_INSTRUCTIONS_LABEL": "تعليمات التنفيذ للمشتري",
73+
"FULFILLMENT_INSTRUCTIONS_PLACEHOLDER": "التجميع يكون من عنوان البائع. إذا تم اختيار التوصيل، يرجى إدخال عنوان المشتري.",
6374
"VALIDATION": {
6475
"EMAIL_VALIDATION": "يرجى إدخال عنوان بريد إلكتروني صالح",
6576
"SUCCESSFUL_REGISTRATION_SUBMISSION": "تم التسجيل بنجاح",
6677
"FAILED_REGISTRATION_SUBMISSION": "خطأ في حفظ التسجيل",
6778
"REGISTRATION_FAILED_USER_NOT_AUTHENTICATED": "فشل التسجيل بسبب عدم المصادقة",
68-
"UNINITIALIZED_SELL_CENTER": "يرجى تحديد مركز البيع"
79+
"UNINITIALIZED_SELL_CENTER": "يرجى تحديد مركز البيع",
80+
"SUCCESSFUL_SELLER_ITEM_SAVED": "تم حفظ عنصر البائع بنجاح",
81+
"SUCCESSFUL_SELLER_ITEM_DELETED": "تم حذف عنصر البائع بنجاح",
82+
"FAILED_SELLER_ITEM_SAVE": "حدث خطأ أثناء حفظ عنصر البائع",
83+
"FAILED_SELLER_ITEM_DELETE": "خطأ في حذف عنصر البائع",
84+
"SELLER_ITEM_NOT_FOUND": "عنصر البائع غير موجود",
85+
"SUCCESSFUL_SAVE_MAPPI_ALLOWANCE_SUFFICIENT": "تم الحفظ بنجاح. تم استخدام مخصصات Mappi {mappi_count}",
86+
"FAILED_SAVE_MAPPI_ALLOWANCE_INSUFFICIENT": "فشل الحفظ. المخصصات المتاحة من Mappi غير كافية"
87+
},
88+
"SELLER_ITEMS_FEATURE": {
89+
"ITEM_LABEL": "العنصر",
90+
"PRICE_LABEL": "السعر",
91+
"STOCK_LABEL": "مستوى المخزون",
92+
"DESCRIPTION_LABEL": "الوصف",
93+
"PHOTO": "الصورة",
94+
"SELLING_DURATION_LABEL": "مدة البيع بالأسابيع",
95+
"SELLING_STATUS_OPTIONS": {
96+
"ACTIVE": "نشط",
97+
"EXPIRED": "منتهي الصلاحية"
98+
},
99+
"STOCK_LEVEL_OPTIONS": {
100+
"AVAILABLE_1": "1 متوفر",
101+
"AVAILABLE_2": "2 متوفر",
102+
"AVAILABLE_3": "3 متوفر",
103+
"MANY": "متوفر بكثرة",
104+
"MADE_TO_ORDER": "يصنع عند الطلب",
105+
"ONGOING_SERVICE": "خدمة مستمرة",
106+
"SOLD": "تم البيع"
107+
},
108+
"SELLING_EXPIRATION_DATE": "يباع بحلول {expired_by_date}"
69109
}
70110
},
71111
"BUY_FROM_SELLER": {
@@ -193,7 +233,11 @@
193233
"SEARCH_REVIEWS": "البحث في التقييمات",
194234
"SEARCH_LOADING": "جارٍ تحميل البحث...",
195235
"REPLY": "رد",
236+
"ADD_ITEM": "إضافة عنصر",
237+
"DELETE": "حذف",
238+
"CONFIRM_DELETE": "هل تريد حقًا حذف هذا العنصر؟ لا يمكن التراجع عن هذا الإجراء.",
196239
"SAVE": "حفظ",
240+
"CONFIRM": "تأكيد",
197241
"CONFIRM_DIALOG": "لديك تغييرات غير محفوظة. هل تريد مغادرة الصفحة حقًا؟",
198242
"USER_INFORMATION": {
199243
"PI_USERNAME_LABEL": "اسم مستخدم Pi",

‎messages/en-GB.json

+45-1
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,52 @@
6060
"SELLER_ADDRESS_LOCATION_PLACEHOLDER": "My map marker shows where I am selling",
6161
"SELLER_SETTINGS_LABEL": "Seller Settings",
6262
"SELLER_SELL_CENTER": "Set Sell Centre",
63+
"SELLER_ONLINE_SHOPPING_LABEL": "Online Shopping",
64+
"MAPPI_ALLOWANCE_LABEL": "Mappi allowance remaining",
65+
"FULFILLMENT_METHOD_TYPE": {
66+
"FULFILLMENT_METHOD_TYPE_LABEL": "Fulfilment method",
67+
"FULFILLMENT_METHOD_TYPE_OPTIONS": {
68+
"COLLECTION_BY_BUYER": "Collection by buyer",
69+
"DELIVERED_TO_BUYER": "Delivered to buyer"
70+
}
71+
},
72+
"FULFILLMENT_INSTRUCTIONS_LABEL": "Fulfilment instructions to buyer",
73+
"FULFILLMENT_INSTRUCTIONS_PLACEHOLDER": "Collection is from the seller's address. If delivery is selected, please enter the buyer's address.",
6374
"VALIDATION": {
6475
"EMAIL_VALIDATION": "Please enter a valid email address",
6576
"SUCCESSFUL_REGISTRATION_SUBMISSION": "Registration successful",
6677
"FAILED_REGISTRATION_SUBMISSION": "Error saving registration",
6778
"REGISTRATION_FAILED_USER_NOT_AUTHENTICATED": "Registration failed because user is not authenticated",
68-
"UNINITIALIZED_SELL_CENTER": "Please set your Sell Centre"
79+
"UNINITIALIZED_SELL_CENTER": "Please set your Sell Centre",
80+
"SUCCESSFUL_SELLER_ITEM_SAVED": "Seller item saved successfully",
81+
"SUCCESSFUL_SELLER_ITEM_DELETED": "Seller item deleted successfully",
82+
"FAILED_SELLER_ITEM_SAVE": "Error saving seller item",
83+
"FAILED_SELLER_ITEM_DELETE": "Error deleting seller item",
84+
"SELLER_ITEM_NOT_FOUND": "Seller item not found",
85+
"SUCCESSFUL_SAVE_MAPPI_ALLOWANCE_SUFFICIENT": "Save successful. Mappi allowance used {mappi_count}",
86+
"FAILED_SAVE_MAPPI_ALLOWANCE_INSUFFICIENT": "Save unsuccessful. Insufficient Mappi allowance available"
87+
},
88+
"SELLER_ITEMS_FEATURE": {
89+
"ITEM_LABEL": "Item",
90+
"PRICE_LABEL": "Price",
91+
"STOCK_LABEL": "Stock level",
92+
"DESCRIPTION_LABEL": "Description",
93+
"PHOTO": "Photo",
94+
"SELLING_DURATION_LABEL": "Selling duration in weeks",
95+
"SELLING_STATUS_OPTIONS": {
96+
"ACTIVE": "Active",
97+
"EXPIRED": "Expired"
98+
},
99+
"STOCK_LEVEL_OPTIONS": {
100+
"AVAILABLE_1": "1 available",
101+
"AVAILABLE_2": "2 available",
102+
"AVAILABLE_3": "3 available",
103+
"MANY": "Many available",
104+
"MADE_TO_ORDER": "Made to order",
105+
"ONGOING_SERVICE": "Ongoing service",
106+
"SOLD": "Sold"
107+
},
108+
"SELLING_EXPIRATION_DATE": "Sell by {expired_by_date}"
69109
}
70110
},
71111
"BUY_FROM_SELLER": {
@@ -205,7 +245,11 @@
205245
"SEARCH_REVIEWS": "Search Reviews",
206246
"SEARCH_LOADING": "Search loading...",
207247
"REPLY": "Reply",
248+
"ADD_ITEM": "Add Item",
249+
"DELETE": "Delete",
250+
"CONFIRM_DELETE": "Do you really want to delete this item? This action cannot be undone.",
208251
"SAVE": "Save",
252+
"CONFIRM": "Confirm",
209253
"CONFIRM_DIALOG": "You have unsaved changes. Do you really want to leave?",
210254
"USER_INFORMATION": {
211255
"PI_USERNAME_LABEL": "Pi username",

‎messages/en.json

+53-2
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,52 @@
6060
"SELLER_ADDRESS_LOCATION_PLACEHOLDER": "My map marker shows where I am selling",
6161
"SELLER_SETTINGS_LABEL": "Seller Settings",
6262
"SELLER_SELL_CENTER": "Set Sell Center",
63+
"SELLER_ONLINE_SHOPPING_LABEL": "Online Shopping",
64+
"MAPPI_ALLOWANCE_LABEL": "Mappi allowance remaining",
65+
"FULFILLMENT_METHOD_TYPE": {
66+
"FULFILLMENT_METHOD_TYPE_LABEL": "Fulfillment method",
67+
"FULFILLMENT_METHOD_TYPE_OPTIONS": {
68+
"COLLECTION_BY_BUYER": "Collection by buyer",
69+
"DELIVERED_TO_BUYER": "Delivered to buyer"
70+
}
71+
},
72+
"FULFILLMENT_INSTRUCTIONS_LABEL": "Fulfillment instructions to buyer",
73+
"FULFILLMENT_INSTRUCTIONS_PLACEHOLDER": "Collection is from the seller's address. If delivery is selected, please enter the buyer's address.",
6374
"VALIDATION": {
6475
"EMAIL_VALIDATION": "Please enter a valid email address",
6576
"SUCCESSFUL_REGISTRATION_SUBMISSION": "Registration successful",
6677
"FAILED_REGISTRATION_SUBMISSION": "Error saving registration",
6778
"REGISTRATION_FAILED_USER_NOT_AUTHENTICATED": "Registration failed because user is not authenticated",
68-
"UNINITIALIZED_SELL_CENTER": "Please set your Sell Center"
79+
"UNINITIALIZED_SELL_CENTER": "Please set your Sell Center",
80+
"SUCCESSFUL_SELLER_ITEM_SAVED": "Seller item saved successfully",
81+
"SUCCESSFUL_SELLER_ITEM_DELETED": "Seller item deleted successfully",
82+
"FAILED_SELLER_ITEM_SAVE": "Error saving seller item",
83+
"FAILED_SELLER_ITEM_DELETE": "Error deleting seller item",
84+
"SELLER_ITEM_NOT_FOUND": "Seller item not found",
85+
"SUCCESSFUL_SAVE_MAPPI_ALLOWANCE_SUFFICIENT": "Save successful. Mappi allowance used {mappi_count}",
86+
"FAILED_SAVE_MAPPI_ALLOWANCE_INSUFFICIENT": "Save unsuccessful. Insufficient Mappi allowance available"
87+
},
88+
"SELLER_ITEMS_FEATURE": {
89+
"ITEM_LABEL": "Item",
90+
"PRICE_LABEL": "Price",
91+
"STOCK_LABEL": "Stock level",
92+
"DESCRIPTION_LABEL": "Description",
93+
"PHOTO": "Photo",
94+
"SELLING_DURATION_LABEL": "Selling duration in weeks",
95+
"SELLING_STATUS_OPTIONS": {
96+
"ACTIVE": "Active",
97+
"EXPIRED": "Expired"
98+
},
99+
"STOCK_LEVEL_OPTIONS": {
100+
"AVAILABLE_1": "1 available",
101+
"AVAILABLE_2": "2 available",
102+
"AVAILABLE_3": "3 available",
103+
"MANY": "Many available",
104+
"MADE_TO_ORDER": "Made to order",
105+
"ONGOING_SERVICE": "Ongoing service",
106+
"SOLD": "Sold"
107+
},
108+
"SELLING_EXPIRATION_DATE": "Sell by {expired_by_date}"
69109
}
70110
},
71111
"BUY_FROM_SELLER": {
@@ -82,7 +122,14 @@
82122
"SELLER_USERNAME_LABEL": "Username",
83123
"SELLER_PIONEER_ID_LABEL": "Pioneer ID",
84124
"SELLER_PHONE_NUMBER_LABEL": "Phone number",
85-
"SELLER_EMAIL_ADDRESS_LABEL": "Email address"
125+
"SELLER_EMAIL_ADDRESS_LABEL": "Email address",
126+
"SELLER_ITEMS_FEATURE": {
127+
"ITEM_LABEL": "Item",
128+
"PRICE_LABEL": "Price",
129+
"DESCRIPTION_LABEL": "Description",
130+
"PHOTO": "Photo",
131+
"BUYING_QUANTITY_LABEL": "Quantity"
132+
}
86133
},
87134
"REVIEWS": {
88135
"REVIEWS_HEADER": "Reviews",
@@ -193,7 +240,11 @@
193240
"SEARCH_REVIEWS": "Search Reviews",
194241
"SEARCH_LOADING": "Search loading...",
195242
"REPLY": "Reply",
243+
"ADD_ITEM": "Add Item",
244+
"DELETE": "Delete",
245+
"CONFIRM_DELETE": "Do you really want to delete this item? This action cannot be undone.",
196246
"SAVE": "Save",
247+
"CONFIRM": "Confirm",
197248
"CONFIRM_DIALOG": "You have unsaved changes. Do you really want to leave?",
198249
"USER_INFORMATION": {
199250
"PI_USERNAME_LABEL": "Pi username",

‎messages/es.json

+46-2
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,52 @@
6060
"SELLER_ADDRESS_LOCATION_PLACEHOLDER": "Mi marcador en el mapa muestra dónde estoy vendiendo",
6161
"SELLER_SETTINGS_LABEL": "Configuración del Vendedor",
6262
"SELLER_SELL_CENTER": "Establecer Centro de Venta",
63+
"SELLER_ONLINE_SHOPPING_LABEL": "Compras en línea",
64+
"MAPPI_ALLOWANCE_LABEL": "Asignación de Mappi restante",
65+
"FULFILLMENT_METHOD_TYPE": {
66+
"FULFILLMENT_METHOD_TYPE_LABEL": "Método de cumplimiento",
67+
"FULFILLMENT_METHOD_TYPE_OPTIONS": {
68+
"COLLECTION_BY_BUYER": "Recogida por el comprador",
69+
"DELIVERED_TO_BUYER": "Entregado al comprador"
70+
}
71+
},
72+
"FULFILLMENT_INSTRUCTIONS_LABEL": "Instrucciones de cumplimiento para el comprador",
73+
"FULFILLMENT_INSTRUCTIONS_PLACEHOLDER": "La recogida es desde la dirección del vendedor. Si se selecciona la entrega, por favor ingrese la dirección del comprador.",
6374
"VALIDATION": {
6475
"EMAIL_VALIDATION": "Por favor, ingresa una dirección de correo electrónico válida",
6576
"SUCCESSFUL_REGISTRATION_SUBMISSION": "Registro exitoso",
6677
"FAILED_REGISTRATION_SUBMISSION": "Error al guardar el registro",
6778
"REGISTRATION_FAILED_USER_NOT_AUTHENTICATED": "El registro falló porque el usuario no está autenticado",
68-
"UNINITIALIZED_SELL_CENTER": "Por favor, establezca su Centro de Venta"
79+
"UNINITIALIZED_SELL_CENTER": "Por favor, establezca su Centro de Venta",
80+
"SUCCESSFUL_SELLER_ITEM_SAVED": "Artículo del vendedor guardado con éxito",
81+
"SUCCESSFUL_SELLER_ITEM_DELETED": "Artículo del vendedor eliminado con éxito",
82+
"FAILED_SELLER_ITEM_SAVE": "Error al guardar el artículo del vendedor",
83+
"FAILED_SELLER_ITEM_DELETE": "Error al eliminar el artículo del vendedor",
84+
"SELLER_ITEM_NOT_FOUND": "Artículo del vendedor no encontrado",
85+
"SUCCESSFUL_SAVE_MAPPI_ALLOWANCE_SUFFICIENT": "Guardado exitoso. Mappi usado {mappi_count}",
86+
"FAILED_SAVE_MAPPI_ALLOWANCE_INSUFFICIENT": "Guardado fallido. Mappi disponible insuficiente"
87+
},
88+
"SELLER_ITEMS_FEATURE": {
89+
"ITEM_LABEL": "Artículo",
90+
"PRICE_LABEL": "Precio",
91+
"STOCK_LABEL": "Nivel de existencias",
92+
"DESCRIPTION_LABEL": "Descripción",
93+
"PHOTO": "Foto",
94+
"SELLING_DURATION_LABEL": "Duración de venta en semanas",
95+
"SELLING_STATUS_OPTIONS": {
96+
"ACTIVE": "Activo",
97+
"EXPIRED": "Expirado"
98+
},
99+
"STOCK_LEVEL_OPTIONS": {
100+
"AVAILABLE_1": "1 disponible",
101+
"AVAILABLE_2": "2 disponibles",
102+
"AVAILABLE_3": "3 disponibles",
103+
"MANY": "Muchos disponibles",
104+
"MADE_TO_ORDER": "Hecho a pedido",
105+
"ONGOING_SERVICE": "Servicio continuo",
106+
"SOLD": "Vendido"
107+
},
108+
"SELLING_EXPIRATION_DATE": "Vender antes de {expired_by_date}"
69109
}
70110
},
71111
"BUY_FROM_SELLER": {
@@ -192,8 +232,12 @@
192232
"SEARCH_REVIEWS": "Buscar reseñas",
193233
"SEARCH_LOADING": "Cargando búsqueda...",
194234
"REPLY": "Responder",
235+
"ADD_ITEM": "Agregar artículo",
236+
"DELETE": "Eliminar",
237+
"CONFIRM_DELETE": "¿Realmente quieres eliminar este elemento? Esta acción no se puede deshacer.",
195238
"SAVE": "Guardar",
196-
"CONFIRM_DIALOG": "Tienes cambios sin guardar. ¿Realmente quieres salir?",
239+
"CONFIRM": "Confirmar",
240+
"CONFIRM_DIALOG": "Tienes cambios sin guardar. Realmente quieres salir?",
197241
"USER_INFORMATION": {
198242
"PI_USERNAME_LABEL": "Nombre de usuario Pi",
199243
"NAME_LABEL": "Nombre",

0 commit comments

Comments
 (0)