From aad886f4d32c555555b7822ba3ac9ceb4f1da70b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <tomas@imaniti.org>
Date: Wed, 26 Jun 2024 11:27:27 +0200
Subject: [PATCH] update some templates
---
majak_uistyleguide/settings/base.py | 30 +++++++++++--------
.../atoms/text/heading_with_image.html | 7 +++++
.../templates/patterns/atoms/text/prose.html | 2 +-
.../patterns/atoms/text/prose_aligned.html | 11 +++++++
.../atoms/text/two_columns_richtext.html | 23 ++++++++++++++
.../atoms/text/two_columns_richtext.yaml | 4 +++
requirements/base.in | 2 +-
7 files changed, 64 insertions(+), 15 deletions(-)
create mode 100644 majak_uistyleguide/templates/patterns/atoms/text/heading_with_image.html
create mode 100644 majak_uistyleguide/templates/patterns/atoms/text/prose_aligned.html
create mode 100644 majak_uistyleguide/templates/patterns/atoms/text/two_columns_richtext.html
create mode 100644 majak_uistyleguide/templates/patterns/atoms/text/two_columns_richtext.yaml
diff --git a/majak_uistyleguide/settings/base.py b/majak_uistyleguide/settings/base.py
index b9b7cb9..3751af8 100644
--- a/majak_uistyleguide/settings/base.py
+++ b/majak_uistyleguide/settings/base.py
@@ -1,9 +1,6 @@
from pathlib import Path
import environ
-import sentry_sdk
-
-from sentry_sdk.integrations.django import DjangoIntegration
ROOT_DIR = Path(__file__).parents[2]
@@ -86,16 +83,23 @@ TEMPLATES = [
# SENTRY
# ------------------------------------------------------------------------------
-SENTRY_DSN = env.str("SENTRY_DSN", default="")
-
-if SENTRY_DSN != "":
- sentry_sdk.init(
- dsn=SENTRY_DSN,
- integrations=[
- DjangoIntegration(),
- ],
- send_default_pii=True,
- )
+try:
+ import sentry_sdk
+
+ from sentry_sdk.integrations.django import DjangoIntegration
+
+ SENTRY_DSN = env.str("SENTRY_DSN", default="")
+
+ if SENTRY_DSN != "":
+ sentry_sdk.init(
+ dsn=SENTRY_DSN,
+ integrations=[
+ DjangoIntegration(),
+ ],
+ send_default_pii=True,
+ )
+except ImportError:
+ pass
# STATIC
diff --git a/majak_uistyleguide/templates/patterns/atoms/text/heading_with_image.html b/majak_uistyleguide/templates/patterns/atoms/text/heading_with_image.html
new file mode 100644
index 0000000..bd0114f
--- /dev/null
+++ b/majak_uistyleguide/templates/patterns/atoms/text/heading_with_image.html
@@ -0,0 +1,7 @@
+<div class="flex justify-between items-center gap-4">
+ <h1 class="head-xl">Nadpis velikosti XL</h1>
+ <img
+ class="max-w-[75px] max-h-[75px]"
+ src="/static/images/person-table.png"
+ >
+</div>
\ No newline at end of file
diff --git a/majak_uistyleguide/templates/patterns/atoms/text/prose.html b/majak_uistyleguide/templates/patterns/atoms/text/prose.html
index 39fe45c..37caea2 100644
--- a/majak_uistyleguide/templates/patterns/atoms/text/prose.html
+++ b/majak_uistyleguide/templates/patterns/atoms/text/prose.html
@@ -1,3 +1,3 @@
-<div class="prose">
+<div class="prose max-w-[100ch]">
{% include 'patterns/atoms/text/paragraph.html' with text=text %}
</div>
diff --git a/majak_uistyleguide/templates/patterns/atoms/text/prose_aligned.html b/majak_uistyleguide/templates/patterns/atoms/text/prose_aligned.html
new file mode 100644
index 0000000..af2f96e
--- /dev/null
+++ b/majak_uistyleguide/templates/patterns/atoms/text/prose_aligned.html
@@ -0,0 +1,11 @@
+<div class="w-full [&_*]:mr-auto text-left">
+ {% include "patterns/atoms/text/prose.html" %}
+</div>
+
+<div class="w-full [&_*]:mx-auto text-center">
+ {% include "patterns/atoms/text/prose.html" %}
+</div>
+
+<div class="w-full [&_*]:ml-auto text-right">
+ {% include "patterns/atoms/text/prose.html" %}
+</div>
\ No newline at end of file
diff --git a/majak_uistyleguide/templates/patterns/atoms/text/two_columns_richtext.html b/majak_uistyleguide/templates/patterns/atoms/text/two_columns_richtext.html
new file mode 100644
index 0000000..64fb992
--- /dev/null
+++ b/majak_uistyleguide/templates/patterns/atoms/text/two_columns_richtext.html
@@ -0,0 +1,23 @@
+<div
+ class="
+ flex gap-6 w-full flex-col
+ lg:flex-row
+ "
+>
+ <div
+ class="
+ w-full max-w-[unset] shrink-0 grow-1 prose
+ lg:w-1/2
+ "
+ >
+ {{ first_column }}
+ </div>
+ <div
+ class="
+ w-full max-w-[unset] shrink-0 grow-1 prose
+ lg:w-1/2
+ "
+ >
+ {{ second_column }}
+ </div>
+</div>
\ No newline at end of file
diff --git a/majak_uistyleguide/templates/patterns/atoms/text/two_columns_richtext.yaml b/majak_uistyleguide/templates/patterns/atoms/text/two_columns_richtext.yaml
new file mode 100644
index 0000000..641d532
--- /dev/null
+++ b/majak_uistyleguide/templates/patterns/atoms/text/two_columns_richtext.yaml
@@ -0,0 +1,4 @@
+context:
+ first_column: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Sit amet luctus venenatis lectus magna fringilla urna porttitor. Risus nullam eget felis eget. Duis at tellus at urna condimentum mattis pellentesque id. Elit scelerisque mauris pellentesque pulvinar pellentesque habitant morbi tristique. Diam sit amet nisl suscipit adipiscing bibendum est ultricies integer. Ultrices eros in cursus turpis. Elementum curabitur vitae nunc sed velit dignissim sodales ut. At elementum eu facilisis sed odio morbi. Ut diam quam nulla porttitor massa. Lacus laoreet non curabitur gravida arcu ac. Ipsum suspendisse ultrices gravida dictum fusce ut placerat orci. Porttitor massa id neque aliquam vestibulum. Vulputate ut pharetra sit amet aliquam id. Scelerisque eleifend donec pretium vulputate sapien nec sagittis aliquam malesuada. Est lorem ipsum dolor sit. Consequat mauris nunc congue nisi vitae suscipit tellus. Nisl condimentum id venenatis a condimentum vitae sapien pellentesque. Enim ut tellus elementum sagittis. Platea dictumst vestibulum rhoncus est pellentesque elit ullamcorper dignissim.'
+ second_column: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Sit amet luctus venenatis lectus magna fringilla urna porttitor. Risus nullam eget felis eget. Duis at tellus at urna condimentum mattis pellentesque id. Elit scelerisque mauris pellentesque pulvinar pellentesque habitant morbi tristique. Diam sit amet nisl suscipit adipiscing bibendum est ultricies integer. Ultrices eros in cursus turpis. Elementum curabitur vitae nunc sed velit dignissim sodales ut. At elementum eu facilisis sed odio morbi. Ut diam quam nulla porttitor massa. Lacus laoreet non curabitur gravida arcu ac. Ipsum suspendisse ultrices gravida dictum fusce ut placerat orci. Porttitor massa id neque aliquam vestibulum. Vulputate ut pharetra sit amet aliquam id. Scelerisque eleifend donec pretium vulputate sapien nec sagittis aliquam malesuada. Est lorem ipsum dolor sit. Consequat mauris nunc congue nisi vitae suscipit tellus. Nisl condimentum id venenatis a condimentum vitae sapien pellentesque. Enim ut tellus elementum sagittis. Platea dictumst vestibulum rhoncus est pellentesque elit ullamcorper dignissim.'
+
\ No newline at end of file
diff --git a/requirements/base.in b/requirements/base.in
index 1e8edef..1bb4dfa 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -3,4 +3,4 @@ django-pattern-library
django-environ
django-vite
psycopg2-binary
-whitenoise
+whitenoise
\ No newline at end of file
--
GitLab