+ `;
+ marker.bindPopup(popupContent, {
+ maxWidth: 300,
+ className: 'location-popup-container'
+ });
+
+ this.locationMarkers.addLayer(marker);
+ }
+ });
+
+ console.log(`Added ${data.locations.length} location markers to cuts map`);
+ } else {
+ console.warn('No locations data received');
+ }
+ } else {
+ // Hide locations
+ if (this.locationMarkers) {
+ this.cutsMap.removeLayer(this.locationMarkers);
+ this.locationMarkers = null;
+ }
+ console.log('Removed location markers from cuts map');
+ }
+ } catch (error) {
+ console.error('Error toggling locations on map:', error);
+ this.showStatus('Failed to load locations', 'error');
+ }
+ }
+
+ // Helper method to get color based on support level
+ getLocationColor(supportLevel) {
+ switch (String(supportLevel)) {
+ case '1': return '#28a745'; // Green - Strong Support
+ case '2': return '#ffc107'; // Yellow - Lean Support
+ case '3': return '#fd7e14'; // Orange - Lean Opposition
+ case '4': return '#dc3545'; // Red - Strong Opposition
+ default: return '#6c757d'; // Gray - Unknown
+ }
+ }
+
+ // Helper method to get support level text
+ getSupportLevelText(supportLevel) {
+ switch (String(supportLevel)) {
+ case '1': return 'Strong Support';
+ case '2': return 'Lean Support';
+ case '3': return 'Lean Opposition';
+ case '4': return 'Strong Opposition';
+ default: return 'Unknown';
+ }
+ }
+
async handleImportFile(event) {
const file = event.target.files[0];
if (!file) return;
diff --git a/map/app/public/js/admin-map.js b/map/app/public/js/admin-map.js
index 4978bde..aca7044 100644
--- a/map/app/public/js/admin-map.js
+++ b/map/app/public/js/admin-map.js
@@ -9,6 +9,28 @@ let startMarker = null;
// Initialize the admin map
function initializeAdminMap() {
+ // Check if the map container is visible before initializing
+ const mapContainer = document.getElementById('admin-map');
+ if (!mapContainer) {
+ console.warn('Admin map container not found, delaying initialization');
+ return;
+ }
+
+ // If container is hidden, delay initialization
+ const isVisible = mapContainer.offsetWidth > 0 && mapContainer.offsetHeight > 0;
+ if (!isVisible) {
+ console.log('Admin map container is hidden, delaying initialization until section is shown');
+ return;
+ }
+
+ // Avoid double initialization
+ if (adminMap) {
+ console.log('Admin map already initialized, invalidating size instead');
+ adminMap.invalidateSize();
+ return;
+ }
+
+ console.log('Initializing admin map...');
adminMap = L.map('admin-map').setView([53.5461, -113.4938], 11);
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
@@ -40,6 +62,13 @@ function initializeAdminMap() {
// Update coordinates when map moves
adminMap.on('moveend', updateCoordinatesFromMap);
+
+ // Trigger size invalidation after a brief moment to ensure proper rendering
+ setTimeout(() => {
+ if (adminMap) {
+ adminMap.invalidateSize();
+ }
+ }, 100);
}
// Load current start location
diff --git a/map/app/public/js/admin.js b/map/app/public/js/admin.js
index 6af5838..2d82c76 100644
--- a/map/app/public/js/admin.js
+++ b/map/app/public/js/admin.js
@@ -102,30 +102,31 @@ document.addEventListener('DOMContentLoaded', () => {
if (window.adminCore && typeof window.adminCore.showSection === 'function') {
window.adminCore.showSection('dashboard');
}
- // Load dashboard data on initial page load
- if (typeof loadDashboardData === 'function') {
- loadDashboardData();
- }
+ // Dashboard loading is handled by admin-core.js showSection/loadSectionData
+ // No need to manually load here to avoid duplicates
}
});
/**
- * Dashboard Functions
- * Loads dashboard data and displays summary statistics
+ * Legacy Dashboard Functions - DEPRECATED
+ * These are kept for backward compatibility but should not be used
+ * Use the dashboard.js module functions instead
*/
-async function loadDashboardData() {
+async function loadAdminDashboardData() {
try {
const response = await fetch('/api/admin/dashboard');
const data = await response.json();
if (data.success) {
+ // This was the old function that only loaded user/shift stats
+ // Now deprecated in favor of the full dashboard.js implementation
document.getElementById('total-users').textContent = data.stats.totalUsers;
document.getElementById('total-shifts').textContent = data.stats.totalShifts;
document.getElementById('total-signups').textContent = data.stats.totalSignups;
document.getElementById('this-month-users').textContent = data.stats.thisMonthUsers;
}
} catch (error) {
- console.error('Failed to load dashboard data:', error);
+ console.error('Failed to load admin dashboard data:', error);
}
}
@@ -133,11 +134,11 @@ async function loadDashboardData() {
* Legacy function redirects for backward compatibility
* These ensure existing functionality continues to work
*/
-window.loadDashboardData = loadDashboardData;
+window.loadAdminDashboardData = loadAdminDashboardData;
// Export dashboard function for module coordination
if (typeof window.adminDashboard === 'undefined') {
window.adminDashboard = {
- loadDashboardData: loadDashboardData
+ loadAdminDashboardData: loadAdminDashboardData
};
}
diff --git a/map/app/public/js/dashboard.js b/map/app/public/js/dashboard.js
index 539f0dc..9101ac1 100644
--- a/map/app/public/js/dashboard.js
+++ b/map/app/public/js/dashboard.js
@@ -2,9 +2,19 @@
let supportChart = null;
let entriesChart = null;
let signSizesChart = null;
+let dashboardLoading = false;
// Load dashboard data
async function loadDashboardData() {
+ // Prevent multiple simultaneous loads
+ if (dashboardLoading) {
+ console.log('Dashboard already loading, skipping duplicate request');
+ return;
+ }
+
+ dashboardLoading = true;
+ console.log('Loading dashboard data from dashboard.js');
+
try {
// Show loading state
setLoadingState(true);
@@ -17,6 +27,7 @@ async function loadDashboardData() {
createSupportLevelChart(result.data.supportLevels);
createSignSizesChart(result.data.signSizes);
createEntriesChart(result.data.dailyEntries);
+ console.log('Dashboard data loaded successfully from dashboard.js');
} else {
showStatus('Failed to load dashboard data', 'error');
}
@@ -25,6 +36,7 @@ async function loadDashboardData() {
showStatus('Error loading dashboard', 'error');
} finally {
setLoadingState(false);
+ dashboardLoading = false;
}
}
@@ -307,32 +319,37 @@ function createEntriesChart(dailyEntries) {
// Add event listener for dashboard navigation
document.addEventListener('DOMContentLoaded', () => {
- // Update navigation to load dashboard when clicked
+ // Dashboard navigation is handled by admin-core.js
+ // This listener is kept for backward compatibility but should not interfere
const dashboardLink = document.querySelector('.admin-nav a[href="#dashboard"]');
if (dashboardLink) {
- dashboardLink.addEventListener('click', (e) => {
- e.preventDefault();
-
- // Hide all sections
- document.querySelectorAll('.admin-section').forEach(section => {
- section.style.display = 'none';
+ // Only add our listener if admin-core.js hasn't already handled it
+ const hasAdminCore = window.adminCore && typeof window.adminCore.showSection === 'function';
+ if (!hasAdminCore) {
+ dashboardLink.addEventListener('click', (e) => {
+ e.preventDefault();
+
+ // Hide all sections
+ document.querySelectorAll('.admin-section').forEach(section => {
+ section.style.display = 'none';
+ });
+
+ // Show dashboard
+ const dashboardSection = document.getElementById('dashboard');
+ if (dashboardSection) {
+ dashboardSection.style.display = 'block';
+ }
+
+ // Update active nav
+ document.querySelectorAll('.admin-nav a').forEach(link => {
+ link.classList.remove('active');
+ });
+ dashboardLink.classList.add('active');
+
+ // Load dashboard data
+ loadDashboardData();
});
-
- // Show dashboard
- const dashboardSection = document.getElementById('dashboard');
- if (dashboardSection) {
- dashboardSection.style.display = 'block';
- }
-
- // Update active nav
- document.querySelectorAll('.admin-nav a').forEach(link => {
- link.classList.remove('active');
- });
- dashboardLink.classList.add('active');
-
- // Load dashboard data
- loadDashboardData();
- });
+ }
}
// Handle window resize for chart responsiveness
diff --git a/map/files-explainer.md b/map/files-explainer.md
index f580486..f62c4e7 100644
--- a/map/files-explainer.md
+++ b/map/files-explainer.md
@@ -94,6 +94,10 @@ Controller for CRUD operations on map cuts (geographic polygon overlays). Handle
Controller for managing Listmonk email list synchronization. Handles sync status checking, bulk synchronization operations for locations and users, list statistics retrieval, connection testing, and list reinitialization. Provides admin-only endpoints for managing the email marketing integration.
+# app/controllers/externalDataController.js
+
+Controller for integrating with external data sources like the City of Edmonton's Socrata API. Handles fetching parcel addresses and other government datasets with filtering, pagination, and bounds-based queries. Provides endpoints for loading external address data to supplement the map display.
+
# app/middleware/auth.js
Express middleware for authentication and admin access control.
@@ -142,6 +146,10 @@ Service for generating QR codes and handling QR-related logic.
Service for integrating with Socrata API to access external government datasets. Handles API communication with Edmonton's open data platform for retrieving parcel and address information.
+# app/services/accountExpiration.js
+
+Service for managing temporary user account expiration. Automatically checks for and removes expired temporary user accounts on a scheduled basis. Provides cleanup functionality to maintain database hygiene and ensure temporary accounts don't persist beyond their intended lifespan.
+
# app/templates/email/password-recovery.txt
Plain text email template for password recovery notifications. Contains user-friendly formatting with password display and security warnings.
@@ -198,6 +206,14 @@ Utility functions for geographic data, validation, and helpers used across the b
Winston logger configuration for backend logging.
+# app/utils/cacheBusting.js
+
+Utility for managing cache busting functionality to ensure users get the latest version of the application when updates are deployed. Handles versioning and cache invalidation strategies with server-side version generation and file hash management.
+
+# app/utils/spatial.js
+
+Utility for spatial operations including point-in-polygon calculations and geographic boundary operations. Provides functions for determining if locations fall within cut boundaries and other spatial analysis needed for map-based filtering and location management.
+
# app/public/admin.html
Admin panel HTML page for managing start location, walk sheet, shift management, user management, and email broadcasting. Features rich text editor with live preview for composing broadcast emails, shift volunteer management modals, comprehensive admin interface with user role controls, and quick access links to both NocoDB database management and Listmonk email marketing interfaces.
@@ -382,6 +398,10 @@ User profile page HTML for displaying user information and account management.
CSS styles for the user profile page and user management components in the admin panel.
+# app/public/css/REFACTORING_SUMMARY.md
+
+Documentation summarizing the CSS refactoring process that reorganized the admin panel styles into modular components. Describes the transition from monolithic CSS files to focused modules for better maintainability and organization.
+
# app/public/js/admin.js
**Main Admin Panel Coordinator** - Coordinates all admin modules and handles initialization. Contains the primary DOM ready handler that initializes all admin functionality, manages section routing, and provides coordination between all modular components. Maintains backward compatibility and global function exports.
@@ -490,6 +510,18 @@ Frontend JavaScript for the Convert Data admin section. Handles file upload UI,
JavaScript module for interactive polygon drawing functionality. Implements click-to-add-points drawing system for creating cut boundaries on the map using Leaflet.js drawing tools.
+# app/public/js/cut-drawing-new.js
+
+**New Cut Drawing Module** - Enhanced version of the polygon drawing functionality for cut creation. Provides improved polygon drawing with vertex management, polygon preview, color customization, and enhanced user interaction. Implements click-to-add-points drawing system with better visual feedback and drawing state management.
+
+# app/public/js/cut-location-manager.js
+
+**Cut Location Management Module** - Handles location display, filtering, statistics, and management specifically for cuts. Manages location markers within cut boundaries, provides filtering capabilities, calculates cut statistics, and handles the display of locations associated with specific cuts on the map.
+
+# app/public/js/cut-print-utils.js
+
+**Cut Print Utilities Module** - Handles map capture, print generation, and export functionality specifically for cuts. Provides functionality to generate printable views of cuts with associated locations, handles map capture for printing, and manages export formats for cut data and visualizations.
+
# app/public/js/cut-controls.js
JavaScript module for cut display controls on the public map. Handles loading and rendering of public cuts as polygon overlays for authenticated users.
@@ -498,6 +530,22 @@ JavaScript module for cut display controls on the public map. Handles loading an
JavaScript for the admin cut management interface. Provides complete CRUD functionality for cuts including interactive drawing, form management, cut list display, and import/export capabilities.
+# app/public/js/admin-cuts-main.js
+
+**Admin Cuts Main Coordinator** - Main initialization file that imports and orchestrates all cut management modules. Handles DOM ready initialization, module loading verification, and coordinates the startup sequence for the admin cuts management system.
+
+# app/public/js/admin-cuts-manager.js
+
+**Admin Cuts Manager Module** - Main class for managing cuts with comprehensive form handling, UI interactions, and cut operations. Handles cut creation, editing, deletion, filtering, drawing operations, location management, and provides the core administrative interface for cut management with integrated map functionality.
+
+# app/public/js/admin-new.js
+
+**New Admin Panel Coordinator** - Refactored version of the admin panel coordinator that coordinates all admin modules while maintaining functionality. Manages event listener setup across modules including auth, map, walksheet, shifts, users, email, and integration modules with improved modular architecture.
+
+# app/public/js/admin-old.js
+
+**Legacy Admin Panel Coordinator** - Backup or legacy version of the admin panel coordinator, likely containing the previous monolithic implementation before modular refactoring. Maintains the same functionality as the newer version but with older architecture for reference or rollback purposes.
+
# app/public/js/listmonk-status.js
JavaScript module for real-time Listmonk sync status monitoring. Displays connection status indicators in the UI, shows error notifications when sync fails, handles automatic status checking, and provides user feedback for email list synchronization health.
@@ -598,6 +646,10 @@ Express router for public-facing endpoints that don't require authentication. Ha
Express router for user management endpoints (list, create, delete users).
+# app/routes/publicShifts.js
+
+Express router for public-facing shift endpoints that don't require authentication. Handles public shift viewing, shift details retrieval, and public signup functionality with appropriate rate limiting. Provides the API endpoints for the public volunteer opportunity signup system.
+
# app/routes/cuts.js
Express router for cut management endpoints. Provides CRUD operations for geographic polygon overlays with admin-only access for modifications and public read access for viewing public cuts.
@@ -614,6 +666,18 @@ Express router for external data integration endpoints, including Socrata API in
Utility for managing cache busting functionality to ensure users get the latest version of the application when updates are deployed. Handles versioning and cache invalidation strategies.
+# package.json
+
+Node.js project manifest for the main map application workspace. Contains project dependencies, scripts, and configuration for the overall map application development and deployment process.
+
+# package-lock.json
+
+Automatically generated lockfile that ensures consistent dependency installation across environments for the main map application workspace.
+
+# test_print_debug.html
+
+Debug HTML file for testing print functionality and troubleshooting print-related features. Contains test layouts and styling for validating print output of maps, walk sheets, and other printable components.
+
# listmonk-env-example.txt
Example environment configuration file showing the required Listmonk environment variables. Provides sample configuration for API URL, credentials, sync settings, and setup instructions for integrating with the Listmonk email marketing platform.