From 4811c4535af79e2261faf6735ff533e298409789 Mon Sep 17 00:00:00 2001 From: lenafx Date: Fri, 19 Dec 2025 19:49:07 +0100 Subject: [PATCH] removed electron stuff from docker ver --- desktop/server.js | 33 ---- docker/main.js | 41 ----- docker/preload.js | 10 -- docker/server.js | 28 ++-- docker/src/scripts/titlebar.js | 18 --- docker/tsconfig.json | 2 +- docker/views/anime/anime.html | 18 --- docker/views/anime/animes.html | 13 -- docker/views/anime/watch.html | 13 -- docker/views/books/book.html | 12 -- docker/views/books/books.html | 12 -- docker/views/books/read.html | 12 -- docker/views/css/components/titlebar.css | 195 ----------------------- docker/views/gallery/gallery.html | 12 -- docker/views/gallery/image.html | 12 -- docker/views/list.html | 12 -- docker/views/marketplace.html | 12 -- docker/views/schedule.html | 13 -- docker/views/users.html | 18 --- 19 files changed, 15 insertions(+), 471 deletions(-) delete mode 100644 docker/main.js delete mode 100644 docker/preload.js delete mode 100644 docker/src/scripts/titlebar.js delete mode 100644 docker/views/css/components/titlebar.css diff --git a/desktop/server.js b/desktop/server.js index 9f54151..e97d2d8 100644 --- a/desktop/server.js +++ b/desktop/server.js @@ -30,39 +30,6 @@ const userRoutes = require("./electron/api/user/user.routes"); const listRoutes = require("./electron/api/list/list.routes"); const anilistRoute = require("./electron/api/anilist/anilist"); -const fs = require("fs"); - -try { - console.log("--- DEBUGGING PATHS ---"); - - // 1. Check where we are currently running - console.log("Current Directory:", __dirname); - - // 2. Check if 'electron' exists - const electronPath = path.join(__dirname, "electron"); - if (fs.existsSync(electronPath)) { - console.log("✅ electron folder found."); - } else { - console.log("❌ electron folder missing!"); - } - - // 3. Check 'electron/api/rpc' specifically - const rpcPath = path.join(__dirname, "electron", "api", "rpc"); - if (fs.existsSync(rpcPath)) { - console.log("✅ electron/api/rpc folder found. Contents:"); - // LIST EVERYTHING INSIDE THE RPC FOLDER - console.log(fs.readdirSync(rpcPath)); - } else { - console.log(`❌ electron/api/rpc folder NOT found at: ${rpcPath}`); - // Check parent folder to see what IS there - const parent = path.join(__dirname, "electron", "api"); - console.log("Contents of electron/api:", fs.readdirSync(parent)); - } - console.log("-----------------------"); -} catch (e) { - console.log("Debug Error:", e); -} - fastify.addHook("preHandler", async (request) => { const auth = request.headers.authorization; if (!auth) return; diff --git a/docker/main.js b/docker/main.js deleted file mode 100644 index 33c0460..0000000 --- a/docker/main.js +++ /dev/null @@ -1,41 +0,0 @@ -const { app, BrowserWindow, ipcMain } = require('electron'); -const { fork } = require('child_process'); -const path = require('path'); - -let win; -let backend; - -function startBackend() { - backend = fork(path.join(__dirname, 'server.js')); -} - -function createWindow() { - win = new BrowserWindow({ - width: 1200, - height: 800, - frame: false, - titleBarStyle: "hidden", - webPreferences: { - preload: path.join(__dirname, "preload.js"), - nodeIntegration: false, - contextIsolation: true - } - }); - - win.setMenu(null); - win.loadURL('http://localhost:54322'); -} - -ipcMain.on("win:minimize", () => win.minimize()); -ipcMain.on("win:maximize", () => win.maximize()); -ipcMain.on("win:close", () => win.close()); - -app.whenReady().then(() => { - startBackend(); - createWindow(); -}); - -app.on('window-all-closed', () => { - if (backend) backend.kill(); - app.quit(); -}); diff --git a/docker/preload.js b/docker/preload.js deleted file mode 100644 index 47cc6dc..0000000 --- a/docker/preload.js +++ /dev/null @@ -1,10 +0,0 @@ -const { contextBridge, ipcRenderer } = require("electron"); - -contextBridge.exposeInMainWorld("electronAPI", { - isElectron: true, - win: { - minimize: () => ipcRenderer.send("win:minimize"), - maximize: () => ipcRenderer.send("win:maximize"), - close: () => ipcRenderer.send("win:close") - } -}); diff --git a/docker/server.js b/docker/server.js index f6b36c0..9a00c37 100644 --- a/docker/server.js +++ b/docker/server.js @@ -5,24 +5,24 @@ const fastify = require("fastify")({ const path = require("path"); const jwt = require("jsonwebtoken"); const cron = require("node-cron"); -const { initHeadless } = require("./electron/shared/headless"); -const { initDatabase } = require("./electron/shared/database"); -const { loadExtensions } = require("./electron/shared/extensions"); -const {refreshTrendingAnime, refreshTopAiringAnime} = require("./electron/api/anime/anime.service"); -const {refreshPopularBooks, refreshTrendingBooks} = require("./electron/api/books/books.service"); +const { initHeadless } = require("./dist/shared/headless"); +const { initDatabase } = require("./dist/shared/database"); +const { loadExtensions } = require("./dist/shared/extensions"); +const {refreshTrendingAnime, refreshTopAiringAnime} = require("./dist/api/anime/anime.service"); +const {refreshPopularBooks, refreshTrendingBooks} = require("./dist/api/books/books.service"); const dotenv = require("dotenv"); dotenv.config(); -const viewsRoutes = require("./electron/views/views.routes"); -const animeRoutes = require("./electron/api/anime/anime.routes"); -const booksRoutes = require("./electron/api/books/books.routes"); -const proxyRoutes = require("./electron/api/proxy/proxy.routes"); -const extensionsRoutes = require("./electron/api/extensions/extensions.routes"); -const galleryRoutes = require("./electron/api/gallery/gallery.routes"); -const userRoutes = require("./electron/api/user/user.routes"); -const listRoutes = require("./electron/api/list/list.routes"); -const anilistRoute = require("./electron/api/anilist/anilist"); +const viewsRoutes = require("./dist/views/views.routes"); +const animeRoutes = require("./dist/api/anime/anime.routes"); +const booksRoutes = require("./dist/api/books/books.routes"); +const proxyRoutes = require("./dist/api/proxy/proxy.routes"); +const extensionsRoutes = require("./dist/api/extensions/extensions.routes"); +const galleryRoutes = require("./dist/api/gallery/gallery.routes"); +const userRoutes = require("./dist/api/user/user.routes"); +const listRoutes = require("./dist/api/list/list.routes"); +const anilistRoute = require("./dist/api/anilist/anilist"); fastify.addHook("preHandler", async (request) => { const auth = request.headers.authorization; diff --git a/docker/src/scripts/titlebar.js b/docker/src/scripts/titlebar.js deleted file mode 100644 index d451bba..0000000 --- a/docker/src/scripts/titlebar.js +++ /dev/null @@ -1,18 +0,0 @@ -if (window.electronAPI?.isElectron) { - document.documentElement.classList.add("electron"); -} - -document.addEventListener("DOMContentLoaded", () => { - document.documentElement.style.visibility = "visible"; - if (!window.electronAPI?.isElectron) return; - document.body.classList.add("electron"); - - const titlebar = document.getElementById("titlebar"); - if (!titlebar) return; - - titlebar.style.display = "flex"; - - titlebar.querySelector(".min").onclick = () => window.electronAPI.win.minimize(); - titlebar.querySelector(".max").onclick = () => window.electronAPI.win.maximize(); - titlebar.querySelector(".close").onclick = () => window.electronAPI.win.close(); -}); \ No newline at end of file diff --git a/docker/tsconfig.json b/docker/tsconfig.json index d1bc8c1..30cb000 100644 --- a/docker/tsconfig.json +++ b/docker/tsconfig.json @@ -5,7 +5,7 @@ "allowJs": true, "checkJs": false, "strict": true, - "outDir": "electron", + "outDir": "dist", "rootDir": "src", "esModuleInterop": true, "skipLibCheck": true diff --git a/docker/views/anime/anime.html b/docker/views/anime/anime.html index 6c7b982..4299dfc 100644 --- a/docker/views/anime/anime.html +++ b/docker/views/anime/anime.html @@ -17,26 +17,8 @@ rel="stylesheet" href="/views/css/components/updateNotifier.css" /> - - -
-
- - WaifuBoard -
-
- - - -
-
-