Merge pull request #142 from jiro4989/feature/#138-favicon

faviconを追加
jiro4989 · Feb 8, 2020 · ca8b8de · ca8b8de
2 parents 14e51d9 + 1079e34
commit ca8b8de
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 9 deletions.
diff --git a/README.rst b/README.rst
@@ -1,10 +1,20 @@
-=====
-websh
-=====
+==========================================
+websh - Web shellgei execution environment
+==========================================
 
-|ci-test|
+.. raw:: html
 
-`シェル芸botのDockerイメージ`_ を利用したWeb移植。
+   <h3 align="center">
+     <img src="https://github.com/jiro4989/websh/wiki/images/websh_logo.png" />
+   </h3>
+   <p align="center">
+     <a href="https://github.com/jiro4989/websh/releases/latest"><img src="https://img.shields.io/github/release/jiro4989/websh.svg" alt="Latest version" /></a>
+     <a href="https://github.com/jiro4989/websh/actions"><img src="https://github.com/jiro4989/websh/workflows/test/badge.svg" alt="Build Status" /></a>
+     <a href="LICENSE" alt="MIT License"><img src="http://img.shields.io/badge/license-MIT-blue.svg?style=flat" /></a>
+   </p>
+
+| websh はWebブラウザ上でシェル芸botの実行環境を提供するWebアプリです。
+| シェル芸の実行はDockerコンテナ上で行っており、イメージに `シェル芸botのDockerイメージ`_ を使用しています。
 
 * https://websh.jiro4989.com/
 
@@ -224,6 +234,3 @@ Apache License
 .. _Nim: https://nim-lang.org/
 .. _Karax: https://github.com/pragmagic/karax
 .. _Jester: https://github.com/dom96/jester
-
-.. |ci-test| image:: https://github.com/jiro4989/websh/workflows/test/badge.svg
-   :target: https://github.com/jiro4989/websh/actions
diff --git a/docs/websh_favicon.kra b/docs/websh_favicon.kra
diff --git a/docs/websh_logo.kra b/docs/websh_logo.kra
diff --git a/proxy/conf.d/nginx.conf b/proxy/conf.d/nginx.conf
@@ -22,4 +22,16 @@ server {
         proxy_set_header Host $http_host;
         proxy_pass http://127.0.1.1:5000/;
     }
+
+    location = /favicon.ico {
+        error_page    404 = @favicon;
+        access_log    off;
+        log_not_found off;
+    }
+
+    location @favicon {
+        empty_gif;
+        access_log    off;
+        log_not_found off;
+    }
 }
diff --git a/websh_front/public/favicon.ico b/websh_front/public/favicon.ico
diff --git a/websh_front/public/index.html b/websh_front/public/index.html
@@ -5,7 +5,7 @@
   <title>websh</title>
 
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.8.0/css/bulma.min.css">
-
+  <link rel="icon" href="/favicon.ico">
   <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
   <style>
   textarea {