Homepage cleanup

9 years ago · be199b77a5
parent bff164afcb
commit be199b77a5
6 changed files with 70 additions and 35 deletions
--- a/gns3server/handlers/init.py
+++ b/gns3server/handlers/init.py
@ -28,21 +28,7 @@ from gns3server.handlers.api.vpcs_handler import VPCSHandler
 from gns3server.handlers.api.config_handler import ConfigHandler
 from gns3server.handlers.api.server_handler import ServerHandler
 from gns3server.handlers.upload_handler import UploadHandler
-from ..web.route import Route
-
-if sys.platform.startswith("linux") or hasattr(sys, "_called_from_test"):
-    from gns3server.handlers.api.iou_handler import IOUHandler
-
-class HomePage:
-
-    @classmethod
-    @Route.get(
-        r"/",
-        description="Home page for GNS3Server",
-        api_version=None
-    )
-    def index(request, response):
-        response.template("homepage.html")
+from gns3server.handlers.index_handler import IndexHandler

 if sys.platform.startswith("linux") or hasattr(sys, "_called_from_test"):
    from gns3server.handlers.api.iou_handler import IOUHandler
--- a/gns3server/handlers/index_handler.py
+++ b/gns3server/handlers/index_handler.py
@ -0,0 +1,27 @@
+#
+# Copyright (C) 2015 GNS3 Technologies Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from ..web.route import Route
+
+class IndexHandler:
+    @classmethod
+    @Route.get(
+        r"/",
+        description="Home page for GNS3Server",
+        api_version=None
+    )
+    def index(request, response):
+        response.template("index.html")
--- a/gns3server/templates/homepage.html
+++ b/gns3server/templates/homepage.html
@ -1,18 +0,0 @@
-<html>
-<head> 
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
-<title>GNS3 Server</title>
-</head>
-<body>
-{% block body %}{% endblock %}
-</body>
-<h3>
-    Welcome to Home page of GNS3.
-</h3>
-<h4>
-    Visit the upload page to try GNS3 features: <a href = "/upload">Upload</a>
-</h4>
-<small>
-    Powered by GNS3 {{gns3_version}}
-</small>
-</html>
--- a/gns3server/templates/index.html
+++ b/gns3server/templates/index.html
@ -0,0 +1,11 @@
+{% extends "layout.html" %}
+{% block body %}
+<h3>
+    Welcome to GNS 3.
+</h3>
+<ul>
+    <li><a href="http://community.gns3.com">Community</a></li>
+    <li><a href="http://api.gns3.net">API documentation</a></li>
+    <li><a href="/upload">Upload images</a></li>
+</ul>
+{% endblock %}
--- a/tests/handlers/test_index.py
+++ b/tests/handlers/test_index.py
@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2015 GNS3 Technologies Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+import aiohttp
+import os
+from unittest.mock import patch
+
+from gns3server.version import __version__
+
+
+def test_index(server):
+    response = server.get('/', api_version=None)
+    assert response.status == 200
+    html = response.html
+    assert "Community" in html
+    assert __version__ in html
--- a/tests/handlers/test_upload.py
+++ b/tests/handlers/test_upload.py
@ -20,8 +20,6 @@ import aiohttp
 import os
 from unittest.mock import patch

-from gns3server.version import __version__
-

 def test_index_upload(server):
    response = server.get('/upload', api_version=None)