From 4f97dc33621516d9e667172b437cd6c671c15444 Mon Sep 17 00:00:00 2001
From: Slawomir Koszewski <slawek@koszewscy.waw.pl>
Date: Mon, 20 Apr 2026 07:21:56 +0200
Subject: [PATCH] refactor: update findAppRoot function and adjust Dockerfile
 paths for consistency

---
 app/Dockerfile                      |  6 +++---
 app/backend/src/server.ts           |  6 +++---
 app/backend/src/template-service.ts | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Dockerfile b/app/Dockerfile
index 98f291a..61fd09c 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -2,12 +2,12 @@ FROM node:24-trixie-slim AS build
 
 WORKDIR /app
 
-COPY app-new/backend/package*.json backend/
-COPY app-new/frontend/package*.json frontend/
+COPY backend/package*.json backend/
+COPY frontend/package*.json frontend/
 RUN cd backend && npm ci
 RUN cd frontend && npm ci
 
-COPY app-new .
+COPY . .
 
 RUN cd backend && npm run build
 RUN cd frontend && npm run build
diff --git a/app/backend/src/server.ts b/app/backend/src/server.ts
index 561b92a..ff0a469 100644
--- a/app/backend/src/server.ts
+++ b/app/backend/src/server.ts
@@ -6,7 +6,7 @@ import { z } from "zod";
 import { AzureImageService } from "./azure-service";
 import { TemplateService } from "./template-service";
 
-const findAppNewRoot = (): string => {
+const findAppRoot = (): string => {
   const candidates = [join(__dirname, "../../.."), join(__dirname, "../..")];
 
   for (const candidate of candidates) {
@@ -15,7 +15,7 @@ const findAppNewRoot = (): string => {
     }
   }
 
-  throw new Error("Unable to resolve app-new root");
+  throw new Error("Unable to resolve app root");
 };
 
 const queryLocation = z.object({ location: z.string().min(1) });
@@ -143,7 +143,7 @@ const makeApp = () => {
     res.status(500).json({ message });
   });
 
-  const frontendRoot = join(findAppNewRoot(), "dist/frontend");
+  const frontendRoot = join(findAppRoot(), "dist/frontend");
   if (existsSync(frontendRoot)) {
     app.use(express.static(frontendRoot));
     app.get(/^(?!\/api).*/, (_req, res) => {
diff --git a/app/backend/src/template-service.ts b/app/backend/src/template-service.ts
index 28434a4..f119c4d 100644
--- a/app/backend/src/template-service.ts
+++ b/app/backend/src/template-service.ts
@@ -3,7 +3,7 @@ import { join } from "node:path";
 import nunjucks from "nunjucks";
 import type { ImageSelection, UsageTemplate } from "./types";
 
-const findAppNewRoot = (): string => {
+const findAppRoot = (): string => {
   const candidates = [join(__dirname, "../../.."), join(__dirname, "../..")];
 
   for (const candidate of candidates) {
@@ -12,19 +12,19 @@ const findAppNewRoot = (): string => {
     }
   }
 
-  throw new Error("Unable to resolve app-new template root");
+  throw new Error("Unable to resolve app template root");
 };
 
 export class TemplateService {
-  private readonly appNewRoot = findAppNewRoot();
+  private readonly appRoot = findAppRoot();
 
-  private readonly env = nunjucks.configure(join(this.appNewRoot, "templates"), {
+  private readonly env = nunjucks.configure(join(this.appRoot, "templates"), {
     autoescape: false,
     noCache: true
   });
 
   private readonly templates: UsageTemplate[] = JSON.parse(
-    readFileSync(join(this.appNewRoot, "templates.json"), "utf8")
+    readFileSync(join(this.appRoot, "templates.json"), "utf8")
   ) as UsageTemplate[];
 
   public getTemplates(): UsageTemplate[] {