diff --git a/myriad/home.py b/myriad/home.py index 837cb64..141e4f5 100644 --- a/myriad/home.py +++ b/myriad/home.py @@ -11,8 +11,8 @@ bp = Blueprint('home', __name__) @bp.route('/') def index(): db = get_db() - fronters = db.execute("SELECT * FROM member WHERE front=(?)",(1,)).fetchall() - homepage = db.execute("SELECT * FROM member WHERE homepage=(?)",(1,)).fetchall() + fronters = db.execute("SELECT * FROM member WHERE front=(?) ORDER BY member_name",(1,)).fetchall() + homepage = db.execute("SELECT * FROM member WHERE homepage=(?) ORDER BY member_name",(1,)).fetchall() icons={} for member in homepage: diff --git a/myriad/manage.py b/myriad/manage.py index 4749b9d..eb093cc 100644 --- a/myriad/manage.py +++ b/myriad/manage.py @@ -85,6 +85,25 @@ def edit(mid): # the above cleanup operations should be a button in the manage sidebar but for now they are here. + 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"] + #c17 = request.form["c17"] + #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=(?), a1=(?), a2=(?) WHERE id=(?)",(c9, c10, c11, c12, c13, c14, c15, c16, c21, c22, mid)) + db.commit() + member = db.execute("SELECT * FROM member WHERE id=(?)",(mid,)).fetchone() icons = db.execute("SELECT * FROM icons WHERE member_id=(?)",(mid,)).fetchall() diff --git a/myriad/schema.sql b/myriad/schema.sql index da6af3b..db2df72 100644 --- a/myriad/schema.sql +++ b/myriad/schema.sql @@ -4,8 +4,6 @@ DROP TABLE IF EXISTS icons; DROP TABLE IF EXISTS groups; DROP TABLE IF EXISTS group_members; DROP TABLE IF EXISTS pages; -DROP TABLE IF EXISTS themes; -DROP TABLE IF EXISTS member_themes; CREATE TABLE user ( id INTEGER PRIMARY KEY AUTOINCREMENT, @@ -23,6 +21,20 @@ CREATE TABLE member ( main_icon INTEGER, homepage BOOLEAN NOT NULL DEFAULT 0, front BOOLEAN NOT NULL DEFAULT 0, + card_border TEXT NOT NULL DEFAULT '#99dfff', + card_bg TEXT NOT NULL DEFAULT '#e6f7ff', + heading_bg TEXT NOT NULL DEFAULT '#b3e7ff', + heading_border TEXT NOT NULL DEFAULT '#008bcc', + heading_name TEXT NOT NULL DEFAULT 'black', + heading_subtitle TEXT NOT NULL DEFAULT 'black', + card_text TEXT NOT NULL DEFAULT 'black', + icon_border TEXT NOT NULL DEFAULT '#008bcc', + page_bg TEXT NOT NULL DEFAULT '#00b7ff', + gradient1 TEXT NOT NULL DEFAULT '#00b7ff', + gradient2 TEXT NOT NULL DEFAULT '#57c785', + gradient3 TEXT NOT NULL DEFAULT '#eddd53', + a1 TEXT NOT NULL DEFAULT '#008bcc', + a2 TEXT NOT NULL DEFAULT '#026897', FOREIGN KEY (user_id) REFERENCES user (id), FOREIGN KEY (main_icon) REFERENCES icons (id) ); @@ -53,22 +65,4 @@ CREATE TABLE pages ( member_id INTEGER NOT NULL, page_location TEXT NOT NULL, FOREIGN KEY (member_id) REFERENCES member (id) -); - -CREATE TABLE themes ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - theme_name TEXT NOT NULL, - color1 TEXT NOT NULL, - color2 TEXT NOT NULL, - color3 TEXT NOT NULL, - color4 TEXT NOT NULL, - color5 TEXT NOT NULL -); - -CREATE TABLE member_themes ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - theme_id INTEGER NOT NULL, - member_id INTEGER NOT NULL, - FOREIGN KEY (theme_id) REFERENCES themes (id), - FOREIGN KEY (member_id) REFERENCES member (id) ); \ No newline at end of file diff --git a/myriad/static/style.css b/myriad/static/style.css index 1f9ec10..db42a55 100644 --- a/myriad/static/style.css +++ b/myriad/static/style.css @@ -5,7 +5,7 @@ body{ background: #00b7ff; - background: linear-gradient(90deg, rgba(0, 183, 255, 1) 0%, rgba(87, 199, 133, 1) 50%, rgba(237, 221, 83, 1) 100%); + background: linear-gradient(90deg, #00b7ff 0%, #57c785 50%, #eddd53 100%); font-family:monospace; font-size:12px; scrollbar-color:#008bcc #b3e7ff; diff --git a/myriad/templates/base.html b/myriad/templates/base.html index 7dc75a4..eb974c6 100644 --- a/myriad/templates/base.html +++ b/myriad/templates/base.html @@ -14,7 +14,6 @@ {% if g.user %}
Manage
- {% endif %}
Administration
diff --git a/myriad/templates/full.html b/myriad/templates/full.html index 303eccb..6e0fe02 100644 --- a/myriad/templates/full.html +++ b/myriad/templates/full.html @@ -9,21 +9,58 @@
jump to:
{% for member in memberlist %} - {{ member[3] }} | + {{ member[3] }} | {% endfor %}
{% for member in memberlist %} -
-
{{ member[3] }} {{ member[4] }}
+ + +
+
{{ member[3]|safe }} {{ member[4]|safe }}
{% if icons[member[0]] %} {% else %} {% endif %}
- {{ member[5] }} + {{ member[5]|safe }}

{% if g.user %}{% endif %} diff --git a/myriad/templates/index.html b/myriad/templates/index.html index 896a38d..d59dac8 100644 --- a/myriad/templates/index.html +++ b/myriad/templates/index.html @@ -7,15 +7,54 @@
{% for member in home_pins %} -
-
{{ member[3] }} {{ member[4] }}
+ + + + +
+
{{ member[3]|safe }} {{ member[4]|safe }}
{% if icons[member[0]] %} {% else %} {% endif %}
- {{ member[5] }} + {{ member[5]|safe }}

{% if g.user %}{% endif %} diff --git a/myriad/templates/manage/edit.html b/myriad/templates/manage/edit.html index 4a5af9b..d60fb63 100644 --- a/myriad/templates/manage/edit.html +++ b/myriad/templates/manage/edit.html @@ -38,19 +38,39 @@
Manage Theme
- + Click here to reset member theme to default