From 607d496f2a4551abb5fb00a0b4f41b02f311c380 Mon Sep 17 00:00:00 2001 From: theoleuthardt Date: Mon, 24 Feb 2025 16:22:28 +0100 Subject: [PATCH] fix: all pages now use the right backend url + backend uses .env of root too --- backend/server.ts | 7 ++++++- frontend/next.config.ts | 2 +- frontend/src/app/bg-remover/page.tsx | 11 +++++++---- frontend/src/app/doc-converter/page.tsx | 2 +- frontend/src/app/password-generator/page.tsx | 2 +- frontend/src/app/qr-code-generator/page.tsx | 2 +- frontend/src/app/regex-tester/page.tsx | 2 +- frontend/src/app/rgb-to-hex/page.tsx | 2 +- frontend/src/app/tmz-converter/page.tsx | 2 +- frontend/src/app/video-to-audio/page.tsx | 2 +- frontend/src/app/word-counter/page.tsx | 2 +- 11 files changed, 22 insertions(+), 14 deletions(-) diff --git a/backend/server.ts b/backend/server.ts index bd56005..6259cb5 100644 --- a/backend/server.ts +++ b/backend/server.ts @@ -10,6 +10,10 @@ import { generateQRCode } from "./src/routes/generateqrcode.route"; import { wordCounter } from "./src/routes/wordcounter.route"; import { videoToAudio } from "./src/routes/videotoaudio.route"; import { removeBG } from "./src/routes/removebg.route"; +import dotenv from "dotenv"; +import path from "node:path"; + +dotenv.config({ path: path.resolve(__dirname, "../.env") }); const app = Fastify({ logger: true }); @@ -30,7 +34,8 @@ app.register(wordCounter); app.register(videoToAudio); app.register(removeBG); -const PORT = process.env.PORT || 4000; +console.log("Starting Fastify server..."); +const PORT = process.env.BACKEND_PORT; app.listen({ port: Number(PORT), host: "0.0.0.0" }, () => { console.log(`🚀Fastify is live on http://localhost:${PORT}`); }); diff --git a/frontend/next.config.ts b/frontend/next.config.ts index 3e1bc5e..79cebf3 100644 --- a/frontend/next.config.ts +++ b/frontend/next.config.ts @@ -6,7 +6,7 @@ dotenv.config({ path: "../.env" }); const nextConfig: NextConfig = { output: "standalone", env: { - backend_url: process.env.NEXT_PUBLIC_BACKEND_URL, + NEXT_PUBLIC_BACKEND_URL: process.env.NEXT_PUBLIC_BACKEND_URL, }, }; diff --git a/frontend/src/app/bg-remover/page.tsx b/frontend/src/app/bg-remover/page.tsx index 7ddf051..b47fe61 100644 --- a/frontend/src/app/bg-remover/page.tsx +++ b/frontend/src/app/bg-remover/page.tsx @@ -32,10 +32,13 @@ export default function BGRemover() { setLoading(true); try { - const response = await fetch(process.env.backend_url + "/api/remove-bg", { - method: "POST", - body: formData, - }); + const response = await fetch( + process.env.NEXT_PUBLIC_BACKEND_URL + "/api/remove-bg", + { + method: "POST", + body: formData, + }, + ); if (!response.ok) { console.error(`Error: ${response.statusText}`); diff --git a/frontend/src/app/doc-converter/page.tsx b/frontend/src/app/doc-converter/page.tsx index b0d003b..44fdc7e 100644 --- a/frontend/src/app/doc-converter/page.tsx +++ b/frontend/src/app/doc-converter/page.tsx @@ -57,7 +57,7 @@ export default function DocConverter() { try { const response = await fetch( - process.env.backend_url + "/api/libre-convert", + process.env.NEXT_PUBLIC_BACKEND_URL + "/api/libre-convert", { method: "POST", body: formData, diff --git a/frontend/src/app/password-generator/page.tsx b/frontend/src/app/password-generator/page.tsx index 138fba1..d9e1c23 100644 --- a/frontend/src/app/password-generator/page.tsx +++ b/frontend/src/app/password-generator/page.tsx @@ -24,7 +24,7 @@ export default function PasswordGenerator() { try { const response = await fetch( - process.env.backend_url + "/api/password-generate", + process.env.NEXT_PUBLIC_BACKEND_URL + "/api/password-generate", { method: "POST", headers: { diff --git a/frontend/src/app/qr-code-generator/page.tsx b/frontend/src/app/qr-code-generator/page.tsx index c179264..2e4d725 100644 --- a/frontend/src/app/qr-code-generator/page.tsx +++ b/frontend/src/app/qr-code-generator/page.tsx @@ -26,7 +26,7 @@ export default function QrCodeGenerator() { try { const response = await fetch( - process.env.backend_url + "/api/generate-qrcode", + process.env.NEXT_PUBLIC_BACKEND_URL + "/api/generate-qrcode", { method: "POST", headers: { diff --git a/frontend/src/app/regex-tester/page.tsx b/frontend/src/app/regex-tester/page.tsx index 91d33fa..cb7631c 100644 --- a/frontend/src/app/regex-tester/page.tsx +++ b/frontend/src/app/regex-tester/page.tsx @@ -17,7 +17,7 @@ export default function RegexTester() { try { const response = await fetch( - process.env.backend_url + "/api/regex-test", + process.env.NEXT_PUBLIC_BACKEND_URL + "/api/regex-test", { method: "POST", headers: { diff --git a/frontend/src/app/rgb-to-hex/page.tsx b/frontend/src/app/rgb-to-hex/page.tsx index aa1825d..9cda246 100644 --- a/frontend/src/app/rgb-to-hex/page.tsx +++ b/frontend/src/app/rgb-to-hex/page.tsx @@ -18,7 +18,7 @@ export default function RgbToHex() { try { const response = await fetch( - process.env.backend_url + "/api/color-convert", + process.env.NEXT_PUBLIC_BACKEND_URL + "/api/color-convert", { method: "POST", headers: { diff --git a/frontend/src/app/tmz-converter/page.tsx b/frontend/src/app/tmz-converter/page.tsx index 2b0fd00..e01fa0d 100644 --- a/frontend/src/app/tmz-converter/page.tsx +++ b/frontend/src/app/tmz-converter/page.tsx @@ -19,7 +19,7 @@ export default function TMZConverter() { try { const response = await fetch( - process.env.backend_url + "/api/tmz-convert", + process.env.NEXT_PUBLIC_BACKEND_URL + "/api/tmz-convert", { method: "POST", headers: { diff --git a/frontend/src/app/video-to-audio/page.tsx b/frontend/src/app/video-to-audio/page.tsx index 9a4439d..b1c0b9b 100644 --- a/frontend/src/app/video-to-audio/page.tsx +++ b/frontend/src/app/video-to-audio/page.tsx @@ -57,7 +57,7 @@ export default function DocConverter() { try { const response = await fetch( - process.env.backend_url + "/api/video-to-audio", + process.env.NEXT_PUBLIC_BACKEND_URL + "/api/video-to-audio", { method: "POST", body: formData, diff --git a/frontend/src/app/word-counter/page.tsx b/frontend/src/app/word-counter/page.tsx index 0434be1..d50b736 100644 --- a/frontend/src/app/word-counter/page.tsx +++ b/frontend/src/app/word-counter/page.tsx @@ -16,7 +16,7 @@ export default function WordCounter() { try { const response = await fetch( - process.env.backend_url + "/api/word-counter", + process.env.NEXT_PUBLIC_BACKEND_URL + "/api/word-counter", { method: "POST", headers: {