diff --git a/.gitignore b/.gitignore index d78ca3227..8acace70f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ docs/research/data/** **/assets/* -!**/assets/sass/ +!**/assets/src/ !**/assets/modules-common/ !**/assets/modules/ !**/assets/modules-admin/ diff --git a/src/gulpfile.js b/src/gulpfile.js index 31e8da8bb..333f465e8 100644 --- a/src/gulpfile.js +++ b/src/gulpfile.js @@ -8,8 +8,8 @@ const TerserPlugin = require('terser-webpack-plugin'); const ASSETS_DIR = './registrar/assets/'; const JS_BUNDLE_DEST = ASSETS_DIR + 'js'; const JS_SOURCES = [ - { src: ASSETS_DIR + 'modules/*.js', output: 'get-gov.js' }, - { src: ASSETS_DIR + 'modules-admin/*.js', output: 'get-gov-admin.js' }, + { src: ASSETS_DIR + 'src/js/getgov/*.js', output: 'getgov.min.js' }, + { src: ASSETS_DIR + 'src/js/getgov-admin/*.js', output: 'getgov-admin.min.js' }, ]; /** @@ -24,7 +24,7 @@ uswds.settings.version = 3; */ uswds.paths.dist.css = ASSETS_DIR + 'css'; uswds.paths.dist.sass = ASSETS_DIR + 'sass'; -uswds.paths.dist.theme = ASSETS_DIR + 'sass/_theme'; +uswds.paths.dist.theme = ASSETS_DIR + 'src/sass/_theme'; uswds.paths.dist.fonts = ASSETS_DIR + 'fonts'; uswds.paths.dist.js = ASSETS_DIR + 'js'; uswds.paths.dist.img = ASSETS_DIR + 'img'; diff --git a/src/registrar/assets/modules-admin/copy-to-clipboard.js b/src/registrar/assets/src/js/getgov-admin/copy-to-clipboard.js similarity index 100% rename from src/registrar/assets/modules-admin/copy-to-clipboard.js rename to src/registrar/assets/src/js/getgov-admin/copy-to-clipboard.js diff --git a/src/registrar/assets/modules-admin/domain-form.js b/src/registrar/assets/src/js/getgov-admin/domain-form.js similarity index 100% rename from src/registrar/assets/modules-admin/domain-form.js rename to src/registrar/assets/src/js/getgov-admin/domain-form.js diff --git a/src/registrar/assets/modules-admin/domain-information-form.js b/src/registrar/assets/src/js/getgov-admin/domain-information-form.js similarity index 100% rename from src/registrar/assets/modules-admin/domain-information-form.js rename to src/registrar/assets/src/js/getgov-admin/domain-information-form.js diff --git a/src/registrar/assets/modules-admin/domain-request-form.js b/src/registrar/assets/src/js/getgov-admin/domain-request-form.js similarity index 100% rename from src/registrar/assets/modules-admin/domain-request-form.js rename to src/registrar/assets/src/js/getgov-admin/domain-request-form.js diff --git a/src/registrar/assets/modules-admin/filter-horizontal.js b/src/registrar/assets/src/js/getgov-admin/filter-horizontal.js similarity index 100% rename from src/registrar/assets/modules-admin/filter-horizontal.js rename to src/registrar/assets/src/js/getgov-admin/filter-horizontal.js diff --git a/src/registrar/assets/modules-admin/helpers-admin.js b/src/registrar/assets/src/js/getgov-admin/helpers-admin.js similarity index 100% rename from src/registrar/assets/modules-admin/helpers-admin.js rename to src/registrar/assets/src/js/getgov-admin/helpers-admin.js diff --git a/src/registrar/assets/modules-admin/helpers-portfolio-dynamic-fields.js b/src/registrar/assets/src/js/getgov-admin/helpers-portfolio-dynamic-fields.js similarity index 100% rename from src/registrar/assets/modules-admin/helpers-portfolio-dynamic-fields.js rename to src/registrar/assets/src/js/getgov-admin/helpers-portfolio-dynamic-fields.js diff --git a/src/registrar/assets/modules-admin/main.js b/src/registrar/assets/src/js/getgov-admin/main.js similarity index 100% rename from src/registrar/assets/modules-admin/main.js rename to src/registrar/assets/src/js/getgov-admin/main.js diff --git a/src/registrar/assets/modules-admin/modals.js b/src/registrar/assets/src/js/getgov-admin/modals.js similarity index 100% rename from src/registrar/assets/modules-admin/modals.js rename to src/registrar/assets/src/js/getgov-admin/modals.js diff --git a/src/registrar/assets/modules-admin/portfolio-form.js b/src/registrar/assets/src/js/getgov-admin/portfolio-form.js similarity index 100% rename from src/registrar/assets/modules-admin/portfolio-form.js rename to src/registrar/assets/src/js/getgov-admin/portfolio-form.js diff --git a/src/registrar/assets/modules-admin/show-more-description.js b/src/registrar/assets/src/js/getgov-admin/show-more-description.js similarity index 100% rename from src/registrar/assets/modules-admin/show-more-description.js rename to src/registrar/assets/src/js/getgov-admin/show-more-description.js diff --git a/src/registrar/assets/modules-admin/submit-bar.js b/src/registrar/assets/src/js/getgov-admin/submit-bar.js similarity index 100% rename from src/registrar/assets/modules-admin/submit-bar.js rename to src/registrar/assets/src/js/getgov-admin/submit-bar.js diff --git a/src/registrar/assets/modules/combobox.js b/src/registrar/assets/src/js/getgov/combobox.js similarity index 100% rename from src/registrar/assets/modules/combobox.js rename to src/registrar/assets/src/js/getgov/combobox.js diff --git a/src/registrar/assets/modules/domain-validators.js b/src/registrar/assets/src/js/getgov/domain-validators.js similarity index 100% rename from src/registrar/assets/modules/domain-validators.js rename to src/registrar/assets/src/js/getgov/domain-validators.js diff --git a/src/registrar/assets/modules/formset-forms.js b/src/registrar/assets/src/js/getgov/formset-forms.js similarity index 100% rename from src/registrar/assets/modules/formset-forms.js rename to src/registrar/assets/src/js/getgov/formset-forms.js diff --git a/src/registrar/assets/modules/helpers-csrf-token.js b/src/registrar/assets/src/js/getgov/helpers-csrf-token.js similarity index 100% rename from src/registrar/assets/modules/helpers-csrf-token.js rename to src/registrar/assets/src/js/getgov/helpers-csrf-token.js diff --git a/src/registrar/assets/modules/helpers-uswds.js b/src/registrar/assets/src/js/getgov/helpers-uswds.js similarity index 76% rename from src/registrar/assets/modules/helpers-uswds.js rename to src/registrar/assets/src/js/getgov/helpers-uswds.js index bb861ab9c..129d578b6 100644 --- a/src/registrar/assets/modules/helpers-uswds.js +++ b/src/registrar/assets/src/js/getgov/helpers-uswds.js @@ -1,7 +1,7 @@ /** * Initialize USWDS tooltips by calling initialization method. Requires that uswds-edited.js - * be loaded before get-gov.js. uswds-edited.js adds the tooltip module to the window to be - * accessible directly in get-gov.js + * be loaded before getgov.min.js. uswds-edited.js adds the tooltip module to the window to be + * accessible directly in getgov.min.js * */ export function initializeTooltips() { @@ -19,8 +19,8 @@ export function initializeTooltips() { /** * Initialize USWDS modals by calling on method. Requires that uswds-edited.js be loaded - * before get-gov.js. uswds-edited.js adds the modal module to the window to be accessible - * directly in get-gov.js. + * before getgov.min.js. uswds-edited.js adds the modal module to the window to be accessible + * directly in getgov.min.js. * uswdsInitializeModals adds modal-related DOM elements, based on other DOM elements existing in * the page. It needs to be called only once for any particular DOM element; otherwise, it * will initialize improperly. Therefore, if DOM elements change dynamically and include @@ -33,8 +33,8 @@ export function uswdsInitializeModals() { /** * Unload existing USWDS modals by calling off method. Requires that uswds-edited.js be - * loaded before get-gov.js. uswds-edited.js adds the modal module to the window to be - * accessible directly in get-gov.js. + * loaded before getgov.min.js. uswds-edited.js adds the modal module to the window to be + * accessible directly in getgov.min.js. * See note above with regards to calling this method relative to uswdsInitializeModals. * */ diff --git a/src/registrar/assets/modules/helpers.js b/src/registrar/assets/src/js/getgov/helpers.js similarity index 100% rename from src/registrar/assets/modules/helpers.js rename to src/registrar/assets/src/js/getgov/helpers.js diff --git a/src/registrar/assets/modules/main.js b/src/registrar/assets/src/js/getgov/main.js similarity index 100% rename from src/registrar/assets/modules/main.js rename to src/registrar/assets/src/js/getgov/main.js diff --git a/src/registrar/assets/modules/portfolio-member-page.js b/src/registrar/assets/src/js/getgov/portfolio-member-page.js similarity index 100% rename from src/registrar/assets/modules/portfolio-member-page.js rename to src/registrar/assets/src/js/getgov/portfolio-member-page.js diff --git a/src/registrar/assets/modules/radios.js b/src/registrar/assets/src/js/getgov/radios.js similarity index 100% rename from src/registrar/assets/modules/radios.js rename to src/registrar/assets/src/js/getgov/radios.js diff --git a/src/registrar/assets/modules/requesting-entity.js b/src/registrar/assets/src/js/getgov/requesting-entity.js similarity index 100% rename from src/registrar/assets/modules/requesting-entity.js rename to src/registrar/assets/src/js/getgov/requesting-entity.js diff --git a/src/registrar/assets/modules/table-base.js b/src/registrar/assets/src/js/getgov/table-base.js similarity index 100% rename from src/registrar/assets/modules/table-base.js rename to src/registrar/assets/src/js/getgov/table-base.js diff --git a/src/registrar/assets/modules/table-domain-requests.js b/src/registrar/assets/src/js/getgov/table-domain-requests.js similarity index 100% rename from src/registrar/assets/modules/table-domain-requests.js rename to src/registrar/assets/src/js/getgov/table-domain-requests.js diff --git a/src/registrar/assets/modules/table-domains.js b/src/registrar/assets/src/js/getgov/table-domains.js similarity index 100% rename from src/registrar/assets/modules/table-domains.js rename to src/registrar/assets/src/js/getgov/table-domains.js diff --git a/src/registrar/assets/modules/table-member-domains.js b/src/registrar/assets/src/js/getgov/table-member-domains.js similarity index 100% rename from src/registrar/assets/modules/table-member-domains.js rename to src/registrar/assets/src/js/getgov/table-member-domains.js diff --git a/src/registrar/assets/modules/table-members.js b/src/registrar/assets/src/js/getgov/table-members.js similarity index 100% rename from src/registrar/assets/modules/table-members.js rename to src/registrar/assets/src/js/getgov/table-members.js diff --git a/src/registrar/assets/modules/urbanization.js b/src/registrar/assets/src/js/getgov/urbanization.js similarity index 100% rename from src/registrar/assets/modules/urbanization.js rename to src/registrar/assets/src/js/getgov/urbanization.js diff --git a/src/registrar/assets/modules/user-profile.js b/src/registrar/assets/src/js/getgov/user-profile.js similarity index 100% rename from src/registrar/assets/modules/user-profile.js rename to src/registrar/assets/src/js/getgov/user-profile.js diff --git a/src/registrar/assets/sass/_theme/_accordions.scss b/src/registrar/assets/src/sass/_theme/_accordions.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_accordions.scss rename to src/registrar/assets/src/sass/_theme/_accordions.scss diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/src/sass/_theme/_admin.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_admin.scss rename to src/registrar/assets/src/sass/_theme/_admin.scss diff --git a/src/registrar/assets/sass/_theme/_alerts.scss b/src/registrar/assets/src/sass/_theme/_alerts.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_alerts.scss rename to src/registrar/assets/src/sass/_theme/_alerts.scss diff --git a/src/registrar/assets/sass/_theme/_base.scss b/src/registrar/assets/src/sass/_theme/_base.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_base.scss rename to src/registrar/assets/src/sass/_theme/_base.scss diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/src/sass/_theme/_buttons.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_buttons.scss rename to src/registrar/assets/src/sass/_theme/_buttons.scss diff --git a/src/registrar/assets/sass/_theme/_cisa_colors.scss b/src/registrar/assets/src/sass/_theme/_cisa_colors.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_cisa_colors.scss rename to src/registrar/assets/src/sass/_theme/_cisa_colors.scss diff --git a/src/registrar/assets/sass/_theme/_containers.scss b/src/registrar/assets/src/sass/_theme/_containers.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_containers.scss rename to src/registrar/assets/src/sass/_theme/_containers.scss diff --git a/src/registrar/assets/sass/_theme/_fieldsets.scss b/src/registrar/assets/src/sass/_theme/_fieldsets.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_fieldsets.scss rename to src/registrar/assets/src/sass/_theme/_fieldsets.scss diff --git a/src/registrar/assets/sass/_theme/_forms.scss b/src/registrar/assets/src/sass/_theme/_forms.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_forms.scss rename to src/registrar/assets/src/sass/_theme/_forms.scss diff --git a/src/registrar/assets/sass/_theme/_header.scss b/src/registrar/assets/src/sass/_theme/_header.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_header.scss rename to src/registrar/assets/src/sass/_theme/_header.scss diff --git a/src/registrar/assets/sass/_theme/_identifier.scss b/src/registrar/assets/src/sass/_theme/_identifier.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_identifier.scss rename to src/registrar/assets/src/sass/_theme/_identifier.scss diff --git a/src/registrar/assets/sass/_theme/_lists.scss b/src/registrar/assets/src/sass/_theme/_lists.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_lists.scss rename to src/registrar/assets/src/sass/_theme/_lists.scss diff --git a/src/registrar/assets/sass/_theme/_pagination.scss b/src/registrar/assets/src/sass/_theme/_pagination.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_pagination.scss rename to src/registrar/assets/src/sass/_theme/_pagination.scss diff --git a/src/registrar/assets/sass/_theme/_register-form.scss b/src/registrar/assets/src/sass/_theme/_register-form.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_register-form.scss rename to src/registrar/assets/src/sass/_theme/_register-form.scss diff --git a/src/registrar/assets/sass/_theme/_search.scss b/src/registrar/assets/src/sass/_theme/_search.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_search.scss rename to src/registrar/assets/src/sass/_theme/_search.scss diff --git a/src/registrar/assets/sass/_theme/_sidenav.scss b/src/registrar/assets/src/sass/_theme/_sidenav.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_sidenav.scss rename to src/registrar/assets/src/sass/_theme/_sidenav.scss diff --git a/src/registrar/assets/sass/_theme/_tables.scss b/src/registrar/assets/src/sass/_theme/_tables.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_tables.scss rename to src/registrar/assets/src/sass/_theme/_tables.scss diff --git a/src/registrar/assets/sass/_theme/_tooltips.scss b/src/registrar/assets/src/sass/_theme/_tooltips.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_tooltips.scss rename to src/registrar/assets/src/sass/_theme/_tooltips.scss diff --git a/src/registrar/assets/sass/_theme/_typography.scss b/src/registrar/assets/src/sass/_theme/_typography.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_typography.scss rename to src/registrar/assets/src/sass/_theme/_typography.scss diff --git a/src/registrar/assets/sass/_theme/_uswds-theme.scss b/src/registrar/assets/src/sass/_theme/_uswds-theme.scss similarity index 100% rename from src/registrar/assets/sass/_theme/_uswds-theme.scss rename to src/registrar/assets/src/sass/_theme/_uswds-theme.scss diff --git a/src/registrar/assets/sass/_theme/styles.scss b/src/registrar/assets/src/sass/_theme/styles.scss similarity index 100% rename from src/registrar/assets/sass/_theme/styles.scss rename to src/registrar/assets/src/sass/_theme/styles.scss diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py index bfbc22124..ce2f27b75 100644 --- a/src/registrar/forms/domain_request_wizard.py +++ b/src/registrar/forms/domain_request_wizard.py @@ -35,7 +35,7 @@ class RequestingEntityForm(RegistrarForm): # If this selection is made on the form (tracked by js), then it will toggle the form value of this. # In other words, this essentially tracks if the suborganization field == "Other". # "Other" is just an imaginary value that is otherwise invalid. - # Note the logic in `def clean` and `handleRequestingEntityFieldset` in get-gov.js + # Note the logic in `def clean` and `handleRequestingEntityFieldset` in getgov.min.js is_requesting_new_suborganization = forms.BooleanField(required=False, widget=forms.HiddenInput()) sub_organization = forms.ModelChoiceField( diff --git a/src/registrar/templates/admin/base_site.html b/src/registrar/templates/admin/base_site.html index 5ca5edffc..b80917bb2 100644 --- a/src/registrar/templates/admin/base_site.html +++ b/src/registrar/templates/admin/base_site.html @@ -21,7 +21,7 @@ - + {% endblock %} diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html index b123a0eac..bda043590 100644 --- a/src/registrar/templates/base.html +++ b/src/registrar/templates/base.html @@ -47,7 +47,7 @@ - + {% endblock %} {% block canonical %} diff --git a/src/registrar/templates/domain_request_dotgov_domain.html b/src/registrar/templates/domain_request_dotgov_domain.html index 18e04f305..6c62c6497 100644 --- a/src/registrar/templates/domain_request_dotgov_domain.html +++ b/src/registrar/templates/domain_request_dotgov_domain.html @@ -49,7 +49,7 @@

After you enter your domain, we’ll make sure it’s available and that it meets some of our naming requirements. If your domain passes these initial checks, we’ll verify that it meets all our requirements after you complete the rest of this form.

{% with attr_aria_describedby="domain_instructions domain_instructions2" %} - {# attr_validate / validate="domain" invokes code in get-gov.js #} + {# attr_validate / validate="domain" invokes code in getgov.min.js #} {% with append_gov=True attr_validate="domain" add_label_class="usa-sr-only" %} {% input_with_errors forms.0.requested_domain %} {% endwith %} diff --git a/src/registrar/templates/domain_request_org_contact.html b/src/registrar/templates/domain_request_org_contact.html index 44b404bbf..d39fb9f78 100644 --- a/src/registrar/templates/domain_request_org_contact.html +++ b/src/registrar/templates/domain_request_org_contact.html @@ -44,5 +44,5 @@ {% endblock %} - + diff --git a/src/zap.conf b/src/zap.conf index 1f0548f2d..7b878fb90 100644 --- a/src/zap.conf +++ b/src/zap.conf @@ -29,8 +29,8 @@ 10027 OUTOFSCOPE http://app:8080/public/js/uswds.min.js # UNCLEAR WHY THIS ONE IS FAILING. Giving 404 error. 10027 OUTOFSCOPE http://app:8080/public/js/uswds-init.min.js -# get-gov.js contains suspicious word "from" as in `Array.from()` -10027 OUTOFSCOPE http://app:8080/public/js/get-gov.js +# getgov.min.js contains suspicious word "from" as in `Array.from()` +10027 OUTOFSCOPE http://app:8080/public/js/getgov.min.js # Ignores suspicious word "TODO" 10027 OUTOFSCOPE http://app:8080.*$ 10028 FAIL (Open Redirect - Passive/beta)