removed every single instance of localhost:5000 from the webap

Arquisoft · May 3, 2022 · fefc1c3 · fefc1c3
1 parent efb7f9f
commit fefc1c3
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 16 deletions.
diff --git a/webapp/src/api/api.ts b/webapp/src/api/api.ts
@@ -1,19 +1,19 @@
 import {Order} from "../shared/shareddtypes";
 
 export async function getOrdersForUser(webId: string): Promise<Order[]> {
-    const apiEndPoint = process.env.REACT_APP_API_URI || "http://localhost:5000";
+    const apiEndPoint = process.env.REACT_APP_API_URI;
     let response = await fetch(apiEndPoint + "/order/list/user/" + encodeURIComponent(webId));
     return response.json();
 }
 
 export async function getOrders(): Promise<Order[]> {
-    const apiEndPoint = process.env.REACT_APP_API_URI || "http://localhost:5000";
+    const apiEndPoint = process.env.REACT_APP_API_URI;
     let response = await fetch(apiEndPoint + "/order/list");
     return response.json();
 }
 
 export async function deleteProduct(id: string): Promise<boolean> {
-    const apiEndPoint = process.env.REACT_APP_API_URI || 'http://localhost:5000/api';
+    const apiEndPoint = process.env.REACT_APP_API_URI;
     let response = await fetch(apiEndPoint + '/product/' + id, {
         method: 'DELETE',
         headers: {'Content-Type': 'application/json', 'auth-token': localStorage.getItem('token') as string},
@@ -23,7 +23,7 @@ export async function deleteProduct(id: string): Promise<boolean> {
 }
 
 export async function deleteOrder(id: string): Promise<boolean> {
-    const apiEndPoint = process.env.REACT_APP_API_URI || 'http://localhost:5000/api';
+    const apiEndPoint = process.env.REACT_APP_API_URI;
     let response = await fetch(apiEndPoint + '/order/' + id, {
         method: 'DELETE',
         headers: {'Content-Type': 'application/json', 'auth-token': localStorage.getItem('token') as string},

diff --git a/webapp/src/components/checkout/Form.tsx b/webapp/src/components/checkout/Form.tsx
@@ -30,10 +30,10 @@ const Form = (props: Props) => {
     const [contactData, setContactData] = useState<Address[]>([]);
 
     const {session} = useSession()
-
+	const apiEndPoint = process.env.REACT_APP_API_URI;
     useEffect(() => {
         if(session.info.webId) {
-            axios.get((process.env.REACT_APP_API_URI || "http://localhost:5000") + "/solid/fetch/" + encrypt(session.info.webId)).then(
+            axios.get(apiEndPoint + "/solid/fetch/" + encrypt(session.info.webId)).then(
                 response => {
                         localStorage.setItem("fn", response.data.fn)
                         setContactData(response.data.addresses)

diff --git a/webapp/src/helpers/authService.ts b/webapp/src/helpers/authService.ts
@@ -1,6 +1,6 @@
 import axios from "axios";
 
-const API_URL = process.env.REACT_APP_API_URI || "http://localhost:5000";
+const API_URL = process.env.REACT_APP_API_URI;
 
 class AuthService {
     login(username: string, password: string) {

diff --git a/webapp/src/helpers/getData.ts b/webapp/src/helpers/getData.ts
@@ -1,5 +1,5 @@
 const getProducts = async () => {
-    const apiEndPoint = process.env.REACT_APP_API_URI || "http://localhost:5000";
+    const apiEndPoint = process.env.REACT_APP_API_URI;
     let response = await fetch(apiEndPoint + "/product/list");
     return response.json();
 }

diff --git a/webapp/src/helpers/postData.ts b/webapp/src/helpers/postData.ts
@@ -1,7 +1,7 @@
 import {OrderAdd} from "../shared/shareddtypes";
 
 const postData = async (order: OrderAdd) => {
-    const apiEndPoint = process.env.REACT_APP_API_URI || "http://localhost:5000";
+    const apiEndPoint = process.env.REACT_APP_API_URI;
 
     let response = await fetch(apiEndPoint + '/order/add', {
         method: 'POST',

diff --git a/webapp/src/hooks/usePodData.tsx b/webapp/src/hooks/usePodData.tsx
@@ -1,6 +1,7 @@
 import {useEffect, useState} from "react";
 import axios from "axios";
 import {SessionInfo} from "@inrupt/solid-ui-react/dist/src/hooks/useSession";
+import { appendFile } from "fs";
 
 function encrypt(webId: string): string {
     return encodeURIComponent(webId)
@@ -11,10 +12,10 @@ export const usePodData = (session: SessionInfo["session"]) => {
         fn: "",
         addresses: []
     })
-
+	const apiEndPoint = process.env.REACT_APP_API_URI;
     useEffect(() => {
         if(session.info.webId) {
-            axios.get((process.env.REACT_APP_API_URI || "http://localhost:5000") + "/solid/fetch/" + encrypt(session.info.webId)).then(
+            axios.get(apiEndPoint + "/solid/fetch/" + encrypt(session.info.webId)).then(
                 response => {
                     setContactData({
                         fn: response.data.fn,

diff --git a/webapp/src/hooks/useShipping.tsx b/webapp/src/hooks/useShipping.tsx
@@ -18,10 +18,10 @@ export const useShipping = (address: string) => {
         distance: 0.0,
         price: 0.0,
     })
-
+	const apiEndPoint = process.env.REACT_APP_API_URI;
     useEffect(() => {
         if(address.length !== 0) {
-            axios.post((process.env.REACT_APP_API_URI || "http://localhost:5000") + "/geocode", parseAddress(address))
+            axios.post(apiEndPoint + "/geocode", parseAddress(address))
                 .then(res => {
                     setShipping({
                         distance: res.data.distance,

diff --git a/webapp/src/pages/Checkout.tsx b/webapp/src/pages/Checkout.tsx
@@ -13,9 +13,10 @@ const Checkout = () => {
         distance: 0.0,
         price: 0.0,
     })
+	const apiEndPoint = process.env.REACT_APP_API_URI;
 
 	useEffect(() => {
-        axios.post((process.env.REACT_APP_API_URI || "http://localhost:5000") + "/geocode",
+        axios.post(apiEndPoint + "/geocode",
             {
                 "street":  address[3],
                 "city":    address[2],

diff --git a/webapp/src/pages/DetailsView/DetailsView.tsx b/webapp/src/pages/DetailsView/DetailsView.tsx
@@ -27,7 +27,7 @@ const DetailsView: React.FC = () => {
     const [item, setItem] = useState<Product>()
 
     useEffect(() => {
-        const apiEndPoint = process.env.REACT_APP_API_URI || "http://localhost:5000";
+        const apiEndPoint = process.env.REACT_APP_API_URI;
         Axios.get(apiEndPoint + '/product/details/' + _id).then(
             response => {
                 const product = response.data

diff --git a/webapp/src/pages/admin/AdminPanel.tsx b/webapp/src/pages/admin/AdminPanel.tsx
@@ -15,7 +15,7 @@ import {Footer} from "../../components/footer/Footer";
 
 
 const AdminPanel = () => {
-    const apiEndPoint = process.env.REACT_APP_API_URI || "http://localhost:5000";
+    const apiEndPoint = process.env.REACT_APP_API_URI;
     const {token} = useUser()
     const [orders, setOrders] = useState<Order[]>([]);
 	const [users, setUsers] = useState<string[]>([])