Testing environment variables for frontend

basshamut · Jun 27, 2024 · e322713 · e322713
1 parent a075e25
commit e322713
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/frontend/src/components/forms/login/Login.jsx b/frontend/src/components/forms/login/Login.jsx
@@ -3,7 +3,7 @@ import {Dialog} from 'primereact/dialog'
 import {InputText} from "primereact/inputtext"
 import {useState} from "react"
 import {useNavigate} from "react-router-dom"
-import {startSession} from "../../../utils/session.jsx"
+import {getApplicationDomain, startSession} from "../../../utils/session.jsx"
 import background from "/Shotokan_Fondo.svg"
 
 
@@ -20,7 +20,7 @@ export default function Login() {
 
     function doLogin() {
         if (validateEmail(user)) {
-            const domain = import.meta.env.VITE_API_URL
+            const domain = getApplicationDomain()
             console.log("Domain: " + domain)
             fetch(domain + '/api/users/login', {
                 method: 'POST',

diff --git a/frontend/src/components/forms/meet/MeetRegisterForm.jsx b/frontend/src/components/forms/meet/MeetRegisterForm.jsx
@@ -3,7 +3,7 @@ import { Button } from "primereact/button";
 import { useState } from "react";
 import { Calendar } from "primereact/calendar";
 import styled from 'styled-components';
-import {getBase64CredentialsFromSession} from "../../../utils/session";
+import {getApplicationDomain, getBase64CredentialsFromSession} from "../../../utils/session";
 
 const RegisterContainer = styled.div`
     background-image: radial-gradient(circle at left top, var(--primary-400), var(--primary-700));
@@ -57,7 +57,7 @@ export default function MeetRegisterForm() {
     const [date, setDate] = useState(today);
     const [url, setUrl] = useState('');
     const [price, setPrice] = useState(0);
-    const domain = import.meta.env.VITE_API_URL
+    const domain = getApplicationDomain()
     const base64Credentials = getBase64CredentialsFromSession()
 
     function saveMeet() {

diff --git a/frontend/src/components/forms/register/Register.jsx b/frontend/src/components/forms/register/Register.jsx
@@ -5,6 +5,7 @@ import {useState} from "react"
 import background from "/Shotokan_Fondo.svg"
 import {Calendar} from "primereact/calendar"
 import {useNavigate} from "react-router-dom";
+import {getApplicationDomain} from "../../../utils/session";
 
 export default function Register() {
     const [visible, setVisible] = useState(true)
@@ -14,7 +15,7 @@ export default function Register() {
     const [confirmPassword, setConfirmPassword] = useState("")
     const [errors, setErrors] = useState({})
     const navigate = useNavigate()
-    const domain = import.meta.env.VITE_API_URL
+    const domain = getApplicationDomain()
 
     const today = new Date()
     const majorityAgeDate = new Date(today.getFullYear() - 18, 0, 1)

diff --git a/frontend/src/components/payment/CheckoutForm.jsx b/frontend/src/components/payment/CheckoutForm.jsx
@@ -1,11 +1,11 @@
 import {useCallback} from "react"
 import {loadStripe} from '@stripe/stripe-js'
 import {format} from "date-fns"
-import {getBase64CredentialsFromSession, getSession} from "../../utils/session.jsx";
+import {getApplicationDomain, getBase64CredentialsFromSession, getSession} from "../../utils/session.jsx";
 
 // eslint-disable-next-line react/prop-types
 export default function CheckoutForm({meet}) {
-    const domain = import.meta.env.VITE_API_URL
+    const domain = getApplicationDomain()
 
     const stripePromise = loadStripe("pk_test_51PSHknKnVUk9u0R7xWznb2PU2LeYeOgFXDVB14wP4BvJQBJ3RdH0ZLF801Ka7oLlNd7pFV7VZndQa2soCDluMFf200UugFXgnD")
     const user = getSession()

diff --git a/frontend/src/hooks/useFetchMeets.js b/frontend/src/hooks/useFetchMeets.js
@@ -1,5 +1,5 @@
 import {useEffect, useState} from 'react';
-import {getBase64CredentialsFromSession} from "../utils/session";
+import {getApplicationDomain, getBase64CredentialsFromSession} from "../utils/session";
 
 function useFetchMeets(isUser, hasSession) {
     const [meets, setMeets] = useState([]);
@@ -9,7 +9,7 @@ function useFetchMeets(isUser, hasSession) {
     useEffect(() => {
         async function fetchMeets() {
             try {
-                const domain = import.meta.env.VITE_API_URL
+                const domain = getApplicationDomain()
                 console.log("Domain: " + domain)
                 const response = await fetch(domain + '/api/meets/all', {
                     headers: {

diff --git a/frontend/src/hooks/useSavePurchase.js b/frontend/src/hooks/useSavePurchase.js
@@ -1,10 +1,10 @@
 import {useEffect, useState} from "react"
-import {getBase64CredentialsFromSession} from "../utils/session";
+import {getApplicationDomain, getBase64CredentialsFromSession} from "../utils/session";
 
 function useSavePurchase(isSuccess, meetId, userId) {
     const [response, setResponse] = useState({})
     const [error, setError] = useState(null);
-    const domain = import.meta.env.VITE_API_URL
+    const domain = getApplicationDomain()
     const base64Credentials = getBase64CredentialsFromSession()
 
     useEffect(() => {

diff --git a/frontend/src/utils/session.jsx b/frontend/src/utils/session.jsx
@@ -44,4 +44,8 @@ export const isAdmin = () => {
 export const getBase64CredentialsFromSession = () => {
     const sessionData = getSession()
     return btoa(sessionData.email + ':' + sessionData.password)
-}
+}
+
+export const getApplicationDomain = () => {
+    return import.meta.env.VITE_API_URL ? import.meta.env.VITE_API_URL : 'http://86.38.204.61'
+}