fix: resolve branding display issues and invitation parsing errors
Fixes #84 - Logo and favicon not displaying on branding page and galleries Fixes #85 - Invitations showing undefined expiresAt causing parseISO errors Changes: - Fix nginx.conf: Add ^~ modifier to /uploads location to prioritize proxy over static file matching - Fix vite.config.ts: Add /uploads proxy for development environment - Fix BrandingPage.tsx: Include logo_url from branding settings instead of expecting it from theme - Fix adminUsers.js: Add transformInvitation() to convert snake_case DB fields to camelCase API response - Fix publicSettings.js: Add branding_hide_powered_by to public settings API response - Update README.md: Mark Multiple Administrators feature as implemented - Bump version to 2.2.1
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "picpeak-backend",
|
||||
"version": "1.1.15",
|
||||
"version": "2.2.1",
|
||||
"description": "Backend for PicPeak event photo sharing platform",
|
||||
"main": "server.js",
|
||||
"scripts": {
|
||||
|
||||
@@ -45,6 +45,20 @@ function transformRole(role) {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Transform invitation object from snake_case (DB) to camelCase (API)
|
||||
*/
|
||||
function transformInvitation(invitation) {
|
||||
return {
|
||||
id: invitation.id,
|
||||
email: invitation.email,
|
||||
expiresAt: invitation.expires_at,
|
||||
createdAt: invitation.created_at,
|
||||
roleName: invitation.role_name,
|
||||
invitedBy: invitation.invited_by
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* GET /me/permissions
|
||||
* Get current user's permissions
|
||||
@@ -81,7 +95,7 @@ router.get('/roles', adminAuth, requirePermission('users.view'), handleAsync(asy
|
||||
*/
|
||||
router.get('/invitations', adminAuth, requirePermission('users.view'), handleAsync(async (req, res) => {
|
||||
const invitations = await userManagementService.getPendingInvitations();
|
||||
res.json({ invitations });
|
||||
res.json({ invitations: invitations.map(transformInvitation) });
|
||||
}));
|
||||
|
||||
/**
|
||||
|
||||
@@ -58,6 +58,7 @@ router.get('/', async (req, res) => {
|
||||
branding_logo_display_header: settingsObject.branding_logo_display_header !== false,
|
||||
branding_logo_display_hero: settingsObject.branding_logo_display_hero !== false,
|
||||
branding_logo_display_mode: settingsObject.branding_logo_display_mode || 'logo_and_text',
|
||||
branding_hide_powered_by: settingsObject.branding_hide_powered_by === true,
|
||||
theme_config: settingsObject.theme_config || null,
|
||||
default_language: settingsObject.general_default_language || 'en',
|
||||
enable_analytics: settingsObject.general_enable_analytics !== false,
|
||||
|
||||
Reference in New Issue
Block a user