Bläddra i källkod

blog posts can be edited from the main feed or individual member pages

cube 1 dag sedan
förälder
incheckning
49828a93ff
5 ändrade filer med 91 tillägg och 43 borttagningar
  1. 2
    0
      README.md
  2. 24
    1
      myriad/blog.py
  3. 1
    1
      myriad/templates/blog/blog.html
  4. 27
    0
      myriad/templates/blog/edit.html
  5. 37
    41
      myriad/templates/page.html

+ 2
- 0
README.md Visa fil

@@ -6,6 +6,8 @@ logged in users are presumed to all be admins with distinction only between bein
6 6
 
7 7
 in the blog view, member privacy outweighs individual post privacy. if a private member makes a public post, it will not show up in the public feed. however, if that member switches to public, their public posts will all become publicly viewable (but private posts will remain private). 
8 8
 
9
+some html files (notably full.html and index.html) will show lots of errors in vscode, because of the use of jinja variables in the inline style. this is fine just ignore it. it doesn't do that in the page.html because simply using quotation marks around the colours is enough to make everything correct, but the use of member specific identifiers as jinja variables renders the entire css 'invalid' in the other html files.
10
+
9 11
 # assorted todo
10 12
 
11 13
 - edit blog posts

+ 24
- 1
myriad/blog.py Visa fil

@@ -72,4 +72,27 @@ def toggle(pid, location):
72 72
     if location == "blog":
73 73
         return redirect(url_for("blog.blog"))
74 74
     else:
75
-        return redirect(url_for("home.page", mid=location))
75
+        return redirect(url_for("home.page", mid=location))
76
+    
77
+@bp.route("/edit/<pid>/<location>", methods=('GET', 'POST'))
78
+@login_required
79
+def edit(pid,location):
80
+    db = get_db()
81
+    post = db.execute("SELECT * FROM blog WHERE id=(?)",(pid,)).fetchone()
82
+    members = db.execute("SELECT id,member_name FROM member").fetchall()
83
+
84
+    if request.method == 'POST':
85
+        title = request.form['title']
86
+        content = request.form['content']
87
+        mid = request.form["mid"]
88
+        privacy = request.form["privacy"]
89
+
90
+        db.execute("UPDATE blog SET title=(?), content=(?), member_id=(?), public=(?) WHERE id=(?)",(title, content, mid, privacy, pid))
91
+        db.commit()
92
+
93
+        if location == "blog":
94
+            return redirect(url_for("blog.blog"))
95
+        else:
96
+            return redirect(url_for("home.page", mid=location))
97
+    
98
+    return render_template('blog/edit.html', post=post, members=members)

+ 1
- 1
myriad/templates/blog/blog.html Visa fil

@@ -24,7 +24,7 @@
24 24
         </div>
25 25
         <br class="clear" />
26 26
         {% if g.user %}
27
-        {% if post[5]==0 %}<b style="color:red;">Private</b>{% else %}<b style="color:green;">Public</b>{% endif %} | <a href="{{url_for('blog.toggle',pid=post[0], location='blog')}}">Toggle privacy</a> | <a href="{{url_for('blog.delete', pid=post[0], location='blog')}}" class="danger">Delete post</a>
27
+        {% if post[5]==0 %}<b style="color:red;">Private</b>{% else %}<b style="color:green;">Public</b>{% endif %} | <a href="{{url_for('blog.toggle',pid=post[0], location='blog')}}">Toggle privacy</a> | <a href="{{url_for('blog.edit',pid=post[0],location='blog')}}">Edit Post</a> | <a href="{{url_for('blog.delete', pid=post[0], location='blog')}}" class="danger">Delete post</a>
28 28
         {% endif %}
29 29
     </div>
30 30
     {% endif %}

+ 27
- 0
myriad/templates/blog/edit.html Visa fil

@@ -0,0 +1,27 @@
1
+{% extends 'base.html' %}
2
+
3
+{% block header %}
4
+  <div class="title">{% block title %}Edit Blog Post{% endblock %}</div>
5
+{% endblock %}
6
+
7
+{% block content %}
8
+  <form method="post">
9
+    <label for="title">Title</label>
10
+    <input name="title" id="title" value="{{post[3]}}"><br>
11
+    <label for="content">Content</label>
12
+    <textarea name="content" id="content">{{post[4]}}</textarea><br>
13
+    <label for="mid">Choose a member:</label>
14
+    <select name="mid" id="mid">
15
+      {% for member in members %}
16
+      <option value="{{member[0]}}" {% if member[0]==post[1] %}selected{% endif %}>{{member[1]}}</option>
17
+      {% endfor %}
18
+    </select>
19
+    <br>
20
+    <input type="radio" id="public" name="privacy" value=1 {% if post[5]==1 %}checked{% endif %}>
21
+      <label for="public">Public</label><br>
22
+      <input type="radio" id="private" name="privacy" value=0 {% if post[5]==0 %}checked{% endif %}>
23
+      <label for="private">Private</label><br>
24
+    <input type="submit" value="Submit">
25
+  </form>
26
+
27
+{% endblock %}

+ 37
- 41
myriad/templates/page.html Visa fil

@@ -7,46 +7,42 @@
7 7
 
8 8
 
9 9
 <style>
10
-body{
11
-    background: {{member[17]}};
12
-    background: linear-gradient(90deg, {{member[17]}} 0%, {{member[18]}} 50%, {{member[19]}} 100%);
13
-    scrollbar-color:{{member[12]}} {{member[11]}};
14
-}
15
-.container{
16
-    background-color:{{member[10]}};
17
-    border-color:{{member[9]}};
18
-}
19
-.heading{
20
-    background-color:{{member[11]}};
21
-    border-color:{{member[12]}};
22
-    color:{{member[14]}};
23
-}
24
-.icon{
25
-    border-color:{{member[16]}};
26
-}
27
-.bio{
28
-    color:{{member[15]}};
29
-}
30
-.heading b
31
-{
32
-    color:{{member[13]}};
33
-}
34
-a{
35
-    color: {{member[21]}};
36
-}
37
-a:hover{
38
-    color: {{member[22]}};
39
-}
40
-::selection {
41
-    background: {{member[12]}};
42
-    color: white;
43
-    text-shadow: none;
44
-}
45
-::-moz-selection {
46
-    background: {{member[12]}};
47
-    color: #EEE;
48
-    text-shadow: none;
49
-}
10
+    body{
11
+        background: '{{member[17]}}';
12
+        background: linear-gradient(90deg, '{{member[17]}}' 0%, '{{member[18]}}' 50%, '{{member[19]}}' 100%);
13
+        scrollbar-color:"{{member[12]}}" "{{member[11]}}";
14
+    }
15
+    .container{
16
+        background-color:"{{member[10]}}";
17
+        border-color:"{{member[9]}}";
18
+    }
19
+    .heading{
20
+        background-color:"{{member[11]}}";
21
+        border-color:"{{member[12]}}";
22
+        color:"{{member[14]}}";
23
+    }
24
+    .icon{
25
+        border-color:"{{member[16]}}";
26
+    }
27
+    .bio{
28
+        color:"{{member[15]}}";
29
+    }
30
+    .heading b
31
+    {
32
+        color:"{{member[13]}}";
33
+    }
34
+    a{
35
+        color: "{{member[21]}}";
36
+    }
37
+    a:hover{
38
+        color: "{{member[22]}}";
39
+    }
40
+    ::selection {
41
+        background: "{{member[12]}}";
42
+    }
43
+    ::-moz-selection {
44
+        background: "{{member[12]}}";
45
+    }
50 46
 </style>
51 47
 
52 48
 
@@ -82,7 +78,7 @@ a:hover{
82 78
                 <div class="content">
83 79
                     {{post[4]|safe}}
84 80
                 </div>
85
-                {% if g.user %}<a href="{{url_for('blog.toggle',pid=post[0], location=member[0])}}">Toggle privacy</a> | <a href="{{url_for('blog.delete', pid=post[0], location=member[0])}}" class="danger">Delete post</a>{% endif %}
81
+                {% if g.user %}<a href="{{url_for('blog.toggle',pid=post[0], location=member[0])}}">Toggle privacy</a> | <a href="{{url_for('blog.edit',pid=post[0],location=member[0])}}">Edit Post</a> | <a href="{{url_for('blog.delete', pid=post[0], location=member[0])}}" class="danger">Delete post</a>{% endif %}
86 82
             </div>
87 83
             {% endif %}
88 84
             {% endfor %}