From 750543980e797b5e17a595cecba7ac476fd5c34124b1aa0185553a4369e5d8da Mon Sep 17 00:00:00 2001 From: vladislav Date: Thu, 3 Sep 2026 11:27:26 -0400 Subject: [PATCH 01/22] feat --- templates/profile/delivery_old.html | 60 +++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/templates/profile/delivery_old.html b/templates/profile/delivery_old.html index 3a25f44..5866592 100644 --- a/templates/profile/delivery_old.html +++ b/templates/profile/delivery_old.html @@ -42,6 +42,66 @@ {% endif %} {% if doc.type == 'exhibition' and doc.get('exhibition') or doc.status == 'Продано' %}

{{doc.get('exhibition').title}}

+ {% if doc.get('user') %} +
+ +
+ Художник + {{doc.user.username}} +
+
+ {% if doc.get('user') and user._id == doc.user._id%} +
+ Показать контакты +
+ + + + + Профиль + + + + + {{ doc.user.phone.split(',')[-1].strip() }} + + + + + {{doc.user.email}} + +
Написать
+
+ + + + + + + + + + + + + + + + + +
+ + +
+
+{% endif %} +{% endif %}
From 92b16272c94548804151c8c48434e3ff3371a403f83582d2c531113b61b41d4e Mon Sep 17 00:00:00 2001 From: vladislav Date: Thu, 3 Sep 2026 11:29:00 -0400 Subject: [PATCH 02/22] fix --- templates/profile/delivery_old.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/profile/delivery_old.html b/templates/profile/delivery_old.html index 5866592..2b82b40 100644 --- a/templates/profile/delivery_old.html +++ b/templates/profile/delivery_old.html @@ -50,7 +50,7 @@ {{doc.user.username}}
- {% if doc.get('user') and user._id == doc.user._id%} + {% if user._id != doc.user._id%}
Показать контакты
From 09e370a3dd5a13bc5e926cba4373ef739a720ff5a78b29bd8a9ecb0a09def773 Mon Sep 17 00:00:00 2001 From: vladislav Date: Thu, 3 Sep 2026 11:31:01 -0400 Subject: [PATCH 03/22] feat --- templates/profile/delivery_history.html | 60 ++++++++++++ templates/profile/delivery_old.html | 118 ++++++++++++------------ 2 files changed, 119 insertions(+), 59 deletions(-) diff --git a/templates/profile/delivery_history.html b/templates/profile/delivery_history.html index a527386..f6b65c3 100644 --- a/templates/profile/delivery_history.html +++ b/templates/profile/delivery_history.html @@ -104,6 +104,66 @@
+{% endif %} +{% if doc.get('user') %} +
+ +
+ Художник + {{doc.user.username}} +
+
+ {% if user._id != doc.user._id%} +
+ Показать контакты +
+ + + + + Профиль + + + + + {{ doc.user.phone.split(',')[-1].strip() }} + + + + + {{doc.user.email}} + +
Написать
+
+ + + + + + + + + + + + + + + + + +
+ + +
+
+{% endif %} {% endif %} {% else %} {% if doc.address %} diff --git a/templates/profile/delivery_old.html b/templates/profile/delivery_old.html index 2b82b40..caf8348 100644 --- a/templates/profile/delivery_old.html +++ b/templates/profile/delivery_old.html @@ -42,7 +42,65 @@ {% endif %} {% if doc.type == 'exhibition' and doc.get('exhibition') or doc.status == 'Продано' %}

{{doc.get('exhibition').title}}

- {% if doc.get('user') %} +
+ +
+ Организатор + {{doc.receiver.username}} +
+
+ {% if doc.get('user') and user._id == doc.user._id%} +
+ Показать контакты +
+ + + + + Профиль + + + + + {{ doc.receiver.phone.split(',')[-1].strip() }} + + + + + {{doc.receiver.email}} + +
Написать
+
+ + + + + + + + + + + + + + + + + +
+ + +
+
+{% endif %} +{% if doc.get('user') %}
@@ -101,64 +159,6 @@
{% endif %} -{% endif %} -
- -
- Организатор - {{doc.receiver.username}} -
-
- {% if doc.get('user') and user._id == doc.user._id%} -
- Показать контакты -
- - - - - Профиль - - - - - {{ doc.receiver.phone.split(',')[-1].strip() }} - - - - - {{doc.receiver.email}} - -
Написать
-
- - - - - - - - - - - - - - - - - -
- - -
-
{% endif %} {% else %} {% if doc.address %} From b7fff6f77e5d0bb9a61aa014f69311555de7cece0b5854297739a0de6771683f Mon Sep 17 00:00:00 2001 From: vladislav Date: Thu, 3 Sep 2026 17:14:10 -0400 Subject: [PATCH 04/22] feat --- templates/exhibition/index.html | 8 +++ templates/exhibitions.html | 69 ++++++++++++++++++++-- templates/profile/partner/exhibitions.html | 53 ++++++++++++++++- 3 files changed, 123 insertions(+), 7 deletions(-) diff --git a/templates/exhibition/index.html b/templates/exhibition/index.html index f369b30..3a5d0df 100644 --- a/templates/exhibition/index.html +++ b/templates/exhibition/index.html @@ -196,6 +196,14 @@ {{ header.style() }} +{%- endmacro %} \ No newline at end of file diff --git a/templates/exhibitions.html b/templates/exhibitions.html index 1d7e02b..747d0cd 100644 --- a/templates/exhibitions.html +++ b/templates/exhibitions.html @@ -1,11 +1,11 @@ {% extends "base.html" %} {% import "/components/header.html" as header %} {% import "/components/footer.html" as footer %} +{% import "/components/contacts.html" as contacts %} {% import "components/share.html" as share %} {% block title %}Выставки{% endblock %} - {% block content %} {{ header.section(user) }}
@@ -16,121 +16,70 @@
{% for exhibition in exhibitions %} - {% set link="/exhibition/{}".format(exhibition._id) %} -
- {% if link %} - - {% endif %} -
- - {{ exhibition.title }} - -
- {% if link %} - - {% endif %} -
- {% if link %} - - {% endif %} -
- {% if now > exhibition.date_finish %} - Закончилась - {% elif now > exhibition.datetime_start %} - Началась - {% else %} - Формируется - {% endif %} -
-
-

{{ exhibition.title }}

-
-

{{ exhibition.topic }}

- {% if link %} - - {% endif %} - {% set creator = exhibition.get('user') %} - {% if creator %} -
- {{ creator.username | e }} -
-

{{ creator.username | e }}

+ {% set link="/exhibition/{}".format(exhibition._id) %} +
+ {% if link %}{% endif %} +
+ + {{ exhibition.title }} + +
+ {% if link %}{% endif %} +
+ {% if link %}{% endif %} +
+ {% if now > exhibition.date_finish %} + Закончилась + {% elif now > exhibition.datetime_start %} + Началась + {% else %} + Формируется + {% endif %} +
+
+

{{ exhibition.title }}

+
+

{{ exhibition.topic }}

+ {% if link %}{% endif %} + {% set creator = exhibition.get('user') %} + {% if creator %} +
+ {{ creator.username | e }} +
+

{{ creator.username | e }}

+
+
+ {{ contacts.details(creator) }} + {% endif %} + {% if exhibition.get('tizer_file_id') or exhibition.get('tizer_link') %} + + Релиз выставки + + {%endif%} + + Список картин + +

Место проведения: {{ exhibition.get('place') }}

+
+ С {{ ( exhibition.datetime_start.strftime('%d.%m.%Y')) if + exhibition.datetime_start else ''}} + По {{ ( exhibition.date_finish.strftime('%d.%m.%Y')) if + exhibition.date_finish else ''}} +
+
+ + {{ share.share('/exhibition/{}'.format(exhibition._id), exhibition.title, + '/b/exhibition/{}'.format(exhibition.poster_file_id), "Приглашаем на выставку") }} + +
+

{{ (exhibition._id.generation_time.strftime('%d.%m.%Y')) if exhibition._id else ''}}

-
-
- Показать контакты -
- - - - - Профиль - - - - - {{ creator.phone.split(',')[-1].strip() }} - - - - - {{creator.email}} - -
Написать
-
- - - - - - - - - - - - - - - - - -
- - -
-
-{% endif %} - {% if exhibition.get('tizer_file_id') or exhibition.get('tizer_link') %} - - Релиз выставки - - {%endif%} - - Список картин - -

Место проведения: {{ exhibition.get('place') }}

-
- С {{ ( exhibition.datetime_start.strftime('%d.%m.%Y')) if exhibition.datetime_start else ''}} - По {{ ( exhibition.date_finish.strftime('%d.%m.%Y')) if exhibition.date_finish else ''}} -
- -
- - {{ share.share('/exhibition/{}'.format(exhibition._id), exhibition.title, '/b/exhibition/{}'.format(exhibition.poster_file_id), "Приглашаем на выставку") }} - -
- -

{{ (exhibition._id.generation_time.strftime('%d.%m.%Y')) if exhibition._id else ''}}

-
-
+ {% endfor %}
@@ -139,27 +88,10 @@ {% block head %} {{ header.style() }} - - {{ footer.style() }} {% endblock %} \ No newline at end of file diff --git a/templates/profile/invitation.html b/templates/profile/invitation.html index 94197d9..9fa2898 100644 --- a/templates/profile/invitation.html +++ b/templates/profile/invitation.html @@ -3,6 +3,7 @@ {% import "/components/footer.html" as footer %} {% import "components/profile_card.html" as profile_card %} {% import "components/profile_nav.html" as profile_nav %} +{% import "/components/contacts.html" as contacts %} {% block title %}Приглашения{% endblock %} @@ -742,45 +743,7 @@ document.getElementById('delivery_type')?.addEventListener('change', toggleTrack {% endif %} -
- Показать контакты -
- - - - {{ user.phone.split(',')[-1].strip() }} - - - - - {{user.email}} - -
Написать
-
- - - - - - - - - - - - - - - - - -
-
-
+{{ contacts.details(user) }} {% endmacro %} {% macro render_links(doc) %} {% if doc.get('exhibition')%} @@ -793,6 +756,7 @@ document.getElementById('delivery_type')?.addEventListener('change', toggleTrack {% block head %} {{ header.style() }} {{ profile_nav.style() }} +{{ contacts.style() }}