From d6ee8e07c5157ad442943adb8bb8fa8ccaf699a3 Mon Sep 17 00:00:00 2001 From: samtiz Date: Sat, 12 Jul 2025 20:29:04 +0900 Subject: [PATCH] resolve import err --- aec | 2 +- src/features/ask/askService.js | 8 ++--- .../ask/repositories/firebase.repository.js | 4 +-- src/features/ask/repositories/index.js | 2 +- .../ask/repositories/sqlite.repository.js | 2 +- .../common/repositories/preset/index.js | 2 +- .../common/services/migrationService.js | 6 ++-- src/features/listen/listenService.js | 4 +-- .../stt/repositories/firebase.repository.js | 4 +-- src/features/listen/stt/repositories/index.js | 2 +- .../stt/repositories/sqlite.repository.js | 2 +- src/features/listen/stt/sttService.js | 7 +---- .../repositories/firebase.repository.js | 6 ++-- .../listen/summary/repositories/index.js | 2 +- .../summary/repositories/sqlite.repository.js | 2 +- src/features/listen/summary/summaryService.js | 7 ++--- .../repositories/firebase.repository.js | 6 ++-- src/features/settings/repositories/index.js | 2 +- .../repositories/sqlite.repository.js | 2 +- src/features/settings/settingsService.js | 2 +- src/index.js | 30 +++++++++---------- src/ui/app/ApiKeyHeader.js | 2 +- src/ui/app/PickleGlassApp.js | 4 +-- src/ui/settings/SettingsView.js | 2 +- src/window/windowManager.js | 27 ++++++++--------- 25 files changed, 65 insertions(+), 74 deletions(-) diff --git a/aec b/aec index 9e11f4f..f00bb1f 160000 --- a/aec +++ b/aec @@ -1 +1 @@ -Subproject commit 9e11f4f95707714464194bdfc9db0222ec5c6163 +Subproject commit f00bb1fb948053c752b916adfee19f90644a0b2f diff --git a/src/features/ask/askService.js b/src/features/ask/askService.js index a031a98..ceb347d 100644 --- a/src/features/ask/askService.js +++ b/src/features/ask/askService.js @@ -1,10 +1,10 @@ const { ipcMain, BrowserWindow } = require('electron'); -const { createStreamingLLM } = require('../../common/ai/factory'); +const { createStreamingLLM } = require('../common/ai/factory'); const { getStoredApiKey, getStoredProvider, getCurrentModelInfo, windowPool, captureScreenshot } = require('../../window/windowManager'); -const authService = require('../../common/services/authService'); -const sessionRepository = require('../../common/repositories/session'); +const authService = require('../common/services/authService'); +const sessionRepository = require('../common/repositories/session'); const askRepository = require('./repositories'); -const { getSystemPrompt } = require('../../common/prompts/promptBuilder'); +const { getSystemPrompt } = require('../common/prompts/promptBuilder'); function formatConversationForPrompt(conversationTexts) { if (!conversationTexts || conversationTexts.length === 0) return 'No conversation history available.'; diff --git a/src/features/ask/repositories/firebase.repository.js b/src/features/ask/repositories/firebase.repository.js index 09ef25c..baeede9 100644 --- a/src/features/ask/repositories/firebase.repository.js +++ b/src/features/ask/repositories/firebase.repository.js @@ -1,6 +1,6 @@ const { collection, addDoc, query, getDocs, orderBy, Timestamp } = require('firebase/firestore'); -const { getFirestoreInstance } = require('../../../common/services/firebaseClient'); -const { createEncryptedConverter } = require('../../../common/repositories/firestoreConverter'); +const { getFirestoreInstance } = require('../../common/services/firebaseClient'); +const { createEncryptedConverter } = require('../../common/repositories/firestoreConverter'); const aiMessageConverter = createEncryptedConverter(['content']); diff --git a/src/features/ask/repositories/index.js b/src/features/ask/repositories/index.js index f9fdda1..ac2b12a 100644 --- a/src/features/ask/repositories/index.js +++ b/src/features/ask/repositories/index.js @@ -1,6 +1,6 @@ const sqliteRepository = require('./sqlite.repository'); const firebaseRepository = require('./firebase.repository'); -const authService = require('../../../common/services/authService'); +const authService = require('../../common/services/authService'); function getBaseRepository() { const user = authService.getCurrentUser(); diff --git a/src/features/ask/repositories/sqlite.repository.js b/src/features/ask/repositories/sqlite.repository.js index 19962eb..501273f 100644 --- a/src/features/ask/repositories/sqlite.repository.js +++ b/src/features/ask/repositories/sqlite.repository.js @@ -1,4 +1,4 @@ -const sqliteClient = require('../../../common/services/sqliteClient'); +const sqliteClient = require('../../common/services/sqliteClient'); function addAiMessage({ uid, sessionId, role, content, model = 'unknown' }) { // uid is ignored in the SQLite implementation diff --git a/src/features/common/repositories/preset/index.js b/src/features/common/repositories/preset/index.js index ac61784..1591241 100644 --- a/src/features/common/repositories/preset/index.js +++ b/src/features/common/repositories/preset/index.js @@ -1,6 +1,6 @@ const sqliteRepository = require('./sqlite.repository'); const firebaseRepository = require('./firebase.repository'); -const authService = require('../../../common/services/authService'); +const authService = require('../../services/authService'); function getBaseRepository() { const user = authService.getCurrentUser(); diff --git a/src/features/common/services/migrationService.js b/src/features/common/services/migrationService.js index 8fe13c3..2f9b5ce 100644 --- a/src/features/common/services/migrationService.js +++ b/src/features/common/services/migrationService.js @@ -5,9 +5,9 @@ const encryptionService = require('../services/encryptionService'); const sqliteSessionRepo = require('../repositories/session/sqlite.repository'); const sqlitePresetRepo = require('../repositories/preset/sqlite.repository'); const sqliteUserRepo = require('../repositories/user/sqlite.repository'); -const sqliteSttRepo = require('../../features/listen/stt/repositories/sqlite.repository'); -const sqliteSummaryRepo = require('../../features/listen/summary/repositories/sqlite.repository'); -const sqliteAiMessageRepo = require('../../features/ask/repositories/sqlite.repository'); +const sqliteSttRepo = require('../../listen/stt/repositories/sqlite.repository'); +const sqliteSummaryRepo = require('../../listen/summary/repositories/sqlite.repository'); +const sqliteAiMessageRepo = require('../../ask/repositories/sqlite.repository'); const MAX_BATCH_OPERATIONS = 500; diff --git a/src/features/listen/listenService.js b/src/features/listen/listenService.js index a4f4946..3c229d2 100644 --- a/src/features/listen/listenService.js +++ b/src/features/listen/listenService.js @@ -1,8 +1,8 @@ const { BrowserWindow, app } = require('electron'); const SttService = require('./stt/sttService'); const SummaryService = require('./summary/summaryService'); -const authService = require('../../common/services/authService'); -const sessionRepository = require('../../common/repositories/session'); +const authService = require('../common/services/authService'); +const sessionRepository = require('../common/repositories/session'); const sttRepository = require('./stt/repositories'); class ListenService { diff --git a/src/features/listen/stt/repositories/firebase.repository.js b/src/features/listen/stt/repositories/firebase.repository.js index 3fb1606..77a6e15 100644 --- a/src/features/listen/stt/repositories/firebase.repository.js +++ b/src/features/listen/stt/repositories/firebase.repository.js @@ -1,6 +1,6 @@ const { collection, addDoc, query, getDocs, orderBy, Timestamp } = require('firebase/firestore'); -const { getFirestoreInstance } = require('../../../../common/services/firebaseClient'); -const { createEncryptedConverter } = require('../../../../common/repositories/firestoreConverter'); +const { getFirestoreInstance } = require('../../../common/services/firebaseClient'); +const { createEncryptedConverter } = require('../../../common/repositories/firestoreConverter'); const transcriptConverter = createEncryptedConverter(['text']); diff --git a/src/features/listen/stt/repositories/index.js b/src/features/listen/stt/repositories/index.js index 8554bc5..ba5b873 100644 --- a/src/features/listen/stt/repositories/index.js +++ b/src/features/listen/stt/repositories/index.js @@ -1,6 +1,6 @@ const sqliteRepository = require('./sqlite.repository'); const firebaseRepository = require('./firebase.repository'); -const authService = require('../../../../common/services/authService'); +const authService = require('../../../common/services/authService'); function getBaseRepository() { const user = authService.getCurrentUser(); diff --git a/src/features/listen/stt/repositories/sqlite.repository.js b/src/features/listen/stt/repositories/sqlite.repository.js index be4d00f..f140315 100644 --- a/src/features/listen/stt/repositories/sqlite.repository.js +++ b/src/features/listen/stt/repositories/sqlite.repository.js @@ -1,4 +1,4 @@ -const sqliteClient = require('../../../../common/services/sqliteClient'); +const sqliteClient = require('../../../common/services/sqliteClient'); function addTranscript({ uid, sessionId, speaker, text }) { // uid is ignored in the SQLite implementation diff --git a/src/features/listen/stt/sttService.js b/src/features/listen/stt/sttService.js index a846014..3c7e4ad 100644 --- a/src/features/listen/stt/sttService.js +++ b/src/features/listen/stt/sttService.js @@ -1,6 +1,6 @@ const { BrowserWindow } = require('electron'); const { spawn } = require('child_process'); -const { createSTT } = require('../../../common/ai/factory'); +const { createSTT } = require('../../common/ai/factory'); const { getStoredApiKey, getStoredProvider, getCurrentModelInfo } = require('../../../window/windowManager'); const COMPLETION_DEBOUNCE_MS = 2000; @@ -367,11 +367,6 @@ class SttService { onclose: event => console.log('Their STT session closed:', event.reason), }, }; - - // Determine auth options for providers that support it - // const authService = require('../../../common/services/authService'); - // const userState = authService.getCurrentUser(); - // const loggedIn = userState.isLoggedIn; const sttOptions = { apiKey: this.modelInfo.apiKey, diff --git a/src/features/listen/summary/repositories/firebase.repository.js b/src/features/listen/summary/repositories/firebase.repository.js index 573c299..454797e 100644 --- a/src/features/listen/summary/repositories/firebase.repository.js +++ b/src/features/listen/summary/repositories/firebase.repository.js @@ -1,7 +1,7 @@ const { collection, doc, setDoc, getDoc, Timestamp } = require('firebase/firestore'); -const { getFirestoreInstance } = require('../../../../common/services/firebaseClient'); -const { createEncryptedConverter } = require('../../../../common/repositories/firestoreConverter'); -const encryptionService = require('../../../../common/services/encryptionService'); +const { getFirestoreInstance } = require('../../../common/services/firebaseClient'); +const { createEncryptedConverter } = require('../../../common/repositories/firestoreConverter'); +const encryptionService = require('../../../common/services/encryptionService'); const fieldsToEncrypt = ['tldr', 'text', 'bullet_json', 'action_json']; const summaryConverter = createEncryptedConverter(fieldsToEncrypt); diff --git a/src/features/listen/summary/repositories/index.js b/src/features/listen/summary/repositories/index.js index 21934ed..5bf7ba7 100644 --- a/src/features/listen/summary/repositories/index.js +++ b/src/features/listen/summary/repositories/index.js @@ -1,6 +1,6 @@ const sqliteRepository = require('./sqlite.repository'); const firebaseRepository = require('./firebase.repository'); -const authService = require('../../../../common/services/authService'); +const authService = require('../../../common/services/authService'); function getBaseRepository() { const user = authService.getCurrentUser(); diff --git a/src/features/listen/summary/repositories/sqlite.repository.js b/src/features/listen/summary/repositories/sqlite.repository.js index 1e319cb..eed4bfa 100644 --- a/src/features/listen/summary/repositories/sqlite.repository.js +++ b/src/features/listen/summary/repositories/sqlite.repository.js @@ -1,4 +1,4 @@ -const sqliteClient = require('../../../../common/services/sqliteClient'); +const sqliteClient = require('../../../common/services/sqliteClient'); function saveSummary({ uid, sessionId, tldr, text, bullet_json, action_json, model = 'unknown' }) { // uid is ignored in the SQLite implementation diff --git a/src/features/listen/summary/summaryService.js b/src/features/listen/summary/summaryService.js index 8f309d5..518d39d 100644 --- a/src/features/listen/summary/summaryService.js +++ b/src/features/listen/summary/summaryService.js @@ -1,8 +1,7 @@ const { BrowserWindow } = require('electron'); -const { getSystemPrompt } = require('../../../common/prompts/promptBuilder.js'); -const { createLLM } = require('../../../common/ai/factory'); -const authService = require('../../../common/services/authService'); -const sessionRepository = require('../../../common/repositories/session'); +const { getSystemPrompt } = require('../../common/prompts/promptBuilder.js'); +const { createLLM } = require('../../common/ai/factory'); +const sessionRepository = require('../../common/repositories/session'); const summaryRepository = require('./repositories'); const { getStoredApiKey, getStoredProvider, getCurrentModelInfo } = require('../../../window/windowManager.js'); diff --git a/src/features/settings/repositories/firebase.repository.js b/src/features/settings/repositories/firebase.repository.js index e007398..50ac7d8 100644 --- a/src/features/settings/repositories/firebase.repository.js +++ b/src/features/settings/repositories/firebase.repository.js @@ -1,7 +1,7 @@ const { collection, doc, addDoc, getDoc, getDocs, updateDoc, deleteDoc, query, where, orderBy } = require('firebase/firestore'); -const { getFirestoreInstance } = require('../../../common/services/firebaseClient'); -const { createEncryptedConverter } = require('../../../common/repositories/firestoreConverter'); -const encryptionService = require('../../../common/services/encryptionService'); +const { getFirestoreInstance } = require('../../common/services/firebaseClient'); +const { createEncryptedConverter } = require('../../common/repositories/firestoreConverter'); +const encryptionService = require('../../common/services/encryptionService'); const userPresetConverter = createEncryptedConverter(['prompt', 'title']); diff --git a/src/features/settings/repositories/index.js b/src/features/settings/repositories/index.js index bca7a9b..cb023d0 100644 --- a/src/features/settings/repositories/index.js +++ b/src/features/settings/repositories/index.js @@ -1,6 +1,6 @@ const sqliteRepository = require('./sqlite.repository'); const firebaseRepository = require('./firebase.repository'); -const authService = require('../../../common/services/authService'); +const authService = require('../../common/services/authService'); function getBaseRepository() { const user = authService.getCurrentUser(); diff --git a/src/features/settings/repositories/sqlite.repository.js b/src/features/settings/repositories/sqlite.repository.js index 86769d9..a1f76b0 100644 --- a/src/features/settings/repositories/sqlite.repository.js +++ b/src/features/settings/repositories/sqlite.repository.js @@ -1,4 +1,4 @@ -const sqliteClient = require('../../../common/services/sqliteClient'); +const sqliteClient = require('../../common/services/sqliteClient'); function getPresets(uid) { const db = sqliteClient.getDb(); diff --git a/src/features/settings/settingsService.js b/src/features/settings/settingsService.js index 94fa262..f36c385 100644 --- a/src/features/settings/settingsService.js +++ b/src/features/settings/settingsService.js @@ -1,6 +1,6 @@ const { ipcMain, BrowserWindow } = require('electron'); const Store = require('electron-store'); -const authService = require('../../common/services/authService'); +const authService = require('../common/services/authService'); const settingsRepository = require('./repositories'); const { getStoredApiKey, getStoredProvider, windowPool } = require('../../window/windowManager'); diff --git a/src/index.js b/src/index.js index 3f8f374..4cdc439 100644 --- a/src/index.js +++ b/src/index.js @@ -14,9 +14,9 @@ if (require('electron-squirrel-startup')) { const { app, BrowserWindow, shell, ipcMain, dialog, desktopCapturer, session } = require('electron'); const { createWindows } = require('./window/windowManager.js'); const ListenService = require('./features/listen/listenService'); -const { initializeFirebase } = require('./common/services/firebaseClient'); -const databaseInitializer = require('./common/services/databaseInitializer'); -const authService = require('./common/services/authService'); +const { initializeFirebase } = require('./features/common/services/firebaseClient'); +const databaseInitializer = require('./features/common/services/databaseInitializer'); +const authService = require('./features/common/services/authService'); const path = require('node:path'); const express = require('express'); const fetch = require('node-fetch'); @@ -24,9 +24,9 @@ const { autoUpdater } = require('electron-updater'); const { EventEmitter } = require('events'); const askService = require('./features/ask/askService'); const settingsService = require('./features/settings/settingsService'); -const sessionRepository = require('./common/repositories/session'); -const ModelStateService = require('./common/services/modelStateService'); -const sqliteClient = require('./common/services/sqliteClient'); +const sessionRepository = require('./features/common/repositories/session'); +const ModelStateService = require('./features/common/services/modelStateService'); +const sqliteClient = require('./features/common/services/sqliteClient'); const featureBridge = require('./bridge/featureBridge'); // Global variables @@ -44,8 +44,8 @@ global.modelStateService = modelStateService; //////// after_modelStateService //////// // Import and initialize OllamaService -const ollamaService = require('./common/services/ollamaService'); -const ollamaModelRepository = require('./common/repositories/ollamaModel'); +const ollamaService = require('./features/common/services/ollamaService'); +const ollamaModelRepository = require('./features/common/repositories/ollamaModel'); // Native deep link handling - cross-platform compatible let pendingDeepLinkUrl = null; @@ -331,7 +331,7 @@ app.on('activate', () => { }); function setupWhisperIpcHandlers() { - const { WhisperService } = require('./common/services/whisperService'); + const { WhisperService } = require('./features/common/services/whisperService'); const whisperService = new WhisperService(); // Forward download progress events to renderer @@ -395,8 +395,8 @@ function setupWhisperIpcHandlers() { } function setupGeneralIpcHandlers() { - const userRepository = require('./common/repositories/user'); - const presetRepository = require('./common/repositories/preset'); + const userRepository = require('./features/common/repositories/user'); + const presetRepository = require('./features/common/repositories/preset'); ipcMain.handle('get-user-presets', () => { // The adapter injects the UID. @@ -627,12 +627,12 @@ function setupOllamaIpcHandlers() { } function setupWebDataHandlers() { - const sessionRepository = require('./common/repositories/session'); + const sessionRepository = require('./features/common/repositories/session'); const sttRepository = require('./features/listen/stt/repositories'); const summaryRepository = require('./features/listen/summary/repositories'); const askRepository = require('./features/ask/repositories'); - const userRepository = require('./common/repositories/user'); - const presetRepository = require('./common/repositories/preset'); + const userRepository = require('./features/common/repositories/user'); + const presetRepository = require('./features/common/repositories/preset'); const handleRequest = async (channel, responseChannel, payload) => { let result; @@ -808,7 +808,7 @@ async function handleCustomUrl(url) { } async function handleFirebaseAuthCallback(params) { - const userRepository = require('./common/repositories/user'); + const userRepository = require('./features/common/repositories/user'); const { token: idToken } = params; if (!idToken) { diff --git a/src/ui/app/ApiKeyHeader.js b/src/ui/app/ApiKeyHeader.js index 276fa85..a0ed1fa 100644 --- a/src/ui/app/ApiKeyHeader.js +++ b/src/ui/app/ApiKeyHeader.js @@ -1,5 +1,5 @@ import { html, css, LitElement } from "../assets/lit-core-2.7.4.min.js" -import { getOllamaProgressTracker } from "../common/services/localProgressTracker.js" +import { getOllamaProgressTracker } from "../../features/common/services/localProgressTracker.js" export class ApiKeyHeader extends LitElement { //////// after_modelStateService //////// diff --git a/src/ui/app/PickleGlassApp.js b/src/ui/app/PickleGlassApp.js index d52b03a..c1a7f72 100644 --- a/src/ui/app/PickleGlassApp.js +++ b/src/ui/app/PickleGlassApp.js @@ -1,8 +1,8 @@ import { html, css, LitElement } from '../assets/lit-core-2.7.4.min.js'; import { SettingsView } from '../settings/SettingsView.js'; import { ListenView } from '../listen/ListenView.js'; -import { AskView } from '../../features/ask/AskView.js'; -import { ShortcutSettingsView } from '../../features/settings/ShortCutSettingsView.js'; +import { AskView } from '../ask/AskView.js'; +import { ShortcutSettingsView } from '../settings/ShortCutSettingsView.js'; import '../listen/audioCore/renderer.js'; diff --git a/src/ui/settings/SettingsView.js b/src/ui/settings/SettingsView.js index b2ee751..4eb43d1 100644 --- a/src/ui/settings/SettingsView.js +++ b/src/ui/settings/SettingsView.js @@ -1,5 +1,5 @@ import { html, css, LitElement } from '../assets/lit-core-2.7.4.min.js'; -import { getOllamaProgressTracker } from '../../common/services/localProgressTracker.js'; +import { getOllamaProgressTracker } from '../../features/common/services/localProgressTracker.js'; export class SettingsView extends LitElement { static styles = css` diff --git a/src/window/windowManager.js b/src/window/windowManager.js index 57f2eca..15f6266 100644 --- a/src/window/windowManager.js +++ b/src/window/windowManager.js @@ -17,10 +17,8 @@ try { console.warn('[WindowManager] Screenshot functionality will work with reduced image processing capabilities'); sharp = null; } -const authService = require('../common/services/authService'); -const systemSettingsRepository = require('../common/repositories/systemSettings'); -const userRepository = require('../common/repositories/user'); -const fetch = require('node-fetch'); +const authService = require('../features/common/services/authService'); +const systemSettingsRepository = require('../features/common/repositories/systemSettings'); const Store = require('electron-store'); const shortCutStore = new Store({ name: 'user-preferences', @@ -253,11 +251,11 @@ function createFeatureWindows(header, namesToCreate) { } const listenLoadOptions = { query: { view: 'listen' } }; if (!shouldUseLiquidGlass) { - listen.loadFile(path.join(__dirname, '../app/content.html'), listenLoadOptions); + listen.loadFile(path.join(__dirname, '../ui/app/content.html'), listenLoadOptions); } else { listenLoadOptions.query.glass = 'true'; - listen.loadFile(path.join(__dirname, '../app/content.html'), listenLoadOptions); + listen.loadFile(path.join(__dirname, '../ui/app/content.html'), listenLoadOptions); listen.webContents.once('did-finish-load', () => { const viewId = liquidGlass.addView(listen.getNativeWindowHandle()); if (viewId !== -1) { @@ -284,11 +282,11 @@ function createFeatureWindows(header, namesToCreate) { } const askLoadOptions = { query: { view: 'ask' } }; if (!shouldUseLiquidGlass) { - ask.loadFile(path.join(__dirname, '../app/content.html'), askLoadOptions); + ask.loadFile(path.join(__dirname, '../ui/app/content.html'), askLoadOptions); } else { askLoadOptions.query.glass = 'true'; - ask.loadFile(path.join(__dirname, '../app/content.html'), askLoadOptions); + ask.loadFile(path.join(__dirname, '../ui/app/content.html'), askLoadOptions); ask.webContents.once('did-finish-load', () => { const viewId = liquidGlass.addView(ask.getNativeWindowHandle()); if (viewId !== -1) { @@ -319,12 +317,12 @@ function createFeatureWindows(header, namesToCreate) { } const settingsLoadOptions = { query: { view: 'settings' } }; if (!shouldUseLiquidGlass) { - settings.loadFile(path.join(__dirname,'../app/content.html'), settingsLoadOptions) + settings.loadFile(path.join(__dirname,'../ui/app/content.html'), settingsLoadOptions) .catch(console.error); } else { settingsLoadOptions.query.glass = 'true'; - settings.loadFile(path.join(__dirname,'../app/content.html'), settingsLoadOptions) + settings.loadFile(path.join(__dirname,'../ui/app/content.html'), settingsLoadOptions) .catch(console.error); settings.webContents.once('did-finish-load', () => { const viewId = liquidGlass.addView(settings.getNativeWindowHandle()); @@ -383,10 +381,10 @@ function createFeatureWindows(header, namesToCreate) { const loadOptions = { query: { view: 'shortcut-settings' } }; if (!shouldUseLiquidGlass) { - shortcutEditor.loadFile(path.join(__dirname, '../app/content.html'), loadOptions); + shortcutEditor.loadFile(path.join(__dirname, '../ui/app/content.html'), loadOptions); } else { loadOptions.query.glass = 'true'; - shortcutEditor.loadFile(path.join(__dirname, '../app/content.html'), loadOptions); + shortcutEditor.loadFile(path.join(__dirname, '../ui/app/content.html'), loadOptions); shortcutEditor.webContents.once('did-finish-load', () => { const viewId = liquidGlass.addView(shortcutEditor.getNativeWindowHandle()); if (viewId !== -1) { @@ -534,11 +532,11 @@ function createWindows() { } const headerLoadOptions = {}; if (!shouldUseLiquidGlass) { - header.loadFile(path.join(__dirname, '../app/header.html'), headerLoadOptions); + header.loadFile(path.join(__dirname, '../ui/app/header.html'), headerLoadOptions); } else { headerLoadOptions.query = { glass: 'true' }; - header.loadFile(path.join(__dirname, '../app/header.html'), headerLoadOptions); + header.loadFile(path.join(__dirname, '../ui/app/header.html'), headerLoadOptions); header.webContents.once('did-finish-load', () => { const viewId = liquidGlass.addView(header.getNativeWindowHandle()); if (viewId !== -1) { @@ -564,7 +562,6 @@ function createWindows() { header.setContentProtection(isContentProtectionOn); header.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true }); - // header.loadFile(path.join(__dirname, '../app/header.html')); // Open DevTools in development if (!app.isPackaged) {