Merge pull request #987 from hpcc-systems/yadhap/installation-fixes

Yadhap/installation fixes

Tombolo/.env.sample

@@ -5,53 +5,49 @@
 # Carefully review the description of each variable, as they may differ depending on the environment        #
 # ==========================================================================================================#
 
-# Instance Configuration
+# 1. Instance Configuration
 INSTANCE_NAME=tombolo_dev_1
 NODE_ENV=development
+NODE_LOG_LEVEL=info
 
-# Host,  port and web URL configuration
+# 2. Host,  port and web URL configuration
 HOSTNAME=localhost
-SERVER_PORT=3000
-HTTP_PORT=3001
+SERVER_PORT=3001
+HTTP_PORT=3000
 HTTPS_PORT=443
-WEB_URL=http://localhost:3001
+WEB_URL=http://localhost:3000
 
-# SSL Certificate Configuration (Nginx)
+# 3. SSL Certificate Configuration (Nginx)
 CERT_PATH=/certs
 CERTIFICATE_NAME=
 CERTIFICATE_KEY=
 
-# Database Configuration
+# 4.  Database Configuration
 MYSQL_SSL_ENABLED=
 DB_USERNAME=root
 DB_PASSWORD=root
 DB_PORT=3306
 DB_NAME=tombolo
 DB_HOSTNAME=localhost
 
-# Email Configuration
-EMAIL_SMTP_HOST=
-EMAIL_PORT=
-EMAIL_SENDER=donotreply@tombolo.com
-
-# Security Configuration
-ENCRYPTION_KEY=
-API_KEY_DURATION=
-
-# Authentication and Authorization Configuration
+# 5. Authentication and Authorization Configuration
 JWT_SECRET=
 JWT_REFRESH_SECRET=
 CSRF_SECRET=
 
-# OAuth 2.0 - Azure
+# 6.  OAuth 2.0 (Azure) Configuration
 TENENT_ID=
 CLIENT_ID=
 CLIENT_SECRET=
 REDIRECT_URI=
 
-# Logging Configuration
-NODE_LOG_LEVEL=info
+# 7. Email Configuration
+EMAIL_SMTP_HOST=
+EMAIL_PORT=
+EMAIL_SENDER=donotreply@tombolo.com
 
-# Integration Specific Configuration
+# 8.  Security Configuration
+ENCRYPTION_KEY=
+API_KEY_DURATION=
 
-# Test Configuration
+# 9.  Integration Specific Configuration

Tombolo/client-reactjs/.env.sample

@@ -9,8 +9,8 @@
 GENERATE_SOURCEMAP=false
 
 # Port and Proxy URL for react application 
-PORT=3001
-REACT_APP_PROXY_URL=http://localhost:3000
+PORT=3000
+REACT_APP_PROXY_URL=http://localhost:3001
 
 # LDAP Configuration
 REACT_APP_LDAP_SEARCH_ENABLED=false
@@ -21,7 +21,7 @@ REACT_APP_AUTH_METHODS=traditional,azure
 # Azure Configuration - only if using Azure AD for authentication
 REACT_APP_AZURE_CLIENT_ID=
 REACT_APP_AZURE_TENENT_ID=
-REACT_APP_AZURE_REDIRECT_URI=http://localhost:3001
+REACT_APP_AZURE_REDIRECT_URI=http://localhost:3000
 
 # App version
 REACT_APP_VERSION=$npm_package_version

Tombolo/client-reactjs/src/components/login/login.js

@@ -79,6 +79,7 @@ const Login = () => {
       return;
     } finally {
       setAzureLoginAttempted(true);
+      setLoading(false);
     }
   };