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 remote-tracking branch 'origin' into scratcher-onboarding

Browse source
This commit is contained in:
tomlum 2022-02-04 14:33:54 -05:00
commit 3ec8a7fba8
3 changed files with 61 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
package-lock.json generated
View file

@ -33987,22 +33987,28 @@
}, },
"dependencies": { "dependencies": {
"browserslist": { "browserslist": {
"version": "4.17.3", "version": "4.17.4",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.4.tgz",
"integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==", "integrity": "sha512-Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"caniuse-lite": "^1.0.30001264", "caniuse-lite": "^1.0.30001265",
"electron-to-chromium": "^1.3.857", "electron-to-chromium": "^1.3.867",
"escalade": "^3.1.1", "escalade": "^3.1.1",
"node-releases": "^1.1.77", "node-releases": "^2.0.0",
"picocolors": "^0.2.1" "picocolors": "^1.0.0"
} }
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.867", "version": "1.3.870",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.867.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.870.tgz",
"integrity": "sha512-WbTXOv7hsLhjJyl7jBfDkioaY++iVVZomZ4dU6TMe/SzucV6mUAs2VZn/AehBwuZMiNEQDaPuTGn22YK5o+aDw==", "integrity": "sha512-PiJMshfq6PL+i1V+nKLwhHbCKeD8eAz8rvO9Cwk/7cChOHJBtufmjajLyYLsSRHguRFiOCVx3XzJLeZsIAYfSA==",
"dev": true
},
"picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"dev": true "dev": true
}, },
"semver": { "semver": {
@ -49184,9 +49190,9 @@
} }
}, },
"node-releases": { "node-releases": {
"version": "1.1.77", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.0.tgz",
"integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==", "integrity": "sha512-aA87l0flFYMzCHpTM3DERFSYxc6lv/BltdbRTOMZuxZ0cwZCD3mejE5n9vLhSJCN++/eOqr77G1IO5uXxlQYWA==",
"dev": true "dev": true
}, },
"node-sass": { "node-sass": {
@ -54191,21 +54197,21 @@
} }
}, },
"scratch-blocks": { "scratch-blocks": {
"version": "0.1.0-prerelease.20211013085421", "version": "0.1.0-prerelease.20211019012346",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211013085421.tgz", "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20211019012346.tgz",
"integrity": "sha512-OOa5CgD7ZZ8zFqVUOhiSep4xtRLgswl6mZUqWPVO2BT4SbJH19xlu91xCBpbHm5ozrmA6XMzMJcmX/TO57Ye6A==", "integrity": "sha512-cOPWuMdvM5x/MW1Od+3X3kh/QytJNAIktKWF+PZ+26D58hz8BrJr/OHLd2GE+/EWBeiN+piIqHFwu3PT+s/vjQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"exports-loader": "0.6.3", "exports-loader": "0.6.3",
"google-closure-library": "20190301.0.0", "google-closure-library": "20190301.0.0",
"imports-loader": "0.6.5", "imports-loader": "0.6.5",
"scratch-l10n": "3.14.20211013031511" "scratch-l10n": "3.14.20211015031515"
} }
}, },
"scratch-gui": { "scratch-gui": {
"version": "0.1.0-prerelease.20211013110407", "version": "0.1.0-prerelease.20211020093753",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211013110407.tgz", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20211020093753.tgz",
"integrity": "sha512-2M8qawOyb7fzd16cjeJQUgR70BriUnArRa77TvVADRqpxDDimXs6R7/QA9IwZLNeomrCMHOYZ18gXAI4T9vnsw==", "integrity": "sha512-l4Nu5vvjviSj9mq9WBHvVZaIx6G/kXsU4N3aBqha9sRLDhy0Mh7krJs92yKXJDQI9oGBergE0avb/SRRQ6/luQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"arraybuffer-loader": "^1.0.6", "arraybuffer-loader": "^1.0.6",
@ -54256,14 +54262,14 @@
"redux": "3.7.2", "redux": "3.7.2",
"redux-throttle": "0.1.1", "redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-audio": "0.1.0-prerelease.20200528195344",
"scratch-blocks": "0.1.0-prerelease.20211013085421", "scratch-blocks": "0.1.0-prerelease.20211019012346",
"scratch-l10n": "3.14.20211013031511", "scratch-l10n": "3.14.20211015031515",
"scratch-paint": "0.2.0-prerelease.20211013052452", "scratch-paint": "0.2.0-prerelease.20211015073533",
"scratch-render": "0.1.0-prerelease.20210819221425", "scratch-render": "0.1.0-prerelease.20210819221425",
"scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-render-fonts": "1.0.0-prerelease.20210401210003",
"scratch-storage": "1.3.5", "scratch-storage": "1.3.5",
"scratch-svg-renderer": "0.2.0-prerelease.20210727023023", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023",
"scratch-vm": "0.2.0-prerelease.20211011184543", "scratch-vm": "0.2.0-prerelease.20211015091140",
"startaudiocontext": "1.2.1", "startaudiocontext": "1.2.1",
"style-loader": "^0.23.0", "style-loader": "^0.23.0",
"text-encoding": "0.7.0", "text-encoding": "0.7.0",
@ -54303,16 +54309,24 @@
"dev": true "dev": true
}, },
"browserslist": { "browserslist": {
"version": "4.17.3", "version": "4.17.4",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.4.tgz",
"integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==", "integrity": "sha512-Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"caniuse-lite": "^1.0.30001264", "caniuse-lite": "^1.0.30001265",
"electron-to-chromium": "^1.3.857", "electron-to-chromium": "^1.3.867",
"escalade": "^3.1.1", "escalade": "^3.1.1",
"node-releases": "^1.1.77", "node-releases": "^2.0.0",
"picocolors": "^0.2.1" "picocolors": "^1.0.0"
},
"dependencies": {
"picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"dev": true
}
} }
}, },
"chalk": { "chalk": {
@ -54406,9 +54420,9 @@
"dev": true "dev": true
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.867", "version": "1.3.873",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.867.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.873.tgz",
"integrity": "sha512-WbTXOv7hsLhjJyl7jBfDkioaY++iVVZomZ4dU6TMe/SzucV6mUAs2VZn/AehBwuZMiNEQDaPuTGn22YK5o+aDw==", "integrity": "sha512-TiHlCgl2uP26Z0c67u442c0a2MZCWZNCRnPTQDPhVJ4h9G6z2zU0lApD9H0K9R5yFL5SfdaiVsVD2izOY24xBQ==",
"dev": true "dev": true
}, },
"has-flag": { "has-flag": {
@ -54671,9 +54685,9 @@
} }
}, },
"scratch-l10n": { "scratch-l10n": {
"version": "3.14.20211013031511", "version": "3.14.20211015031515",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211013031511.tgz", "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20211015031515.tgz",
"integrity": "sha512-AeAIz+u7lblZMis8xwA4kxJoRmG4UIjRwRaRaApoicGpbUjap2WFpylSy7ebIDn6CBo8TKNH6mRY9Mmgzp23Kw==", "integrity": "sha512-o7UUf/TAlGyhKKNq6IEEFelsZ2TNkn3QgNmciVoXjtUq6qQFkEuXNPKZ4AZqTucr/LueF+nDvzeQzZaRkrrioQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/cli": "^7.1.2", "@babel/cli": "^7.1.2",
@ -54683,9 +54697,9 @@
} }
}, },
"scratch-paint": { "scratch-paint": {
"version": "0.2.0-prerelease.20211013052452", "version": "0.2.0-prerelease.20211015073533",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211013052452.tgz", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20211015073533.tgz",
"integrity": "sha512-pyKwXuxcxmS9WoHIoiE3CkifZVapIpUOiQmbcM5XV/BS6GqJ8CKwknUFRrO5pM5UUhGU8ksGSnJEtoI80MYqkA==", "integrity": "sha512-KYCxGBfT2crCKcupIpYXCugQtFP/c1v1cSndCW11w47QRkc/of2ugvd+T5isLYMfs8RySRM0j9FQZoP47GZzDA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@scratch/paper": "0.11.20200728195508", "@scratch/paper": "0.11.20200728195508",
@ -54902,9 +54916,9 @@
"dev": true "dev": true
}, },
"scratch-vm": { "scratch-vm": {
"version": "0.2.0-prerelease.20211011184543", "version": "0.2.0-prerelease.20211015091140",
"resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211011184543.tgz", "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20211015091140.tgz",
"integrity": "sha512-4t/uIQt35HGL52U5gp9/DXALycvo1KkFmsAOyOy4hahrI6xLOGA5M27zOZDh4c9GX8EGPV51xzTqLstd/Fh3Wg==", "integrity": "sha512-ipWfHiHK6KTm51/YNFHQABXNTpAtetSsuJAT1WiLykS3Qjf3vD6hd1zGJTyEyLXuwseQIet1gcK8gxhlZjYcxQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@vernier/godirect": "1.5.0", "@vernier/godirect": "1.5.0",

4
package.json
View file

@ -132,8 +132,8 @@
"redux-mock-store": "1.5.4", "redux-mock-store": "1.5.4",
"redux-thunk": "2.0.1", "redux-thunk": "2.0.1",
"sass-loader": "6.0.6", "sass-loader": "6.0.6",
"scratch-gui": "0.1.0-prerelease.20211013110407", "scratch-gui": "0.1.0-prerelease.20211020093753",
"scratch-l10n": "3.14.20211013031511", "scratch-l10n": "3.14.20211015031515",
"selenium-webdriver": "3.6.0", "selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0", "slick-carousel": "1.6.0",
"style-loader": "0.12.3", "style-loader": "0.12.3",

2
src/components/navigation/www/navigation.jsx
View file

@ -84,6 +84,8 @@ class Navigation extends React.Component {
} }
handleSearchSubmit (formData) { handleSearchSubmit (formData) {
if (formData.q.trim() === '') return; // don't submit empty searches
let targetUrl = '/search/projects'; let targetUrl = '/search/projects';
if (formData.q) { if (formData.q) {
targetUrl += `?q=${encodeURIComponent(formData.q)}`; targetUrl += `?q=${encodeURIComponent(formData.q)}`;