diff --git a/Dockerfile b/Dockerfile
index f1a67fb..1b24f38 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,63 +7,45 @@ ENV SQLALCHEMY_DATABASE_URI="sqlite:////app/tmp/dev.db"
WORKDIR /app
-RUN apk update && apk add make
-RUN python -m venv /app/venv
-
+RUN apk update && apk add --no-cache nodejs npm make uv
COPY . .
-RUN /app/venv/bin/python3 -m pip install -r requirements.txt
-RUN /app/venv/bin/python3 -m pip install -r dev.txt
-
-
-RUN source /app/venv/bin/activate && make check
+RUN uv sync && make check && make test
-FROM python:3.10-alpine AS build-image
+FROM python:3.10-alpine
ENV PYTHONDONTWRITEBYTECODE=1
ENV PYTHONUNBUFFERED=1
ENV FLASK_APP="blog"
ENV SQLALCHEMY_DATABASE_URI="sqlite:////app/tmp/dev.db"
-WORKDIR /app
-
-
-RUN python -m venv /app/venv
-
-COPY requirements.txt .
-RUN /app/venv/bin/python3 -m pip install -r requirements.txt
-
-
-
-FROM python:3.10-alpine
-ENV PYTHONDONTWRITEBYTECODE=1
-ENV PYTHONUNBUFFERED=1
-
+RUN apk update && apk add --no-cache uv
WORKDIR /app
-ARG UID=10001
+ARG UID=10000
RUN adduser \
--disabled-password \
--gecos "" \
- --home "/nonexistent" \
+ --home "/app" \
--shell "/sbin/nologin" \
- --no-create-home \
--uid "${UID}" \
appuser
+# --no-create-home \
+# appuser
-USER appuser
-COPY --from=build-image /app/venv /app/venv
# Copy the source code into the container.
COPY . .
-
+RUN uv sync --no-dev -n
# Expose the port that the application listens on.
EXPOSE 5000
ENV PATH=/app/venv/bin:$PATH
+#USER appuser
+
# Run the application.
ENTRYPOINT [ "./entrypoint.sh" ]
-CMD [ "gunicorn -c gunicorn.py 'app:create_app()'" ]
+#CMD [ "uv", "run gunicorn -c gunicorn.py "]
diff --git a/Makefile b/Makefile
index b3691c2..7beecc4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 0.0.6
+VERSION = 0.0.7
all: check
@@ -16,6 +16,10 @@ lint-types:
uv run pyright .
+test:
+ FLASK_ENV=testing FLASK_APP=blog uv run pytest
+
+
test-coverage:
( \
. venv/bin/activate;\
@@ -25,8 +29,8 @@ test-coverage:
check: lint test
run:
- flask db upgrade
- flask run --host="0.0.0.0" --debug
+ uv run flask db upgrade
+ uv run flask run --host="0.0.0.0" --debug
docker-build:
docker build . --tag="gunlinux:$(VERSION)"
diff --git a/blog/category/models.py b/blog/category/models.py
index c1a00dc..5c08ef9 100644
--- a/blog/category/models.py
+++ b/blog/category/models.py
@@ -1,6 +1,6 @@
"""SqlAlchemy models."""
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING
from sqlalchemy.orm import Mapped, mapped_column, relationship
@@ -17,7 +17,8 @@ class Category(db.Model):
id: Mapped[int] = mapped_column(primary_key=True)
title: Mapped[str] = mapped_column(default="")
alias: Mapped[str] = mapped_column(unique=True)
- posts: Mapped[List["Post"]] = relationship()
+ posts: Mapped[list["Post"]] = relationship()
+ template: Mapped[str] = mapped_column(nullable=True)
def __str__(self):
- return f"Category(id={self.id}, title={self.title})"
+ return f"Category(id={self.id}, title={self.title}, template={self.template})"
diff --git a/blog/config.py b/blog/config.py
index 27e7e58..1998a76 100644
--- a/blog/config.py
+++ b/blog/config.py
@@ -11,7 +11,9 @@ class Config(object):
SECRET_KEY = environ.get("SECRET_KEY") or "hard to guess string"
SQLALCHEMY_TRACK_MODIFICATIONS = False
SQLALCHEMY_ECHO = False
- PAGE_CATEGORY = int(environ.get("PAGE_CATEGORY", 0))
+ PAGE_CATEGORY: list[int] = [
+ int(c) for c in environ.get("PAGE_CATEGORY", "0").split(",")
+ ]
class DevelopmentConfig(Config):
@@ -23,7 +25,9 @@ class DevelopmentConfig(Config):
class TestingConfig(Config):
TESTING = True
SQLALCHEMY_DATABASE_URI = "sqlite:///:memory:"
- PAGE_CATEGORY = 1
+ PAGE_CATEGORY: list[int] = [
+ 1,
+ ]
class ProductionConfig(Config):
diff --git a/blog/post/views.py b/blog/post/views.py
index aba6d35..a18ee46 100644
--- a/blog/post/views.py
+++ b/blog/post/views.py
@@ -15,6 +15,7 @@
from blog import cache, db
from blog.post.models import Post
+from blog.category.models import Category
post = Blueprint("postb", __name__)
@@ -23,7 +24,7 @@ def pages_gen(f):
@wraps(f)
def decorated_function(*args, **kwargs):
page_category = current_app.config["PAGE_CATEGORY"]
- pages_query = sa.select(Post).where(Post.category_id == page_category)
+ pages_query = sa.select(Post).where(Post.category_id.in_(page_category))
pages = db.session.scalars(pages_query).all()
return f(pages=pages, *args, **kwargs)
@@ -46,12 +47,18 @@ def index(**kwargs):
@cache.cached(timeout=50)
@pages_gen
def view(alias=None, **kwargs):
- page_category = current_app.config["PAGE_CATEGORY"]
+ page_categories = current_app.config["PAGE_CATEGORY"] # (1,3,)
post_query = sa.select(Post).where(
- or_(Post.publishedon.isnot(None), Post.category_id == page_category),
+ or_(Post.publishedon.isnot(None), Post.category_id.in_(page_categories)),
Post.alias == alias,
)
post = db.first_or_404(post_query)
+
+ page_category_obj = db.session.scalars(
+ sa.select(Category).where(Category.id == post.category_id)
+ ).first()
+ if page_category_obj:
+ return render_template(page_category_obj.template, post=post, **kwargs)
return render_template("post.html", post=post, **kwargs)
diff --git a/blog/static/src/components/refs.css b/blog/static/src/components/refs.css
new file mode 100644
index 0000000..f62c8f5
--- /dev/null
+++ b/blog/static/src/components/refs.css
@@ -0,0 +1,34 @@
+.refs {
+ padding: 0.5rem 0;
+}
+
+.refs__links {
+
+}
+
+.refs__links_desc {
+
+}
+
+.refs__link_itemlink {
+ transition: all 0.2s ease-in-out;
+ color: #333;
+ text-align: center;
+ text-decoration: none;
+ border-bottom: 1px solid #ccc;
+ font-size: 1.3em;
+}
+
+.refs__link_itemlink:hover {
+ border-color: #000;
+ color: #000;
+}
+
+
+
+}
+
+.refs__link_itemlink {
+
+}
+
diff --git a/blog/static/src/styles.css b/blog/static/src/styles.css
index 227ac45..1baa91c 100644
--- a/blog/static/src/styles.css
+++ b/blog/static/src/styles.css
@@ -13,3 +13,4 @@
@import 'components/nav.css';
@import 'components/works.css';
@import 'components/work.css';
+@import 'components/refs.css';
diff --git a/blog/templates/layout.html b/blog/templates/layout.html
index b1bb02c..2d2309d 100644
--- a/blog/templates/layout.html
+++ b/blog/templates/layout.html
@@ -20,6 +20,7 @@
+
{% block styles %}
{% endblock %}
diff --git a/blog/templates/post.html b/blog/templates/post.html
index 0ef8611..98a6399 100644
--- a/blog/templates/post.html
+++ b/blog/templates/post.html
@@ -9,7 +9,9 @@
{{post.pagetitle}}
{% if post.category_id != config['PAGE_CATEGORY'] %}
- {{post.publishedon.strftime("%B %d, %Y")}}
+ {% if post.publishedon %}
+ {{post.publishedon.strftime("%B %d, %Y")}}
+ {% endif %}
{% endif %}
@@ -30,4 +32,5 @@ {{post.pagetitle}}
{% block scripts %}
{% endblock %}
+ hljs.initHighlightingOnLoad();
+{% endblock %}
diff --git a/blog/templates/refs.html b/blog/templates/refs.html
new file mode 100644
index 0000000..2934ddd
--- /dev/null
+++ b/blog/templates/refs.html
@@ -0,0 +1,47 @@
+{% extends "layout.html" %}
+
+{% block styles %}
+
+{% endblock %}
+
+{% block content %}
+
+
+
+ {{ post.markdown|safe }}
+
+
+
+