Merge branch 'dev' into jon-chatUI

Author: johnwage

Procfile

@@ -1 +1 @@
-web: node server/server.js
+web: npx tsx server/server.ts

app/src/public/styles/style.css

@@ -2,7 +2,7 @@
 @import url('https://fonts.googleapis.com/css2?family=Raleway&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Roboto&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0');
-@import url('https: //fonts.googleapis.com/css2?family=Fira+Code:wght@300;400;500;600;700&display=swap');
+/* @import url('https: //fonts.googleapis.com/css2?family=Fira+Code:wght@300;400;500;600;700&display=swap'); */
 
 *,
 *::before,

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;

index.html

@@ -4,7 +4,11 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Reactype</title>
-    <link rel="stylesheet" type="text/css" href="./style.css" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="./app/src/public/styles/style.css"
+    />
     <link
       rel="icon"
       type="image/x-icon"

server/server.ts

@@ -49,6 +49,20 @@ 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');
+  app.get('/', (req, res) => {
+    const indexPath = path.join(__dirname, '../index.html');
+    return res.status(200).sendFile(indexPath);
+  });
+}
+
 // NOTE from v13.0 team: GitHub OAuth works fine in Electron production app and the backend for Electron production app is deployed on Heroku at https://reactype-caret.herokuapp.com/ (get credentials from instructor )
 
 const passport = require('passport');
@@ -75,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
+    ]
   }
 });
 
@@ -520,34 +539,22 @@ app.get(
 );
 
 // serve index.html on the route '/'
-const isDocker = process.env.IS_DOCKER === 'true';
-console.log('this is running on docker: ', isDocker);
-
-//if in production mode, statically serve everything in the build folder on the route '/dist'
-if (process.env.NODE_ENV == 'production') {
-  app.use('/dist', express.static(path.join(__dirname, '/app/dist')));
-}
-
-app.get('/', (req, res) => {
-  const indexPath = isDocker
-    ? path.join(__dirname, '../index-prod.html')
-    : path.join(__dirname, '../index.html');
-  return res.status(200).sendFile(indexPath);
-});
+// const isDocker = process.env.IS_DOCKER === 'true';
+// console.log('this is running on docker: ', isDocker);
 
-app.get('/bundle.js', (req, res) => {
-  return res.status(200).sendFile(path.join(process.cwd(), 'bundle.js'));
-});
+// app.get('/bundle.js', (req, res) => {
+//   return res.status(200).sendFile(path.join(process.cwd(), 'bundle.js'));
+// });
 
-if (isDocker) {
-  app.get('/main.css', (req, res) => {
-    return res.status(200).sendFile(path.join(process.cwd(), 'main.css'));
-  });
-}
+// if (isDocker) {
+//   app.get('/main.css', (req, res) => {
+//     return res.status(200).sendFile(path.join(process.cwd(), 'main.css'));
+//   });
+// }
 
-app.get('/test', (req, res) => {
-  res.send('test request is working');
-});
+// app.get('/test', (req, res) => {
+//   res.send('test request is working');
+// });
 
 app.use('/*', (req, res) => res.status(404).send('Page not found'));
 
@@ -565,8 +572,8 @@ app.use((err, req, res, next) => {
 
 // starts server on PORT
 if (!isTest) {
-  httpServer.listen(5656, () =>
-    console.log(`Server listening on port: ${DEV_PORT}`)
+  httpServer.listen(PORT, () =>
+    console.log(`Server listening on port: ${PORT}`)
   );
 }