From 4856c36444ff38016f0da5f5f9de09707cef0b87 Mon Sep 17 00:00:00 2001 From: Abban Dunne Date: Wed, 20 Nov 2024 14:08:35 +0100 Subject: [PATCH 1/4] Prepare campaign for C24_WMDE_Desktop_EN_05 Ticket: https://phabricator.wikimedia.org/T380360 --- .../C24_WMDE_Desktop_EN_05/banner_ctrl.ts | 71 ++++++++ .../C24_WMDE_Desktop_EN_05/banner_var.ts | 71 ++++++++ .../components/BannerCtrl.vue | 160 ++++++++++++++++++ .../components/BannerVar.vue | 160 ++++++++++++++++++ .../components/FallbackBanner.vue | 106 ++++++++++++ .../components/MainBanner.vue | 50 ++++++ .../content/BannerSlides.vue | 51 ++++++ .../content/BannerSlidesVar.vue | 52 ++++++ .../content/BannerText.vue | 44 +++++ .../content/BannerTextVar.vue | 43 +++++ .../content/FallbackSlides.vue | 27 +++ .../content/FallbackText.vue | 32 ++++ .../C24_WMDE_Desktop_EN_05/event_map.ts | 38 +++++ .../C24_WMDE_Desktop_EN_05/form_items.ts | 21 +++ .../C24_WMDE_Desktop_EN_05/messages.ts | 28 +++ .../C24_WMDE_Desktop_EN_05/styles/Banner.scss | 17 ++ .../styles/FallbackBanner.scss | 134 +++++++++++++++ .../styles/MainBanner.scss | 44 +++++ .../C24_WMDE_Desktop_EN_05/styles/styles.scss | 60 +++++++ campaign_info.toml | 18 +- .../components/BannerCtrl.spec.ts | 141 +++++++++++++++ .../components/BannerVar.spec.ts | 141 +++++++++++++++ .../components/FallbackBanner.spec.ts | 64 +++++++ 23 files changed, 1564 insertions(+), 9 deletions(-) create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/banner_ctrl.ts create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/banner_var.ts create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/components/BannerCtrl.vue create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.vue create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/components/FallbackBanner.vue create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/components/MainBanner.vue create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/content/BannerSlides.vue create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/content/BannerSlidesVar.vue create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/content/BannerText.vue create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/content/BannerTextVar.vue create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/content/FallbackSlides.vue create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/content/FallbackText.vue create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/event_map.ts create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/form_items.ts create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/messages.ts create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/styles/Banner.scss create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/styles/FallbackBanner.scss create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/styles/MainBanner.scss create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/styles/styles.scss create mode 100644 test/banners/english/C24_WMDE_Desktop_EN_05/components/BannerCtrl.spec.ts create mode 100644 test/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.spec.ts create mode 100644 test/banners/english/C24_WMDE_Desktop_EN_05/components/FallbackBanner.spec.ts diff --git a/banners/english/C24_WMDE_Desktop_EN_05/banner_ctrl.ts b/banners/english/C24_WMDE_Desktop_EN_05/banner_ctrl.ts new file mode 100644 index 000000000..eaa6e8e8e --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/banner_ctrl.ts @@ -0,0 +1,71 @@ +import { createVueApp } from '@src/createVueApp'; + +import './styles/styles.scss'; + +import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue'; +import Banner from './components/BannerCtrl.vue'; +import FallbackBanner from './components/FallbackBanner.vue'; +import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment'; +import { WindowResizeHandler } from '@src/utils/ResizeHandler'; +import PageWPORG from '@src/page/PageWPORG'; +import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki'; +import { SkinFactory } from '@src/page/skin/SkinFactory'; +import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker'; +import TranslationPlugin from '@src/TranslationPlugin'; +import { Translator } from '@src/Translator'; +import DynamicTextPlugin from '@src/DynamicTextPlugin'; +import { LocalImpressionCount } from '@src/utils/LocalImpressionCount'; +import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG'; +import { Locales } from '@src/domain/Locales'; +import messages from './messages'; +import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn'; +import { createFormItems } from './form_items'; +import { createFormActions } from '@src/createFormActions'; +import eventMappings from './event_map'; +import { createFallbackDonationURL } from '@src/createFallbackDonationURL'; +import { WindowTimer } from '@src/utils/Timer'; + +const localeFactory = new LocaleFactoryEn(); +const translator = new Translator( messages ); +const mediaWiki = new WindowMediaWiki(); +const page = new PageWPORG( mediaWiki, ( new SkinFactory( mediaWiki ) ).getSkin(), new WindowSizeIssueChecker( 400 ) ); +const runtimeEnvironment = new UrlRuntimeEnvironment( window.location ); +const impressionCount = new LocalImpressionCount( page.getTracking().keyword, runtimeEnvironment ); +const tracker = new LegacyTrackerWPORG( mediaWiki, page.getTracking().keyword, eventMappings, runtimeEnvironment ); + +const app = createVueApp( BannerConductor, { + page, + bannerConfig: { + delay: runtimeEnvironment.getBannerDelay( 7500 ), + transitionDuration: 1000 + }, + bannerProps: { + useOfFundsContent: localeFactory.getUseOfFundsLoader().getContent(), + remainingImpressions: impressionCount.getRemainingImpressions( page.getMaxBannerImpressions( 'english' ) ), + donationLink: createFallbackDonationURL( page.getTracking(), impressionCount, { locale: Locales.EN } ) + }, + resizeHandler: new WindowResizeHandler(), + banner: Banner, + fallbackBanner: FallbackBanner, + minWidthForMainBanner: 800, + impressionCount +} ); + +app.use( TranslationPlugin, translator ); +app.use( DynamicTextPlugin, { + campaignParameters: page.getCampaignParameters(), + date: new Date(), + formatters: localeFactory.getFormatters(), + impressionCount, + translator +} ); + +const currencyFormatter = localeFactory.getCurrencyFormatter(); + +app.provide( 'currencyFormatter', currencyFormatter ); +app.provide( 'formItems', createFormItems( translator, currencyFormatter.euroAmount.bind( currencyFormatter ) ) ); +app.provide( 'formActions', createFormActions( page.getTracking(), impressionCount, { locale: Locales.EN, afo: '1' } ) ); +app.provide( 'tracker', tracker ); +app.provide( 'timer', new WindowTimer() ); + +app.mount( page.getBannerContainer() ); diff --git a/banners/english/C24_WMDE_Desktop_EN_05/banner_var.ts b/banners/english/C24_WMDE_Desktop_EN_05/banner_var.ts new file mode 100644 index 000000000..98a017922 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/banner_var.ts @@ -0,0 +1,71 @@ +import { createVueApp } from '@src/createVueApp'; + +import './styles/styles.scss'; + +import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue'; +import Banner from './components/BannerVar.vue'; +import FallbackBanner from './components/FallbackBanner.vue'; +import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment'; +import { WindowResizeHandler } from '@src/utils/ResizeHandler'; +import PageWPORG from '@src/page/PageWPORG'; +import { WindowMediaWiki } from '@src/page/MediaWiki/WindowMediaWiki'; +import { SkinFactory } from '@src/page/skin/SkinFactory'; +import { WindowSizeIssueChecker } from '@src/utils/SizeIssueChecker/WindowSizeIssueChecker'; +import TranslationPlugin from '@src/TranslationPlugin'; +import { Translator } from '@src/Translator'; +import DynamicTextPlugin from '@src/DynamicTextPlugin'; +import { LocalImpressionCount } from '@src/utils/LocalImpressionCount'; +import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG'; +import { Locales } from '@src/domain/Locales'; +import messages from './messages'; +import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn'; +import { createFormItems } from './form_items'; +import { createFormActions } from '@src/createFormActions'; +import eventMappings from './event_map'; +import { createFallbackDonationURL } from '@src/createFallbackDonationURL'; +import { WindowTimer } from '@src/utils/Timer'; + +const localeFactory = new LocaleFactoryEn(); +const translator = new Translator( messages ); +const mediaWiki = new WindowMediaWiki(); +const page = new PageWPORG( mediaWiki, ( new SkinFactory( mediaWiki ) ).getSkin(), new WindowSizeIssueChecker( 400 ) ); +const runtimeEnvironment = new UrlRuntimeEnvironment( window.location ); +const impressionCount = new LocalImpressionCount( page.getTracking().keyword, runtimeEnvironment ); +const tracker = new LegacyTrackerWPORG( mediaWiki, page.getTracking().keyword, eventMappings, runtimeEnvironment ); + +const app = createVueApp( BannerConductor, { + page, + bannerConfig: { + delay: runtimeEnvironment.getBannerDelay( 7500 ), + transitionDuration: 1000 + }, + bannerProps: { + useOfFundsContent: localeFactory.getUseOfFundsLoader().getContent(), + remainingImpressions: impressionCount.getRemainingImpressions( page.getMaxBannerImpressions( 'english' ) ), + donationLink: createFallbackDonationURL( page.getTracking(), impressionCount, { locale: Locales.EN } ) + }, + resizeHandler: new WindowResizeHandler(), + banner: Banner, + fallbackBanner: FallbackBanner, + minWidthForMainBanner: 800, + impressionCount +} ); + +app.use( TranslationPlugin, translator ); +app.use( DynamicTextPlugin, { + campaignParameters: page.getCampaignParameters(), + date: new Date(), + formatters: localeFactory.getFormatters(), + impressionCount, + translator +} ); + +const currencyFormatter = localeFactory.getCurrencyFormatter(); + +app.provide( 'currencyFormatter', currencyFormatter ); +app.provide( 'formItems', createFormItems( translator, currencyFormatter.euroAmount.bind( currencyFormatter ) ) ); +app.provide( 'formActions', createFormActions( page.getTracking(), impressionCount, { locale: Locales.EN, afo: '1' } ) ); +app.provide( 'tracker', tracker ); +app.provide( 'timer', new WindowTimer() ); + +app.mount( page.getBannerContainer() ); diff --git a/banners/english/C24_WMDE_Desktop_EN_05/components/BannerCtrl.vue b/banners/english/C24_WMDE_Desktop_EN_05/components/BannerCtrl.vue new file mode 100644 index 000000000..d5f616146 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/components/BannerCtrl.vue @@ -0,0 +1,160 @@ + + + diff --git a/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.vue b/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.vue new file mode 100644 index 000000000..043ceec16 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.vue @@ -0,0 +1,160 @@ + + + diff --git a/banners/english/C24_WMDE_Desktop_EN_05/components/FallbackBanner.vue b/banners/english/C24_WMDE_Desktop_EN_05/components/FallbackBanner.vue new file mode 100644 index 000000000..75e469475 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/components/FallbackBanner.vue @@ -0,0 +1,106 @@ + + + diff --git a/banners/english/C24_WMDE_Desktop_EN_05/components/MainBanner.vue b/banners/english/C24_WMDE_Desktop_EN_05/components/MainBanner.vue new file mode 100644 index 000000000..9f9ebe572 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/components/MainBanner.vue @@ -0,0 +1,50 @@ + + + diff --git a/banners/english/C24_WMDE_Desktop_EN_05/content/BannerSlides.vue b/banners/english/C24_WMDE_Desktop_EN_05/content/BannerSlides.vue new file mode 100644 index 000000000..ac14de304 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/content/BannerSlides.vue @@ -0,0 +1,51 @@ + + + diff --git a/banners/english/C24_WMDE_Desktop_EN_05/content/BannerSlidesVar.vue b/banners/english/C24_WMDE_Desktop_EN_05/content/BannerSlidesVar.vue new file mode 100644 index 000000000..31c872b83 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/content/BannerSlidesVar.vue @@ -0,0 +1,52 @@ + + + diff --git a/banners/english/C24_WMDE_Desktop_EN_05/content/BannerText.vue b/banners/english/C24_WMDE_Desktop_EN_05/content/BannerText.vue new file mode 100644 index 000000000..7129d9b38 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/content/BannerText.vue @@ -0,0 +1,44 @@ + + + diff --git a/banners/english/C24_WMDE_Desktop_EN_05/content/BannerTextVar.vue b/banners/english/C24_WMDE_Desktop_EN_05/content/BannerTextVar.vue new file mode 100644 index 000000000..e719d6b08 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/content/BannerTextVar.vue @@ -0,0 +1,43 @@ + + + diff --git a/banners/english/C24_WMDE_Desktop_EN_05/content/FallbackSlides.vue b/banners/english/C24_WMDE_Desktop_EN_05/content/FallbackSlides.vue new file mode 100644 index 000000000..a50a81082 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/content/FallbackSlides.vue @@ -0,0 +1,27 @@ + + + diff --git a/banners/english/C24_WMDE_Desktop_EN_05/content/FallbackText.vue b/banners/english/C24_WMDE_Desktop_EN_05/content/FallbackText.vue new file mode 100644 index 000000000..60a58e80d --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/content/FallbackText.vue @@ -0,0 +1,32 @@ + + + diff --git a/banners/english/C24_WMDE_Desktop_EN_05/event_map.ts b/banners/english/C24_WMDE_Desktop_EN_05/event_map.ts new file mode 100644 index 000000000..612f999a8 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/event_map.ts @@ -0,0 +1,38 @@ +import { TrackingEventConverterFactory } from '@src/tracking/LegacyTrackerWPORG'; +import { WMDELegacyBannerEvent } from '@src/tracking/WPORG/WMDELegacyBannerEvent'; +import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent'; +import { mapFormStepShownEvent } from '@src/tracking/LegacyEventTracking/mapFormStepShownEvent'; +import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent'; +import { CloseEvent } from '@src/tracking/events/CloseEvent'; +import { mapCloseEvent } from '@src/tracking/LegacyEventTracking/mapCloseEvent'; +import { NotShownEvent } from '@src/tracking/events/NotShownEvent'; +import { mapNotShownEvent } from '@src/tracking/LegacyEventTracking/mapNotShownEvent'; +import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent'; +import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue'; +import { createViewportInfo } from '@src/tracking/LegacyEventTracking/createViewportInfo'; +import { FallbackBannerSubmitEvent } from '@src/tracking/events/FallbackBannerSubmitEvent'; +import { ShownEvent } from '@src/tracking/events/ShownEvent'; +import { mapShownEvent } from '@src/tracking/LegacyEventTracking/mapShownEvent'; + +export default new Map( [ + [ ShownEvent.EVENT_NAME, mapShownEvent ], + [ CloseEvent.EVENT_NAME, mapCloseEvent ], + + [ FormStepShownEvent.EVENT_NAME, mapFormStepShownEvent ], + [ CustomAmountChangedEvent.EVENT_NAME, + ( e: CustomAmountChangedEvent ): WMDELegacyBannerEvent => + new WMDELegacyBannerEvent( e.userChoice + '-amount', 1 ) + ], + [ NotShownEvent.EVENT_NAME, mapNotShownEvent ], + [ BannerSubmitEvent.EVENT_NAME, ( e: BannerSubmitEvent ): WMDESizeIssueEvent => { + switch ( e.feature ) { + case 'UpgradeToYearlyForm': + return new WMDESizeIssueEvent( `submit-${e.userChoice}`, createViewportInfo(), 1 ); + case 'CustomAmountForm': + return new WMDESizeIssueEvent( `submit-different-amount`, createViewportInfo(), 1 ); + default: + return new WMDESizeIssueEvent( `submit`, createViewportInfo(), 1 ); + } + } ], + [ FallbackBannerSubmitEvent.EVENT_NAME, ( e: FallbackBannerSubmitEvent ): WMDESizeIssueEvent => new WMDESizeIssueEvent( e.eventName, createViewportInfo(), 1 ) ] +] ); diff --git a/banners/english/C24_WMDE_Desktop_EN_05/form_items.ts b/banners/english/C24_WMDE_Desktop_EN_05/form_items.ts new file mode 100644 index 000000000..95a254ccb --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/form_items.ts @@ -0,0 +1,21 @@ +import FormItemsBuilder from '@src/utils/FormItemsBuilder/FormItemsBuilder'; +import { Translator } from '@src/Translator'; +import { DonationFormItems } from '@src/utils/FormItemsBuilder/DonationFormItems'; +import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals'; +import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods'; +import { NumberFormatter } from '@src/utils/DynamicContent/formatters/NumberFormatter'; + +export function createFormItems( translations: Translator, amountFormatter: NumberFormatter ): DonationFormItems { + return new FormItemsBuilder( translations, amountFormatter ) + .setIntervals( + Intervals.ONCE, + Intervals.MONTHLY, + Intervals.QUARTERLY, + Intervals.YEARLY + ) + .setAmounts( 5, 10, 20, 25, 50, 100 ) + .setPaymentMethods( + PaymentMethods.PAYPAL, + PaymentMethods.CREDIT_CARD + ).getItems(); +} diff --git a/banners/english/C24_WMDE_Desktop_EN_05/messages.ts b/banners/english/C24_WMDE_Desktop_EN_05/messages.ts new file mode 100644 index 000000000..28077441b --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/messages.ts @@ -0,0 +1,28 @@ +import CustomAmountFormEn from '@src/components/DonationForm/Forms/messages/CustomAmountForm.en'; +import DynamicCampaignTextEn from '@src/utils/DynamicContent/messages/DynamicCampaignText.en'; +import { TranslationMessages } from '@src/Translator'; +import UpgradeToYearlyEn from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.en'; +import SoftCloseEn from '@src/components/SoftClose/messages/SoftClose.en'; +import AddressFormEn from '@src/components/DonationForm/Forms/messages/AddressForm.en'; +import FooterEn from '@src/components/Footer/messages/Footer.en'; +import MainDonationFormEn from '@src/components/DonationForm/Forms/messages/MainDonationForm.en'; +import AlreadyDonatedModalEn from '@src/components/AlreadyDonatedModal/translations/AlreadyDonatedModal.en'; +import FallbackBanner from '@src/components/FallbackBanner/messages/FallbackBanner.en'; + +const messages: TranslationMessages = { + ...CustomAmountFormEn, + ...DynamicCampaignTextEn, + ...UpgradeToYearlyEn, + ...SoftCloseEn, + ...AddressFormEn, + ...FooterEn, + ...MainDonationFormEn, + ...AlreadyDonatedModalEn, + ...FallbackBanner, + 'upgrade-to-yearly-copy': '

Every year we are dependent on the support of people like you. Yearly donations ' + + 'help sustainably and enable long term development.

' + + '

No risks attached, you can tell us to stop at any time.

', + 'cover-transaction-costs': 'I\'ll generously add {{transactionCosts}} to cover the transaction fees so you can keep 100% of my donation.' +}; + +export default messages; diff --git a/banners/english/C24_WMDE_Desktop_EN_05/styles/Banner.scss b/banners/english/C24_WMDE_Desktop_EN_05/styles/Banner.scss new file mode 100644 index 000000000..f88657686 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/styles/Banner.scss @@ -0,0 +1,17 @@ +@use 'src/themes/Treedip/variables/fonts'; + +.wmde-banner { + &-wrapper { + font-size: 14px; + font-family: fonts.$ui; + box-shadow: var( --main-box-shadow ); + background-color: var( --main-background ); + color: var( --main-color ); + } + + &--closed { + .wmde-banner-wrapper { + display: none; + } + } +} diff --git a/banners/english/C24_WMDE_Desktop_EN_05/styles/FallbackBanner.scss b/banners/english/C24_WMDE_Desktop_EN_05/styles/FallbackBanner.scss new file mode 100644 index 000000000..dbc72eb30 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/styles/FallbackBanner.scss @@ -0,0 +1,134 @@ +@use 'src/themes/Treedip/variables/globals'; +@use 'src/themes/Treedip/variables/fonts'; + +$breakpoint: 800px; + +.wmde-banner { + &-fallback { + width: 100%; + height: 150px; + display: flex; + flex-direction: column; + background: var( --fallback-background ); + box-shadow: var( --main-box-shadow ); + + @media ( min-width: $breakpoint ) { + height: auto; + min-height: 250px; + padding: 4px; + } + + &-small, + &-large { + display: flex; + flex-direction: column; + flex: 1 1 auto; + } + + &-small { + align-items: center; + border: 4px solid var( --fallback-border ); + border-radius: 4px; + padding: 8px; + + .wmde-banner-progress-bar { + height: 25px; + line-height: 25px; + } + + .wmde-banner-progress-bar-text, + .wmde-banner-progress-bar-fill-wrapper { + height: 25px; + } + + .wmde-banner-progress-bar-fill { + line-height: 20px; + } + + .wmde-banner-fallback-button { + margin: 0 0 8px; + } + + .wmde-banner-selection-input-text, + .wmde-banner-selection-input-input { + font-family: fonts.$content; + font-size: 14px; + font-weight: normal; + } + } + + &-large { + align-items: stretch; + } + + &-usage-link { + color: var( --fallback-uof-link ); + } + + &-message { + flex: 1 1 auto; + display: flex; + flex-direction: column; + background: var( --fallback-message-background ); + border: 4px solid var( --fallback-message-border ); + border-radius: 4px; + padding: 8px 0; + } + + &-bank-item { + display: block; + + &-label { + font-weight: bold; + } + } + + .wmde-banner-close { + height: 16px; + width: 16px; + top: 8px; + right: 8px; + + @media ( min-width: $breakpoint ) { + height: 30px; + width: 30px; + top: 12px; + right: 12px; + } + } + + .wmde-banner-slider-container { + padding: 0 0 8px; + } + + .wmde-banner-slide-content { + font-size: 14px; + p { + margin-bottom: 8px; + } + } + + .wmde-banner-slider-navigation-previous, + .wmde-banner-slider-navigation-next { + align-items: end; + } + + .wmde-banner-slider-pagination-dot { + cursor: default; + } + + .wmde-banner-message { + flex: 1 1 auto; + + p { + margin-bottom: 0; + } + } + } + + &--pending { + .wmde-banner-fallback { + box-shadow: none; + } + } +} diff --git a/banners/english/C24_WMDE_Desktop_EN_05/styles/MainBanner.scss b/banners/english/C24_WMDE_Desktop_EN_05/styles/MainBanner.scss new file mode 100644 index 000000000..518b8c959 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/styles/MainBanner.scss @@ -0,0 +1,44 @@ +$banner-height: 357px !default; +$form-width: 300px !default; + +.wmde-banner { + &-main { + min-height: $banner-height; + display: flex; + flex-direction: column; + padding: 12px 24px 0; + } + + &-content { + display: flex; + flex-direction: row; + flex-grow: 1; + } + + &-message { + padding: 0 15px; + } + + &-column-left { + display: flex; + flex-direction: column; + justify-content: center; + flex: 1 1 auto; + margin-bottom: 0; + overflow-y: hidden; + margin-right: 30px; + padding: 0 0 10px; + background: var( --message-background ); + border: 5px solid var( --message-border ); + border-radius: 9px; + } + + &-column-right { + order: 2; + flex: 0 0 $form-width; + display: flex; + flex-direction: column; + width: $form-width; + padding: 10px 0; + } +} diff --git a/banners/english/C24_WMDE_Desktop_EN_05/styles/styles.scss b/banners/english/C24_WMDE_Desktop_EN_05/styles/styles.scss new file mode 100644 index 000000000..fba213019 --- /dev/null +++ b/banners/english/C24_WMDE_Desktop_EN_05/styles/styles.scss @@ -0,0 +1,60 @@ +// This is the file where we import the theme-specific component styles +@use 'src/themes/Treedip/swatches/skin_vector-2022' with ( + $slider: true, + $select-group-bubble: true, + $select-group-image-label: true, + $upgrade-to-yearly: true, + $fallback-banner: true, + $progress-bar: true, + $soft-close: true, +); +@use 'src/themes/Treedip/variables/breakpoints'; +@use 'src/components/BannerConductor/banner-transition'; +@use 'Banner'; +@use 'MainBanner' with ( + $banner-height: 355px, + $form-width: 300px +); +@use 'src/themes/UseOfFunds/swatches/skin_vector-2022' as uof-vector-2022; +@use 'src/themes/UseOfFunds/UseOfFunds'; +@use 'src/themes/Treedip/defaults'; +@use 'src/themes/Treedip/ButtonClose/ButtonClose' with ( + $padding: 4px, + $top: 12px, + $right: 8px, + $margin: -4.5px +); +@use 'src/themes/Treedip/ProgressBar/ProgressBarAlternative' with ( + $progress-bar-margin: 0 15px +); +@use 'src/themes/Treedip/DonationForm/DonationForm'; +@use 'src/themes/Treedip/DonationForm/MultiStepDonation'; +@use 'src/themes/Treedip/DonationForm/BubbleForm/SelectGroupBubble'; +@use 'src/themes/Treedip/DonationForm/BubbleForm/SelectGroupRadioBubbles' with ( + $height: 34px, + $font-size: 14px +); +@use 'src/themes/Treedip/DonationForm/BubbleForm/SelectCustomAmountRadioBubble' with ( + $height: 34px, + $font-size: 14px +); +@use 'src/themes/Treedip/DonationForm/BubbleForm/SelectGroupBubbleImageLabel'; +@use 'src/themes/Treedip/DonationForm/SubComponents/SmsBox'; +@use 'src/themes/Treedip/DonationForm/Forms/MainDonationForm' with ( + $padding: 14px 0 0 +); +@use 'src/themes/Treedip/DonationForm/Forms/UpgradeToYearlyButtonForm'; +@use 'src/themes/Treedip/DonationForm/Forms/CustomAmountForm'; +@use 'src/themes/Treedip/Footer/FooterAlreadyDonated' with ( + $right-column-width: 300px +); +@use 'src/themes/Treedip/Footer/SelectionInput'; +@use 'src/themes/Treedip/Message/Message' with ( + $font-sizes: ( 1400px: 15px, 1600px: 16px, 1800px: 18px ) +); +@use 'src/themes/Treedip/Slider/KeenSlider'; +@use 'src/themes/Treedip/SoftClose/SoftClose'; +@use 'FallbackBanner'; +@use 'src/themes/Fijitiv/FallbackBanner/FallbackButton'; +@use 'src/themes/Fijitiv/FallbackBanner/LargeFooter'; +@use 'src/themes/Fijitiv/FallbackBanner/SmallFooter'; diff --git a/campaign_info.toml b/campaign_info.toml index 72b912a28..b7d6a1d76 100644 --- a/campaign_info.toml +++ b/campaign_info.toml @@ -139,9 +139,9 @@ tracking = "wpde-mob01-241028-var" [english] name = "English Desktop" icon = "desktop" -campaign = "C24_WMDE_Desktop_EN_04" -description = "Based on CTRL desktop EN 03" -campaign_tracking = "en04-ba-241113" +campaign = "C24_WMDE_Desktop_EN_05" +description = "Based on CTRL desktop EN 04" +campaign_tracking = "en05-ba-241125" preview_link = "/wiki/Main_Page?devbanner={{banner}}&banner=B22_WMDE_local_prototype" preview_link_darkmode = "/wiki/Main_Page?devbanner={{banner}}&banner=B22_WMDE_local_prototype&vectornightmode=1" preview_url = 'https://en.wikipedia.org/wiki/Main_Page?banner={{banner}}&devMode' @@ -149,14 +149,14 @@ wrapper_template = "wikipedia_org" use_of_funds_source = "MediaWiki:WMDE_Fundraising/UseOfFunds_2024_EN" [english.banners.ctrl] -filename = "./banners/english/C24_WMDE_Desktop_EN_04/banner_ctrl.ts" -pagename = "B24_WMDE_Desktop_EN_04_ctrl" -tracking = "org-en04-241113-ctrl" +filename = "./banners/english/C24_WMDE_Desktop_EN_05/banner_ctrl.ts" +pagename = "B24_WMDE_Desktop_EN_05_ctrl" +tracking = "org-en05-241125-ctrl" [english.banners.var] -filename = "./banners/english/C24_WMDE_Desktop_EN_04/banner_var.ts" -pagename = "B24_WMDE_Desktop_EN_04_var" -tracking = "org-en04-241113-var" +filename = "./banners/english/C24_WMDE_Desktop_EN_05/banner_var.ts" +pagename = "B24_WMDE_Desktop_EN_05_var" +tracking = "org-en05-241125-var" [english.test_matrix] platform = ["edge", "firefox_win10", "chrome_win10", "safari", "firefox_macos", "chrome_macos", "firefox_linux", "chrome_linux"] diff --git a/test/banners/english/C24_WMDE_Desktop_EN_05/components/BannerCtrl.spec.ts b/test/banners/english/C24_WMDE_Desktop_EN_05/components/BannerCtrl.spec.ts new file mode 100644 index 000000000..87c1a797b --- /dev/null +++ b/test/banners/english/C24_WMDE_Desktop_EN_05/components/BannerCtrl.spec.ts @@ -0,0 +1,141 @@ +import { beforeEach, describe, test } from 'vitest'; +import { mount, VueWrapper } from '@vue/test-utils'; +import Banner from '@banners/english/C24_WMDE_Desktop_EN_05/components/BannerCtrl.vue'; +import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates'; +import { newDynamicContent } from '@test/banners/dynamicCampaignContent'; +import { useOfFundsContent } from '@test/banners/useOfFundsContent'; +import { formItems } from '@test/banners/formItems'; +import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn'; +import { useOfFundsFeatures } from '@test/features/UseOfFunds'; +import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent'; +import { TrackerStub } from '@test/fixtures/TrackerStub'; +import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton'; +import { useFormModel } from '@src/components/composables/useFormModel'; +import { resetFormModel } from '@test/resetFormModel'; +import { bannerAutoHideFeatures, bannerMainFeatures } from '@test/features/MainBanner'; +import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent'; +import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal'; +import { softCloseFeatures } from '@test/features/SoftCloseDesktop'; +import { Timer } from '@src/utils/Timer'; +import { TimerStub } from '@test/fixtures/TimerStub'; + +const formModel = useFormModel(); +const translator = ( key: string ): string => key; + +describe( 'BannerCtrl.vue', () => { + + beforeEach( () => { + resetFormModel( formModel ); + } ); + + const getWrapper = ( dynamicContent: DynamicContent = null, timer: Timer = null ): VueWrapper => { + return mount( Banner, { + attachTo: document.body, + props: { + bannerState: BannerStates.Pending, + useOfFundsContent, + remainingImpressions: 10 + }, + global: { + mocks: { + $translate: translator + }, + provide: { + translator: { translate: translator }, + dynamicCampaignText: dynamicContent ?? newDynamicContent(), + formActions: { donateWithAddressAction: 'https://example.com', donateWithoutAddressAction: 'https://example.com' }, + currencyFormatter: new CurrencyEn(), + formItems, + tracker: new TrackerStub(), + timer: timer ?? new TimerStub() + } + } + } ); + }; + + describe( 'Main Banner', () => { + test.each( [ + [ 'expectDoesNotEmitCloseEvent' ] + ] )( '%s', async ( testName: string ) => { + await bannerMainFeatures[ testName ]( getWrapper() ); + } ); + + test.each( [ + [ 'expectClosesBannerWhenWindowBecomesSmall' ] + ] )( '%s', async ( testName: string ) => { + await bannerAutoHideFeatures[ testName ]( getWrapper ); + } ); + } ); + + describe( 'Content', () => { + test.each( [ + [ 'expectSlideShowPlaysWhenBecomesVisible' ], + [ 'expectSlideShowStopsOnFormInteraction' ] + ] )( '%s', async ( testName: string ) => { + await bannerContentFeatures[ testName ]( getWrapper() ); + } ); + + test.each( [ + [ 'expectShowsSlideShowOnSmallSizes' ], + [ 'expectShowsMessageOnLargeSizes' ] + ] )( '%s', async ( testName: string ) => { + await bannerContentDisplaySwitchFeatures[ testName ]( getWrapper, 1300 ); + } ); + + test.each( [ + [ 'expectShowsAnimatedVisitorsVsDonorsSentenceInMessage' ], + [ 'expectShowsAnimatedVisitorsVsDonorsSentenceInSlideShow' ] + ] )( '%s', async ( testName: string ) => { + await bannerContentAnimatedTextFeatures[ testName ]( getWrapper ); + } ); + + test.each( [ + [ 'expectShowsLiveDateAndTimeInMessage' ], + [ 'expectShowsLiveDateAndTimeInSlideshow' ] + ] )( '%s', async ( testName: string ) => { + await bannerContentDateAndTimeFeatures[ testName ]( getWrapper ); + } ); + } ); + + describe( 'Donation Form Happy Paths', () => { + test.each( [ + [ 'expectMainDonationFormSubmitsWhenSofortIsSelected' ], + [ 'expectMainDonationFormSubmitsWhenYearlyIsSelected' ], + [ 'expectMainDonationFormGoesToUpgrade' ], + [ 'expectUpgradeToYearlyFormSubmitsUpgrade' ], + [ 'expectUpgradeToYearlyFormSubmitsDontUpgrade' ] + ] )( '%s', async ( testName: string ) => { + await donationFormFeatures[ testName ]( getWrapper() ); + } ); + } ); + + describe( 'Soft Close', () => { + test.each( [ + [ 'expectShowsSoftClose' ], + [ 'expectEmitsSoftCloseCloseEvent' ], + [ 'expectEmitsSoftCloseMaybeLaterEvent' ], + [ 'expectEmitsSoftCloseTimeOutEvent' ], + [ 'expectEmitsBannerContentChangedOnSoftClose' ], + [ 'expectDoesNotShowSoftCloseOnFinalBannerImpression' ] + ] )( '%s', async ( testName: string ) => { + await softCloseFeatures[ testName ]( getWrapper ); + } ); + } ); + + describe( 'Use of Funds', () => { + test.each( [ + [ 'expectShowsUseOfFunds' ], + [ 'expectHidesUseOfFunds' ] + ] )( '%s', async ( testName: string ) => { + await useOfFundsFeatures[ testName ]( getWrapper() ); + } ); + } ); + + describe( 'Already Donated', () => { + test.each( [ + [ 'expectFiresMaybeLaterEventOnLinkClick' ] + ] )( '%s', async ( testName: string ) => { + await alreadyDonatedModalFeatures[ testName ]( getWrapper() ); + } ); + } ); +} ); diff --git a/test/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.spec.ts b/test/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.spec.ts new file mode 100644 index 000000000..5159e18f9 --- /dev/null +++ b/test/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.spec.ts @@ -0,0 +1,141 @@ +import { beforeEach, describe, test } from 'vitest'; +import { mount, VueWrapper } from '@vue/test-utils'; +import Banner from '@banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.vue'; +import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates'; +import { newDynamicContent } from '@test/banners/dynamicCampaignContent'; +import { useOfFundsContent } from '@test/banners/useOfFundsContent'; +import { formItems } from '@test/banners/formItems'; +import { CurrencyEn } from '@src/utils/DynamicContent/formatters/CurrencyEn'; +import { useOfFundsFeatures } from '@test/features/UseOfFunds'; +import { bannerContentAnimatedTextFeatures, bannerContentDateAndTimeFeatures, bannerContentDisplaySwitchFeatures, bannerContentFeatures } from '@test/features/BannerContent'; +import { TrackerStub } from '@test/fixtures/TrackerStub'; +import { donationFormFeatures } from '@test/features/forms/MainDonation_UpgradeToYearlyButton'; +import { useFormModel } from '@src/components/composables/useFormModel'; +import { resetFormModel } from '@test/resetFormModel'; +import { bannerAutoHideFeatures, bannerMainFeatures } from '@test/features/MainBanner'; +import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent'; +import { alreadyDonatedModalFeatures } from '@test/features/AlreadyDonatedModal'; +import { softCloseFeatures } from '@test/features/SoftCloseDesktop'; +import { Timer } from '@src/utils/Timer'; +import { TimerStub } from '@test/fixtures/TimerStub'; + +const formModel = useFormModel(); +const translator = ( key: string ): string => key; + +describe( 'BannerVar.vue', () => { + + beforeEach( () => { + resetFormModel( formModel ); + } ); + + const getWrapper = ( dynamicContent: DynamicContent = null, timer: Timer = null ): VueWrapper => { + return mount( Banner, { + attachTo: document.body, + props: { + bannerState: BannerStates.Pending, + useOfFundsContent, + remainingImpressions: 10 + }, + global: { + mocks: { + $translate: translator + }, + provide: { + translator: { translate: translator }, + dynamicCampaignText: dynamicContent ?? newDynamicContent(), + formActions: { donateWithAddressAction: 'https://example.com', donateWithoutAddressAction: 'https://example.com' }, + currencyFormatter: new CurrencyEn(), + formItems, + tracker: new TrackerStub(), + timer: timer ?? new TimerStub() + } + } + } ); + }; + + describe( 'Main Banner', () => { + test.each( [ + [ 'expectDoesNotEmitCloseEvent' ] + ] )( '%s', async ( testName: string ) => { + await bannerMainFeatures[ testName ]( getWrapper() ); + } ); + + test.each( [ + [ 'expectClosesBannerWhenWindowBecomesSmall' ] + ] )( '%s', async ( testName: string ) => { + await bannerAutoHideFeatures[ testName ]( getWrapper ); + } ); + } ); + + describe( 'Content', () => { + test.each( [ + [ 'expectSlideShowPlaysWhenBecomesVisible' ], + [ 'expectSlideShowStopsOnFormInteraction' ] + ] )( '%s', async ( testName: string ) => { + await bannerContentFeatures[ testName ]( getWrapper() ); + } ); + + test.each( [ + [ 'expectShowsSlideShowOnSmallSizes' ], + [ 'expectShowsMessageOnLargeSizes' ] + ] )( '%s', async ( testName: string ) => { + await bannerContentDisplaySwitchFeatures[ testName ]( getWrapper, 1300 ); + } ); + + test.each( [ + [ 'expectShowsAnimatedVisitorsVsDonorsSentenceInMessage' ], + [ 'expectShowsAnimatedVisitorsVsDonorsSentenceInSlideShow' ] + ] )( '%s', async ( testName: string ) => { + await bannerContentAnimatedTextFeatures[ testName ]( getWrapper ); + } ); + + test.each( [ + [ 'expectShowsLiveDateAndTimeInMessage' ], + [ 'expectShowsLiveDateAndTimeInSlideshow' ] + ] )( '%s', async ( testName: string ) => { + await bannerContentDateAndTimeFeatures[ testName ]( getWrapper ); + } ); + } ); + + describe( 'Donation Form Happy Paths', () => { + test.each( [ + [ 'expectMainDonationFormSubmitsWhenSofortIsSelected' ], + [ 'expectMainDonationFormSubmitsWhenYearlyIsSelected' ], + [ 'expectMainDonationFormGoesToUpgrade' ], + [ 'expectUpgradeToYearlyFormSubmitsUpgrade' ], + [ 'expectUpgradeToYearlyFormSubmitsDontUpgrade' ] + ] )( '%s', async ( testName: string ) => { + await donationFormFeatures[ testName ]( getWrapper() ); + } ); + } ); + + describe( 'Soft Close', () => { + test.each( [ + [ 'expectShowsSoftClose' ], + [ 'expectEmitsSoftCloseCloseEvent' ], + [ 'expectEmitsSoftCloseMaybeLaterEvent' ], + [ 'expectEmitsSoftCloseTimeOutEvent' ], + [ 'expectEmitsBannerContentChangedOnSoftClose' ], + [ 'expectDoesNotShowSoftCloseOnFinalBannerImpression' ] + ] )( '%s', async ( testName: string ) => { + await softCloseFeatures[ testName ]( getWrapper ); + } ); + } ); + + describe( 'Use of Funds', () => { + test.each( [ + [ 'expectShowsUseOfFunds' ], + [ 'expectHidesUseOfFunds' ] + ] )( '%s', async ( testName: string ) => { + await useOfFundsFeatures[ testName ]( getWrapper() ); + } ); + } ); + + describe( 'Already Donated', () => { + test.each( [ + [ 'expectFiresMaybeLaterEventOnLinkClick' ] + ] )( '%s', async ( testName: string ) => { + await alreadyDonatedModalFeatures[ testName ]( getWrapper() ); + } ); + } ); +} ); diff --git a/test/banners/english/C24_WMDE_Desktop_EN_05/components/FallbackBanner.spec.ts b/test/banners/english/C24_WMDE_Desktop_EN_05/components/FallbackBanner.spec.ts new file mode 100644 index 000000000..4a04d7f75 --- /dev/null +++ b/test/banners/english/C24_WMDE_Desktop_EN_05/components/FallbackBanner.spec.ts @@ -0,0 +1,64 @@ +import { describe, test } from 'vitest'; +import { mount, VueWrapper } from '@vue/test-utils'; +import FallbackBanner from '@banners/english/C24_WMDE_Desktop_EN_05/components/FallbackBanner.vue'; +import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates'; +import { useOfFundsContent } from '@test/banners/useOfFundsContent'; +import { newDynamicContent } from '@test/banners/dynamicCampaignContent'; +import { DynamicContent } from '@src/utils/DynamicContent/DynamicContent'; +import { Tracker } from '@src/tracking/Tracker'; +import { TrackerStub } from '@test/fixtures/TrackerStub'; +import { dynamicContentFeatures, fallbackBannerFeatures, submitFeatures } from '@test/features/FallbackBanner'; +import { TimerStub } from '@test/fixtures/TimerStub'; +import { Timer } from '@src/utils/Timer'; + +const translator = ( key: string ): string => key; + +describe( 'FallbackBanner.vue', () => { + const getWrapperAtWidth = ( width: number, dynamicContent: DynamicContent = null, tracker: Tracker = null, timer: Timer = null ): VueWrapper => { + Object.defineProperty( window, 'innerWidth', { writable: true, configurable: true, value: width } ); + return mount( FallbackBanner, { + props: { + bannerState: BannerStates.Pending, + useOfFundsContent, + donationLink: 'https://spenden.wikimedia.de' + }, + global: { + mocks: { + $translate: translator + }, + provide: { + translator: { translate: translator }, + dynamicCampaignText: dynamicContent ?? newDynamicContent(), + tracker: tracker ?? new TrackerStub(), + timer: timer ?? new TimerStub() + } + } + } ); + }; + + test.each( [ + [ 'showsTheSmallBanner' ], + [ 'showsTheLargeBanner' ], + [ 'emitsTheBannerCloseEvent' ], + [ 'playsTheSlideshowWhenBecomesVisible' ], + [ 'showsUseOfFundsFromSmallBanner' ], + [ 'hidesUseOfFundsFromSmallBanner' ], + [ 'showsUseOfFundsFromLargeBanner' ], + [ 'hidesUseOfFundsFromLargeBanner' ] + ] )( '%s', async ( testName: string ) => { + await fallbackBannerFeatures[ testName ]( getWrapperAtWidth ); + } ); + + test.each( [ + [ 'showsLiveTimeInLargeBanner' ] + ] )( '%s', async ( testName: string ) => { + await dynamicContentFeatures[ testName ]( getWrapperAtWidth ); + } ); + + test.each( [ + [ 'submitsFromLargeBanner' ], + [ 'submitsFromSmallBanner' ] + ] )( '%s', async ( testName: string ) => { + await submitFeatures[ testName ]( getWrapperAtWidth ); + } ); +} ); From 38ac67f51f7346c71b0677421138ee7a34eb6cde Mon Sep 17 00:00:00 2001 From: Abban Dunne Date: Wed, 20 Nov 2024 14:10:33 +0100 Subject: [PATCH 2/4] Prepare CTRL for C24_WMDE_Desktop_EN_05 Ticket: https://phabricator.wikimedia.org/T380360 --- .../components/BannerVar.vue | 4 +- .../content/BannerSlidesVar.vue | 52 ------------------- .../content/BannerTextVar.vue | 43 --------------- .../C24_WMDE_Desktop_EN_05/banner_ctrl.ts | 2 +- .../components/BannerVar.vue | 4 +- .../content/BannerSlidesVar.vue | 52 ------------------- .../content/BannerTextVar.vue | 43 --------------- 7 files changed, 5 insertions(+), 195 deletions(-) delete mode 100644 banners/english/C24_WMDE_Desktop_EN_04/content/BannerSlidesVar.vue delete mode 100644 banners/english/C24_WMDE_Desktop_EN_04/content/BannerTextVar.vue delete mode 100644 banners/english/C24_WMDE_Desktop_EN_05/content/BannerSlidesVar.vue delete mode 100644 banners/english/C24_WMDE_Desktop_EN_05/content/BannerTextVar.vue diff --git a/banners/english/C24_WMDE_Desktop_EN_04/components/BannerVar.vue b/banners/english/C24_WMDE_Desktop_EN_04/components/BannerVar.vue index 043ceec16..d5f616146 100644 --- a/banners/english/C24_WMDE_Desktop_EN_04/components/BannerVar.vue +++ b/banners/english/C24_WMDE_Desktop_EN_04/components/BannerVar.vue @@ -89,10 +89,10 @@ import MainBanner from './MainBanner.vue'; import FundsModal from '@src/components/UseOfFunds/FundsModal.vue'; import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent'; import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue'; -import BannerSlides from '../content/BannerSlidesVar.vue'; +import BannerSlides from '../content/BannerSlides.vue'; import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue'; import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue'; -import BannerText from '../content/BannerTextVar.vue'; +import BannerText from '../content/BannerText.vue'; import KeenSlider from '@src/components/Slider/KeenSlider.vue'; import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue'; import { useFormModel } from '@src/components/composables/useFormModel'; diff --git a/banners/english/C24_WMDE_Desktop_EN_04/content/BannerSlidesVar.vue b/banners/english/C24_WMDE_Desktop_EN_04/content/BannerSlidesVar.vue deleted file mode 100644 index e24663cf5..000000000 --- a/banners/english/C24_WMDE_Desktop_EN_04/content/BannerSlidesVar.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - diff --git a/banners/english/C24_WMDE_Desktop_EN_04/content/BannerTextVar.vue b/banners/english/C24_WMDE_Desktop_EN_04/content/BannerTextVar.vue deleted file mode 100644 index 62b22623b..000000000 --- a/banners/english/C24_WMDE_Desktop_EN_04/content/BannerTextVar.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - diff --git a/banners/english/C24_WMDE_Desktop_EN_05/banner_ctrl.ts b/banners/english/C24_WMDE_Desktop_EN_05/banner_ctrl.ts index eaa6e8e8e..5ac47a488 100644 --- a/banners/english/C24_WMDE_Desktop_EN_05/banner_ctrl.ts +++ b/banners/english/C24_WMDE_Desktop_EN_05/banner_ctrl.ts @@ -64,7 +64,7 @@ const currencyFormatter = localeFactory.getCurrencyFormatter(); app.provide( 'currencyFormatter', currencyFormatter ); app.provide( 'formItems', createFormItems( translator, currencyFormatter.euroAmount.bind( currencyFormatter ) ) ); -app.provide( 'formActions', createFormActions( page.getTracking(), impressionCount, { locale: Locales.EN, afo: '1' } ) ); +app.provide( 'formActions', createFormActions( page.getTracking(), impressionCount, { locale: Locales.EN } ) ); app.provide( 'tracker', tracker ); app.provide( 'timer', new WindowTimer() ); diff --git a/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.vue b/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.vue index 043ceec16..d5f616146 100644 --- a/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.vue +++ b/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.vue @@ -89,10 +89,10 @@ import MainBanner from './MainBanner.vue'; import FundsModal from '@src/components/UseOfFunds/FundsModal.vue'; import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent'; import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue'; -import BannerSlides from '../content/BannerSlidesVar.vue'; +import BannerSlides from '../content/BannerSlides.vue'; import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue'; import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue'; -import BannerText from '../content/BannerTextVar.vue'; +import BannerText from '../content/BannerText.vue'; import KeenSlider from '@src/components/Slider/KeenSlider.vue'; import FooterAlreadyDonated from '@src/components/Footer/FooterAlreadyDonated.vue'; import { useFormModel } from '@src/components/composables/useFormModel'; diff --git a/banners/english/C24_WMDE_Desktop_EN_05/content/BannerSlidesVar.vue b/banners/english/C24_WMDE_Desktop_EN_05/content/BannerSlidesVar.vue deleted file mode 100644 index 31c872b83..000000000 --- a/banners/english/C24_WMDE_Desktop_EN_05/content/BannerSlidesVar.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - diff --git a/banners/english/C24_WMDE_Desktop_EN_05/content/BannerTextVar.vue b/banners/english/C24_WMDE_Desktop_EN_05/content/BannerTextVar.vue deleted file mode 100644 index e719d6b08..000000000 --- a/banners/english/C24_WMDE_Desktop_EN_05/content/BannerTextVar.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - From 740c8d5ffef262c4993af6745e3615a982001e04 Mon Sep 17 00:00:00 2001 From: Abban Dunne Date: Wed, 20 Nov 2024 15:32:47 +0100 Subject: [PATCH 3/4] Implement VAR for C24_WMDE_Desktop_EN_05 VAR has a new main donation form with an address checkbox. Ticket: https://phabricator.wikimedia.org/T380360 --- .../C24_WMDE_Desktop_EN_05/banner_var.ts | 6 +- .../components/BannerVar.vue | 14 +- .../C24_WMDE_Desktop_EN_05/messages.ts | 3 +- .../C24_WMDE_Desktop_EN_05/messages_var.ts | 28 +++ .../styles/styles_var.scss | 60 +++++ .../MainDonationFormDonationReceipt.scss | 31 +++ .../Forms/MainDonationFormDonationReceipt.vue | 176 ++++++++++++++ .../MainDonationFormDonationReceipt.scss | 41 ++++ .../SubComponents/TransactionFees.scss | 4 +- src/themes/Treedip/swatches/color_dark.scss | 7 +- src/themes/Treedip/swatches/color_light.scss | 5 +- .../components/BannerVar.spec.ts | 5 +- .../MainDonationFormDonationReceipt.spec.ts | 215 ++++++++++++++++++ ...onDonationReceipt_UpgradeToYearlyButton.ts | 17 ++ 14 files changed, 591 insertions(+), 21 deletions(-) create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/messages_var.ts create mode 100644 banners/english/C24_WMDE_Desktop_EN_05/styles/styles_var.scss create mode 100644 src/components/DonationForm/Forms/MainDonationFormDonationReceipt.scss create mode 100644 src/components/DonationForm/Forms/MainDonationFormDonationReceipt.vue create mode 100644 src/themes/Treedip/DonationForm/Forms/MainDonationFormDonationReceipt.scss create mode 100644 test/components/DonationForm/Forms/MainDonationFormDonationReceipt.spec.ts create mode 100644 test/features/forms/MainDonationDonationReceipt_UpgradeToYearlyButton.ts diff --git a/banners/english/C24_WMDE_Desktop_EN_05/banner_var.ts b/banners/english/C24_WMDE_Desktop_EN_05/banner_var.ts index 98a017922..9883c3e6d 100644 --- a/banners/english/C24_WMDE_Desktop_EN_05/banner_var.ts +++ b/banners/english/C24_WMDE_Desktop_EN_05/banner_var.ts @@ -1,6 +1,6 @@ import { createVueApp } from '@src/createVueApp'; -import './styles/styles.scss'; +import './styles/styles_var.scss'; import BannerConductor from '@src/components/BannerConductor/FallbackBannerConductor.vue'; import Banner from './components/BannerVar.vue'; @@ -17,7 +17,7 @@ import DynamicTextPlugin from '@src/DynamicTextPlugin'; import { LocalImpressionCount } from '@src/utils/LocalImpressionCount'; import { LegacyTrackerWPORG } from '@src/tracking/LegacyTrackerWPORG'; import { Locales } from '@src/domain/Locales'; -import messages from './messages'; +import messages from './messages_var'; import { LocaleFactoryEn } from '@src/utils/LocaleFactory/LocaleFactoryEn'; import { createFormItems } from './form_items'; import { createFormActions } from '@src/createFormActions'; @@ -64,7 +64,7 @@ const currencyFormatter = localeFactory.getCurrencyFormatter(); app.provide( 'currencyFormatter', currencyFormatter ); app.provide( 'formItems', createFormItems( translator, currencyFormatter.euroAmount.bind( currencyFormatter ) ) ); -app.provide( 'formActions', createFormActions( page.getTracking(), impressionCount, { locale: Locales.EN, afo: '1' } ) ); +app.provide( 'formActions', createFormActions( page.getTracking(), impressionCount, { locale: Locales.EN } ) ); app.provide( 'tracker', tracker ); app.provide( 'timer', new WindowTimer() ); diff --git a/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.vue b/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.vue index d5f616146..78ff6fc5a 100644 --- a/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.vue +++ b/banners/english/C24_WMDE_Desktop_EN_05/components/BannerVar.vue @@ -28,7 +28,7 @@ - + + + @@ -108,6 +112,7 @@ import SoftClose from '@src/components/SoftClose/SoftClose.vue'; import WMDEFundsForwardingEN from '@src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue'; import { useBannerHider } from '@src/components/composables/useBannerHider'; import MainDonationFormAddressType from '@src/components/DonationForm/Forms/MainDonationFormDonationReceipt.vue'; +import MainDonationFormPaymentsAndReceiptButton from '@src/components/DonationForm/Forms/MainDonationFormPaymentsAndReceiptButton.vue'; enum ContentStates { Main = 'wmde-banner-wrapper--main', diff --git a/banners/english/C24_WMDE_Desktop_EN_05/styles/FallbackBanner.scss b/banners/english/C24_WMDE_Desktop_EN_05/styles/FallbackBanner.scss index dbc72eb30..2361a26cf 100644 --- a/banners/english/C24_WMDE_Desktop_EN_05/styles/FallbackBanner.scss +++ b/banners/english/C24_WMDE_Desktop_EN_05/styles/FallbackBanner.scss @@ -88,6 +88,8 @@ $breakpoint: 800px; width: 16px; top: 8px; right: 8px; + margin: 0; + padding: 0; @media ( min-width: $breakpoint ) { height: 30px; diff --git a/banners/english/C24_WMDE_Desktop_EN_05/styles/styles.scss b/banners/english/C24_WMDE_Desktop_EN_05/styles/styles.scss index fba213019..1e0e5a7f3 100644 --- a/banners/english/C24_WMDE_Desktop_EN_05/styles/styles.scss +++ b/banners/english/C24_WMDE_Desktop_EN_05/styles/styles.scss @@ -43,8 +43,9 @@ @use 'src/themes/Treedip/DonationForm/Forms/MainDonationForm' with ( $padding: 14px 0 0 ); -@use 'src/themes/Treedip/DonationForm/Forms/UpgradeToYearlyButtonForm'; -@use 'src/themes/Treedip/DonationForm/Forms/CustomAmountForm'; +@use 'src/themes/Treedip/DonationForm/Forms/UpgradeToYearlyButtonForm' with ( + $font-size: 14px +); @use 'src/themes/Treedip/Footer/FooterAlreadyDonated' with ( $right-column-width: 300px ); diff --git a/banners/english/C24_WMDE_Desktop_EN_05/styles/styles_var.scss b/banners/english/C24_WMDE_Desktop_EN_05/styles/styles_var.scss index 5b30b5ab3..7a126e0a0 100644 --- a/banners/english/C24_WMDE_Desktop_EN_05/styles/styles_var.scss +++ b/banners/english/C24_WMDE_Desktop_EN_05/styles/styles_var.scss @@ -43,8 +43,9 @@ @use 'src/themes/Treedip/DonationForm/Forms/MainDonationFormDonationReceipt' with ( $padding: 14px 0 0 ); -@use 'src/themes/Treedip/DonationForm/Forms/UpgradeToYearlyButtonForm'; -@use 'src/themes/Treedip/DonationForm/Forms/CustomAmountForm'; +@use 'src/themes/Treedip/DonationForm/Forms/UpgradeToYearlyButtonForm' with ( + $font-size: 14px +); @use 'src/themes/Treedip/Footer/FooterAlreadyDonated' with ( $right-column-width: 300px ); diff --git a/campaign_info.toml b/campaign_info.toml index b7d6a1d76..798732e30 100644 --- a/campaign_info.toml +++ b/campaign_info.toml @@ -141,7 +141,7 @@ name = "English Desktop" icon = "desktop" campaign = "C24_WMDE_Desktop_EN_05" description = "Based on CTRL desktop EN 04" -campaign_tracking = "en05-ba-241125" +campaign_tracking = "en05-ba-241126" preview_link = "/wiki/Main_Page?devbanner={{banner}}&banner=B22_WMDE_local_prototype" preview_link_darkmode = "/wiki/Main_Page?devbanner={{banner}}&banner=B22_WMDE_local_prototype&vectornightmode=1" preview_url = 'https://en.wikipedia.org/wiki/Main_Page?banner={{banner}}&devMode' @@ -151,12 +151,12 @@ use_of_funds_source = "MediaWiki:WMDE_Fundraising/UseOfFunds_2024_EN" [english.banners.ctrl] filename = "./banners/english/C24_WMDE_Desktop_EN_05/banner_ctrl.ts" pagename = "B24_WMDE_Desktop_EN_05_ctrl" -tracking = "org-en05-241125-ctrl" +tracking = "org-en05-241126-ctrl" [english.banners.var] filename = "./banners/english/C24_WMDE_Desktop_EN_05/banner_var.ts" pagename = "B24_WMDE_Desktop_EN_05_var" -tracking = "org-en05-241125-var" +tracking = "org-en05-241126-var" [english.test_matrix] platform = ["edge", "firefox_win10", "chrome_win10", "safari", "firefox_macos", "chrome_macos", "firefox_linux", "chrome_linux"] diff --git a/package-lock.json b/package-lock.json index 6f0bbfaba..3d5f71755 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4499,9 +4499,9 @@ "license": "MIT" }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -6637,7 +6637,7 @@ }, "node_modules/fundraising-frontend-content": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/wmde/fundraising-frontend-content.git#a15a417b75aba9b485df180e537047b4b47f065a", + "resolved": "git+ssh://git@github.com/wmde/fundraising-frontend-content.git#23c5bb8aa1130d6d1a8ca95ce939e95e8751a5d2", "license": "CC0-1.0" }, "node_modules/get-intrinsic": { @@ -8920,9 +8920,9 @@ "license": "MIT" }, "node_modules/npm-run-all/node_modules/cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", + "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", "dev": true, "license": "MIT", "dependencies": { diff --git a/src/components/DonationForm/Forms/MainDonationFormPaymentsAndReceiptButton.vue b/src/components/DonationForm/Forms/MainDonationFormPaymentsAndReceiptButton.vue new file mode 100644 index 000000000..a64f6820c --- /dev/null +++ b/src/components/DonationForm/Forms/MainDonationFormPaymentsAndReceiptButton.vue @@ -0,0 +1,36 @@ + + + diff --git a/src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue b/src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue index 2649f47bc..ffe5d9741 100644 --- a/src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue +++ b/src/components/UseOfFunds/Infographics/WMDEFundsForwardingEN.vue @@ -1,551 +1,4 @@ - - diff --git a/src/themes/Treedip/DonationForm/BubbleForm/SelectCustomAmountRadioBubble.scss b/src/themes/Treedip/DonationForm/BubbleForm/SelectCustomAmountRadioBubble.scss index 68dd716bc..a7604bd17 100644 --- a/src/themes/Treedip/DonationForm/BubbleForm/SelectCustomAmountRadioBubble.scss +++ b/src/themes/Treedip/DonationForm/BubbleForm/SelectCustomAmountRadioBubble.scss @@ -71,3 +71,14 @@ $font-size: 0.9em !default; } } } + +html[ lang='en' ] .wmde-banner { + .wmde-banner-select-custom-amount-euro-symbol { + right: auto; + left: 20px; + } + + .wmde-banner-select-custom-amount-input { + padding: 0 10px 0 30px; + } +} diff --git a/src/themes/Treedip/DonationForm/Forms/MainDonationFormDonationReceipt.scss b/src/themes/Treedip/DonationForm/Forms/MainDonationFormDonationReceipt.scss index 4fc1a296f..279055b90 100644 --- a/src/themes/Treedip/DonationForm/Forms/MainDonationFormDonationReceipt.scss +++ b/src/themes/Treedip/DonationForm/Forms/MainDonationFormDonationReceipt.scss @@ -26,6 +26,7 @@ $padding: 0 !default; &-form-donation-receipt-checkbox { input[ type='checkbox' ] { + cursor: pointer; appearance: none; background: var( --input-checkbox-background ); border: 1px solid var( --input-checkbox-border ); @@ -37,5 +38,9 @@ $padding: 0 !default; border-color: var( --input-checkbox-border-checked ); } } + + label { + cursor: pointer; + } } } diff --git a/test/components/DonationForm/Forms/MainDonationFormPaymentsAndReceiptButton.spec.ts b/test/components/DonationForm/Forms/MainDonationFormPaymentsAndReceiptButton.spec.ts new file mode 100644 index 000000000..dc4b3afd4 --- /dev/null +++ b/test/components/DonationForm/Forms/MainDonationFormPaymentsAndReceiptButton.spec.ts @@ -0,0 +1,79 @@ +import { describe, expect, test } from 'vitest'; +import { useFormModel } from '@src/components/composables/useFormModel'; +import { shallowMount } from '@vue/test-utils'; +import { Intervals } from '@src/utils/FormItemsBuilder/fields/Intervals'; +import { PaymentMethods } from '@src/utils/FormItemsBuilder/fields/PaymentMethods'; +import MainDonationFormPaymentsAndReceiptButton from '@src/components/DonationForm/Forms/MainDonationFormPaymentsAndReceiptButton.vue'; +import { AddressTypes } from '@src/utils/FormItemsBuilder/fields/AddressTypes'; + +const translate = ( key: string ): string => key; + +describe( 'MainDonationFormPaymentsAndReceiptButton.vue', () => { + + test.each( [ + [ Intervals.ONCE.value, 'submit-label-short' ], + [ Intervals.MONTHLY.value, 'submit-label' ], + [ Intervals.BIANNUAL.value, 'submit-label' ], + [ Intervals.YEARLY.value, 'submit-label' ], + [ Intervals.QUARTERLY.value, 'submit-label' ] + ] )( 'shows the correct label for interval %i', ( interval: string, label: string ) => { + const formModel = useFormModel(); + formModel.interval.value = interval; + formModel.addressType.value = interval; + formModel.paymentMethod.value = PaymentMethods.PAYPAL.value; + + const wrapper = shallowMount( MainDonationFormPaymentsAndReceiptButton, { + global: { + provide: { + translator: { translate } + } + } + } ); + + expect( wrapper.text() ).toStrictEqual( label ); + } ); + + test.each( [ + [ AddressTypes.ANONYMOUS.value, 'submit-label-paypal' ], + [ AddressTypes.EMAIL.value, 'submit-label' ], + [ AddressTypes.FULL.value, 'submit-label' ] + ] )( 'shows the correct label for address type %s', ( addressType: string, label: string ) => { + const formModel = useFormModel(); + formModel.addressType.value = addressType; + formModel.paymentMethod.value = PaymentMethods.PAYPAL.value; + + const wrapper = shallowMount( MainDonationFormPaymentsAndReceiptButton, { + global: { + provide: { + translator: { translate } + } + } + } ); + + expect( wrapper.text() ).toStrictEqual( label ); + } ); + + test.each( [ + [ PaymentMethods.PAYPAL.value, 'submit-label-paypal' ], + [ PaymentMethods.BANK_TRANSFER.value, 'submit-label-bank-transfer' ], + [ PaymentMethods.CREDIT_CARD.value, 'submit-label-credit-card' ], + [ PaymentMethods.SOFORT.value, 'submit-label-sofort' ], + [ PaymentMethods.DIRECT_DEBIT.value, 'submit-label' ] + ] )( 'shows the correct label when anonymous for payment method %s', ( paymentMethod: string, label: string ) => { + const formModel = useFormModel(); + formModel.interval.value = Intervals.MONTHLY.value; + formModel.addressType.value = AddressTypes.ANONYMOUS.value; + formModel.paymentMethod.value = paymentMethod; + + const wrapper = shallowMount( MainDonationFormPaymentsAndReceiptButton, { + global: { + provide: { + translator: { translate } + } + } + } ); + + expect( wrapper.text() ).toStrictEqual( label ); + } ); + +} );