oppia · seanlip · Jul 6, 2019 · Jun 19, 2019 · Jun 21, 2019 · Jun 21, 2019
@@ -404,6 +404,7 @@
 
 # Speed Improvement team.
 /app.yaml @vojtechjelinek @seanlip
+/app_dev.yaml @vojtechjelinek @seanlip
 /core/templates/dev/head/base_components/ @jamesjay4199 @vojtechjelinek
 /core/templates/dev/head/pages/Base.ts @vojtechjelinek @seanlip
 /core/templates/dev/head/pages/base.html @vojtechjelinek @seanlip

@@ -137,20 +137,78 @@ handlers:
   login: admin
   script: main_mail.app
   secure: always
+
+# STATIC PAGES.
+- url: /get_started
+  static_files: core/templates/dev/head/dist/get-started-page.mainpage.html
+  upload: core/templates/dev/head/dist/get-started-page.mainpage.html
+  http_headers:
+    Pragma: no-cache
+    Strict-Transport-Security: "max-age=31536000; includeSubDomains"
+    X-Content-Type-Options: "nosniff"
+    X-Frame-Options: "DENY"
+    X-Xss-Protection: "1; mode=block"
+  secure: always
+  expiration: "0"
+- url: /splash
+  static_files: core/templates/dev/head/dist/splash-page.mainpage.html
+  upload: core/templates/dev/head/dist/splash-page.mainpage.html
+  http_headers:
+    Pragma: no-cache
+    Strict-Transport-Security: "max-age=31536000; includeSubDomains"
+    X-Content-Type-Options: "nosniff"
+    X-Frame-Options: "DENY"
+    X-Xss-Protection: "1; mode=block"
+  secure: always
+  expiration: "0"
+- url: /splash?c=at0
+  static_files: core/templates/dev/head/dist/splash_at0.html
+  upload: core/templates/dev/head/dist/splash_at0.html
+  http_headers:
+    Pragma: no-cache
+    Strict-Transport-Security: "max-age=31536000; includeSubDomains"
+    X-Content-Type-Options: "nosniff"
+    X-Frame-Options: "DENY"
+    X-Xss-Protection: "1; mode=block"
+  secure: always
+  expiration: "0"
+- url: /splash?c=at1
+  static_files: core/templates/dev/head/dist/splash_at1.html
+  upload: core/templates/dev/head/dist/splash_at1.html
+  http_headers:
+    Pragma: no-cache
+    Strict-Transport-Security: "max-age=31536000; includeSubDomains"
+    X-Content-Type-Options: "nosniff"
+    X-Frame-Options: "DENY"
+    X-Xss-Protection: "1; mode=block"
+  secure: always
+  expiration: "0"
+- url: /teach
+  static_files: core/templates/dev/head/dist/teach-page.mainpage.html
+  upload: core/templates/dev/head/dist/teach-page.mainpage.html
+  http_headers:
+    Pragma: no-cache
+    Strict-Transport-Security: "max-age=31536000; includeSubDomains"
+    X-Content-Type-Options: "nosniff"
+    X-Frame-Options: "DENY"
+    X-Xss-Protection: "1; mode=block"
+  secure: always
+  expiration: "0"
+
 - url: /.*
   script: main.app
   secure: always
 
 libraries:
 - name: jinja2
-  version: '2.6'
+  version: "2.6"
 - name: PIL
-  version: '1.1.7'
+  version: "1.1.7"
 # This is needed for sending requests to a mailgun HTTPS URL.
 - name: ssl
-  version: '2.7.11'
+  version: "2.7.11"
 - name: webapp2
-  version: '2.5.2'
+  version: "2.5.2"
 
 env_variables:
   PYTHONHTTPSVERIFY: 1

@@ -341,9 +341,9 @@ def mock_get_current_time(unused_cls):
     def test_redirect_oppia_test_server(self):
         # The old demo server redirects to the new demo server.
         self.get_html_response(
-            'https://oppiaserver.appspot.com/splash', expected_status_int=301)
+            'https://oppiaserver.appspot.com/about', expected_status_int=301)
         self.get_html_response(
-            'https://oppiatestserver.appspot.com/splash')
+            'https://oppiatestserver.appspot.com/about')
 
 
 class EscapingTests(test_utils.GenericTestBase):

@@ -19,34 +19,6 @@
 import feconf
 
 
-class SplashPage(base.BaseHandler):
-    """Landing page for Oppia."""
-
-    @acl_decorators.open_access
-    def get(self):
-        """Handles GET requests."""
-        c_value = self.request.get('c')
-        if not c_value:
-            self.render_template('dist/splash-page.mainpage.html')
-        else:
-            try:
-                self.render_template('dist/splash_%s.html' % c_value)
-            except Exception:
-                # Old c values may have been deprecated, in which case we
-                # revert to the default splash page URL. When redirecting,
-                # we pass any arguments along (except the c_value).
-                arguments = self.request.arguments()
-                query_suffix = '&'.join([
-                    '%s=%s' % (arg_name, self.request.get(arg_name))
-                    for arg_name in arguments if arg_name != 'c'])
-
-                target_url = feconf.SPLASH_URL
-                if query_suffix:
-                    target_url += '?%s' % query_suffix
-                self.redirect(target_url)
-                return
-
-
 class AboutPage(base.BaseHandler):
     """Page with information about Oppia."""
 
@@ -56,24 +28,6 @@ def get(self):
         self.render_template('dist/about-page.mainpage.html')
 
 
-class GetStartedPage(base.BaseHandler):
-    """Page with information about how to get started using Oppia."""
-
-    @acl_decorators.open_access
-    def get(self):
-        """Handles GET requests."""
-        self.render_template('dist/get-started-page.mainpage.html')
-
-
-class TeachPage(base.BaseHandler):
-    """Page with information about how to teach on Oppia."""
-
-    @acl_decorators.open_access
-    def get(self):
-        """Handles GET requests."""
-        self.render_template('dist/teach-page.mainpage.html')
-
-
 class ContactPage(base.BaseHandler):
     """Page with information about how to contact Oppia."""
 

@@ -33,19 +33,6 @@ def test_about_page(self):
         response.mustcontain(
             '<about-page></about-page>')
 
-    def test_splash_page_with_valid_c_value(self):
-        response = self.get_html_response('/splash', params={'c': 'at0'})
-        self.assertIn(
-            'Create fun interactive quizzes that students can do at home.',
-            response.body)
-
-    def test_splash_page_with_invalid_c_value_redirects(self):
-        response = self.get_html_response(
-            '/splash?data=value', params={'c': 'invalid'},
-            expected_status_int=302)
-        self.assertTrue(
-            response.headers['Location'].endswith('/splash?data=value'))
-
     def test_maintenance_page(self):
         fake_urls = []
         fake_urls.append(

diff --git a/core/templates/dev/head/pages/get-started-page/get-started-page.mainpage.html b/core/templates/dev/head/pages/get-started-page/get-started-page.mainpage.html
@@ -7,7 +7,7 @@
     <base-content>
       <content>
         <div class="oppia-static-header">
-          <h1 translate="I18N_GET_STARTED_PAGE_HEADING"></h1>
+          <h1 translate="I18N_GET_STARTED_PAGE_HEADING" class="protractor-test-get-started-page"></h1>
         </div>
         <background-banner></background-banner>
         <div class="oppia-page-card oppia-static-content oppia-static-content-below-banner">

diff --git a/core/templates/dev/head/pages/splash-page/splash-page.mainpage.html b/core/templates/dev/head/pages/splash-page/splash-page.mainpage.html
@@ -7,7 +7,7 @@
   <body>
     <base-content>
       <content>
-        <splash-page></splash-page>
+        <splash-page class="protractor-test-splash-page"></splash-page>
       </content>
     </base-content>
 

diff --git a/core/templates/dev/head/pages/splash-page/splash_at0.html b/core/templates/dev/head/pages/splash-page/splash_at0.html
@@ -7,7 +7,7 @@
   <body>
     <base-content>
       <content>
-        <div ng-controller="Splash">
+        <div ng-controller="Splash" class="protractor-test-splash-page">
           <div class="oppia-splash-section-one text-center">
             <h1 class="oppia-splash-h1" style="max-width: 800px; font-size: 2.3em; line-height: 1.5em; padding-bottom: 0.5em;">Lesson plans aren't just for the schoolday</h1>
 

diff --git a/core/templates/dev/head/pages/splash-page/splash_at1.html b/core/templates/dev/head/pages/splash-page/splash_at1.html
@@ -7,7 +7,7 @@
   <body>
     <base-content>
       <content>
-        <div ng-controller="Splash">
+        <div ng-controller="Splash" class="protractor-test-splash-page">
           <div class="oppia-splash-section-one text-center">
             <h1 class="oppia-splash-h1" style="max-width: 800px; font-size: 2.3em; line-height: 1.5em; padding-bottom: 0.5em;">Tired of the same lesson plans?</h1>
 

diff --git a/core/templates/dev/head/pages/teach-page/teach-page.mainpage.html b/core/templates/dev/head/pages/teach-page/teach-page.mainpage.html
@@ -7,7 +7,7 @@
   <body>
     <base-content>
       <navbar-breadcrumb>
-        <ul class="nav navbar-nav oppia-navbar-breadcrumb">
+        <ul class="nav navbar-nav oppia-navbar-breadcrumb protractor-test-teach-page">
           <li>
             <span class="oppia-navbar-breadcrumb-separator"></span>
             Teach with Oppia

@@ -93,6 +93,32 @@ describe('Oppia static pages tour', function() {
     waitFor.pageToFullyLoad();
   });
 
+  it('visits the Get started page', function() {
+    browser.get('/get_started');
+    waitFor.pageToFullyLoad();
+    expect(element(by.css('.protractor-test-get-started-page'))).toBe(true);
+  });
+
+  it('visits the Teach page', function() {
+    browser.get('/teach');
+    waitFor.pageToFullyLoad();
+    expect(element(by.css('.protractor-test-teach-page'))).toBe(true);
+  });
+
+  it('visits the Splash pages', function() {
+    browser.get('/splash');
+    waitFor.pageToFullyLoad();
+    expect(element(by.css('.protractor-test-splash-page'))).toBe(true);
+
+    browser.get('/splash?c=at0');
+    waitFor.pageToFullyLoad();
+    expect(element(by.css('.protractor-test-splash-page'))).toBe(true);
+
+    browser.get('/splash?c=at1');
+    waitFor.pageToFullyLoad();
+    expect(element(by.css('.protractor-test-splash-page'))).toBe(true);
+  });
+
   afterEach(function() {
     general.checkForConsoleErrors([
       // TODO (Jacob) Remove when

@@ -179,12 +179,9 @@ def ui_access_wrapper(self, *args, **kwargs):
     get_redirect_route(r'/_ah/warmup', WarmupPage),
     get_redirect_route(r'/', HomePageRedirectPage),
 
-    get_redirect_route(feconf.SPLASH_URL, pages.SplashPage),
     get_redirect_route(r'/about', pages.AboutPage),
-    get_redirect_route(r'/get_started', pages.GetStartedPage),
     get_redirect_route(r'/foundation', pages.FoundationRedirectPage),
     get_redirect_route(r'/credits', pages.AboutRedirectPage),
-    get_redirect_route(r'/teach', pages.TeachPage),
     get_redirect_route(r'/participate', pages.TeachRedirectPage),
     get_redirect_route(r'/site_guidelines', pages.TeachRedirectPage),
     get_redirect_route(r'/console_errors', pages.ConsoleErrorPage),

diff --git a/package-lock.json b/package-lock.json
@@ -105,13 +105,20 @@
 # hash).
 # This is because these files don't need cache invalidation, are referenced
 # from third party files or should not be moved to the build directory.
+# Statically served pages from app.yaml should be here to since they don't
+# need cache invalidation.
 FILEPATHS_NOT_TO_RENAME = (
     '*.py',
     'third_party/generated/fonts/*',
     'third_party/generated/js/third_party.min.js.map',
     'third_party/generated/webfonts/*',
     '*.bundle.js',
-    '*.bundle.js.map')
+    '*.bundle.js.map',
+    '*/dist/get-started-page.mainpage.html',
+    '*/dist/splash-page.mainpage.html',
+    '*/dist/splash_at0.html',
+    '*/dist/splash_at1.html',
+    '*/dist/teach-page.mainpage.html')
 
 # Hashes for files with these paths should be provided to the frontend in
 # JS hashes object.
@@ -122,6 +129,25 @@
 HASH_BLOCK_SIZE = 2**20
 
 
+def generate_app_yaml():
+    """Generate app.yaml from app_dev.yaml."""
+    dev_file_prefix = 'core/templates/dev/head'
+    prod_file_prefix = 'build/templates/head'
+    content = '# THIS FILE IS AUTOGENERATED, DO NOT MODIFY\n'
+    with open('app_dev.yaml', 'r') as yaml_file:
+        content += yaml_file.read()
+    for file_path in FILEPATHS_NOT_TO_RENAME:
+        if '/dist/' in file_path:
+            content = content.replace(
+                dev_file_prefix + file_path[1:],
+                prod_file_prefix + file_path[1:])
+    content = content.replace('version: default', '')
+    if os.path.isfile('app.yaml'):
+        os.remove('app.yaml')
+    with open('app.yaml', 'w+') as prod_yaml_file:
+        prod_yaml_file.write(content)
+
+
 def require_compiled_js_dir_to_be_valid():
     """Checks if COMPILED_JS_DIR matches the output directory used in
     TSCONFIG_FILEPATH.
@@ -1302,6 +1328,7 @@ def build():
     if options.prod_mode:
         build_using_webpack()
         minify_third_party_libs(THIRD_PARTY_GENERATED_DEV_DIR)
+        generate_app_yaml()
         if not options.minify_third_party_libs_only:
             generate_build_directory()