From 79e51d6294dcc823b508e158a8390b24af30072e Mon Sep 17 00:00:00 2001 From: Joao Ramos Date: Thu, 29 Feb 2024 18:26:41 +0000 Subject: [PATCH 1/2] Added support for the homepage languages --- src/pages/api/users/agents/[code].ts | 6 ++++-- src/pages/api/users/agents/index.ts | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/pages/api/users/agents/[code].ts b/src/pages/api/users/agents/[code].ts index 56e9a0fd..262f23ce 100644 --- a/src/pages/api/users/agents/[code].ts +++ b/src/pages/api/users/agents/[code].ts @@ -23,7 +23,7 @@ interface Contact { number: string; } async function get(req: NextApiRequest, res: NextApiResponse) { - const { code } = req.query as { code: string }; + const { code, language = 'en' } = req.query as { code: string, language: string}; const usersQuery = query( collection(db, "users"), @@ -44,8 +44,10 @@ async function get(req: NextApiRequest, res: NextApiResponse) { }) as Contact[]; const country = countryCodes.findOne("countryCode" as any, code); + const key = language === 'ar' ? 'countryNameLocal' : 'countryNameEn'; + res.json({ - label: country.countryNameEn, + label: country[key], entries, }); } diff --git a/src/pages/api/users/agents/index.ts b/src/pages/api/users/agents/index.ts index 8eb3da81..2bc9a4e0 100644 --- a/src/pages/api/users/agents/index.ts +++ b/src/pages/api/users/agents/index.ts @@ -23,6 +23,8 @@ interface Contact { number: string; } async function get(req: NextApiRequest, res: NextApiResponse) { + const { language = 'en' } = req.query as { language: string }; + const usersQuery = query( collection(db, "users"), where("type", "==", "agent") @@ -50,8 +52,9 @@ async function get(req: NextApiRequest, res: NextApiResponse) { const result = Object.keys(data).map((code) => { const country = countryCodes.findOne("countryCode" as any, code); + const key = language === 'ar' ? 'countryNameLocal' : 'countryNameEn'; return { - label: country.countryNameEn, + label: country[key], key: code, entries: data[code], }; From 424b72efaf85ccef50ddc544f9acb5ba1daa100b Mon Sep 17 00:00:00 2001 From: Joao Ramos Date: Thu, 29 Feb 2024 18:35:30 +0000 Subject: [PATCH 2/2] Uppercased the country code to prevent API errors --- src/pages/api/users/agents/[code].ts | 2 +- src/pages/api/users/agents/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/api/users/agents/[code].ts b/src/pages/api/users/agents/[code].ts index 262f23ce..9ede7b77 100644 --- a/src/pages/api/users/agents/[code].ts +++ b/src/pages/api/users/agents/[code].ts @@ -43,7 +43,7 @@ async function get(req: NextApiRequest, res: NextApiResponse) { return newUser; }) as Contact[]; - const country = countryCodes.findOne("countryCode" as any, code); + const country = countryCodes.findOne("countryCode" as any, code.toUpperCase()); const key = language === 'ar' ? 'countryNameLocal' : 'countryNameEn'; res.json({ diff --git a/src/pages/api/users/agents/index.ts b/src/pages/api/users/agents/index.ts index 2bc9a4e0..f229f5ae 100644 --- a/src/pages/api/users/agents/index.ts +++ b/src/pages/api/users/agents/index.ts @@ -51,7 +51,7 @@ async function get(req: NextApiRequest, res: NextApiResponse) { ) as Record; const result = Object.keys(data).map((code) => { - const country = countryCodes.findOne("countryCode" as any, code); + const country = countryCodes.findOne("countryCode" as any, code.toUpperCase()); const key = language === 'ar' ? 'countryNameLocal' : 'countryNameEn'; return { label: country[key],