diff --git a/.prettierignore b/.prettierignore index 1d0a8ea7f7..56de23a9dd 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,15 @@ .venv/ .yarn/ flow-typed/npm/ +static/js/flow/ +static/js/components/forms/elements/FormError.js +static/js/lib/queries/catalog.js +static/js/containers/pages/profile/ViewProfilePage.js +static/js/lib/courses.js +static/js/store/configureStore.js +static/js/util/integration_test_helper.js +static/js/lib/queries/digitalCredentials.js +static/js/Router.js +static/js/components/forms/ProfileFormFields.js +voucher/templates/enroll.html +mail/templates/product_order_receipt/body.html diff --git a/cms/templates/partials/hero.html b/cms/templates/partials/hero.html index 248a9f0b9d..70d954729b 100644 --- a/cms/templates/partials/hero.html +++ b/cms/templates/partials/hero.html @@ -1,7 +1,7 @@ {% load wagtailembeds_tags image_version_url %} {% block extrahead %} - + {% endblock %}
{% if background_video_url %} - {% if not request.user_agent.is_mobile %} - - {% endif %} + {% if not request.user_agent.is_mobile %} + + {% endif %} {% endif %}
@@ -46,15 +52,19 @@

{{ page.subhead }}

{% if page.video_url %} - {% embed page.video_url as youtube_video %} - {% if youtube_video %} -
{{ youtube_video }}
- {% else %} - - {% endif %} -
{{ page.video_title|safe }}
- {% endif %} -
+ {% embed page.video_url as youtube_video %} + {% if youtube_video %} +
{{ youtube_video }}
+ {% else %} + + {% endif %} +
{{ page.video_title|safe }}
+ {% endif %}
diff --git a/hubspot_xpro/api.py b/hubspot_xpro/api.py index 8dee2712fc..a0190fa8dc 100644 --- a/hubspot_xpro/api.py +++ b/hubspot_xpro/api.py @@ -6,7 +6,6 @@ from django.contrib.contenttypes.models import ContentType from django.db.models import Q -from hubspot.crm.objects import SimplePublicObject, SimplePublicObjectInput from mitol.hubspot_api.api import ( HubspotApi, HubspotAssociationType, @@ -27,6 +26,7 @@ from b2b_ecommerce.constants import B2B_ORDER_PREFIX from b2b_ecommerce.models import B2BLine, B2BOrder from ecommerce.models import Line, Order, Product, ProductVersion +from hubspot.crm.objects import SimplePublicObject, SimplePublicObjectInput from users.models import User log = logging.getLogger(__name__) diff --git a/hubspot_xpro/conftest.py b/hubspot_xpro/conftest.py index 93d0fe0479..4ed6da99a8 100644 --- a/hubspot_xpro/conftest.py +++ b/hubspot_xpro/conftest.py @@ -7,12 +7,12 @@ import pytest from django.contrib.contenttypes.models import ContentType -from hubspot.crm.objects import SimplePublicObject from mitol.hubspot_api.factories import HubspotObjectFactory from b2b_ecommerce import factories as b2b_factories from ecommerce import factories from ecommerce.models import Order, Product +from hubspot.crm.objects import SimplePublicObject from users.models import User TIMESTAMPS = [ diff --git a/hubspot_xpro/tasks.py b/hubspot_xpro/tasks.py index 5621131960..c3742f500f 100644 --- a/hubspot_xpro/tasks.py +++ b/hubspot_xpro/tasks.py @@ -9,8 +9,6 @@ import celery from django.conf import settings from django.contrib.contenttypes.models import ContentType -from hubspot.crm.associations import BatchInputPublicAssociation, PublicAssociation -from hubspot.crm.objects import ApiException, BatchInputSimplePublicObjectInput from mitol.common.decorators import single_task from mitol.common.utils import chunks from mitol.hubspot_api.api import HubspotApi, HubspotAssociationType, HubspotObjectType @@ -20,6 +18,8 @@ from b2b_ecommerce.models import B2BOrder from ecommerce.models import Order +from hubspot.crm.associations import BatchInputPublicAssociation, PublicAssociation +from hubspot.crm.objects import ApiException, BatchInputSimplePublicObjectInput from hubspot_xpro import api from hubspot_xpro.api import get_hubspot_id_for_object from mitxpro.celery import app diff --git a/hubspot_xpro/tasks_test.py b/hubspot_xpro/tasks_test.py index 24783b19a9..dc19630d01 100644 --- a/hubspot_xpro/tasks_test.py +++ b/hubspot_xpro/tasks_test.py @@ -8,8 +8,6 @@ import pytest from django.contrib.contenttypes.models import ContentType from faker import Faker -from hubspot.crm.associations import BatchInputPublicAssociation, PublicAssociation -from hubspot.crm.objects import ApiException, BatchInputSimplePublicObjectInput from mitol.hubspot_api.api import HubspotAssociationType, HubspotObjectType from mitol.hubspot_api.exceptions import TooManyRequestsException from mitol.hubspot_api.factories import HubspotObjectFactory, SimplePublicObjectFactory @@ -24,6 +22,8 @@ ProductVersionFactory, ) from ecommerce.models import Order, Product +from hubspot.crm.associations import BatchInputPublicAssociation, PublicAssociation +from hubspot.crm.objects import ApiException, BatchInputSimplePublicObjectInput from hubspot_xpro import tasks from hubspot_xpro.api import make_contact_sync_message from hubspot_xpro.tasks import task_obj_lock diff --git a/package.json b/package.json index b0cdcd0446..e77ece6d2b 100644 --- a/package.json +++ b/package.json @@ -136,8 +136,8 @@ "watch": "WATCH=1 ./scripts/test/js_test.sh", "repl": "node --require ./scripts/repl.js", "flow": "flow check", - "fmt": "LOG_LEVEL= prettier --write --no-semi --ignore 'static/js/flow/**/*.js' --ignore $PWD/'static/js/**/*.js'", - "fmt:check": "LOG_LEVEL= prettier --check --no-semi --ignore 'static/js/flow/**/*.js' --ignore $PWD/'static/js/**/*.js'" + "fmt": "LOG_LEVEL= prettier --config .prettierrc.json --write .", + "fmt:check": "LOG_LEVEL= prettier --config .prettierrc.json --check ." }, "resolutions": { "mixin-deep": "^1.3.2", diff --git a/static/scss/detail/for-teams.scss b/static/scss/detail/for-teams.scss index 6eaf97690d..78b529fb39 100644 --- a/static/scss/detail/for-teams.scss +++ b/static/scss/detail/for-teams.scss @@ -78,7 +78,7 @@ line-height: 28px; padding: 20px 0; font-weight: 500; - border-top: 1px solid rgb(white 0.2); + border-top: 1px solid rgba(white, 0.2); /* stylelint-disable-line */ &:first-child { border: none; diff --git a/static/scss/detail/who-should-enroll.scss b/static/scss/detail/who-should-enroll.scss index af4a5e53ff..d220521670 100644 --- a/static/scss/detail/who-should-enroll.scss +++ b/static/scss/detail/who-should-enroll.scss @@ -88,7 +88,7 @@ line-height: 28px; padding: 20px 0; font-weight: 500; - border-top: 1px solid rgb(white 0.2); + border-top: 1px solid rgba(white, 0.2); /* stylelint-disable-line */ text-align: left; &:first-child {