diff --git a/out/main/index.js b/out/main/index.js index c70a40d..f6d3e08 100644 --- a/out/main/index.js +++ b/out/main/index.js @@ -273,7 +273,7 @@ class NotesAPI { const preloadPath = join(__dirname, "../preload/index.mjs"); const rendererPath = join(__dirname, "../renderer/index.html"); function createWindow() { - const mainWindow2 = new BrowserWindow({ + const mainWindow = new BrowserWindow({ width: 354, height: 549, show: false, @@ -283,17 +283,17 @@ function createWindow() { sandbox: false } }); - mainWindow2.on("ready-to-show", () => { - mainWindow2.show(); + mainWindow.on("ready-to-show", () => { + mainWindow.show(); }); - mainWindow2.webContents.setWindowOpenHandler((details) => { + mainWindow.webContents.setWindowOpenHandler((details) => { shell.openExternal(details.url); return { action: "deny" }; }); if (is.dev && process.env["ELECTRON_RENDERER_URL"]) { - mainWindow2.loadURL(process.env["ELECTRON_RENDERER_URL"]); + mainWindow.loadURL(process.env["ELECTRON_RENDERER_URL"]); } else { - mainWindow2.loadFile(rendererPath); + mainWindow.loadFile(rendererPath); } } function createNoteWindow(noteId) { @@ -310,11 +310,11 @@ function createNoteWindow(noteId) { }); if (is.dev && process.env["ELECTRON_RENDERER_URL"]) { noteWindow.loadURL( - `${process.env["ELECTRON_RENDERER_URL"]}/note/${noteId}` + `${process.env["ELECTRON_RENDERER_URL"]}/#/note/${noteId}` ); } else { - mainWindow.loadFile(rendererPath, { - path: `/notes/${noteId}` + noteWindow.loadFile(rendererPath, { + hash: `/note/${noteId}` }); } } diff --git a/out/renderer/assets/index-GKstRZpo.js b/out/renderer/assets/index-DdUrngdf.js similarity index 99% rename from out/renderer/assets/index-GKstRZpo.js rename to out/renderer/assets/index-DdUrngdf.js index f8853af..307ad98 100644 --- a/out/renderer/assets/index-GKstRZpo.js +++ b/out/renderer/assets/index-DdUrngdf.js @@ -9253,6 +9253,11 @@ function createWebHistory(base2) { }); return routerHistory; } +function createWebHashHistory(base2) { + base2 = location.host ? base2 || location.pathname + location.search : ""; + if (!base2.includes("#")) base2 += "#"; + return createWebHistory(base2); +} let TokenType = /* @__PURE__ */ (function(TokenType2) { TokenType2[TokenType2["Static"] = 0] = "Static"; TokenType2[TokenType2["Param"] = 1] = "Param"; @@ -10704,7 +10709,6 @@ const _sfc_main$9 = { createBaseVNode("div", _hoisted_1$8, [ createVNode(_sfc_main$b, { class: "menu-item", - category: "Special Delivery", onNoteOpened: unref(closeMenu) }, null, 8, ["onNoteOpened"]), createVNode(_component_router_link, { @@ -87785,7 +87789,7 @@ const routes = [ { path: "/instructions", name: "instructions", component: Instructions } ]; const router = createRouter({ - history: createWebHistory(), + history: createWebHashHistory(), routes }); const app = createApp(_sfc_main$7); diff --git a/out/renderer/index.html b/out/renderer/index.html index 792b177..57dbc58 100644 --- a/out/renderer/index.html +++ b/out/renderer/index.html @@ -1,18 +1,18 @@ - - - Electron - - - - - + + + Electron + + + + + - -
- + +
+ diff --git a/src/main/index.js b/src/main/index.js index a63ad37..0ee9605 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -56,11 +56,11 @@ function createNoteWindow(noteId) { if (is.dev && process.env['ELECTRON_RENDERER_URL']) { noteWindow.loadURL( - `${process.env['ELECTRON_RENDERER_URL']}/note/${noteId}`, + `${process.env['ELECTRON_RENDERER_URL']}/#/note/${noteId}`, ) } else { - mainWindow.loadFile(rendererPath, { - path: `/notes/${noteId}`, + noteWindow.loadFile(rendererPath, { + hash: `/note/${noteId}`, }) } } diff --git a/src/renderer/src/plugins/router.js b/src/renderer/src/plugins/router.js index 98f1839..30ea498 100644 --- a/src/renderer/src/plugins/router.js +++ b/src/renderer/src/plugins/router.js @@ -1,4 +1,4 @@ -import { createRouter, createWebHistory } from 'vue-router' +import { createRouter, createWebHashHistory } from 'vue-router' import Directory from '@/views/Directory.vue' import Editor from '@/views/Editor.vue' @@ -15,6 +15,6 @@ const routes = [ ] export const router = createRouter({ - history: createWebHistory(), + history: createWebHashHistory(), routes, })