Update libs, debug html and add user button

[cavote.git] / main.py

diff --git a/main.py b/main.py
index fdb1de4..57c876b 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -4,7 +4,9 @@
 from flask import Flask, request, session, g, redirect, url_for, abort, \
     render_template, flash
 import sqlite3
-from datetime import date
+from datetime import date, timedelta
+import locale
+locale.setlocale(locale.LC_ALL, '')
 
 DATABASE = '/tmp/cavote.db'
 SECRET_KEY = '{J@uRKO,xO-PK7B,jF?>iHbxLasF9s#zjOoy=+:'
@@ -16,7 +18,7 @@ app = Flask(__name__)
 app.config.from_object(__name__)
 
 def connect_db():
-        return sqlite3.connect(app.config['DATABASE'])
+    return sqlite3.connect(app.config['DATABASE'])
 
 @app.before_request
 def before_request():
@@ -26,21 +28,27 @@ def before_request():
 def teardown_request(exception):
     g.db.close()
 
+@app.route('/')
+def home():
+    return render_template('index.html')
+
 @app.route('/admin/votes')
 def show_votes():
-    cur = g.db.execute('select title, description from votes order by id desc')
-    votes = [dict(title=row[0], description=row[1]) for row in cur.fetchall()]
+    cur = g.db.execute('select title, description, date from votes order by id desc')
+    votes = [dict(title=row[0], description=row[1], date=row[2]) for row in cur.fetchall()]
     return render_template('show_votes.html', votes=votes)
 
 @app.route('/admin/vote/add', methods=['POST'])
 def add_vote():
     if not session.get('logged_in'):
         abort(401)
-    g.db.execute('insert into votes (title, description) values (?, ?)',
-                 [request.form['title'], request.form['description']])
+    daten = date.today() + timedelta(days=60)
+    ndate = daten.strftime('%d %B %Y')
+    g.db.execute('insert into votes (title, description, date) values (?, ?, ?)',
+            [request.form['title'], request.form['description'], ndate])
     g.db.commit()
     flash('New entry was successfully posted')
-    return redirect(url_for('show_votes'))
+    return redirect(url_for('home'))
 
 @app.route('/login', methods=['GET', 'POST'])
 def login():
@@ -52,15 +60,16 @@ def login():
             error = 'Invalid password'
         else:
             session['logged_in'] = True
+            session['nickname'] = request.form['username']
             flash('You were logged in')
-            return redirect(url_for('show_votes'))
+            return redirect(url_for('home'))
     return render_template('login.html', error=error)
 
 @app.route('/logout')
 def logout():
     session.pop('logged_in', None)
     flash('You were logged out')
-    return redirect(url_for('show_votes'))
+    return redirect(url_for('home'))