Skip to content

Commit

Permalink
lazy-loads registered-not-subscribed users
Browse files Browse the repository at this point in the history
  • Loading branch information
smirolo committed Apr 26, 2024
1 parent 18101ae commit 54f0581
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RUN set -eux; \
pkg-config; \
\
/app/bin/pip install billiard==4.0.0 cairocffi==1.3.0 coverage==6.3.2 cryptography==41.0.3 psycopg2-binary==2.9.3 pycairo==1.21.0 python-ldap==3.4.0 setproctitle==1.2.3; \
/app/bin/pip install boto3==1.28.3 Django==3.2.25 django-phonenumber-field==7.1.0 django-recaptcha==3.0.0 djangorestframework==3.14.0 djaodjin-deployutils==0.10.9 djaodjin-extended-templates==0.4.6 djaodjin-multitier==0.2.1 djaodjin-rules==0.4.6 djaodjin-saas==0.20.2 djaodjin-signup==0.9.5 docutils==0.15.2 googlemaps==4.10.0 gunicorn==20.1.0 jinja2==3.1.3 MarkupSafe==2.1.1 phonenumbers==8.13.13 PyJWT==2.6.0 pyotp==2.8.0 pytz==2023.3 social-auth-app-django==5.2.0 whitenoise==6.4.0 WeasyPrint==53.4; \
/app/bin/pip install boto3==1.28.3 Django==3.2.25 django-phonenumber-field==7.1.0 django-recaptcha==3.0.0 djangorestframework==3.14.0 djaodjin-deployutils==0.10.9 djaodjin-extended-templates==0.4.6 djaodjin-multitier==0.2.1 djaodjin-rules==0.4.6 djaodjin-saas==0.20.3 djaodjin-signup==0.9.5 docutils==0.15.2 googlemaps==4.10.0 gunicorn==20.1.0 jinja2==3.1.3 MarkupSafe==2.1.1 phonenumbers==8.13.13 PyJWT==2.6.0 pyotp==2.8.0 pytz==2023.3 social-auth-app-django==5.2.0 whitenoise==6.4.0 WeasyPrint==53.4; \
/app/bin/pip install django-debug-toolbar==3.5.0 django-extensions==3.2.3 django-storages==1.14.2; \
\
apt-mark auto '.*'; \
Expand Down
12 changes: 7 additions & 5 deletions djaoapp/templates/saas/profile/subscribers.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@


{% block saas_content %}
<section id="subscribers">
<lazy-load-tabs inline-template id="subscribers">
<div id="subscribers-list-container"
data-trip data-trip-index="1"
data-trip-content="<h2>{% trans %}Active subscribers{% endtrans %}</h2><p>{% trans %}List of all active subscribers.<br />You will find here the list of all active subscribers,<br />with the plans they are subscribed to, the date they first<br />subscribed as well as when their renewal is due.{% endtrans %}</p><em>{% trans %}Use keyboard navigation or click 'Next' to move forward.{% endtrans %}</em>"
data-trip-position="screen-center">
<ul class="nav nav-tabs dashboard-tab" role="tablist">
{% if registered %}
<li class="nav-item">
<a class="nav-link" href="#registered" data-bs-toggle="tab">{% trans %}Registered{% endtrans %}</a>
<a class="nav-link" href="#registered" data-bs-toggle="tab"
@click="tabClicked('registered')">{% trans %}Registered{% endtrans %}</a>
</li>
{% endif %}

Expand All @@ -37,7 +38,8 @@
<div class="tab-content">

{% if registered %}
<registered inline-template id="registered" class="tab-pane" role="tabpanel">
<registered inline-template id="registered" class="tab-pane"
role="tabpanel" ref="registered">
<div id="registered-tab-container">
<div class="mt-2">
{% include "saas/_filter.html" %}
Expand Down Expand Up @@ -83,7 +85,7 @@ <h3 class="text-center"><i class="fa fa-refresh fa-spin fa-2x"></i></h3>
{% for tab in tabs %}
<{{tab.slug}} inline-template id="{{tab.slug}}"
class="tab-pane{% if tab.is_active %} active{% endif %}"
role="tabpanel">
role="tabpanel" ref="tab.slug">
<div id="{{tab.slug}}-tab-container">
<div class="mt-2">
{% include "saas/_filter.html" %}
Expand Down Expand Up @@ -354,5 +356,5 @@ <h3 class="text-center"><i class="fa fa-refresh fa-spin fa-2x"></i></h3>

</div>{# /.tab-content #}
</div>
</section>
</lazy-load-tabs>
{% endblock %}
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ djaodjin-deployutils==0.10.9
djaodjin-extended-templates==0.4.6
djaodjin-multitier==0.2.1
djaodjin-rules==0.4.6
djaodjin-saas==0.20.2
djaodjin-saas==0.20.3
djaodjin-signup==0.9.5
docutils==0.15.2 # botocore has a constraint: docutils<0.16
googlemaps==4.10.0
Expand Down

0 comments on commit 54f0581

Please sign in to comment.