Skip to content

GitLab

S
scratch-www
Commit 26d314a5 authored by Technoboy10's avatar Technoboy10
Browse files
Options

undo weird merge thing that happened a while back

parent 5e7bf857
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 138 deletions
src/routes.json
View file @ 26d314a5
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
{ {
"name": "splash", "name": "splash",
"pattern": "^/?$", "pattern": "^/?$",
"routeAlias": "/?$",
"view": "splash/splash", "view": "splash/splash",
"title": "Imagine, Program, Share", "title": "Imagine, Program, Share",
"viewportWidth": "device-width" "viewportWidth": "device-width"
...@@ -10,213 +9,181 @@ ...@@ -10,213 +9,181 @@
{ {
"name": "about", "name": "about",
"pattern": "^/about/?$", "pattern": "^/about/?$",
"routeAlias": "/about/?$",
"view": "about/about", "view": "about/about",
"title": "About" "title": "About"
}, },
{ {
"name": "guidelines", "name": "developers",
"pattern": "^/community_guidelines/?$", "pattern": "^/developers/?$",
"routeAlias": "/community_guidelines/?$", "view": "developers/developers",
"view": "guidelines/guidelines", "title": "Developers"
"title": "Scratch Community Guidelines"
},
{
"name": "student-complete-registration",
"pattern": "^/classes/complete_registration",
"routeAlias": "/classes/(complete_registration|.+/register/.+)",
"view": "studentcompleteregistration/studentcompleteregistration",
"title": "Complete your Registration"
}, },
{ {
"name": "student-registration", "name": "hoc",
"pattern": "^/classes/:id/register/:token", "pattern": "^/hoc/?$",
"routeAlias": "/classes/(complete_registration|.+/register/.+)", "view": "hoc/hoc",
"view": "studentregistration/studentregistration", "title": "Hour of Code"
"title": "Class Registration"
}, },
{ {
"name": "conference-index", "name": "explore",
"pattern": "^/conference/?$", "pattern": "^/explore/:projects/:all/?$",
"routeAlias": "/conference(?!/201[4-5])", "routeAlias": "^/explore(?!/ajax)",
"view": "conference/index/index", "view": "explore/explore",
"title": "Scratch Conference", "title": "Explore"
"viewportWidth": "device-width"
}, },
{ {
"name": "conference-plan", "name": "explore-redirect",
"pattern": "^/conference/plan/?$", "pattern": "^/explore/?$",
"routeAlias": "/conference(?!/201[4-5])", "routeAlias": "^/explore(?!/ajax)",
"view": "conference/plan/plan", "redirect": "/explore/projects/all"
"title": "Plan Your Visit",
"viewportWidth": "device-width"
}, },
{ {
"name": "conference-expectations", "name": "explore-projects-redirect",
"pattern": "^/conference/expect/?$", "pattern": "^/explore/projects/?$",
"routeAlias": "/conference(?!/201[4-5])", "routeAlias": "^/explore(?!/ajax)",
"view": "conference/expect/expect", "redirect": "/explore/projects/all"
"title": "What to Expect",
"viewportWidth": "device-width"
}, },
{ {
"name": "conference-schedule", "name": "explore-studios-redirect",
"pattern": "^/conference/schedule/?$", "pattern": "^/explore/studios/?$",
"routeAlias": "/conference(?!/201[4-5])", "routeAlias": "^/explore(?!/ajax)",
"view": "conference/schedule/schedule", "redirect": "/explore/studios/all"
"title": "Conference Schedule",
"viewportWidth": "device-width"
}, },
{ {
"name": "conference-details", "name": "search",
"pattern": "^/conference/:id/details/?$", "pattern": "^/search/:projects?$/?$",
"routeAlias": "/conference(?!/201[4-5])", "routeAlias": "^/search",
"view": "conference/details/details", "view": "search/search",
"title": "Event Details", "title": "Search"
"viewportWidth": "device-width"
}, },
{ {
"name": "developers", "name": "credits",
"pattern": "^/developers/?$", "pattern": "^/info/credits/?$",
"routeAlias": "/developers/?$", "view": "credits/credits",
"view": "developers/developers", "title": "Credits"
"title": "Developers"
}, },
{ {
"name": "dmca", "name": "faq",
"pattern": "^/DMCA/?$", "pattern": "^/info/faq/?$",
"routeAlias": "/DMCA/?$", "view": "faq/faq",
"view": "dmca/dmca", "title": "FAQ"
"title": "DMCA"
}, },
{ {
"name": "educator-landing", "name": "educator-landing",
"pattern": "^/educators/?$", "pattern": "^/educators/?$",
"routeAlias": "/educators(?:/(faq|register|waiting))?/?$",
"view": "teachers/landing/landing", "view": "teachers/landing/landing",
"title": "Educators" "title": "Educators"
}, },
{ {
"name": "teacher-faq", "name": "teacher-faq",
"pattern": "^/educators/faq/?$", "pattern": "^/educators/faq/?$",
"routeAlias": "/educators(?:/(faq|register|waiting))?/?$",
"view": "teachers/faq/faq", "view": "teachers/faq/faq",
"title": "Teacher Accounts FAQ" "title": "Teacher Accounts FAQ"
}, },
{
"name": "teacherregistration",
"pattern": "^/educators/register$",
"routeAlias": "/educators(?:/(faq|register|waiting))?/?$",
"view": "teacherregistration/teacherregistration",
"title": "Teacher Registration",
"viewportWidth": "device-width"
},
{
"name": "teacherwaitingroom",
"pattern": "^/educators/waiting",
"routeAlias": "/educators(?:/(faq|register|waiting))?/?$",
"view": "teacherwaitingroom/teacherwaitingroom",
"title": "Thank you for requesting a Scratch Teacher Account"
},
{
"name": "explore",
"pattern": "^/explore/:projects/:all/?$",
"routeAlias": "/explore(?!/ajax)",
"view": "explore/explore",
"title": "Explore"
},
{
"name": "hoc",
"pattern": "^/hoc/?$",
"routeAlias": "/hoc/?$",
"view": "hoc/hoc",
"title": "Hour of Code"
},
{ {
"name": "cards", "name": "cards",
"pattern": "^/info/cards/?$", "pattern": "^/info/cards/?$",
"routeAlias": "/info/(cards|communityblocks-interviews|credits|faq)/?$",
"view": "cards/cards", "view": "cards/cards",
"title": "Cards" "title": "Cards"
}, },
{ {
"name": "communityblocks-interviews", "name": "communityblocks-interviews",
"pattern": "^/info/communityblocks-interviews/?$", "pattern": "^/info/communityblocks-interviews/?$",
"routeAlias": "/info/(cards|communityblocks-interviews|credits|faq|donate)/?$",
"view": "communityblocks-interviews/communityblocks-interviews", "view": "communityblocks-interviews/communityblocks-interviews",
"title": "Community Blocks Beta Tester Interviews" "title": "Community Blocks Beta Tester Interviews"
}, },
{
"name": "credits",
"pattern": "^/info/credits/?$",
"routeAlias": "/info/(cards|communityblocks-interviews|credits|faq)/?$",
"view": "credits/credits",
"title": "Credits"
},
{
"name": "faq",
"pattern": "^/info/faq/?$",
"routeAlias": "/info/(cards|communityblocks-interviews|credits|faq)/?$",
"view": "faq/faq",
"title": "FAQ"
},
{ {
"name": "jobs", "name": "jobs",
"pattern": "^/jobs/?$", "pattern": "^/jobs/?$",
"routeAlias": "/jobs/?$",
"view": "jobs/jobs", "view": "jobs/jobs",
"title": "Jobs" "title": "Jobs"
}, },
{ {
"name": "privacypolicy", "name": "teacherregistration",
"pattern": "^/privacy_policy/?$", "pattern": "^/educators/register$",
"routeAlias": "/privacy_policy/?$", "view": "teacherregistration/teacherregistration",
"view": "privacypolicy/privacypolicy", "title": "Teacher Registration",
"title": "Privacy Policy" "viewportWidth": "device-width"
},
{
"name": "search",
"pattern": "^/search/:projects?$/?$",
"routeAlias": "/search",
"view": "search/search",
"title": "Search"
}, },
{ {
"name": "terms", "name": "teacherwaitingroom",
"pattern": "^/terms_of_use/?$", "pattern": "^/educators/waiting",
"routeAlias": "/terms_of_use/?$", "view": "teacherwaitingroom/teacherwaitingroom",
"view": "terms/terms", "title": "Thank you for requesting a Scratch Teacher Account"
"title": "Scratch Terms of Use"
}, },
{ {
"name": "wedo2", "name": "wedo2",
"pattern": "^/wedo/?$", "pattern": "^/wedo/?$",
"routeAlias": "/wedo/?$",
"view": "wedo2/wedo2", "view": "wedo2/wedo2",
"title": "LEGO WeDo 2.0" "title": "LEGO WeDo 2.0"
}, },
{
"name": "conference-index",
"pattern": "^/conference/?$",
"routeAlias": "^/conference(?!/201[4-5])",
"view": "conference/index/index",
"title": "Scratch Conference",
"viewportWidth": "device-width"
},
{
"name": "conference-plan",
"pattern": "^/conference/plan/?$",
"routeAlias": "^/conference(?!/201[4-5])",
"view": "conference/plan/plan",
"title": "Plan Your Visit",
"viewportWidth": "device-width"
},
{
"name": "conference-expectations",
"pattern": "^/conference/expect/?$",
"routeAlias": "^/conference(?!/201[4-5])",
"view": "conference/expect/expect",
"title": "What to Expect",
"viewportWidth": "device-width"
},
{
"name": "conference-schedule",
"pattern": "^/conference/schedule/?$",
"routeAlias": "^/conference(?!/201[4-5])",
"view": "conference/schedule/schedule",
"title": "Conference Schedule",
"viewportWidth": "device-width"
},
{
"name": "conference-details",
"pattern": "^/conference/:id/details/?$",
"routeAlias": "^/conference(?!/201[4-5])",
"view": "conference/details/details",
"title": "Event Details",
"viewportWidth": "device-width"
},
{ {
"name": "donate", "name": "donate",
"pattern": "^/info/donate/?", "pattern": "^/info/donate/?",
"routeAlias": "/info/(cards|communityblocks-interviews|credits|faq|donate)/?$",
"redirect": "https://secure.donationpay.org/scratchfoundation/" "redirect": "https://secure.donationpay.org/scratchfoundation/"
}, },
{ {
"name": "explore-redirect", "name": "dmca",
"pattern": "^/explore/?$", "pattern": "^/DMCA/?$",
"routeAlias": "/explore(?!/ajax)", "view": "dmca/dmca",
"redirect": "/explore/projects/all" "title": "DMCA"
}, },
{ {
"name": "explore-projects-redirect", "name": "guidelines",
"pattern": "^/explore/projects/?$", "pattern": "^/community_guidelines/?$",
"routeAlias": "/explore(?!/ajax)", "view": "guidelines/guidelines",
"redirect": "/explore/projects/all" "title": "Scratch Community Guidelines"
}, },
{ {
"name": "explore-studios-redirect", "name": "privacypolicy",
"pattern": "^/explore/studios/?$", "pattern": "^/privacy_policy/?$",
"routeAlias": "/explore(?!/ajax)", "view": "privacypolicy/privacypolicy",
"redirect": "/explore/studios/all" "title": "Privacy Policy"
},
{
"name": "terms",
"pattern": "^/terms_of_use/?$",
"view": "terms/terms",
"title": "Scratch Terms of Use"
} }
] ]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment