From ac0b34c1e172521979530aadbfa7593326685bdf Mon Sep 17 00:00:00 2001
From: Hayden Hargreaves <hhargreaves2006@gmail.com>
Date: Thu, 6 Mar 2025 15:52:15 -0700
Subject: [PATCH] FIX: Trying to make dev-ops chain a bit better.

---
 docker-compose.yml                    | 2 +-
 frontend/.dockerignore                | 1 +
 frontend/.gitignore                   | 1 +
 frontend/src/components/LoginForm.jsx | 8 ++++++--
 frontend/src/pages/Dashboard.jsx      | 7 +++++--
 5 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 frontend/.dockerignore
 create mode 100644 frontend/.gitignore

diff --git a/docker-compose.yml b/docker-compose.yml
index 4bab036..d8a277c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,10 @@
+# THIS FILE DOES NOT REFLECT THE COMPOSE FILE USED ON THE SERVER
 version: "3.8"
 services:
   frontend:
     build:
       context: ./frontend
       dockerfile: Dockerfile
-
     ports:
       - "3100:3100"
     depends_on:
diff --git a/frontend/.dockerignore b/frontend/.dockerignore
new file mode 100644
index 0000000..2eea525
--- /dev/null
+++ b/frontend/.dockerignore
@@ -0,0 +1 @@
+.env
\ No newline at end of file
diff --git a/frontend/.gitignore b/frontend/.gitignore
new file mode 100644
index 0000000..2eea525
--- /dev/null
+++ b/frontend/.gitignore
@@ -0,0 +1 @@
+.env
\ No newline at end of file
diff --git a/frontend/src/components/LoginForm.jsx b/frontend/src/components/LoginForm.jsx
index 5bdc0a9..f94091a 100644
--- a/frontend/src/components/LoginForm.jsx
+++ b/frontend/src/components/LoginForm.jsx
@@ -4,12 +4,16 @@ import PasswordInput from "./PasswordInput.jsx";
 import RememberMe from "./RememberMe.jsx";
 import {useNavigate} from "react-router-dom";
 
+
 export default function LoginForm() {
     /**
-     * URL To the backend web server
+     * URL To the backend web server.
+     * Uses the .env var in local development, but when
+     * pushed to dockerhub, the .env is ignored and the real
+     * backend URL is used.
      * @type {string}
      */
-    const backendUrl = "https://backend.gophernest.net";
+    const backendUrl = import.meta.env.VITE_BACKEND_URL || "https://backend.gophernest.net";
 
     const [username, setUsername] = useState("");
     const [remember, setRemember] = useState(false);
diff --git a/frontend/src/pages/Dashboard.jsx b/frontend/src/pages/Dashboard.jsx
index 5017204..8352d3b 100644
--- a/frontend/src/pages/Dashboard.jsx
+++ b/frontend/src/pages/Dashboard.jsx
@@ -11,10 +11,13 @@ export default function Dashboard() {
     const defaultPath = ["media", "vault"];
 
     /**
-     * URL To the backend web server
+     * URL To the backend web server.
+     * Uses the .env var in local development, but when
+     * pushed to dockerhub, the .env is ignored and the real
+     * backend URL is used.
      * @type {string}
      */
-    const backendUrl = "https://backend.gophernest.net";
+    const backendUrl = import.meta.env.VITE_BACKEND_URL || "https://backend.gophernest.net";
 
     const [token, setToken] = useState(null);
     const [path, setPath] = useState([...defaultPath]);