From 934454046f18baf170baf9be745e27fb1b4d8ad2 Mon Sep 17 00:00:00 2001 From: Joshua Kiwiet-Pantaleoni Date: Mon, 18 Nov 2024 21:57:14 -0800 Subject: [PATCH 01/14] chore(deps): upgrade kv-components, kv-shop, and kv-tokens to latest --- package-lock.json | 64 +++++++++++++++++++++++------------------------ package.json | 6 ++--- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index c400937624..bd595b232f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,9 +16,9 @@ "@godaddy/terminus": "^4.11.0", "@graphql-tools/load": "^7.7.0", "@graphql-tools/url-loader": "^7.17.18", - "@kiva/kv-components": "^3.105.3", - "@kiva/kv-shop": "^1.12.51", - "@kiva/kv-tokens": "^2.11.1", + "@kiva/kv-components": "^3.109.0", + "@kiva/kv-shop": "^1.12.64", + "@kiva/kv-tokens": "^2.15.0", "@mdi/js": "^7", "@opentelemetry/api": "^1.7.0", "@opentelemetry/auto-instrumentations-node": "^0.40.2", @@ -5448,11 +5448,11 @@ "integrity": "sha512-1lNM7toQpiHWWdKrBmoXPudNLgFscU8rnk4nyBQQhbnlhSLzbjbsCcWWnA+IqXkgOCVysSpI7yEi7fuU6uLMYg==" }, "node_modules/@kiva/kv-components": { - "version": "3.105.3", - "resolved": "https://registry.npmjs.org/@kiva/kv-components/-/kv-components-3.105.3.tgz", - "integrity": "sha512-Ng/Dc/lVNNrAPzXDdZBwLYJNvzCL3oOutfcGvskc1kRkZxLvEiGY4muBZID2Mz5WsGWgBCz8rAijJ6q/2I8wbg==", + "version": "3.109.0", + "resolved": "https://registry.npmjs.org/@kiva/kv-components/-/kv-components-3.109.0.tgz", + "integrity": "sha512-R5+spaiT8N2VjNhXmWjvq6FEBKe/8QJ+GtD0Rs3Dlo5OYH87Q4tp7k6B2UUo8SVyPcFJ19MkI8SR3ooWGp/wpA==", "dependencies": { - "@kiva/kv-tokens": "^2.13.0", + "@kiva/kv-tokens": "^2.15.0", "@mdi/js": "^5.9.55", "@vueuse/integrations": "^7.6.0", "aria-hidden": "^1.1.3", @@ -5508,13 +5508,13 @@ } }, "node_modules/@kiva/kv-shop": { - "version": "1.12.51", - "resolved": "https://registry.npmjs.org/@kiva/kv-shop/-/kv-shop-1.12.51.tgz", - "integrity": "sha512-lBTFzpzLbSdjNKTqxT8Ap9+X1tIPV6Hgt7QDGfMT6UHROUZO9ljjYqzVCq3jywhrUOnC5MXLrK49aXkLJE+1hA==", + "version": "1.12.64", + "resolved": "https://registry.npmjs.org/@kiva/kv-shop/-/kv-shop-1.12.64.tgz", + "integrity": "sha512-C0cchb7CIMzLv7QNFTeDK6URO/1qPz8fvXCQDbxiilQ1E24dWuxKsnAqSgSRSV7eIufkCwe9uzIPI9gQ1dZe+w==", "dependencies": { "@apollo/client": "^3.7.14", "@kiva/kv-analytics": "^1.3.0", - "@kiva/kv-components": "^3.102.5", + "@kiva/kv-components": "^3.109.0", "@types/braintree-web-drop-in": "^1.34.2", "braintree-web-drop-in": "^1.37.0", "numeral": "^2.0.6", @@ -5556,9 +5556,9 @@ } }, "node_modules/@kiva/kv-tokens": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/@kiva/kv-tokens/-/kv-tokens-2.13.0.tgz", - "integrity": "sha512-RiWzQQGaRFDc3aRZDqNgHeKfy5UaUsrvfDORwwhCJaYwznkKOjFX8UEqJlIK6o8u8xEZ7tK2tZOf82QpwPUoig==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/@kiva/kv-tokens/-/kv-tokens-2.15.0.tgz", + "integrity": "sha512-V+XSN/V/Qs1HPcRtXmyKVywGWf999pe+FvsZfZ1bSn/F9flav9bmC/WbiH+Bj2k6hOW7g8PotwziXt/8tcmLqA==", "dependencies": { "@tailwindcss/typography": "^0.5.1", "tailwindcss": "^3.4.3" @@ -12516,9 +12516,9 @@ } }, "node_modules/@tailwindcss/typography": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.9.tgz", - "integrity": "sha512-t8Sg3DyynFysV9f4JDOVISGsjazNb48AeIYQwcL+Bsq5uf4RYL75C1giZ43KISjeDGBaTN3Kxh7Xj/vRSMJUUg==", + "version": "0.5.15", + "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.15.tgz", + "integrity": "sha512-AqhlCXl+8grUz8uqExv5OTtgpjuVIwFTSXTrh8y9/pw6q2ek7fJ+Y8ZEVw7EB2DCcuCOtEjf9w3+J3rzts01uA==", "dependencies": { "lodash.castarray": "^4.4.0", "lodash.isplainobject": "^4.0.6", @@ -12526,7 +12526,7 @@ "postcss-selector-parser": "6.0.10" }, "peerDependencies": { - "tailwindcss": ">=3.0.0 || insiders" + "tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20" } }, "node_modules/@testing-library/cypress": { @@ -41219,11 +41219,11 @@ "integrity": "sha512-1lNM7toQpiHWWdKrBmoXPudNLgFscU8rnk4nyBQQhbnlhSLzbjbsCcWWnA+IqXkgOCVysSpI7yEi7fuU6uLMYg==" }, "@kiva/kv-components": { - "version": "3.105.3", - "resolved": "https://registry.npmjs.org/@kiva/kv-components/-/kv-components-3.105.3.tgz", - "integrity": "sha512-Ng/Dc/lVNNrAPzXDdZBwLYJNvzCL3oOutfcGvskc1kRkZxLvEiGY4muBZID2Mz5WsGWgBCz8rAijJ6q/2I8wbg==", + "version": "3.109.0", + "resolved": "https://registry.npmjs.org/@kiva/kv-components/-/kv-components-3.109.0.tgz", + "integrity": "sha512-R5+spaiT8N2VjNhXmWjvq6FEBKe/8QJ+GtD0Rs3Dlo5OYH87Q4tp7k6B2UUo8SVyPcFJ19MkI8SR3ooWGp/wpA==", "requires": { - "@kiva/kv-tokens": "^2.13.0", + "@kiva/kv-tokens": "^2.15.0", "@mdi/js": "^5.9.55", "@vueuse/integrations": "^7.6.0", "aria-hidden": "^1.1.3", @@ -41253,13 +41253,13 @@ } }, "@kiva/kv-shop": { - "version": "1.12.51", - "resolved": "https://registry.npmjs.org/@kiva/kv-shop/-/kv-shop-1.12.51.tgz", - "integrity": "sha512-lBTFzpzLbSdjNKTqxT8Ap9+X1tIPV6Hgt7QDGfMT6UHROUZO9ljjYqzVCq3jywhrUOnC5MXLrK49aXkLJE+1hA==", + "version": "1.12.64", + "resolved": "https://registry.npmjs.org/@kiva/kv-shop/-/kv-shop-1.12.64.tgz", + "integrity": "sha512-C0cchb7CIMzLv7QNFTeDK6URO/1qPz8fvXCQDbxiilQ1E24dWuxKsnAqSgSRSV7eIufkCwe9uzIPI9gQ1dZe+w==", "requires": { "@apollo/client": "^3.7.14", "@kiva/kv-analytics": "^1.3.0", - "@kiva/kv-components": "^3.102.5", + "@kiva/kv-components": "^3.109.0", "@types/braintree-web-drop-in": "^1.34.2", "braintree-web-drop-in": "^1.37.0", "numeral": "^2.0.6", @@ -41275,9 +41275,9 @@ } }, "@kiva/kv-tokens": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/@kiva/kv-tokens/-/kv-tokens-2.13.0.tgz", - "integrity": "sha512-RiWzQQGaRFDc3aRZDqNgHeKfy5UaUsrvfDORwwhCJaYwznkKOjFX8UEqJlIK6o8u8xEZ7tK2tZOf82QpwPUoig==", + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/@kiva/kv-tokens/-/kv-tokens-2.15.0.tgz", + "integrity": "sha512-V+XSN/V/Qs1HPcRtXmyKVywGWf999pe+FvsZfZ1bSn/F9flav9bmC/WbiH+Bj2k6hOW7g8PotwziXt/8tcmLqA==", "requires": { "@tailwindcss/typography": "^0.5.1", "tailwindcss": "^3.4.3" @@ -46217,9 +46217,9 @@ } }, "@tailwindcss/typography": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.9.tgz", - "integrity": "sha512-t8Sg3DyynFysV9f4JDOVISGsjazNb48AeIYQwcL+Bsq5uf4RYL75C1giZ43KISjeDGBaTN3Kxh7Xj/vRSMJUUg==", + "version": "0.5.15", + "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.15.tgz", + "integrity": "sha512-AqhlCXl+8grUz8uqExv5OTtgpjuVIwFTSXTrh8y9/pw6q2ek7fJ+Y8ZEVw7EB2DCcuCOtEjf9w3+J3rzts01uA==", "requires": { "lodash.castarray": "^4.4.0", "lodash.isplainobject": "^4.0.6", diff --git a/package.json b/package.json index fc7b98bfd7..6d1501a6f0 100644 --- a/package.json +++ b/package.json @@ -43,9 +43,9 @@ "@godaddy/terminus": "^4.11.0", "@graphql-tools/load": "^7.7.0", "@graphql-tools/url-loader": "^7.17.18", - "@kiva/kv-components": "^3.105.3", - "@kiva/kv-shop": "^1.12.51", - "@kiva/kv-tokens": "^2.11.1", + "@kiva/kv-components": "^3.109.0", + "@kiva/kv-shop": "^1.12.64", + "@kiva/kv-tokens": "^2.15.0", "@mdi/js": "^7", "@opentelemetry/api": "^1.7.0", "@opentelemetry/auto-instrumentations-node": "^0.40.2", From eaf7174344e67eddceb86cf037bc21a854048d17 Mon Sep 17 00:00:00 2001 From: Joshua Kiwiet-Pantaleoni Date: Mon, 18 Nov 2024 21:58:15 -0800 Subject: [PATCH 02/14] feat: add ecosystem themes --- .../Contentful/SectionWithBackgroundClassic.vue | 14 ++++++++++++-- src/components/Contentful/StoryCard.vue | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/components/Contentful/SectionWithBackgroundClassic.vue b/src/components/Contentful/SectionWithBackgroundClassic.vue index ad7bf77c5f..f5a3e37240 100644 --- a/src/components/Contentful/SectionWithBackgroundClassic.vue +++ b/src/components/Contentful/SectionWithBackgroundClassic.vue @@ -38,7 +38,12 @@ import { darkGreenTheme, mintTheme, defaultTheme, - darkMintTheme + darkMintTheme, + greenLightTheme, + greenDarkTheme, + marigoldLightTheme, + stoneLightTheme, + stoneDarkTheme, } from '@kiva/kv-tokens/configs/kivaColors.cjs'; import { defineAsyncComponent } from 'vue'; @@ -165,7 +170,12 @@ export default { kivaClassicGreen: darkGreenTheme, kivaClassicDark: darkTheme, imageCard: darkTheme, - kivaDarkMint: darkMintTheme + kivaDarkMint: darkMintTheme, + ecoGreenLight: greenLightTheme, + ecoGreenDark: greenDarkTheme, + ecoMarigoldLight: marigoldLightTheme, + ecoStoneLight: stoneLightTheme, + ecoStoneDark: stoneDarkTheme, }; const theme = themeMapper[this.themeName] ?? defaultTheme; // No styles needed if using the default theme diff --git a/src/components/Contentful/StoryCard.vue b/src/components/Contentful/StoryCard.vue index d986cacfd8..1493361ee9 100644 --- a/src/components/Contentful/StoryCard.vue +++ b/src/components/Contentful/StoryCard.vue @@ -77,7 +77,12 @@ import { darkTheme, darkGreenTheme, mintTheme, - defaultTheme + defaultTheme, + greenLightTheme, + greenDarkTheme, + marigoldLightTheme, + stoneLightTheme, + stoneDarkTheme, } from '@kiva/kv-tokens/configs/kivaColors.cjs'; import KvContentfulImg from '@kiva/kv-components/vue/KvContentfulImg'; import KvThemeProvider from '@kiva/kv-components/vue/KvThemeProvider'; @@ -117,7 +122,12 @@ export default { kivaClassicMint: mintTheme, kivaClassicGreen: darkGreenTheme, kivaClassicDark: darkTheme, - imageCard: darkTheme + imageCard: darkTheme, + ecoGreenLight: greenLightTheme, + ecoGreenDark: greenDarkTheme, + ecoMarigoldLight: marigoldLightTheme, + ecoStoneLight: stoneLightTheme, + ecoStoneDark: stoneDarkTheme, }; return themeMapper[this.content?.theme] ?? defaultTheme; }, From e3c40f723236d85cba689475a66d253266ff7045 Mon Sep 17 00:00:00 2001 From: Joshua Kiwiet-Pantaleoni Date: Mon, 18 Nov 2024 22:08:38 -0800 Subject: [PATCH 03/14] fix: update kv-components location --- .storybook/preview.js | 2 +- .../KivaClassicSingleCategoryCarousel.stories.js | 4 ++-- .storybook/stories/KivaMultiCategoryGrid.stories.js | 2 +- .../stories/KvFrequentlyAskedQuestions.stories.js | 2 +- .storybook/stories/LoanSpotlight.stories.js | 4 ++-- .storybook/stories/MainCategoryTile.stories.js | 4 ++-- .../stories/PortfolioKivaCreditStats.stories.js | 4 ++-- .storybook/stories/SupportedByLenders.stories.js | 2 +- .../AutoDeposit/AutoDepositDropInPaymentWrapper.vue | 2 +- src/components/AutoDeposit/AutoDepositSignUpForm.vue | 10 +++++----- .../BorrowerProfile/BorrowerBusinessDetails.vue | 2 +- .../BorrowerProfile/ChallengeTeamInvite.vue | 4 ++-- .../BorrowerProfile/CommentsAndWhySpecial.vue | 12 ++++++------ src/components/BorrowerProfile/ContentContainer.vue | 4 ++-- src/components/BorrowerProfile/CountryInfo.vue | 4 ++-- src/components/BorrowerProfile/DetailsTabs.vue | 10 +++++----- .../BorrowerProfile/FieldPartnerDetails.vue | 4 ++-- .../BorrowerProfile/FundedBorrowerProfile.vue | 4 ++-- src/components/BorrowerProfile/HeroBackground.vue | 2 +- src/components/BorrowerProfile/JournalUpdates.vue | 4 ++-- src/components/BorrowerProfile/JumpLinks.vue | 2 +- src/components/BorrowerProfile/LendCta.vue | 8 ++++---- src/components/BorrowerProfile/LendersAndTeams.vue | 10 +++++----- src/components/BorrowerProfile/LoanBookmark.vue | 4 ++-- src/components/BorrowerProfile/LoanDescription.vue | 2 +- src/components/BorrowerProfile/LoanProgress.vue | 2 +- src/components/BorrowerProfile/MoreAboutLoan.vue | 2 +- .../BorrowerProfile/PreviousLoanDescription.vue | 4 ++-- src/components/BorrowerProfile/RepaymentSchedule.vue | 4 ++-- src/components/BorrowerProfile/ShareButton.vue | 2 +- src/components/BorrowerProfile/SidebarContainer.vue | 4 ++-- src/components/BorrowerProfile/SummaryCard.vue | 4 ++-- .../BorrowerProfile/SupportedByLenders.vue | 2 +- src/components/BorrowerProfile/TopBannerPfp.vue | 6 +++--- src/components/BorrowerProfile/TrusteeDetails.vue | 2 +- src/components/BorrowerProfile/WhySpecial.vue | 2 +- src/components/Build/BuildPageWrapper.vue | 2 +- src/components/Categories/LoanSpotlight.vue | 4 ++-- src/components/Categories/MonthlyGoodModule.vue | 2 +- src/components/Checkout/AutoDepositCTA.vue | 6 +++--- src/components/Checkout/AutoDepositUpsell.vue | 4 ++-- .../Checkout/CheckoutDropInPaymentWrapper.vue | 6 +++--- src/components/Checkout/CheckoutReceipt.vue | 2 +- src/components/Checkout/DepositIncentiveUpsell.vue | 8 ++++---- src/components/Checkout/DonateRepaymentsToggle.vue | 4 ++-- src/components/Checkout/DonationItem.vue | 8 ++++---- .../Checkout/DonationNudge/DonationNudgeBoxes.vue | 4 ++-- .../Checkout/DonationNudge/DonationNudgeLightbox.vue | 4 ++-- src/components/Checkout/EmptyBasketCarousel.vue | 2 +- .../Checkout/InContext/InContextCheckout.vue | 4 ++-- src/components/Checkout/KivaCardItem.vue | 2 +- src/components/Checkout/KivaCardRedemption.vue | 6 +++--- src/components/Checkout/KivaCreditGuestPayment.vue | 6 +++--- src/components/Checkout/KivaCreditPayment.vue | 2 +- src/components/Checkout/LoanPrice.vue | 2 +- src/components/Checkout/LoanReservation.vue | 2 +- src/components/Checkout/MatchedLoansLightbox.vue | 2 +- src/components/Checkout/MonthlyGoodCTA.vue | 4 ++-- src/components/Checkout/OrderTotals.vue | 2 +- src/components/Checkout/RemoveBasketItem.vue | 2 +- src/components/Checkout/TeamAttribution.vue | 2 +- src/components/Checkout/UpsellModule.vue | 4 ++-- src/components/Checkout/UserUpdatesPreference.vue | 2 +- src/components/Checkout/VerifyRemovePromoCredit.vue | 4 ++-- src/components/Contentful/ButtonWrapper.vue | 2 +- src/components/Contentful/CardRow.vue | 4 ++-- src/components/Contentful/CenteredRichText.vue | 4 ++-- src/components/Contentful/CommentsContainer.vue | 2 +- src/components/Contentful/DynamicHeroClassic.vue | 6 +++--- src/components/Contentful/DynamicRichText.vue | 2 +- .../Contentful/FrequentlyAskedQuestions.vue | 2 +- src/components/Contentful/HeroWithCarousel.vue | 6 +++--- .../HomePage/NewHomeLoansByCategoryGrid.vue | 2 +- .../Contentful/HomePage/NewHomeLoansCardCarousel.vue | 2 +- .../Contentful/LoansByCategoryCarousel.vue | 2 +- src/components/Contentful/MediaItemsCentered.vue | 6 +++--- src/components/Contentful/RichTextItemsCentered.vue | 4 ++-- .../Contentful/SectionWithBackgroundClassic.vue | 2 +- src/components/Contentful/StoryCard.vue | 4 ++-- src/components/Contentful/StoryCardCarousel.vue | 2 +- src/components/Contentful/TestimonialCards.vue | 4 ++-- src/components/CorporateCampaign/CampaignHero.vue | 2 +- src/components/CorporateCampaign/CampaignLoanRow.vue | 2 +- .../CorporateCampaign/CampaignLogoGroup.vue | 2 +- .../CorporateCampaign/CampaignProgressBar.vue | 6 +++--- .../CorporateCampaign/LoanSearch/GenderFilter.vue | 2 +- .../LoanSearch/LoanSearchFilters.vue | 8 ++++---- .../CorporateCampaign/LoanSearch/SortOrder.vue | 2 +- src/components/Forms/GuestAccountCreation.vue | 2 +- src/components/Forms/JoinTeamForm.vue | 2 +- src/components/Forms/MonthlyGoodUpdateForm.vue | 6 +++--- .../Homepage/HomeExp/KivaMultiCategoryGrid.vue | 2 +- src/components/Iwd/ActivityAvatar.vue | 2 +- src/components/Kv/KvAccordionItem.vue | 2 +- src/components/Kv/KvActivityRow.vue | 2 +- src/components/Kv/KvBaseInput.vue | 4 ++-- src/components/Kv/KvCheckboxList.vue | 2 +- src/components/Kv/KvChipClassic.vue | 2 +- src/components/Kv/KvCurrencyInput.vue | 2 +- src/components/Kv/KvDefaultWrapper.vue | 2 +- src/components/Kv/KvExpandableQuestion.vue | 2 +- src/components/Kv/KvFrequentlyAskedQuestions.vue | 2 +- src/components/Kv/KvLoadingOverlay.vue | 2 +- src/components/Kv/KvLoadingParagraph.vue | 2 +- src/components/Kv/KvLoanActivities.vue | 4 ++-- src/components/Kv/KvPagination.vue | 2 +- src/components/Kv/KvPhoneInput.vue | 2 +- src/components/Kv/KvProgressCampaign.vue | 2 +- src/components/Kv/KvResultsPerPage.vue | 2 +- src/components/Kv/KvSectionModalLoader.vue | 2 +- src/components/Kv/KvSelectBox.vue | 2 +- src/components/Kv/KvSocialShareButton.vue | 6 +++--- src/components/Kv/KvTooltip.vue | 2 +- src/components/Lend/LoanSearch/ChallengeCallout.vue | 4 ++-- src/components/Lend/LoanSearch/ChallengeHeader.vue | 4 ++-- src/components/Lend/LoanSearch/LoanSearchFilter.vue | 4 ++-- .../Lend/LoanSearch/LoanSearchFilterChips.vue | 2 +- .../Lend/LoanSearch/LoanSearchInterface.vue | 4 ++-- .../Lend/LoanSearch/LoanSearchRadioGroupFilter.vue | 2 +- .../Lend/LoanSearch/LoanSearchSavedSearch.vue | 8 ++++---- src/components/Lend/LoanSearch/LoanSearchSortBy.vue | 4 ++-- src/components/Lend/LoanSearch/TeamPicksSwitch.vue | 2 +- src/components/LenderProfile/LenderBadges.vue | 2 +- .../LenderProfile/LenderDedicationsList.vue | 4 ++-- src/components/LenderProfile/LenderInviteesList.vue | 6 +++--- src/components/LenderProfile/LenderLoansList.vue | 4 ++-- src/components/LenderProfile/LenderMap.vue | 6 +++--- src/components/LenderProfile/LenderStats.vue | 2 +- src/components/LenderProfile/LenderSummary.vue | 6 +++--- src/components/LenderProfile/LenderTeamsList.vue | 6 +++--- src/components/Lightboxes/EcoChallengeLightbox.vue | 8 ++++---- .../LoanCards/Buttons/CheckoutNowButton.vue | 4 ++-- src/components/LoanCards/Buttons/LendButton.vue | 2 +- .../LoanCards/Buttons/LendIncrementButton.vue | 2 +- src/components/LoanCards/FavoriteStar.vue | 2 +- .../LoanCards/KivaClassicBasicLoanCard.vue | 8 ++++---- .../LoanCards/KvClassicLoanCardContainer.vue | 4 ++-- src/components/LoanCards/LoanProgressGroup.vue | 2 +- src/components/LoanCards/LoanTags/LoanTag.vue | 2 +- src/components/LoanCards/NewHomePageLoanCard.vue | 6 +++--- src/components/LoanCards/RecommendedLoanCard.vue | 2 +- src/components/LoanCards/WhySpecial.vue | 2 +- .../LoanCollections/HomeExp/KivaLoanCardCarousel.vue | 2 +- .../LoanCollections/HomeExp/KivaLoanCardCategory.vue | 4 ++-- .../HomeExp/LoanCategorySelectorHomeExp.vue | 6 +++--- .../LoanCollections/KivaClassicLoanCarousel.vue | 4 ++-- .../KivaClassicLoanCategorySelector.vue | 2 +- .../LoanFinding/LendingCategorySection.vue | 2 +- src/components/LoanFinding/ViewMoreCard.vue | 4 ++-- .../HelpmeChoose/HelpmeChooseRecommendations.vue | 4 ++-- .../LoansByCategory/QuickFilters/CheckboxList.vue | 4 ++-- .../QuickFilters/LocationSelector.vue | 6 +++--- .../LoansByCategory/QuickFilters/QuickFilters.vue | 4 ++-- .../MonthlyGood/AutomaticallySupportNotice.vue | 2 +- .../MonthlyGood/MonthlyGoodDropInPaymentWrapper.vue | 2 +- .../MonthlyGood/MonthlyGoodSelectorDesktop.vue | 2 +- .../MonthlyGood/MonthlyGoodSelectorMobile.vue | 8 ++++---- src/components/MyKiva/BadgeCompleted.vue | 2 +- src/components/MyKiva/BadgeContainer.vue | 2 +- src/components/MyKiva/BadgeInProgress.vue | 4 ++-- src/components/MyKiva/BadgeModal.vue | 6 +++--- src/components/MyKiva/BadgeModalContentJourney.vue | 2 +- src/components/MyKiva/BadgeTile.vue | 4 ++-- src/components/MyKiva/BorrowerCarousel.vue | 12 ++++++------ src/components/MyKiva/BorrowerStatusCard.vue | 2 +- src/components/MyKiva/EarnedBadgesSection.vue | 2 +- src/components/MyKiva/JournalUpdateCard.vue | 2 +- src/components/MyKiva/JournalUpdatesCarousel.vue | 4 ++-- src/components/MyKiva/MyKivaContainer.vue | 4 ++-- src/components/MyKiva/MyKivaHero.vue | 2 +- src/components/MyKiva/MyKivaNavigation.vue | 2 +- src/components/MyKiva/MyKivaProfile.vue | 2 +- src/components/Settings/AppAuthentication.vue | 2 +- src/components/Settings/Password.vue | 2 +- src/components/Settings/PhoneAuthentication.vue | 4 ++-- src/components/Settings/SaveSearchItem.vue | 4 ++-- .../Settings/SubscriptionsSettingsCards.vue | 4 ++-- src/components/Settings/TwoStepVerification.vue | 4 ++-- src/components/Stats/StatsTable.vue | 12 ++++++------ .../Subscriptions/SubscriptionsAutoDeposit.vue | 6 +++--- .../Subscriptions/SubscriptionsMonthlyGood.vue | 4 ++-- .../SubscriptionsMonthlyGoodCancellationFlow.vue | 4 ++-- src/components/Teams/TeamGoal.vue | 4 ++-- src/components/Teams/TeamGoalsList.vue | 4 ++-- src/components/Thanks/Badges/DetailSection.vue | 6 +++--- src/components/Thanks/Badges/DiscoverSection.vue | 4 ++-- src/components/Thanks/Badges/FirstScreen.vue | 4 ++-- src/components/Thanks/Badges/RevealedBadge.vue | 4 ++-- src/components/Thanks/ChallengeHeader.vue | 6 +++--- src/components/Thanks/CommentAsk.vue | 10 +++++----- src/components/Thanks/LoanNextSteps.vue | 2 +- src/components/Thanks/MyKiva/OptInModule.vue | 4 ++-- src/components/Thanks/MyKiva/OptInNotification.vue | 2 +- src/components/Thanks/MyKiva/ThanksBadges.vue | 8 ++++---- src/components/Thanks/ShareChallenge.vue | 6 +++--- src/components/Thanks/ThanksPageCommentAndShare.vue | 10 +++++----- src/components/Thanks/ThanksPageDonationOnly.vue | 6 +++--- src/components/Thanks/WhatIsNextTemplate.vue | 4 ++-- src/components/WwwFrame/Header/TeamsMenu.vue | 2 +- src/components/WwwFrame/LendMenu/LendListMenu.vue | 10 +++++----- src/components/WwwFrame/LendMenu/LendMegaMenu.vue | 6 +++--- .../WwwFrame/Menus/TheMyKivaSecondaryMenu.vue | 4 ++-- .../Banners/AppealBanner/AppealBannerCircular.vue | 8 ++++---- .../Banners/Donation/DonationBanner.vue | 8 ++++---- .../PromotionalBanner/Banners/GenericPromoBanner.vue | 2 +- src/components/WwwFrame/SearchBar.vue | 2 +- src/components/WwwFrame/TheBasketBar.vue | 4 ++-- src/components/WwwFrame/TheFooter.vue | 6 +++--- src/components/WwwFrame/TheHeader.vue | 8 ++++---- src/components/WwwFrame/TheTipMessage.vue | 2 +- src/components/WwwFrame/WwwPageDesign.vue | 8 ++++---- src/pages/AutoDeposit/AutoDepositThanksPage.vue | 2 +- src/pages/Autolending/AutolendingStatus.vue | 2 +- src/pages/Autolending/AutolendingWhen.vue | 2 +- src/pages/Autolending/AutolendingWho.vue | 2 +- src/pages/Autolending/LoanCountSpan.vue | 2 +- src/pages/Autolending/SaveButton.vue | 2 +- src/pages/Borrow/BorrowCommunity.vue | 4 ++-- src/pages/Borrow/BorrowHowLong.vue | 4 ++-- src/pages/Borrow/BorrowIndex.vue | 2 +- src/pages/Borrow/BorrowIntro.vue | 6 +++--- src/pages/BorrowerProfile/BorrowerProfile.vue | 2 +- src/pages/Categories/CategoriesPage.vue | 6 +++--- src/pages/Checkout/CheckoutPage.vue | 6 +++--- src/pages/InstantActions/ConfirmInstantDonation.vue | 6 +++--- src/pages/InstantActions/InstantDonationThanks.vue | 8 ++++---- src/pages/InstantActions/InstantLendingError.vue | 8 ++++---- src/pages/InstantActions/ProcessInstantLending.vue | 12 ++++++------ src/pages/Lend/LoanChannelCategoryPage.vue | 2 +- src/pages/Lend/LoanSearchPage.vue | 6 +++--- src/pages/LenderProfile/LenderProfile.vue | 2 +- src/pages/LendingTeams/LendingTeams.vue | 6 +++--- src/pages/LendingTeams/TeamLeaderboard.vue | 10 +++++----- src/pages/LendingTeams/TeamListing.vue | 8 ++++---- src/pages/LendingTeams/TeamSearchBar.vue | 4 ++-- src/pages/LoanFinding/LoanFinding.vue | 2 +- src/pages/LoginAndRegister/GuestAccountClaim.vue | 2 +- src/pages/LoginAndRegister/RegisterSocial.vue | 2 +- src/pages/MonthlyGood/HowItWorks.vue | 2 +- src/pages/MonthlyGood/LandingForm.vue | 4 ++-- src/pages/MonthlyGood/MonthlyGoodSetupPage.vue | 8 ++++---- src/pages/MonthlyGood/MonthlyGoodThanksPage.vue | 2 +- src/pages/NotFound.vue | 2 +- .../Portfolio/ImpactDashboard/AccountOverview.vue | 6 +++--- .../Portfolio/ImpactDashboard/AccountUpdates.vue | 2 +- .../ImpactDashboard/CreditSummaryLightbox.vue | 6 +++--- .../Portfolio/ImpactDashboard/EducationModule.vue | 2 +- .../Portfolio/ImpactDashboard/EducationPost.vue | 2 +- .../ImpactDashboard/ImpactDashboardPage.vue | 4 ++-- .../Portfolio/ImpactDashboard/KivaCreditStats.vue | 4 ++-- .../Portfolio/ImpactDashboard/KivaEffectFigure.vue | 2 +- .../Portfolio/ImpactDashboard/LendingInsights.vue | 6 +++--- .../Portfolio/ImpactDashboard/LoanCommentModal.vue | 6 +++--- .../Portfolio/ImpactDashboard/RecentLoanItem.vue | 4 ++-- .../Portfolio/ImpactDashboard/RecentLoansList.vue | 4 ++-- .../Portfolio/ImpactDashboard/TeamChallenge.vue | 2 +- .../Portfolio/ImpactDashboard/YourDonations.vue | 10 +++++----- src/pages/Portfolio/ImpactDashboard/YourTeams.vue | 4 ++-- src/pages/Portfolio/LendingStats/BadgesList.vue | 2 +- src/pages/Portfolio/LendingStats/BadgesSection.vue | 2 +- .../Portfolio/LendingStats/LendingStatsPage.vue | 4 ++-- src/pages/Portfolio/LendingStats/StatsSection.vue | 4 ++-- src/pages/ProcessJoinTeam.vue | 6 +++--- src/pages/Settings/FirstMFASetup.vue | 2 +- src/pages/Settings/RecoveryCodeConfirm.vue | 4 ++-- src/pages/Settings/SavedSearch.vue | 4 ++-- src/pages/Settings/TwoStepVerificationPage.vue | 4 ++-- src/pages/StartVerification.vue | 4 ++-- src/pages/StyleGuide.vue | 2 +- src/pages/Thanks/ThanksPage.vue | 2 +- src/pages/Thanks/ThanksPageChallenge.vue | 10 +++++----- .../BorrowerProfile/ChallengeTeamInvite.spec.js | 2 +- 272 files changed, 533 insertions(+), 533 deletions(-) diff --git a/.storybook/preview.js b/.storybook/preview.js index 024e52d656..4a48033362 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -2,7 +2,7 @@ import { setup } from '@storybook/vue3'; import { MINIMAL_VIEWPORTS } from '@storybook/addon-viewport'; import { VueHeadMixin, createHead } from '@unhead/vue'; import { createRouter, createWebHistory } from 'vue-router'; -import KvThemeProvider from '@kiva/kv-components/vue/KvThemeProvider.vue'; +import KvThemeProvider from '@kiva/kv-components/dist/components/KvThemeProvider.vue'; import { defaultTheme } from '@kiva/kv-tokens/configs/kivaColors.cjs'; import changeCaseFilter from '../src/plugins/change-case-filter'; import numeralFilter from '../src/plugins/numeral-filter'; diff --git a/.storybook/stories/KivaClassicSingleCategoryCarousel.stories.js b/.storybook/stories/KivaClassicSingleCategoryCarousel.stories.js index 6766076916..f90ba3945f 100644 --- a/.storybook/stories/KivaClassicSingleCategoryCarousel.stories.js +++ b/.storybook/stories/KivaClassicSingleCategoryCarousel.stories.js @@ -1,8 +1,8 @@ import KivaClassicSingleCategoryCarousel from '#src/components/LoanCollections/KivaClassicSingleCategoryCarousel.vue'; import apolloStoryMixin from '../mixins/apollo-story-mixin'; import cookieStoreStoryMixin from '../mixins/cookie-store-story-mixin'; -import KvGrid from '@kiva/kv-components/vue/KvGrid'; -import KvPageContainer from '@kiva/kv-components/vue/KvPageContainer'; +import KvGrid from '@kiva/kv-components/dist/components/KvGrid'; +import KvPageContainer from '@kiva/kv-components/dist/components/KvPageContainer'; import loanData from '../mock-data/loan-data-mock'; const queryResult = { diff --git a/.storybook/stories/KivaMultiCategoryGrid.stories.js b/.storybook/stories/KivaMultiCategoryGrid.stories.js index 3f1470c137..9e9effe87f 100644 --- a/.storybook/stories/KivaMultiCategoryGrid.stories.js +++ b/.storybook/stories/KivaMultiCategoryGrid.stories.js @@ -2,7 +2,7 @@ import KivaLoanCardCategory from '#src/components/LoanCollections/HomeExp/KivaLo import apolloStoryMixin from '../mixins/apollo-story-mixin'; import cookieStoreStoryMixin from '../mixins/cookie-store-story-mixin'; import LoanCategorySelectorHomeExp from '#src/components/LoanCollections/HomeExp/LoanCategorySelectorHomeExp'; -import KvGrid from '@kiva/kv-components/vue/KvGrid'; +import KvGrid from '@kiva/kv-components/dist/components/KvGrid'; import loanData from '../mock-data/loan-data-mock'; const queryResult = { diff --git a/.storybook/stories/KvFrequentlyAskedQuestions.stories.js b/.storybook/stories/KvFrequentlyAskedQuestions.stories.js index 9e2555ce2c..261af39b04 100644 --- a/.storybook/stories/KvFrequentlyAskedQuestions.stories.js +++ b/.storybook/stories/KvFrequentlyAskedQuestions.stories.js @@ -1,6 +1,6 @@ import SectionWithBackgroundClassic from '#src/components/Contentful/SectionWithBackgroundClassic'; import KvFrequentlyAskedQuestions from '#src/components/Kv/KvFrequentlyAskedQuestions'; -import KvPageContainer from '@kiva/kv-components/vue/KvPageContainer'; +import KvPageContainer from '@kiva/kv-components/dist/components/KvPageContainer'; const args = { frequentlyAskedQuestionsHeadline: 'Questions', diff --git a/.storybook/stories/LoanSpotlight.stories.js b/.storybook/stories/LoanSpotlight.stories.js index 5c80b50d07..12904c7d7b 100644 --- a/.storybook/stories/LoanSpotlight.stories.js +++ b/.storybook/stories/LoanSpotlight.stories.js @@ -1,8 +1,8 @@ import LoanSpotlight from '#src/components/Categories/LoanSpotlight'; import apolloStoryMixin from '../mixins/apollo-story-mixin'; import cookieStoreStoryMixin from '../mixins/cookie-store-story-mixin'; -import KvGrid from '@kiva/kv-components/vue/KvGrid'; -import KvPageContainer from '@kiva/kv-components/vue/KvPageContainer'; +import KvGrid from '@kiva/kv-components/dist/components/KvGrid'; +import KvPageContainer from '@kiva/kv-components/dist/components/KvPageContainer'; const loanHorizontal = { id: 2389631, diff --git a/.storybook/stories/MainCategoryTile.stories.js b/.storybook/stories/MainCategoryTile.stories.js index 35f5e5fc2a..151cf66ff7 100644 --- a/.storybook/stories/MainCategoryTile.stories.js +++ b/.storybook/stories/MainCategoryTile.stories.js @@ -1,6 +1,6 @@ import MainCategoryTile from '#src/components/Categories/MainCategoryTile'; -import KvGrid from '@kiva/kv-components/vue/KvGrid'; -import KvPageContainer from '@kiva/kv-components/vue/KvPageContainer'; +import KvGrid from '@kiva/kv-components/dist/components/KvGrid'; +import KvPageContainer from '@kiva/kv-components/dist/components/KvPageContainer'; export default { title: 'Components/Main Category Tile', diff --git a/.storybook/stories/PortfolioKivaCreditStats.stories.js b/.storybook/stories/PortfolioKivaCreditStats.stories.js index fc5e320398..f3a8ec700f 100644 --- a/.storybook/stories/PortfolioKivaCreditStats.stories.js +++ b/.storybook/stories/PortfolioKivaCreditStats.stories.js @@ -1,5 +1,5 @@ -import KvGrid from '@kiva/kv-components/vue/KvGrid'; -import KvPageContainer from '@kiva/kv-components/vue/KvPageContainer'; +import KvGrid from '@kiva/kv-components/dist/components/KvGrid'; +import KvPageContainer from '@kiva/kv-components/dist/components/KvPageContainer'; import KivaCreditStats from '#src/pages/Portfolio/ImpactDashboard/KivaCreditStats'; import apolloStoryMixin from '../mixins/apollo-story-mixin'; diff --git a/.storybook/stories/SupportedByLenders.stories.js b/.storybook/stories/SupportedByLenders.stories.js index 2d0ae98968..752be9c178 100644 --- a/.storybook/stories/SupportedByLenders.stories.js +++ b/.storybook/stories/SupportedByLenders.stories.js @@ -1,6 +1,6 @@ import SupportedByLenders from '#src/components/BorrowerProfile/SupportedByLenders'; import activities from '../mock-data/activity-feed-data-mock'; -import KvUserAvatar from '@kiva/kv-components/vue/KvUserAvatar'; +import KvUserAvatar from '@kiva/kv-components/dist/components/KvUserAvatar'; export default { title: 'Components/SupportedByLenders', diff --git a/src/components/AutoDeposit/AutoDepositDropInPaymentWrapper.vue b/src/components/AutoDeposit/AutoDepositDropInPaymentWrapper.vue index 0a890e012f..1bf7fdf256 100644 --- a/src/components/AutoDeposit/AutoDepositDropInPaymentWrapper.vue +++ b/src/components/AutoDeposit/AutoDepositDropInPaymentWrapper.vue @@ -39,7 +39,7 @@ import braintreeUpdateSubscriptionPaymentMethod from '#src/graphql/mutation/braintreeUpdateSubscriptionPaymentMethod.graphql'; import KvIcon from '#src/components/Kv/KvIcon'; -import KvButton from '@kiva/kv-components/vue/KvButton'; +import KvButton from '@kiva/kv-components/dist/components/KvButton'; export default { name: 'AutoDepositDropInPaymentWrapper', diff --git a/src/components/AutoDeposit/AutoDepositSignUpForm.vue b/src/components/AutoDeposit/AutoDepositSignUpForm.vue index df517fc9c1..ec3d28b8e1 100644 --- a/src/components/AutoDeposit/AutoDepositSignUpForm.vue +++ b/src/components/AutoDeposit/AutoDepositSignUpForm.vue @@ -172,11 +172,11 @@ import KvLoadingOverlay from '#src/components/Kv/KvLoadingOverlay'; import userIdQuery from '#src/graphql/query/userId.graphql'; import { mdiPencil } from '@mdi/js'; -import KvButton from '@kiva/kv-components/vue/KvButton'; -import KvCheckbox from '@kiva/kv-components/vue/KvCheckbox'; -import KvMaterialIcon from '@kiva/kv-components/vue/KvMaterialIcon'; -import KvSelect from '@kiva/kv-components/vue/KvSelect'; -import KvTextInput from '@kiva/kv-components/vue/KvTextInput'; +import KvButton from '@kiva/kv-components/dist/components/KvButton'; +import KvCheckbox from '@kiva/kv-components/dist/components/KvCheckbox'; +import KvMaterialIcon from '@kiva/kv-components/dist/components/KvMaterialIcon'; +import KvSelect from '@kiva/kv-components/dist/components/KvSelect'; +import KvTextInput from '@kiva/kv-components/dist/components/KvTextInput'; let frozenDropdownOptions; diff --git a/src/components/BorrowerProfile/BorrowerBusinessDetails.vue b/src/components/BorrowerProfile/BorrowerBusinessDetails.vue index 379042222d..3e4f86d139 100644 --- a/src/components/BorrowerProfile/BorrowerBusinessDetails.vue +++ b/src/components/BorrowerProfile/BorrowerBusinessDetails.vue @@ -57,7 +57,7 @@ diff --git a/src/components/WwwFrame/LendMenu/LendMegaMenu.vue b/src/components/WwwFrame/LendMenu/LendMegaMenu.vue index 717765d24d..15e60bb027 100644 --- a/src/components/WwwFrame/LendMenu/LendMegaMenu.vue +++ b/src/components/WwwFrame/LendMenu/LendMegaMenu.vue @@ -49,8 +49,7 @@ > {{ category.name }} @@ -63,7 +62,7 @@
  • Recommended by lenders @@ -72,7 +71,7 @@
  • All categories @@ -80,7 +79,7 @@
  • @@ -102,7 +101,7 @@ v-if="favorites > 0" :to="{ path: '/lend', query: { lenderFavorite: userId } }" v-kv-track-event="['TopNav','click-Lend-Favorites']" - class="tw-text-primary tw-text-left hover:tw-text-action-highlight + class="lend-menu-link tw-text-primary tw-text-left tw-py-1 tw-inline-block" > Saved loans @@ -119,7 +118,7 @@ v-if="hasSearches" @click="openSection(savedSearchesTitle)" :aria-pressed="isOpenSection(savedSearchesTitle) ? 'true' : 'false'" - class="tw-text-primary tw-text-left tw-py-1 tw-inline-block + class="lend-menu-link tw-text-primary tw-text-left tw-py-1 tw-inline-block hover:tw-text-action-highlight hover:tw-underline" > {{ savedSearchesTitle }} @@ -196,8 +195,7 @@ @click="openSection(region.name)" :aria-pressed="isOpenSection(region.name) ? 'true' : 'false'" v-kv-track-event="['TopNav','click-Lend-Region', region.name]" - class="tw-text-primary tw-text-left tw-py-1 - hover:tw-text-action-highlight hover:tw-underline " + class="lend-menu-link tw-text-primary tw-text-left tw-py-1" :class="{ 'tw-text-action' : isOpenSection(region.name)}" > {{ region.name }} @@ -330,4 +328,7 @@ export default { column-fill: auto; /* Tailwind doesnt have a column-fill option currently */ @apply tw-columns-3 tw-gap-4; } +.lend-menu-link { + @apply tw-no-underline hover:tw-underline hover:tw-text-action active:tw-text-action-highlight; +} diff --git a/src/components/WwwFrame/LendMenu/SearchList.vue b/src/components/WwwFrame/LendMenu/SearchList.vue index 0cca0ce3a0..acd1360a4b 100644 --- a/src/components/WwwFrame/LendMenu/SearchList.vue +++ b/src/components/WwwFrame/LendMenu/SearchList.vue @@ -2,14 +2,14 @@