From dd1923d9f1d438e63100e9a37385cdfef354d92f Mon Sep 17 00:00:00 2001
From: Jayden Pyles <jpylesbusiness@gmail.com>
Date: Fri, 5 Jul 2024 15:42:57 -0500
Subject: [PATCH] fix: project structure

---
 Dockerfile         | 10 +++++-----
 api/backend/app.py |  2 +-
 docker-compose.yml |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d078d52..3033eb4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ RUN python -m pip --no-cache-dir install pdm
 RUN pdm config python.use_venv false
 
 COPY pyproject.toml pdm.lock /project/app/
-COPY ./api/backend/ /project/app/backend
+COPY ./api/ /project/app/api
 
 WORKDIR /project/app
 RUN pdm install
@@ -34,12 +34,12 @@ FROM python:3.10-slim
 ENV PYTHONPATH=/project/pkgs
 COPY --from=pybuilder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
 COPY --from=pybuilder /usr/local/bin /usr/local/bin
-COPY --from=pybuilder /project/app /project/api
-COPY --from=jsbuilder /app/dist /project/api/dist
+COPY --from=pybuilder /project/app /project/
+COPY --from=jsbuilder /app/dist /project/dist
 
 EXPOSE 8000
 
-WORKDIR /project/api
+WORKDIR /project/
 
-CMD [ "pdm", "run", "python", "-m", "uvicorn", "backend.app:app", "--reload", "--host", "0.0.0.0", "--port", "8000"]
+CMD [ "pdm", "run", "python", "-m", "uvicorn", "api.backend.app:app", "--reload", "--host", "0.0.0.0", "--port", "8000"]
 
diff --git a/api/backend/app.py b/api/backend/app.py
index f76cd8f..a44e2d2 100644
--- a/api/backend/app.py
+++ b/api/backend/app.py
@@ -29,4 +29,4 @@ def read_root():
 
 @app.get("/api/endpoint")
 async def test_endpoint():
-    return {"hello": "world"}
+    return "Hello World!"
diff --git a/docker-compose.yml b/docker-compose.yml
index 9f360cb..e11d36a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,15 +19,15 @@ services:
       - "--providers.docker=true"
       - "--entrypoints.web.address=:80"
       - "--entrypoints.websecure.address=:443"
-      - "--providers.file.filename=/etc/traefik/dynamic_conf.yaml"
+      # - "--providers.file.filename=/etc/traefik/dynamic_conf.yaml"
     ports:
       - 80:80
       - 443:443
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "./dynamic_conf.yaml:/etc/traefik/dynamic_conf.yaml"
-      - "/etc/letsencrypt/live/domain/fullchain.pem:/etc/certs/ssl-cert.pem"
-      - "/etc/letsencrypt/live/domain/privkey.pem:/etc/certs/ssl-cert.key"
+      # - "./dynamic_conf.yaml:/etc/traefik/dynamic_conf.yaml"
+      # - "/etc/letsencrypt/live/domain/fullchain.pem:/etc/certs/ssl-cert.pem"
+      # - "/etc/letsencrypt/live/domain/privkey.pem:/etc/certs/ssl-cert.key"
     networks:
       - web
 networks: