wagtail-cjkcms 24.10.1__tar.gz → 24.12.2__tar.gz

{wagtail_cjkcms-24.10.1 → wagtail_cjkcms-24.12.2}/CHANGELOG.md

@@ -14,6 +14,12 @@ migrated to this file.
 ### Fixed
 ### Removed
 
+## [24.12.2] - 2024-12-31
+### Added
+ - "countdown" content block using VincentLoy's library. See https://vincentloy.github.io/simplyCountdown.js/ for more info
+ - added themes and tests for the "countdown" block
+
+
 ## [24.9.1] - 2024-09-02
 ### Added
  - Support for breadcrumbs per-page visibility

{wagtail_cjkcms-24.10.1/wagtail_cjkcms.egg-info → wagtail_cjkcms-24.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wagtail-cjkcms
-Version: 24.10.1
+Version: 24.12.2
 Summary: Wagtail Content Management System, installable as a Django app into any Wagtail 4.1.x/5.x/6.x site.
 Author-email: Grzegorz Krol <gk@cjk.pl>
 License: BSD-3-Clause

{wagtail_cjkcms-24.10.1 → wagtail_cjkcms-24.12.2}/cjkcms/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (24, 10, 1, "")
+VERSION = (24, 12, 2, "")
 
 __version_info__ = VERSION
 __version__ = ".".join(map(str, VERSION[:3])) + (f"-{VERSION[3]}" if VERSION[3] else "")

{wagtail_cjkcms-24.10.1 → wagtail_cjkcms-24.12.2}/cjkcms/blocks/__init__.py

@@ -34,6 +34,7 @@ from .content_blocks import (  # noqa
     HighlightBlock,
 )
 from .content.events import PublicEventBlock, EventCalendarBlock
+from .content.countdown import CountdownBlock
 from .layout_blocks import CardGridBlock, GridBlock, HeroBlock
 from cjkcms.settings import cms_settings
 
@@ -77,6 +78,7 @@ CONTENT_STREAMBLOCKS = HTML_STREAMBLOCKS + [
     ("reusable_content", ReusableContentBlock()),
     ("event_calendar", EventCalendarBlock()),
     ("highlight", HighlightBlock()),
+    ("countdown", CountdownBlock()),
 ]
 
 NAVIGATION_STREAMBLOCKS = [

wagtail_cjkcms-24.12.2/cjkcms/blocks/content/countdown.py

@@ -0,0 +1,116 @@
+from cjkcms.blocks.base_blocks import BaseBlock
+from wagtail import blocks
+from django.utils.translation import gettext_lazy as _
+from datetime import datetime, timedelta, timezone
+import re
+
+
+def convert_to_utc(naive_dt, utc_offset_str):
+    # Parse the UTC offset string (e.g., "UTC+05:30" or "UTC-02:00")
+    match = re.match(r"UTC([+-])(\d{2}):(\d{2})", utc_offset_str)
+    if not match:
+        raise ValueError("Invalid UTC offset format. Use 'UTC±HH:MM'.")
+
+    sign = match.group(1)
+    hours = int(match.group(2))
+    minutes = int(match.group(3))
+
+    # Calculate the total offset in minutes
+    total_offset = timedelta(hours=hours, minutes=minutes)
+    if sign == "-":
+        total_offset = -total_offset
+
+    # Create a timezone with the given offset
+    tz = timezone(total_offset)
+
+    # Attach the offset to the naive datetime, making it timezone-aware
+    aware_local_dt = naive_dt.replace(tzinfo=tz)
+
+    # Convert the timezone-aware datetime to UTC
+    utc_dt = aware_local_dt.astimezone(timezone.utc)
+
+    return utc_dt
+
+
+class CountdownBlock(BaseBlock):
+    """
+    Display a countdown to a specific date
+    """
+
+    title = blocks.CharBlock(
+        required=False,
+        max_length=255,
+        label=_("Title"),
+    )
+
+    start_date = blocks.DateTimeBlock(
+        required=True,
+        label=_("Start date and time"),
+        help_text=_("Format: YYYY-MM-DD HH:MM"),
+    )
+
+    timezone = blocks.CharBlock(
+        required=True,
+        default="UTC",
+        max_length=255,
+        label=_("Timezone"),
+        help_text=_("Timezone relative to UTC, e.g. UTC+01:00"),
+    )
+
+    url = blocks.URLBlock(
+        max_length=255,
+        label=_("Link"),
+        required=False,
+        help_text=_("Optional link"),
+    )
+
+    # hide_after_end_date = blocks.BooleanBlock(
+    #     required=False,
+    #     default=False,
+    #     label=_("Hide after end date"),
+    #     help_text=_("Hide this after end date, or show zeros if false"),
+    # )
+
+    theme = blocks.ChoiceBlock(
+        choices=[
+            ("light", _("Light")),
+            ("dark", _("Dark")),
+            ("cyber", _("Cyberpunk")),
+            ("losange", _("Losange")),
+            ("circle", _("Circle")),
+            # ("flipbook", _("Flipbook")),
+        ],
+        default="light",
+        label=_("Theme"),
+    )
+
+    def get_context(self, value, parent_context=None):
+        context = super().get_context(value, parent_context=parent_context)
+        sd = value.get("start_date")
+
+        naive_datetime = datetime(
+            sd.year, sd.month, sd.day, sd.hour, sd.minute
+        )  # Naive datetime
+
+        tz = value.get("timezone")
+        if tz == "UTC" or tz == "":
+            tz = "UTC+00:00"
+
+        utc_offset_string = tz  # String containing UTC offset
+        utc = convert_to_utc(naive_datetime, utc_offset_string)
+
+        # print(naive_datetime, utc, utc_offset_string)
+        context["year"] = utc.year
+        context["month"] = utc.month
+        context["day"] = utc.day
+        context["hour"] = utc.hour
+        context["minute"] = utc.minute
+        context["second"] = 0
+        return context
+
+    class Meta:
+        template = "cjkcms/blocks/countdown.html"
+        icon = "history"
+        label = "Countdown"
+        ordering = ["start_date"]
+        label_format = _("Countdown to {start_date}")

{wagtail_cjkcms-24.10.1 → wagtail_cjkcms-24.12.2}/cjkcms/models/admin_sidebar.py

@@ -1,4 +1,4 @@
-from .snippet_models import Navbar, EventCalendar
+from .snippet_models import Navbar, NavbarForm, EventCalendar
 from wagtail.snippets.views.snippets import SnippetViewSet
 
 
@@ -16,6 +16,9 @@ class NavbarSnippet(SnippetViewSet):
         "name",
     ]
 
+    def get_form_class(self, for_update=False):
+        return NavbarForm
+
 
 class EventCalendarSnippet(SnippetViewSet):
     model = EventCalendar

{wagtail_cjkcms-24.10.1 → wagtail_cjkcms-24.12.2}/cjkcms/models/snippet_models.py

@@ -25,6 +25,7 @@ from django.conf import settings
 from cjkcms.fields import CjkcmsStreamField
 from wagtail_color_panel.fields import ColorField
 from wagtail_color_panel.edit_handlers import NativeColorPanel
+from django.forms import ModelForm
 
 
 @register_snippet
@@ -342,7 +343,7 @@ class Navbar(models.Model):
     language = models.CharField(
         blank=True,
         max_length=10,
-        choices=[("_all_", _("All languages"))],
+        choices=[],
         default="_all_",
         verbose_name=_("Show in language"),
         help_text=_("Select a language to limit display to specific locale."),
@@ -371,24 +372,38 @@ class Navbar(models.Model):
     def __str__(self):
         return self.name
 
+    @staticmethod
+    def get_available_langs():
+        available_langs = [("_all_", _("All languages"))]
+        if hasattr(settings, "WAGTAIL_CONTENT_LANGUAGES"):
+            available_langs += settings.WAGTAIL_CONTENT_LANGUAGES
+        return available_langs
+
     def __init__(self, *args, **kwargs):
         """
         Inject custom choices and defaults into the form fields
         to enable customization of settings without causing migration issues.
         """
         super().__init__(*args, **kwargs)
-        # Set choices dynamically.
-
-        available_langs = [("_all_", _("All languages"))]
-        if hasattr(settings, "WAGTAIL_CONTENT_LANGUAGES"):
-            available_langs += settings.WAGTAIL_CONTENT_LANGUAGES
 
-        self._meta.get_field("language").choices = available_langs  # type: ignore
+        self._meta.get_field("language").choices = Navbar.get_available_langs()  # type: ignore
         # Set default dynamically.
         if not self.id:  # type: ignore
             self.language = "_all_"
 
 
+class NavbarForm(ModelForm):
+    class Meta:
+        model = Navbar
+        fields = "__all__"
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Set the dynamic choices
+        self.fields["language"].choices = Navbar.get_available_langs()
+
+
 @register_snippet
 class Footer(models.Model):
     """

wagtail_cjkcms-24.12.2/cjkcms/static/vendor/simplycountdown/css/circle.css

@@ -0,0 +1,73 @@
+.simply-countdown-circle {
+  --sc-circle-primary: #6366f1;
+  --sc-circle-secondary: #818cf8;
+  --sc-circle-bg: #1e1b4b;
+  --sc-circle-text: #fff;
+
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  gap: 1.5rem;
+  font-family: "Inter", sans-serif;
+}
+
+.simply-countdown-circle > .simply-section {
+  position: relative;
+  width: 100px;
+  height: 100px;
+  padding: 1rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  border-radius: 50%;
+  background: linear-gradient(45deg, var(--sc-circle-primary), var(--sc-circle-secondary));
+  box-shadow: 0 0 25px -5px var(--sc-circle-primary);
+  animation: pulse-circle 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
+}
+
+.simply-countdown-circle > .simply-section::before {
+  content: "";
+  position: absolute;
+  inset: 6px;
+  border-radius: 50%;
+  background: var(--sc-circle-bg);
+  z-index: 0;
+}
+
+.simply-countdown-circle > .simply-section > div {
+  position: relative;
+  z-index: 1;
+  color: var(--sc-circle-text);
+  text-align: center;
+}
+
+.simply-countdown-circle .simply-amount {
+  display: block;
+  font-size: 1.75rem;
+  font-weight: 700;
+  line-height: 1;
+  background: linear-gradient(to right, var(--sc-circle-primary), var(--sc-circle-secondary));
+  -webkit-background-clip: text;
+  background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+.simply-countdown-circle .simply-word {
+  font-size: 0.7rem;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  opacity: 0.8;
+}
+
+@keyframes pulse-circle {
+  0%,
+  100% {
+    transform: scale(1);
+    opacity: 1;
+  }
+  50% {
+    transform: scale(0.98);
+    opacity: 0.9;
+  }
+}

wagtail_cjkcms-24.12.2/cjkcms/static/vendor/simplycountdown/css/cyber.css

@@ -0,0 +1,155 @@
+/**
+* Project : simply-countdown
+* File : simplyCountdown.theme.cyberpunk
+* Author : Vincent Loy <vincent.loy1@gmail.com>
+* Theme : Modern Cyberpunk
+*/
+
+.simply-countdown-cyber {
+  overflow: visible;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  gap: 1.75rem;
+  font-family: "Inter", system-ui, -apple-system, sans-serif;
+  perspective: 1000px;
+}
+
+.simply-countdown-cyber > .simply-section {
+  width: 70px;
+  height: 70px;
+  padding: 1.5rem;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: linear-gradient(135deg, rgba(23, 25, 35, 0.9), rgba(15, 17, 25, 0.95));
+  border-radius: 0.5rem;
+  transition: all 0.4s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+  backdrop-filter: blur(12px);
+  transform-style: preserve-3d;
+}
+
+.simply-countdown-cyber > .simply-section::before {
+  content: "";
+  position: absolute;
+  inset: -1px;
+  background: linear-gradient(135deg, rgba(120, 240, 255, 0.2), rgba(255, 90, 220, 0.2));
+  border-radius: 0.5rem;
+  z-index: -1;
+  opacity: 0;
+  transition: opacity 0.3s ease;
+}
+
+.simply-countdown-cyber > .simply-section::after {
+  content: "";
+  position: absolute;
+  inset: -2px;
+  background: linear-gradient(135deg, #78f0ff, #ff5adc);
+  border-radius: 0.5rem;
+  z-index: -2;
+  opacity: 0.15;
+  filter: blur(4px);
+  animation: pulse 4s ease-in-out infinite;
+}
+
+.simply-countdown-cyber > .simply-section .glass-overlay {
+  position: absolute;
+  inset: 0;
+  background: linear-gradient(135deg, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.05));
+  border-radius: 0.5rem;
+}
+
+.simply-countdown-cyber > .simply-section:hover {
+  transform: translateY(-4px) translateZ(10px) rotateX(5deg);
+  box-shadow: 0 20px 40px -10px rgba(0, 0, 0, 0.5), 0 0 20px rgba(120, 240, 255, 0.2), 0 0 0 1px rgba(120, 240, 255, 0.1);
+}
+
+.simply-countdown-cyber > .simply-section:hover::before {
+  opacity: 1;
+}
+
+.simply-countdown-cyber > .simply-section > div {
+  display: flex;
+  flex-direction: column;
+  gap: 0.4rem;
+  align-items: center;
+  transform-style: preserve-3d;
+}
+
+.simply-countdown-cyber > .simply-section .simply-amount {
+  font-size: 1.75rem;
+  font-weight: 700;
+  background: linear-gradient(to bottom right, #78f0ff, #ff5adc);
+  -webkit-background-clip: text;
+  background-clip: text;
+  color: transparent;
+  text-shadow: 0 0 20px rgba(120, 240, 255, 0.3), 0 0 40px rgba(120, 240, 255, 0.2);
+  letter-spacing: -0.02em;
+  transform: translateZ(10px);
+}
+
+.simply-countdown-cyber > .simply-section .simply-word {
+  font-size: 0.6rem;
+  font-weight: 500;
+  text-transform: uppercase;
+  letter-spacing: 0.2em;
+  color: rgba(255, 255, 255, 0.7);
+  transform: translateZ(5px);
+  position: relative;
+}
+
+.simply-countdown-cyber > .simply-section .simply-word::after {
+  content: "";
+  position: absolute;
+  left: -10%;
+  bottom: -4px;
+  width: 120%;
+  height: 1px;
+  background: linear-gradient(to right, rgba(120, 240, 255, 0), rgba(120, 240, 255, 0.5), rgba(255, 90, 220, 0.5), rgba(255, 90, 220, 0));
+}
+
+@media (min-width: 640px) {
+  .simply-countdown-cyber > .simply-section {
+    width: 80px;
+    height: 80px;
+    padding: 1.75rem;
+  }
+
+  .simply-countdown-cyber > .simply-section .simply-amount {
+    font-size: 2rem;
+  }
+
+  .simply-countdown-cyber > .simply-section .simply-word {
+    font-size: 0.75rem;
+  }
+}
+
+@media (min-width: 1024px) {
+  .simply-countdown-cyber > .simply-section {
+    width: 100px;
+    height: 100px;
+    padding: 2rem;
+  }
+
+  .simply-countdown-cyber > .simply-section .simply-amount {
+    font-size: 2.5rem;
+  }
+
+  .simply-countdown-cyber > .simply-section .simply-word {
+    font-size: 0.8rem;
+  }
+}
+
+/* Add subtle animation for extra futuristic feel */
+@keyframes pulse {
+  0%,
+  100% {
+    opacity: 0.15;
+    transform: scale(1);
+  }
+  50% {
+    opacity: 0.25;
+    transform: scale(1.05);
+  }
+}

wagtail_cjkcms-24.12.2/cjkcms/static/vendor/simplycountdown/css/dark.css

@@ -0,0 +1,85 @@
+/**
+* Project : simply-countdown
+* File : simplyCountdown.theme.dark
+* Author : Vincent Loy <vincent.loy1@gmail.com>
+* Theme : Dark Modern
+*/
+
+.simply-countdown-dark {
+  overflow: hidden;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  gap: 1.25rem;
+  font-family: "Inter", system-ui, -apple-system, sans-serif;
+}
+
+.simply-countdown-dark > .simply-section {
+  width: 65px;
+  height: 65px;
+  padding: 1.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: rgba(15, 23, 42, 0.75);
+  border: 1px solid rgba(51, 65, 85, 0.6);
+  border-radius: 1rem;
+  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.2), 0 2px 4px -1px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(255, 255, 255, 0.05);
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  backdrop-filter: blur(10px);
+}
+
+.simply-countdown-dark > .simply-section > div {
+  display: flex;
+  flex-direction: column;
+  line-height: 1;
+  align-items: center;
+}
+
+.simply-countdown-dark > .simply-section .simply-amount {
+  font-size: 1.5rem;
+  font-weight: 700;
+  color: #f1f5f9;
+  line-height: 1.2;
+  letter-spacing: -0.025em;
+}
+
+.simply-countdown-dark > .simply-section .simply-word {
+  font-size: 0.6rem;
+  font-weight: 500;
+  color: #94a3b8;
+  text-transform: uppercase;
+  letter-spacing: 0.1em;
+}
+
+@media (min-width: 640px) {
+  .simply-countdown-dark > .simply-section {
+    width: 75px;
+    height: 75px;
+    padding: 1.75rem;
+  }
+
+  .simply-countdown-dark > .simply-section .simply-amount {
+    font-size: 1.75rem;
+  }
+
+  .simply-countdown-dark > .simply-section .simply-word {
+    font-size: 0.75rem;
+  }
+}
+
+@media (min-width: 1024px) {
+  .simply-countdown-dark > .simply-section {
+    width: 90px;
+    height: 90px;
+    padding: 2rem;
+  }
+
+  .simply-countdown-dark > .simply-section .simply-amount {
+    font-size: 2rem;
+  }
+
+  .simply-countdown-dark > .simply-section .simply-word {
+    font-size: 0.8rem;
+  }
+}

wagtail_cjkcms-24.12.2/cjkcms/static/vendor/simplycountdown/css/light.css

@@ -0,0 +1,85 @@
+/**
+* Project : simply-countdown
+* File : simplyCountdown.theme.default
+* Author : Vincent Loy <vincent.loy1@gmail.com>
+* Theme : Light Modern
+*/
+
+.simply-countdown-light  {
+  overflow: hidden;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  gap: 1.25rem;
+  font-family: "Inter", system-ui, -apple-system, sans-serif;
+}
+
+.simply-countdown-light  > .simply-section {
+  width: 65px;
+  height: 65px;
+  padding: 1.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: rgba(255, 255, 255, 0.9);
+  border: 1px solid rgba(226, 232, 240, 0.8);
+  border-radius: 1rem;
+  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.05), 0 2px 4px -1px rgba(0, 0, 0, 0.03), 0 0 0 1px rgba(0, 0, 0, 0.02);
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  backdrop-filter: blur(10px);
+}
+
+.simply-countdown-light  > .simply-section > div {
+  display: flex;
+  flex-direction: column;
+  line-height: 1;
+  align-items: center;
+}
+
+.simply-countdown-light  > .simply-section .simply-amount {
+  font-size: 1.5rem;
+  font-weight: 700;
+  color: #1e293b;
+  line-height: 1.2;
+  letter-spacing: -0.025em;
+}
+
+.simply-countdown-light  > .simply-section .simply-word {
+  font-size: 0.6rem;
+  font-weight: 500;
+  color: #64748b;
+  text-transform: uppercase;
+  letter-spacing: 0.1em;
+}
+
+@media (min-width: 640px) {
+  .simply-countdown-light  > .simply-section {
+    width: 75px;
+    height: 75px;
+    padding: 1.75rem;
+  }
+
+  .simply-countdown-light  > .simply-section .simply-amount {
+    font-size: 1.75rem;
+  }
+
+  .simply-countdown-light  > .simply-section .simply-word {
+    font-size: 0.75rem;
+  }
+}
+
+@media (min-width: 1024px) {
+  .simply-countdown-light  > .simply-section {
+    width: 90px;
+    height: 90px;
+    padding: 2rem;
+  }
+
+  .simply-countdown-light  > .simply-section .simply-amount {
+    font-size: 2rem;
+  }
+
+  .simply-countdown-light  > .simply-section .simply-word {
+    font-size: 0.8rem;
+  }
+}