Skip to content

Commit 03eae2f

Browse files
committed
fixes #479 and fixes #449
1 parent e38474c commit 03eae2f

File tree

6 files changed

+17
-5
lines changed

6 files changed

+17
-5
lines changed

server/routes/asset.routes.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { Router } from 'express';
2+
import { getProjectAsset } from '../controllers/project.controller';
3+
import { getFileContent } from '../controllers/file.controller';
4+
5+
const router = new Router();
6+
7+
router.route('/:username/sketches/:project_id/*').get(getProjectAsset);
8+
9+
router.route('/sketches/:project_id/assets/*?').get(getFileContent);
10+
11+
export default router;

server/routes/file.routes.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ const router = new Router();
55

66
router.route('/projects/:project_id/files').post(FileController.createFile);
77
router.route('/projects/:project_id/files/:file_id').delete(FileController.deleteFile);
8-
router.route('/projects/:project_id/*?').get(FileController.getFileContent);
98

109
export default router;

server/routes/server.routes.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ router.route('/:username/sketches/:project_id').get((req, res) => {
2828
res.send(renderIndex());
2929
});
3030

31-
router.route('/:username/sketches/:project_id/*').get((req, res) => {
32-
getProjectAsset(req, res);
33-
});
3431

3532
// router.route('/full/:project_id').get((req, res) => {
3633
// res.send(renderIndex());

server/server.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import files from './routes/file.routes';
2424
import aws from './routes/aws.routes';
2525
import serverRoutes from './routes/server.routes';
2626
import embedRoutes from './routes/embed.routes';
27+
import assetRoutes from './routes/asset.routes';
2728
import { requestsOfTypeJSON } from './utils/requestsOfType';
2829

2930
import { renderIndex } from './views/index';
@@ -91,6 +92,7 @@ app.use('/api', requestsOfTypeJSON(), sessions);
9192
app.use('/api', requestsOfTypeJSON(), projects);
9293
app.use('/api', requestsOfTypeJSON(), files);
9394
app.use('/api', requestsOfTypeJSON(), aws);
95+
app.use(assetRoutes);
9496
// this is supposed to be TEMPORARY -- until i figure out
9597
// isomorphic rendering
9698
app.use('/', csrfToken, serverRoutes);

server/utils/previewGeneration.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function resolveLinksInString(content, files, projectId) {
2626
while (resolvedFilePath.startsWith('/')) {
2727
resolvedFilePath = resolvedFilePath.substr(1);
2828
}
29-
newContent = newContent.replace(filePath, `/api/projects/${projectId}/${resolvedFilePath}`);
29+
newContent = newContent.replace(filePath, `/sketches/${projectId}/assets/${resolvedFilePath}`);
3030
}
3131
}
3232
}

server/utils/requestsOfType.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
header does not match `type`
55
*/
66
const requestsOfType = type => (req, res, next) => {
7+
console.log(req);
8+
console.log(req.get('content-type'));
79
if (req.get('content-type') != null && !req.is(type)) {
10+
console.log('in requests of type error');
811
return next({ statusCode: 406 }); // 406 UNACCEPTABLE
912
}
1013

0 commit comments

Comments
 (0)