Commit graph

210 commits

Author SHA1 Message Date
Eric Rosenbaum
a33f904b17
Merge pull request #2817 from ericrosenbaum/feature/vernier-landing-page
Add Vernier Force and Accel extension landing page
2019-04-10 14:15:27 -04:00
Eric Rosenbaum
05a4c7be06 Rename route to “vernier” 2019-04-10 12:42:53 -04:00
chrisgarrity
3aa37d5a82
Merge pull request #2748 from kyleplo/patch-4
Migrate Starter Projects
2019-03-05 12:40:58 +01:00
kyleplo
1aa87a74c8 Create starter-projects.jsx
* add messages for localization
* define projects to include in starter-projects.json
* add new route and redirect
2019-03-05 12:23:41 +01:00
Ben Wheeler
2a4e076339 corrected mail list form; links use _blank; redirect conference url; logo links to main site 2019-02-28 10:44:30 -05:00
Eric Rosenbaum
fb09d904f9 URL is /vernier 2019-02-27 21:13:46 -05:00
Ben Wheeler
7cbf6764e2 updated route alias for conferences 2019-02-27 17:00:58 -05:00
Ben Wheeler
9509e698cb initial conference 2019 changes 2019-02-15 12:11:14 -05:00
Eric Rosenbaum
777f0cca47 Initial draft of landing page 2019-02-06 11:54:30 -05:00
chrisgarrity
fc5d2ed8c7 Add route for /tutorials shortcut 2019-01-29 17:21:06 +01:00
chrisgarrity
b105c517d6 Add missing resource to .tx/config
The `download/scratch2` l10n file was missing from the config file, along with the new ideas page.

Also, the `name` field in the routes json needs to match the resource name. So changed the `download-scratch2` route name to match the l10n name.
2019-01-29 11:33:45 +01:00
Eric Rosenbaum
3231d4cbd7 Fix WeDo page title 2019-01-22 11:18:59 -05:00
Paul Kaplan
3eb8ad9092 Fix the regexp that allows for query params on faq and download 2019-01-02 11:39:30 -05:00
Colby Gutierrez-Kraybill
e1780b2454
Merge pull request #2552 from colbygk/hotfix/fix_downloads_3faq_routes
[Develop] fix downloads 3faq routes
2019-01-02 06:56:09 -05:00
Colby Gutierrez-Kraybill
25a1854fb1 These should be more greedy, as we sometimes have links from third parties that add query parameters. We don't do anything with the final group match, yet. 2018-12-28 23:43:09 -05:00
picklesrus
60ef644bc7 Add people to acknoledgements. Move credits from /info/credits to /credits. Remove 3.0 from text about illustrations. 2018-12-20 11:02:38 -05:00
picklesrus
37cb2fb7fa redirect /3faq to /info/faq/#scratch3 2018-12-20 10:12:21 -05:00
Paul Kaplan
c768fab47d Add flag for dynamic meta tags in the template 2018-12-17 14:55:27 -05:00
Eric Rosenbaum
e170a9cd4a
Merge pull request #2455 from ericrosenbaum/feature/ideas-page
Ideas page
2018-12-13 13:58:55 -05:00
Eric Rosenbaum
6ae4bb882b Update routes for ideas page 2018-12-13 10:49:04 -05:00
picklesrus
1ce8ef5b0d
Merge pull request #2449 from picklesrus/download-directly-version
New Download page
2018-12-13 10:26:23 -05:00
picklesrus
6dde3fa231 Move the scratch2 download page to /download/scratch2. 2018-12-11 11:26:53 -05:00
chrisgarrity
bc49f04ed6
Merge pull request #2387 from Kenny2github/delete-cards
Redirect /info/cards route to /ideas 
/cc @ericrosenbaum
2018-12-11 10:25:48 -05:00
Eric Rosenbaum
68c8decae9 Remove microworlds pages 2018-12-10 18:06:23 -05:00
Eric Rosenbaum
8e6af59635 Initial draft of ideas page 2018-12-10 18:06:07 -05:00
chrisgarrity
1a1122d984 show embed view
* detect `embed` in the URL
* initialize GUI in embed mode if detected
* match `embed` in the project page route
* add fastly config rules to redirect `/projects/embed/:id` to `/projects/:id/embed`
2018-12-05 17:35:44 -05:00
Kenny2github
2916da2822 Remove routeAlias 2018-12-05 10:33:05 +08:00
Kenny2github
06a38ca247 Redirect /info/cards route to /ideas 2018-12-04 10:47:14 +08:00
chrisgarrity
44e64aede8 Add missing tutorial shortcuts
Add `/bird` and `/makeitfly` as redirects to the tips page.

When the Fly tutorial is created /mak
2018-12-03 10:45:03 -05:00
chrisgarrity
bef5e615f7
Merge pull request #2186 from apple502j/add-parents
Migrate Parents Page
2018-11-28 09:23:01 -05:00
chrisgarrity
345b111371
Merge pull request #2333 from chrisgarrity/feature/2270-shortcut-redirect
Tutorial shortcut redirects
2018-11-21 11:31:00 -05:00
Paul Kaplan
ac6a870a3f
Merge pull request #2334 from chrisgarrity/feature/rename-preview
Rename /preview to /projects
2018-11-20 15:34:03 -05:00
chrisgarrity
2065090bb8
Merge pull request #2262 from sjgllghr/issue/gh2212-migrate-scratch-1.4
Fix gh-2212: Migrate Scratch 1.4 download page
2018-11-19 15:27:49 -05:00
chrisgarrity
494bc3e48d Rename /preview to /projects 2018-11-19 14:59:56 -05:00
chrisgarrity
dd620e1187 Tutorial shortcut redirects
Duplicate tutorial shortcuts previously handled by scratchr2.

Left out routeAlias as that is no longer needed.
2018-11-19 14:18:22 -05:00
chrisgarrity
d2500e88c7
Merge pull request #2302 from chrisgarrity/issue/2281-gettingstarted
Issue/2281 gettingstarted
2018-11-14 17:11:46 -05:00
chrisgarrity
48593869f9 Fix wedo-legacy translations
The translation generatation script uses the view name from the routes file when generating the translations files. So the route `name:` and `view:` must match.

Symptom: when generating translations there were warnings that there were no translations for `wedo-legacy`.
2018-11-12 14:07:44 -05:00
chrisgarrity
062c074407 allow query parameters on the preview route
Preview needs to be able to handle query parameters for tutorials.
2018-11-12 10:16:22 -05:00
S. Gallagher
3ba4e551d4 migrate scratch 1.4 download page 2018-10-31 16:20:35 -07:00
apple502j
9cb2c34a1d
Merge branch 'develop' into add-parents 2018-10-19 21:14:57 +09:00
apple502j
38c85f559d Routes config 2018-10-15 18:16:17 +09:00
Eric Rosenbaum
0c628c3e97 Add new WeDo landing page, move old one to wedo-legacy 2018-08-21 15:16:06 -04:00
Connor Hudson
5f0016f385
Add landing pages for the micro:bit and EV3 extensions (#1981)
* start building ev3 landing page structure

* Inject translations, add more content and structure to ev3 landing page

* Add ev3 route

* add active styles for os chooser buttons

* Add ev3 assets

* Add content and intial styles for everything down to "Sample Projects"

* Add correct padding to all sections on ev3 page

* Add more margins to match the mockup

* Create os chooser component for reuse on other landing pages

* Make EV3 page stateful, add OS logic, change step styles, fix images on Chrome

* Add sample project cards and styles

* Add fixed ev3 icon svg

* Add app store badges (no href on links yet)

* Add section separator, fix sample project card margins

* Add border to project cards, make project cards clickable links

* Add FAQ boilerplate and styling from InformationPage component

* Add indented ol style, example

* Add link style with underline

* Add EV3 retail link

* Content updates

* Fix some z-index issues with os chooser

* micro:bit page mega-commit

* os chooser should not have a higher z-index than nav

* Update starter projects

* Localize OS chooser

* Add localization configuration for EV3 page

* Localize section titles on ev3 page

* Add starter project images and descriptions

* Add link to microbit.org

* Fix tip box width on microbit and ev3 pages

* add l10n strings up to things to try on ev3 page

* Fix lint error in ev3.scss

* Add download link style to ev3

* microbit getting started text and images

* Remove tip about microbit name

* Hex file and starter project download links

* microbit wording updates

* update images

* Fix issues with download link style

* text fix

* Add ev3 starter project downloads

* Add microbit l10n file and config

* Add l10n strings for microbit header and scratch link sections

* Add l10n strings for microbit page up to faq

* content updates

* Fix some page overflow issues

* microbit faq content and style

* Use zipped version of microbit hex file

* Add platform name to scratch link download button

* Add EV3 faq to l10n.json

* Add final strings from micro:bit and EV3 pages to l10n.json files

* Add white download asset

* Tweak styles for ev3 and microbit

* Add some final tweaks to the EV3 page styles

* Add TODO comments about refactoring duplicate code
2018-07-19 18:08:44 -04:00
Connor Hudson
61cfbb90e6 Remove extra characters from preview faq redirect routeAlias 2018-07-17 10:36:13 -04:00
Connor Hudson
a669106796 Redirect /preview-faq -> /3faq, remove "Preview" from faq title 2018-07-16 12:47:18 -04:00
Colby Gutierrez-Kraybill
835b33e91e Add donate and connect (email list) redirects
* https://scratch.mit.edu/donatehttps://secure.donationpay.org/scratchfoundation/
* https://scratch.mit.edu/connecthttps://eepurl.com/cws7_f
2018-06-12 18:27:15 -04:00
Sean Hickey
9ef187aada Updated conference pages for 2018 2018-05-29 11:07:07 -04:00
chrisgarrity
6df58e41fd Correct preview route for fastly
- use more explicit route
- handle fastly error in the callback correctly
- more succinct parsing of the URL path
2018-05-02 17:04:14 -04:00
chrisgarrity
d1420862ea
Initial GUI embed (#1869)
- `/preview/editor` will load GUI with an empty project
- `/preview/:id/editor` will load GUI with a project from the projects server (not local data)
- passes intl object to GUI
- `/preview/:id` with show the project page with an embedded player
- `/preview/:id/fullscreen` will load the project page with the player in fullscreen mode.

* Note that we needed to Increase memory for the build to avoid running out of heap space, and build time increases by about 2 minutes
2018-05-02 15:27:49 -04:00
Ken
68ae157bbf
Add /info/research redirect 2018-04-03 21:13:30 +08:00
Kenny2github
bf8baaf7d0 Fix everything
*Updated to new convention for InformationPages
+Added route in routes.json (might be missing previous /info/research path)
-Removed package-lock.json to fix conflicts
*Updated l10n to not use HTML
2018-04-03 16:22:36 +08:00
chrisgarrity
f836c6e3a8 Adding in remix metadata
- Moved preview state into redux
- Gets remix credit if the project is a remix
- Shows up to 5 remixes (direct children?)
- handles empty remixes result (it’s not an array)
- Added Column component - based on Grid, but doesn’t use frameless to set width.
- allows trailing ‘/‘ on the URL
- cleaned up conditional content
2018-03-14 15:50:27 -04:00
chrisgarrity
79199d6d32 Placeholders for everything ‘above the fold’ 2018-03-08 15:57:19 -05:00
chrisgarrity
ea6de54104 [WIP]: embed GUI in a preview page 2018-02-21 14:39:21 -05:00
Matthew Taylor
3e7ccc6207 Add preview faq page
Implements #1711
2018-01-08 13:39:29 -05:00
Ray Schamp
6c39953c5b Ignore querystring when routing conference page
There should be a generalized solution for this, but my attempts have failed thus far.
2017-12-18 11:50:04 -05:00
The_Grits
8f830c2a04
[master] hotfix hoc2014 redirect 2017-12-02 12:19:45 -05:00
Matthew Taylor
2acf90ba41 Change back routeAlias for conference pages
These are needed to ensure that fastly doesn’t 404 on the 2016 and 2017 sites.
2017-11-21 09:25:42 -05:00
Sheshank Shankar
4f14dfcbe3 Fixes #1633 - Scratch Conference 2018 Website Phase 1 (#1673)
* add 2018 conference page (new subdirectory and index page)

* Redirect /conference route to 2018, and add new route for /conference/2017 for last year's conferences.

* Update mailto link in the footer
2017-11-21 09:19:37 -05:00
Matthew Taylor
b62a4db590 Pass to legacy on message routes with ajax
Currenlty, some legacy endpoints are failing because they’re being directed to www. A similar thing happened with `/explore`, and this is the same fix
2017-09-01 14:39:47 -04:00
Matthew Taylor
3dd768f2f6 GH-1361: Implement Notifications Page (#1487)
* start work on www page
committing out of paranoia.
including changing splash page endpoints

* updates from feedback

thanks @rschamp! This includes:

1. splitting out messages list into a separate component (for clarity)
2. some comment/formatting adjustments for the api calls
3. removal of an extraneous property in emoji-text

* remove duplicate string declaration

* use object.assign instead of defaults deep

we don’t need deep defaults

* fix react warnings
2017-08-31 17:05:22 -04:00
The_Grits
0d76d58f5f Make donate a redirect 2017-07-26 10:26:32 -04:00
The_Grits
d936d0d9c4 Add -redirect tags + reorder 2017-07-21 09:51:45 -04:00
The_Grits
5fa9c6a05f Alphabetize Routes List v2 2017-07-21 07:30:42 -04:00
St19_Galla
43b8f0b38f Down Deep - Scratch Camp 2017 Page (#1409)
* Add files via upload

* Create downdeep.jsx

* Delete downdeep.jsx

* Delete downdeep.scss

* Delete l10n.json

* Delete downdeep.jsx

* Create dd.jsx

* Rename dd.jsx to filler.jsx

* Add files via upload

* Delete dd.jsx

* Delete filler.jsx

* Create filler.jsx

* Add files via upload

* Delete filler.jsx

* Update routes.json

* whoops

* travis

* Update downdeep.jsx

* Update downdeep.scss

* Update downdeep.scss

* Update _colors.scss

* what i get for rushing

* Update downdeep.jsx

* Update l10n.json

* thisandagain's changes

* Carl's Changes

* carl's changes

* carl's changes

* Update downdeep.jsx

* Rename downdeep.jsx to camp.jsx

* Rename downdeep.scss to camp.scss

* Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx

* Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss

* Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json

* Update camp.jsx

* Add files via upload

* Update camp.jsx

* Update camp.scss

* Update l10n.json

* Create filler

* Add files via upload

* Delete bubbles.svg

* Delete dolphin.svg

* Delete fish-divider.svg

* Delete fish-divider2.svg

* Delete map.svg

* Delete ocean-bottom.svg

* Delete ocean-top.svg

* Delete treasure.svg

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update camp.jsx

* whoops

* Update camp.scss

* Update l10n.json

* Update camp.scss

* Update camp.jsx

* Update _colors.scss

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update _colors.scss

* Update camp.scss

* Update camp.scss
2017-07-19 11:48:29 -04:00
chrisgarrity
ced9339fb6 Remove unnecessary ‘^’ from routeAliases 2017-06-29 15:30:26 -04:00
chrisgarrity
ece3d4a1f9 update /help and /info routes 2017-06-29 14:42:17 -04:00
chrisgarrity
ed056701c4 Add /info redirect 2017-06-28 17:25:36 -04:00
chrisgarrity
6469ac3362 Simplify /help redirect pattern (#1366)
Restrict /help redirect to just `/help` or `/help/`. Anything else following help should get handled by scratchr2.
2017-06-23 12:02:15 -04:00
chrisgarrity
39b1400705 Handle /help redirect (#1363) 2017-06-23 10:28:34 -04:00
Matthew Taylor
dd923aa586 change download route 2017-06-22 10:57:30 -04:00
chrisgarrity
74e315dc71 Add new Tips page (#1357)
New of tips page, uses cards from new resources server (s3)

* added get-localized-urls script to get the generated json from the s3 bucket
* added /tips route
* correct localized-urls for other pages
* remove thingstotry
* redirect /go
* fix up /info/cards view to use resources (s3).
* redirect /go to /tips
* change /hoc redirect from /go to /tips
* Add full set of cards pdf download to tips localization
* removed cards and guides from static PDFs, they are all coming from resources.scratch.mit.edu now.
* removed things to try view

Corrections for reviews:
* decided to pretty print the localized URLs
* replaced console.errors with process.stdout and fail with exit(1)
* formatted localized-urls to make it easier to read
* moved link outside  `<Button…` makes whole button clickable instead of just text
* fixed up css styles, removed unnecessary classes
* corrected “unused” resource links
2017-06-21 16:20:18 -04:00
Matthew Taylor
2c7cc52a70 Merge pull request #1359 from mewtaylor/issue/store
[Develop] Hotfix: add redirect for store
2017-06-20 15:37:35 -04:00
Matthew Taylor
73b88c850b Add redirect for store 2017-06-20 14:38:14 -04:00
Matthew Taylor
670633a459 s/view/redirect
thanks @chrisgarrity :)
2017-06-19 11:35:33 -04:00
Matthew Taylor
6e3c255fa7 Make version dependent on xml call
Fixes #1351 by including a call to `version.xml` to get the most up-to-date offline build version, defaulting to the current version, `456.0.3`. This also fixes #1352 by switching the route to `/download`, with a redirect from `/scratch2download/`
2017-06-16 10:11:58 -04:00
Matthew Taylor
348fd2d860 Merge pull request #1258 from TheGrits/patch-3
Fix gh-1254: Migrate Download Page
2017-06-13 17:06:21 -04:00
Matthew Taylor
e7c04044ae remove ?$ from search expressjs expression
I don’t see a reason for this to be here, and it’s breaking the build with the explore change
2017-05-24 17:33:55 -04:00
Matthew Taylor
87da9f3d8a Use regex in express patterns to limit scope
This fixes https://github.com/LLK/scratchr2/issues/3798 by using regex in expressjs patterns, and then also parsing those regex patterns for fastly, such that we can limit the scope of the regex created for a specific view
2017-05-18 13:57:49 -04:00
Matthew Taylor
a56c8d0b37 Update jobs route to include moderator
Fixes #1265 by updating the logic for checking the route to include an optional moderator endpoint check
2017-04-11 12:57:02 -04:00
The_Grits
68d10ffe32 Patch 3 wip (#30) 2017-04-01 10:55:47 -04:00
Matthew Taylor
2954d0916b match routeAlias with that of /jobs route
this `routeAlias` is being added as it’s own path pattern since it’s not matching the other one, causing us to hit our 512 char limit.
2017-02-28 09:55:16 -05:00
The_Grits
8772ab5605 Fix jobs-moderator route 2017-02-28 09:33:18 -05:00
The_Grits
b01c8a44e0 /jobs route
R is for route and that's good enough for me
2017-02-23 12:47:42 -05:00
The_Grits
9a11c04cd2 Add Community Moderator Page 2017-02-23 11:53:29 -05:00
Matthew Taylor
8b772737a3 Add 2017 conference site 2017-02-15 08:35:10 -05:00
Matthew Taylor
67a39e4870 Archive 2016 site
move to a subfolder, do some css shuffling and add some trello style guide stylings to help scope for also adding 2017
2017-02-15 08:34:46 -05:00
The_Grits
e4ffcf00c3 Remove ajax 2017-02-06 17:00:48 -05:00
The_Grits
1cc8083137 Travis Fix 2017-02-01 16:15:18 -05:00
The_Grits
ee2cb185bd Search Redirect 2017-02-01 15:57:04 -05:00
morantsur
e95caef368 Merge branch 'develop' into microworlds_projects 2016-12-20 13:02:46 -05:00
morant
485d3903e0 - Fix routes
- move functions to inline rendering in ttt-tile and mw homepage
2016-12-20 12:06:58 -05:00
morant
7bbb498a4f - Stop using ttt cscc files, and remove all references to ttt that are not needed.
- Update translation strings that are specific to microworlds to have microworlds as prefix.
- Address other comments
2016-12-16 12:18:16 -05:00
Matthew Taylor
134dbbd3a8 Remove routeAlias from splash redirect
It’s not necessary, and I believe is causing confusion for the faslty config.
2016-12-16 10:41:45 -05:00
morant
e3025ea3e9 Added a microworlds homepage, based on the ttt page, at /microworlds/go.
Changed ttt-tile to only show “see guides…” if they exist.
2016-12-15 16:59:48 -05:00
Matthew Taylor
83f6bc6892 add slash
thanks @rschamp!
2016-12-08 17:37:34 -05:00
Matthew Taylor
d3e6fd48cd Move out to redirect 2016-12-08 17:20:34 -05:00
Matthew Taylor
b1595caa95 Handle double slash in splash pattern
This fixes https://github.com/LLK/scratchr2/issues/4195 by updating the regex to catch two slashes. I decided to intentionally not catch more than 2 – it’ll 404 on 3 or more, which seems appropriate.
2016-12-08 10:19:17 -05:00
Matthew Taylor
788b034f32 Remove extra $ 2016-11-22 14:56:27 -05:00
Matthew Taylor
a182367a4e allow querystrings for /go
again, the same as #1004, but needed too soon for a full fix of this issue.
2016-11-22 10:40:35 -05:00