From 5fa9c6a05f51aa951ffcadd71d4da7cd176b03fa Mon Sep 17 00:00:00 2001 From: The_Grits Date: Fri, 21 Jul 2017 07:30:42 -0400 Subject: [PATCH 1/5] Alphabetize Routes List v2 --- src/routes.json | 384 ++++++++++++++++++++++++------------------------ 1 file changed, 192 insertions(+), 192 deletions(-) diff --git a/src/routes.json b/src/routes.json index 13f077c9f..33903d0f4 100644 --- a/src/routes.json +++ b/src/routes.json @@ -1,16 +1,4 @@ [ - { - "name": "splash", - "pattern": "^/?$", - "routeAlias": "/?$", - "view": "splash/splash", - "title": "Imagine, Program, Share" - }, - { - "name": "splash-redirect", - "pattern": "^///?$", - "redirect": "/" - }, { "name": "about", "pattern": "^/about/?$", @@ -19,25 +7,39 @@ "title": "About" }, { - "name": "guidelines", - "pattern": "^/community_guidelines/?$", - "routeAlias": "/community_guidelines/?$", - "view": "guidelines/guidelines", - "title": "Scratch Community Guidelines" + "name": "camp", + "pattern": "^/camp/?$", + "routeAlias": "/camp/?$", + "view": "camp/camp", + "title": "Down Deep" }, { - "name": "student-complete-registration", - "pattern": "^/classes/complete_registration", - "routeAlias": "/classes/(complete_registration|.+/register/.+)", - "view": "studentcompleteregistration/studentcompleteregistration", - "title": "Complete your Registration" + "name": "cards", + "pattern": "^/info/cards/?$", + "routeAlias": "/info/(cards|communityblocks-interviews|credits|faq)/?$", + "view": "cards/cards", + "title": "Cards" }, { - "name": "student-registration", - "pattern": "^/classes/:id/register/:token", - "routeAlias": "/classes/(complete_registration|.+/register/.+)", - "view": "studentregistration/studentregistration", - "title": "Class Registration" + "name": "communityblocks-interviews", + "pattern": "^/info/communityblocks-interviews/?$", + "routeAlias": "/info/(cards|communityblocks-interviews|credits|faq|donate)/?$", + "view": "communityblocks-interviews/communityblocks-interviews", + "title": "Community Blocks Beta Tester Interviews" + }, + { + "name": "conference-details-2016", + "pattern": "^/conference/2016/:id/details/?$", + "routeAlias": "/conference(?!/201[4-5])", + "view": "conference/2016/details/details", + "title": "Event Details" + }, + { + "name": "conference-expectations-2016", + "pattern": "^/conference/2016/expect/?$", + "routeAlias": "/conference(?!/201[4-5])", + "view": "conference/2016/expect/expect", + "title": "What to Expect" }, { "name": "conference-index", @@ -62,13 +64,6 @@ "view": "conference/2016/plan/plan", "title": "Plan Your Visit" }, - { - "name": "conference-expectations-2016", - "pattern": "^/conference/2016/expect/?$", - "routeAlias": "/conference(?!/201[4-5])", - "view": "conference/2016/expect/expect", - "title": "What to Expect" - }, { "name": "conference-schedule-2016", "pattern": "^/conference/2016/schedule/?$", @@ -77,11 +72,11 @@ "title": "Conference Schedule" }, { - "name": "conference-details-2016", - "pattern": "^/conference/2016/:id/details/?$", - "routeAlias": "/conference(?!/201[4-5])", - "view": "conference/2016/details/details", - "title": "Event Details" + "name": "credits", + "pattern": "^/info/credits/?$", + "routeAlias": "/info/(cards|communityblocks-interviews|credits|faq|donate)/?$", + "view": "credits/credits", + "title": "Credits" }, { "name": "developers", @@ -98,11 +93,17 @@ "title": "DMCA" }, { - "name": "camp", - "pattern": "^/camp/?$", - "routeAlias": "/camp/?$", - "view": "camp/camp", - "title": "Down Deep" + "name": "donate", + "pattern": "^/info/donate/?", + "routeAlias": "/info/(cards|communityblocks-interviews|credits|faq|donate)/?$", + "redirect": "https://secure.donationpay.org/scratchfoundation/" + }, + { + "name": "download", + "pattern": "^/download/?$", + "routeAlias": "/download", + "view": "download/download", + "title": "Scratch Offline Editor" }, { "name": "educator-landing", @@ -111,6 +112,123 @@ "view": "teachers/landing/landing", "title": "Educators" }, + { + "name": "explore", + "pattern": "^/explore/:projects(projects|studios)/:all/?$", + "routeAlias": "/explore(?!/ajax)", + "view": "explore/explore", + "title": "Explore" + }, + { + "name": "faq", + "pattern": "^/info/faq/?$", + "routeAlias": "/info/(cards|communityblocks-interviews|credits|faq)/?$", + "view": "faq/faq", + "title": "FAQ" + }, + { + "name": "guidelines", + "pattern": "^/community_guidelines/?$", + "routeAlias": "/community_guidelines/?$", + "view": "guidelines/guidelines", + "title": "Scratch Community Guidelines" + }, + { + "name": "help", + "pattern": "^/help/?(\\?.*)?$", + "routeAlias": "/help/?(\\?.*)?$", + "redirect": "/tips" + }, + { + "name": "hoc", + "pattern": "^/hoc/?(\\?.*)?$", + "routeAlias": "/hoc/?\\??", + "redirect": "/tips" + }, + { + "name": "jobs", + "pattern": "^/jobs/?$", + "routeAlias": "/jobs(/moderator)?/?$", + "view": "jobs/jobs", + "title": "Jobs" + }, + { + "name": "jobs-moderator", + "pattern": "^/jobs/moderator/?$", + "routeAlias": "/jobs(/moderator)?/?$", + "view": "jobs/moderator/moderator", + "title": "Community Moderator" + }, + { + "name": "microworld-art", + "pattern": "^/microworlds/art", + "routeAlias": "/microworlds", + "view": "microworld/art/art", + "title": "Art" + }, + { + "name": "microworld-fashion", + "pattern": "^/microworlds/fashion", + "routeAlias": "/microworlds", + "view": "microworld/fashion/fashion", + "title": "Fashion" + }, + { + "name": "microworld-hiphop", + "pattern": "^/microworlds/hiphop", + "routeAlias": "/microworlds", + "view": "microworld/hiphop/hiphop", + "title": "Hip Hop Dance" + }, + { + "name": "microworld-soccer", + "pattern": "^/microworlds/soccer", + "routeAlias": "/microworlds", + "view": "microworld/soccer/soccer", + "title": "Soccer" + }, + { + "name": "microworlds-homepage", + "pattern": "^/microworlds/go/?(\\?.*)?$", + "routeAlias": "/microworlds", + "view": "microworldshomepage/microworldshomepage", + "title": "Microworlds" + }, + { + "name": "privacypolicy", + "pattern": "^/privacy_policy/?$", + "routeAlias": "/privacy_policy/?$", + "view": "privacypolicy/privacypolicy", + "title": "Privacy Policy" + }, + { + "name": "search", + "pattern": "^/search/:projects/?$", + "routeAlias": "/search", + "view": "search/search", + "title": "Search" + }, + { + "name": "splash", + "pattern": "^/?$", + "routeAlias": "/?$", + "view": "splash/splash", + "title": "Imagine, Program, Share" + }, + { + "name": "student-complete-registration", + "pattern": "^/classes/complete_registration", + "routeAlias": "/classes/(complete_registration|.+/register/.+)", + "view": "studentcompleteregistration/studentcompleteregistration", + "title": "Complete your Registration" + }, + { + "name": "student-registration", + "pattern": "^/classes/:id/register/:token", + "routeAlias": "/classes/(complete_registration|.+/register/.+)", + "view": "studentregistration/studentregistration", + "title": "Class Registration" + }, { "name": "teacher-faq", "pattern": "^/educators/faq/?$", @@ -133,24 +251,11 @@ "title": "Thank you for requesting a Scratch Teacher Account" }, { - "name": "explore", - "pattern": "^/explore/:projects(projects|studios)/:all/?$", - "routeAlias": "/explore(?!/ajax)", - "view": "explore/explore", - "title": "Explore" - }, - { - "name": "hoc", - "pattern": "^/hoc/?(\\?.*)?$", - "routeAlias": "/hoc/?\\??", - "redirect": "/tips" - }, - { - "name": "cards", - "pattern": "^/info/cards/?$", - "routeAlias": "/info/(cards|communityblocks-interviews|credits|faq)/?$", - "view": "cards/cards", - "title": "Cards" + "name": "terms", + "pattern": "^/terms_of_use/?$", + "routeAlias": "/terms_of_use/?$", + "view": "terms/terms", + "title": "Scratch Terms of Use" }, { "name": "things-to-try", @@ -158,18 +263,6 @@ "routeAlias": "/go/?\\??", "redirect": "/tips" }, - { - "name": "help", - "pattern": "^/help/?(\\?.*)?$", - "routeAlias": "/help/?(\\?.*)?$", - "redirect": "/tips" - }, - { - "name": "info-redirect", - "pattern": "^/info/?(\\?.*)?$", - "routeAlias": "/info/?(\\?.*)?$", - "redirect": "/tips" - }, { "name": "tips", "pattern": "^/tips/?(\\?.*)?$", @@ -177,75 +270,6 @@ "view": "tips/tips", "title": "Tips" }, - { - "name": "communityblocks-interviews", - "pattern": "^/info/communityblocks-interviews/?$", - "routeAlias": "/info/(cards|communityblocks-interviews|credits|faq|donate)/?$", - "view": "communityblocks-interviews/communityblocks-interviews", - "title": "Community Blocks Beta Tester Interviews" - }, - { - "name": "credits", - "pattern": "^/info/credits/?$", - "routeAlias": "/info/(cards|communityblocks-interviews|credits|faq|donate)/?$", - "view": "credits/credits", - "title": "Credits" - }, - { - "name": "download", - "pattern": "^/download/?$", - "routeAlias": "/download", - "view": "download/download", - "title": "Scratch Offline Editor" - }, - { - "name": "faq", - "pattern": "^/info/faq/?$", - "routeAlias": "/info/(cards|communityblocks-interviews|credits|faq)/?$", - "view": "faq/faq", - "title": "FAQ" - }, - { - "name": "jobs", - "pattern": "^/jobs/?$", - "routeAlias": "/jobs(/moderator)?/?$", - "view": "jobs/jobs", - "title": "Jobs" - }, - { - "name": "jobs-moderator", - "pattern": "^/jobs/moderator/?$", - "routeAlias": "/jobs(/moderator)?/?$", - "view": "jobs/moderator/moderator", - "title": "Community Moderator" - }, - { - "name": "privacypolicy", - "pattern": "^/privacy_policy/?$", - "routeAlias": "/privacy_policy/?$", - "view": "privacypolicy/privacypolicy", - "title": "Privacy Policy" - }, - { - "name": "search", - "pattern": "^/search/:projects/?$", - "routeAlias": "/search", - "view": "search/search", - "title": "Search" - }, - { - "name": "search-redirect", - "pattern": "^/search/?$", - "routeAlias": "/search", - "redirect": "/search/projects" - }, - { - "name": "terms", - "pattern": "^/terms_of_use/?$", - "routeAlias": "/terms_of_use/?$", - "view": "terms/terms", - "title": "Scratch Terms of Use" - }, { "name": "wedo2", "pattern": "^/wedo/?$", @@ -254,22 +278,10 @@ "title": "LEGO WeDo 2.0" }, { - "name": "donate", - "pattern": "^/info/donate/?", - "routeAlias": "/info/(cards|communityblocks-interviews|credits|faq|donate)/?$", - "redirect": "https://secure.donationpay.org/scratchfoundation/" - }, - { - "name": "store", - "pattern": "^/store/?$", - "routeAlias": "/store", - "redirect": "https://scratch-foundation.myshopify.com" - }, - { - "name": "explore-redirect", - "pattern": "^/explore/?$", - "routeAlias": "/explore(?!/ajax)", - "redirect": "/explore/projects/all" + "name": "download-redirect", + "pattern": "^/scratch2download/?$", + "routeAlias": "/scratch2download", + "redirect": "/download" }, { "name": "explore-projects-redirect", @@ -277,6 +289,12 @@ "routeAlias": "/explore(?!/ajax)", "redirect": "/explore/projects/all" }, + { + "name": "explore-redirect", + "pattern": "^/explore/?$", + "routeAlias": "/explore(?!/ajax)", + "redirect": "/explore/projects/all" + }, { "name": "explore-studios-redirect", "pattern": "^/explore/studios/?$", @@ -284,44 +302,26 @@ "redirect": "/explore/studios/all" }, { - "name": "download-redirect", - "pattern": "^/scratch2download/?$", - "routeAlias": "/scratch2download", - "redirect": "/download" + "name": "info-redirect", + "pattern": "^/info/?(\\?.*)?$", + "routeAlias": "/info/?(\\?.*)?$", + "redirect": "/tips" }, { - "name": "microworld-art", - "pattern": "^/microworlds/art", - "routeAlias": "/microworlds", - "view": "microworld/art/art", - "title": "Art" + "name": "search-redirect", + "pattern": "^/search/?$", + "routeAlias": "/search", + "redirect": "/search/projects" }, { - "name": "microworld-hiphop", - "pattern": "^/microworlds/hiphop", - "routeAlias": "/microworlds", - "view": "microworld/hiphop/hiphop", - "title": "Hip Hop Dance" + "name": "splash-redirect", + "pattern": "^///?$", + "redirect": "/" }, { - "name": "microworld-fashion", - "pattern": "^/microworlds/fashion", - "routeAlias": "/microworlds", - "view": "microworld/fashion/fashion", - "title": "Fashion" - }, - { - "name": "microworld-soccer", - "pattern": "^/microworlds/soccer", - "routeAlias": "/microworlds", - "view": "microworld/soccer/soccer", - "title": "Soccer" - }, - { - "name": "microworlds-homepage", - "pattern": "^/microworlds/go/?(\\?.*)?$", - "routeAlias": "/microworlds", - "view": "microworldshomepage/microworldshomepage", - "title": "Microworlds" + "name": "store", + "pattern": "^/store/?$", + "routeAlias": "/store", + "redirect": "https://scratch-foundation.myshopify.com" } ] From d936d0d9c4b903f2e86ce216ff9d6e247d2bbd06 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Fri, 21 Jul 2017 09:51:45 -0400 Subject: [PATCH 2/5] Add -redirect tags + reorder --- src/routes.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/routes.json b/src/routes.json index 33903d0f4..ffff6c53b 100644 --- a/src/routes.json +++ b/src/routes.json @@ -133,18 +133,6 @@ "view": "guidelines/guidelines", "title": "Scratch Community Guidelines" }, - { - "name": "help", - "pattern": "^/help/?(\\?.*)?$", - "routeAlias": "/help/?(\\?.*)?$", - "redirect": "/tips" - }, - { - "name": "hoc", - "pattern": "^/hoc/?(\\?.*)?$", - "routeAlias": "/hoc/?\\??", - "redirect": "/tips" - }, { "name": "jobs", "pattern": "^/jobs/?$", @@ -257,12 +245,6 @@ "view": "terms/terms", "title": "Scratch Terms of Use" }, - { - "name": "things-to-try", - "pattern": "^/go/?(\\?.*)?$", - "routeAlias": "/go/?\\??", - "redirect": "/tips" - }, { "name": "tips", "pattern": "^/tips/?(\\?.*)?$", @@ -301,6 +283,18 @@ "routeAlias": "/explore(?!/ajax)", "redirect": "/explore/studios/all" }, + { + "name": "help-redirect", + "pattern": "^/help/?(\\?.*)?$", + "routeAlias": "/help/?(\\?.*)?$", + "redirect": "/tips" + }, + { + "name": "hoc-redirect", + "pattern": "^/hoc/?(\\?.*)?$", + "routeAlias": "/hoc/?\\??", + "redirect": "/tips" + }, { "name": "info-redirect", "pattern": "^/info/?(\\?.*)?$", @@ -323,5 +317,11 @@ "pattern": "^/store/?$", "routeAlias": "/store", "redirect": "https://scratch-foundation.myshopify.com" + }, + { + "name": "things-to-try-redirect", + "pattern": "^/go/?(\\?.*)?$", + "routeAlias": "/go/?\\??", + "redirect": "/tips" } ] From 0d76d58f5f03a8f066e65aa1dfd96c2421e68700 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Wed, 26 Jul 2017 10:26:32 -0400 Subject: [PATCH 3/5] Make donate a redirect --- src/routes.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/routes.json b/src/routes.json index ffff6c53b..d0fd1ac04 100644 --- a/src/routes.json +++ b/src/routes.json @@ -92,12 +92,6 @@ "view": "dmca/dmca", "title": "DMCA" }, - { - "name": "donate", - "pattern": "^/info/donate/?", - "routeAlias": "/info/(cards|communityblocks-interviews|credits|faq|donate)/?$", - "redirect": "https://secure.donationpay.org/scratchfoundation/" - }, { "name": "download", "pattern": "^/download/?$", @@ -259,6 +253,12 @@ "view": "wedo2/wedo2", "title": "LEGO WeDo 2.0" }, + { + "name": "donate-redirect", + "pattern": "^/info/donate/?", + "routeAlias": "/info/(cards|communityblocks-interviews|credits|faq|donate)/?$", + "redirect": "https://secure.donationpay.org/scratchfoundation/" + }, { "name": "download-redirect", "pattern": "^/scratch2download/?$", From d8a62719cb09c87944d4189dd60e695a69adb4e3 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Wed, 26 Jul 2017 14:49:17 -0400 Subject: [PATCH 4/5] Update Community Guidelines --- src/views/guidelines/l10n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/guidelines/l10n.json b/src/views/guidelines/l10n.json index 02b22e594..74be1cb19 100644 --- a/src/views/guidelines/l10n.json +++ b/src/views/guidelines/l10n.json @@ -13,5 +13,5 @@ "guidelines.honestybody": "Don’t try to impersonate other Scratchers, spread rumors, or otherwise try to trick the community.", "guidelines.friendlyheader": "Help keep the site friendly.", "guidelines.friendlybody": "If you think a project or comment is mean, insulting, too violent, or otherwise inappropriate, click “Report” to let us know about it.", - "guidelines.footer": "Scratch welcomes people of all ages, races, ethnicities, religions, sexual orientations, and gender identities." + "guidelines.footer": "Scratch welcomes people of all ages, races, ethnicities, religions, abilities, sexual orientations, and gender identities." } From 2cf2e7e9519c3a3f8f904051794466f477ecdfcd Mon Sep 17 00:00:00 2001 From: St19_Galla Date: Thu, 27 Jul 2017 11:30:39 -0400 Subject: [PATCH 5/5] Remove Moderator Position --- src/views/jobs/jobs.jsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/views/jobs/jobs.jsx b/src/views/jobs/jobs.jsx index 33f273e8b..9f6b11bf7 100644 --- a/src/views/jobs/jobs.jsx +++ b/src/views/jobs/jobs.jsx @@ -30,14 +30,6 @@ var Jobs = React.createClass({