From ebbe4059f4811569a1713aea39edda4326d9f63b Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 20 Dec 2022 16:24:32 -0300 Subject: [PATCH] Use environment variable Co-authored-by: Ezequiel Bellver Co-authored-by: Juan Barmasch --- bsition/frontend/next.config.js | 5 +++++ bsition/frontend/src/components/Sidebar.tsx | 4 ++-- bsition/frontend/src/pages/create-document.tsx | 2 +- bsition/frontend/src/pages/documents/[id].tsx | 10 +++++----- bsition/frontend/src/pages/documents/[id]/access.tsx | 10 +++++----- bsition/frontend/src/pages/index.tsx | 2 ++ bsition/frontend/src/pages/login.tsx | 4 ++-- bsition/frontend/src/pages/search.tsx | 2 +- 8 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 bsition/frontend/next.config.js diff --git a/bsition/frontend/next.config.js b/bsition/frontend/next.config.js new file mode 100644 index 0000000..3fba24a --- /dev/null +++ b/bsition/frontend/next.config.js @@ -0,0 +1,5 @@ +module.exports = { + env: { + API_URL: 'http://localhost:8000', + }, + } \ No newline at end of file diff --git a/bsition/frontend/src/components/Sidebar.tsx b/bsition/frontend/src/components/Sidebar.tsx index d63bf00..17e4d2f 100644 --- a/bsition/frontend/src/components/Sidebar.tsx +++ b/bsition/frontend/src/components/Sidebar.tsx @@ -31,7 +31,7 @@ const Sidebar = () => { useEffect(() => { if (token) { const fetchData = async () => { - const res = await fetch("http://localhost:8000/api/documents", { + const res = await fetch(process.env.API_URL + "/api/documents", { method: "GET", headers: { 'Authorization': `Bearer ${token}` @@ -122,7 +122,7 @@ const Sidebar = () => { const handleSubmit = async (event) => { event.preventDefault() - const res = await fetch("http://localhost:8000/api/token", { + const res = await fetch(process.env.API_URL + "/api/token", { method: "DELETE", headers: { 'Authorization': `Bearer ${token}` diff --git a/bsition/frontend/src/pages/create-document.tsx b/bsition/frontend/src/pages/create-document.tsx index 0c5ecd8..f4bf853 100644 --- a/bsition/frontend/src/pages/create-document.tsx +++ b/bsition/frontend/src/pages/create-document.tsx @@ -24,7 +24,7 @@ export default function CreateDocument() { const JSONdata = JSON.stringify(data) - const res = await fetch("http://localhost:8000/api/documents", { + const res = await fetch(process.env.API_URL + "/api/documents", { method: "POST", headers: { 'Content-Type': 'application/json', diff --git a/bsition/frontend/src/pages/documents/[id].tsx b/bsition/frontend/src/pages/documents/[id].tsx index 2563386..c54e560 100644 --- a/bsition/frontend/src/pages/documents/[id].tsx +++ b/bsition/frontend/src/pages/documents/[id].tsx @@ -26,7 +26,7 @@ export default function Document() { useEffect(() => { if (token && router.query.id) { const fetchData = async () => { - const res = await fetch(`http://localhost:8000/api/documents/${router.query.id}`, { + const res = await fetch(`${process.env.API_URL}/api/documents/${router.query.id}`, { method: "GET", headers: { 'Authorization': `Bearer ${token}` @@ -46,7 +46,7 @@ export default function Document() { useEffect(() => { if (token && router.query.id) { const interval = setInterval(() => { - fetch(`http://localhost:8000/api/documents/${router.query.id}`, { + fetch(`${process.env.API_URL}/api/documents/${router.query.id}`, { method: 'PUT', body: `{"data": "${text.replace(/\n/g, "\\n")}"}`, headers: { @@ -86,7 +86,7 @@ export default function Document() { let access = router.query.id + "/access" const deleteDoc = async () => { - const res = await fetch(`http://localhost:8000/api/documents/${router.query.id}`, { + const res = await fetch(`${process.env.API_URL}/api/documents/${router.query.id}`, { method: "DELETE", headers: { 'Authorization': `Bearer ${token}` @@ -100,7 +100,7 @@ export default function Document() { }; const publicOrPrivate = async () => { if (!publicMode) { - const res = await fetch(`http://localhost:8000/api/documents/${router.query.id}`, { + const res = await fetch(`${process.env.API_URL}/api/documents/${router.query.id}`, { method: "PUT", headers: { 'Content-type': 'application/json', @@ -113,7 +113,7 @@ export default function Document() { setPublicMode(() => true) } } else { - const res = await fetch(`http://localhost:8000/api/documents/${router.query.id}`, { + const res = await fetch(`${process.env.API_URL}/api/documents/${router.query.id}`, { method: 'PUT', headers: { 'Content-type': 'application/json', diff --git a/bsition/frontend/src/pages/documents/[id]/access.tsx b/bsition/frontend/src/pages/documents/[id]/access.tsx index 96a4478..f876e1d 100644 --- a/bsition/frontend/src/pages/documents/[id]/access.tsx +++ b/bsition/frontend/src/pages/documents/[id]/access.tsx @@ -17,7 +17,7 @@ export default function Document() { useEffect(() => { if (token && router.query.id) { const fetchData = async () => { - const res = await fetch(`http://localhost:8000/api/documents/${router.query.id}/access`, { + const res = await fetch(`${process.env.API_URL}/api/documents/${router.query.id}/access`, { method: "GET", headers: { 'Authorization': `Bearer ${token}` @@ -54,7 +54,7 @@ export default function Document() { console.log(JSONdata) - const res = await fetch(`http://localhost:8000/api/documents/${router.query.id}/access`, { + const res = await fetch(`${process.env.API_URL}/api/documents/${router.query.id}/access`, { method: "POST", headers: { 'Content-Type': 'application/json', @@ -76,7 +76,7 @@ export default function Document() { const JSONdata = JSON.stringify(data) - const res = await fetch(`http://localhost:8000/api/documents/${router.query.id}/access`, { + const res = await fetch(`${process.env.API_URL}/api/documents/${router.query.id}/access`, { method: "DELETE", headers: { 'Content-Type': 'application/json', @@ -92,7 +92,7 @@ export default function Document() { const handleSubmit = async (event) => { event.preventDefault() - const aux = await fetch(`http://localhost:8000/api/users?` + new URLSearchParams( + const aux = await fetch(`${process.env.API_URL}/api/users?` + new URLSearchParams( {user: event.target.name.value} ), { method: "GET", @@ -110,7 +110,7 @@ export default function Document() { const JSONdata = JSON.stringify(data) - const res = await fetch(`http://localhost:8000/api/documents/${router.query.id}/access`, { + const res = await fetch(`${process.env.API_URL}/api/documents/${router.query.id}/access`, { method: "POST", headers: { 'Content-Type': 'application/json', diff --git a/bsition/frontend/src/pages/index.tsx b/bsition/frontend/src/pages/index.tsx index 82fdc7f..b4c60c9 100644 --- a/bsition/frontend/src/pages/index.tsx +++ b/bsition/frontend/src/pages/index.tsx @@ -19,6 +19,8 @@ export default function Home() { return <> } + console.log(process.env.API_URL) + return
diff --git a/bsition/frontend/src/pages/login.tsx b/bsition/frontend/src/pages/login.tsx index f9f98bf..c557450 100644 --- a/bsition/frontend/src/pages/login.tsx +++ b/bsition/frontend/src/pages/login.tsx @@ -12,12 +12,12 @@ export default function Login() { formData.append("username", event.target.username.value) formData.append("password", event.target.password.value) - const res = await fetch("http://localhost:8000/api/token", {method: 'POST', body: formData}) + const res = await fetch(process.env.API_URL + "/api/token", {method: 'POST', body: formData}) const json = await res.json(); if (res.status == 202) { localStorage.setItem("token", json["access_token"]) - const res = await fetch("http://localhost:8000/api/users/me", { + const res = await fetch(process.env.API_URL + "/api/users/me", { method: 'GET', headers: { 'Authorization': `Bearer ${json["access_token"]}` diff --git a/bsition/frontend/src/pages/search.tsx b/bsition/frontend/src/pages/search.tsx index 5085ad3..e8b12a0 100644 --- a/bsition/frontend/src/pages/search.tsx +++ b/bsition/frontend/src/pages/search.tsx @@ -20,7 +20,7 @@ export default function Search() { const handleSubmit = async (event) => { event.preventDefault() - const res = await fetch("http://localhost:8000/api/documents?" + new URLSearchParams( + const res = await fetch(process.env.API_URL + "/api/documents?" + new URLSearchParams( {query: "*" + event.target.search.value + "*"} ), { method: "GET",