Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Specify Python version for some deps #116

Merged
merged 2 commits into from
Oct 8, 2024
Merged

fix: Specify Python version for some deps #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b45c18
fix pyproject.toml
nchz Sep 23, 2024
f6333e9
reformat templates with djlint
nchz Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions allauth_ui/templates/account/email.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
{% trans "Email Addresses" as heading %}
{% #container heading=heading %}
{% if emailaddresses %}
<div>{% trans 'The following email addresses are associated with your account:' %}</div>
<div>
{% trans 'The following email addresses are associated with your account:' %}
</div>
{% url 'account_email' as action_url %}
{% #form url=action_url use_default_button="false" %}
{{ redirect_field }}
Expand Down Expand Up @@ -35,9 +37,15 @@
{% endfor %}
</div>
<div class="flex flex-col mt-3 gap-1.5 ">
<button name="action_primary" type="submit" class="btn btn-primary">Make Primary</button>
<button name="action_send" type="submit" class="btn btn-secondary">Re-send verification</button>
<button name="action_remove" type="submit" class="btn btn-warning">Remove</button>
<button name="action_primary" type="submit" class="btn btn-primary">
Make Primary
</button>
<button name="action_send" type="submit" class="btn btn-secondary">
Re-send verification
</button>
<button name="action_remove" type="submit" class="btn btn-warning">
Remove
</button>
</div>
{% /form %}
{% else %}
Expand Down
4 changes: 3 additions & 1 deletion allauth_ui/templates/account/reauthenticate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
{% load i18n %}
{% load allauth_ui %}
{% block reauthenticate_content %}
<div class="mt-5">{% blocktranslate %}Enter your password:{% endblocktranslate %}</div>
<div class="mt-5">
{% blocktranslate %}Enter your password:{% endblocktranslate %}
</div>
{% url 'account_reauthenticate' as action_url %}
{% trans "Confirm" as button_text %}
{% #form form=form url=action_url button_text=button_text %}
Expand Down
4 changes: 3 additions & 1 deletion allauth_ui/templates/mfa/authenticate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
<div class="divider"></div>
<h2 class="my-3 text-lg">{% translate "Alternative options" %}</h2>
{% #form form=webauthn_form url=action_url use_default_button="false" %}
<button type="submit" class="btn btn-neutral">{% trans "Use a security key" %}</button>
<button type="submit" class="btn btn-neutral">
{% trans "Use a security key" %}
</button>
<a href="{% url "account_login" %}" class="btn btn-accent">{% trans "Cancel" %}</a>
{% csrf_token %}
{% /form %}
Expand Down
4 changes: 3 additions & 1 deletion allauth_ui/templates/mfa/reauthenticate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
{% load i18n %}
{% load allauth_ui %}
{% block reauthenticate_content %}
<div class="mt-5">{% blocktranslate %}Enter an authenticator code:{% endblocktranslate %}</div>
<div class="mt-5">
{% blocktranslate %}Enter an authenticator code:{% endblocktranslate %}
</div>
{% url 'mfa_reauthenticate' as action_url %}
{% trans "Confirm" as button_text %}
{% #form form=form url=action_url button_text=button_text %}
Expand Down
4 changes: 3 additions & 1 deletion allauth_ui/templates/socialaccount/connections.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
</label>
</div>
{% endfor %}
<button type="submit" class="btn btn-warning my-3">{% trans "Remove" %}</button>
<button type="submit" class="btn btn-warning my-3">
{% trans "Remove" %}
</button>
{% /form %}
{% endif %}
<h2 class="py-3 text-lg">{% trans "Add a Third-Party Account" %}</h2>
Expand Down
1,479 changes: 770 additions & 709 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ django-debug-toolbar = "^3.2.4"
django-extensions = "^3.1.5"
django-rosetta = "^0.10.0"
django-toolset = "^0.1.5"
djlint = "^1.34.1"
djlint = {version = "^1.34.1", python = ">=3.8,<4.0"}
fido2 = {version = "^1.1.3", python = ">=3.8,<4.0"}
isort = "^5.13.2"
mypy = "^1.3.0"
mypy-extensions = "1.0.0"
Expand Down
Loading