From 024e21439e6208aa180789631e7d31f275a1b334 Mon Sep 17 00:00:00 2001
From: EasyToFindName <34809118+EasyToFindName@users.noreply.github.com>
Date: Sun, 30 Sep 2018 23:14:57 +0300
Subject: [PATCH] Fix favicon's href (#51)

* Fix favicon's href

* Remove wrong index.html
---
 basics/src/main.rs         |  2 +-
 basics/static/index.html   | 90 --------------------------------------
 basics/static/welcome.html |  2 +-
 3 files changed, 2 insertions(+), 92 deletions(-)
 delete mode 100644 basics/static/index.html
diff --git a/basics/src/main.rs b/basics/src/main.rs
index 46e9cbc5..b4fbe9e9 100644
--- a/basics/src/main.rs
+++ b/basics/src/main.rs
@@ -120,7 +120,7 @@ fn main() {
             .resource("/", |r| r.method(Method::GET).f(|req| {
                 println!("{:?}", req);
                 HttpResponse::Found()
-                    .header(header::LOCATION, "static/index.html")
+                    .header(header::LOCATION, "static/welcome.html")
                     .finish()
             }))
             // default
diff --git a/basics/static/index.html b/basics/static/index.html
deleted file mode 100644
index b2fbfcd2..00000000
--- a/basics/static/index.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<html>
-<head>
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js">
-</script>
-  <script language="javascript" type="text/javascript">
-    $(function() {
-      var conn = null;
-      function log(msg) {
-        var control = $('#log');
-        control.html(control.html() + msg + '<br/>');
-        control.scrollTop(control.scrollTop() + 1000);
-      }
-      function connect() {
-        disconnect();
-        var wsUri = (window.location.protocol=='https:'&&'wss://'||'ws://')+window.location.host + '/ws/';
-        conn = new WebSocket(wsUri);
-        log('Connecting...');
-        conn.onopen = function() {
-          log('Connected.');
-          update_ui();
-        };
-        conn.onmessage = function(e) {
-          log('Received: ' + e.data);
-        };
-        conn.onclose = function() {
-          log('Disconnected.');
-          conn = null;
-          update_ui();
-        };
-      }
-      function disconnect() {
-        if (conn != null) {
-          log('Disconnecting...');
-          conn.close();
-          conn = null;
-          update_ui();
-        }
-      }
-      function update_ui() {
-        var msg = '';
-        if (conn == null) {
-          $('#status').text('disconnected');
-          $('#connect').html('Connect');
-        } else {
-          $('#status').text('connected (' + conn.protocol + ')');
-          $('#connect').html('Disconnect');
-        }
-      }
-      $('#connect').click(function() {
-        if (conn == null) {
-          connect();
-        } else {
-          disconnect();
-        }
-        update_ui();
-        return false;
-      });
-      $('#send').click(function() {
-        var text = $('#text').val();
-        log('Sending: ' + text);
-        conn.send(text);
-        $('#text').val('').focus();
-        return false;
-      });
-      $('#text').keyup(function(e) {
-        if (e.keyCode === 13) {
-          $('#send').click();
-          return false;
-        }
-      });
-    });
-</script>
-</head>
-<body>
-<h3>Chat!</h3>
-<div>
-  <button id="connect">Connect</button>&nbsp;|&nbsp;Status:
-  <span id="status">disconnected</span>
-</div>
-<div id="log"
-     style="width:20em;height:15em;overflow:auto;border:1px solid black">
-</div>
-<form id="chatform" onsubmit="return false;">
-  <input id="text" type="text" />
-  <input id="send" type="button" value="Send" />
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/basics/static/welcome.html b/basics/static/welcome.html
index b85527fa..48bf3cfe 100644
--- a/basics/static/welcome.html
+++ b/basics/static/welcome.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html><html><head><title>actix - basics</title>
-    <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /></head>
+    <link rel="shortcut icon" type="image/x-icon" href="/favicon" /></head>
   <body>
     <h1>Welcome <img width="30px" height="30px" src="/static/actixLogo.png" /></h1>
   </body>
