From f2316237936df28280280bff86cdd5e00d2da7b3 Mon Sep 17 00:00:00 2001 From: swoocn Date: Thu, 18 Dec 2025 09:34:12 -0500 Subject: [PATCH 1/2] Add Holiday seller type + logic; WIP. --- messages/ak-TW.json | 4 ++- messages/ar.json | 4 ++- messages/de.json | 5 +++- messages/en-GB.json | 4 ++- messages/en.json | 4 ++- messages/es.json | 4 ++- messages/ewe-BJ.json | 4 ++- messages/fon-BJ.json | 4 ++- messages/fr.json | 4 ++- messages/hau-NG.json | 4 ++- messages/hi.json | 4 ++- messages/ja.json | 4 ++- messages/ko.json | 4 ++- messages/vi.json | 4 ++- messages/yor-NG.json | 4 ++- messages/zh-CN.json | 4 ++- messages/zh-TW.json | 4 ++- public/images/christmas-logo.svg | 1 + .../images/icons/map-of-pi-christmas-icon.png | Bin 0 -> 17932 bytes src/components/shared/map/Map.tsx | 26 +++++++++--------- src/components/shared/sidebar/sidebar.tsx | 4 +++ src/constants/types.ts | 2 ++ src/utils/translate.ts | 8 ++++++ 23 files changed, 80 insertions(+), 30 deletions(-) create mode 100644 public/images/christmas-logo.svg create mode 100644 public/images/icons/map-of-pi-christmas-icon.png diff --git a/messages/ak-TW.json b/messages/ak-TW.json index a501ad58..8f67a1c9 100644 --- a/messages/ak-TW.json +++ b/messages/ak-TW.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "Atɔnfo a wɔyɛ adwuma", "INCLUDE_INACTIVE_SELLERS": "Atɔnfo a wogyae adwuma", - "INCLUDE_TEST_SELLERS": "Atɔnfo a wɔregyina nsɔhwɛ mu" + "INCLUDE_TEST_SELLERS": "Atɔnfo a wɔregyina nsɔhwɛ mu", + "INCLUDE_HOLIDAY_SELLERS": "Afehyia Atɔnfo" }, "CONTACT_MAP_OF_PI": "Kasa kyerɛ Map of Pi", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "Atɔnfoɔ a ɔyɛ adwuma", "INACTIVE_SELLER": "Atɔnfoɔ a wagyae adwuma", "TEST_SELLER": "Nsɔhwɛ Atɔnfoɔ", + "HOLIDAY_SELLER": "Afehyia Atɔnfo", "RESTRICTED_SELLER": "Dwadifo a wɔakyiw no" } }, diff --git a/messages/ar.json b/messages/ar.json index 6cb6bb98..30ae4c7f 100644 --- a/messages/ar.json +++ b/messages/ar.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "البائعون النشطون", "INCLUDE_INACTIVE_SELLERS": "البائعون غير النشطين", - "INCLUDE_TEST_SELLERS": "البائعون التجريبيون" + "INCLUDE_TEST_SELLERS": "البائعون التجريبيون", + "INCLUDE_HOLIDAY_SELLERS": "بائعو العطلات" }, "CONTACT_MAP_OF_PI": "اتصل بـ Map of Pi", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "بائع نشط", "INACTIVE_SELLER": "بائع غير نشط", "TEST_SELLER": "بائع تجريبي", + "HOLIDAY_SELLER": "بائع العطلات", "RESTRICTED_SELLER": "بائع مقيّد" } }, diff --git a/messages/de.json b/messages/de.json index d7aa581d..e5c040ca 100644 --- a/messages/de.json +++ b/messages/de.json @@ -37,7 +37,9 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "Aktives Mitglied Verkäufer", "INCLUDE_INACTIVE_SELLERS": "Untätig Verkäufer", - "INCLUDE_TEST_SELLERS": "Testverkäufer einschließen" + "INCLUDE_TEST_SELLERS": "Testverkäufer einschließen", + "INCLUDE_HOLIDAY_SELLERS": "Feiertagsverkäufer" + }, "CONTACT_MAP_OF_PI": "Kontaktkarte von Map of Pi", "VALIDATION": { @@ -85,6 +87,7 @@ "ACTIVE_SELLER": "Aktiver Verkäufer", "INACTIVE_SELLER": "Inaktiver Verkäufer", "TEST_SELLER": "Testverkäufer", + "HOLIDAY_SELLER": "Feiertagsverkäufer", "RESTRICTED_SELLER": "Eingeschränkter Verkäufer" } }, diff --git a/messages/en-GB.json b/messages/en-GB.json index 48e1a22a..96f90d8b 100644 --- a/messages/en-GB.json +++ b/messages/en-GB.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "Active sellers", "INCLUDE_INACTIVE_SELLERS": "Inactive sellers", - "INCLUDE_TEST_SELLERS": "Test sellers" + "INCLUDE_TEST_SELLERS": "Test sellers", + "INCLUDE_HOLIDAY_SELLERS": "Holiday sellers" }, "CONTACT_MAP_OF_PI": "Contact Map of Pi", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "Active seller", "INACTIVE_SELLER": "Inactive seller", "TEST_SELLER": "Test seller", + "HOLIDAY_SELLER": "Holiday seller", "RESTRICTED_SELLER": "Restricted seller" } }, diff --git a/messages/en.json b/messages/en.json index d76e2b13..d21dd088 100644 --- a/messages/en.json +++ b/messages/en.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "Active sellers", "INCLUDE_INACTIVE_SELLERS": "Inactive sellers", - "INCLUDE_TEST_SELLERS": "Test sellers" + "INCLUDE_TEST_SELLERS": "Test sellers", + "INCLUDE_HOLIDAY_SELLERS": "Holiday sellers" }, "CONTACT_MAP_OF_PI": "Contact Map of Pi", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "Active seller", "INACTIVE_SELLER": "Inactive seller", "TEST_SELLER": "Test seller", + "HOLIDAY_SELLER": "Holiday seller", "RESTRICTED_SELLER": "Restricted seller" } }, diff --git a/messages/es.json b/messages/es.json index b79b236f..1dc76767 100644 --- a/messages/es.json +++ b/messages/es.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "Vendedores activos", "INCLUDE_INACTIVE_SELLERS": "Vendedores inactivos", - "INCLUDE_TEST_SELLERS": "Vendedores de prueba" + "INCLUDE_TEST_SELLERS": "Vendedores de prueba", + "INCLUDE_HOLIDAY_SELLERS": "Vendedores festivos" }, "CONTACT_MAP_OF_PI": "Contactar a Map of Pi", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "Vendedor activo", "INACTIVE_SELLER": "Vendedor inactivo", "TEST_SELLER": "Vendedor de prueba", + "HOLIDAY_SELLER": "Vendedor festivo", "RESTRICTED_SELLER": "Vendedor restringido" } }, diff --git a/messages/ewe-BJ.json b/messages/ewe-BJ.json index 6ed2a1ca..e65ace4c 100644 --- a/messages/ewe-BJ.json +++ b/messages/ewe-BJ.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "Tɔxɛviawo siwo le dɔwɔme", "INCLUDE_INACTIVE_SELLERS": "Tɔxɛviawo siwo mele dɔwɔme o", - "INCLUDE_TEST_SELLERS": "Tɔxɛviawo ƒe nɔnɔme ɖe sia ɖe" + "INCLUDE_TEST_SELLERS": "Tɔxɛviawo ƒe nɔnɔme ɖe sia ɖe", + "INCLUDE_HOLIDAY_SELLERS": "Ŋkɔkɔeɖe Tɔgbuiwo" }, "CONTACT_MAP_OF_PI": "Kadodo ƒe Map of Pi", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "Nudzrala si le dɔ wɔm", "INACTIVE_SELLER": "Nudzrala si mele dɔ wɔm o", "TEST_SELLER": "Dodokpɔ ƒe nudzrala", + "HOLIDAY_SELLER": "Vendedor festivo", "RESTRICTED_SELLER": "Tɔxɛvia si le dɔwɔme le eme o" } }, diff --git a/messages/fon-BJ.json b/messages/fon-BJ.json index e8a266fb..b2b40d2e 100644 --- a/messages/fon-BJ.json +++ b/messages/fon-BJ.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "Zan tó wà do", "INCLUDE_INACTIVE_SELLERS": "Zan tó mɛ̀ wà do", - "INCLUDE_TEST_SELLERS": "Zan sì wɛ́n" + "INCLUDE_TEST_SELLERS": "Zan sì wɛ́n", + "INCLUDE_HOLIDAY_SELLERS": "Àsìwá Xwéɖeɖe" }, "CONTACT_MAP_OF_PI": "Do xo sedo Map Of Pi", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "Nusatɔ he to nus able-ble", "INACTIVE_SELLER": "Nǔsátɔ́ e ma ɖò azɔ̌ wà wɛ ǎ é le", "TEST_SELLER": "Tɛnkpɔn nusatɔ", + "HOLIDAY_SELLER": "Àsìwá Xwéɖeɖe", "RESTRICTED_SELLER": "Zan tò hùntɔ̀n" } }, diff --git a/messages/fr.json b/messages/fr.json index 30d529b2..b8d560f1 100644 --- a/messages/fr.json +++ b/messages/fr.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "Vendeurs actifs", "INCLUDE_INACTIVE_SELLERS": "Vendeurs inactifs", - "INCLUDE_TEST_SELLERS": "Vendeurs de test" + "INCLUDE_TEST_SELLERS": "Vendeurs de test", + "INCLUDE_HOLIDAY_SELLERS": "Vendeurs saisonniers" }, "CONTACT_MAP_OF_PI": "Contacter Map of Pi", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "Vendeur activé", "INACTIVE_SELLER": "Vendeur desactivé", "TEST_SELLER": "Vendeur de test", + "HOLIDAY_SELLER": "Vendeur saisonnier", "RESTRICTED_SELLER": "Vendeur restreint" } }, diff --git a/messages/hau-NG.json b/messages/hau-NG.json index 2bba1659..d48a4223 100644 --- a/messages/hau-NG.json +++ b/messages/hau-NG.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "Yan kasuwa masu aiki", "INCLUDE_INACTIVE_SELLERS": "Yan kasuwa marasa aiki", - "INCLUDE_TEST_SELLERS": "Yan kasuwa na gwaji" + "INCLUDE_TEST_SELLERS": "Yan kasuwa na gwaji", + "INCLUDE_HOLIDAY_SELLERS": "Masu sayarwa na hutu" }, "CONTACT_MAP_OF_PI": "Tuntubi Map of Pi", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "Mai siyarwa mai aiki", "INACTIVE_SELLER": "Mai siyarwa mara aiki", "TEST_SELLER": "Mai siyarwa gwaji", + "HOLIDAY_SELLER": "Mai sayarwa na hutu", "RESTRICTED_SELLER": "Mai siyarwa da aka takaita" } }, diff --git a/messages/hi.json b/messages/hi.json index f6865506..c0a177f6 100644 --- a/messages/hi.json +++ b/messages/hi.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "सक्रिय विक्रेता", "INCLUDE_INACTIVE_SELLERS": "निष्क्रिय विक्रेता", - "INCLUDE_TEST_SELLERS": "टेस्ट विक्रेता" + "INCLUDE_TEST_SELLERS": "टेस्ट विक्रेता", + "INCLUDE_HOLIDAY_SELLERS": "छुट्टियों के विक्रेता" }, "CONTACT_MAP_OF_PI": "Map of Pi से संपर्क करें", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "सक्रिय विक्रेता", "INACTIVE_SELLER": "निष्क्रिय विक्रेता", "TEST_SELLER": "टेस्ट विक्रेता", + "HOLIDAY_SELLER": "छुट्टियों का विक्रेता", "RESTRICTED_SELLER": "प्रतिबंधित विक्रेता" } }, diff --git a/messages/ja.json b/messages/ja.json index e6e82b94..906b3a4b 100644 --- a/messages/ja.json +++ b/messages/ja.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "アクティブな販売者を含む", "INCLUDE_INACTIVE_SELLERS": "非アクティブな販売者を含む", - "INCLUDE_TEST_SELLERS": "テスト販売者を含む" + "INCLUDE_TEST_SELLERS": "テスト販売者を含む", + "INCLUDE_HOLIDAY_SELLERS": "祝日販売者" }, "CONTACT_MAP_OF_PI": "Map of Pi に連絡", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "アクティブな販売者", "INACTIVE_SELLER": "非アクティブな販売者", "TEST_SELLER": "テスト販売者", + "HOLIDAY_SELLER": "祝日販売者", "RESTRICTED_SELLER": "制限された販売者" } }, diff --git a/messages/ko.json b/messages/ko.json index c1e0e69c..360f5ce7 100644 --- a/messages/ko.json +++ b/messages/ko.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "활동 중인 판매자 포함", "INCLUDE_INACTIVE_SELLERS": "비활동 중인 판매자 포함", - "INCLUDE_TEST_SELLERS": "테스트 판매자 포함" + "INCLUDE_TEST_SELLERS": "테스트 판매자 포함", + "INCLUDE_HOLIDAY_SELLERS": "휴일 판매자" }, "CONTACT_MAP_OF_PI": "Map of Pi에 문의", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "활성 판매자", "INACTIVE_SELLER": "비활성 판매자", "TEST_SELLER": "테스트 판매자", + "HOLIDAY_SELLER": "휴일 판매자", "RESTRICTED_SELLER": "제한된 판매자" } }, diff --git a/messages/vi.json b/messages/vi.json index 7bb52e78..790db7de 100644 --- a/messages/vi.json +++ b/messages/vi.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "Bao gồm người bán hoạt động", "INCLUDE_INACTIVE_SELLERS": "Bao gồm người bán không hoạt động", - "INCLUDE_TEST_SELLERS": "Bao gồm người bán thử nghiệm" + "INCLUDE_TEST_SELLERS": "Bao gồm người bán thử nghiệm", + "INCLUDE_HOLIDAY_SELLERS": "Người bán dịp lễ" }, "CONTACT_MAP_OF_PI": "Liên hệ với Map of Pi", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "Người bán hoạt động", "INACTIVE_SELLER": "Người bán không hoạt động", "TEST_SELLER": "Người bán thử nghiệm", + "HOLIDAY_SELLER": "Người bán dịp lễ", "RESTRICTED_SELLER": "Người bán bị hạn chế" } }, diff --git a/messages/yor-NG.json b/messages/yor-NG.json index fdfaae87..620a5fd2 100644 --- a/messages/yor-NG.json +++ b/messages/yor-NG.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "Fi awọn olutaja ti n ṣiṣẹ kun", "INCLUDE_INACTIVE_SELLERS": "Fi awọn olutaja ti ko n ṣiṣẹ kun", - "INCLUDE_TEST_SELLERS": "Fi awọn olutaja idanwo kun" + "INCLUDE_TEST_SELLERS": "Fi awọn olutaja idanwo kun", + "INCLUDE_HOLIDAY_SELLERS": "Àwọn oníṣòwò àkókò ìsinmi" }, "CONTACT_MAP_OF_PI": "Olubasọrọ Map of Pi", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "Onítajà lọ́wọ́-lọ́wọ́", "INACTIVE_SELLER": "Onítajà aláì ṣi ṣẹ́mọ́", "TEST_SELLER": "Idanwo Olutaja", + "HOLIDAY_SELLER": "Oníṣòwò àkókò ìsinmi", "RESTRICTED_SELLER": "Olutaja to ni idiwọ" } }, diff --git a/messages/zh-CN.json b/messages/zh-CN.json index e64789aa..bd39e6a2 100644 --- a/messages/zh-CN.json +++ b/messages/zh-CN.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "包含活跃卖家", "INCLUDE_INACTIVE_SELLERS": "包含非活跃卖家", - "INCLUDE_TEST_SELLERS": "包含测试卖家" + "INCLUDE_TEST_SELLERS": "包含测试卖家", + "INCLUDE_HOLIDAY_SELLERS": "节日卖家" }, "CONTACT_MAP_OF_PI": "联络 Map of Pi", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "活跃卖家", "INACTIVE_SELLER": "非活跃卖家", "TEST_SELLER": "测试卖家", + "HOLIDAY_SELLER": "节日卖家", "RESTRICTED_SELLER": "受限卖家" } }, diff --git a/messages/zh-TW.json b/messages/zh-TW.json index 87695d05..1568456a 100644 --- a/messages/zh-TW.json +++ b/messages/zh-TW.json @@ -37,7 +37,8 @@ "SEARCH_FILTERS": { "INCLUDE_ACTIVE_SELLERS": "包含活躍賣家", "INCLUDE_INACTIVE_SELLERS": "包含非活躍賣家", - "INCLUDE_TEST_SELLERS": "包含測試賣家" + "INCLUDE_TEST_SELLERS": "包含測試賣家", + "INCLUDE_HOLIDAY_SELLERS": "節日賣家" }, "CONTACT_MAP_OF_PI": "聯絡 Map of Pi", "VALIDATION": { @@ -85,6 +86,7 @@ "ACTIVE_SELLER": "活躍賣家", "INACTIVE_SELLER": "非活躍賣家", "TEST_SELLER": "測試賣家", + "HOLIDAY_SELLER": "節日賣家", "RESTRICTED_SELLER": "受限賣家" } }, diff --git a/public/images/christmas-logo.svg b/public/images/christmas-logo.svg new file mode 100644 index 00000000..996f08ab --- /dev/null +++ b/public/images/christmas-logo.svg @@ -0,0 +1 @@ +AAAvWGp1bWIAAAAeanVtZGMycGEAEQAQgAAAqgA4m3EDYzJwYQAAAC8yanVtYgAAAEdqdW1kYzJtYQARABCAAACqADibcQN1cm46dXVpZDpkMWU3MDBlYy1kYTljLTQ1ZTktOGI2Yi03ZmFlNjZjYmY4NjQAAAABsWp1bWIAAAApanVtZGMyYXMAEQAQgAAAqgA4m3EDYzJwYS5hc3NlcnRpb25zAAAAANNqdW1iAAAAJmp1bWRjYm9yABEAEIAAAKoAOJtxA2MycGEuYWN0aW9ucwAAAAClY2JvcqFnYWN0aW9uc4GjZmFjdGlvbmxjMnBhLmNyZWF0ZWRtc29mdHdhcmVBZ2VudGhDYW52YSBBSXFkaWdpdGFsU291cmNlVHlwZXhTaHR0cDovL2N2LmlwdGMub3JnL25ld3Njb2Rlcy9kaWdpdGFsc291cmNldHlwZS9jb21wb3NpdGVXaXRoVHJhaW5lZEFsZ29yaXRobWljTWVkaWEAAACtanVtYgAAAChqdW1kY2JvcgARABCAAACqADibcQNjMnBhLmhhc2guZGF0YQAAAAB9Y2JvcqVqZXhjbHVzaW9uc4GiZXN0YXJ0GQEPZmxlbmd0aBk/IGRuYW1lbmp1bWJmIG1hbmlmZXN0Y2FsZ2ZzaGEyNTZkaGFzaFggEDCrX1fG9CbgxFi+QzXOtQ7KY4xx4hQvYJotshoI2qpjcGFkSQAAAAAAAAAAAAAAAedqdW1iAAAAJGp1bWRjMmNsABEAEIAAAKoAOJtxA2MycGEuY2xhaW0AAAABu2Nib3Kob2NsYWltX2dlbmVyYXRvcm8gYzJwYS1ycy8wLjQ2LjB0Y2xhaW1fZ2VuZXJhdG9yX2luZm+AaXNpZ25hdHVyZXhNc2VsZiNqdW1iZj0vYzJwYS91cm46dXVpZDpkMWU3MDBlYy1kYTljLTQ1ZTktOGI2Yi03ZmFlNjZjYmY4NjQvYzJwYS5zaWduYXR1cmVqYXNzZXJ0aW9uc4KiY3VybHgnc2VsZiNqdW1iZj1jMnBhLmFzc2VydGlvbnMvYzJwYS5hY3Rpb25zZGhhc2hYIOqcrYOdhOs1rbU2S97U9/uaWHB+eQlMM6Kfbz0afJwJomN1cmx4KXNlbGYjanVtYmY9YzJwYS5hc3NlcnRpb25zL2MycGEuaGFzaC5kYXRhZGhhc2hYIAq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AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9lkCAEX93ZF7cNsehOZegPa0QziICWiXf9rh2G8nYWV0XwXXgvQDwHSS3F8M5mX8GOT4PXZL8JHZuTF3H2iCT82mBIyznRcJUioukc5qVUmxrt/c9YKqM+o5NpGsyp5l6L91QjKrMBMzevXPbZq1WHSl8PASyCt+UcrB3s52yM69p3Z89qa6h3vyGC0ZA03XBoIh0HjsJoQ6gvsCe+CdXma1mFx4YGwxzMxRJaxpfQGOO+GsiWi3C05fRKOSc5g8gS/W9BtYUeZP5iqPQbpKpxvotUyQ54DOEPhCpGM8lNiCVU6tZVWTg19S3EWEU/jzZOY6o8qH/ylIJ6tuR2YKgMScolnvgY3S0dJ3HisPneOZ66BrFeYdiyD4Z3Db3WmI5GiPlk5dg57PoP6/pGMnrDzILkxd2CD0iLMk1b4OucPAn/ZxjNwtT2zHlS1Hu+/5JVZr06N7D25vbcHnl1xwvBqBUseniwFblKb5UNDwe4a2jd/Sj1rEdwZKsyMlv5WyTtPwzNKYptN75DOhAKwSFMolowy8tZJP8At2WD6CXyiFuR0LDaFiRTCbdOfqim8xj3XWWgljsD2XqCCgr+iV/NzRSovrj/TuvWOIAffEym/3m+zHdJiEmExPbSl2Ultl6X9ZTw6+fVJZl0B7Tegq6PH6HwkPS/BYuRoz6QltbfQ2AExrYes \ No newline at end of file diff --git a/public/images/icons/map-of-pi-christmas-icon.png b/public/images/icons/map-of-pi-christmas-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a72fd7ed5595e12ed9165b251f56c43c5ce0d539 GIT binary patch literal 17932 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%0AeUc|FV}Xm$Im!8rK0_&^PUPeu#mg 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 literal 0 HcmV?d00001 diff --git a/src/components/shared/map/Map.tsx b/src/components/shared/map/Map.tsx index 1a5834a7..196a3b39 100644 --- a/src/components/shared/map/Map.tsx +++ b/src/components/shared/map/Map.tsx @@ -5,7 +5,7 @@ import { MapContainer, Marker, Popup, TileLayer, useMapEvents } from 'react-leaf import L, { LatLngExpression, LatLngBounds, LatLngTuple } from 'leaflet'; import _ from 'lodash'; -import { ISeller, ISellerWithSettings } from '@/constants/types'; +import { ISeller, ISellerWithSettings, SellerType } from '@/constants/types'; import { fetchSellers } from '@/services/sellerApi'; import MapMarkerPopup from './MapMarkerPopup'; @@ -75,13 +75,19 @@ const Map = ({ popupAnchor: [1, -34], }); - // Define the crosshair icon for the center of the map - const crosshairIcon = new L.Icon({ - iconUrl: '/images/icons/crosshair.png', - iconSize: [100, 100], - iconAnchor: [60, 60], + const holidayIcon = L.icon({ + iconUrl: '/images/icons/map-of-pi-christmas-icon.png', + iconSize: [40, 40], + iconAnchor: [20, 40], + popupAnchor: [0, -36], }); + const getSellerMarkerIcon = (sellerType?: string) => { + return sellerType === SellerType.holiday_seller + ? holidayIcon + : customIcon + }; + const [position, setPosition] = useState(null); const [sellers, setSellers] = useState([]); const [loading, setLoading] = useState(false); @@ -329,12 +335,6 @@ const Map = ({ return center === null ? null : ; } - // Define map boundaries - const bounds = L.latLngBounds( - L.latLng(-90, -180), // SW corner - L.latLng(90, 180) // NE corner - ); - return ( <> {loading &&
{t('SHARED.LOADING_SCREEN_MESSAGE')}
} @@ -395,7 +395,7 @@ const Map = ({ handleMarkerClick(seller.coordinates as LatLngTuple), }} diff --git a/src/components/shared/sidebar/sidebar.tsx b/src/components/shared/sidebar/sidebar.tsx index a8766d32..24bc2cd7 100644 --- a/src/components/shared/sidebar/sidebar.tsx +++ b/src/components/shared/sidebar/sidebar.tsx @@ -85,6 +85,10 @@ function Sidebar(props: any) { target: 'include_test_sellers', title: t('SIDE_NAVIGATION.SEARCH_FILTERS.INCLUDE_TEST_SELLERS'), }, + { + target: 'include_holiday_sellers', + title: t('SIDE_NAVIGATION.SEARCH_FILTERS.INCLUDE_HOLIDAY_SELLERS'), + }, { target: 'include_trust_level_100', title: 'Trust-o-meter 100%' }, { target: 'include_trust_level_80', title: 'Trust-o-meter 80%' }, { target: 'include_trust_level_50', title: 'Trust-o-meter 50%' }, diff --git a/src/constants/types.ts b/src/constants/types.ts index 256e5833..d86ee226 100644 --- a/src/constants/types.ts +++ b/src/constants/types.ts @@ -30,6 +30,7 @@ export interface IUserSettings { include_active_sellers: boolean | undefined; include_inactive_sellers: boolean | undefined; include_test_sellers: boolean | undefined; + include_holiday_sellers: boolean | undefined; include_trust_level_100: boolean | undefined; include_trust_level_80: boolean | undefined; include_trust_level_50: boolean | undefined; @@ -137,6 +138,7 @@ export enum SellerType { active_seller = 'activeSeller', inactive_seller = 'inactiveSeller', test_seller = 'testSeller', + holiday_seller = 'holidaySeller' }; export type PartialSeller = Pick; diff --git a/src/utils/translate.ts b/src/utils/translate.ts index d51d9449..868cc747 100644 --- a/src/utils/translate.ts +++ b/src/utils/translate.ts @@ -87,6 +87,12 @@ export const getSellerCategoryOptions = (t: (key: string) => string) => [ 'SCREEN.SELLER_REGISTRATION.SELLER_TYPE.SELLER_TYPE_OPTIONS.TEST_SELLER', ), }, + { + value: SellerType.holiday_seller, + name: t( + 'SCREEN.SELLER_REGISTRATION.SELLER_TYPE.SELLER_TYPE_OPTIONS.HOLIDAY_SELLER', + ), + }, ]; export const getFulfillmentMethodOptions = (t: (key: string) => string) => [ @@ -108,6 +114,8 @@ export const translateSellerCategory = (category: string, t: (key: string) => st return t('SCREEN.SELLER_REGISTRATION.SELLER_TYPE.SELLER_TYPE_OPTIONS.INACTIVE_SELLER'); case SellerType.test_seller: return t('SCREEN.SELLER_REGISTRATION.SELLER_TYPE.SELLER_TYPE_OPTIONS.TEST_SELLER'); + case SellerType.holiday_seller: + return t('SCREEN.SELLER_REGISTRATION.SELLER_TYPE.SELLER_TYPE_OPTIONS.HOLIDAY_SELLER'); default: return ''; } From badf6d7c274706a54a98acbeb71658781b34b13a Mon Sep 17 00:00:00 2001 From: swoocn Date: Fri, 19 Dec 2025 00:36:17 -0500 Subject: [PATCH 2/2] Addtl. changes from sandbox testing. --- src/components/shared/map/Map.tsx | 5 ++--- src/components/shared/sidebar/sidebar.tsx | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/shared/map/Map.tsx b/src/components/shared/map/Map.tsx index 196a3b39..04286beb 100644 --- a/src/components/shared/map/Map.tsx +++ b/src/components/shared/map/Map.tsx @@ -77,9 +77,8 @@ const Map = ({ const holidayIcon = L.icon({ iconUrl: '/images/icons/map-of-pi-christmas-icon.png', - iconSize: [40, 40], - iconAnchor: [20, 40], - popupAnchor: [0, -36], + iconAnchor: [12, 41], + popupAnchor: [1, -34], }); const getSellerMarkerIcon = (sellerType?: string) => { diff --git a/src/components/shared/sidebar/sidebar.tsx b/src/components/shared/sidebar/sidebar.tsx index 24bc2cd7..6d7f4157 100644 --- a/src/components/shared/sidebar/sidebar.tsx +++ b/src/components/shared/sidebar/sidebar.tsx @@ -128,6 +128,7 @@ function Sidebar(props: any) { include_active_sellers: false, include_inactive_sellers: false, include_test_sellers: false, + include_holiday_sellers: false, include_trust_level_100: false, include_trust_level_80: false, include_trust_level_50: false, @@ -561,7 +562,7 @@ function Sidebar(props: any) { /> - {/* THIS IS THE THE SEARCH FILTERS */} + {/* THIS IS THE SEARCH FILTERS */}