- Remove electron-builder and @electron/rebuild packages to resolve build errors
- Clean up package.json scripts that depend on electron-builder
- Fix merge conflict markers in AdminSettings.tsx and PasswordReset.tsx
- All build commands now work correctly:
- npm run build (frontend + backend)
- npm run build:frontend
- npm run build:backend
- npm run electron:package (using electron-packager)
The build system is now stable and functional without signing requirements.
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <[email protected]>
This merge brings the complete Electron desktop application implementation into main branch:
- Full Electron desktop architecture with cross-platform support
- Complete i18n internationalization system (English/Chinese)
- Mobile keyboard support and responsive design improvements
- Updated dependencies and version 1.6.0
- Enhanced user interface components and admin functionality
- Directory restructure from src/ui/Apps/* to src/ui/Desktop/Apps/*
All merge conflicts resolved preserving i18n functionality as requested.
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <[email protected]>
Core merge strategy:
- PRESERVE all Electron functionality including desktop/mobile switching
- PRESERVE enhanced i18n translations (electron has more complete translations)
- PRESERVE Electron directory structure (src/ui/Desktop/*)
- PRESERVE version 1.6.0 and Electron build scripts
- KEEP mobile keyboard and cross-platform support
Key decisions made:
- Chinese translations: Keep electron's 854 lines (vs main's 776 lines)
- English translations: Keep electron's enhanced translations
- UI Components: Keep Electron's Desktop/* structure intact
- Package.json: Keep version 1.6.0 and all Electron dependencies
- i18n config: Keep electron's './locales/...' path for Electron compatibility
Result: Successfully merged i18n improvements while maintaining full Electron + mobile support architecture.
🤖 Generated with Claude Code
Co-Authored-By: Claude <[email protected]>
- Add electron-packager scripts for Windows, macOS, and Linux
- Include universal architecture support for macOS
- Add electron:package:all for building all platforms
- Remove obsolete start-backend.sh script (replaced by Electron auto-start)
- Improve ignore patterns to exclude repo-images folder
- Add platform-specific icon configurations
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <[email protected]>
- Add backend auto-start functionality in main process
- Fix authentication token storage for Electron environment
- Implement localStorage-based token management in Electron
- Add proper Electron environment detection via preload script
- Fix WebSocket connections for terminal functionality
- Resolve font file loading issues in packaged application
- Update API endpoints to work with backend auto-start
- Streamline build scripts with unified electron:package command
- Fix better-sqlite3 native module compatibility issues
- Ensure all services start automatically in production mode
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <[email protected]>
- Merge OIDC authentication fixes from 3877e90:
* Enhanced JWKS discovery mechanism with multiple backup URLs
* Better support for non-standard OIDC providers (Authentik, etc.)
* Improved error handling for "Failed to get user information"
- Migrate to unified Sonner toast notification system:
* Replace custom success/error state management
* Remove redundant alert state variables
* Consistent user feedback across all components
- Improve code quality and function naming conventions
- PRESERVE all existing i18n functionality and Chinese translations
🤖 Generated with Claude Code
Co-Authored-By: Claude <[email protected]>
ZacharyZcRandClaude