Standardize URLs

Author: YoYo178

frontend/src/config/api.config.ts

@@ -4,11 +4,10 @@ import type { Endpoints } from "../types/api.types";
 const isProduction = import.meta.env.PROD;
 
 export const SERVER_URL = isProduction
-    ? (import.meta.env.VITE_SERVER_URL || 'https://talketeer.onrender.com')
-    : (import.meta.env.VITE_DEV_SERVER_URL || 'https://localhost:3000');
-export const API_URL = SERVER_URL + '/talketeer/api';
+    ? import.meta.env.VITE_SERVER_URL
+    : import.meta.env.VITE_DEV_SERVER_URL;
 
-export const SOCKET_SERVER_URL = SERVER_URL;
+export const API_URL = SERVER_URL + `${isProduction ? '/talketeer/api' : '/api'}`;
 
 export const API = axios.create({
     baseURL: API_URL

frontend/src/socket.ts

@@ -1,5 +1,9 @@
 import { io } from 'socket.io-client';
-import { SOCKET_SERVER_URL } from './config/api.config';
+import { SERVER_URL } from './config/api.config';
 import type { TalketeerSocket } from './types/socket.types';
 
-export const socket: TalketeerSocket = io(SOCKET_SERVER_URL, { withCredentials: true, autoConnect: false, path: '/talketeer/socket.io/' }) as TalketeerSocket;
+export const socket: TalketeerSocket = io(SERVER_URL, {
+    withCredentials: true,
+    autoConnect: false,
+    path: '/talketeer/socket.io/'
+}) as TalketeerSocket;