Replaced mock data with live database data; minoe aesthetic changes
This commit is contained in:
@@ -0,0 +1,92 @@
|
||||
import { app, BrowserWindow, shell, ipcMain } from 'electron'
|
||||
import { fileURLToPath } from 'node:url'
|
||||
import path from 'node:path'
|
||||
import { fetchEntries } from './pocketbase.js'
|
||||
|
||||
const __dirname = path.dirname(fileURLToPath(import.meta.url))
|
||||
|
||||
// ─── Paths ──────────────────────────────────────────────────────────────────
|
||||
// Compiled main lives in dist-electron/main/ — go up two levels to reach dist/
|
||||
const RENDERER_DIST = path.join(__dirname, '../../dist')
|
||||
// Preload is compiled to dist-electron/preload/index.cjs (explicitly CJS)
|
||||
const PRELOAD_PATH = path.join(__dirname, '../preload/index.cjs')
|
||||
|
||||
// ─── Dev server URL ─────────────────────────────────────────────────────────
|
||||
// vite-plugin-electron sets this env var when running in development mode.
|
||||
const VITE_DEV_SERVER_URL = process.env.VITE_DEV_SERVER_URL
|
||||
|
||||
// ─── Window reference ────────────────────────────────────────────────────────
|
||||
let mainWindow
|
||||
|
||||
function createWindow() {
|
||||
mainWindow = new BrowserWindow({
|
||||
width: 1280,
|
||||
height: 800,
|
||||
minWidth: 900,
|
||||
minHeight: 600,
|
||||
title: 'CTM Concierge',
|
||||
show: false, // show after ready-to-show to prevent visual flash
|
||||
backgroundColor: '#0f1117',
|
||||
webPreferences: {
|
||||
// ── Security defaults ──────────────────────────────────────────────
|
||||
contextIsolation: true, // Isolates renderer from Electron internals
|
||||
nodeIntegration: false, // Renderer cannot access Node.js APIs directly
|
||||
sandbox: false, // Must be false so preload can use require('electron') for contextBridge
|
||||
webSecurity: true,
|
||||
// ── Preload ────────────────────────────────────────────────────────
|
||||
preload: PRELOAD_PATH,
|
||||
},
|
||||
})
|
||||
|
||||
// Gracefully show window once the DOM is ready to avoid white flash
|
||||
mainWindow.once('ready-to-show', () => {
|
||||
mainWindow.show()
|
||||
})
|
||||
|
||||
// Open external links in the system browser, not Electron
|
||||
mainWindow.webContents.setWindowOpenHandler(({ url }) => {
|
||||
if (url.startsWith('https:') || url.startsWith('http:')) {
|
||||
shell.openExternal(url)
|
||||
}
|
||||
return { action: 'deny' }
|
||||
})
|
||||
|
||||
// ── Load the app ─────────────────────────────────────────────────────────
|
||||
if (VITE_DEV_SERVER_URL) {
|
||||
// Development: load from Vite HMR dev server
|
||||
mainWindow.loadURL(VITE_DEV_SERVER_URL)
|
||||
mainWindow.webContents.openDevTools()
|
||||
} else {
|
||||
// Production: load compiled static files
|
||||
mainWindow.loadFile(path.join(RENDERER_DIST, 'index.html'))
|
||||
}
|
||||
}
|
||||
|
||||
// ─── App lifecycle ───────────────────────────────────────────────────────────
|
||||
app.whenReady().then(() => {
|
||||
createWindow()
|
||||
|
||||
// macOS: re-create window when dock icon is clicked and no windows are open
|
||||
app.on('activate', () => {
|
||||
if (BrowserWindow.getAllWindows().length === 0) {
|
||||
createWindow()
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
// Quit when all windows are closed (except on macOS)
|
||||
app.on('window-all-closed', () => {
|
||||
if (process.platform !== 'darwin') {
|
||||
app.quit()
|
||||
mainWindow = null
|
||||
}
|
||||
})
|
||||
|
||||
// ─── IPC Handlers ────────────────────────────────────────────────────────────
|
||||
// Register main-process IPC handlers here.
|
||||
// Example: ipcMain.handle('channel-name', async (event, ...args) => { ... })
|
||||
|
||||
ipcMain.handle('app:get-version', () => app.getVersion())
|
||||
ipcMain.handle('pb:fetch-entries', async () => {
|
||||
return await fetchEntries()
|
||||
})
|
||||
@@ -0,0 +1,4 @@
|
||||
/** Internal admin app — PocketBase connection (bundled with the desktop build). */
|
||||
export const POCKETBASE_URL = 'https://ctm-pocketbase.wirediv.dev'
|
||||
export const PB_ADMIN_EMAIL = 'info@wirediv.com'
|
||||
export const PB_ADMIN_PASSWORD = 'Supernova99!!__'
|
||||
@@ -0,0 +1,60 @@
|
||||
import PocketBase from 'pocketbase'
|
||||
import { POCKETBASE_URL, PB_ADMIN_EMAIL, PB_ADMIN_PASSWORD } from './pocketbase-config.js'
|
||||
|
||||
const COLLECTION = 'travellers'
|
||||
|
||||
let pb = null
|
||||
let authPromise = null
|
||||
|
||||
function getClient() {
|
||||
if (!pb) {
|
||||
pb = new PocketBase(POCKETBASE_URL)
|
||||
// Main process may receive overlapping IPC calls (e.g. React Strict Mode).
|
||||
// Default auto-cancel would abort duplicate in-flight PocketBase requests.
|
||||
pb.autoCancellation(false)
|
||||
}
|
||||
return pb
|
||||
}
|
||||
|
||||
function parseEntry(r) {
|
||||
return {
|
||||
id: r.emr_id,
|
||||
name: r.name ?? '',
|
||||
location: r.location ?? '',
|
||||
countryISO: r.country_iso ?? '',
|
||||
countriesISO: r.countries_iso ?? [],
|
||||
status: r.status ?? '',
|
||||
departure: r.departure ?? '',
|
||||
arrival: r.arrival ?? '',
|
||||
created: r.created,
|
||||
updated: r.updated,
|
||||
}
|
||||
}
|
||||
|
||||
export async function ensureAuth() {
|
||||
const client = getClient()
|
||||
if (client.authStore.isValid) return
|
||||
|
||||
if (authPromise) {
|
||||
await authPromise
|
||||
return
|
||||
}
|
||||
|
||||
// PocketBase v0.23+ removed /api/admins/*; superusers authenticate as a collection.
|
||||
authPromise = client
|
||||
.collection('_superusers')
|
||||
.authWithPassword(PB_ADMIN_EMAIL, PB_ADMIN_PASSWORD)
|
||||
try {
|
||||
await authPromise
|
||||
} catch (err) {
|
||||
authPromise = null
|
||||
throw err
|
||||
}
|
||||
}
|
||||
|
||||
export async function fetchEntries() {
|
||||
await ensureAuth()
|
||||
const list = await getClient().collection(COLLECTION).getFullList({ sort: '-created' })
|
||||
return list.map(parseEntry)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user