From 09d7a7fb7fd02b5d4a97489208cbcc602d707e1e Mon Sep 17 00:00:00 2001 From: Johannes Henkel Date: Mon, 16 May 2016 16:39:09 -0700 Subject: [PATCH] Add a favicon to the web ui. I went with the one from www.ampproject.org. Also very slightly simplified the location for webcomponents-lite.js in the appengine app. --- validator/build.py | 4 +--- validator/index.js | 10 ++++++++++ validator/webui/amp_favicon.png | Bin 0 -> 3195 bytes validator/webui/app.yaml | 8 ++++++-- validator/webui/index.html | 1 + 5 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 validator/webui/amp_favicon.png diff --git a/validator/build.py b/validator/build.py index 06584ad64d85..a7ffce93f14f 100755 --- a/validator/build.py +++ b/validator/build.py @@ -417,10 +417,8 @@ def CreateWebuiAppengineDist(out_dir): f for f in files if not os.path.isdir(os.path.join(d, f)) and os.path.splitext(f)[1] != '.html']) - webcomponents_out = os.path.join(out_dir, 'webcomponents-lite') - os.mkdir(webcomponents_out) shutil.copyfile('node_modules/webcomponents-lite/webcomponents-lite.js', - os.path.join(webcomponents_out, 'webcomponents-lite.js')) + os.path.join(webui_out, 'webcomponents-lite.js')) logging.info('... success') diff --git a/validator/index.js b/validator/index.js index 5b1266b67e0a..2166045277a0 100755 --- a/validator/index.js +++ b/validator/index.js @@ -410,6 +410,16 @@ function serve(port, validatorScript) { return; } // + // Handle '/amp_favicon.png' + // + if (request.url == '/amp_favicon.png') { + const contents = fs.readFileSync( + path.join(__dirname, 'webui/amp_favicon.png'), 'binary'); + response.writeHead(200, {'Content-Type': 'image/png'}); + response.end(contents, 'binary'); + return; + } + // // Handle fetch?, a request to fetch an arbitrary doc from the // internet. It presents the results as JSON. // diff --git a/validator/webui/amp_favicon.png b/validator/webui/amp_favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..a43306c3a6cf6ead0bc8f4f5faa9c46ba98d7967 GIT binary patch literal 3195 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 literal 0 HcmV?d00001 diff --git a/validator/webui/app.yaml b/validator/webui/app.yaml index e77197f35aa4..344120dafca5 100644 --- a/validator/webui/app.yaml +++ b/validator/webui/app.yaml @@ -19,5 +19,9 @@ handlers: upload: polymer/.*\.html$ - url: /webcomponents-lite.js$ - static_files: webcomponents-lite/webcomponents-lite.js - upload: webcomponents-lite/webcomponents-lite\.js$ + static_files: webcomponents-lite.js + upload: webcomponents-lite\.js$ + +- url: /amp_favicon.png$ + static_files: amp_favicon.png + upload: amp_favicon\.png$ diff --git a/validator/webui/index.html b/validator/webui/index.html index 63f5ce7607fd..e007c62c6975 100644 --- a/validator/webui/index.html +++ b/validator/webui/index.html @@ -18,6 +18,7 @@ The AMP Validator +