refactoring website

diofeher · Sep 16, 2010 · fd1bb94 · fd1bb94
1 parent ccef710
commit fd1bb94
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 67 deletions.
diff --git a/cobrateam_tests.py b/cobrateam_tests.py
@@ -10,19 +10,7 @@ def setUp(self):
 
     def test_index(self):
         request = self.app.get('/')
-        assert 'Dorgas Manolo' in request.data
+        assert 'Projects' in request.data
 
-    def test_staff(self):
-        request= self.app.get('/staff')
-        assert 'Team' in request.data
-
-    def test_challenges(self):
-        request= self.app.get('/challenges')
-        assert 'challenges' in request.data
-
-    def test_contact(self):
-        request= self.app.get('/contact')
-        assert 'contact' in request.data
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/index.py b/index.py
@@ -6,17 +6,5 @@
 def index():
     return render_template("index.html")
 
-@app.route("/staff")
-def staff():
-    return render_template("staff.html")
-
-@app.route("/challenges")
-def challenges():
-    return render_template("challenges.html")
-
-@app.route("/contact")
-def contact():
-    return render_template("contact.html")
-
 if __name__ == "__main__":
     app.run(debug=True)
diff --git a/templates/base.html b/templates/base.html
@@ -7,17 +7,30 @@
     <div id="header">
       <img src="/static/logo.png"/>
        <br><br>
-       <ul>
-         <li><a href="/staff">STAFF</a> |</li>
-         <li><a href="/challenges">CHALLENGES</a> |</li>
-         <li><a href="/contact">CONTACT</a></li>
-       </ul>
     </div>
     <div id="content">
+        <ul>
+            <h2>Projects</h2>
+            <li><a href="http://github.com/andrewsmedina/pyweek2010">jailbreakerz</a> - casual game developed in python</li>
+            <li><a href="http://github.com/igorsobreira/wifimap">wifimap</a> - search and share wifipoints</li>
+            <li><a href="http://github.com/andrewsmedina/magic2d">magic2d</a> - framework for building 2D games using html5 canvas and javascript</li>
+            <li><a href="http://github.com/andrewsmedina/zeuda">zeuda</a> - mmo game, in node.js and html5 canvas</li>
+            <li><a href="http://github.com/igorsobreira/eizzek">eizzek</a> - simple g-talk bot</li>
+        </ul>
+        <ul>
+            <h2>Developers</h2>
+            <li><a href="http://www.github.com/andrewsmedina/">Andrews Medina</a></li>
+            <li><a href="http://www.github.com/diofeher/">Diógenes Augusto</a></li>
+            <li><a href="http://www.github.com/flavioribeiro/">Flávio Ribeiro</a></li>
+            <li><a href="http://www.github.com/igorsobreira/">Igor Sobreira</a></li>
+            <li><a href="http://github.com/osantana">Osvaldo Santana</a></li>
+            <li><a href="http://github.com/ricobl">Enrico Batista da Luz</a></li>
+            <li><a href="http://github.com/thiagoss">Thiago Santos</a></li>
+            <li><a href="http://github.com/hugobr">Hugo Lopes Tavares</a></li>
+        </ul>
       {% block content %}{% endblock %}
     </div>
     <div id="footer">
-      2010 - CobraTeam
     </div>
 </body>
 </html>
diff --git a/templates/challenges.html b/templates/challenges.html
diff --git a/templates/contact.html b/templates/contact.html
diff --git a/templates/index.html b/templates/index.html
@@ -1,5 +1,36 @@
-{% extends "base.html" %}
-
-{% block content %}
-    Dorgas Manolo
-{% endblock %}
+<html>
+<head>
+    <title>CobraTeam website - CobraTeam.info</title>
+    <link rel="stylesheet" type="text/css" href="static/cobra.css">
+</head>
+<body>
+    <div id="header">
+      <img src="/static/logo.png"/>
+       <br><br>
+    </div>
+    <div id="content">
+        <ul>
+            <h2>Projects</h2>
+            <li><a href="http://github.com/andrewsmedina/pyweek2010">jailbreakerz</a> - casual game developed in python</li>
+            <li><a href="http://github.com/igorsobreira/wifimap">wifimap</a> - search and share wifipoints</li>
+            <li><a href="http://github.com/andrewsmedina/magic2d">magic2d</a> - framework for building 2D games using html5 canvas and javascript</li>
+            <li><a href="http://github.com/andrewsmedina/zeuda">zeuda</a> - mmo game, in node.js and html5 canvas</li>
+            <li><a href="http://github.com/igorsobreira/eizzek">eizzek</a> - simple g-talk bot</li>
+        </ul>
+        <ul>
+            <h2>Developers</h2>
+            <li><a href="http://www.github.com/andrewsmedina/">Andrews Medina</a></li>
+            <li><a href="http://www.github.com/diofeher/">Diógenes Augusto</a></li>
+            <li><a href="http://www.github.com/flavioribeiro/">Flávio Ribeiro</a></li>
+            <li><a href="http://www.github.com/igorsobreira/">Igor Sobreira</a></li>
+            <li><a href="http://github.com/osantana">Osvaldo Santana</a></li>
+            <li><a href="http://github.com/ricobl">Enrico Batista da Luz</a></li>
+            <li><a href="http://github.com/thiagoss">Thiago Santos</a></li>
+            <li><a href="http://github.com/hugobr">Hugo Lopes Tavares</a></li>
+        </ul>
+      {% block content %}{% endblock %}
+    </div>
+    <div id="footer">
+    </div>
+</body>
+</html>
diff --git a/templates/staff.html b/templates/staff.html