replace API_BASE_URL

Author: Eliza612

app/src/serverConfig.js

@@ -2,11 +2,11 @@ const isProduction = process.env.NODE_ENV === 'production';
 const serverConfig = {
   DEV_PORT: 5656,
   API_BASE_URL: isProduction
-    ? 'https://app.reactype.dev'
+    ? 'https://reactype-2c81e4204f81.herokuapp.com'
     : 'http://localhost:5656',
   // : 'http://localhost:8080',
   API_BASE_URL2: isProduction
-    ? 'https://app.reactype.dev'
+    ? 'https://reactype-2c81e4204f81.herokuapp.com'
     : 'http://localhost:8080'
 };
 // module.exports = config;

config.js

@@ -2,11 +2,11 @@ const isProduction = process.env.NODE_ENV === 'production';
 const config = {
   DEV_PORT: 5656,
   API_BASE_URL: isProduction
-    ? 'https://app.reactype.dev'
+    ? 'https://reactype-2c81e4204f81.herokuapp.com'
     : 'http://localhost:5656',
   // : 'http://localhost:8080',
   API_BASE_URL2: isProduction
-    ? 'https://app.reactype.dev'
+    ? 'https://reactype-2c81e4204f81.herokuapp.com'
     : 'http://localhost:8080'
 };
 module.exports = config;

server/server.ts

@@ -51,12 +51,12 @@ app.use(
 
 //if in production mode, statically serve everything in the build folder on the route '/dist'
 if (process.env.NODE_ENV == 'production') {
+  console.log('currently in port', process.env.PORT);
   console.log('in production');
   console.log('joined path: ', path.join(__dirname, '../build'));
   app.use('/', express.static(path.join(__dirname, '../build')));
 } else {
   console.log('not production');
-  console.log('joined path: ', path.join(__dirname, '../build'));
   app.get('/', (req, res) => {
     const indexPath = path.join(__dirname, '../index.html');
     return res.status(200).sendFile(indexPath);
@@ -89,7 +89,12 @@ const httpServer = createServer(app);
 const io = new Server(httpServer, {
   transports: ['websocket'],
   cors: {
-    origin: ['http://localhost:5656', 'http://localhost:8080', API_BASE_URL]
+    origin: [
+      process.env.PORT,
+      'http://localhost:5656',
+      'http://localhost:8080',
+      API_BASE_URL
+    ]
   }
 });