some auth updates that got over written
This commit is contained in:
parent
8cebb567b1
commit
dfe7c6997c
@ -72,7 +72,7 @@ class AuthController {
|
|||||||
req.session.userId = user.id || user.Id;
|
req.session.userId = user.id || user.Id;
|
||||||
req.session.userEmail = user.email || user.Email; // Make sure this is set
|
req.session.userEmail = user.email || user.Email; // Make sure this is set
|
||||||
req.session.userName = user.name || user.Name;
|
req.session.userName = user.name || user.Name;
|
||||||
req.session.isAdmin = user.admin || false;
|
req.session.isAdmin = user.admin || user.Admin || false;
|
||||||
|
|
||||||
logger.info('User logged in:', {
|
logger.info('User logged in:', {
|
||||||
email: req.session.userEmail,
|
email: req.session.userEmail,
|
||||||
|
|||||||
@ -44,7 +44,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="header-actions">
|
<div class="header-actions">
|
||||||
<a href="#" id="homepage-link" class="btn btn-secondary">
|
<a href="#" id="homepage-link" class="btn btn-secondary" style="display: none;">
|
||||||
<span class="btn-icon">🖥️</span>
|
<span class="btn-icon">🖥️</span>
|
||||||
<span class="btn-text">Homepage</span>
|
<span class="btn-text">Homepage</span>
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@ -36,6 +36,16 @@ export function updateUserInterface() {
|
|||||||
if (mobileUserEmailElement) {
|
if (mobileUserEmailElement) {
|
||||||
mobileUserEmailElement.textContent = currentUser.email;
|
mobileUserEmailElement.textContent = currentUser.email;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Control visibility of homepage link for admins
|
||||||
|
const homepageLink = document.getElementById('homepage-link');
|
||||||
|
if (homepageLink) {
|
||||||
|
if (currentUser.isAdmin) {
|
||||||
|
homepageLink.style.display = 'inline-flex';
|
||||||
|
} else {
|
||||||
|
homepageLink.style.display = 'none';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Add admin link if user is admin
|
// Add admin link if user is admin
|
||||||
if (currentUser.isAdmin) {
|
if (currentUser.isAdmin) {
|
||||||
@ -77,5 +87,42 @@ function addAdminLinks() {
|
|||||||
mobileDropdownContent.appendChild(adminItem);
|
mobileDropdownContent.appendChild(adminItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add homepage link for mobile dropdown if it doesn't exist
|
||||||
|
if (!mobileDropdownContent.querySelector('.homepage-link-mobile')) {
|
||||||
|
const homepageItem = document.createElement('div');
|
||||||
|
homepageItem.className = 'mobile-dropdown-item homepage-link-mobile';
|
||||||
|
|
||||||
|
const homepageLink = document.createElement('a');
|
||||||
|
homepageLink.href = '#'; // Or the correct link for homepage
|
||||||
|
homepageLink.id = 'mobile-homepage-link';
|
||||||
|
homepageLink.style.color = 'inherit';
|
||||||
|
homepageLink.style.textDecoration = 'none';
|
||||||
|
homepageLink.textContent = '🖥️ Homepage';
|
||||||
|
|
||||||
|
homepageItem.appendChild(homepageLink);
|
||||||
|
|
||||||
|
// Insert after the admin link
|
||||||
|
const adminLink = mobileDropdownContent.querySelector('.admin-link-mobile');
|
||||||
|
if (adminLink && adminLink.nextSibling) {
|
||||||
|
mobileDropdownContent.insertBefore(homepageItem, adminLink.nextSibling);
|
||||||
|
} else if (adminLink) {
|
||||||
|
mobileDropdownContent.appendChild(homepageItem);
|
||||||
|
} else if (mobileDropdownContent.firstChild) {
|
||||||
|
mobileDropdownContent.insertBefore(homepageItem, mobileDropdownContent.firstChild);
|
||||||
|
} else {
|
||||||
|
mobileDropdownContent.appendChild(homepageItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add event listener for mobile homepage link
|
||||||
|
const mobileHomepageLink = document.getElementById('mobile-homepage-link');
|
||||||
|
const desktopHomepageLink = document.getElementById('homepage-link');
|
||||||
|
if (mobileHomepageLink && desktopHomepageLink) {
|
||||||
|
mobileHomepageLink.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
desktopHomepageLink.click();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
# Map
|
# Map
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
Interactive map service for geospatial data visualization, powered by NocoDB and Leaflet.js.
|
Interactive map service for geospatial data visualization, powered by NocoDB and Leaflet.js.
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|||||||
BIN
mkdocs/docs/services/map.png
Normal file
BIN
mkdocs/docs/services/map.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 MiB |
Loading…
x
Reference in New Issue
Block a user