diff --git a/.husky/pre-push b/.husky/pre-push index 5681751c27..d9b2545b59 100755 --- a/.husky/pre-push +++ b/.husky/pre-push @@ -1,2 +1,10 @@ #!/bin/sh -# yarn test +[ -n "$CI" ] && exit 0 + +echo "Running build and tests..." +yarn test && yarn build + +if [ $? -ne 0 ]; then + echo "Build or tests failed. Please fix errors before pushing." + exit 1 +fi diff --git a/packages/app-degree-pages/src/components/DetailPage/components/AtAGlance/index.jsx b/packages/app-degree-pages/src/components/DetailPage/components/AtAGlance/index.jsx index e1a77d24d2..e10401cd52 100644 --- a/packages/app-degree-pages/src/components/DetailPage/components/AtAGlance/index.jsx +++ b/packages/app-degree-pages/src/components/DetailPage/components/AtAGlance/index.jsx @@ -46,9 +46,7 @@ export const AtAGlance = ({ {timeCommitment && ( )} - {stemOptText && ( - - )} + {stemOptText && } ); diff --git a/packages/app-degree-pages/src/components/DetailPage/index.jsx b/packages/app-degree-pages/src/components/DetailPage/index.jsx index 882a1e2bac..051242d207 100644 --- a/packages/app-degree-pages/src/components/DetailPage/index.jsx +++ b/packages/app-degree-pages/src/components/DetailPage/index.jsx @@ -231,10 +231,7 @@ const DetailPage = ({ mathIntensity={ atAGlance?.mathIntensity || resolver.getMathIntensity() } - stemOptText={ - resolver.hasStemOptText() - } - + stemOptText={resolver.hasStemOptText()} /> )} {!introContent?.hideRequiredCourses && diff --git a/packages/app-degree-pages/src/core/constants/component-constants.js b/packages/app-degree-pages/src/core/constants/component-constants.js index e6ba7572a2..abd8575770 100644 --- a/packages/app-degree-pages/src/core/constants/component-constants.js +++ b/packages/app-degree-pages/src/core/constants/component-constants.js @@ -22,7 +22,7 @@ const glanceItemsMap = { }, mathIntensity: { icon: "calculator", title: "Math intensity" }, timeCommitment: { icon: "calendar-alt", title: "Time commitment" }, - stemOptText: {icon: "star", title: "STEM-OPT extension eligible"} + stemOptText: { icon: "star", title: "STEM-OPT extension eligible" }, }; const GRID_VIEW_ID = "grid-view"; diff --git a/packages/app-rfi/src/components/steps/questions/Campus.js b/packages/app-rfi/src/components/steps/questions/Campus.js index 2740cd3422..94b655ce99 100644 --- a/packages/app-rfi/src/components/steps/questions/Campus.js +++ b/packages/app-rfi/src/components/steps/questions/Campus.js @@ -9,7 +9,7 @@ import { RfiSelect } from "../../controls"; * @param {{ gaData: import("../../../../../../shared/services/googleAnalytics").GAEventObject}} props */ // eslint-disable-next-line react/prop-types -export const Campus = ({ gaData, autoFocus}) => { +export const Campus = ({ gaData, autoFocus }) => { const label = "Which applies to you?"; const name = "Campus"; diff --git a/packages/app-rfi/src/components/steps/questions/Country.js b/packages/app-rfi/src/components/steps/questions/Country.js index 640176ad5d..1c2056b362 100644 --- a/packages/app-rfi/src/components/steps/questions/Country.js +++ b/packages/app-rfi/src/components/steps/questions/Country.js @@ -1,10 +1,10 @@ import React, { useEffect, useState } from "react"; import { gaEventPropTypes, trackGAEvent } from "../../../../../../shared"; +import { PII_VALUE } from "../../../core/utils/constants"; import { fetchCountries } from "../../../core/utils/fetchCountries"; import { useRfiContext } from "../../../core/utils/rfiContext"; import { RfiSelect } from "../../controls"; -import { PII_VALUE } from "../../../core/utils/constants"; // Options function getCountryOptions(resultsArrayOfObjects) { diff --git a/packages/app-rfi/src/components/steps/questions/EmailAddress.js b/packages/app-rfi/src/components/steps/questions/EmailAddress.js index 1975f92933..2a5b93aa58 100644 --- a/packages/app-rfi/src/components/steps/questions/EmailAddress.js +++ b/packages/app-rfi/src/components/steps/questions/EmailAddress.js @@ -1,8 +1,8 @@ import React from "react"; import { gaEventPropTypes, trackGAEvent } from "../../../../../../shared"; -import { RfiEmailInput } from "../../controls"; import { PII_VALUE } from "../../../core/utils/constants"; +import { RfiEmailInput } from "../../controls"; /** * @param {{ gaData: import("../../../../../../shared/services/googleAnalytics").GAEventObject}} props diff --git a/packages/app-rfi/src/components/steps/questions/FirstName.js b/packages/app-rfi/src/components/steps/questions/FirstName.js index cb5c7e7d0f..1439b3bbfe 100644 --- a/packages/app-rfi/src/components/steps/questions/FirstName.js +++ b/packages/app-rfi/src/components/steps/questions/FirstName.js @@ -1,8 +1,8 @@ import React from "react"; import { gaEventPropTypes, trackGAEvent } from "../../../../../../shared"; -import { RfiTextInput } from "../../controls"; import { PII_VALUE } from "../../../core/utils/constants"; +import { RfiTextInput } from "../../controls"; /** * @param {{ gaData: import("../../../../../../shared/services/googleAnalytics").GAEventObject}} props diff --git a/packages/app-rfi/src/components/steps/questions/LastName.js b/packages/app-rfi/src/components/steps/questions/LastName.js index b40c0ec931..d1a460328d 100644 --- a/packages/app-rfi/src/components/steps/questions/LastName.js +++ b/packages/app-rfi/src/components/steps/questions/LastName.js @@ -1,8 +1,8 @@ import React from "react"; import { gaEventPropTypes, trackGAEvent } from "../../../../../../shared"; -import { RfiTextInput } from "../../controls"; import { PII_VALUE } from "../../../core/utils/constants"; +import { RfiTextInput } from "../../controls"; /** * @param {{ gaData: import("../../../../../../shared/services/googleAnalytics").GAEventObject}} props diff --git a/packages/app-rfi/src/components/steps/questions/Phone.js b/packages/app-rfi/src/components/steps/questions/Phone.js index a9ca95f51f..83586491c7 100644 --- a/packages/app-rfi/src/components/steps/questions/Phone.js +++ b/packages/app-rfi/src/components/steps/questions/Phone.js @@ -1,8 +1,8 @@ import React from "react"; import { gaEventPropTypes, trackGAEvent } from "../../../../../../shared"; -import { RfiPhone } from "../../controls"; import { PII_VALUE } from "../../../core/utils/constants"; +import { RfiPhone } from "../../controls"; /** * @param {{ gaData: import("../../../../../../shared/services/googleAnalytics").GAEventObject}} props diff --git a/packages/app-webdir-ui/src/ProfileCard/index.js b/packages/app-webdir-ui/src/ProfileCard/index.js index 5431bbedc8..f89cebd88b 100644 --- a/packages/app-webdir-ui/src/ProfileCard/index.js +++ b/packages/app-webdir-ui/src/ProfileCard/index.js @@ -96,7 +96,7 @@ const ProfileCard = ({ ...props }) => {