admin/freealberta
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shifsts bug

Browse Source
This commit is contained in:
admin 2025-08-17 09:03:28 -06:00
parent b7263188f9
commit c2ccddd1dc
7 changed files with 111 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
map/app/public/css/modules/base.css
View File

@ -38,7 +38,33 @@
*/ */
} }
/* Reset and base styles */ /* Authentication loading states */
body.authenticating {
overflow: hidden;
background: #ffffff; /* Clean white background during auth */
}
body.authenticating #app.app-hidden {
opacity: 0;
visibility: hidden;
transition: none; /* No transition while hiding */
transform: translateY(10px); /* Slight offset for smooth entrance */
}
body.authenticated #app {
opacity: 1;
visibility: visible;
transform: translateY(0);
transition: opacity 0.4s ease, transform 0.4s ease, visibility 0.4s ease;
}
/* Enhanced loading overlay for authentication */
body.authenticating .loading-overlay {
background-color: rgba(255, 255, 255, 0.98);
backdrop-filter: blur(2px);
}
/* Base styles */
* { * {
margin: 0; margin: 0;
padding: 0; padding: 0;

37
map/app/public/css/modules/notifications.css
View File

@ -63,7 +63,14 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
z-index: 12500; z-index: 15000; /* Higher than everything else during auth */
}
/* Enhanced loading for authentication state */
body.authenticating .loading-overlay {
background-color: rgba(255,255,255,0.98);
backdrop-filter: blur(2px);
z-index: 15000;
} }
.loading-overlay.hidden { .loading-overlay.hidden {
@ -88,3 +95,31 @@
color: var(--dark-color); color: var(--dark-color);
font-size: 16px; font-size: 16px;
} }
.loading-patience-message {
margin-top: 10px !important;
font-size: 14px !important;
color: #666 !important;
max-width: 320px;
text-align: center;
line-height: 1.4;
opacity: 0.85;
padding: 0 20px; /* Add padding for mobile */
}
/* Better spinner animation during auth */
body.authenticating .spinner {
width: 60px;
height: 60px;
border: 4px solid var(--light-color);
border-top-color: var(--primary-color);
border-radius: 50%;
animation: spin 1s linear infinite;
}
/* Larger text during authentication */
body.authenticating .loading-overlay p:first-of-type {
font-size: 18px;
font-weight: 500;
color: var(--primary-color);
}

9
map/app/public/index.html
View File

@ -18,8 +18,8 @@
<!-- Custom CSS --> <!-- Custom CSS -->
<link rel="stylesheet" href="css/style.css"> <link rel="stylesheet" href="css/style.css">
</head> </head>
<body> <body class="authenticating">
<div id="app"> <div id="app" class="app-hidden">
<!-- Header --> <!-- Header -->
<header class="header"> <header class="header">
<h1>Map</h1> <h1>Map</h1>
@ -429,7 +429,10 @@
<!-- Loading Overlay --> <!-- Loading Overlay -->
<div id="loading" class="loading-overlay"> <div id="loading" class="loading-overlay">
<div class="spinner"></div> <div class="spinner"></div>
<p>Loading map...</p> <p>Authenticating...</p>
<p class="loading-patience-message">
Loading map for the first time can take several seconds, even up to a minute. Please be patient.
</p>
</div> </div>
</div> </div>

17
map/app/public/js/auth.js
View File

@ -11,26 +11,31 @@ export async function checkAuth() {
// Check if user has expired // Check if user has expired
if (data.expired) { if (data.expired) {
showStatus('Account has expired. Please contact an administrator.', 'error'); showStatus('Account has expired. Please contact an administrator.', 'error');
setTimeout(() => { // Immediate redirect for expired users
window.location.href = '/login.html?expired=true'; window.location.href = '/login.html?expired=true';
}, 2000);
throw new Error('Account expired'); throw new Error('Account expired');
} }
if (!data.authenticated) { if (!data.authenticated) {
// Immediate redirect for unauthenticated users
window.location.href = '/login.html'; window.location.href = '/login.html';
throw new Error('Not authenticated'); throw new Error('Not authenticated');
} }
currentUser = data.user; currentUser = data.user;
currentUser.userType = data.user.userType || 'user'; // Ensure userType is set currentUser.userType = data.user.userType || 'user'; // Ensure userType is set
// Authentication successful - show the app
document.body.classList.remove('authenticating');
document.body.classList.add('authenticated');
document.getElementById('app').classList.remove('app-hidden');
updateUserInterface(); updateUserInterface();
} catch (error) { } catch (error) {
console.error('Auth check failed:', error); console.error('Auth check failed:', error);
if (error.message !== 'Account expired') { // Always redirect immediately on any auth failure
window.location.href = '/login.html'; window.location.href = '/login.html';
}
throw error; throw error;
} }
} }

29
map/app/public/js/main.js
View File

@ -1,6 +1,6 @@
// Main application entry point // Main application entry point
import { CONFIG, loadDomainConfig } from './config.js'; import { CONFIG, loadDomainConfig } from './config.js';
import { hideLoading, showStatus, setViewportDimensions } from './utils.js'; import { hideLoading, showStatus, setViewportDimensions, updateLoadingMessage } from './utils.js';
import { checkAuth } from './auth.js'; import { checkAuth } from './auth.js';
import { initializeMap, getMap } from './map-manager.js'; import { initializeMap, getMap } from './map-manager.js';
import { loadLocations } from './location-manager.js'; import { loadLocations } from './location-manager.js';
@ -23,28 +23,36 @@ document.addEventListener('DOMContentLoaded', async () => {
setTimeout(setViewportDimensions, 100); setTimeout(setViewportDimensions, 100);
}); });
console.log('DOM loaded, initializing application...'); console.log('DOM loaded, checking authentication...');
try { try {
// Load domain configuration first // Load domain configuration first
updateLoadingMessage('Loading configuration...');
await loadDomainConfig(); await loadDomainConfig();
// First check authentication // CRITICAL: Check authentication FIRST before any UI initialization
// This prevents the map from briefly showing before redirect
updateLoadingMessage('Authenticating...');
await checkAuth(); await checkAuth();
console.log('Authentication confirmed, initializing application...');
// Setup temp user security measures after authentication // Setup temp user security measures after authentication
setupTempUserSecurity(); setupTempUserSecurity();
// Then initialize the map // Then initialize the map
updateLoadingMessage('Initializing map...');
await initializeMap(); await initializeMap();
// Initialize cut manager after map is ready // Initialize cut manager after map is ready
updateLoadingMessage('Loading map overlays...');
await cutManager.initialize(getMap()); await cutManager.initialize(getMap());
// Initialize cut controls for public map // Initialize cut controls for public map
await initializeCutControls(); await initializeCutControls();
// Only load locations after map is ready // Only load locations after map is ready
updateLoadingMessage('Loading locations...');
await loadLocations(); await loadLocations();
// Setup other features // Setup other features
@ -52,13 +60,24 @@ document.addEventListener('DOMContentLoaded', async () => {
setupAutoRefresh(); setupAutoRefresh();
// Initialize Unified Search // Initialize Unified Search
updateLoadingMessage('Setting up search...');
await initializeUnifiedSearch(); await initializeUnifiedSearch();
} catch (error) { } catch (error) {
console.error('Initialization error:', error); console.error('Initialization error:', error);
showStatus('Failed to initialize application', 'error'); // If authentication fails, we should already be redirected
// But in case of other errors, clean up the loading state
if (!error.message.includes('Not authenticated') && !error.message.includes('Account expired')) {
document.body.classList.remove('authenticating');
document.body.classList.add('authenticated');
document.getElementById('app').classList.remove('app-hidden');
showStatus('Failed to initialize application', 'error');
}
} finally { } finally {
hideLoading(); // Only hide loading if we're not being redirected for authentication
if (!document.body.classList.contains('authenticating')) {
hideLoading();
}
} }
}); });

7
map/app/public/js/utils.js
View File

@ -52,6 +52,13 @@ export function hideLoading() {
} }
} }
export function updateLoadingMessage(message) {
const loadingElement = document.querySelector('#loading p');
if (loadingElement) {
loadingElement.textContent = message;
}
}
export function updateLocationCount(count) { export function updateLocationCount(count) {
const countElement = document.getElementById('location-count'); const countElement = document.getElementById('location-count');
const mobileCountElement = document.getElementById('mobile-location-count'); const mobileCountElement = document.getElementById('mobile-location-count');

14
map/listmonk-env-example.txt
View File

@ -1,14 +0,0 @@
# Add these Listmonk configuration variables to your .env file
# Listmonk Configuration
LISTMONK_API_URL=http://listmonk:9000/api
LISTMONK_USERNAME=admin
LISTMONK_PASSWORD=your-secure-listmonk-password
LISTMONK_SYNC_ENABLED=true
LISTMONK_INITIAL_SYNC=false # Set to true only for first run to sync existing data
# Note: Make sure to:
# 1. Replace 'your-secure-listmonk-password' with your actual Listmonk admin password
# 2. Update the LISTMONK_API_URL if your Listmonk instance runs on a different host/port
# 3. Set LISTMONK_INITIAL_SYNC=true only once to sync existing data, then set back to false
# 4. Restart the Map application after updating these variables