From 9ca6e04fa1a3cd9e818a6656ab99e9e6720dc1a5 Mon Sep 17 00:00:00 2001 From: swift-river542 Date: Wed, 16 Sep 2026 21:21:07 -0500 Subject: [PATCH] Keep the prayer yellow to the prayer palette; other palettes keep their orange --- app-profiles/country-posters/src/colors/resource.js | 2 +- app-profiles/doxa-research-map/src/colors/resource.js | 2 +- .../src/composables/useDashboardAggregations.js | 4 ++-- library/composables/useAvatarGenerator.js | 2 +- library/composables/useMapEvents.js | 2 +- library/utils/geoUtils.js | 3 ++- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app-profiles/country-posters/src/colors/resource.js b/app-profiles/country-posters/src/colors/resource.js index 3b8de1b4e..cacbdfa99 100644 --- a/app-profiles/country-posters/src/colors/resource.js +++ b/app-profiles/country-posters/src/colors/resource.js @@ -17,7 +17,7 @@ export const PALETTE = { bible: '#3498db', // Blue - Bible available jesusFilm: '#20c997', // Fisher Green (teal-green) - Jesus Film available radio: '#9b59b6', // Purple - Radio broadcast available - gospel: '#f0c64a', // Orange - Gospel recordings available + gospel: '#f39c12', // Orange - Gospel recordings available audio: '#1abc9c', // Teal - Audio resources available stories: '#e74c3c', // Red - Stories available hasResources: '#27ae60', // Green - Has ANY gospel resource (default pin color) diff --git a/app-profiles/doxa-research-map/src/colors/resource.js b/app-profiles/doxa-research-map/src/colors/resource.js index 3b8de1b4e..cacbdfa99 100644 --- a/app-profiles/doxa-research-map/src/colors/resource.js +++ b/app-profiles/doxa-research-map/src/colors/resource.js @@ -17,7 +17,7 @@ export const PALETTE = { bible: '#3498db', // Blue - Bible available jesusFilm: '#20c997', // Fisher Green (teal-green) - Jesus Film available radio: '#9b59b6', // Purple - Radio broadcast available - gospel: '#f0c64a', // Orange - Gospel recordings available + gospel: '#f39c12', // Orange - Gospel recordings available audio: '#1abc9c', // Teal - Audio resources available stories: '#e74c3c', // Red - Stories available hasResources: '#27ae60', // Green - Has ANY gospel resource (default pin color) diff --git a/app-profiles/research-dashboard/src/composables/useDashboardAggregations.js b/app-profiles/research-dashboard/src/composables/useDashboardAggregations.js index a2361b3ab..c55dc1316 100644 --- a/app-profiles/research-dashboard/src/composables/useDashboardAggregations.js +++ b/app-profiles/research-dashboard/src/composables/useDashboardAggregations.js @@ -5,10 +5,10 @@ * install). SVG donut/bar geometry is pure math, renders in the shadow root, tweens via CSS. */ export const REGION_COLORS = { - 'Africa': '#e74c3c', 'Asia': '#3498db', 'Europe': '#2ecc71', 'Latin America': '#f0c64a', + 'Africa': '#e74c3c', 'Asia': '#3498db', 'Europe': '#2ecc71', 'Latin America': '#f39c12', 'Middle East': '#9b59b6', 'North America': '#1abc9c', 'Oceania': '#e67e22', 'Other': '#95a5a6', } -export const CATEGORICAL = ['#2456c7', '#e67e22', '#16a085', '#8e44ad', '#c0392b', '#27ae60', '#2c3e50', '#d35400', '#2980b9', '#7f8c8d', '#f0c64a', '#9b59b6', '#1abc9c', '#34495e', '#e74c3c'] +export const CATEGORICAL = ['#2456c7', '#e67e22', '#16a085', '#8e44ad', '#c0392b', '#27ae60', '#2c3e50', '#d35400', '#2980b9', '#7f8c8d', '#f39c12', '#9b59b6', '#1abc9c', '#34495e', '#e74c3c'] export const lbl = (v) => (v === null || v === undefined ? '' : (typeof v === 'object' ? (v.label ?? v.value ?? '') : v)) diff --git a/library/composables/useAvatarGenerator.js b/library/composables/useAvatarGenerator.js index 38fea8731..655160c2f 100644 --- a/library/composables/useAvatarGenerator.js +++ b/library/composables/useAvatarGenerator.js @@ -13,7 +13,7 @@ const AVATAR_COLORS = [ '#e74c3c', // Red '#3498db', // Blue '#2ecc71', // Green - '#f0c64a', // Orange + '#f39c12', // Orange '#9b59b6', // Purple '#1abc9c', // Teal '#e67e22', // Dark Orange diff --git a/library/composables/useMapEvents.js b/library/composables/useMapEvents.js index 78d274f35..016032114 100644 --- a/library/composables/useMapEvents.js +++ b/library/composables/useMapEvents.js @@ -61,7 +61,7 @@ export function useMapEvents(options = {}) { // Generate avatar based on first letter const firstLetter = (properties.name || 'U')[0].toUpperCase(); const avatarColors = [ - '#e74c3c', '#3498db', '#2ecc71', '#f0c64a', + '#e74c3c', '#3498db', '#2ecc71', '#f39c12', '#9b59b6', '#1abc9c', '#e67e22', '#34495e' ]; const colorIndex = firstLetter.charCodeAt(0) % avatarColors.length; diff --git a/library/utils/geoUtils.js b/library/utils/geoUtils.js index 66be15a0c..17e77984d 100644 --- a/library/utils/geoUtils.js +++ b/library/utils/geoUtils.js @@ -154,7 +154,8 @@ export function darkenColor(color, percent = 15) { // Eurasia/Europe, North America, Middle East) if (color === '#3498db') return '#2171b5' if (color === '#e74c3c') return '#c0392b' - if (color === '#f0c64a') return '#ca6f1e' + if (color === '#f39c12') return '#ca6f1e' + if (color === '#f0c64a') return '#c9a227' // prayer yellow → darker yellow if (color === '#2ecc71') return '#229954' if (color === '#1abc9c') return '#138d75' if (color === '#9b59b6') return '#7d3c98'