oppia · seanlip · Jul 6, 2019 · Jun 19, 2019 · Jun 21, 2019 · Jun 21, 2019
diff --git a/app.yaml b/app.yaml
@@ -137,6 +137,64 @@ 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

@@ -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(

@@ -178,12 +178,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),