Remove logged_in variable

[cavote.git] / main.py

diff --git a/main.py b/main.py
index fdb1de4..77310af 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,45 +28,101 @@ def before_request():
 def teardown_request(exception):
     g.db.close()
 
-@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()]
-    return render_template('show_votes.html', votes=votes)
+@app.route('/')
+def home():
+    return render_template('index.html')
 
-@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']])
-    g.db.commit()
-    flash('New entry was successfully posted')
-    return redirect(url_for('show_votes'))
+
+#----------------
+# Login / Logout
+
+def valid_login(username, password):
+    return username == app.config['USERNAME'] and password == app.config['PASSWORD']
 
 @app.route('/login', methods=['GET', 'POST'])
 def login():
     error = None
     if request.method == 'POST':
-        if request.form['username'] != app.config['USERNAME']:
-            error = 'Invalid username'
-        elif request.form['password'] != app.config['PASSWORD']:
-            error = 'Invalid password'
-        else:
-            session['logged_in'] = True
+        if valid_login(request.form['username'], request.form['password']):
+            session['username'] = request.form['username']
+            if session['username'] == 'admin':
+                session['is_admin'] = True
             flash('You were logged in')
-            return redirect(url_for('show_votes'))
+            return redirect(url_for('home'))
+        else:
+            error = "Invalid username/password"
     return render_template('login.html', error=error)
 
 @app.route('/logout')
 def logout():
-    session.pop('logged_in', None)
+    session.pop('username', None)
+    session.pop('is_admin', None)
     flash('You were logged out')
-    return redirect(url_for('show_votes'))
+    return redirect(url_for('home'))
+
+#---------------
+# User settings
+@app.route('/user/settings/<username>')
+def show_settings(username):
+    if username != session['username']:
+        abort(401)
+
+
+#------------
+# User admin
 
 
+#------------
+# Votes list
+
+@app.route('/votes/<votes>')
+def show_votes(votes):
+    today = date.today()
+    if votes == 'all':
+        cur = g.db.execute('select title, description, date_begin, date_end from votes order by id desc')
+    elif votes == 'archives':
+        cur = g.db.execute('select title, description, date_begin, date_end from votes where date_end < (?) order by id desc', [today])
+    elif votes == 'currently':
+        cur = g.db.execute('select title, description, date_begin, date_end from votes where date_end >= (?) order by id desc', [today])
+    else:
+        abort(404)
+    votes = [dict(title=row[0], description=row[1], date_begin=row[2], date_end=row[3], 
+        pourcent=60) for row in cur.fetchall()]
+    return render_template('show_votes.html', votes=votes)
+
+#-------------
+# Votes admin
+
+@app.route('/votes/admin/new')
+def new_vote():
+    if not session.get('is_admin'):
+        abort(401)
+    return render_template('new_vote.html')
+
+@app.route('/votes/admin/add', methods=['POST'])
+def add_vote():
+    if not session.get('is_admin'):
+        abort(401)
+    date_begin = date.today()
+    date_end = date.today() + timedelta(days=int(request.form['days']))
+    transparent = 0
+    public = 0
+    multiplechoice = 0
+    if 'transparent' in request.form.keys():
+        transparent = 1
+    if 'public' in request.form.keys():
+        public = 1
+    if 'multiplechoice' in request.form.keys():
+        multiplechoice = 1
+    g.db.execute('insert into votes (title, description, date_begin, date_end, is_transparent, is_public, is_multiplechoice) values (?, ?, ?, ?, ?, ?, ?)',
+            [request.form['title'], request.form['description'], date_begin, date_end, transparent, public, multiplechoice])
+    g.db.commit()
+    flash('New entry was successfully posted')
+    return redirect(url_for('home'))
+
+#------
+# Main
 
 if __name__ == '__main__':
     app.run()
 
-