From 8e36d1794a5bdd88dc5a0dd302297f5be755eeb4 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Tue, 12 Oct 2021 12:57:30 -0700 Subject: [PATCH] fix icons, add menu items, initial commit of discussion --- web/app.py | 61 ++++++++++++++++++++++++++++ web/templates/disc.html | 58 ++++++++++++++++++++++++++ web/templates/flask_user_layout.html | 29 ++++++++++++- 3 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 web/templates/disc.html diff --git a/web/app.py b/web/app.py index 3538be3..3debf47 100644 --- a/web/app.py +++ b/web/app.py @@ -504,6 +504,14 @@ def hbnet_web_service(): query_term = db.Column(db.String(100), nullable=False, server_default='', unique=False) time = db.Column(db.DateTime()) + class Disc(db.Model): + __tablename__ = 'discussion' + id = db.Column(db.Integer(), primary_key=True) + poster = db.Column(db.String(200), nullable=False, server_default='') + text = db.Column(db.String(5000), nullable=False, server_default='') + time = db.Column(db.DateTime()) + + class Misc(db.Model): __tablename__ = 'misc' id = db.Column(db.Integer(), primary_key=True) @@ -2550,6 +2558,45 @@ TG #: ''' + str(tg_d.tg) + ''' ''' return render_template('tp_all.html', markup_content = Markup(content)) + + @app.route('/discussion', methods=['POST', 'GET']) + def portal_discussion(): +## dl = Disc.query.order_by(Disc.time.desc()).limit(30).all() + dl = Disc.query.order_by(Disc.time.desc()).all() + content = ''' ''' + show_table = True + if request.args.get('post'): +## tp_add(u.username, request.form.get('query'), request.form.get('content')) + disc_add(current_user.username, request.form.get('message')) + show_table = False + content = '''

Added post.

+

Redirecting in 1 seconds.

+ ''' + elif request.args.get('delete'): +## tp_add(u.username, request.form.get('query'), request.form.get('content')) + disc_del(request.args.get('delete')) + show_table = False + content = '''

Deleted post.

+

Redirecting in 1 seconds.

+ ''' + else: + + for i in dl: + try: + options_l = '' + if str(current_user.username).upper() == str(i.poster).upper(): + options_l = '''''' + except: + options_l = '' + content = content + ''' + + ''' + i.poster + ''' + ''' + i.text + ''' + ''' + options_l + ''' + ''' + return render_template('disc.html', markup_content = Markup(content), table = show_table) + + @app.route('/add_tp', methods=['POST', 'GET']) @login_required def new_tp(): @@ -2993,6 +3040,15 @@ Name: ''' + p.name + '''  -  Port: ''' + str( db.session.add(add_loc) db.session.commit() + def disc_add(_poster, _text): + add_d = Disc( + poster = _poster, + text = _text, + time = datetime.datetime.utcnow(), + ) + db.session.add(add_d) + db.session.commit() + def tp_add(_author, _query_term, _content): add_tp = TinyPage( author = _author, @@ -3046,6 +3102,11 @@ Name: ''' + p.name + '''  -  Port: ''' + str( db.session.delete(tpd) db.session.commit() + def disc_del(_id): + dd = Disc.query.filter_by(id=_id).first() + db.session.delete(dd) + db.session.commit() + def sms_log_add(_snd_call, _rcv_call, _msg, _snd_id, _rcv_id, _server, _system_name): add_sms = SMSLog( snd_callsign = _snd_call, diff --git a/web/templates/disc.html b/web/templates/disc.html new file mode 100644 index 0000000..18de658 --- /dev/null +++ b/web/templates/disc.html @@ -0,0 +1,58 @@ +{% extends 'flask_user/_public_base.html' %} +{% block content %} + +

Discussion

+ + +
+ +
+
Post to the discussion
+
+ +
+ +
+ Message + +
+ +
+

+ +
+
+ +
+ +{% if table %} + +
+
+ {% if call_or_get(current_user.is_authenticated) %} +

+{% endif %} + + + + + + + + + +{% endif %} + + {{markup_content}} +{% if table %} + +
AuthorPostOptions
+ + +
+
+ +{% endif %} + +

 

+{% endblock %} diff --git a/web/templates/flask_user_layout.html b/web/templates/flask_user_layout.html index 3f0420b..635d3c2 100644 --- a/web/templates/flask_user_layout.html +++ b/web/templates/flask_user_layout.html @@ -111,16 +111,43 @@ {% endif %} - + + +
  • + + +
    • + +
  • + + +
    • + +
  • Sign Out