Skip to content

Commit

Permalink
Merge pull request #1355 from GSA-TTS/main
Browse files Browse the repository at this point in the history 
2023-06-28 d06db70 main -> prod
  • Loading branch information
@asteel-gsa
asteel-gsa authored Jun 28, 2023
2 parents b0a0f93 + d06db70 commit 6973be9
Show file tree
Hide file tree
Showing 10 changed files with 56 additions and 49 deletions.
13 changes: 0 additions & 13 deletions backend/audit/storages.py
View file

This file was deleted.

4 changes: 2 additions & 2 deletions backend/audit/templates/audit/my_submissions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ <h2 class="usa-modal__heading" id="modal-uei-info-heading">What is a Unique Enti
aria-label="Close this window"
data-close-modal>
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use xlink:href="/static/img/sprite.svg#close"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#close"></use>
</svg>
</button>
</div>
Expand Down Expand Up @@ -150,7 +150,7 @@ <h2 class="usa-modal__heading" id="modal-terms-conditions-heading">
aria-label="Close this window"
data-close-modal>
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use xlink:href="/static/img/sprite.svg#close"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#close"></use>
</svg>
</button>
</div>
Expand Down
52 changes: 26 additions & 26 deletions backend/audit/templates/audit/submission-progress.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
aria-hidden="true"
focusable="false"
role="img">
<use xlink:href="/static/img/sprite.svg#person_add"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#person_add"></use>
</svg>
<span class="padding-top-05">Manage report access</span>
</button>
Expand All @@ -69,7 +69,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
<li class="usa-icon-list__item padding-bottom-2">
<div class="usa-icon-list__icon text-green">
<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
<use xlink:href="/static/img/sprite.svg#check_circle"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
</svg>
</div>
<div class="usa-icon-list__content {% if single_audit_checklist.created is True %}text-green{% endif %}">
Expand Down Expand Up @@ -99,13 +99,13 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
{% if federal_awards_workbook.completed == True %}
<div class="usa-icon-list__icon text-green">
<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
<use xlink:href="/static/img/sprite.svg#check_circle"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
</svg>
</div>
{% else %}
<div class="usa-icon-list__icon text-base">
<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
</svg>
</div>
{% endif %}
Expand All @@ -121,7 +121,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
<li class="usa-icon-list__item padding-bottom-2">
<div class="usa-icon-list__icon text-base">
<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
</svg>
</div>
<div class="usa-icon-list__content {% if single_audit_checklist.completed is True %} text-green {% else %} text-base-dark {% endif %}">
Expand All @@ -134,9 +134,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
<div class="usa-icon-list__icon {% if audit_findings_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
{% if audit_findings_workbook.completed == True %}
<use xlink:href="/static/img/sprite.svg#check_circle"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
{% else %}
<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
{% endif %}
</svg>
</div>
Expand All @@ -151,9 +151,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
<div class="usa-icon-list__icon {% if findings_text_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
{% if findings_text_workbook.completed == True %}
<use xlink:href="/static/img/sprite.svg#check_circle"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
{% else %}
<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
{% endif %}
</svg>
</div>
Expand All @@ -168,9 +168,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
<div class="usa-icon-list__icon {% if CAP_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
{% if CAP_workbook.completed == True %}
<use xlink:href="/static/img/sprite.svg#check_circle"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
{% else %}
<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
{% endif %}
</svg>
</div>
Expand All @@ -185,9 +185,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
<div class="usa-icon-list__icon {% if additional_UEIs_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
{% if additional_UEIs_workbook.completed == True %}
<use xlink:href="/static/img/sprite.svg#check_circle"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
{% else %}
<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
{% endif %}
</svg>
</div>
Expand All @@ -202,9 +202,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
<div class="usa-icon-list__icon {% if secondary_auditors_workbook.completed == True %}text-green{% else %}text-base{% endif %}">
<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
{% if secondary_auditors_workbook.completed == True %}
<use xlink:href="/static/img/sprite.svg#check_circle"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
{% else %}
<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
{% endif %}
</svg>
</div>
Expand All @@ -227,9 +227,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
<div class="usa-icon-list__icon {% if audit_report.completed == True %} text-green {% else %} text-base {% endif %}">
<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
{% if audit_report.completed == True %}
<use xlink:href="/static/img/sprite.svg#check_circle"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
{% else %}
<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
{% endif %}
</svg>
</div>
Expand All @@ -245,9 +245,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
<div class="usa-icon-list__icon {% if certification.auditor_certified == True %} text-green {% else %} text-base {% endif %}">
<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
{% if certification.auditor_certified == True %}
<use xlink:href="/static/img/sprite.svg#check_circle"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
{% else %}
<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
{% endif %}
</svg>
</div>
Expand All @@ -257,7 +257,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
href="{% url 'audit:AuditorCertification' report_id=report_id %}">Auditor Certification</a>
{% else %}
<svg class="usa-icon margin-right-05" aria-hidden="true" role="img">
<use xlink:href="/static/img/sprite.svg#lock_outline"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#lock_outline"></use>
</svg>
<span class="text-base">Auditor Certification</span>
{% endif %}
Expand All @@ -271,9 +271,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
<div class="usa-icon-list__icon {% if certification.auditee_certified == True %} text-green {% else %} text-base {% endif %}">
<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
{% if certification.auditee_certified == True %}
<use xlink:href="/static/img/sprite.svg#check_circle"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
{% else %}
<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
{% endif %}
</svg>
</div>
Expand All @@ -283,7 +283,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
href="{% url 'audit:AuditeeCertification' report_id=report_id %}">Auditee Certification</a>
{% else %}
<svg class="usa-icon margin-right-05" aria-hidden="true" role="img">
<use xlink:href="/static/img/sprite.svg#lock_outline"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#lock_outline"></use>
</svg>
<span class="text-base">Auditee Certification</span>
{% endif %}
Expand All @@ -297,9 +297,9 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
<div class="usa-icon-list__icon {% if submission.completed == True %}text-green{% else %}text-base{% endif %}">
<svg class="usa-icon margin-right-2" aria-hidden="true" role="img">
{% if submission.completed == True %}
<use xlink:href="/static/img/sprite.svg#check_circle"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#check_circle"></use>
{% else %}
<use xlink:href="/static/img/sprite.svg#radio_button_unchecked"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#radio_button_unchecked"></use>
{% endif %}
</svg>
</div>
Expand All @@ -309,7 +309,7 @@ <h1 class="border-base-light margin-top-0">{{ auditee_name | default_if_none:''
href="{% url 'audit:Submission' report_id=report_id %}">Submit to FAC for processing</a>
{% else %}
<svg class="usa-icon margin-right-05" aria-hidden="true" role="img">
<use xlink:href="/static/img/sprite.svg#lock_outline"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#lock_outline"></use>
</svg>
<span class="text-base">Submit to FAC for processing</span>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion backend/config/settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@
CSP_IMG_SRC = allowed_sources
CSP_MEDIA_SRC = allowed_sources
CSP_FRAME_SRC = allowed_sources
CSP_FONT_SRC = ("self", bucket)
CSP_FONT_SRC = ("'self'", bucket)
CSP_WORKER_SRC = allowed_sources
CSP_FRAME_ANCESTORS = allowed_sources
CSP_STYLE_SRC = allowed_sources
Expand Down
3 changes: 2 additions & 1 deletion backend/report_submission/templates/cancel-button.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<!-- Cancel submission button. Opens a confirmation modal which when accepted, moves the user to the home page. -->
{% load static %}
<a class="usa-button usa-button--outline"
aria-controls="modal-cancel"
data-open-modal>Cancel</a>
Expand Down Expand Up @@ -31,7 +32,7 @@ <h2 class="usa-modal__heading" id="modal-cancel-heading">Cancel audit submission
aria-label="Close this window"
data-close-modal>
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use xlink:href="/static/img/sprite.svg#close"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#close"></use>
</svg>
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions backend/report_submission/templates/report_submission/step-2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div id="no-uei-warning" hidden>
<h2>
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use xlink:href="/static/img/sprite.svg#error_outline"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#error_outline"></use>
</svg>
Your UEI was not confirmed
</h2>
Expand Down Expand Up @@ -184,7 +184,7 @@ <h2 class="usa-modal__heading" id="uei-search-result-heading"></h2>
aria-label="Close this window"
data-close-modal>
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use xlink:href="/static/img/sprite.svg#close"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#close"></use>
</svg>
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions backend/report_submission/templates/report_submission/step-3.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
aria-label="Delete contact"
title="Delete contact">
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use xlink:href="/static/img/sprite.svg#cancel"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#cancel"></use>
</svg>
</button>
</template>
Expand Down Expand Up @@ -349,7 +349,7 @@
aria-label="Delete contact"
title="Delete contact">
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use xlink:href="/static/img/sprite.svg#cancel"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#cancel"></use>
</svg>
</button>
</template>
Expand Down
9 changes: 9 additions & 0 deletions backend/schemas/output/sections/GeneralInformation.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,18 @@
"enum": [
"AL",
"AK",
"AS",
"AZ",
"AR",
"CA",
"CO",
"CT",
"DE",
"DC",
"FM",
"FL",
"GA",
"GU",
"HI",
"ID",
"IL",
Expand All @@ -42,6 +46,7 @@
"KY",
"LA",
"ME",
"MH",
"MD",
"MA",
"MI",
Expand All @@ -57,17 +62,21 @@
"NY",
"NC",
"ND",
"MP",
"OH",
"OK",
"OR",
"PW",
"PA",
"PR",
"RI",
"SC",
"SD",
"TN",
"TX",
"UT",
"VT",
"VI",
"VA",
"WA",
"WV",
Expand Down
10 changes: 10 additions & 0 deletions backend/schemas/source/base/Base.libsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,18 +126,23 @@ local Enum = {
],
title: 'EmptyString_EmptyArray_Null',
},
// Source: https://pe.usps.com/text/pub28/28apb.htm
UnitedStatesStateAbbr: Types.string {
enum: [
'AL',
'AK',
'AS',
'AZ',
'AR',
'CA',
'CO',
'CT',
'DE',
'DC',
'FM',
'FL',
'GA',
'GU',
'HI',
'ID',
'IL',
Expand All @@ -147,6 +152,7 @@ local Enum = {
'KY',
'LA',
'ME',
'MH',
'MD',
'MA',
'MI',
Expand All @@ -162,17 +168,21 @@ local Enum = {
'NY',
'NC',
'ND',
'MP',
'OH',
'OK',
'OR',
'PW',
'PA',
'PR',
'RI',
'SC',
'SD',
'TN',
'TX',
'UT',
'VT',
'VI',
'VA',
'WA',
'WV',
Expand Down
4 changes: 2 additions & 2 deletions backend/templates/includes/nav_primary.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<form action="/openid/logout" class="sign-out">
<button class="usa-button usa-button--unstyled">
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use xlink:href="/static/img/sprite.svg#logout"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#logout"></use>
</svg>
<span>Sign out</span>
{% if request.user.first_name == '' %}
Expand Down Expand Up @@ -105,7 +105,7 @@ <h2 class="usa-modal__heading" id="login-modal-heading">You must log in to conti
aria-label="Close this window"
data-close-modal>
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use xlink:href="{% static 'img/sprite.svg#close' %}"></use>
<use xlink:href="{% static 'img/sprite.svg'%}#close"></use>
</svg>
</button>
</div>
Expand Down

0 comments on commit 6973be9

Please sign in to comment.