scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 01:25:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #2406 from chrisgarrity/issue/2388-embed-project

Browse source 
show embed view
This commit is contained in:
chrisgarrity 2018-12-06 11:51:33 -05:00 committed by GitHub
commit 7ac90afb56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
bin/configure-fastly.js
View file

@ -217,6 +217,52 @@ async.auto({
if (err) return cb(err);
cb(null, redirectResults);
});
}],
embedRedirectHeaders: ['version', function (cb, results) {
async.auto({
requestCondition: function (cb2) {
var condition = {
name: 'routes/projects/embed (request)',
statement: 'req.url ~ "^/projects/embed/(\\d+)"',
type: 'REQUEST',
priority: 10
};
fastly.setCondition(results.version, condition, cb2);
},
responseCondition: function (cb2) {
var condition = {
name: 'routes/projects/embed (response)',
statement: 'req.url ~ "^/projects/embed/(\\d+)"',
type: 'RESPONSE',
priority: 10
};
fastly.setCondition(results.version, condition, cb2);
},
responseObject: ['requestCondition', function (cb2, redirectResults) {
var responseObject = {
name: 'redirects/projects/embed',
status: 301,
response: 'Moved Permanently',
request_condition: redirectResults.requestCondition.name
};
fastly.setResponseObject(results.version, responseObject, cb2);
}],
redirectHeader: ['responseCondition', function (cb2, redirectResults) {
var header = {
name: 'redirects/projects/embed',
action: 'set',
ignore_if_set: 0,
type: 'RESPONSE',
dst: 'http.Location',
src: '"/projects/" + re.group.1 + "/embed"',
response_condition: redirectResults.responseCondition.name
};
fastly.setFastlyHeader(results.version, header, cb2);
}]
}, function (err, redirectResults) {
if (err) return cb(err);
cb(null, redirectResults);
});
}]
}, function (err, results) {
if (err) throw new Error(err);

2
src/routes.json
View file

@ -199,7 +199,7 @@
},
{
"name": "projects",
"pattern": "^/projects(/editor|(/\\d+(/editor|/fullscreen)?)?)?/?(\\?.*)?$",
"pattern": "^/projects(/editor|(/\\d+(/editor|/fullscreen|/embed)?)?)?/?(\\?.*)?$",
"routeAlias": "/projects/?$",
"view": "preview/preview",
"title": "Scratch Project"

5
src/views/preview/project-view.jsx
View file

@ -883,13 +883,16 @@ module.exports.initGuiState = guiInitialState => {
const parts = pathname.split('/').filter(Boolean);
// parts[0]: 'projects'
// parts[1]: either :id or 'editor'
// parts[2]: undefined if no :id, otherwise either 'editor' or 'fullscreen'
// parts[2]: undefined if no :id, otherwise either 'editor', 'fullscreen' or 'embed'
if (parts.indexOf('editor') === -1) {
guiInitialState = GUI.initPlayer(guiInitialState);
}
if (parts.indexOf('fullscreen') !== -1) {
guiInitialState = GUI.initFullScreen(guiInitialState);
}
if (parts.indexOf('embed') !== -1) {
guiInitialState = GUI.initEmbedded(guiInitialState);
}
return guiInitialState;
};