diff --git a/twiderboard/flask_app.py b/twiderboard/flask_app.py index eab6414..3745959 100644 --- a/twiderboard/flask_app.py +++ b/twiderboard/flask_app.py @@ -75,7 +75,17 @@ def stop(): @app.route('/') def index(): + return render_template('index.html') + + +@app.route('/statistics') +def statistics(): return render_template('statistics.html') + +@app.route('/about') +def about(): + return render_template('about.html') + if __name__ == '__main__': app.run(debug=True) diff --git a/twiderboard/templates/about.html b/twiderboard/templates/about.html new file mode 100644 index 0000000..4275f27 --- /dev/null +++ b/twiderboard/templates/about.html @@ -0,0 +1,6 @@ +{% extends "layout.html" %} +{% block restbody %} +

+ Nothing +

+{% endblock %} \ No newline at end of file diff --git a/twiderboard/templates/index.html b/twiderboard/templates/index.html new file mode 100644 index 0000000..b4d02ca --- /dev/null +++ b/twiderboard/templates/index.html @@ -0,0 +1,35 @@ +{% extends "layout.html" %} +{% block restbody %} + +

Current Hashtags

+{% include "trendy.html" %} +

Add new Hashtag

+

+ + +
+ Add hashtag! +

+{% endblock %} \ No newline at end of file diff --git a/twiderboard/templates/layout.html b/twiderboard/templates/layout.html index 931b0e4..9f6e7a7 100644 --- a/twiderboard/templates/layout.html +++ b/twiderboard/templates/layout.html @@ -5,4 +5,8 @@ -{% block body %}{% endblock %} \ No newline at end of file +{% block body %} +{% include "top_bar.html" %} +{% block restbody %} +{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/twiderboard/templates/statistics.html b/twiderboard/templates/statistics.html index 3750916..8e67bba 100644 --- a/twiderboard/templates/statistics.html +++ b/twiderboard/templates/statistics.html @@ -1,5 +1,5 @@ {% extends "layout.html" %} -{% block body %} +{% block restbody %} -

Database information

Current number of active hastags in database : @@ -51,11 +28,4 @@ Current number of members in database : ?

-

Hashtags

-

- - -
- Add hashtag! -

{% endblock %} \ No newline at end of file diff --git a/twiderboard/templates/top_bar.html b/twiderboard/templates/top_bar.html new file mode 100644 index 0000000..1f820a8 --- /dev/null +++ b/twiderboard/templates/top_bar.html @@ -0,0 +1,5 @@ + + + + +
StatisticsTracked hashtagsAbout
\ No newline at end of file diff --git a/twiderboard/templates/trendy.html b/twiderboard/templates/trendy.html new file mode 100644 index 0000000..61710ba --- /dev/null +++ b/twiderboard/templates/trendy.html @@ -0,0 +1 @@ +I'm trendy! \ No newline at end of file