Merge branch 'main' of https://github.com/GSA/notifications-admin into 718-clean-up-components-section

# Conflicts:
#	app/templates/components/components/footer/_footer.scss
#	app/templates/components/components/hint/_hint.scss
#	app/templates/views/service-settings/data-retention.html
#	app/templates/views/service-settings/sms-senders.html
#	app/templates/views/two-factor-webauthn.html
#	app/templates/views/user-profile/security-keys.html
This commit is contained in:
Jonathan Bobel
2023-08-31 12:06:55 -04:00
186 changed files with 3619 additions and 16898 deletions

View File

@@ -14,8 +14,8 @@
{% endblock %}
{% block maincolumn_content %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
<div class="grid-row">
<div class="grid-col-10">
{{ page_header('Callbacks for delivery receipts') }}

View File

@@ -14,8 +14,8 @@
{% block maincolumn_content %}
{{ page_header('Callbacks for received text messages') }}
<div class="govuk-grid-row">
<div class="govuk-grid-column-five-sixths">
<div class="grid-row">
<div class="grid-col-10">
<p>
When you receive a text message in Notify, we can forward it to your system.
Check the <a class="usa-link" href="{{ url_for('.callbacks') }}"> callback documentation </a> for more information.

View File

@@ -50,8 +50,8 @@
{% call form_wrapper() %}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<div class="grid-row">
<div class="grid-col-8">
{{ list_entry(
form.email_addresses,

View File

@@ -12,25 +12,25 @@
API integration
</h1>
<nav class="govuk-grid-row bottom-gutter-1-2">
<div class="govuk-grid-column-one-third">
<nav class="grid-row bottom-gutter-1-2">
<div class="grid-col-4">
<a class="usa-link pill-separate-item" href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a>
</div>
<div class="govuk-grid-column-one-third">
<div class="grid-col-4">
<a class="usa-link pill-separate-item" href="{{ url_for('.guest_list', service_id=current_service.id) }}">Guest list</a>
</div>
<div class="govuk-grid-column-one-third">
<div class="grid-col-4">
<a class="usa-link pill-separate-item" href="{{ url_for(callbacks_link, service_id=current_service.id) }}">Callbacks</a>
</div>
</nav>
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-half">
<div class="grid-row">
<div class="grid-col-6">
<h2 class="heading-small">
Message log
</h2>
</div>
<div class="govuk-grid-column-one-half align-with-heading-copy-right">
<div class="grid-col-6 align-with-heading-copy-right">
<a class="usa-link" href="{{ url_for('.api_integration', service_id=current_service.id) }}">Refresh</a>
</div>
</div>
@@ -46,17 +46,17 @@
</div>
{% endif %}
{% for notification in api_notifications.notifications %}
<details class="api-notifications-item govuk-details govuk-!-margin-bottom-0" data-module="govuk-details">
<details class="api-notifications-item govuk-details" data-module="govuk-details">
<summary class="govuk-details__summary govuk-clearfix api-notifications-item__heading">
<h3>
<span class="govuk-details__summary-text">
{{ notification.to }}
</span>
<span class="govuk-grid-row api-notifications-item__meta">
<span class="govuk-grid-column-one-half api-notifications-item__meta-key">
<span class="grid-row api-notifications-item__meta">
<span class="grid-col-6 api-notifications-item__meta-key">
{{notification.key_name}}
</span>
<span class="govuk-grid-column-one-half api-notifications-item__meta-time">
<span class="grid-col-6 api-notifications-item__meta-time">
<time class="timeago" datetime="{{ notification.created_at }}">
{{ notification.created_at|format_delta }}
</time>
@@ -64,7 +64,7 @@
</span>
</h3>
</summary>
<div class="govuk-details__text api-notifications-item__data govuk-!-padding-top-0">
<div class="govuk-details__text api-notifications-item__data">
<dl id="notification-{{ notification.id }}">
{% for key in [
'id', 'client_reference', 'notification_type', 'created_at', 'updated_at', 'sent_at', 'status'