From 0d375ab1b11245e03b02c49232d933f6d0a3fa22 Mon Sep 17 00:00:00 2001 From: kitoy Date: Fri, 20 Mar 2026 16:04:21 +0100 Subject: [PATCH] Fix landing-page css --- base.db.bkp | Bin 0 -> 73728 bytes static/pywallter.css | 13 +-- templates/accueil.html | 4 +- templates/blog_rss.xml | 4 +- templates/edit_article.html | 50 +-------- templates/index_author_blog.html | 2 +- templates/index_blog.html | 2 +- templates/list_articles.html | 4 +- templates/update_article.html | 48 +++++++++ tools/databaseinit.py | 59 +++++++++-- views/blog.py | 167 +++++++++++++++---------------- 11 files changed, 196 insertions(+), 157 deletions(-) create mode 100644 base.db.bkp create mode 100644 templates/update_article.html diff --git a/base.db.bkp b/base.db.bkp new file mode 100644 index 0000000000000000000000000000000000000000..52a603e2c563ccc50a1810fa80f285dbb34cd388 GIT binary patch literal 73728 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 H*x>&GFxX8A literal 0 HcmV?d00001 diff --git a/static/pywallter.css b/static/pywallter.css index 7161933..deda436 100644 --- a/static/pywallter.css +++ b/static/pywallter.css @@ -64,22 +64,19 @@ main > nav } article { - width: 44vw; - max-height: 35vw; + min-width: 45vw; + max-width:50vw; + max-height: 40vw; margin-left: auto; margin-right: auto; } article > header { - height: 20vw; + height: fit-content; } article > .subtitle { - height: 10vw; - } - article footer{ - display: block; - height: 10vw; + height: fit-content; } } diff --git a/templates/accueil.html b/templates/accueil.html index f1789fe..844ecb5 100644 --- a/templates/accueil.html +++ b/templates/accueil.html @@ -61,7 +61,9 @@ - + + + {% endfor %} {% endif %} diff --git a/templates/blog_rss.xml b/templates/blog_rss.xml index f78d80d..c78be60 100644 --- a/templates/blog_rss.xml +++ b/templates/blog_rss.xml @@ -18,8 +18,8 @@ {{ post.title }} {% if post.last_updated %} {{ post.last_updated }} {% else %} {{ post.time }} {% endif %} - {{base_url}}/blog/{{ post.status }}/{{post.author}}/{{post.title}} - {{base_url}}/blog/{{ post.status }}/{{post.author}}/{{post.title}} + {{base_url}}/blog/{{ post.status }}/{{post.author}}/{{post.title_id}} + {{base_url}}/blog/{{ post.status }}/{{post.author}}/{{post.title_id}} {{ post.subtitle }} diff --git a/templates/edit_article.html b/templates/edit_article.html index eb6eadf..6882c25 100644 --- a/templates/edit_article.html +++ b/templates/edit_article.html @@ -6,55 +6,7 @@ {% block main %} - -
-
-
-
- - -
- -

Visibilité

- -
-

Les articles brouillons ne sont visibles que par vous même

-

Les articles privés ne sont visibles que par les membres du serveur

-

Les articles public sont visibles par tout le monde

- - - {% if oldpost['status'] == 'public' or oldpost['status'] == "public_unified" %} - Brouillon - Privé - Publique - - {% elif oldpost['status'] == 'private' or oldpost['status'] == "private_unified" %} - Brouillon - Privé - Publique - {% else %} - Brouillon - Privé - Publique - - {% endif %} -
- -
- -
-
-
- -
+{% include 'update_article.html' %} {% endblock %} diff --git a/templates/index_author_blog.html b/templates/index_author_blog.html index 9cbe0d8..99b5399 100644 --- a/templates/index_author_blog.html +++ b/templates/index_author_blog.html @@ -33,7 +33,7 @@

{{ post.subtitle }}

-

Lire la suite...

+

Lire la suite...

{% endfor %} diff --git a/templates/index_blog.html b/templates/index_blog.html index 7d1fc20..61b42de 100644 --- a/templates/index_blog.html +++ b/templates/index_blog.html @@ -38,7 +38,7 @@

{{ post.subtitle }}

-

Lire la suite...

+

Lire la suite...

{% endfor %} diff --git a/templates/list_articles.html b/templates/list_articles.html index e5e720e..2891065 100644 --- a/templates/list_articles.html +++ b/templates/list_articles.html @@ -36,8 +36,8 @@

- - + + {% endfor %} diff --git a/templates/update_article.html b/templates/update_article.html new file mode 100644 index 0000000..89d30ec --- /dev/null +++ b/templates/update_article.html @@ -0,0 +1,48 @@ +
+
+
+
+
+
+ +
+

Visibilité

+ +
+

Les articles brouillons ne sont visibles que par vous même

+

Les articles privés ne sont visibles que par les membres du serveur

+

Les articles public sont visibles par tout le monde

+ + + {% if oldpost['status'] == 'public' or oldpost['status'] == "public_unified" %} + Brouillon + Privé + Publique + + {% elif oldpost['status'] == 'private' or oldpost['status'] == "private_unified" %} + Brouillon + Privé + Publique + {% else %} + Brouillon + Privé + Publique + + {% endif %} +
+ +
+ +
+
+
+ +
diff --git a/tools/databaseinit.py b/tools/databaseinit.py index b6c00cf..377567f 100755 --- a/tools/databaseinit.py +++ b/tools/databaseinit.py @@ -3,7 +3,7 @@ import sqlite3 import os from tools.utils import gen_token from flask_bcrypt import Bcrypt - +from markupsafe import escape app = Flask( 'pywallter' ) bcrypt = Bcrypt(app) @@ -36,6 +36,7 @@ def init_db(database): cursor.execute(""" CREATE TABLE IF NOT EXISTS Blog_posts( + title_id TEXT, title TEXT NOT NULL, subtitle TEXT, comments TEXT, @@ -45,7 +46,7 @@ def init_db(database): category TEXT, author TEXT, status TEXT, - PRIMARY KEY(title, author) + PRIMARY KEY(title_id, author) ) """) conn.commit() @@ -83,7 +84,8 @@ def db_migrate(database): updated_col = False creation_date_col = False content_col = False - + title_id_col = False + conn = sqlite3.connect(database) cursor = conn.cursor() @@ -111,7 +113,8 @@ def db_migrate(database): creation_date_col= True if "category" == col[0]: category_col= True - + if "title_id" == col[0]: + title_id_col = True if not(invitations_col): cursor.execute("""ALTER TABLE users ADD COLUMN invitations INTEGER DEFAULT (20);""") @@ -152,9 +155,49 @@ def db_migrate(database): conn.commit() print ("Time renomé en creation_date") - if not(category_col): - cursor.execute("""ALTER TABLE Blog_posts ADD COLUMN category TEXT;""") - conn.commit() - print ("Ajout de la colono category") + if not(category_col): + cursor.execute("""ALTER TABLE Blog_posts ADD COLUMN category TEXT;""") + conn.commit() + print ("Ajout de la colono category") + + if not(title_id_col): + cursor.execute("""SELECT title, subtitle, content, creation_date, category, comments, last_updated, author, status FROM Blog_posts;""") + list_posts=cursor.fetchall() + cursor.execute("""DROP TABLE Blog_posts""") + conn.commit() + cursor.execute(""" + CREATE TABLE Blog_posts( + title_id TEXT, + title TEXT NOT NULL, + subtitle TEXT, + comments TEXT, + content TEXT, + creation_date TEXT, + last_updated TEXT, + category TEXT, + author TEXT, + status TEXT, + PRIMARY KEY(title_id, author) + ) + """) + conn.commit() + if list_posts != None: + for post in list_posts: + title_id=escape(post[0]) + title = post[0] + subtitle = post[1] + content = post[2] + creation_date = post[3] + category = post[4] + comments = post[5] + last_updated = post[6] + author = post[7] + status = post[8] + cursor.execute("""INSERT INTO Blog_posts(title_id, title, subtitle, category, content, creation_date, last_updated, author, status) + VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)""", (title_id, title, subtitle, category, content, creation_date, last_updated, author, status)) + #Après le for on commit les transations + conn.commit() + print ("migration de l'anciene base de donnée de blog") + conn.close() diff --git a/views/blog.py b/views/blog.py index 5f6a36e..d20e3cb 100644 --- a/views/blog.py +++ b/views/blog.py @@ -32,97 +32,93 @@ MARKDOWN_EXT=["extra", "toc", "codehilite", @blog.route('/myblog/new-article/', methods=['GET', 'POST']) @login_required def new_article(): - user = '%s'% escape(session['username']) + user = '%s' % escape(session['username']) + if request.method == 'POST': - title = strOB(request.form['title'].rstrip()) - subtitle = str(request.form['subtitle']) - category = str(request.form['category']) - content = str(request.form['content']) - status = str(request.form['status']) + title_id = escape(request.form['title'].rstrip()) + title = request.form['title'].rstrip() + subtitle = request.form['subtitle'] + category = request.form['category'] + content = request.form['content'] + status = request.form['status'] post_date = time.strftime("%d/%m/%Y %H:%M:%S") if 'blog-unified' in request.form.keys(): status = status+'_unified' conn = sqlite3.connect(DATABASE) # Connexion à la base de donnée cursor = conn.cursor() # Création de l'objet "curseur" - cursor.execute("""INSERT INTO Blog_posts(title, subtitle, category, content, creation_date, author, status) VALUES(?, ?, ?, ?, ?, ?, ?)""", (title, subtitle, category, content, post_date, user, status)) # Insérer des valeurs + cursor.execute("""INSERT INTO Blog_posts(title_id, title, subtitle, category, content, creation_date, author, status) VALUES(?, ?, ?, ?, ?, ?, ?, ?)""", (title_id, title, subtitle, category, content, post_date, user, status)) # Insérer des valeurs conn.commit() return redirect(url_for('blog.list_articles_blog')) else: return render_template('new_article_blog.html') -@blog.route('/myblog/edit/', methods=['GET', 'POST']) +@blog.route('/myblog/edit/<title_id>', methods=['GET']) @login_required -def edit(title): - user='%s'% escape(session['username']) - folder_blog = DOSSIER_PERSO + user + "/blog/articles/" - if request.method == 'POST' : - newtitle = str(request.form['title'].rstrip()) - subtitle = str(request.form['subtitle']) - category = str(request.form['category']) - newcontent = str(request.form['content']) - newstatus = str(request.form['status']) - updated = time.strftime("%d/%m/%Y %H:%M:%S") - conn = sqlite3.connect(DATABASE) - cursor = conn.cursor() - if 'blog-unified' in request.form.keys(): - newstatus = newstatus+'_unified' - - cursor.execute("""UPDATE Blog_posts SET title=?, subtitle=?, category=?, last_updated=?, status=?, content=? WHERE title=? AND author=?""", (newtitle, subtitle, category, updated, newstatus, newcontent, title, user)) - conn.commit() - conn.close() - return redirect(url_for('blog.list_articles_blog')) - else: - conn = sqlite3.connect(DATABASE) # Connexion à la base de donnée - cursor = conn.cursor() # Création de l'objet "curseur" - cursor.execute("""SELECT title, subtitle, category, content, status FROM Blog_posts WHERE title=? AND author=?""", (title, user)) - oldpost = cursor.fetchone() - conn.close() - post = dict(title=oldpost[0], subtitle=oldpost[1], category=oldpost[2], content=oldpost[3], status=oldpost[4]) - return render_template('edit_article.html', +def edit(title_id): + user = '%s' % escape(session['username']) + conn = sqlite3.connect(DATABASE) # Connexion à la base de donnée + cursor = conn.cursor() # Création de l'objet "curseur" + cursor.execute("""SELECT title_id, title, subtitle, creation_date, category, content, status FROM Blog_posts WHERE title_id=? AND author=?""", (title_id, user)) + oldpost = cursor.fetchone() + post = dict(title_id=oldpost[0], title=oldpost[1], subtitle=oldpost[2], creation_date=oldpost[3], category=oldpost[4], content=oldpost[5], status=oldpost[6]) + + conn.close() + + return render_template('edit_article.html', section='Post-it', oldpost=post) -@blog.route('/myblog/update/<title>', methods=['POST']) +@blog.route('/myblog/update_blogpost', methods=['POST']) @login_required -def update(title): - user='%s'% escape(session['username']) - folder_blog = DOSSIER_PERSO + user + "/blog/articles/" - newtitle = str(request.form['title']).encode() +def update(): + user = '%s' % escape(session['username']) + title_id = str(request.form['title_id']) + title = str(request.form['title']) subtitle = str(request.form['subtitle']) + creation_date = str(request.form['creation_date']) category = str(request.form['category']) - newcontent = str(request.form['content']) - newstatus = str(request.form['status']) - updated = time.strftime("%d/%m/%Y à %H:%M:%S") + content = str(request.form['content']) + status = str(request.form['status']) + updated = time.strftime("%d/%m/%Y %H:%M:%S") conn = sqlite3.connect(DATABASE) cursor = conn.cursor() if 'blog-unified' in request.form.keys(): - newstatus = newstatus+'_unified' - - cursor.execute("""UPDATE Blog_posts SET title=?, subtitle=?, category=?, last_updated=?, status=?, content=? WHERE title=? AND author=?""", (newtitle, subtitle, category, updated, newstatus, newcontent, title, user)) + status = status+'_unified' + + cursor.execute("""DELETE FROM Blog_posts WHERE title_id=? AND author=?""", (title_id, user)) + cursor.execute("""INSERT INTO Blog_posts(title_id, title, subtitle, category, content, creation_date, last_updated, author, status)VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)""", + (title_id, title, subtitle, category, content, creation_date, updated, user, status)) conn.commit() conn.close() - response = """ <p class="center success" >Article mis à jour le """+ updated +""" .</p>""" - return response + + post = dict(title_id=title_id, title=title, subtitle=subtitle, category=category, content=content, status=status) + flash(u'Article mis à jour avec succès le: '+ updated , 'success' ) + return render_template('edit_article.html', + section='Post-it', + oldpost=post) + + @blog.route('/myblog/list-articles/', methods=['GET']) @login_required def list_articles_blog(): - user = '%s'% escape(session['username']) + user = '%s' % escape(session['username']) conn = sqlite3.connect(DATABASE) # Connexion à la base de donnée cursor = conn.cursor() # Création de l'objet "curseur" - cursor.execute("""SELECT title, subtitle, creation_date, last_updated, status FROM Blog_posts WHERE author=? """, (user,) ) + cursor.execute("""SELECT title_id, title, subtitle, creation_date, last_updated, status FROM Blog_posts WHERE author=? """, (user,) ) list_posts=cursor.fetchall() posts=list() nb_articles=0 for post in list_posts: - posts = [dict(title=post[0], - subtitle=post[1], - time=post[2], - last_updated=post[3], - status=post[4])] + posts + posts = [dict(title_id=post[0], + title=post[1], + subtitle=post[2], + time=post[3], + last_updated=post[4], + status=post[5])] + posts nb_articles = nb_articles + 1 return render_template('list_articles.html', @@ -130,16 +126,16 @@ def list_articles_blog(): list_posts=posts, nb_articles=nb_articles ) -@blog.route('/myblog/delete/<title>') +@blog.route('/myblog/delete/<title_id>') @login_required -def delete(title): - title = escape(title) +def delete(title_id): + title_id = '%s' % str(title_id).rstrip() user='%s'% escape(session['username']) folder_blog = DOSSIER_PERSO + user + "/blog/articles/" folder_blog_public = DOSSIER_PUBLIC + user + "/blog/articles/" conn = sqlite3.connect(DATABASE) # Connexion à la base de donnée cursor = conn.cursor() # Création de l'objet "curseur" - cursor.execute("""DELETE FROM Blog_posts WHERE title=? AND author=?""", (title, user)) + cursor.execute("""DELETE FROM Blog_posts WHERE title_id=? AND author=?""", (title_id, user)) conn.commit() conn.close() return redirect(url_for('blog.list_articles_blog')) @@ -183,14 +179,14 @@ def viewmyblog(): user='%s' % escape(session['username']) conn = sqlite3.connect(DATABASE) # Connexion à la base de donnée cursor = conn.cursor() # Création de l'objet "curseur" - cursor.execute("""SELECT title, subtitle, creation_date, author, status FROM Blog_posts WHERE author=? AND status!='draft'""", (user,)) + cursor.execute("""SELECT title_id, title, subtitle, creation_date, author, status FROM Blog_posts WHERE author=? AND status!='draft'""", (user,)) list_posts=cursor.fetchall() posts=list() id=0 conn.close() if list_posts != None: for post in list_posts: - posts=[dict(title=post[0], subtitle=post[1], creation_date=post[2], author=post[3], status=post[4])] + posts + posts=[dict(title_id=post[0], title=post[1], subtitle=post[2], creation_date=post[3], author=post[4], status=post[5])] + posts return render_template('index_blog.html', section='Blog', posts=posts, author=user) @@ -200,14 +196,14 @@ def viewmyblog(): def view_internal(): conn = sqlite3.connect(DATABASE) # Connexion à la base de donnée cursor = conn.cursor() # Création de l'objet "curseur" - cursor.execute("""SELECT title, subtitle, content, creation_date, last_updated, author, status FROM Blog_posts WHERE status='private_unified' OR status='public_unified' """ ) + cursor.execute("""SELECT title_id, title, subtitle, content, creation_date, last_updated, author, status FROM Blog_posts WHERE status='private_unified' OR status='public_unified' """ ) list_posts=cursor.fetchall() conn.close() posts=list() id=0 if list_posts != None: for post in list_posts: - posts = [dict(title=post[0], subtitle=post[1], content=post[2], creation_date=post[3], last_updated=post[4], author=post[5], status=post[6] )] + posts + posts = [dict(title_id=[0], title=post[1], subtitle=post[2], content=post[3], creation_date=post[4], last_updated=post[5], author=post[6], status=post[7] )] + posts else: return redirect(BASE_URL, code=404) @@ -224,7 +220,7 @@ def view(): conn.close() if list_posts != None: for post in list_posts: - posts=[dict(title=post[0], subtitle=post[1], creation_date=post[2], author=post[3], status=post[4])] + posts + posts=[dict(title_id=post[0], title=post[1], subtitle=post[2], creation_date=post[3], author=post[4], status=post[5])] + posts return render_template('index_blog.html', section='Blog', posts=posts) @@ -235,9 +231,9 @@ def viewuser(author): conn = sqlite3.connect(DATABASE) # Connexion à la base de donnée cursor = conn.cursor() # Création de l'objet "curseur" if 'username' in session : - cursor.execute("""SELECT title, subtitle, creation_date, last_updated, author, status FROM Blog_posts WHERE author=? AND status != 'draft' """, (author,)) + cursor.execute("""SELECT title_id, title, subtitle, creation_date, last_updated, author, status FROM Blog_posts WHERE author=? AND status != 'draft' """, (author,)) else: - cursor.execute("""SELECT title, subtitle, creation_date, last_updated, author, status FROM Blog_posts WHERE author=? AND status='public' OR status='public_unified' """, (author,)) + cursor.execute("""SELECT title_id, title, subtitle, creation_date, last_updated, author, status FROM Blog_posts WHERE author=? AND status='public' OR status='public_unified' """, (author,)) list_posts=cursor.fetchall() posts=None id=0 @@ -245,7 +241,7 @@ def viewuser(author): if list_posts != None: posts=list() for post in list_posts: - posts=[dict(title=post[0], subtitle=post[1], creation_date=post[2], last_updated=post[3], author=post[4], status=post[5])] + posts + posts=[dict(title_id=post[0], title=post[1], subtitle=post[2], creation_date=post[3], last_updated=post[4], author=post[5], status=post[6])] + posts return render_template('index_blog.html', section='Blog', posts=posts, author=author) @@ -264,7 +260,8 @@ def viewauthorrss(author): if list_posts != None: last_build=last_article_date[0] for post in list_posts: - posts=[dict(title=post[0], subtitle=post[1], content=markdown(post[2], extensions=MARKDOWN_EXT), creation_date=post[3], author=post[4], status=post[5])] + posts + posts=[dict(title_id[0], title=post[1], subtitle=post[2], content=markdown(post[3], extensions=MARKDOWN_EXT), creation_date=post[4], + author=post[5], status=post[6])] + posts return render_template('blog_rss.xml', base_url=BASE_URL, @@ -273,37 +270,36 @@ def viewauthorrss(author): posts=posts) -@blog.route('/blog/private_unified/<username>/<title>', methods=['GET']) -@blog.route('/blog/private/<username>/<title>', methods=['GET']) +@blog.route('/blog/private_unified/<username>/<title_id>', methods=['GET']) +@blog.route('/blog/private/<username>/<title_id>', methods=['GET']) @login_required -def viewPrivateArticle(username, title): - user = escape(username) - title = escape(title) +def viewPrivateArticle(username, title_id): + user = '%s' % escape(username) conn = sqlite3.connect(DATABASE) # Connexion à la base de donnée cursor = conn.cursor() # Création de l'objet "curseur" - cursor.execute("""SELECT title, subtitle, content, creation_date, last_updated, author, status FROM Blog_posts WHERE author=? AND title=? AND status!='draft' """, (user, title)) + cursor.execute("""SELECT title_id, title, subtitle, content, creation_date, last_updated, author, status FROM Blog_posts WHERE author=? AND title_id=? AND status!='draft' """, (user, title_id)) post = cursor.fetchone() conn.close() if post != None: - post_info = (dict(title=post[0], subtitle=post[1], creation_date=post[3], last_updated=post[4],author=post[5])) - content = markdown(post[2], extensions=MARKDOWN_EXT) + post_info = (dict(title_id=post[0], title=post[1], subtitle=post[2], creation_date=post[4], last_updated=post[5],author=post[6])) + content = markdown(post[3], extensions=MARKDOWN_EXT) return render_template('blog.html', post_info=post_info, content=content) else: return redirect(url_for('blog'), code=404) -@blog.route('/blog/public_unified/<username>/<title>', methods=['GET']) -@blog.route('/blog/public/<username>/<title>', methods=['GET']) -def viewArticle(username, title): - user = username +@blog.route('/blog/public_unified/<username>/<title_id>', methods=['GET']) +@blog.route('/blog/public/<username>/<title_id>', methods=['GET']) +def viewArticle(username, title_id): + user = '%s' % escape(username) conn = sqlite3.connect(DATABASE) # Connexion à la base de donnée cursor = conn.cursor() # Création de l'objet "curseur" - cursor.execute("""SELECT title, subtitle, content, creation_date, last_updated, author FROM Blog_posts WHERE author=? AND title=? AND status='public_unified' """, (user, title) ) + cursor.execute("""SELECT title_id, title, subtitle, content, creation_date, last_updated, author FROM Blog_posts WHERE author=? AND title=? AND status='public_unified' """, (user, title_id) ) post = cursor.fetchone() conn.close() if post != None: - post_info = (dict(title=post[0], subtitle=post[1], creation_date=post[3], last_updated=post[4],author=post[5])) - content= markdown(post[2], extensions=MARKDOWN_EXT) + post_info = (dict(title_id=post[0], title=post[1], subtitle=post[2], creation_date=post[4], last_updated=post[5],author=post[6])) + content= markdown(post[3], extensions=MARKDOWN_EXT) return render_template('blog.html', post_info=post_info, content=content) else: @@ -316,7 +312,7 @@ def viewrss(): cursor.execute("""SELECT MAX(creation_date) FROM Blog_posts WHERE status='public_unified'""") last_article_date = cursor.fetchone() print (last_article_date[0]) - cursor.execute("""SELECT title, subtitle, content, creation_date, author, status FROM Blog_posts WHERE status='public_unified'""" ) + cursor.execute("""SELECT title_id, title, subtitle, content, creation_date, author, status FROM Blog_posts WHERE status='public_unified'""" ) list_posts=cursor.fetchall() posts=list() id=0 @@ -324,7 +320,8 @@ def viewrss(): if list_posts != None: last_build=last_article_date[0] for post in list_posts: - posts=[dict(title=post[0], subtitle=post[1], content=markdown(post[2], extensions=MARKDOWN_EXT), creation_date=post[3], author=post[4], status=post[5])] + posts + posts=[dict(title_id=post[0], title=post[1], subtitle=post[2], content=markdown(post[3], extensions=MARKDOWN_EXT), creation_date=post[4], + author=post[5], status=post[6])] + posts return render_template('blog_rss.xml', base_url=BASE_URL,