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 00000000..a72fd7ed Binary files /dev/null and b/public/images/icons/map-of-pi-christmas-icon.png differ diff --git a/src/components/shared/map/Map.tsx b/src/components/shared/map/Map.tsx index 1a5834a7..04286beb 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,18 @@ 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', + iconAnchor: [12, 41], + popupAnchor: [1, -34], }); + 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 +334,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 +394,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..6d7f4157 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%' }, @@ -124,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, @@ -557,7 +562,7 @@ function Sidebar(props: any) { /> - {/* THIS IS THE THE SEARCH FILTERS */} + {/* THIS IS THE SEARCH FILTERS */}
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 ''; }