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:
+2
-1
@@ -88,7 +88,8 @@ server {
|
||||
}
|
||||
|
||||
# Uploads serving proxy (logos, favicons, watermarks)
|
||||
location /uploads {
|
||||
# ^~ modifier stops regex matching, ensuring uploads are proxied not served locally
|
||||
location ^~ /uploads {
|
||||
proxy_pass http://backend:3001;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "picpeak-frontend",
|
||||
"private": true,
|
||||
"version": "1.1.15",
|
||||
"version": "2.2.1",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
@@ -81,9 +81,8 @@ export const BrandingPage: React.FC = () => {
|
||||
useEffect(() => {
|
||||
if (settings) {
|
||||
const formatted = settingsService.formatBrandingSettings(settings);
|
||||
// Don't set logo_url here - it will be synced from theme
|
||||
const { logo_url, ...brandingWithoutLogo } = formatted;
|
||||
setBrandingSettings(prev => ({ ...prev, ...brandingWithoutLogo }));
|
||||
// Include logo_url from branding settings
|
||||
setBrandingSettings(prev => ({ ...prev, ...formatted }));
|
||||
}
|
||||
}, [settings]);
|
||||
|
||||
@@ -91,15 +90,17 @@ export const BrandingPage: React.FC = () => {
|
||||
useEffect(() => {
|
||||
if (themeSettings) {
|
||||
const formatted = settingsService.formatThemeSettings(themeSettings) as ThemeConfig;
|
||||
|
||||
|
||||
if (formatted && Object.keys(formatted).length > 0) {
|
||||
// Use the theme's logo URL as stored in the theme config
|
||||
setCurrentTheme(formatted);
|
||||
setTheme(formatted);
|
||||
|
||||
// Always sync the logo URL from theme to branding settings - theme is source of truth
|
||||
setBrandingSettings(prev => ({ ...prev, logo_url: formatted.logoUrl || '' }));
|
||||
|
||||
|
||||
// Only sync logo URL from theme if it exists there (logo is stored in branding settings)
|
||||
if (formatted.logoUrl) {
|
||||
setBrandingSettings(prev => ({ ...prev, logo_url: formatted.logoUrl }));
|
||||
}
|
||||
|
||||
// Try to identify which preset this matches
|
||||
for (const [key, preset] of Object.entries(GALLERY_THEME_PRESETS)) {
|
||||
if (JSON.stringify(preset.config) === JSON.stringify(formatted)) {
|
||||
|
||||
@@ -36,6 +36,10 @@ const config: VitestUserConfig = {
|
||||
target: 'http://localhost:7101',
|
||||
changeOrigin: true,
|
||||
},
|
||||
'/uploads': {
|
||||
target: 'http://localhost:7101',
|
||||
changeOrigin: true,
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user