openwrite 0.11.0__tar.gz → 0.12.0__tar.gz

{openwrite-0.11.0/openwrite.egg-info → openwrite-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwrite
-Version: 0.11.0
+Version: 0.12.0
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
                                Version 3, 19 November 2007
         
@@ -690,6 +690,7 @@ Dynamic: license-file
 ![logo](https://openwrite.io/static/logo.png)
 openwrite is a minimalist blogging platform built for writing freely, hosting independently, and publishing without noise.
 
+![PyPI - Downloads](https://img.shields.io/pypi/dw/openwrite)
 ![PyPI - Version](https://img.shields.io/pypi/v/openwrite)
 [![License: AGPL-3.0-or-later](https://img.shields.io/badge/License-AGPL--3.0--or--later-blue.svg)](LICENSE)
 ![pythonver](https://img.shields.io/badge/python%20version-3.11-blue)
@@ -719,6 +720,8 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Gemini protocol
 - Statistics per post
 - Multilanguage (currently English and Polish)
+- Custom favicon per blog
+- Subpages per blog
 
 
 ## Installation

{openwrite-0.11.0 → openwrite-0.12.0}/README.md

@@ -1,6 +1,7 @@
 ![logo](https://openwrite.io/static/logo.png)
 openwrite is a minimalist blogging platform built for writing freely, hosting independently, and publishing without noise.
 
+![PyPI - Downloads](https://img.shields.io/pypi/dw/openwrite)
 ![PyPI - Version](https://img.shields.io/pypi/v/openwrite)
 [![License: AGPL-3.0-or-later](https://img.shields.io/badge/License-AGPL--3.0--or--later-blue.svg)](LICENSE)
 ![pythonver](https://img.shields.io/badge/python%20version-3.11-blue)
@@ -30,6 +31,8 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Gemini protocol
 - Statistics per post
 - Multilanguage (currently English and Polish)
+- Custom favicon per blog
+- Subpages per blog
 
 
 ## Installation

{openwrite-0.11.0 → openwrite-0.12.0}/openwrite/__init__.py

@@ -32,7 +32,7 @@ def create_app(test_config=None):
         file_cwd = "/".join(f_abs_path.split("/")[:-1])
         from .utils.create_db import init_db
         init_db(db_type, db_path)
-        from .utils.models import User, Blog, Post, Settings, Home
+        from .utils.models import User, Blog, Post, Settings, Home, Page
         from .utils.db import init_engine, SessionLocal
         init_engine(db_type, db_path)
         from .utils.db import SessionLocal
@@ -68,15 +68,26 @@ def create_app(test_config=None):
                 title=domain, 
                 index="on", 
                 access="domain",
-                description_raw=f"![hello](https://openwrite.b-cdn.net/hello.jpg =500x258)\n\n# Hello there! 👋\n\nYou can edit your blog description in [dashboard](http://{domain}/dashboard/edit/default)",
-                description_html=f"<p><img src=\"https://openwrite.b-cdn.net/hello.jpg\" width=\"500\" height=\"258\"></p><h1>Hello there! 👋</h1><p>You can edit your blog description in <a href=\"http://{domain}/dashboard/edit/default\">dashboard</a></p>",
                 css="",
+                description_raw="x",
+                description_html="x",
                 pub_key=public_pem,
                 priv_key=private_pem,
                 theme="default",
+                favicon="",
                 created=now
             )
             SessionLocal.add(new_blog)
+            
+            new_page = Page(
+                blog=1,
+                name="Home",
+                url="",
+                content_raw=f"![hello](https://openwrite.b-cdn.net/hello.jpg =500x258)\n\n# Hello there! 👋\n\nYou can edit your blog home page in [dashboard](https://{domain}/dashboard/page/1/edit)\n\n---\n### Posts\n\n{{posts}}",
+                content_html=f"<p><img src=\"https://openwrite.b-cdn.net/hello.jpg\" width=\"500\" height=\"258\"></p><h1>Hello there! 👋</h1><p>You can edit your blog home page in <a href=\"https://{domain}/dashboard/page/1/edit\">dashboard</a></p>\n\n<hr>\n<h3>Posts\n\n{{posts}}",
+                show="off"
+            )
+            SessionLocal.add(new_page)
 
         hometext_pl = """
                  <h1 class="centered"><span style="color: #f2d2c8">cicha</span> przestrzeń na <span style="color: #5a36bf">głośne</span> myśli.</h1>

{openwrite-0.11.0 → openwrite-0.12.0}/openwrite/routes/admin.py

@@ -1,4 +1,5 @@
-from flask import Blueprint, render_template, redirect, g, request
+from flask import Blueprint, render_template, redirect, g, request, make_response
+import json
 from openwrite.utils.models import Blog, User, Settings, Home
 import re
 import bcrypt
@@ -13,6 +14,9 @@ ALLOWED_EXTENSIONS = {"png", "jpg", "jpeg", "gif", "webp"}
 
 @admin_bp.route("/admin")
 def admin():
+    """
+    Admin dashboard to manage blogs and users.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
 
@@ -26,6 +30,9 @@ def admin():
 
 @admin_bp.route("/admin/delete_blog/<blog>")
 def admin_delete_blog(blog):
+    """
+    Delete a blog by its name.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
 
@@ -38,6 +45,9 @@ def admin_delete_blog(blog):
 
 @admin_bp.route("/admin/delete_user/<username>")
 def admin_delete_user(username):
+    """
+    Delete a user and all their blogs.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
 
@@ -59,6 +69,9 @@ def admin_delete_user(username):
 
 @admin_bp.route("/admin/make_admin/<username>")
 def admin_make_admin(username):
+    """
+    Grant admin privileges to a user.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
 
@@ -73,6 +86,9 @@ def admin_make_admin(username):
 
 @admin_bp.route("/admin/remove_admin/<username>")
 def admin_remove_admin(username):
+    """
+    Remove admin privileges from a user.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
 
@@ -90,6 +106,9 @@ def admin_remove_admin(username):
 
 @admin_bp.route("/admin/add_user", methods=['GET', 'POST'])
 def admin_add_user():
+    """
+    Add a new user to the system.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
     if request.method == "GET":
@@ -122,6 +141,9 @@ def admin_add_user():
 
 @admin_bp.route("/admin/settings", methods=['GET', 'POST'])
 def admin_settings():
+    """
+    Manage application settings.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
 
@@ -174,6 +196,14 @@ def admin_settings():
 
 @admin_bp.route("/admin/translations", methods=['GET', 'POST'])
 def translations():
+    """
+    Manage translations for the application.
+    Allows viewing, editing, and saving translations.
+    (I can't believe I didn't secured it earlier lol)
+    """
+    if g.user is None or g.isadmin == 0 or g.mode == "single":
+        return redirect("/")
+
     if request.method == "GET":
         trans = g.db.query(Home).filter_by(type="translation").all()
         grouped = defaultdict(dict)
@@ -198,3 +228,21 @@ def translations():
 
     g.db.commit()
     return redirect("/admin/translations")
+
+@admin_bp.route("/admin/download_translations")
+def download_translations():
+    """
+    Download all translations as a json file.
+    """
+    if g.user is None or g.isadmin == 0 or g.mode == "single":
+        return redirect("/")
+
+    translations = g.db.query(Home).filter_by(type="translation").all()
+    trans_dict = defaultdict(dict)
+    for t in translations:
+        trans_dict[t.language][t.name] = t.content
+    
+    response = make_response(json.dumps(dict(trans_dict), ensure_ascii=False))
+    response.headers["Content-Disposition"] = "attachment; filename=i18n.json"
+    response.headers["Content-Type"] = "application/json"
+    return response

{openwrite-0.11.0 → openwrite-0.12.0}/openwrite/routes/blog.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, render_template, redirect, request, g, Response, abort
-from openwrite.utils.models import Blog, Post, User, View, Like
+from openwrite.utils.models import Blog, Post, User, View, Like, Page
 from openwrite.utils.helpers import gen_link, sanitize_html, anonymize, get_ip
 from feedgen.feed import FeedGenerator
 from sqlalchemy import desc
@@ -20,10 +20,14 @@ def show_blog(blog):
     if blog.access == "domain":
         return redirect(f"https://{blog.name}.{os.getenv('DOMAIN')}/")
 
-    posts = g.db.query(Post).filter_by(blog=blog.id).order_by(desc(Post.id)).all()
+    pages = g.db.query(Page).filter_by(blog=blog.id).all()
     blog.url = f"/b/{blog.name}"
+    homepage = g.db.query(Page).filter(Page.blog == blog.id, Page.url == "").first()
+    if "{posts}" in homepage.content_raw:
+        posts = g.db.query(Post).filter_by(blog=blog.id).order_by(desc(Post.id)).all()
+        return render_template("blog.html", blog=blog, page=homepage, posts=posts, pages=pages)
 
-    return render_template("blog.html", blog=blog, posts=posts)
+    return render_template("blog.html", blog=blog, page=homepage, pages=pages)
 
 @blog_bp.route("/", subdomain="<blog>")
 def show_subblog(blog):
@@ -36,9 +40,13 @@ def show_subblog(blog):
     if blog.access == "path":
         return redirect(f"https://{os.getenv('DOMAIN')}/b/{blog.name}")
 
-    posts = g.db.query(Post).filter_by(blog=blog.id).order_by(desc(Post.id)).all()
+    pages = g.db.query(Page).filter_by(blog=blog.id).all()
+    homepage = g.db.query(Page).filter(Page.blog == blog.id, Page.url == "").first()
+    if "{posts}" in homepage.content_raw:
+        posts = g.db.query(Post).filter_by(blog=blog.id).order_by(desc(Post.id)).all()
+        return render_template("blog.html", blog=blog, page=homepage, posts=posts, pages=pages)
 
-    return render_template("blog.html", blog=blog, posts=posts)
+    return render_template("blog.html", blog=blog, page=homepage, pages=pages)
 
 @blog_bp.route("/b/<blog>/<post>")
 def show_post(blog, post):
@@ -54,9 +62,21 @@ def show_post(blog, post):
     if blog.access == "domain":
         return redirect(f"https://{blog.name}.{os.getenv('DOMAIN')}/{post}")
 
+    blog.url = f"/b/{blog.name}"
+    pages = g.db.query(Page).filter_by(blog=blog.id).all()
     one_post = g.db.query(Post).filter(Post.blog == blog.id, Post.link == post).first()
     if not one_post:
-        return redirect("/")
+        page = g.db.query(Page).filter(Page.blog == blog.id, Page.url == post).first()
+        if not page:
+            return redirect("/")
+
+        if "{posts}" in page.content_raw:
+            posts = g.db.query(Post).filter_by(blog=blog.id).order_by(desc(Post.id)).all()
+
+            return render_template("blog.html", blog=blog, page=page, posts=posts, pages=pages)
+        
+        return render_template("blog.html", blog=blog, page=page, pages=pages)
+
 
     post_author = g.db.query(User).filter_by(id=blog.owner).first()
     one_post.authorname = post_author.username
@@ -76,7 +96,7 @@ def show_post(blog, post):
     one_post.liked = liked
 
     user = g.db.query(User).filter_by(id=g.user) if g.user else None
-    return render_template("post.html", blog=blog, post=one_post, user=user, views=v, likes=likes)
+    return render_template("post.html", blog=blog, post=one_post, user=user, views=v, likes=likes, pages=pages)
 
 @blog_bp.route("/<post>", subdomain="<blog>")
 def show_subpost(blog, post):
@@ -92,9 +112,20 @@ def show_subpost(blog, post):
     if blog.access == "path":
         return redirect(f"https://{os.getenv('DOMAIN')}/b/{blog.name}/{post}")
 
+    pages = g.db.query(Page).filter_by(blog=blog.id).all()
     one_post = g.db.query(Post).filter(Post.blog == blog.id, Post.link == post).first()
+
     if not one_post:
-        return redirect("/")
+        page = g.db.query(Page).filter(Page.blog == blog.id, Page.url == post).first()
+        if not page:
+            return redirect("/")
+
+        if "{posts}" in page.content_raw:
+            posts = g.db.query(Post).filter_by(blog=blog.id).order_by(desc(Post.id)).all()
+
+            return render_template("blog.html", blog=blog, page=page, posts=posts, pages=pages)
+        
+        return render_template("blog.html", blog=blog, page=page, pages=pages)
 
     post_author = g.db.query(User).filter_by(id=blog.owner).first()
     one_post.authorname = post_author.username
@@ -115,7 +146,7 @@ def show_subpost(blog, post):
     one_post.liked = liked
 
     user = g.db.query(User).filter_by(id=g.user) if g.user else None
-    return render_template("post.html", blog=blog, post=one_post, user=user, views=v)
+    return render_template("post.html", blog=blog, post=one_post, user=user, views=v, pages=pages)
 
 @blog_bp.route("/p/<post>")
 def single_showpost(post):
@@ -123,9 +154,22 @@ def single_showpost(post):
         return redirect("/")
 
     blog = g.db.query(Blog).filter_by(id=1).first()
+    blog.url = f"http://{g.main_domain}"
     one_post = g.db.query(Post).filter(Post.blog == 1, Post.link == post).first()
+
+    pages = g.db.query(Page).filter_by(blog=1).all()
+
     if not one_post:
-        return redirect("/")
+        page = g.db.query(Page).filter(Page.blog == blog.id, Page.url == post).first()
+        if not page:
+            return redirect("/")
+
+        if "{posts}" in page.content_raw:
+            posts = g.db.query(Post).filter_by(blog=blog.id).order_by(desc(Post.id)).all()
+
+            return render_template("blog.html", blog=blog, page=page, posts=posts, pages=pages)
+        
+        return render_template("blog.html", blog=blog, page=page, pages=pages)
 
     post_author = g.db.query(User).filter_by(id=1).first()
     one_post.authorname = post_author.username
@@ -145,7 +189,7 @@ def single_showpost(post):
     one_post.liked = liked
 
     user = g.db.query(User).filter_by(id=g.user) if g.user else None
-    return render_template("post.html", blog=blog, post=one_post, user=user, views=v)
+    return render_template("post.html", blog=blog, post=one_post, user=user, views=v, pages=pages)
 
 @blog_bp.route("/rss")
 def single_rss():

{openwrite-0.11.0 → openwrite-0.12.0}/openwrite/routes/dashboard.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, render_template, redirect, request, g, abort
-from openwrite.utils.models import Blog, Post, User, View
+from openwrite.utils.models import Blog, Post, User, View, Page
 from openwrite.utils.helpers import sanitize_html, gen_link, safe_css, send_activity, is_html, get_themes
 import requests
 from sqlalchemy import desc
@@ -12,6 +12,7 @@ import bcrypt
 import markdown
 from bs4 import BeautifulSoup
 from user_agents import parse
+import re
 
 dashboard_bp = Blueprint("dashboard", __name__)
 
@@ -79,16 +80,31 @@ def create_blog():
             name=form_url,
             index=form_index,
             access=form_access,
-            description_raw=f"![hello](https://openwrite.b-cdn.net/hello.jpg =500x258)\n\n# Hello there! 👋\n\nYou can edit your blog description in [dashboard](https://{g.main_domain}/dashboard/edit/{form_url})",
-            description_html=f"<p><img src=\"https://openwrite.b-cdn.net/hello.jpg\" width=\"500\" height=\"258\"></p><h1>Hello there! 👋</h1><p>You can edit your blog description in <a href=\"https://{g.main_domain}/dashboard/edit/{form_url}\">dashboard</a></p>",
             css="",
+            description_raw="x",
+            description_html="x",
             pub_key=public_pem,
             priv_key=private_pem,
             theme="default",
+            favicon="",
             created=now
         )
         g.db.add(new_blog)
         g.db.commit()
+
+        b_id = g.db.query(Blog).filter_by(name=form_url).first().id
+
+        new_page = Page(
+            blog=b_id,
+            name="Home",
+            url="",
+            content_raw=f"![hello](https://openwrite.b-cdn.net/hello.jpg =500x258)\n\n# Hello there! 👋\n\nYou can edit your blog home page in [dashboard](https://{g.main_domain}/dashboard/edit/{form_url})\n\n---\n### Posts\n\n{{posts}}",
+            content_html=f"<p><img src=\"https://openwrite.b-cdn.net/hello.jpg\" width=\"500\" height=\"258\"></p><h1>Hello there! 👋</h1><p>You can edit your blog home page in <a href=\"https://{g.main_domain}/dashboard/edit/{form_url}\">dashboard</a></p>\n\n<hr>\n<h3>Posts\n\n{{posts}}",
+            show="off"
+        )
+        g.db.add(new_page)
+        g.db.commit()
+           
         return redirect("/dashboard")
     except Exception:
         return render_template("create.html", error=g.trans['error'])
@@ -122,27 +138,28 @@ def edit_blog(name):
         v = g.db.query(View).filter(View.post == p.id, View.blog == blog.id).count()
         p.views = v
 
+    pages = g.db.query(Page).filter_by(blog=blog.id).all()
+
     themes = get_themes()
     themes.append("default")
 
     if request.method == "GET":
-        return render_template("edit.html", blog=blog, posts=posts, themes=themes)
+        return render_template("edit.html", blog=blog, posts=posts, themes=themes, pages=pages)
 
     now = datetime.now(timezone.utc).replace(microsecond=0)
-    blog.description_raw = request.form.get("description_raw")
-    blog.description_html = sanitize_html(request.form.get("description_html"))
     if len(request.form.get("title")) > 30:
-        return render_template("edit.html", blog=blog, posts=posts, themes=themes, error="Title too long! Max 30 characters.")
+        return render_template("edit.html", blog=blog, posts=posts, themes=themes, pages=pages, error="Title too long! Max 30 characters.")
     blog.css = safe_css(request.form.get("css"))
     blog.updated = now   
     blog.title = request.form.get("title")
+    blog.favicon = request.form.get("icon")[:10]
     selected_theme = request.form.get("theme")
     if selected_theme not in themes:
-        return render_template("edit.html", blog=blog, posts=posts, themes=themes, error="Wrong theme!")
+        return render_template("edit.html", blog=blog, posts=posts, themes=themes, pages=pages, error="Wrong theme!")
     blog.theme = selected_theme
     g.db.commit()
 
-    return render_template("edit.html", blog=blog, posts=posts, themes=themes)
+    return render_template("edit.html", blog=blog, posts=posts, themes=themes, pages=pages)
 
 @dashboard_bp.route("/dashboard/post/<name>", methods=['GET', 'POST'])
 def new_post(name):
@@ -164,7 +181,9 @@ def new_post(name):
     link = gen_link(title)
     if link == "rss":
         link = "p_rss"
-    dupes = g.db.query(Post).filter(Post.link.startswith(link), Post.blog == blog.id).count()
+    dupes_posts = g.db.query(Post).filter(Post.link.startswith(link), Post.blog == blog.id).count()
+    dupes_pages = g.db.query(Page).filter(Page.url == link, Page.blog == blog.id).count()
+    dupes = dupes_posts + dupes_pages
     if dupes > 0:
         link += f"-{dupes + 1}"
 
@@ -246,12 +265,21 @@ def blog_preview():
         return redirect("/login")
 
     u = g.db.query(User).filter_by(id=g.user).first()
+    blog_name = request.referrer.split("/")[-1]
+    blog = g.db.query(Blog).filter_by(name=blog_name).first()
+    if not blog:
+        return redirect("/")
+
+    homepage = g.db.query(Page).filter(Page.blog == blog.id, Page.url == "").first()
     data = {
         'title': request.form.get('title'),
-        'content': sanitize_html(request.form.get('content')),
+        'css': request.form.get('css'),
+        'icon': request.form.get('icon'),
+        'content': homepage.content_html,
         'theme': request.form.get('theme')
     }
 
+
     return render_template("blog_preview.html", data=data)
 
 @dashboard_bp.route("/dashboard/edit/<blog>/<post>", methods=['GET', 'POST'])
@@ -277,7 +305,9 @@ def edit_post(blog, post):
     link = gen_link(title)
     if link == "rss":
         link = "p_rss"
-    dupes = g.db.query(Post).filter(Post.link.startswith(link), Post.blog == blog_obj.id).count()
+    dupes_posts = g.db.query(Post).filter(Post.link.startswith(link), Post.blog == blog_obj.id).count()
+    dupes_pages = g.db.query(Page).filter(Page.url == link, Page.blog == blog_obj.id).count()
+    dupes = dupes_posts + dupes_pages
     if dupes > 0 and link != post:
         link += f"-{dupes + 1}"
 
@@ -407,3 +437,127 @@ def get_stats(blog, post, limit):
         views_obj["views"].append([v.date, os, browser])
 
     return views_obj
+
+@dashboard_bp.route("/dashboard/page/<blog>", methods=['GET', 'POST'])
+def new_page(blog):
+    if g.user is None:
+        abort(403)
+    blog = g.db.query(Blog).filter_by(name=blog).first()
+
+    if not blog:
+        abort(404)
+
+    if blog.owner != g.user:
+        abort(403)
+
+    if request.method == "GET":
+        return render_template("new_page.html", blog=blog)
+
+    name = request.form.get("name")
+    url = request.form.get("url")
+    content_raw = request.form.get("content_raw")
+    content_html = request.form.get("content")
+    show = request.form.get("show")
+    if len(name) > 120:
+        return render_template("new_page.html", blog=blog, error="Name too long! Max 120 characters")
+    if not re.match(r"^\/[a-zA-Z0-9\-\_]+$", url):
+        return render_template("new_page.html", blog=blog, error="Invalid URL!")
+
+    url = url[1:]
+    if url == "rss":
+        url = "p_rss"
+    dupes_posts = g.db.query(Post).filter(Post.link.startswith(url), Post.blog == blog.id).count()
+    dupes_pages = g.db.query(Page).filter(Page.url == url, Page.blog == blog.id).count()
+    dupes = dupes_posts + dupes_pages
+    if dupes > 0:
+        url = f"{url}-{dupes + 1}"
+
+    new_page = Page(blog=blog.id, name=name, url=url, content_raw=content_raw, content_html=sanitize_html(content_html), show=show)
+
+    g.db.add(new_page)
+    g.db.commit()
+    return redirect(f"/dashboard/edit/{blog.name}")
+
+@dashboard_bp.route("/dashboard/page/<page>/edit", methods=['GET', 'POST'])
+def edit_page(page):
+    if g.user is None:
+        abort(403)
+
+    page = g.db.query(Page).filter_by(id=page).first()
+    if not page:
+        abort(404)
+    blog = g.db.query(Blog).filter_by(id=page.blog).first()
+
+    if not blog:
+        abort(404)
+
+    if blog.owner != g.user:
+        abort(403)
+    home = False
+    if page.url == "":
+        home = True
+
+    if request.method == 'GET':
+        return render_template("new_page.html", blog=blog, page=page, home=home)
+
+    name = request.form.get("name")
+    content_raw = request.form.get("content_raw")
+    content_html = request.form.get("content")
+    show = request.form.get("show")
+    url = request.form.get("url")
+    if len(name) > 120:
+        return render_template("new_page.html", blog=blog, page=page, home=home, error="Name too long!")
+    if home == False:
+        if not re.match(r"^\/[a-zA-Z0-9\-\_]+$", url):
+            return render_template("new_page.html", blog=blog, error="Invalid URL!")
+
+        url = url[1:]
+        if url == "rss":
+            url = "p_rss"
+        dupes_posts = g.db.query(Post).filter(Post.link.startswith(url), Post.blog == blog.id).count()
+        dupes_pages = g.db.query(Page).filter(Page.url == url, Page.blog == blog.id).count()
+        dupes = dupes_posts + dupes_pages
+        if dupes > 0 and url != page.url:
+            url = f"{url}-{dupes + 1}"
+
+    page.name = name
+    page.content_raw = content_raw
+    page.content_html = sanitize_html(content_html)
+    page.show = show
+    if home == False:
+        page.url = url
+
+    g.db.commit()
+    return redirect(f"/dashboard/edit/{blog.name}")
+
+@dashboard_bp.route("/dashboard/page_preview", methods=['POST'])
+def page_preview():
+    if g.user is None:
+        return redirect("/")
+
+    data = {
+        'name': request.form.get('name'),
+        'content': sanitize_html(request.form.get('content')),
+        'blog_title': request.form.get('blog_title'),
+        'blog_name': request.form.get('blog_name'),
+        'theme': request.form.get('theme')
+    }
+
+    return render_template("page_preview.html", data=data)
+
+
+@dashboard_bp.route("/dashboard/page/<page>/delete")
+def page_delete(page):
+    if g.user is None:
+        return redirect("/")
+
+    page = g.db.query(Page).filter_by(id=page).first()
+    blog = g.db.query(Blog).filter_by(id=page.blog).first()
+
+    if blog.owner != g.user:
+        return abort(403)
+
+    g.db.delete(page)
+    g.db.commit()
+
+    return redirect(f"/dashboard/edit/{blog.name}")

{openwrite-0.11.0 → openwrite-0.12.0}/openwrite/routes/main.py

@@ -3,7 +3,7 @@ import os
 import json
 import datetime
 import requests
-from openwrite.utils.models import Post, Blog, Home, Settings
+from openwrite.utils.models import Post, Blog, Home, Settings, Page
 import time
 from openwrite import start_time
 
@@ -22,8 +22,14 @@ def index():
 
     elif g.mode == "single":
         blog = g.db.query(Blog).filter_by(name="default").first()
+        blog.url = f"http://{g.main_domain}"
+        page = g.db.query(Page).filter_by(blog=blog.id, url="").first()
+        pages = g.db.query(Page).filter_by(blog=blog.id).all()
+        if '{posts}' in page.content_raw:
+            posts = g.db.query(Post).filter_by(blog=blog.id).order_by(desc(Post.id)).all()
+            return render_template('blog.html', blog=blog, page=page, posts=posts, pages=pages)
         posts = g.db.query(Post).filter_by(blog=blog.id).all()
-        return render_template('blog.html', blog=blog, posts=posts)
+        return render_template('blog.html', blog=blog, posts=posts, page=page, pages=pages)
 
 @main_bp.route("/set-lang/<lang_code>")
 def set_lang(lang_code):