Merge pull request #2302 from chrisgarrity/issue/2281-gettingstarted

Issue/2281 gettingstarted

src/components/intro/intro.jsx

@@ -39,7 +39,7 @@ class Intro extends React.Component {
                     <div className="sprites">
                         <a
                             className="sprite sprite-1"
-                            href="/projects/editor/?tip_bar=getStarted"
+                            href="/projects/editor/?tutorial=getStarted"
                         >
                             <img
                                 alt="Scratch Cat"

src/components/navigation/www/navigation.jsx

@@ -81,7 +81,7 @@ class Navigation extends React.Component {
         window.location.href = `/search/projects?q=${encodeURIComponent(formData.q)}`;
     }
     render () {
-        const createLink = this.props.user ? '/projects/editor/' : '/projects/editor/?tip_bar=home';
+        const createLink = this.props.user ? '/projects/editor/' : '/projects/editor/?tutorial=getStarted';
         return (
             <NavigationBox
                 className={classNames({

src/components/welcome/welcome.jsx

@@ -19,11 +19,11 @@ const Welcome = props => (
     >
         <div className="welcome-col blue">
             <h4>
-                <a href="/projects/editor/?tip_bar=getStarted">
+                <a href="/projects/editor/?tutorial=getStarted">
                     {props.messages['welcome.learn']}
                 </a>
             </h4>
-            <a href="/projects/editor/?tip_bar=getStarted">
+            <a href="/projects/editor/?tutorial=getStarted">
                 <img
                     alt="Get Started"
                     src="/images/welcome-learn.png"

src/routes.json

@@ -199,7 +199,7 @@
     },
     {
         "name": "preview",
-        "pattern": "^/preview(/editor|(/\\d+(/editor|/fullscreen)?)?)?/?$",
+        "pattern": "^/preview(/editor|(/\\d+(/editor|/fullscreen)?)?)?/?(\\?.*)?$",
         "routeAlias": "/preview/?$",
         "view": "preview/preview",
         "title": "Scratch 3.0 Preview"

src/views/faq/l10n.json

@@ -11,7 +11,7 @@
     "faq.aboutScratchTitle":"What is Scratch, and what can I do with it?",
     "faq.aboutScratchBody":"Scratch is a programming language and online community where you can create your own interactive stories, games, and animations -- and share your creations with others around the world. In the process of designing and programming Scratch projects, young people learn to think creatively, reason systematically, and work collaboratively. To learn more about Scratch, check out the <a href=\"/about\">About Scratch</a> page.",
     "faq.makeGameTitle":"How do I make a game or animation with Scratch?",
-    "faq.makeGameBody":"Check out the <a href=\"/tips\">tips page</a> to see lots of ways to get started with Scratch. Or just <a href=\"/projects/editor/?tip_bar=getStarted\">dive in</a> to the project editor.",
+    "faq.makeGameBody":"Check out the <a href=\"/tips\">tips page</a> to see lots of ways to get started with Scratch. Or just <a href=\"/projects/editor/?tutorial=getStarted\">dive in</a> to the project editor.",
     "faq.requirementsTitle":"What are the system requirements for Scratch?",
     "faq.requirementsBody":"To run Scratch 2.0, you need to be using (1) a Windows, ChromeOS, Mac, or Linux computer; (2) a version of <a href=\"https://get.adobe.com/flashplayer/\">Adobe Flash Player</a> released on or after June 15, 2016; (3) a relatively recent web browser: one of the latest two versions of <a href=\"http://google.com/chrome/\">Chrome</a> (Windows, ChromeOS, Mac or Linux), <a href=\"http://www.mozilla.org/firefox/new/\">Firefox</a> (Windows or Mac only), <a href=\"https://support.apple.com/downloads/safari\">Safari</a> (Mac only), <a href=\"https://www.microsoft.com/windows/microsoft-edge\">Edge</a> (Windows only), or <a href=\"https://www.microsoft.com/download/internet-explorer.aspx\">Internet Explorer 11</a> (Windows only). If your computer doesn’t meet these requirements, you can try downloading and installing <a href=\"/scratch_1.4\">Scratch 1.4</a>, which you can still use to share projects to the Scratch 2.0 website.",
     "faq.offlineTitle":"Do you have a downloadable version so I can create and view projects offline?",

src/views/messages/message-rows/user-join.jsx

@@ -24,7 +24,7 @@ const UserJoinMessage = props => (
                     </a>
                 ),
                 makeProjectLink: (
-                    <a href="/projects/editor/?tip_bar=getStarted">
+                    <a href="/projects/editor/?tutorial=getStarted">
                         {props.intl.formatMessage({id: 'messages.userJoinMakeProject'})}
                     </a>
                 )

test/integration-cypress/cypress/smoke-tests/test-navbar-links.js

@@ -22,7 +22,7 @@ describe('test links in nav bar while signed out', function (){
             .click();
         cy
             .url()
-            .should('eq', baseUrl + '/projects/editor/?tip_bar=home');
+            .should('eq', baseUrl + '/projects/editor/?tutorial=getStarted');
     });
 
     it('click Explore', function (){

test/integration/smoke-testing/test_navbar_links.js

@@ -33,7 +33,7 @@ tap.beforeEach(function () {
 // the create link changes depending on whether the user is signed in or not (tips window opens)
 tap.test('checkCreateLinkWhenSignedOut', function (t) {
     var xPathLink = '//li[contains(@class, "link") and contains(@class, "create")]/a';
-    var expectedHref = '/projects/editor/?tip_bar=home';
+    var expectedHref = '/projects/editor/?tutorial=getStarted';
     driver.findElement(webdriver.By.xpath(xPathLink))
         .then(function (element) {
             return element.getAttribute('href');