Fixes #1576, Added FRONTEND env variable, updated routes/index.js

env.example

@@ -4,6 +4,16 @@ NODE_ENV=development
 # PORT is the port used by the web server
 PORT=3000
 
+
+# FRONTEND is the Front-End env variable that defines what Front-End
+# gets served for Telescope.
+# Currently, FRONTEND only has two supported values:
+#   'gatsby' - The Gatsby Front-End
+#   'next' - The NextJs Front-End
+# Our default value for FRONTEND is 'gatsby'
+FRONTEND=gatsby
+
+
 # API_URL is the URL of the Telescope Web API server.  Change this to
 # pick which backend server our frontend uses.  If you are developing
 # locally, this will be localhost:{PORT}, probably http://localhost:3000.

env.production

@@ -4,6 +4,14 @@ NODE_ENV=production
 # PORT is the port used by the web server
 PORT=3000
 
+# FRONTEND is the Front-End env variable that defines what Front-End
+# gets served for Telescope.
+# Currently, FRONTEND only has two supported values:
+#   'gatsby' - The Gatsby Front-End
+#   'next' - The NextJs Front-End
+# Our default value for FRONTEND is 'gatsby'
+FRONTEND=gatsby
+
 API_URL=https://telescope.cdot.systems
 
 # LOG_LEVEL is used to set the level of debugging for the logs.

env.staging

@@ -4,6 +4,16 @@ NODE_ENV=production
 # PORT is the port used by the web server
 PORT=3000
 
+
+# FRONTEND is the Front-End env variable that defines what Front-End
+# gets served for Telescope.
+# Currently, FRONTEND only has two supported values:
+#   'gatsby' - The Gatsby Front-End
+#   'next' - The NextJs Front-End
+# Our default value for FRONTEND is 'gatsby'
+FRONTEND=gatsby
+
+
 API_URL=https://dev.telescope.cdot.systems
 
 # LOG_LEVEL is used to set the level of debugging for the logs.

netlify.toml

@@ -8,3 +8,4 @@
   API_URL="https://dev.telescope.cdot.systems"
   # We need to expose the API_URL to the front-end too
   NEXT_PUBLIC_API_URL="https://dev.telescope.cdot.systems"
+  FRONTEND="next"

now.json

@@ -1,7 +1,8 @@
 {
   "build": {
     "env": {
-      "API_URL": "https://dev.telescope.cdot.systems"
+      "API_URL": "https://dev.telescope.cdot.systems",
+      "FRONTEND": "gatsby"
     }
   },
   "builds": [

src/backend/web/routes/index.js

@@ -17,7 +17,6 @@ const user = require('./user');
 const query = require('./query');
 
 const router = express.Router();
-
 /**
  * In staging and production, all routes are being cached in our reverse proxy except for admin, user, health and auth.
  * Please check https://github.com/Seneca-CDOT/telescope/blob/master/nginx.conf for more details about it.
@@ -45,9 +44,19 @@ if (process.env.NODE_ENV === 'development') {
   if (process.env.PROXY_FRONTEND) {
     // Allow proxying the Gatsby dev server through our backend if PROXY_FRONTEND=1 is set in env
     router.use('/', createProxyMiddleware({ target: 'http://localhost:8000', changeOrigin: true }));
-  } else {
     // Or serve the static files in the Gatsby build directory
+  } else if (
+    !process.env.FRONTEND ||
+    process.env.FRONTEND.toLowerCase() === 'gatsby' ||
+    process.env.FRONTEND === ''
+  ) {
     router.use(express.static(path.join(__dirname, '../../../frontend/gatsby/public')));
+  } else if (process.env.FRONTEND.toLowerCase() === 'next') {
+    router.use(express.static(path.join(__dirname, '../../../frontend/next/out')));
+  } else {
+    throw new Error(
+      `FRONTEND Value is Incorrect or Does Not Exist. Check your .env files to see if the FRONTEND value is properly set\n FRONTENDs Current Value: ${process.env.FRONTEND}`
+    );
   }
 }