+{% from "admin/macros/pagination.html" import pagination %} {% from
+"macros/dialog.html" import dialog %} {% if allowlist_entries %}
+
-
-
-
- {{ pagination(allowlist_pagination, "allowlist_page", request, hx_target="#allowlist-content", fragment="allowlist-content") }}
-{% else %}
-
-{% endif %}
\ No newline at end of file
+
+{% endif %}
diff --git a/app/templates/icons/google.svg b/app/templates/icons/google.svg
index 088288f..3c77c6c 100644
--- a/app/templates/icons/google.svg
+++ b/app/templates/icons/google.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/app/templates/macros/dialog.html b/app/templates/macros/dialog.html
index 53e6247..73d1d8b 100644
--- a/app/templates/macros/dialog.html
+++ b/app/templates/macros/dialog.html
@@ -1,94 +1,215 @@
-{#
- Renders a dialog component with optional trigger, header, body, and footer.
-
- @param id {string} - Unique identifier for the dialog component.
- @param trigger {string} [optional] - Text or HTML for the button that triggers the dialog.
- @param title {string} [optional] - Title text displayed in the dialog header.
- @param description {string} [optional] - Description text displayed below the title.
- @param footer {string} [optional] - HTML content for the dialog footer.
- @param main_attrs {object} [optional] - Additional HTML attributes for the main container div.
- @param trigger_attrs {object} [optional] - Additional HTML attributes for the trigger button.
- @param dialog_attrs {object} [optional] - Additional HTML attributes for the dialog content container.
- @param header_attrs {object} [optional] - Additional HTML attributes for the dialog header.
- @param body_attrs {object} [optional] - Additional HTML attributes for the dialog body section.
- @param footer_attrs {object} [optional] - Additional HTML attributes for the dialog footer.
- @param open {boolean} [optional] [default=false] - Whether the dialog should be open initially.
- @param close_button {boolean} [optional] [default=true] - Whether to include a close button.
- @param close_on_overlay_click {boolean} [optional] [default=true] - Whether clicking the overlay closes the dialog.
-#}
-{% macro dialog(
- id=None,
- trigger=None,
- title=None,
- description=None,
- footer=None,
- dialog_attrs={},
- trigger_attrs={},
- header_attrs={},
- body_attrs={},
- footer_attrs={},
- open=false,
- close_button=true,
- close_on_overlay_click=true
-) %}
-{% set id = id or ("dialog-" + (range(100000, 999999) | random | string)) %}
-{% if trigger %}
+{# Renders a dialog component with optional trigger, header, body, and footer.
+@param id {string} - Unique identifier for the dialog component. @param trigger
+{string} [optional] - Text or HTML for the button that triggers the dialog.
+@param title {string} [optional] - Title text displayed in the dialog header.
+@param description {string} [optional] - Description text displayed below the
+title. @param footer {string} [optional] - HTML content for the dialog footer.
+@param main_attrs {object} [optional] - Additional HTML attributes for the main
+container div. @param trigger_attrs {object} [optional] - Additional HTML
+attributes for the trigger button. @param dialog_attrs {object} [optional] -
+Additional HTML attributes for the dialog content container. @param header_attrs
+{object} [optional] - Additional HTML attributes for the dialog header. @param
+body_attrs {object} [optional] - Additional HTML attributes for the dialog body
+section. @param footer_attrs {object} [optional] - Additional HTML attributes
+for the dialog footer. @param open {boolean} [optional] [default=false] -
+Whether the dialog should be open initially. @param close_button {boolean}
+[optional] [default=true] - Whether to include a close button. @param
+close_on_overlay_click {boolean} [optional] [default=true] - Whether clicking
+the overlay closes the dialog. @param cancel_label {string} [optional] - Label
+for cancel button (for alert dialogs). @param confirm_label {string} [optional]
+- Label for confirm button (for alert dialogs). @param confirm_attrs {object}
+[optional] - Additional HTML attributes for the confirm button. #} {% macro
+dialog( id=None, trigger=None, title=None, description=None, footer=None,
+dialog_attrs={}, trigger_attrs={}, header_attrs={}, body_attrs={},
+footer_attrs={}, open=false, close_button=true, close_on_overlay_click=true,
+cancel_label=None, confirm_label=None, confirm_attrs={} ) %} {% set id = id or
+("dialog-" + (range(100000, 999999) | random | string)) %} {% if trigger %}
{% endif %}
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}
diff --git a/app/templates/team/partials/_settings-members.html b/app/templates/team/partials/_settings-members.html
index 053dfc9..79cd3aa 100644
--- a/app/templates/team/partials/_settings-members.html
+++ b/app/templates/team/partials/_settings-members.html
@@ -1,265 +1,345 @@
-{% from "macros/dialog.html" import dialog %}
-{% from "macros/dropdown-menu.html" import dropdown_menu with context %}
-{% from "macros/avatar.html" import avatar with context %}
-{% set roles = {
- "owner": _("Owner"),
- "admin": _("Admin"),
- "member": _("Member"),
-} %}
+{% from "macros/dialog.html" import dialog %} {% from
+"macros/dropdown-menu.html" import dropdown_menu with context %} {% from
+"macros/avatar.html" import avatar with context %} {% set roles = { "owner":
+_("Owner"), "admin": _("Admin"), "member": _("Member"), } %}
| {{ _('Type') }} | -{{ _('Value') }} | -{{ _('Added') }} | -- |
|---|---|---|---|
| - {% if entry.type == "email" %} - {{ _('Email') }} - {% elif entry.type == "domain" %} - {{ _('Domain') }} - {% elif entry.type == "pattern" %} - {{ _('Pattern') }} - {% endif %} - | -{{ entry.value }} | -{{ entry.created_at | time_ago }} | -- - | -
| {{ _('Type') }} | +{{ _('Value') }} | +{{ _('Added') }} | ++ |
| + {% if entry.type == "email" %} + {{ _('Email') }} + {% elif entry.type == "domain" %} + {{ _('Domain') }} + {% elif entry.type == "pattern" %} + {{ _('Pattern') }} + {% endif %} + | ++ {{ entry.value }} + | +{{ entry.created_at | time_ago }} | ++ {% set trigger %} {% include "icons/trash-2.svg" %} {{ + _('Delete') }} {% endset %} {% call dialog( trigger=trigger, + title=_('Delete this entry?'), description=_('Are you sure + you want to delete this allowlist entry? This action cannot + be undone.'), trigger_attrs={"class": "btn-sm-ghost + text-destructive"}, dialog_attrs={"class": "max-w-md"}, + cancel_label=_('Cancel'), confirm_label=_('Delete'), + confirm_attrs={ "hx-post": "", "hx-target": "closest .card", + "hx-swap": "outerHTML", "hx-indicator": "next + .htmx-indicator", "hx-push-url": "false", "hx-vals": + '{"csrf_token": "' + + allowlist_delete_form.csrf_token._value() + '", "entry_id": + "' + entry.id|string + '", "action": "delete_allowlist"}' } + ) %} {% endcall %} + | +
+
+{{ pagination(allowlist_pagination, "allowlist_page", request,
+hx_target="#allowlist-content", fragment="allowlist-content") }} {% else %}
+{{ _('No allowlist entries found.') }}
-
-
-
+
+
-
-
diff --git a/app/templates/user/partials/_settings-teams.html b/app/templates/user/partials/_settings-teams.html
index abf1718..85c679e 100644
--- a/app/templates/user/partials/_settings-teams.html
+++ b/app/templates/user/partials/_settings-teams.html
@@ -1,76 +1,92 @@
-{% from "macros/avatar.html" import avatar with context %}
-{% set roles = {
- "owner": _("Owner"),
- "admin": _("Admin"),
- "member": _("Member"),
-} %}
+{% from "macros/avatar.html" import avatar with context %} {% from
+"macros/dialog.html" import dialog %} {% set roles = { "owner": _("Owner"),
+"admin": _("Admin"), "member": _("Member"), } %}
{{ _('Members') }}
-{{ _('Manage the members of the team.') }}
-{{ _('Members') }}
+{{ _('Manage the members of the team.') }}
+
-
-
-
-
-
- | - | {{ _('Name') }} | -{{ _('Email') }} | -{{ _('Role') }} | -- |
|---|---|---|---|---|
|
-
- {% set fallback %}
-
- 
- {% endset %}
- {{ avatar(
- item=member.user,
- prefix="user",
- name=member.user.name if member.user.name else member.user.username,
- class="!rounded-full",
- fallback=fallback
- ) }}
- |
-
- {% if member.user.name %}
- {{ member.user.name }}
- {{ member.user.username }}
- {% else %}
- {{ member.user.username }}
- {% endif %}
- |
- - {{ member.user.email }} - | -- - | -
- {% if owner_count == 1 and member.role == "owner" %}
-
- {% else %}
- {% set trigger %}
- {% include "icons/trash-2.svg" %}
- {% endset %}
- {% call dialog(
- id="delete-member-" ~ member.user.id,
- trigger=trigger,
- title=_('Remove "%(name)s"?', name=member.user.name if member.user.name else member.user.username),
- trigger_attrs={
- "class": "btn-icon-ghost text-destructive hover:bg-destructive/10 dark:hover:bg-destructive/20",
- "aria-label": _('Remove'),
- "data-tooltip": _('Remove'),
- "data-align": "end",
- },
- dialog_attrs={"class": "max-w-md whitespace-normal text-left"},
- close_button=false,
- close_on_overlay_click=false
- ) %}
-
-
- {% endcall %}
- {% endif %}
- {{ _("This will remove the member from the team. They will no longer have access to the team and its projects.") }} -{{ _('To confirm, enter the member\'s email address "%(email)s" below.', email=member.user.email) | safe }} - - |
-
-
+
@@ -36,21 +37,27 @@
-
\ No newline at end of file
+{{ _('Invite members by email') }}
+
+
+
+
+
+
+ | + | {{ _('Name') }} | +{{ _('Email') }} | +{{ _('Role') }} | ++ |
|---|---|---|---|---|
|
+
+ {% set fallback %}
+
+
+ {% endset %} {{ avatar( item=member.user,
+ prefix="user", name=member.user.name if
+ member.user.name else member.user.username,
+ class="!rounded-full", fallback=fallback ) }}
+ |
+
+ {% if member.user.name %} {{ member.user.name }}
+
+ {{ member.user.username }}
+
+ {% else %} {{ member.user.username }} {% endif %}
+ |
+ {{ member.user.email }} | +
+
+ {% if owner_count == 1 and member.role ==
+ "owner" %}
+
+ {% else %}
+
-
+ |
+
+ {% if owner_count == 1 and member.role == "owner" %}
+
+ {% else %} {% set trigger %} {% include
+ "icons/trash-2.svg" %} {% endset %} {% call dialog(
+ id="delete-member-" ~ member.user.id,
+ trigger=trigger, title=_('Remove "%(name)s"?',
+ name=member.user.name if member.user.name else
+ member.user.username), trigger_attrs={ "class":
+ "btn-icon-ghost text-destructive
+ hover:bg-destructive/10
+ dark:hover:bg-destructive/20", "aria-label":
+ _('Remove'), "data-tooltip": _('Remove'),
+ "data-align": "end", }, dialog_attrs={"class":
+ "max-w-md whitespace-normal text-left"},
+ close_button=false, close_on_overlay_click=false )
+ %}
+
+
+ {% endcall %} {% endif %}
+ + {{ _("This will remove the member from the + team. They will no longer have access to the + team and its projects.") }} + ++ {{ _('To confirm, enter the member\'s email + address "%(email)s" below.', + email=member.user.email) | safe }} + + + |
+
+
- {% if member_invites %}
- {{ _('Invite members by email') }}
+ + -
-
diff --git a/app/templates/user/partials/_settings-authentication.html b/app/templates/user/partials/_settings-authentication.html
index e4f4dfc..f547e1d 100644
--- a/app/templates/user/partials/_settings-authentication.html
+++ b/app/templates/user/partials/_settings-authentication.html
@@ -1,4 +1,5 @@
{% from "macros/dropdown-menu.html" import dropdown_menu %}
+{% from "macros/dialog.html" import dialog %}
{{ _('%(count)s pending invite(s)', count=member_invites|length) }}
-
-
-
-
+ {% if member_invites %}
+
- {% endif %}
-
+ {% endif %}
+
- | - | {{ _('Email') }} | -{{ _('Role') }} | -{{ _('Expires') }} | -- |
|---|---|---|---|---|
|
-
-
- 
- |
- {{ invite.email }} | -{{ roles[invite.role] }} | -{{ invite.expires_at.strftime('%b %d, %Y') }} | -- - - | -
+
- + {{ _('%(count)s pending invite(s)', count=member_invites|length) + }} +
+
+
+
+
+
| + | {{ _('Email') }} | +{{ _('Role') }} | +{{ _('Expires') }} | ++ |
|---|---|---|---|---|
|
+
+
+
+ |
+ {{ invite.email }} | +{{ roles[invite.role] }} | ++ {{ invite.expires_at.strftime('%b %d, %Y') }} + | ++ + {% set trigger %} {% include "icons/trash-2.svg" + %} {% endset %} {% call dialog( trigger=trigger, + title=_('Revoke invitation?'), + description=_('Are you sure you want to revoke + this invitation? The recipient will no longer be + able to join the team with this link.'), + trigger_attrs={ "class": "btn-icon-ghost + text-destructive hover:bg-destructive/10 + dark:hover:bg-destructive/20", "aria-label": + _('Revoke'), "data-tooltip": _('Revoke'), + "data-align": "end" }, dialog_attrs={"class": + "max-w-md"}, cancel_label=_('Cancel'), + confirm_label=_('Revoke'), confirm_attrs={ + "hx-get": url_for('team_settings', + team_slug=team.slug).include_query_params(fragment='revoke_member_invite', + invite_id=invite.id), "hx-target": "closest + .card", "hx-swap": "outerHTML", "hx-indicator": + "next .htmx-indicator", "@click": + "$el.closest('dialog').close()" } ) %} {% + endcall %} + | +
-
\ No newline at end of file
+
- {% include "icons/loader.svg" %}
- {{ _("Saving") }}
+
-
+
-
+ {% include "icons/loader.svg" %} {{ _("Saving") }}
+
{{ _("Authentication") }}
{% include "icons/external-link.svg" %} - + {% set trigger %} + {{ _('Disconnect') }} + {% endset %} + {% call dialog( + trigger=trigger, + title=_('Disconnect GitHub?'), + description=_('Are you sure you want to disconnect your GitHub account? You will need to reconnect it to sign in with GitHub.'), + trigger_attrs={"role": "menuitem", "class": "text-destructive hover:bg-destructive/10 dark:hover:bg-destructive/20 focus:bg-destructive/10 dark:focus:bg-destructive/20 focus:text-destructive"}, + dialog_attrs={"class": "max-w-md"}, + cancel_label=_('Cancel'), + confirm_label=_('Disconnect'), + confirm_attrs={ + "hx-post": url_for('user_settings').include_query_params(fragment='revoke_oauth_access'), + "hx-target": "closest .card", + "hx-swap": "outerHTML", + "hx-indicator": "next .htmx-indicator", + "hx-vals": '{"csrf_token": "' + revoke_oauth_access_form.csrf_token._value() + '", "provider": "github"}', + "@click": "$el.closest('dialog').close()" + } + ) %} + {% endcall %} {% endcall %} {% else %} @@ -80,21 +87,27 @@{{ _("Authentication") }}
{% include "icons/external-link.svg" %} - + {% set trigger %} + {{ _('Disconnect') }} + {% endset %} + {% call dialog( + trigger=trigger, + title=_('Disconnect Google?'), + description=_('Are you sure you want to disconnect your Google account? You will need to reconnect it to sign in with Google.'), + trigger_attrs={"role": "menuitem", "class": "text-destructive hover:bg-destructive/10 dark:hover:bg-destructive/20 focus:bg-destructive/10 dark:focus:bg-destructive/20 focus:text-destructive"}, + dialog_attrs={"class": "max-w-md"}, + cancel_label=_('Cancel'), + confirm_label=_('Disconnect'), + confirm_attrs={ + "hx-post": url_for('user_settings').include_query_params(fragment='revoke_oauth_access'), + "hx-target": "closest .card", + "hx-swap": "outerHTML", + "hx-indicator": "next .htmx-indicator", + "hx-vals": '{"csrf_token": "' + revoke_oauth_access_form.csrf_token._value() + '", "provider": "google"}', + "@click": "$el.closest('dialog').close()" + } + ) %} + {% endcall %} {% endcall %} {% else %} @@ -111,4 +124,4 @@{{ _("Authentication") }}
{% include "icons/loader.svg" %} {{ _('Saving') }}
-
-
+
+
-
-
+
+
-{{ _('Teams') }}
-{{ _('Manage the teams you are a member of.') }}
-{{ _('Teams') }}
+{{ _('Manage the teams you are a member of.') }}
+
-
-
-
-
- | - | {{ _('Name') }} | -{{ _('Role') }} | -- |
|---|---|---|---|
| - {{ avatar(item=team, prefix="team", name=team.name, size="sm") }} - | -- - {{ team.name }} - - {% if team.id == current_user.default_team_id %} - {{ _('Default') }} - {% endif %} - | -{{ roles[role] }} | -- {% if team.id != current_user.default_team_id %} - - {% else %} - - {% endif %} - | -
+
+
+
+
+ | + | {{ _('Name') }} | +{{ _('Role') }} | ++ |
|---|---|---|---|
| + {{ avatar(item=team, prefix="team", name=team.name, + size="sm") }} + | ++ + {{ team.name }} + + {% if team.id == current_user.default_team_id %} + {{ _('Default') }} + {% endif %} + | ++ {{ roles[role] }} + | ++ {% if team.id != current_user.default_team_id %} {% + set trigger %} {% include "icons/log-out.svg" %} {% + endset %} {% call dialog( trigger=trigger, + title=_('Leave "%(team)s"?', team=team.name), + description=_('Are you sure you want to leave this + team? You will lose access to all projects within + this team.'), trigger_attrs={ "class": + "btn-sm-icon-ghost", "aria-label": _('Leave team'), + "data-tooltip": _('Leave team'), "data-align": "end" + }, dialog_attrs={"class": "max-w-md"}, + cancel_label=_('Cancel'), confirm_label=_('Leave + Team'), confirm_attrs={ "hx-post": + url_for('user_settings').include_query_params(fragment='teams'), + "hx-target": "closest .card", "hx-swap": + "outerHTML", "hx-indicator": "next .htmx-indicator", + "hx-vals": '{"csrf_token": "' + + leave_team_form.csrf_token._value() + '", "team_id": + "' + team.id|string + '"}', "@click": + "$el.closest('dialog').close()" } ) %} {% endcall %} + {% else %} + + {% endif %} + | +
-
\ No newline at end of file
+
- {% include "icons/loader.svg" %}
- {{ _('Saving') }}
-
-
+
+ {% include "icons/loader.svg" %} {{ _('Saving') }}
+
+