From 8ddf1aef53dee1f2059de4609f95c52d940d2ca8 Mon Sep 17 00:00:00 2001 From: Olly Hearn Date: Wed, 24 May 2023 15:10:34 +0300 Subject: [PATCH] fixes --- docker-compose.yml | 2 -- react/Dockerfile | 10 +++++++--- react/app/src/components/Snippet.jsx | 4 ++-- react/app/src/context/AuthContext.jsx | 4 ++-- react/app/src/utils/useAxios.jsx | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 41e2257..dd88abd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,8 +14,6 @@ services: context: react ports: - "3000" - environment: - - WDS_SOCKET_PORT=0 volumes: - ./react/app:/app:z # - ./docker_cache/node_modules:/app/node_modules diff --git a/react/Dockerfile b/react/Dockerfile index dbc8441..017d34f 100644 --- a/react/Dockerfile +++ b/react/Dockerfile @@ -1,5 +1,11 @@ FROM node:20.1 +ENV CI=true +ENV PORT=3000 +ENV HOST=0.0.0.0 +ENV WDS_SOCKET_PORT=0 +ENV REACT_APP_DOMAIN=127.0.0.1 + WORKDIR /app COPY /app /app # COPY package.json /app/package.json @@ -10,8 +16,6 @@ RUN npm ci # COPY . /app # -ENV CI=true -ENV PORT=3000 -ENV HOST=0.0.0.0 +RUN printenv CMD [ "npm", "start" ] diff --git a/react/app/src/components/Snippet.jsx b/react/app/src/components/Snippet.jsx index 27f52ef..662b396 100644 --- a/react/app/src/components/Snippet.jsx +++ b/react/app/src/components/Snippet.jsx @@ -15,7 +15,7 @@ const Snippet = ({ id }) => { const { authTokens } = useContext(AuthContext); const [ snippet, setSnippet ] = useState(""); const getSnippet = async (id) => { - const response = await fetch(`http://127.0.0.1/api/snippets/${id}`, { + const response = await fetch(`http://${process.env.REACT_APP_DOMAIN}/api/snippets/${id}`, { method: "GET", headers: { "Authorization": `Bearer ${authTokens.access}`, @@ -31,7 +31,7 @@ const Snippet = ({ id }) => { } }; const updateSnippet = async (id, snippet) => { - const response = await fetch(`http://127.0.0.1/api/snippets/${id}`, { + const response = await fetch(`http://${process.env.REACT_APP_DOMAIN}/api/snippets/${id}`, { method: "POST", headers: { "Authorization": `Bearer ${authTokens.access}`, diff --git a/react/app/src/context/AuthContext.jsx b/react/app/src/context/AuthContext.jsx index 1d62628..7f16a7d 100644 --- a/react/app/src/context/AuthContext.jsx +++ b/react/app/src/context/AuthContext.jsx @@ -22,7 +22,7 @@ export const AuthProvider = ({ children }) => { const history = useNavigate(); const loginUser = async (username, password) => { - const response = await fetch("http://127.0.0.1/api/auth/token/", { + const response = await fetch(`http://${process.env.REACT_APP_DOMAIN}/api/auth/token/`, { method: "POST", headers: { "Content-Type": "application/json" @@ -46,7 +46,7 @@ export const AuthProvider = ({ children }) => { }; const registerUser = async (username, password, password2) => { - const response = await fetch("http://127.0.0.1/api/auth/register/", { + const response = await fetch(`http://${process.env.REACT_APP_DOMAIN}/api/auth/register/`, { method: "POST", headers: { "Content-Type": "application/json" diff --git a/react/app/src/utils/useAxios.jsx b/react/app/src/utils/useAxios.jsx index 49f8f1e..368aea6 100644 --- a/react/app/src/utils/useAxios.jsx +++ b/react/app/src/utils/useAxios.jsx @@ -4,7 +4,7 @@ import dayjs from "dayjs"; import { useContext } from "react"; import AuthContext from "../context/AuthContext"; -const baseURL = "http://127.0.0.1/api/auth"; +const baseURL = `http://${process.env.REACT_APP_DOMAIN}/api/auth`; const useAxios = () => { const { authTokens, setUser, setAuthTokens } = useContext(AuthContext);