Move embed/present routes to previewServer

Author: catarak

client/modules/IDE/components/ShareModal.jsx

@@ -2,22 +2,24 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { withTranslation } from 'react-i18next';
 import CopyableInput from './CopyableInput';
+import getConfig from '../../../utils/getConfig';
 
 class ShareModal extends React.PureComponent {
   render() {
     const { projectId, ownerUsername, projectName } = this.props;
     const hostname = window.location.origin;
+    const previewUrl = getConfig('PREVIEW_URL');
     return (
       <div className="share-modal">
         <h3 className="share-modal__project-name">{projectName}</h3>
         <CopyableInput
           label={this.props.t('ShareModal.Embed')}
-          value={`<iframe src="${hostname}/${ownerUsername}/embed/${projectId}"></iframe>`}
+          value={`<iframe src="${previewUrl}/${ownerUsername}/embed/${projectId}"></iframe>`}
         />
         <CopyableInput
           label={this.props.t('ShareModal.Present')}
           hasPreviewLink
-          value={`${hostname}/${ownerUsername}/present/${projectId}`}
+          value={`${previewUrl}/${ownerUsername}/present/${projectId}`}
         />
         <CopyableInput
           label={this.props.t('ShareModal.Fullscreen')}

server/previewServer.js

@@ -4,7 +4,7 @@ import webpack from 'webpack';
 import webpackDevMiddleware from 'webpack-dev-middleware';
 import webpackHotMiddleware from 'webpack-hot-middleware';
 import config from '../webpack/config.dev';
-
+import embedRoutes from './routes/embed.routes';
 import renderPreviewIndex from './views/previewIndex';
 
 const app = new Express();
@@ -32,6 +32,8 @@ app.get('/', (req, res) => {
   res.send(renderPreviewIndex());
 });
 
+app.use('/', embedRoutes);
+
 app.listen(process.env.PREVIEW_PORT, (error) => {
   if (!error) {
     console.log(

server/routes/redirectEmbed.routes.js

@@ -0,0 +1,21 @@
+import { Router } from 'express';
+
+const router = new Router();
+const previewUrl = process.env.PREVIEW_URL;
+
+router.get('/:username/embed/:project_id', (req, res) => {
+  const { username, project_id: projectId } = req.params;
+  res.redirect(301, `${previewUrl}/${username}/embed/${projectId}`);
+});
+
+router.get('/:username/present/:project_id', (req, res) => {
+  const { username, project_id: projectId } = req.params;
+  res.redirect(301, `${previewUrl}/${username}/present/${projectId}`);
+});
+
+router.get('/embed/:project_id', (req, res) => {
+  const { project_id: projectId } = req.params;
+  res.redirect(301, `${previewUrl}/embed/${projectId}`);
+});
+
+export default router;

server/server.js

@@ -24,7 +24,7 @@ import files from './routes/file.routes';
 import collections from './routes/collection.routes';
 import aws from './routes/aws.routes';
 import serverRoutes from './routes/server.routes';
-import embedRoutes from './routes/embed.routes';
+import redirectEmbedRoutes from './routes/redirectEmbed.routes';
 import assetRoutes from './routes/asset.routes';
 import passportRoutes from './routes/passport.routes';
 import { requestsOfTypeJSON } from './utils/requestsOfType';
@@ -143,7 +143,7 @@ app.use('/', serverRoutes);
 
 app.use(assetRoutes);
 
-app.use('/', embedRoutes);
+app.use('/', redirectEmbedRoutes);
 app.use('/', passportRoutes);
 
 // configure passport