Seo

blog/__init__.py

@@ -8,7 +8,7 @@
 
 from blog.admin import create_admin
 from blog.config import config
-from blog.extensions import admin_ext, cache, db, login_manager, migrate
+from blog.extensions import admin_ext, cache, db, login_manager, migrate, flask_sitemap
 from blog.post.views import post
 from blog.tags.views import tagsb
 from blog.user.views import user_blueprint
@@ -25,6 +25,7 @@ def configure_extensions(app):
     migrate.init_app(app=app, db=db)
     login_manager.init_app(app=app)
     login_manager.login_view = "userb.index"  # type: ignore
+    flask_sitemap.init_app(app)
 
 
 def create_app():

blog/config.py

@@ -6,34 +6,39 @@
 
 
 class Config(object):
-    CACHE_TYPE = "NullCache"
-    PORT = environ.get("PORT") or "5555"
-    SECRET_KEY = environ.get("SECRET_KEY") or "hard to guess string"
-    SQLALCHEMY_TRACK_MODIFICATIONS = False
-    SQLALCHEMY_ECHO = False
+    CACHE_TYPE: str = "NullCache"
+    PORT: str = environ.get("PORT") or "5555"
+    SECRET_KEY: str = environ.get("SECRET_KEY") or "hard to guess string"
+    SQLALCHEMY_TRACK_MODIFICATIONS: bool = False
+    SQLALCHEMY_ECHO: bool = False
+    YANDEX_VERIFICATION: str | None = environ.get("YANDEX_VERIFICATION", None)
+    YANDEX_METRIKA: str = environ.get("YANDEX_METRIKA", "76938046")
+
     PAGE_CATEGORY: list[int] = [
         int(c) for c in environ.get("PAGE_CATEGORY", "0").split(",")
     ]
 
 
 class DevelopmentConfig(Config):
-    DEBUG = True
-    default_db_uri = f"sqlite:///{path.join(basedir, '../tmp/dev.db')}"
-    SQLALCHEMY_DATABASE_URI = environ.get("SQLALCHEMY_DATABASE_URI", default_db_uri)
+    DEBUG: bool = True
+    default_db_uri: str = f"sqlite:///{path.join(basedir, '../tmp/dev.db')}"
+    SQLALCHEMY_DATABASE_URI: str = environ.get(
+        "SQLALCHEMY_DATABASE_URI", default_db_uri
+    )
 
 
 class TestingConfig(Config):
-    TESTING = True
-    SQLALCHEMY_DATABASE_URI = "sqlite:///:memory:"
+    TESTING: bool = True
+    SQLALCHEMY_DATABASE_URI: str = "sqlite:///:memory:"
     PAGE_CATEGORY: list[int] = [
         1,
     ]
 
 
 class ProductionConfig(Config):
-    SQLALCHEMY_DATABASE_URI = environ.get("SQLALCHEMY_DATABASE_URI", None)
-    CACHE_TYPE = "SimpleCache"
-    CACHE_DEFAULT_TIMEOUT = 300
+    SQLALCHEMY_DATABASE_URI: str | None = environ.get("SQLALCHEMY_DATABASE_URI", None)
+    CACHE_TYPE: str = "SimpleCache"
+    CACHE_DEFAULT_TIMEOUT: int = 300
 
 
 config = {

blog/extensions.py

@@ -5,9 +5,11 @@
 from flask_login import LoginManager
 from flask_migrate import Migrate
 from flask_sqlalchemy import SQLAlchemy
+from flask_sitemap import Sitemap
 
 db = SQLAlchemy()
 admin_ext = Admin(base_template="admin/index.html", template_mode="bootstrap3")
 cache = Cache()
 migrate = Migrate()
 login_manager: LoginManager = LoginManager()
+flask_sitemap = Sitemap()

blog/post/views.py

@@ -10,8 +10,10 @@
     make_response,
     render_template,
     request,
+    url_for,
 )
 from sqlalchemy import or_
+from blog.extensions import flask_sitemap
 
 from blog import cache, db
 from blog.post.models import Post
@@ -61,11 +63,32 @@ def view(alias=None, **kwargs):
     page_category_obj = db.session.scalars(
         sa.select(Category).where(Category.id == post.category_id)
     ).first()
-    if page_category_obj:
+    if page_category_obj and page_category_obj.template:
         return render_template(page_category_obj.template, post=post, **kwargs)
     return render_template("post.html", post=post, **kwargs)
 
 
+@flask_sitemap.register_generator
+def site_map_gen():
+    page_category = current_app.config["PAGE_CATEGORY"]
+    pages_query = sa.select(Post).where(Post.category_id.in_(page_category))
+    pages = db.session.scalars(pages_query).all()
+    for page in pages:
+        yield url_for("postb.view", alias=page.alias)
+    post_query = (
+        sa.select(Post)
+        .where(
+            Post.publishedon.isnot(None),
+            Post.category_id.is_(None),
+        )
+        .order_by(Post.publishedon.desc())
+    )
+
+    posts = db.session.scalars(post_query).all()
+    for post in posts:
+        yield url_for("postb.view", alias=post.alias)
+
+
 @post.route("/md/", methods=["POST", "GET"])
 def getmd():
     post_data = request.form.get("data", "")

blog/templates/footer.html

@@ -1,4 +1,5 @@
 <footer class="footer">
+
   <div class="footer__content">
     <div class="footer__links">
       <a href="https://t.me/gunlinuxlog" class="nav__link" target="_blank" aria-label="Telegram">
@@ -19,4 +20,7 @@
     </div>
   </div>
 </footer>
+{% if config['YANDEX_METRIKA'] %}
+  {% include "snippets/yandex_metrika.html" %}
+{% endif %}
 

blog/templates/layout.html

@@ -5,11 +5,15 @@
     <meta charset="utf-8">
     <title>{% if post %}{{post.pagetitle}}{% else %}  Неразумный перфекционизм{% endif %}</title>
     <meta name="description" content="{% if post %}{{post.pagetitle}}{% endif %}">
+    {% if config['YANDEX_VERIFICATION'] %}
+      <meta name="yandex-verification" content="{{config['YANDEX_VERIFICATION']}}"/>
+    {% endif %}
     <link href="/static/img/favicon.ico" rel="shortcut icon" />
     <base href="{{config['BASE']}}">
     <link rel="stylesheet" href="/static/src/global/normalize.css">
     <link rel="stylesheet" href="/static/src/global/fonts.css">
     <link rel="stylesheet" href="/static/src/global/vars.css">
+
     <link rel="stylesheet" href="/static/src/global/reboot.css">
     <link rel="stylesheet" href="/static/src/global/global.css">
     <link rel="stylesheet" href="/static/src/components/header.css">

blog/templates/snippets/yandex_metrika.html

@@ -0,0 +1,14 @@
+<!-- Yandex.Metrika counter -->
+<script type="text/javascript">
+    (function(m,e,t,r,i,k,a){
+        m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
+        m[i].l=1*new Date();
+        for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }}
+        k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)
+    })(window, document,'script','https://mc.yandex.ru/metrika/tag.js', 'ym');
+
+    ym({{config['YANDEX_METRIKA']}}, 'init', {clickmap:true, accurateTrackBounce:true, trackLinks:true});
+</script>
+<noscript><div><img src="https://mc.yandex.ru/watch/{{config['YANDEX_METRIKA']}}" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
+<!-- /Yandex.Metrika counter -->
+

pyproject.toml

@@ -12,6 +12,7 @@ dependencies = [
     "flask-caching>=2.3.1",
     "flask-login>=0.6.3",
     "flask-migrate>=4.1.0",
+    "flask-sitemap>=0.4.0",
     "flask-sqlalchemy>=3.1.1",
     "flask-wtf>=1.2.2",
     "gevent>=25.5.1",

tests/test_posts.py

@@ -36,7 +36,7 @@ def post_helper(prefix="post", page=False):
 
 def test_post(test_client):
     with test_client.application.app_context():
-        post = post_helper()
+        post = post_helper(page=False)
         db.session.add(post)
         db.session.commit()
     rv = test_client.get("/post_alias")