From c851d92e327c0fa357065f444b5e305fb18c7883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kol=C3=A1=C5=99?= <thejoeejoee@gmail.com>
Date: Sun, 26 Nov 2023 22:34:29 +0100
Subject: [PATCH 1/9] feat(wiki): use local db instead of elastic

---
 docker-compose.override.yml                   |  12 --
 docker-compose.prod.yml                       |   5 -
 docker-compose.yml                            |  34 +----
 .../fiesta/parts/navigation_items.html        |   8 +-
 wiki/Gemfile                                  |   1 +
 wiki/fetcher.rb                               | 130 +++++++-----------
 6 files changed, 59 insertions(+), 131 deletions(-)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index a573cfe7..98ca166c 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -39,18 +39,6 @@ services:
     volumes:
       - ./legacy.sql:/docker-entrypoint-initdb.d/legacy.sql
 
-  elastic:
-    volumes:
-      - ./elastic/elastic.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-      - ./conf/elastic/elasticsearch.keystore:/usr/share/elasticsearch/config/elasticsearch.keystore
-      - ./conf/certs:/usr/share/elasticsearch/config/certs
-
-  kibana:
-    volumes:
-      - ./elastic/kibana.yml:/usr/share/kibana/config/kibana.yml
-      - ./conf/certs:/etc/kibana/certs
-
   wikifetcher:
     volumes:
       - ./wiki/:/usr/src/app/
-      - ./conf/certs:/usr/share/certs
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index f11f33bd..4e4948d6 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -22,13 +22,8 @@ services:
     ports:
       - "80:80"
       - "443:443"
-    # TODO: figure out before deployment, whereever/where should be certs stored
     volumes:
       - ./conf/certs:/etc/nginx/certs
 
-  # remove profiles so production env does have filled elastic search
-#  elastic:
-#    profiles: [ ]
-
 #  wikifetcher:
 #    profiles: [ ]
diff --git a/docker-compose.yml b/docker-compose.yml
index 0e74c2ba..6d8a10dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       - web
     volumes:
       - web_media_files:/var/media
-      - wiki_static_files:/var/wiki
+      - wiki_data:/var/wiki
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
       PROXY_HOSTNAME_TARGET: "web"
@@ -98,46 +98,20 @@ services:
     ports:
       - "4306:3306"
 
-  elastic:
-    image: elasticsearch:7.17.0
-    profiles: [ "wiki" ]
-    volumes:
-      - elastic_data:/usr/share/elasticsearch/data
-    ports:
-      - "9200"
-
-  kibana:
-    image: kibana:7.17.0
-    profiles: [ "wiki" ]
-    depends_on:
-      - elastic
-    ports:
-      - "5601"
-    env_file:
-      - ./wiki/.env.base
-      - ./.env
-    environment:
-      VIRTUAL_HOST: kibana.${ROOT_DOMAIN}
-      VIRTUAL_PORT: 5601
-
   wikifetcher:
     build: ./wiki
-    profiles: [ "wiki" ]
-    # when elastic is not ready yet, try it again
     restart: on-failure
-    depends_on:
-      - elastic
     volumes:
-      - wiki_static_files:/usr/src/static
+#      - wiki_data:/usr/src/static
+      - ./wiki/data:/usr/src/static
     env_file:
       - .env
       - wiki/.env.base
 
 volumes:
   postgres15_data:
-  elastic_data:
   legacydb_data:
   webpack_build:
   web_static_files:
   web_media_files:
-  wiki_static_files:
+  wiki_data:
diff --git a/fiesta/templates/fiesta/parts/navigation_items.html b/fiesta/templates/fiesta/parts/navigation_items.html
index efcd3cb5..53f426e1 100644
--- a/fiesta/templates/fiesta/parts/navigation_items.html
+++ b/fiesta/templates/fiesta/parts/navigation_items.html
@@ -1,8 +1,8 @@
 <ul class="w-full flex flex-col mt-4 md:flex-row md:space-x-4 md:mt-0 md:text-sm md:font-medium lg:space-x-8">
-  {#          <li>#}
-  {#            TODO: documentation content and ES deploy#}
-  {#            <a class="Menu__link" href="{% url "wiki:index" %}">Docs</a>#}
-  {#          </li>#}
+  <li>
+    {#              TODO: documentation content and ES deploy#}
+    <a class="Menu__link" href="{% url "wiki:index" %}">Docs</a>
+  </li>
   {% for item in items %}
     <li>
       {% if item.children %}
diff --git a/wiki/Gemfile b/wiki/Gemfile
index cd4f145b..e5eac862 100644
--- a/wiki/Gemfile
+++ b/wiki/Gemfile
@@ -28,3 +28,4 @@ gem "wikicloth", "=0.8.3"
 gem "twitter-text", "~> 1.14"
 gem "asciidoctor", "~> 2.0.5"
 gem "rake"
+gem "sqlite3"
diff --git a/wiki/fetcher.rb b/wiki/fetcher.rb
index 286bb770..990d3882 100755
--- a/wiki/fetcher.rb
+++ b/wiki/fetcher.rb
@@ -4,11 +4,11 @@
 require "logger"
 require "linguist"
 require "github/markup"
-require "elasticsearch"
 require "html/pipeline"
 require "fileutils"
 require "facets/string/titlecase"
 require "sanitize"
+require "sqlite3"
 
 class String
   def titleize
@@ -33,8 +33,6 @@ def call
   end
 end
 
-require_relative "wait-for-port"
-
 WIKI_REPO_PATH = "/usr/src/wiki"
 
 FileUtils.rm_rf(WIKI_REPO_PATH)
@@ -47,64 +45,21 @@ def call
   :log => Logger.new(STDOUT)
 )
 
-git.config("log.date", "unix")
-
-last_revision = git.object("HEAD^").sha
+db_file = File.join(ENV["WIKI_STATIC_PATH"], "wiki.sqlite3")
+File.delete(db_file) if File.exist?(db_file)
 
-wait_for_port("elastic", 9200)
+db = SQLite3::Database.new db_file
 
-elastic = Elasticsearch::Client.new(
-  url: ENV["ELASTIC_URL"],
-  transport_options: {
-    ssl: { ca_file: "/usr/share/certs/rootCA.pem" },
-  },
-  log: true,
-)
+# Create a table
+db.execute <<-SQL
+  CREATE VIRTUAL TABLE IF NOT EXISTS
+    wiki USING
+    fts5(file, title, content_html, content_plain, toc);
+SQL
 
-# purge all
-if elastic.indices.exists? index: "wiki"
-  elastic.indices.delete(:index => "wiki")
-end
+git.config("log.date", "unix")
 
-elastic.indices.create(
-  :index => "wiki",
-  :body => {
-    "settings": {
-      "index": {
-        "analysis": {
-          "char_filter": {
-            "ignore_html_tags": {
-              "type": "html_strip",
-            },
-          },
-          "analyzer": {
-            "ignore_html_tags": {
-              "tokenizer": "lowercase",
-              "char_filter": [
-                "ignore_html_tags",
-              ],
-              "type": "custom",
-            },
-          },
-        },
-      },
-    },
-    "mappings": {
-      "properties": {
-        "content_html": {
-          "type": "text",
-          "analyzer": "ignore_html_tags",
-          "fields": {
-            "keyword": {
-              "type": "keyword",
-              "ignore_above": 256,
-            },
-          },
-        },
-      },
-    },
-  },
-)
+last_revision = git.object("HEAD^").sha
 
 rich_pipeline = HTML::Pipeline.new [
   HTML::Pipeline::TableOfContentsFilter,
@@ -172,34 +127,49 @@ def call
       )
     end
 
-    puts relativepath,
-         last_commit.author.name,
-         last_commit.author.email,
-         last_commit.author.date,
-         last_commit.message, language
+    puts relativepath #,
+#          last_commit.author.name,
+#          last_commit.author.email,
+#          last_commit.author.date,
+#          last_commit.message, language
 
     basename = File.basename(relativepath, File.extname(relativepath))
     title = basename.gsub("-", " ").titleize
 
-    elastic.index(
-      index: "wiki",
-      id: relativepath,
-      body: {
-        content_html: rich_result[:output].to_s,
-        content_plain: Sanitize.fragment(rich_result[:output].to_s),
-        toc: rich_result[:toc],
-        title: title,
-        file: relativepath,
-        last_change: {
-          # 2022-02-11 10:40:58 +0000
-          at: last_commit.date.iso8601,
-          name: last_commit.author.name,
-          email: last_commit.author.email,
-          sha: last_commit.sha,
-          parent_sha: last_commit.parent.sha,
-        },
-      },
+    db.execute(
+        "INSERT INTO
+        wiki (file, title, content_html, content_plain, toc)
+        VALUES (?, ?, ?, ?, ?)",
+        [
+            relativepath,
+            title,
+            rich_result[:output].to_s,
+            Sanitize.fragment(rich_result[:output].to_s),
+            rich_result[:toc],
+        ]
     )
+
+#     elastic.index(
+#       index: "wiki",
+#       id: relativepath,
+#       body: {
+#         content_html: rich_result[:output].to_s,
+#         content_plain: Sanitize.fragment(rich_result[:output].to_s),
+#         toc: rich_result[:toc],
+#         title: title,
+#         file: relativepath,
+#         last_change: {
+#           # 2022-02-11 10:40:58 +0000
+#           at: last_commit.date.iso8601,
+#           name: last_commit.author.name,
+#           email: last_commit.author.email,
+#           sha: last_commit.sha,
+#           parent_sha: last_commit.parent.sha,
+#         },
+#       },
+#     )
+
+
   end
   puts ""
 end

From 0149fd565ef15c218efb42f33e6cd9f3735d2254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kol=C3=A1=C5=99?= <thejoeejoee@gmail.com>
Date: Wed, 29 Nov 2023 09:07:03 +0100
Subject: [PATCH 2/9] feat(wiki): use local sqlite

---
 docker-compose.yml                            |  4 +-
 fiesta/apps/utils/templatetags/navigation.py  | 28 +++++++++++---
 fiesta/apps/wiki/{elastic.py => adapter.py}   | 37 ++++++++++++++++++-
 fiesta/apps/wiki/models.py                    | 20 ++++++++++
 fiesta/apps/wiki/templates/wiki/index.html    | 24 +++++++-----
 fiesta/apps/wiki/templates/wiki/search.html   |  6 +--
 fiesta/apps/wiki/views.py                     | 10 ++---
 fiesta/fiesta/settings/db.py                  |  4 ++
 fiesta/fiesta/settings/files.py               |  2 +
 .../fiesta/parts/navigation_items.html        |  4 --
 nginx/nginx.conf.template                     | 10 ++---
 webpack/src/css/_Wiki.css                     | 28 +++++++-------
 wiki/.env.base                                |  8 ----
 wiki/Gemfile                                  |  2 +-
 wiki/fetcher.rb                               | 14 +++++--
 wiki/wait-for-port.rb                         | 17 ---------
 16 files changed, 138 insertions(+), 80 deletions(-)
 rename fiesta/apps/wiki/{elastic.py => adapter.py} (74%)
 create mode 100644 fiesta/apps/wiki/models.py
 delete mode 100644 wiki/wait-for-port.rb

diff --git a/docker-compose.yml b/docker-compose.yml
index 6d8a10dd..9b97aa34 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,7 @@ services:
     volumes:
       # for dev and also produp
       - web_media_files:/usr/src/media
+      - wiki_data:/usr/wiki
     environment:
       VIRTUAL_HOST: web.${ROOT_DOMAIN}
       VIRTUAL_PORT: 8000
@@ -102,8 +103,7 @@ services:
     build: ./wiki
     restart: on-failure
     volumes:
-#      - wiki_data:/usr/src/static
-      - ./wiki/data:/usr/src/static
+      - wiki_data:/usr/src/static
     env_file:
       - .env
       - wiki/.env.base
diff --git a/fiesta/apps/utils/templatetags/navigation.py b/fiesta/apps/utils/templatetags/navigation.py
index 07875ac9..d833c997 100644
--- a/fiesta/apps/utils/templatetags/navigation.py
+++ b/fiesta/apps/utils/templatetags/navigation.py
@@ -6,6 +6,7 @@
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.urls import reverse
 from django.utils.http import urlencode
+from django.utils.translation import gettext_lazy as _
 
 if typing.TYPE_CHECKING:
     from apps.plugins.middleware.plugin import HttpRequest
@@ -13,6 +14,7 @@
     from apps.plugins.plugin import BasePluginAppConfig
     from apps.sections.models import Section, SectionMembership
 
+
 register = template.Library()
 
 
@@ -27,6 +29,7 @@ class NavigationItemSpec(typing.NamedTuple):
 @register.simple_tag(takes_context=True)
 def get_navigation_items(context):
     from apps.plugins.utils import all_plugins_to_order
+    from apps.sections.models import SectionMembership
 
     request: HttpRequest = context["request"]
 
@@ -34,6 +37,18 @@ def get_navigation_items(context):
     section: Section | None = request.in_space_of_section
 
     if not membership:
+        if request.all_memberships.filter(
+            role__in=(SectionMembership.Role.ADMIN, SectionMembership.Role.EDITOR)
+        ).exists():
+            # TODO: consider better way
+            return [
+                NavigationItemSpec(
+                    _("Docs"),
+                    reverse("wiki:index"),
+                    [],
+                    request.path.startswith(reverse("wiki:index")),
+                ),
+            ]
         return []
 
     plugins: list[Plugin] = (
@@ -42,11 +57,14 @@ def get_navigation_items(context):
 
     orders = all_plugins_to_order()
 
-    for plugin in sorted(plugins, key=lambda p: (orders[p.app_label], p.app_label)):
-        apps: BasePluginAppConfig = plugin.app_config
-        item = apps.as_navigation_item(request=request, bound_plugin=plugin)
-        if item:
-            yield item
+    def _all_items():
+        for plugin in sorted(plugins, key=lambda p: (orders[p.app_label], p.app_label)):
+            apps: BasePluginAppConfig = plugin.app_config
+            item = apps.as_navigation_item(request=request, bound_plugin=plugin)
+            if item:
+                yield item
+
+    return list(_all_items())
 
 
 @register.simple_tag(takes_context=True)
diff --git a/fiesta/apps/wiki/elastic.py b/fiesta/apps/wiki/adapter.py
similarity index 74%
rename from fiesta/apps/wiki/elastic.py
rename to fiesta/apps/wiki/adapter.py
index 341e9e1a..0e898401 100644
--- a/fiesta/apps/wiki/elastic.py
+++ b/fiesta/apps/wiki/adapter.py
@@ -5,6 +5,8 @@
 from django.core.exceptions import ObjectDoesNotExist
 from elasticsearch import Elasticsearch, Transport, Urllib3HttpConnection
 
+from apps.wiki import models
+
 
 class Revision(TypedDict):
     at: str
@@ -30,7 +32,7 @@ class SearchPage(TypedDict):
     highlight: list[str]
 
 
-class WikiElastic:
+class ElasticAdapter:
     def __init__(self, client: Elasticsearch):
         self._client = client
 
@@ -109,6 +111,36 @@ def _page_for_filename(self, file_name: str, *, base: str = "") -> Page | None:
         return None
 
 
+class LocalDbAdapter(ElasticAdapter):
+    def _page_for_filename(self, file_name: str, *, base: str = "") -> Page | None:
+        base = f"{base}/" if base and not file_name.startswith("_") else ""
+        return models.Page.objects.using("wiki").get(file__contains=f"{base}{file_name}.").__dict__
+
+    def search(self, term: str) -> list[SearchPage]:
+        results = models.Page.objects.using("wiki").raw(
+            """
+                SELECT
+                    snippet(wiki, 1, '<b>', '</b>', '...', 64) as highlight,
+                    rank as rank,
+                    w.*
+                FROM wiki AS w
+                WHERE content_plain MATCH %s
+                ORDER BY rank;
+            """,
+            [term.strip()],
+        )
+
+        return [
+            SearchPage(
+                source=page.__dict__,
+                highlight=page.highlight,
+                score=page.rank,
+            )
+            for page in results
+            if not page.file.startswith("_")
+        ]
+
+
 class LocalCATrustedTransportation(Transport):
     # TODO: really here?
     class CATrustedConnection(Urllib3HttpConnection):
@@ -124,4 +156,5 @@ def __init__(self, *args, **kwargs) -> None:
     transport_class=LocalCATrustedTransportation,
 )
 
-wiki_elastic = WikiElastic(client=es)
+wiki_adapter = LocalDbAdapter(client=es)
+# wiki_adapter = ElasticAdapter(client=es)
diff --git a/fiesta/apps/wiki/models.py b/fiesta/apps/wiki/models.py
new file mode 100644
index 00000000..dc52cc99
--- /dev/null
+++ b/fiesta/apps/wiki/models.py
@@ -0,0 +1,20 @@
+from __future__ import annotations
+
+from django.db import models
+
+
+class Page(models.Model):
+    file = models.CharField(primary_key=True, max_length=255, db_column="file")
+    title = models.CharField(max_length=255, db_column="title")
+    content_html = models.TextField(db_column="content_html")
+    content_plain = models.TextField(db_column="content_plain")
+    toc = models.TextField(db_column="toc")
+
+    last_change = models.JSONField(db_column="last_change")
+
+    class Meta:
+        managed = False
+        db_table = "wiki"
+
+    def __str__(self):
+        return self.title
diff --git a/fiesta/apps/wiki/templates/wiki/index.html b/fiesta/apps/wiki/templates/wiki/index.html
index 559c4cfc..71129440 100644
--- a/fiesta/apps/wiki/templates/wiki/index.html
+++ b/fiesta/apps/wiki/templates/wiki/index.html
@@ -32,8 +32,9 @@
 
       {% block main %}
         {{ page.content_html|safe }}
-        <hr class="mt-10">
-        <div class="mt-5 mb-5 text-sm">{{ footer.content_html|safe }}</div>
+        {#        TODO: consider footer display #}
+        {#        <hr class="mt-10">#}
+        {#        <div class="mt-5 mb-5 text-sm">{{ footer.content_html|safe }}</div>#}
       {% endblock main %}
     </main>
 
@@ -48,14 +49,17 @@
         {% endif %}
         <div class="mt-5 text-xs items-center space-y-1 text-gray-600">
           {# TODO: links to conf #}
-          Last revision: {{ page.last_change.name }}
-          <a href="https://github.com/esnvutbrno/fiesta-plus/wiki/_compare/{{ page.last_change.parent_sha }}..{{ page.last_change.sha }}"
-             target="_blank"
-             rel="noreferrer nofollow noopener"
-             class="hover:underline"
-             title="{{ page.last_change.at|date_from_iso|date }}">
-            {{ page.last_change.at|date_from_iso|naturaltime }}
-          </a>
+          {% if page.last_change %}
+            Last revision:
+            {#          {{ page.last_change.name }}#}
+            <a href="https://github.com/esnvutbrno/fiesta-plus/wiki/_compare/{{ page.last_change.parent_sha }}..{{ page.last_change.sha }}"
+               target="_blank"
+               rel="noreferrer nofollow noopener"
+               class="hover:underline"
+               title="{{ page.last_change.at|date_from_iso|date }}">
+              {{ page.last_change.at|date_from_iso|naturaltime }}
+            </a>
+          {% endif %}
           <div class="border-t border-gray-100"></div>
           <a href="https://github.com/esnvutbrno/fiesta-plus/wiki/{{ page.file|strip_file_extension }}/_history"
              target="_blank"
diff --git a/fiesta/apps/wiki/templates/wiki/search.html b/fiesta/apps/wiki/templates/wiki/search.html
index b80abb63..60a5685c 100644
--- a/fiesta/apps/wiki/templates/wiki/search.html
+++ b/fiesta/apps/wiki/templates/wiki/search.html
@@ -16,11 +16,7 @@ <h2 class="text-3xl font-medium font-gray-800 my-3">{{ hit.source.title }}</h2>
               {{ hit.score }}
             </span>
           </div>
-          <p class="text-gray-700 text-md">
-            {{ hit.highlight.content_plain|safeseq|join:"
-            <br>
-            "|safe }}
-          </p>
+          <p class="text-gray-700 text-md">{{ hit.highlight|safe }}</p>
         </a>
       {% endwith %}
     {% endfor %}
diff --git a/fiesta/apps/wiki/views.py b/fiesta/apps/wiki/views.py
index 43cbcdb1..202f76fc 100644
--- a/fiesta/apps/wiki/views.py
+++ b/fiesta/apps/wiki/views.py
@@ -5,7 +5,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 
-from .elastic import wiki_elastic
+from .adapter import wiki_adapter
 from apps.utils.breadcrumbs import with_breadcrumb
 
 
@@ -17,7 +17,7 @@ def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         q = self.request.GET.get("q")
 
-        ctx["results"] = wiki_elastic.search(term=q) if q else []
+        ctx["results"] = wiki_adapter.search(term=q) if q else []
         ctx["q"] = q
 
         self.request.titles.append(_("Search: {}").format(q))
@@ -34,7 +34,7 @@ class WikiView(TemplateView):
     def get(self, request, *args, **kwargs):
         self.path = self.kwargs.get("path") or "/"
 
-        base, file_name = wiki_elastic.split_path(self.path)
+        base, file_name = wiki_adapter.split_path(self.path)
 
         if file_name.startswith("_"):
             return HttpResponsePermanentRedirect(
@@ -45,8 +45,8 @@ def get(self, request, *args, **kwargs):
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
 
-        ctx["sidebar"], ctx["footer"] = wiki_elastic.get_page_parts(path=self.path)
-        page = wiki_elastic.page_for_path(path=self.path)
+        ctx["sidebar"], ctx["footer"] = wiki_adapter.get_page_parts(path=self.path)
+        page = wiki_adapter.page_for_path(path=self.path)
         ctx["page"] = page
         self.request.titles.append(page.get("title"))
 
diff --git a/fiesta/fiesta/settings/db.py b/fiesta/fiesta/settings/db.py
index c8741ee9..6c21606d 100644
--- a/fiesta/fiesta/settings/db.py
+++ b/fiesta/fiesta/settings/db.py
@@ -18,4 +18,8 @@ class DatabaseConfigMixin:
             "USER": "root",
             "PASSWORD": "root",
         },
+        "wiki": {
+            "ENGINE": "django.db.backends.sqlite3",
+            "NAME": "/usr/wiki/wiki.sqlite3",
+        },
     }
diff --git a/fiesta/fiesta/settings/files.py b/fiesta/fiesta/settings/files.py
index 93242eb4..9fce5c7d 100644
--- a/fiesta/fiesta/settings/files.py
+++ b/fiesta/fiesta/settings/files.py
@@ -22,6 +22,8 @@ def STATICFILES_DIRS(self):
         return [
             (self.BASE_DIR / "static"),
             (self.BASE_DIR / "templates/static"),
+            # TODO: tmp for development
+            "/usr",
         ]
 
     def USE_WEBPACK_INTEGRITY(self):
diff --git a/fiesta/templates/fiesta/parts/navigation_items.html b/fiesta/templates/fiesta/parts/navigation_items.html
index 53f426e1..e7410a9a 100644
--- a/fiesta/templates/fiesta/parts/navigation_items.html
+++ b/fiesta/templates/fiesta/parts/navigation_items.html
@@ -1,8 +1,4 @@
 <ul class="w-full flex flex-col mt-4 md:flex-row md:space-x-4 md:mt-0 md:text-sm md:font-medium lg:space-x-8">
-  <li>
-    {#              TODO: documentation content and ES deploy#}
-    <a class="Menu__link" href="{% url "wiki:index" %}">Docs</a>
-  </li>
   {% for item in items %}
     <li>
       {% if item.children %}
diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template
index aea516bc..dc5317bb 100644
--- a/nginx/nginx.conf.template
+++ b/nginx/nginx.conf.template
@@ -21,11 +21,11 @@ server {
     client_max_body_size 32M;
 
     # wiki static are always served by nginx
-    location ~ ^/static/wiki/(.*) {
-        root /;
-        add_header Cache-Control "public, max-age=31536000";
-        try_files /var/wiki/$1 =404;
-    }
+    # location ~ ^/static/wiki/(.*) {
+    #     root /;
+    #     add_header Cache-Control "public, max-age=31536000";
+    #     try_files /var/wiki/$1 =404;
+    # }
 
     # wiki gh is pass to GH assets
     location ~ ^/static/gh/(.*) {
diff --git a/webpack/src/css/_Wiki.css b/webpack/src/css/_Wiki.css
index 6b61caf3..85bf76bd 100644
--- a/webpack/src/css/_Wiki.css
+++ b/webpack/src/css/_Wiki.css
@@ -45,21 +45,23 @@
         @apply opacity-100;
     }
 
-    .Wiki__sidebar {
-        @apply mt-3;
-    }
 
-    .Wiki__sidebar ul {
-        @apply space-y-6 lg:space-y-2 border-l border-slate-100 dark:border-slate-800;
-    }
+}
 
-    .Wiki__sidebar li a {
-        @apply block border-l pl-4 -ml-px border-transparent text-slate-700
-        hover:border-slate-400 dark:hover:border-slate-500
-        hover:text-slate-900 dark:text-slate-400 dark:hover:text-slate-300
-        ;
-        /*@apply block border-l pl-4 -ml-px text-sky-500 border-current font-semibold dark:text-sky-400;*/
-    }
+.Wiki__sidebar {
+    @apply mt-3 prose prose-sm prose-h2:mt-0 prose-h2:mb-1 prose-img:mx-0;
+}
+
+.Wiki__sidebar ul {
+    @apply space-y-6 lg:space-y-2 border-l border-slate-100 dark:border-slate-800;
+}
+
+.Wiki__sidebar li a {
+
+}
+
+.Wiki__sidebar .Wiki__link-icon {
+    @apply hidden
 }
 
 /* not present in HTML files, so placed outside layer */
diff --git a/wiki/.env.base b/wiki/.env.base
index c1352d59..5d53de5d 100644
--- a/wiki/.env.base
+++ b/wiki/.env.base
@@ -1,11 +1,3 @@
-ELASTIC_HOST=elastic:9200
-ELASTIC_PROTO=https
-ELASTIC_HOST_URL=${ELASTIC_PROTO}://${ELASTIC_HOST}
-ELASTIC_USERNAME=elastic
-ELASTIC_PASSWORD=elastic
-
-ELASTIC_URL="${ELASTIC_PROTO}://${ELASTIC_USERNAME}:${ELASTIC_PASSWORD}@${ELASTIC_HOST}"
-
 WIKI_GIT_URL=https://github.com/esnvutbrno/fiesta-plus.wiki.git
 
 WIKI_STATIC_URL=https://${ROOT_DOMAIN}/static/wiki/
diff --git a/wiki/Gemfile b/wiki/Gemfile
index e5eac862..2e3b7fdd 100644
--- a/wiki/Gemfile
+++ b/wiki/Gemfile
@@ -8,7 +8,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 gem "git", "~> 1.11"
 gem "github-markup", "~> 4.0"
 gem "github-linguist"
-gem "elasticsearch", "~> 7.17.0"
+# gem "elasticsearch", "~> 7.17.0"
 gem "html-pipeline"
 gem "facets", "~> 3.1"
 gem "gemoji"
diff --git a/wiki/fetcher.rb b/wiki/fetcher.rb
index 990d3882..8de538e9 100755
--- a/wiki/fetcher.rb
+++ b/wiki/fetcher.rb
@@ -54,7 +54,7 @@ def call
 db.execute <<-SQL
   CREATE VIRTUAL TABLE IF NOT EXISTS
     wiki USING
-    fts5(file, title, content_html, content_plain, toc);
+    fts5(file, title, content_html, content_plain, toc, last_change);
 SQL
 
 git.config("log.date", "unix")
@@ -138,14 +138,22 @@ def call
 
     db.execute(
         "INSERT INTO
-        wiki (file, title, content_html, content_plain, toc)
-        VALUES (?, ?, ?, ?, ?)",
+        wiki (file, title, content_html, content_plain, toc, last_change)
+        VALUES (?, ?, ?, ?, ?, ?)",
         [
             relativepath,
             title,
             rich_result[:output].to_s,
             Sanitize.fragment(rich_result[:output].to_s),
             rich_result[:toc],
+            {
+                # 2022-02-11 10:40:58 +0000
+                at: last_commit.date.iso8601,
+                name: last_commit.author.name,
+                email: last_commit.author.email,
+                sha: last_commit.sha,
+                parent_sha: last_commit.parent.sha,
+            }.to_json
         ]
     )
 
diff --git a/wiki/wait-for-port.rb b/wiki/wait-for-port.rb
deleted file mode 100644
index b1a0cf39..00000000
--- a/wiki/wait-for-port.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require "socket"
-require "timeout"
-
-def port_open?(ip, port)
-  begin
-    TCPSocket.new(ip, port).close
-    true
-  rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-    false
-  end
-end
-
-def wait_for_port(ip, port)
-  until port_open?(ip, port)
-    sleep(0.5)
-  end
-end

From 797b975f6351f7f9d8ab1d14b1dcb23c9e38cea9 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Sat, 2 Dec 2023 15:01:03 +0000
Subject: [PATCH 3/9] fix: Dockerfile to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-ALPINE317-CURL-5958910
- https://snyk.io/vuln/SNYK-ALPINE317-CURL-5958910
- https://snyk.io/vuln/SNYK-ALPINE317-LIBWEBP-5902239
- https://snyk.io/vuln/SNYK-ALPINE317-NCURSES-5606599
- https://snyk.io/vuln/SNYK-ALPINE317-NGHTTP2-5954769
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8e775521..edb97057 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -140,7 +140,7 @@ CMD ["python -m gunicorn -b [::]:8000 fiesta.wsgi:application"]
 #
 # proxy image
 #
-FROM nginx:1.25.0-alpine as proxy-base
+FROM nginx:1.25.2-alpine as proxy-base
 
 RUN rm /etc/nginx/conf.d/default.conf
 

From f05a452f7176ba785b1b4ed8c59ac4f1240083b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kol=C3=A1=C5=99?= <thejoeejoee@gmail.com>
Date: Thu, 7 Dec 2023 20:07:21 +0100
Subject: [PATCH 4/9] feat(wiki): pass statics to correct position

---
 Dockerfile                      | 40 ++++++++++++++++++++++++++++++++-
 docker-compose.prod.yml         |  3 ---
 docker-compose.yml              | 15 ++++++++-----
 fiesta/apps/wiki/models.py      | 16 ++++++++-----
 fiesta/fiesta/settings/db.py    |  3 ++-
 fiesta/fiesta/settings/files.py |  5 +++--
 wiki/.env.base                  |  3 ++-
 wiki/Dockerfile                 | 20 -----------------
 wiki/fetcher.rb                 |  5 +++--
 9 files changed, 69 insertions(+), 41 deletions(-)
 delete mode 100644 wiki/Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 8e775521..028eb10e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,41 @@ ARG DJANGO_RELEASE_NAME
 ARG SENTRY_RELEASE_NAME
 ARG SENTRY_RELEASE_ENVIRONMENT
 
+#
+# wiki renderer image
+#
+FROM ruby:3.0 as wiki-base
+
+RUN apt-get update && \
+    # pip to install docutils, cmake to build github-linguist
+    apt-get install -y python3-pip cmake && \
+    python3 -m pip install docutils && \
+    apt-get remove -y python3-pip && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY ./wiki/Gemfile ./wiki/Gemfile.lock ./
+RUN bundle install
+
+RUN apt-get remove -y cmake && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /usr/src/app
+
+COPY ./wiki/ .
+
+ENTRYPOINT [ "./fetcher.rb" ]
+
+FROM wiki-base as wiki-stable
+
+ENV WIKI_GIT_URL=https://github.com/esnvutbrno/fiesta-plus.wiki.git
+ENV WIKI_STATIC_ASSETS_URL=/static/gh/
+
+ENV WIKI_DB_NAME=/usr/src/db.sqlite3
+ENV WIKI_STATIC_PATH=/usr/src/static
+ENV WIKI_STATIC_URL=/static/wiki/
+
+RUN mkdir -p $WIKI_STATIC_PATH && ./fetcher.rb
+
 #
 # webpack image
 #
@@ -129,11 +164,13 @@ ARG DJANGO_RELEASE_NAME
 ENV DJANGO_RELEASE_NAME=${DJANGO_RELEASE_NAME}
 
 # need production configuration, but not all values are ready in env
-RUN bash -c "DJANGO_SECRET_KEY=\$RANDOM DJANGO_CONFIGURATION=LocalProduction python manage.py collectstatic --no-input"
+RUN bash -c "DJANGO_SECRET_KEY=\$RANDOM DJANGO_CONFIGURATION=LocalProduction python manage.py collectstatic --no-input --verbosity 3"
 
 # given by webpack compiled results
 COPY --from=webpack-stable /usr/src/build/webpack-stats.json ${DJANGO_BUILD_DIR}
 
+COPY --from=wiki-stable /usr/src/wiki/db/wiki.sqlite3 /usr/src/wiki/db/wiki.sqlite3
+
 # TODO: check opts https://www.uvicorn.org/#command-line-options
 CMD ["python -m gunicorn -b [::]:8000 fiesta.wsgi:application"]
 
@@ -152,6 +189,7 @@ FROM proxy-base as proxy-stable
 # prepared by webpack and web builds during CD
 COPY --from=webpack-stable /usr/src/build/ /var/build/
 COPY --from=web-stable /usr/src/static/ /var/static/
+COPY --from=wiki-stable /usr/src/wiki/static /var/static/wiki/
 
 ARG STATIC_LOCATION_PATTERN="^/static/(.*)$$"
 ENV STATIC_LOCATION_PATTERN=${STATIC_LOCATION_PATTERN}
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 4e4948d6..2389db78 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -24,6 +24,3 @@ services:
       - "443:443"
     volumes:
       - ./conf/certs:/etc/nginx/certs
-
-#  wikifetcher:
-#    profiles: [ ]
diff --git a/docker-compose.yml b/docker-compose.yml
index 9b97aa34..df7c48e6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,8 @@ services:
     volumes:
       # for dev and also produp
       - web_media_files:/usr/src/media
-      - wiki_data:/usr/wiki
+      - wiki_db:/usr/src/wiki/db/
+      - wiki_static:/usr/src/wiki/static/wiki/
     environment:
       VIRTUAL_HOST: web.${ROOT_DOMAIN}
       VIRTUAL_PORT: 8000
@@ -33,7 +34,6 @@ services:
       - web
     volumes:
       - web_media_files:/var/media
-      - wiki_data:/var/wiki
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
       PROXY_HOSTNAME_TARGET: "web"
@@ -100,10 +100,14 @@ services:
       - "4306:3306"
 
   wikifetcher:
-    build: ./wiki
+    build:
+      context: .
+      dockerfile: Dockerfile
+      target: wiki-base
     restart: on-failure
     volumes:
-      - wiki_data:/usr/src/static
+      - wiki_db:/usr/src/wiki/db/
+      - wiki_static:/usr/src/wiki/static/
     env_file:
       - .env
       - wiki/.env.base
@@ -114,4 +118,5 @@ volumes:
   webpack_build:
   web_static_files:
   web_media_files:
-  wiki_data:
+  wiki_db:
+  wiki_static:
diff --git a/fiesta/apps/wiki/models.py b/fiesta/apps/wiki/models.py
index dc52cc99..78ca858b 100644
--- a/fiesta/apps/wiki/models.py
+++ b/fiesta/apps/wiki/models.py
@@ -1,20 +1,24 @@
 from __future__ import annotations
 
 from django.db import models
+from django.utils.translation import gettext_lazy as _
 
 
 class Page(models.Model):
-    file = models.CharField(primary_key=True, max_length=255, db_column="file")
-    title = models.CharField(max_length=255, db_column="title")
-    content_html = models.TextField(db_column="content_html")
-    content_plain = models.TextField(db_column="content_plain")
-    toc = models.TextField(db_column="toc")
+    file = models.CharField(primary_key=True, max_length=255, db_column="file", verbose_name=_("file"))
+    title = models.CharField(max_length=255, db_column="title", verbose_name=_("title"))
+    content_html = models.TextField(db_column="content_html", verbose_name=_("content"))
+    content_plain = models.TextField(db_column="content_plain", verbose_name=_("content (plain)"))
+    toc = models.TextField(db_column="toc", verbose_name=_("table of contents"))
 
-    last_change = models.JSONField(db_column="last_change")
+    last_change = models.JSONField(db_column="last_change", verbose_name=_("last change"))
 
     class Meta:
+        # generated by wiki dumper script, just queried by Django
         managed = False
         db_table = "wiki"
+        verbose_name = _("page")
+        verbose_name_plural = _("pages")
 
     def __str__(self):
         return self.title
diff --git a/fiesta/fiesta/settings/db.py b/fiesta/fiesta/settings/db.py
index 6c21606d..0b72edc3 100644
--- a/fiesta/fiesta/settings/db.py
+++ b/fiesta/fiesta/settings/db.py
@@ -20,6 +20,7 @@ class DatabaseConfigMixin:
         },
         "wiki": {
             "ENGINE": "django.db.backends.sqlite3",
-            "NAME": "/usr/wiki/wiki.sqlite3",
+            # TODO: pass from ENV
+            "NAME": "/usr/src/wiki/db/wiki.sqlite3",
         },
     }
diff --git a/fiesta/fiesta/settings/files.py b/fiesta/fiesta/settings/files.py
index 9fce5c7d..2873694b 100644
--- a/fiesta/fiesta/settings/files.py
+++ b/fiesta/fiesta/settings/files.py
@@ -22,8 +22,9 @@ def STATICFILES_DIRS(self):
         return [
             (self.BASE_DIR / "static"),
             (self.BASE_DIR / "templates/static"),
-            # TODO: tmp for development
-            "/usr",
+            # dir with wiki statics during debug
+            # TODO: pass from env
+            "/usr/src/wiki/static/",
         ]
 
     def USE_WEBPACK_INTEGRITY(self):
diff --git a/wiki/.env.base b/wiki/.env.base
index 5d53de5d..25084466 100644
--- a/wiki/.env.base
+++ b/wiki/.env.base
@@ -1,6 +1,7 @@
 WIKI_GIT_URL=https://github.com/esnvutbrno/fiesta-plus.wiki.git
 
 WIKI_STATIC_URL=https://${ROOT_DOMAIN}/static/wiki/
-WIKI_STATIC_PATH=/usr/src/static
+WIKI_STATIC_PATH=/usr/src/wiki/static
+WIKI_DB_NAME=/usr/src/wiki/db/wiki.sqlite3
 
 WIKI_STATIC_ASSETS_URL=https://${ROOT_DOMAIN}/static/gh/
diff --git a/wiki/Dockerfile b/wiki/Dockerfile
deleted file mode 100644
index a05e2e54..00000000
--- a/wiki/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM ruby:3.0
-
-RUN apt-get update && \
-    # pip to install docutils, cmake to build github-linguist
-    apt-get install -y python3-pip cmake && \
-    python3 -m pip install docutils && \
-    apt-get remove -y python3-pip && \
-    rm -rf /var/lib/apt/lists/*
-
-COPY Gemfile Gemfile.lock ./
-RUN bundle install
-
-RUN apt-get remove -y cmake && \
-    rm -rf /var/lib/apt/lists/*
-
-WORKDIR /usr/src/app
-
-COPY ./ .
-
-ENTRYPOINT [ "./fetcher.rb" ]
diff --git a/wiki/fetcher.rb b/wiki/fetcher.rb
index 8de538e9..9ac5228d 100755
--- a/wiki/fetcher.rb
+++ b/wiki/fetcher.rb
@@ -33,7 +33,7 @@ def call
   end
 end
 
-WIKI_REPO_PATH = "/usr/src/wiki"
+WIKI_REPO_PATH = "/var/wiki"
 
 FileUtils.rm_rf(WIKI_REPO_PATH)
 FileUtils.rm_rf(File.join(ENV["WIKI_STATIC_PATH"], "*"))
@@ -45,7 +45,7 @@ def call
   :log => Logger.new(STDOUT)
 )
 
-db_file = File.join(ENV["WIKI_STATIC_PATH"], "wiki.sqlite3")
+db_file = File.join(ENV["WIKI_DB_NAME"])
 File.delete(db_file) if File.exist?(db_file)
 
 db = SQLite3::Database.new db_file
@@ -64,6 +64,7 @@ def call
 rich_pipeline = HTML::Pipeline.new [
   HTML::Pipeline::TableOfContentsFilter,
   VersionedImagesFilter,
+#   TODO: does not work with relative paths
   HTML::Pipeline::AbsoluteSourceFilter,
   HTML::Pipeline::AutolinkFilter,
   HTML::Pipeline::EmojiFilter,

From b6f4f56daa8ad3dd92e758212ab84e78bd444d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kol=C3=A1=C5=99?= <thejoeejoee@gmail.com>
Date: Thu, 7 Dec 2023 20:43:25 +0100
Subject: [PATCH 5/9] fix(wiki): allow to join relative bases

---
 docs            |  2 +-
 wiki/.env.base  |  4 ++--
 wiki/fetcher.rb | 33 +++++++++++++++++++++++++++++++--
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/docs b/docs
index c5d4026a..ac4e17d0 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit c5d4026af1c4bb36ab0eea3fb1a9a51b75d9ae63
+Subproject commit ac4e17d0e54eabe65cc6ad04c93c616de2051fe1
diff --git a/wiki/.env.base b/wiki/.env.base
index 25084466..97a2e580 100644
--- a/wiki/.env.base
+++ b/wiki/.env.base
@@ -1,7 +1,7 @@
 WIKI_GIT_URL=https://github.com/esnvutbrno/fiesta-plus.wiki.git
 
-WIKI_STATIC_URL=https://${ROOT_DOMAIN}/static/wiki/
+WIKI_STATIC_URL=/static/wiki/
 WIKI_STATIC_PATH=/usr/src/wiki/static
 WIKI_DB_NAME=/usr/src/wiki/db/wiki.sqlite3
 
-WIKI_STATIC_ASSETS_URL=https://${ROOT_DOMAIN}/static/gh/
+WIKI_STATIC_ASSETS_URL=/static/gh/
diff --git a/wiki/fetcher.rb b/wiki/fetcher.rb
index 9ac5228d..d9f92750 100755
--- a/wiki/fetcher.rb
+++ b/wiki/fetcher.rb
@@ -33,6 +33,35 @@ def call
   end
 end
 
+class AbsoluteSourceFilter < HTML::Pipeline::Filter
+  # same impl except url join -- replaced by concat (because native uri cannot handle relative urls)
+  def call
+    doc.search("img").each do |element|
+      next if element['src'].nil? || element['src'].empty?
+      src = element['src'].strip
+      unless src.start_with? 'http'
+        if src.start_with? '/'
+          base = image_base_url
+        else
+          base = image_subpage_url
+        end
+        element["src"] = base + src
+      end
+    end
+    doc
+  end
+
+  # Private: the base url you want to use
+  def image_base_url
+    context[:image_base_url] or raise "Missing context :image_base_url for #{self.class.name}"
+  end
+
+  # Private: the relative url you want to use
+  def image_subpage_url
+    context[:image_subpage_url] or raise "Missing context :image_subpage_url for #{self.class.name}"
+  end
+end
+
 WIKI_REPO_PATH = "/var/wiki"
 
 FileUtils.rm_rf(WIKI_REPO_PATH)
@@ -64,8 +93,8 @@ def call
 rich_pipeline = HTML::Pipeline.new [
   HTML::Pipeline::TableOfContentsFilter,
   VersionedImagesFilter,
-#   TODO: does not work with relative paths
-  HTML::Pipeline::AbsoluteSourceFilter,
+  # same impl except url join -- replaced by concat (because native uri cannot handle relative urls)
+  AbsoluteSourceFilter,
   HTML::Pipeline::AutolinkFilter,
   HTML::Pipeline::EmojiFilter,
 ]

From c1635214a426f85323a92ee9c4ec58be8c0d099a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kol=C3=A1=C5=99?= <thejoeejoee@gmail.com>
Date: Thu, 7 Dec 2023 20:47:52 +0100
Subject: [PATCH 6/9] fix(wiki): allow to join relative bases II

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 028eb10e..87fbf6cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,8 +32,8 @@ FROM wiki-base as wiki-stable
 ENV WIKI_GIT_URL=https://github.com/esnvutbrno/fiesta-plus.wiki.git
 ENV WIKI_STATIC_ASSETS_URL=/static/gh/
 
-ENV WIKI_DB_NAME=/usr/src/db.sqlite3
-ENV WIKI_STATIC_PATH=/usr/src/static
+ENV WIKI_DB_NAME=/usr/src/wiki/db/wiki.sqlite3
+ENV WIKI_STATIC_PATH=/usr/src/wiki/static
 ENV WIKI_STATIC_URL=/static/wiki/
 
 RUN mkdir -p $WIKI_STATIC_PATH && ./fetcher.rb

From 6479684de34428555a916c021cb383997a1d292a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kol=C3=A1=C5=99?= <thejoeejoee@gmail.com>
Date: Thu, 7 Dec 2023 20:51:43 +0100
Subject: [PATCH 7/9] fix(wiki): allow to join relative bases III

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 87fbf6cc..9bc53992 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,11 +32,12 @@ FROM wiki-base as wiki-stable
 ENV WIKI_GIT_URL=https://github.com/esnvutbrno/fiesta-plus.wiki.git
 ENV WIKI_STATIC_ASSETS_URL=/static/gh/
 
-ENV WIKI_DB_NAME=/usr/src/wiki/db/wiki.sqlite3
+ENV WIKI_DB_PATH=/usr/src/wiki/db
+ENV WIKI_DB_NAME=${WIKI_DB_PATH}/wiki.sqlite3
 ENV WIKI_STATIC_PATH=/usr/src/wiki/static
 ENV WIKI_STATIC_URL=/static/wiki/
 
-RUN mkdir -p $WIKI_STATIC_PATH && ./fetcher.rb
+RUN mkdir -p $WIKI_STATIC_PATH && mkdir -p $WIKI_DB_PATH && ./fetcher.rb
 
 #
 # webpack image

From 3593e6ec642520778ad5d7a3cf439b62e97328c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kol=C3=A1=C5=99?= <thejoeejoee@gmail.com>
Date: Thu, 7 Dec 2023 21:12:38 +0100
Subject: [PATCH 8/9] fix(wiki): configure multiple dbs

---
 fiesta/fiesta/settings/__init__.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/fiesta/fiesta/settings/__init__.py b/fiesta/fiesta/settings/__init__.py
index d5ed118f..7ecbe613 100644
--- a/fiesta/fiesta/settings/__init__.py
+++ b/fiesta/fiesta/settings/__init__.py
@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+import dj_database_url
 from configurations import Configuration
-from configurations.values import DatabaseURLValue, Value
+from configurations.values import SecretValue, Value
 
 from .admin import AdminConfigMixin
 from .auth import AuthConfigMixin
@@ -66,7 +67,14 @@ class Production(
 
     ROOT_DOMAIN = Value(environ_required=True)
 
-    DATABASES = DatabaseURLValue(environ_prefix="DJANGO")
+    DATABASE_URL = SecretValue(environ_prefix="DJANGO")
+
+    @property
+    def DATABASES(self):
+        return {
+            "default": dj_database_url.parse(self.DATABASE_URL),
+            "wiki": DatabaseConfigMixin.DATABASES["wiki"],
+        }
 
     ENVIRONMENT_NAME = Value(default="production")
     ENVIRONMENT_COLOR = Value(default="#7b3ff4")

From 8095669cd3cc8f4120509f412469a444848930c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kol=C3=A1=C5=99?= <thejoeejoee@gmail.com>
Date: Thu, 7 Dec 2023 21:50:12 +0100
Subject: [PATCH 9/9] feat(daisyui): bumped

---
 fiesta/templates/fiesta/parts/breadcrumbs.html | 4 ++--
 webpack/package.json                           | 2 +-
 webpack/yarn.lock                              | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fiesta/templates/fiesta/parts/breadcrumbs.html b/fiesta/templates/fiesta/parts/breadcrumbs.html
index 49f2a778..81df07d5 100644
--- a/fiesta/templates/fiesta/parts/breadcrumbs.html
+++ b/fiesta/templates/fiesta/parts/breadcrumbs.html
@@ -7,7 +7,7 @@
         <div class="inline-flex items-center">
           {% if forloop.first %}
             <a href="{{ item.url }}"
-               class="inline-flex items-center text-xs md:text-sm font-medium text-base-content hover:text-primary-focus whitespace-nowrap">
+               class="inline-flex items-center text-xs md:text-sm font-medium text-base-content hover:text-primary whitespace-nowrap">
               <svg class="mr-2 w-4 h-4 md:w-6 md:h-6"
                    fill="currentColor"
                    viewBox="0 0 22 20"
@@ -26,7 +26,7 @@
               </path>
             </svg>
             <a href="{{ item.url }}"
-               class="ml-1 font-medium md:ml-2 text-base-content hover:text-primary-focus text-xs md:text-sm">{{ item.title }}</a>
+               class="ml-1 font-medium md:ml-2 text-base-content hover:text-primary text-xs md:text-sm">{{ item.title }}</a>
           {% endif %}
         </div>
       </li>
diff --git a/webpack/package.json b/webpack/package.json
index c567133c..a2197e6c 100644
--- a/webpack/package.json
+++ b/webpack/package.json
@@ -18,7 +18,7 @@
     "alpinejs": "^3.13.2",
     "autoprefixer": "^10.4.16",
     "css-loader": "^6.6.0",
-    "daisyui": "^4.0.9",
+    "daisyui": "^4.4.19",
     "htmx.org": "^1.9.6",
     "jquery": "^3.7.1",
     "mini-css-extract-plugin": "^2.5.3",
diff --git a/webpack/yarn.lock b/webpack/yarn.lock
index 0051e857..3039398f 100644
--- a/webpack/yarn.lock
+++ b/webpack/yarn.lock
@@ -1241,10 +1241,10 @@ culori@^3:
   resolved "https://registry.yarnpkg.com/culori/-/culori-3.2.0.tgz#df6561503f0cc20e8e1c029f086466666c0ac62f"
   integrity sha512-HIEbTSP7vs1mPq/2P9In6QyFE0Tkpevh0k9a+FkjhD+cwsYm9WRSbn4uMdW9O0yXlNYC3ppxL3gWWPOcvEl57w==
 
-daisyui@^4.0.9:
-  version "4.0.9"
-  resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.0.9.tgz#0e44e8dd9ff194ac5da10a8d1c4339c96da96a64"
-  integrity sha512-x9E1UL/gF4ZWOAJaMKOw3Ji9WmNZA0Tok/knRzzJWu9KJu+7kOHREqlhpvnP9Qz/4EOTu0ep9akquQnbeldYYQ==
+daisyui@4.4.19:
+  version "4.4.19"
+  resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.4.19.tgz#90187e2ce5c914e774bb174a13f446aac7f555ad"
+  integrity sha512-IjOLWwnndD4N7Ut5CDxbUsaVtbqXPeVHM92IcgxGFxpuOd3CCKW/PAXZH6JoBTHFRaN57vB9XqEhdWm5yC+bPA==
   dependencies:
     css-selector-tokenizer "^0.8"
     culori "^3"