diff --git a/main.py b/main.py deleted file mode 100644 index b0d4b06..0000000 --- a/main.py +++ /dev/null @@ -1 +0,0 @@ -import hashlib diff --git a/scherm_web.py b/scherm_web.py index e69de29..7f7f888 100644 --- a/scherm_web.py +++ b/scherm_web.py @@ -0,0 +1,32 @@ +import database_connector +from flask import Flask, request, render_template, session, redirect, url_for, flash + +""" +test var, het het nogmaal gesproken op False +""" +debug = True + + +""" +database objecten, om minder te typen +""" +conn = database_connector.conn +cur = database_connector.cur + + +""" +stel flask in +""" +app = Flask(__name__) + + +@app.route('/') +def root(): + return render_template('scherm.html') + + + + + +if __name__ == "__main__": + app.run('0.0.0.0', debug=debug) \ No newline at end of file diff --git a/templates/moderation_addmoderator.html b/templates/moderation_addmoderator.html deleted file mode 100644 index a8dab54..0000000 --- a/templates/moderation_addmoderator.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - Add Moderator - - - {% include 'flash_template.html' %} -

Enter new moderator details

-
- - - - -
- - \ No newline at end of file diff --git a/templates/scherm.html b/templates/scherm.html new file mode 100644 index 0000000..be7db79 --- /dev/null +++ b/templates/scherm.html @@ -0,0 +1,10 @@ + + + + + NS Scherm + + + + + \ No newline at end of file diff --git a/templates/zuil.html b/templates/zuil.html new file mode 100644 index 0000000..8ff996e --- /dev/null +++ b/templates/zuil.html @@ -0,0 +1,19 @@ + + + + + {{ locatie[1] }} + + + +

Welkom op {{ locatie[1] }}

+ {% include 'flash_template.html' %} +

Heeft u feedback voor ons?

+
+ + + +
+

Feedback wordt openbaar gemaakt op Twitter na goedkeuring

+ + \ No newline at end of file diff --git a/customer_input.py b/zuil.py similarity index 100% rename from customer_input.py rename to zuil.py diff --git a/zuil_web.py b/zuil_web.py new file mode 100644 index 0000000..6412655 --- /dev/null +++ b/zuil_web.py @@ -0,0 +1,89 @@ +import database_connector +from flask import Flask, request, render_template, session, redirect, url_for, flash +import datetime +import secrets + +""" +pas de locatie id aan zoals weergeven in moderator scherm +""" +locatieid = 1 + +""" +test var, het het nogmaal gesproken op False +""" +debug = True + +""" +database objecten, om minder te typen +""" +conn = database_connector.conn +cur = database_connector.cur + +""" +stel flask in +""" +app = Flask(__name__) + +""" +als debug op true is een vaste secret key gebruiken, dit is zodat we niet elke keer in hoefen te loggen na een +code wijziging. Maar in productie elke start een nieuwe token genereren +""" +if debug == True: + app.secret_key = 'jdndhsyh83r90hfeqwf' # dit is om live te testen +else: + app.secret_key = secrets.token_hex(32) + + + +def func_getlocaties(locatieid): + cur.execute('SELECT * FROM locaties WHERE locatieid = (%s)', [locatieid]) + return cur.fetchall()[0] + +def func_invoerdatabase(bericht, naamposter, locatieid): + date = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S") + try: + QUERY = 'INSERT INTO berichten(bericht, datumontvangen, locatieid, naamposter, statusid) VALUES (%s, %s, %s, %s, %s)' + DATA = (bericht, date, locatieid, naamposter, '1') + cur.execute(QUERY, DATA) + conn.commit() + return True + except: + return False + +def func_checkinvoer(bericht, naamposter): + if len(bericht) > 140: + return False + elif len(bericht) < 16: + return False + + if len(naamposter) > 32: + return False + elif len(naamposter) < 3: + return False + + + + + + +@app.route('/') +def root(): + return redirect(url_for('zuil')) + +@app.route('/zuil') +def zuil(): + + return render_template('zuil.html', locatie=func_getlocaties(locatieid)) + +@app.route('/zuil/post', methods=['POST']) +def zuil_post(): + flash('We hebben uw bericht ontvangen') + + return redirect(url_for('zuil')) + + + + + +if __name__ == "__main__": + app.run('0.0.0.0', debug=debug) \ No newline at end of file