Moved static html page to client/app

getredash · Mar 26, 2019 · 3d114d6 · 3d114d6
1 parent 659c032
commit 3d114d6
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 26 deletions.
diff --git a/client/app/index.html b/client/app/index.html
@@ -7,7 +7,7 @@
     <title>Redash</title>
     <script>
       function onIE() {
-        window.location.href = '/unsupported';
+        window.location.href = '/static/unsupported';
       }
       if (
         navigator.userAgent.match('MSIE') || // IE10

diff --git a/client/app/multi_org.html b/client/app/multi_org.html
@@ -7,7 +7,7 @@
     <title>Redash</title>
     <script>
       function onIE() {
-        window.location.href = '/unsupported';
+        window.location.href = '/static/unsupported';
       }
       if (
         navigator.userAgent.match('MSIE') || // IE10

diff --git a/redash/templates/unsupported.html → client/app/unsupported.html b/redash/templates/unsupported.html → client/app/unsupported.html
@@ -46,7 +46,7 @@
 </head>
 <body>
   <div>
-    <a href="https://redash.io"><img src="/static/images/redash_icon_small.png" width="40" height="40"></a>
+    <a href="https://redash.io"><img src="images/redash_icon_small.png" width="40" height="40"></a>
     <h3>Whoops... Redash doesn't support your browser</h3>
   </div>
   <div class="tiled">

diff --git a/package-lock.json b/package-lock.json
diff --git a/redash/handlers/static.py b/redash/handlers/static.py
@@ -20,10 +20,6 @@ def render_index():
     return response
 
 
-@routes.route(org_scoped_rule('/unsupported'))
-def unsupported():
-    return render_template("unsupported.html")
-
 @routes.route(org_scoped_rule('/<path:path>'))
 @routes.route(org_scoped_rule('/'))
 @login_required

diff --git a/webpack.config.js b/webpack.config.js
@@ -72,6 +72,7 @@ const config = {
     }),
     new CopyWebpackPlugin([
       { from: "client/app/assets/robots.txt" },
+      { from: "client/app/unsupported.html" },
       { from: "client/app/assets/css/*.css", to: "styles/", flatten: true },
       { from: "node_modules/jquery/dist/jquery.min.js", to: "js/jquery.min.js" }
     ])