diff --git a/myriad/manage.py b/myriad/manage.py index 9cce7a7..80c9801 100644 --- a/myriad/manage.py +++ b/myriad/manage.py @@ -59,24 +59,6 @@ def edit(mid): db.execute("INSERT INTO icons (member_id, icon_location) VALUES (?, ?)", (mid, filename),) db.commit() - if "c9" in request.form: - c9 = request.form["c9"] - c10 = request.form["c10"] - c11 = request.form["c11"] - c12 = request.form["c12"] - c13 = request.form["c13"] - c14 = request.form["c14"] - c15 = request.form["c15"] - c16 = request.form["c16"] - c18 = request.form["c18"] - c19 = request.form["c19"] - c20 = request.form["c20"] - c21 = request.form["c21"] - c22 = request.form["c22"] - - db.execute("UPDATE member SET card_border=(?), card_bg=(?), heading_bg=(?), heading_border=(?), heading_name=(?), heading_subtitle=(?), card_text=(?), icon_border=(?), page_bg=(?), gradient1=(?), gradient2=(?), gradient3=(?), a1=(?), a2=(?) WHERE id=(?)",(c9, c10, c11, c12, c13, c14, c15, c16, c18, c18, c19, c20, c21, c22, mid)) - db.commit() - if "gid_add" in request.form: gid = request.form["gid_add"] db.execute("INSERT INTO group_members (group_id,member_id) VALUES (?,?)",(gid,mid)) @@ -132,62 +114,54 @@ def delete_icon(mid, icon_id): return redirect(url_for("manage.edit", mid=mid)) -@bp.route("/add_to_front/") +@bp.route("/add_to_front//") @login_required -def add_to_front(mid): +def add_to_front(mid,location): db = get_db() db.execute("UPDATE member SET front=(?) WHERE id=(?)",(1, mid)) db.commit() - return redirect(url_for('home.full_list')) + if location == "home": + return redirect(url_for('index')) + else: + return redirect(url_for('home.full_list')) -@bp.route("/remove_front/") +@bp.route("/remove_front//") @login_required -def remove_front(mid): +def remove_front(mid, location): db = get_db() db.execute("UPDATE member SET front=(?) WHERE id=(?)",(0, mid)) db.commit() - return redirect(url_for('home.full_list')) + if location == "home": + return redirect(url_for('index')) + else: + return redirect(url_for('home.full_list')) -@bp.route("/add_to_home/") +@bp.route("/add_to_home//") @login_required -def add_to_home(mid): +def add_to_home(mid, location): db = get_db() db.execute("UPDATE member SET homepage=(?) WHERE id=(?)",(1, mid)) db.commit() - return redirect(url_for('home.full_list')) + if location == "home": + return redirect(url_for('index')) + else: + return redirect(url_for('home.full_list')) -@bp.route("/remove_home/") +@bp.route("/remove_home//") @login_required -def remove_home(mid): +def remove_home(mid,location): db = get_db() db.execute("UPDATE member SET homepage=(?) WHERE id=(?)",(0, mid)) db.commit() - return redirect(url_for('home.full_list')) - -@bp.route("/reset_theme/") -@login_required -def reset_theme(mid): - c9 = "#99dfff" - c10 = "#e6f7ff" - c11 = "#b3e7ff" - c12 = "#008bcc" - c13 = "black" - c14 = "black" - c15 = "black" - c16 = "#008bcc" - c21 = "#008bcc" - c22 = "#026897" - - db = get_db() - db.execute("UPDATE member SET card_border=(?), card_bg=(?), heading_bg=(?), heading_border=(?), heading_name=(?), heading_subtitle=(?), card_text=(?), icon_border=(?), a1=(?), a2=(?) WHERE id=(?)",(c9, c10, c11, c12, c13, c14, c15, c16, c21, c22, mid)) - db.commit() - - return redirect(url_for("manage.edit", mid=mid)) + if location == "home": + return redirect(url_for('index')) + else: + return redirect(url_for('home.full_list')) @bp.route("/assets") diff --git a/myriad/templates/full.html b/myriad/templates/full.html index bba3fb9..c84acd9 100644 --- a/myriad/templates/full.html +++ b/myriad/templates/full.html @@ -35,7 +35,7 @@ {{ member[5]|safe }}
- +
diff --git a/myriad/templates/index.html b/myriad/templates/index.html index 58e9fe9..28e551a 100644 --- a/myriad/templates/index.html +++ b/myriad/templates/index.html @@ -29,7 +29,7 @@ {{ member[5]|safe }}
- +