scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2389 from chrisgarrity/issue/2306-projects-404

Browse source 
Show NotAvailable for invalid URL
This commit is contained in:
chrisgarrity 2018-12-05 15:01:51 -05:00 committed by GitHub
commit 8d88ab9b9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,7 @@ class Preview extends React.Component {
const pathname = window.location.pathname.toLowerCase(); const pathname = window.location.pathname.toLowerCase();
const parts = pathname.split('/').filter(Boolean); const parts = pathname.split('/').filter(Boolean);
// parts[0]: 'projects' // parts[0]: 'projects'
// parts[1]: either :id or 'editor' // parts[1]: either :id or 'editor', invalid if neither specified
// parts[2]: undefined if no :id, otherwise either 'editor' or 'fullscreen' // parts[2]: undefined if no :id, otherwise either 'editor' or 'fullscreen'
// Get single-comment id from url hash, using the #comments-{id} scheme from scratch2 // Get single-comment id from url hash, using the #comments-{id} scheme from scratch2
@ -81,6 +81,7 @@ class Preview extends React.Component {
addToStudioOpen: false, addToStudioOpen: false,
extensions: [], extensions: [],
favoriteCount: 0, favoriteCount: 0,
invalidProject: parts.length === 1,
justShared: false, justShared: false,
loveCount: 0, loveCount: 0,
modInfo: { modInfo: {
@ -448,7 +449,7 @@ class Preview extends React.Component {
); );
} }
render () { render () {
if (this.props.projectNotAvailable) { if (this.props.projectNotAvailable || this.state.invalidProject) {
return ( return (
<Page> <Page>
<div className="preview"> <div className="preview">