Merge branch 'main' of https://github.com/pickle-com/glass
This commit is contained in:
		
						commit
						f764ad5362
					
				@ -1,2 +1,2 @@
 | 
				
			|||||||
src/assets
 | 
					src/ui/assets
 | 
				
			||||||
node_modules
 | 
					node_modules
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								aec
									
									
									
									
									
								
							
							
								
								
								
								
								
								
									
									
								
							
						
						
									
										2
									
								
								aec
									
									
									
									
									
								
							@ -1 +1 @@
 | 
				
			|||||||
Subproject commit 9e11f4f95707714464194bdfc9db0222ec5c6163
 | 
					Subproject commit f00bb1fb948053c752b916adfee19f90644a0b2f
 | 
				
			||||||
@ -39,7 +39,7 @@ asarUnpack:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# Windows configuration
 | 
					# Windows configuration
 | 
				
			||||||
win:
 | 
					win:
 | 
				
			||||||
    icon: src/assets/logo.ico
 | 
					    icon: src/ui/assets/logo.ico
 | 
				
			||||||
    target:
 | 
					    target:
 | 
				
			||||||
        - target: nsis
 | 
					        - target: nsis
 | 
				
			||||||
          arch: x64
 | 
					          arch: x64
 | 
				
			||||||
@ -67,7 +67,7 @@ mac:
 | 
				
			|||||||
    # The application category type
 | 
					    # The application category type
 | 
				
			||||||
    category: public.app-category.utilities
 | 
					    category: public.app-category.utilities
 | 
				
			||||||
    # Path to the .icns icon file
 | 
					    # Path to the .icns icon file
 | 
				
			||||||
    icon: src/assets/logo.icns
 | 
					    icon: src/ui/assets/logo.icns
 | 
				
			||||||
    # Minimum macOS version (supports both Intel and Apple Silicon)
 | 
					    # Minimum macOS version (supports both Intel and Apple Silicon)
 | 
				
			||||||
    minimumSystemVersion: '11.0'
 | 
					    minimumSystemVersion: '11.0'
 | 
				
			||||||
    hardenedRuntime: true
 | 
					    hardenedRuntime: true
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,5 @@
 | 
				
			|||||||
// src/bridge/windowBridge.js
 | 
					// src/bridge/windowBridge.js
 | 
				
			||||||
const { ipcMain, BrowserWindow } = require('electron');
 | 
					const { ipcMain, shell } = require('electron');
 | 
				
			||||||
const windowManager = require('../window/windowManager');
 | 
					const windowManager = require('../window/windowManager');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
module.exports = {
 | 
					module.exports = {
 | 
				
			||||||
@ -15,6 +15,7 @@ module.exports = {
 | 
				
			|||||||
    ipcMain.handle('open-personalize-page', () => windowManager.openLoginPage());
 | 
					    ipcMain.handle('open-personalize-page', () => windowManager.openLoginPage());
 | 
				
			||||||
    ipcMain.handle('move-window-step', (event, direction) => windowManager.moveWindowStep(direction));
 | 
					    ipcMain.handle('move-window-step', (event, direction) => windowManager.moveWindowStep(direction));
 | 
				
			||||||
    ipcMain.on('close-shortcut-editor', () => windowManager.closeWindow('shortcut-settings'));
 | 
					    ipcMain.on('close-shortcut-editor', () => windowManager.closeWindow('shortcut-settings'));
 | 
				
			||||||
 | 
					    ipcMain.handle('open-external', (event, url) => shell.openExternal(url));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Newly moved handlers from windowManager
 | 
					    // Newly moved handlers from windowManager
 | 
				
			||||||
    ipcMain.on('header-state-changed', (event, state) => windowManager.handleHeaderStateChanged(state));
 | 
					    ipcMain.on('header-state-changed', (event, state) => windowManager.handleHeaderStateChanged(state));
 | 
				
			||||||
 | 
				
			|||||||
@ -19,6 +19,7 @@ contextBridge.exposeInMainWorld('api', {
 | 
				
			|||||||
    
 | 
					    
 | 
				
			||||||
    // App Control
 | 
					    // App Control
 | 
				
			||||||
      quitApplication: () => ipcRenderer.invoke('quit-application'),
 | 
					      quitApplication: () => ipcRenderer.invoke('quit-application'),
 | 
				
			||||||
 | 
					      openExternal: (url) => ipcRenderer.invoke('open-external', url),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // User state listener (used by multiple components)
 | 
					    // User state listener (used by multiple components)
 | 
				
			||||||
      onUserStateChanged: (callback) => ipcRenderer.on('user-state-changed', callback),
 | 
					      onUserStateChanged: (callback) => ipcRenderer.on('user-state-changed', callback),
 | 
				
			||||||
 | 
				
			|||||||
@ -256,6 +256,7 @@ export class ApiKeyHeader extends LitElement {
 | 
				
			|||||||
        .footer-link {
 | 
					        .footer-link {
 | 
				
			||||||
            text-decoration: underline;
 | 
					            text-decoration: underline;
 | 
				
			||||||
            cursor: pointer;
 | 
					            cursor: pointer;
 | 
				
			||||||
 | 
					            -webkit-app-region: no-drag;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        .error-message,
 | 
					        .error-message,
 | 
				
			||||||
        .success-message {
 | 
					        .success-message {
 | 
				
			||||||
@ -1904,8 +1905,9 @@ export class ApiKeyHeader extends LitElement {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    openPrivacyPolicy() {
 | 
					    openPrivacyPolicy() {
 | 
				
			||||||
        if (window.require) {
 | 
					        console.log('🔊 openPrivacyPolicy ApiKeyHeader');
 | 
				
			||||||
            window.require('electron').shell.openExternal('https://pickleglass.com/privacy');
 | 
					        if (window.api?.common) {
 | 
				
			||||||
 | 
					            window.api.common.openExternal('https://pickle.com/privacy-policy');
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -156,6 +156,7 @@ export class WelcomeHeader extends LitElement {
 | 
				
			|||||||
        .footer-link {
 | 
					        .footer-link {
 | 
				
			||||||
            text-decoration: underline;
 | 
					            text-decoration: underline;
 | 
				
			||||||
            cursor: pointer;
 | 
					            cursor: pointer;
 | 
				
			||||||
 | 
					            -webkit-app-region: no-drag;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    `;
 | 
					    `;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -177,8 +178,8 @@ export class WelcomeHeader extends LitElement {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    handleClose() {
 | 
					    handleClose() {
 | 
				
			||||||
        if (window.require) {
 | 
					        if (window.api?.common) {
 | 
				
			||||||
            window.require('electron').ipcRenderer.invoke('quit-application');
 | 
					            window.api.common.quitApplication();
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -225,8 +226,9 @@ export class WelcomeHeader extends LitElement {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    openPrivacyPolicy() {
 | 
					    openPrivacyPolicy() {
 | 
				
			||||||
        if (window.require) {
 | 
					        console.log('🔊 openPrivacyPolicy WelcomeHeader');
 | 
				
			||||||
            window.require('electron').shell.openExternal('https://pickleglass.com/privacy');
 | 
					        if (window.api?.common) {
 | 
				
			||||||
 | 
					            window.api.common.openExternal('https://pickle.com/privacy-policy');
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -640,6 +640,7 @@ function createWindows() {
 | 
				
			|||||||
        frame: false,
 | 
					        frame: false,
 | 
				
			||||||
        transparent: true,
 | 
					        transparent: true,
 | 
				
			||||||
        vibrancy: false,
 | 
					        vibrancy: false,
 | 
				
			||||||
 | 
					        hasShadow: false,
 | 
				
			||||||
        alwaysOnTop: true,
 | 
					        alwaysOnTop: true,
 | 
				
			||||||
        skipTaskbar: true,
 | 
					        skipTaskbar: true,
 | 
				
			||||||
        hiddenInMissionControl: true,
 | 
					        hiddenInMissionControl: true,
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user