fix: address review comments

Author: abhishekblue

.env.example

@@ -8,7 +8,7 @@ PORT=4321
 
 # Run Talawa-api locally in your system, and put its url into the same.
 
-REACT_APP_TALAWA_URL=/graphql
+REACT_APP_TALAWA_URL=http://localhost:4000/graphql
 
 # Do you want to setup and use "I'm not a robot" Checkbox (Google Recaptcha)?
 # If no, leave blank, else write yes
@@ -24,7 +24,7 @@ REACT_APP_USE_RECAPTCHA=
 REACT_APP_RECAPTCHA_SITE_KEY=
 
 # has to be inserted in the env file to use websocket based features.
-REACT_APP_BACKEND_WEBSOCKET_URL=/graphql
+REACT_APP_BACKEND_WEBSOCKET_URL=ws://localhost:4000/graphql
 
 # If you want to logs Compiletime and Runtime error , warning and info write YES or if u want to  
 # keep the console clean leave it blank

config/docker/setup/apache.conf

@@ -1,18 +1,23 @@
 <VirtualHost *:80>
+    # CHANGE THIS: Update 'localhost' to your real domain name in production
     ServerName localhost
-    DocumentRoot /usr/share/nginx/html
+    
+    # Standard Apache web root
+    DocumentRoot /usr/local/apache2/htdocs
 
     # Proxy GraphQL requests to the internal API container
+    # 'api' is the Docker Service Name defined in docker-compose.yml.
+    # If running outside Docker, replace 'api' with your API IP address.
     ProxyPass /graphql http://api:4000/graphql
     ProxyPassReverse /graphql http://api:4000/graphql
 
-    # Handle WebSocket upgrades (FIXED REGEX)
+    # Handle WebSocket upgrades
     RewriteEngine On
     RewriteCond %{HTTP:Upgrade} =websocket [NC]
     RewriteRule ^/graphql(.*)$           ws://api:4000/graphql$1 [P,L]
 
-    # Serve React App (FIXED SECURITY)
-    <Directory /usr/share/nginx/html>
+    # Serve React App
+    <Directory /usr/local/apache2/htdocs>
         Options FollowSymLinks
         AllowOverride None
         Require all granted

config/docker/setup/nginx.conf

@@ -10,6 +10,8 @@ server {
     }
 
     location /graphql {
+        # 'api' is the Docker Service Name defined in docker-compose.yml.
+        # If running outside Docker, replace 'api' with your API IP address.
         proxy_pass http://api:4000;
 
 

config/vite.config.ts

@@ -63,7 +63,7 @@ export default defineConfig({
     port: PORT,
     proxy: {
       '/graphql': {
-        target: process.env.VITE_API_URL || 'http://localhost:4000',
+        target: 'http://localhost:4000',
         changeOrigin: true,
         ws: true,
       },

docs/docs/docs/getting-started/configuration.md

@@ -68,15 +68,21 @@ If you are trying to access Talawa Admin from a remote host with the API URL con
 REACT_APP_TALAWA_URL="http://YOUR-REMOTE-ADDRESS:4000/graphql"
 
 ```
-:::tip Proxy Configuration
-To avoid CORS issues when hosting the Admin and API on different IP addresses, you can use a **relative path** for the backend URL.
 
-Talawa-Admin includes a pre-configured Reverse Proxy (via Vite in Dev, and Nginx/Apache in Prod).
+#### Reverse Proxy Configuration (CORS Solution)
+To resolve CORS issues in production environments (where Admin and API run on different IPs), Talawa-Admin is designed to use a **Reverse Proxy**.
 
-**Recommended Configuration:**
+**1. React Configuration:**
 ```bash
 REACT_APP_TALAWA_URL=/graphql
 REACT_APP_BACKEND_WEBSOCKET_URL=/graphql
+```
+**2. Web Server Configuration:**  
+You must configure your web server (Nginx/Apache) to forward these `/graphql` requests to the actual API IP address.
+
+- **Docker**: The provided nginx.conf and apache.conf are pre-configured to forward to the internal api container.
+
+- **Distributed Systems:** If running on bare metal, update the proxy_pass directive in nginx.conf (or Apache equivalent) to point to your actual API IP Address.
 
 #### Setting up REACT_APP_BACKEND_WEBSOCKET_URL in .env file