@@ -955,62 +973,6 @@ function displayAdminShifts(shifts) {
setupShiftActionListeners();
}
-// Fix the setupNavigation function to properly load shifts when switching to shifts section
-function setupNavigation() {
- const navLinks = document.querySelectorAll('.admin-nav a');
- const sections = document.querySelectorAll('.admin-section');
-
- navLinks.forEach(link => {
- link.addEventListener('click', (e) => {
- e.preventDefault();
-
- // Get target section ID
- const targetId = link.getAttribute('href').substring(1);
-
- // Hide all sections
- sections.forEach(section => {
- section.style.display = 'none';
- });
-
- // Show target section
- const targetSection = document.getElementById(targetId);
- if (targetSection) {
- targetSection.style.display = 'block';
- }
-
- // Update active nav link
- navLinks.forEach(navLink => {
- navLink.classList.remove('active');
- });
- link.classList.add('active');
-
- // If switching to shifts section, load shifts
- if (targetId === 'shifts') {
- console.log('Loading admin shifts...');
- loadAdminShifts();
- }
-
- // If switching to walk sheet section, load config
- if (targetId === 'walk-sheet') {
- loadWalkSheetConfig().then((success) => {
- if (success) {
- generateWalkSheetPreview();
- }
- });
- }
- });
- });
-
- // Also check if we're already on the shifts page (via hash)
- const hash = window.location.hash;
- if (hash === '#shifts') {
- const shiftsLink = document.querySelector('.admin-nav a[href="#shifts"]');
- if (shiftsLink) {
- shiftsLink.click();
- }
- }
-}
-
// Fix the setupShiftActionListeners function
function setupShiftActionListeners() {
const list = document.getElementById('admin-shifts-list');
@@ -1112,101 +1074,181 @@ function clearShiftForm() {
}
}
-// Update setupEventListeners to include shift form and clear button
-function setupEventListeners() {
- // Use current view button
- const useCurrentViewBtn = document.getElementById('use-current-view');
- if (useCurrentViewBtn) {
- useCurrentViewBtn.addEventListener('click', () => {
- const center = adminMap.getCenter();
- const zoom = adminMap.getZoom();
-
- document.getElementById('start-lat').value = center.lat.toFixed(6);
- document.getElementById('start-lng').value = center.lng.toFixed(6);
- document.getElementById('start-zoom').value = zoom;
-
- updateStartMarker(center.lat, center.lng);
- showStatus('Captured current map view', 'success');
- });
- }
+// User Management Functions
+async function loadUsers() {
+ const loadingEl = document.getElementById('users-loading');
+ const emptyEl = document.getElementById('users-empty');
+ const tableBody = document.getElementById('users-table-body');
- // Save button
- const saveLocationBtn = document.getElementById('save-start-location');
- if (saveLocationBtn) {
- saveLocationBtn.addEventListener('click', saveStartLocation);
- }
+ if (loadingEl) loadingEl.style.display = 'block';
+ if (emptyEl) emptyEl.style.display = 'none';
+ if (tableBody) tableBody.innerHTML = '';
- // Coordinate input changes
- const startLatInput = document.getElementById('start-lat');
- const startLngInput = document.getElementById('start-lng');
- const startZoomInput = document.getElementById('start-zoom');
-
- if (startLatInput) startLatInput.addEventListener('change', updateMapFromInputs);
- if (startLngInput) startLngInput.addEventListener('change', updateMapFromInputs);
- if (startZoomInput) startZoomInput.addEventListener('change', updateMapFromInputs);
-
- // Walk Sheet buttons
- const saveWalkSheetBtn = document.getElementById('save-walk-sheet');
- const previewWalkSheetBtn = document.getElementById('preview-walk-sheet');
- const printWalkSheetBtn = document.getElementById('print-walk-sheet');
- const refreshPreviewBtn = document.getElementById('refresh-preview');
-
- if (saveWalkSheetBtn) saveWalkSheetBtn.addEventListener('click', saveWalkSheetConfig);
- if (previewWalkSheetBtn) previewWalkSheetBtn.addEventListener('click', generateWalkSheetPreview);
- if (printWalkSheetBtn) printWalkSheetBtn.addEventListener('click', printWalkSheet);
- if (refreshPreviewBtn) refreshPreviewBtn.addEventListener('click', generateWalkSheetPreview);
-
- // Auto-update preview on input change
- const walkSheetInputs = document.querySelectorAll(
- '#walk-sheet-title, #walk-sheet-subtitle, #walk-sheet-footer, ' +
- '[id^="qr-code-"][id$="-url"], [id^="qr-code-"][id$="-label"]'
- );
-
- walkSheetInputs.forEach(input => {
- if (input) {
- input.addEventListener('input', debounce(() => {
- generateWalkSheetPreview();
- }, 500));
+ try {
+ const response = await fetch('/api/users');
+ const data = await response.json();
+
+ if (loadingEl) loadingEl.style.display = 'none';
+
+ if (data.success && data.users) {
+ displayUsers(data.users);
+ } else {
+ throw new Error(data.error || 'Failed to load users');
}
- });
-
- // Add URL change listeners to detect when QR codes need regeneration
- for (let i = 1; i <= 3; i++) {
- const urlInput = document.getElementById(`qr-code-${i}-url`);
- if (urlInput) {
- let previousUrl = urlInput.value;
-
- urlInput.addEventListener('change', () => {
- const currentUrl = urlInput.value;
- if (currentUrl !== previousUrl) {
- console.log(`QR Code ${i} URL changed from "${previousUrl}" to "${currentUrl}"`);
- // Remove stored QR code so it gets regenerated
- delete storedQRCodes[currentUrl];
- previousUrl = currentUrl;
- generateWalkSheetPreview();
- }
- });
+
+ } catch (error) {
+ console.error('Error loading users:', error);
+ if (loadingEl) loadingEl.style.display = 'none';
+ if (emptyEl) {
+ emptyEl.textContent = 'Failed to load users';
+ emptyEl.style.display = 'block';
}
- }
-
- // Shift form submission
- const shiftForm = document.getElementById('shift-form');
- if (shiftForm) {
- shiftForm.addEventListener('submit', createShift);
- }
-
- // Clear shift form button
- const clearShiftBtn = document.getElementById('clear-shift-form');
- if (clearShiftBtn) {
- clearShiftBtn.addEventListener('click', clearShiftForm);
+ showStatus('Failed to load users', 'error');
}
}
-// Add the missing clearShiftForm function
-function clearShiftForm() {
- const form = document.getElementById('shift-form');
- if (form) {
- form.reset();
- showStatus('Form cleared', 'info');
+function displayUsers(users) {
+ const tableBody = document.getElementById('users-table-body');
+ const emptyEl = document.getElementById('users-empty');
+
+ if (!tableBody) return;
+
+ if (!users || users.length === 0) {
+ if (emptyEl) emptyEl.style.display = 'block';
+ return;
+ }
+
+ if (emptyEl) emptyEl.style.display = 'none';
+
+ tableBody.innerHTML = users.map(user => {
+ const createdDate = user.created_at || user['Created At'] || user.createdAt;
+ const formattedDate = createdDate ? new Date(createdDate).toLocaleDateString() : 'N/A';
+ const isAdmin = user.admin || user.Admin || false;
+ const userId = user.Id || user.id || user.ID;
+
+ return `
+
+ | ${escapeHtml(user.email || user.Email || 'N/A')} |
+ ${escapeHtml(user.name || user.Name || 'N/A')} |
+
+
+ ${isAdmin ? 'Admin' : 'User'}
+
+ |
+ ${formattedDate} |
+
+
+
+
+ |
+
+ `;
+ }).join('');
+
+ // Setup event listeners for user actions
+ setupUserActionListeners();
+}
+
+function setupUserActionListeners() {
+ const tableBody = document.getElementById('users-table-body');
+ if (!tableBody) return;
+
+ // Remove existing listeners by cloning the node
+ const newTableBody = tableBody.cloneNode(true);
+ tableBody.parentNode.replaceChild(newTableBody, tableBody);
+
+ // Get the updated reference
+ const updatedTableBody = document.getElementById('users-table-body');
+
+ updatedTableBody.addEventListener('click', function(e) {
+ if (e.target.classList.contains('delete-user-btn')) {
+ const userId = e.target.getAttribute('data-user-id');
+ const userEmail = e.target.getAttribute('data-user-email');
+ console.log('Delete button clicked for user:', userId);
+ deleteUser(userId, userEmail);
+ }
+ });
+}
+
+async function deleteUser(userId, userEmail) {
+ if (!confirm(`Are you sure you want to delete user "${userEmail}"? This action cannot be undone.`)) {
+ return;
+ }
+
+ try {
+ const response = await fetch(`/api/users/${userId}`, {
+ method: 'DELETE'
+ });
+
+ const data = await response.json();
+
+ if (data.success) {
+ showStatus(`User "${userEmail}" deleted successfully`, 'success');
+ loadUsers(); // Reload the users list
+ } else {
+ throw new Error(data.error || 'Failed to delete user');
+ }
+
+ } catch (error) {
+ console.error('Error deleting user:', error);
+ showStatus(`Failed to delete user: ${error.message}`, 'error');
+ }
+}
+
+async function createUser(e) {
+ e.preventDefault();
+
+ const email = document.getElementById('user-email').value.trim();
+ const password = document.getElementById('user-password').value;
+ const name = document.getElementById('user-name').value.trim();
+ const admin = document.getElementById('user-admin').checked;
+
+ if (!email || !password) {
+ showStatus('Email and password are required', 'error');
+ return;
+ }
+
+ if (password.length < 6) {
+ showStatus('Password must be at least 6 characters long', 'error');
+ return;
+ }
+
+ try {
+ const response = await fetch('/api/users', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({
+ email,
+ password,
+ name: name || '',
+ admin
+ })
+ });
+
+ const data = await response.json();
+
+ if (data.success) {
+ showStatus('User created successfully', 'success');
+ clearUserForm();
+ loadUsers(); // Reload the users list
+ } else {
+ throw new Error(data.error || 'Failed to create user');
+ }
+
+ } catch (error) {
+ console.error('Error creating user:', error);
+ showStatus(`Failed to create user: ${error.message}`, 'error');
+ }
+}
+
+function clearUserForm() {
+ const form = document.getElementById('user-form');
+ if (form) {
+ form.reset();
+ showStatus('User form cleared', 'info');
}
}
diff --git a/map/app/public/js/user.js b/map/app/public/js/user.js
new file mode 100644
index 0000000..88bfeae
--- /dev/null
+++ b/map/app/public/js/user.js
@@ -0,0 +1,97 @@
+// User profile JavaScript
+
+// Initialize when DOM is loaded
+document.addEventListener('DOMContentLoaded', () => {
+ checkUserAuth();
+ loadUserProfile();
+ setupEventListeners();
+});
+
+// Check if user is authenticated
+async function checkUserAuth() {
+ try {
+ const response = await fetch('/api/auth/check');
+ const data = await response.json();
+
+ if (!data.authenticated) {
+ window.location.href = '/login.html';
+ return;
+ }
+
+ // Update user info in header
+ const userInfo = document.getElementById('user-info');
+ if (userInfo && data.user) {
+ userInfo.textContent = `${data.user.name || data.user.email}`;
+ }
+
+ } catch (error) {
+ console.error('Auth check failed:', error);
+ window.location.href = '/login.html';
+ }
+}
+
+// Load user profile information
+async function loadUserProfile() {
+ try {
+ const response = await fetch('/api/auth/check');
+ const data = await response.json();
+
+ if (data.authenticated && data.user) {
+ document.getElementById('profile-email').textContent = data.user.email || 'N/A';
+ document.getElementById('profile-name').textContent = data.user.name || 'N/A';
+ document.getElementById('profile-role').textContent = data.user.isAdmin ? 'Administrator' : 'User';
+ }
+
+ } catch (error) {
+ console.error('Failed to load profile:', error);
+ showStatus('Failed to load profile information', 'error');
+ }
+}
+
+// Setup event listeners
+function setupEventListeners() {
+ // Logout button
+ const logoutBtn = document.getElementById('logout-btn');
+ if (logoutBtn) {
+ logoutBtn.addEventListener('click', handleLogout);
+ }
+}
+
+// Handle logout
+async function handleLogout() {
+ try {
+ const response = await fetch('/api/auth/logout', {
+ method: 'POST',
+ credentials: 'include'
+ });
+
+ if (response.ok) {
+ window.location.href = '/login.html';
+ } else {
+ throw new Error('Logout failed');
+ }
+
+ } catch (error) {
+ console.error('Logout error:', error);
+ showStatus('Logout failed', 'error');
+ }
+}
+
+// Show status message
+function showStatus(message, type = 'info') {
+ const container = document.getElementById('status-container');
+ if (!container) return;
+
+ const statusDiv = document.createElement('div');
+ statusDiv.className = `status-message status-${type}`;
+ statusDiv.textContent = message;
+
+ container.appendChild(statusDiv);
+
+ // Auto remove after 5 seconds
+ setTimeout(() => {
+ if (statusDiv.parentNode) {
+ statusDiv.parentNode.removeChild(statusDiv);
+ }
+ }, 5000);
+}
diff --git a/map/app/public/user.html b/map/app/public/user.html
new file mode 100644
index 0000000..d48d78e
--- /dev/null
+++ b/map/app/public/user.html
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
User Profile
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Profile Information
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/map/app/routes/admin.js b/map/app/routes/admin.js
index 3083696..0210eec 100644
--- a/map/app/routes/admin.js
+++ b/map/app/routes/admin.js
@@ -2,6 +2,26 @@ const express = require('express');
const router = express.Router();
const settingsController = require('../controllers/settingsController');
+// Debug endpoint to check configuration
+router.get('/config-debug', (req, res) => {
+ const config = require('../config');
+ res.json({
+ success: true,
+ config: {
+ nocodb: {
+ apiUrl: config.nocodb.apiUrl,
+ hasToken: !!config.nocodb.apiToken,
+ projectId: config.nocodb.projectId,
+ tableId: config.nocodb.tableId,
+ loginSheetId: config.nocodb.loginSheetId,
+ settingsSheetId: config.nocodb.settingsSheetId,
+ shiftsSheetId: config.nocodb.shiftsSheetId,
+ shiftSignupsSheetId: config.nocodb.shiftSignupsSheetId
+ }
+ }
+ });
+});
+
// Start location management
router.get('/start-location', settingsController.getStartLocation);
router.post('/start-location', settingsController.updateStartLocation);
diff --git a/map/app/routes/debug.js b/map/app/routes/debug.js
index 362383b..3276851 100644
--- a/map/app/routes/debug.js
+++ b/map/app/routes/debug.js
@@ -222,4 +222,43 @@ router.get('/walk-sheet-raw', async (req, res) => {
}
});
+// Add this route to check login table structure
+router.get('/login-structure', async (req, res) => {
+ try {
+ const loginSheetId = config.nocodb.loginSheetId;
+
+ if (!loginSheetId) {
+ return res.status(400).json({
+ success: false,
+ error: 'Login sheet ID not configured'
+ });
+ }
+
+ // Get table structure
+ const tableId = extractTableId(loginSheetId);
+ const response = await nocodbService.api.get(`/db/meta/tables/${tableId}`);
+
+ const columns = response.data.columns.map(col => ({
+ column_name: col.column_name,
+ title: col.title,
+ uidt: col.uidt,
+ required: col.rqd
+ }));
+
+ res.json({
+ success: true,
+ tableId,
+ columns,
+ columnNames: columns.map(c => c.column_name)
+ });
+
+ } catch (error) {
+ logger.error('Error fetching login table structure:', error);
+ res.status(500).json({
+ success: false,
+ error: error.message
+ });
+ }
+});
+
module.exports = router;
\ No newline at end of file
diff --git a/map/app/routes/index.js b/map/app/routes/index.js
index 51b37a0..2eb0219 100644
--- a/map/app/routes/index.js
+++ b/map/app/routes/index.js
@@ -102,6 +102,11 @@ module.exports = (app) => {
res.sendFile(path.join(__dirname, '../public', 'shifts.html'));
});
+ // User profile page route
+ app.get('/user.html', requireAuth, (req, res) => {
+ res.sendFile(path.join(__dirname, '../public', 'user.html'));
+ });
+
// Catch all - redirect to login
app.get('*', (req, res) => {
res.redirect('/login.html');
diff --git a/map/build-nocodb.md b/map/build-nocodb.md
index d97b586..8392110 100644
--- a/map/build-nocodb.md
+++ b/map/build-nocodb.md
@@ -344,7 +344,7 @@ Updated the build-nocodb.sh script to use proper NocoDB column types based on th
- `unit_number` (SingleLineText)
- `support_level` (SingleSelect with colors: 1=Green, 2=Yellow, 3=Orange, 4=Red)
- `sign` (Checkbox)
- - `sign_size` (SingleSelect: Small, Medium, Large)
+ - `sign_size` (SingleSelect: Regular, Large, Unsure)
- `notes` (LongText)
- `address` (SingleLineText instead of LongText)
diff --git a/map/build-nocodb.sh b/map/build-nocodb.sh
index e7c7666..785f6f9 100755
--- a/map/build-nocodb.sh
+++ b/map/build-nocodb.sh
@@ -343,9 +343,9 @@ create_locations_table() {
"rqd": false,
"colOptions": {
"options": [
- {"title": "Small", "color": "#2196F3"},
- {"title": "Medium", "color": "#FF9800"},
- {"title": "Large", "color": "#4CAF50"}
+ {"title": "Regular", "color": "#2196F3"},
+ {"title": "Large", "color": "#4CAF50"},
+ {"title": "Unsure", "color": "#FF9800"}
]
}
},
diff --git a/map/files-explainer.md b/map/files-explainer.md
index 63e045a..5bfd473 100644
--- a/map/files-explainer.md
+++ b/map/files-explainer.md
@@ -92,7 +92,7 @@ Winston logger configuration for backend logging.
# app/public/admin.html
-Admin panel HTML page for managing start location, walk sheet, and settings.
+Admin panel HTML page for managing start location, walk sheet, shift management, and user management.
# app/public/css/admin.css
@@ -122,9 +122,21 @@ Login page HTML for user authentication.
Volunteer shifts management and signup page HTML with both grid and calendar view options.
+# app/public/user.html
+
+User profile page HTML for displaying user information and account management.
+
+# app/public/css/user.css
+
+CSS styles for the user profile page and user management components in the admin panel.
+
# app/public/js/admin.js
-JavaScript for admin panel functionality (map, start location, walk sheet, etc).
+JavaScript for admin panel functionality (map, start location, walk sheet, shift management, and user management).
+
+# app/public/js/user.js
+
+JavaScript for user profile page functionality and user account management.
# app/public/js/auth.js
diff --git a/mkdocs/.cache/plugin/social/7ca622286d4c40d181cd6c809308aadd.png b/mkdocs/.cache/plugin/social/7ca622286d4c40d181cd6c809308aadd.png
new file mode 100644
index 0000000..5dd10c6
Binary files /dev/null and b/mkdocs/.cache/plugin/social/7ca622286d4c40d181cd6c809308aadd.png differ
diff --git a/mkdocs/.cache/plugin/social/a0553b3e88ffc3c868350353b63036cb.png b/mkdocs/.cache/plugin/social/a0553b3e88ffc3c868350353b63036cb.png
new file mode 100644
index 0000000..441516d
Binary files /dev/null and b/mkdocs/.cache/plugin/social/a0553b3e88ffc3c868350353b63036cb.png differ
diff --git a/mkdocs/docs/config/map.md b/mkdocs/docs/config/map.md
index 113b39c..009116e 100644
--- a/mkdocs/docs/config/map.md
+++ b/mkdocs/docs/config/map.md
@@ -133,7 +133,7 @@ Main table for storing map data:
- 3 = Low Support (Orange)
- 4 = No Support (Red)
- `Sign` (Checkbox): Has campaign sign
-- `Sign Size` (Single Select): Options: "Small", "Medium", "Large"
+- `Sign Size` (Single Select): Options: "Regular", "Large", "Unsure"
- `Notes` (Long Text): Additional details and comments
#### 2. Login Table
diff --git a/mkdocs/docs/how to/canvass.md b/mkdocs/docs/how to/canvass.md
new file mode 100644
index 0000000..553f7d5
--- /dev/null
+++ b/mkdocs/docs/how to/canvass.md
@@ -0,0 +1,4 @@
+# Canvas
+
+This is BNKops canvassing how to! In the following document, you will find all sorts of tips and tricks for door knocking, canvassing, and using the BNKops canvassing app.
+
diff --git a/mkdocs/docs/manual/map.md b/mkdocs/docs/manual/map.md
index 6699944..df924a1 100644
--- a/mkdocs/docs/manual/map.md
+++ b/mkdocs/docs/manual/map.md
@@ -2,7 +2,8 @@
Quick Tips:
-- Map works best when you clear your cookies, cache, and other data before use! This is because it is a web-app that pushes information to your phone. By clearing that data, you will always load the most recent version of the app to your browser.
+- **Data:** Map works best when you clear your cookies, cache, and other data before use! This is because it is a web-app that pushes information to your phone. By clearing that data, you will always load the most recent version of the app to your browser.
+- **Browser:** Map will work on nearly any browser however the developers test on Firefox, Brave, & Chromium. Firefox is what the bnkops team uses to access Map and is generally the most stable.
## How to add new location - Video
diff --git a/mkdocs/site/config/map/index.html b/mkdocs/site/config/map/index.html
index 99920b5..ddb613c 100644
--- a/mkdocs/site/config/map/index.html
+++ b/mkdocs/site/config/map/index.html
@@ -2629,7 +2629,7 @@ Changemaker Archive.
Learn more
3 = Low Support (Orange)
4 = No Support (Red)
Sign (Checkbox): Has campaign sign
-
Sign Size (Single Select): Options: "Small", "Medium", "Large"
+
Sign Size (Single Select): Options: "Regular", "Large", "Unsure"
Notes (Long Text): Additional details and comments
2. Login Table
diff --git a/mkdocs/site/services/map/index.html b/mkdocs/site/services/map/index.html
index 1e1167a..da5164d 100644
--- a/mkdocs/site/services/map/index.html
+++ b/mkdocs/site/services/map/index.html
@@ -1873,7 +1873,7 @@ Changemaker Archive.
Learn more
4 - No Support (Red)
Address (Text): Full street address
Sign (Checkbox): Has campaign sign (true/false)
-
Sign Size (Single Select): Small, Medium, Large
+
Sign Size (Single Select): Regular, Large, Unsure
Geo-Location (Text): Formatted as "latitude;longitude"
API Endpoints