diff --git a/.gitignore b/.gitignore index 7f7cccc..d17ae6b 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,5 @@ docs/_build/ # PyBuilder target/ + +.ropeproject diff --git a/ferry/templates/base.html b/ferry/templates/base.html index 61e61f2..cc5a5e5 100644 --- a/ferry/templates/base.html +++ b/ferry/templates/base.html @@ -24,6 +24,37 @@ +{% set navigation_bar = [ +('ferry', 'ferry', 'Färja'), +('timeleft', 'timeleft', 'Räkna ut tid kvar'), +] -%} + + +{% set active_page = active_page|default('ferry') -%} + +{% block navbar -%} + +
+ +
+{% endblock %} {% block body %}{% endblock %} diff --git a/ferry/templates/index.html b/ferry/templates/ferry.html similarity index 72% rename from ferry/templates/index.html rename to ferry/templates/ferry.html index dbd35b1..433abe7 100644 --- a/ferry/templates/index.html +++ b/ferry/templates/ferry.html @@ -1,12 +1,20 @@ {% extends 'base.html' %} +{% set active_page = "ferry" %} +{% block navbar -%} +{{super()}} +{% endblock %} {% block body %} + +
@@ -16,28 +24,23 @@ Tid - Från + {% if info %} Info + {% endif %} {% for value in data %} {{ value['time'] }} - nånting {% if 'info' in value %} - {{ value['info'] }} - {% else %} - nånting + {{ value['info'][0] }} {% endif %} {% endfor %} -
-


- diff --git a/ferry/templates/timeleft.html b/ferry/templates/timeleft.html new file mode 100644 index 0000000..caa47e8 --- /dev/null +++ b/ferry/templates/timeleft.html @@ -0,0 +1,55 @@ + +{% extends 'base.html' %} + +{% set active_page = "timeleft" %} +{% block navbar -%} +{{super()}} +{% endblock %} + +{% block body %} + + +
+
+ + +
+
+ Snitthastighet +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+
+ + +
+
+

+
+ + + + + {% endblock %} diff --git a/ferry/views.py b/ferry/views.py index e5c0a47..36f4f39 100644 --- a/ferry/views.py +++ b/ferry/views.py @@ -1,3 +1,6 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + from ferry.app import app from flask import render_template import requests @@ -5,11 +8,19 @@ from datetime import datetime @app.route('/') -@app.route('/index') -def index(): +def ferry(): data = ferry_request() - print data - return render_template('index.html', data=data) + + info = False + for value in data: + if 'info' in value: + info = True + break + return render_template('ferry.html', data=data, info=info) + +@app.route("/time") +def timeleft(): + return render_template("timeleft.html") def extract_time(json): @@ -20,6 +31,7 @@ def extract_time(json): return -1 +# def ferry_request(): url = 'http://api.trafikinfo.trafikverket.se/beta/data.json' headers = {'Content-Type': 'text/xml'} @@ -68,4 +80,5 @@ def ferry_request(): return result else: + print r.text return 0