From 00c14f4eebf47e484e8ff693b044bf80714b2622 Mon Sep 17 00:00:00 2001 From: JBB0807 <104856796+JBB0807@users.noreply.github.com> Date: Fri, 2 May 2025 17:20:38 -0700 Subject: [PATCH] convert endpoint urls to env variables --- .env | 4 ++-- src/components/Navbar.jsx | 4 +++- src/pages/SignIn.jsx | 4 +++- src/pages/SignUp.jsx | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 0d0092a..7dc9c2c 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ -VITE_AUTH_URL="http://localhost:8080/auth/google" -#VITE_AUTH_URL="https://byte-camp-auth-service.fly.dev/auth/google" \ No newline at end of file +VITE_AUTH_URL="http://localhost:8080" +#VITE_AUTH_URL="https://byte-camp-auth-service.fly.dev" \ No newline at end of file diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx index 0a011b4..02b1e5e 100644 --- a/src/components/Navbar.jsx +++ b/src/components/Navbar.jsx @@ -3,6 +3,8 @@ import "../scss/styles.scss"; import "../scss/components/_navbar.scss"; import { Link } from "react-router-dom"; +const authUrl = import.meta.env.VITE_AUTH_URL; + const Navbar = () => { const [glitchEffect, setGlitchEffect] = useState(false); const [activeLink, setActiveLink] = useState("/"); @@ -37,7 +39,7 @@ const Navbar = () => { document.addEventListener("mousedown", handleClickOutside); async function fetchUser() { - const res = await fetch("http://localhost:8080/auth/current_user", { + const res = await fetch(`${authUrl}/auth/current_user`, { credentials: "include", // very important }); if (res.ok) { diff --git a/src/pages/SignIn.jsx b/src/pages/SignIn.jsx index a404843..ff2372e 100644 --- a/src/pages/SignIn.jsx +++ b/src/pages/SignIn.jsx @@ -1,6 +1,8 @@ import React from "react"; import "@fortawesome/fontawesome-free/css/all.min.css"; +const authUrl = import.meta.env.VITE_AUTH_URL; + function SignInForm() { const [state, setState] = React.useState({ assignmentID: "", @@ -21,7 +23,7 @@ function SignInForm() { console.log(`You are loggind in with email: ${assignmentId} and password: ${password}`); console.log("Submitting login request with state:", state); - fetch("http://localhost:8080/auth/student/login", { + fetch(`${authUrl}/auth/student/login`, { method: "POST", headers: { "Content-Type": "application/json", diff --git a/src/pages/SignUp.jsx b/src/pages/SignUp.jsx index cb9d445..9f6804b 100644 --- a/src/pages/SignUp.jsx +++ b/src/pages/SignUp.jsx @@ -34,7 +34,7 @@ function SignUpForm() { const googleAuth = () => { - window.open(authUrl, "_self"); + window.open(`${authUrl}/auth/google`, "_self"); }; return (