diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/FormController.ts b/banners/wpde_mobile/C24_WPDE_Mobile_01/FormController.ts new file mode 100644 index 000000000..e69de29bb diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_ctrl.ts b/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_ctrl.ts new file mode 100644 index 000000000..3315f7c59 --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_ctrl.ts @@ -0,0 +1,72 @@ +import { createVueApp } from '@src/createVueApp'; + +import './styles/styles.scss'; + +import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue'; +import Banner from './components/BannerCtrl.vue'; +import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment'; +import { WindowResizeHandler } from '@src/utils/ResizeHandler'; +import PageWPDE from '@src/page/PageWPDE'; +import TranslationPlugin from '@src/TranslationPlugin'; +import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller'; +import { TrackerWPDE } from '@src/tracking/TrackerWPDE'; +import eventMap from './event_map'; +import { Translator } from '@src/Translator'; +import DynamicTextPlugin from '@src/DynamicTextPlugin'; +import { LocalImpressionCount } from '@src/utils/LocalImpressionCount'; + +// Channel specific form setup +import { createFormItems } from './form_items'; +import { createFormActions } from '@src/createFormActions'; + +// Content +import messages from './messages'; +import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe'; + +const localeFactory = new LocaleFactoryWpDe(); +const translator = new Translator( messages ); + +// Tracking placeholders will be replaced by webpack string-replace-loader +// using the campaign configuration ( campaign_info.toml ) for the correct values +const tracking = { + campaign: '!insert-campaign-here!', + keyword: '!insert-keyword-here!' +}; + +const page = new PageWPDE( tracking ); +const runtimeEnvironment = new UrlRuntimeEnvironment( window.location ); +const impressionCount = new LocalImpressionCount( page.getTracking().keyword, runtimeEnvironment ); +const tracker = new TrackerWPDE( 'FundraisingTracker', page.getTracking().keyword, eventMap, runtimeEnvironment ); + +const app = createVueApp( BannerConductor, { + page, + bannerConfig: { + delay: runtimeEnvironment.getBannerDelay( 0 ), + transitionDuration: 1000 + }, + bannerProps: { + useOfFundsContent: localeFactory.getUseOfFundsLoader().getContent(), + pageScroller: new WindowPageScroller(), + remainingImpressions: impressionCount.getRemainingImpressions( page.getMaxBannerImpressions() ) + }, + resizeHandler: new WindowResizeHandler(), + banner: Banner, + 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 ) ); +app.provide( 'tracker', tracker ); + +app.mount( page.getBannerContainer() ); diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_var.ts b/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_var.ts new file mode 100644 index 000000000..3811316ce --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/banner_var.ts @@ -0,0 +1,72 @@ +import { createVueApp } from '@src/createVueApp'; + +import './styles/styles.scss'; + +import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue'; +import Banner from './components/BannerVar.vue'; +import { UrlRuntimeEnvironment } from '@src/utils/RuntimeEnvironment'; +import { WindowResizeHandler } from '@src/utils/ResizeHandler'; +import PageWPDE from '@src/page/PageWPDE'; +import TranslationPlugin from '@src/TranslationPlugin'; +import { WindowPageScroller } from '@src/utils/PageScroller/WindowPageScroller'; +import { TrackerWPDE } from '@src/tracking/TrackerWPDE'; +import eventMap from './event_map'; +import { Translator } from '@src/Translator'; +import DynamicTextPlugin from '@src/DynamicTextPlugin'; +import { LocalImpressionCount } from '@src/utils/LocalImpressionCount'; + +// Channel specific form setup +import { createFormItems } from './form_items'; +import { createFormActions } from '@src/createFormActions'; + +// Content +import messages from './messages'; +import { LocaleFactoryWpDe } from '@src/utils/LocaleFactory/LocaleFactoryWpDe'; + +const localeFactory = new LocaleFactoryWpDe(); +const translator = new Translator( messages ); + +// Tracking placeholders will be replaced by webpack string-replace-loader +// using the campaign configuration ( campaign_info.toml ) for the correct values +const tracking = { + campaign: '!insert-campaign-here!', + keyword: '!insert-keyword-here!' +}; + +const page = new PageWPDE( tracking ); +const runtimeEnvironment = new UrlRuntimeEnvironment( window.location ); +const impressionCount = new LocalImpressionCount( page.getTracking().keyword, runtimeEnvironment ); +const tracker = new TrackerWPDE( 'FundraisingTracker', page.getTracking().keyword, eventMap, runtimeEnvironment ); + +const app = createVueApp( BannerConductor, { + page, + bannerConfig: { + delay: runtimeEnvironment.getBannerDelay( 0 ), + transitionDuration: 1000 + }, + bannerProps: { + useOfFundsContent: localeFactory.getUseOfFundsLoader().getContent(), + pageScroller: new WindowPageScroller(), + remainingImpressions: impressionCount.getRemainingImpressions( page.getMaxBannerImpressions() ) + }, + resizeHandler: new WindowResizeHandler(), + banner: Banner, + 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 ) ); +app.provide( 'tracker', tracker ); + +app.mount( page.getBannerContainer() ); diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerCtrl.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerCtrl.vue new file mode 100644 index 000000000..9a2291096 --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerCtrl.vue @@ -0,0 +1,215 @@ + + + diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerVar.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerVar.vue new file mode 100644 index 000000000..8a2fb018f --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerVar.vue @@ -0,0 +1,215 @@ + + + diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/components/FullPageBanner.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/FullPageBanner.vue new file mode 100644 index 000000000..89eb818a4 --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/FullPageBanner.vue @@ -0,0 +1,40 @@ + + + diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/components/MiniBanner.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/MiniBanner.vue new file mode 100644 index 000000000..9961c3107 --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/MiniBanner.vue @@ -0,0 +1,36 @@ + + + diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/components/MiniBannerVar.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/MiniBannerVar.vue new file mode 100644 index 000000000..19875a8ab --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/components/MiniBannerVar.vue @@ -0,0 +1,36 @@ + + + diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlides.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlides.vue new file mode 100644 index 000000000..79c51b5f0 --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlides.vue @@ -0,0 +1,67 @@ + + + diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlidesVar.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlidesVar.vue new file mode 100644 index 000000000..1e8b78623 --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerSlidesVar.vue @@ -0,0 +1,66 @@ + + + diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerText.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerText.vue new file mode 100644 index 000000000..f3131e2ed --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerText.vue @@ -0,0 +1,51 @@ + + + diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerTextVar.vue b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerTextVar.vue new file mode 100644 index 000000000..42d80a9f1 --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/content/BannerTextVar.vue @@ -0,0 +1,51 @@ + + + diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/event_map.ts b/banners/wpde_mobile/C24_WPDE_Mobile_01/event_map.ts new file mode 100644 index 000000000..ea0e58a98 --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/event_map.ts @@ -0,0 +1,15 @@ +import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent'; +import { CloseEvent } from '@src/tracking/events/CloseEvent'; +import { ShownEvent } from '@src/tracking/events/ShownEvent'; +import { FormStepShownEvent } from '@src/tracking/events/FormStepShownEvent'; +import { CustomAmountChangedEvent } from '@src/tracking/events/CustomAmountChangedEvent'; +import { BannerSubmitEvent } from '@src/tracking/events/BannerSubmitEvent'; + +export default new Map( [ + [ MobileMiniBannerExpandedEvent.EVENT_NAME, 1 ], + [ CloseEvent.EVENT_NAME, 0.1 ], + [ ShownEvent.EVENT_NAME, 1 ], + [ FormStepShownEvent.EVENT_NAME, 1 ], + [ CustomAmountChangedEvent.EVENT_NAME, 1 ], + [ BannerSubmitEvent.EVENT_NAME, 1 ] +] ); diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/form_items.ts b/banners/wpde_mobile/C24_WPDE_Mobile_01/form_items.ts new file mode 100644 index 000000000..a3c657221 --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/form_items.ts @@ -0,0 +1,23 @@ +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.YEARLY + ) + .setAmounts( 5, 15, 25, 50, 100 ) + .setPaymentMethods( + PaymentMethods.PAYPAL, + PaymentMethods.CREDIT_CARD, + PaymentMethods.DIRECT_DEBIT, + PaymentMethods.BANK_TRANSFER, + PaymentMethods.SOFORT + ).getItems(); +} diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/messages.ts b/banners/wpde_mobile/C24_WPDE_Mobile_01/messages.ts new file mode 100644 index 000000000..b9601b241 --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/messages.ts @@ -0,0 +1,33 @@ +import CustomAmountFormDe from '@src/components/DonationForm/Forms/messages/CustomAmountForm.de'; +import DynamicCampaignTextDe from '@src/utils/DynamicContent/messages/DynamicCampaignText.de'; +import { TranslationMessages } from '@src/Translator'; +import UpgradeToYearlyDe from '@src/components/DonationForm/Forms/messages/UpgradeToYearly.de'; +import SoftCloseDe from '@src/components/SoftClose/messages/SoftClose.de'; +import AddressFormDe from '@src/components/DonationForm/Forms/messages/AddressForm.de'; +import FooterDe from '@src/components/Footer/messages/Footer.de'; +import MainDonationFormDe from '@src/components/DonationForm/Forms/messages/MainDonationForm.de'; + +const messages: TranslationMessages = { + ...CustomAmountFormDe, + ...DynamicCampaignTextDe, + ...UpgradeToYearlyDe, + ...SoftCloseDe, + ...AddressFormDe, + ...FooterDe, + ...MainDonationFormDe, + + // custom messages here + 'address-type-notice-full': 'Nur so können wir Ihnen eine Spendenquittung per Post zusenden. Außerdem erhalten ' + + 'Sie eine Bestätigung per E-Mail.', + 'address-type-notice-none': 'Sie verzichten sowohl auf eine Spendenquittung als auch auf eine Bestätigung ' + + 'per E-Mail. Sie erhalten von uns keine Information, wenn Wikipedia wieder Hilfe braucht.', + 'soft-close-prompt': 'Wikipedia später unterstützen?', + 'soft-close-button-already-donated': 'Habe schon gespendet', + 'upgrade-to-yearly-copy': '

Jedes Jahr sind wir auf die Unterstützung von Menschen wie Ihnen angewiesen.' + + ' Jährliche Spenden helfen uns nachhaltig und ermöglichen langfristige Weiterentwicklungen.

' + + '

Sie gehen kein Risiko ein: Jederzeit formlos zu sofort kündbar.

', + 'payment-sofort': 'Sofort', + 'payment-bank-transfer': 'Überweisung' +}; + +export default messages; diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/styles/Banner.scss b/banners/wpde_mobile/C24_WPDE_Mobile_01/styles/Banner.scss new file mode 100644 index 000000000..124f9f157 --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/styles/Banner.scss @@ -0,0 +1,55 @@ +@use 'src/themes/Mikings/variables/globals'; +@use 'src/themes/Mikings/variables/fonts'; + +@keyframes hide-mini { + 0% { + opacity: 1; + } + 99% { + opacity: 0; + } + 100% { + display: none; + } +} + +.wmde-banner { + + &-full { + visibility: hidden; + opacity: 0; + transform: scale( 1.1 ); + transition: opacity 500ms globals.$banner-easing, transform 500ms globals.$banner-easing; + } + + &-wrapper { + font-size: 16px; + font-family: fonts.$ui; + box-shadow: 0 3px 0.6em rgba( 60 60 60 / 40% ); + background-color: var( --main-background ); + color: var( --main-color ); + + &--full-page { + .wmde-banner-mini { + animation: hide-mini 500ms; + } + .wmde-banner-full { + visibility: visible; + opacity: 1; + transform: scale( 1 ); + } + } + + &--soft-closing { + .wmde-banner-mini { + display: none; + } + } + } + + &--closed { + .wmde-banner-wrapper { + display: none; + } + } +} diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/styles/FullPageBanner.scss b/banners/wpde_mobile/C24_WPDE_Mobile_01/styles/FullPageBanner.scss new file mode 100644 index 000000000..a0fe64711 --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/styles/FullPageBanner.scss @@ -0,0 +1,105 @@ +@use '@src/themes/Mikings/variables/globals'; +@use '@src/themes/Mikings/variables/breakpoints'; + +.wmde-banner { + &-form-field-group { + border: 0; + } + + &-full { + position: fixed; + top: 0; + z-index: 1000; + border: 2px solid var( --full-border ); + background: var( --full-background ); + height: 100vh; + width: 100vw; + + &-content { + overflow-y: auto; + height: 100%; + width: 100%; + } + + p { + margin: 0; + padding-bottom: 16px; + line-height: 25px; + } + + &-close { + position: absolute; + top: 16px; + right: 16px; + height: 35px; + width: 35px; + padding: 5px; + background: var( --full-background ); + z-index: 99; + border-radius: 50%; + border: 0; + + &:hover { + cursor: pointer; + } + + .close-button { + text-decoration: underline; + } + } + + &-info { + padding: 16px; + } + + &-call-to-action { + position: relative; + color: var( --full-cta-color ); + background: var( --full-cta-background ); + font-weight: bold; + height: 31px; + line-height: 31px; + text-align: center; + + &-optional-text { + display: none; + + @include breakpoints.tablet-portrait-up { + display: inline; + } + } + + &::after { + content: ''; + position: absolute; + bottom: -4px; + left: 50%; + margin-left: -4px; + width: 0; + height: 0; + border-style: solid; + border-width: 4px 4px 0; + border-color: var( --full-cta-background ) transparent transparent transparent; + } + } + + .banner-text-title { + margin-right: 30px; + } + + &-small-print { + text-align: center; + font-size: 12px; + margin-bottom: 16px; + + a { + color: var( --full-smallprint-color ); + + &:hover, + &:focus { + text-decoration: underline; + } + } + } + } +} diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/styles/MiniBanner.scss b/banners/wpde_mobile/C24_WPDE_Mobile_01/styles/MiniBanner.scss new file mode 100644 index 000000000..9c11c7cbf --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/styles/MiniBanner.scss @@ -0,0 +1,157 @@ +@use '@src/themes/Mikings/variables/globals'; + +$height: 267px !default; + +.wmde-banner { + &-mini { + display: flex; + flex-direction: column; + min-height: $height; + padding: 16px 0; + position: relative; + border: 2px solid var( --mini-border ); + background: var( --mini-background ); + + &-close { + position: absolute; + height: 36px; + width: 36px; + top: 11px; + right: 16px; + text-align: center; + background: var( --mini-close-background ); + padding: 10px; + z-index: 2; + + &-button { + border: none; + margin-top: auto; + float: right; + height: 16px; + line-height: 16px; + width: 16px; + background: var( --mini-close-background ); + z-index: 2; + + svg { + height: 16px; + width: 16px; + } + + &:hover { + cursor: pointer; + } + } + } + + &-headline { + height: 25px; + text-align: center; + margin: 0 16px 16px; + + &-background { + position: relative; + text-align: left; + + @media ( min-width: 400px ) { + text-align: center; + } + + /* single line above container */ + &::before { + content: ''; + display: block; + background: var( --mini-headline-line ); + width: 100%; + height: 1px; + position: absolute; + top: 50%; + z-index: 1; + } + } + + &-content { + position: relative; + display: inline-block; + font-weight: bold; + font-size: 14px; + line-height: 25px; + color: var( --mini-headline-color ); + background: var( --mini-headline-background ); + padding: 0 5px; + z-index: 2; + white-space: nowrap; + + @media ( min-width: 330px ) { + font-size: 16px; + } + + @media ( min-width: 360px ) { + font-size: 18px; + } + } + } + + &-slideshow { + display: flex; + flex-direction: column; + flex: 1 1 auto; + } + + &-button-group { + display: flex; + justify-content: center; + } + + &-button, + &-button-preselect { + width: 50%; + height: 40px; + border: none; + border-radius: 20px; + font-weight: bold; + color: var( --mini-button-color ); + margin: 0 16px; + font-size: 14px; + white-space: nowrap; + + @media ( min-width: 370px ) { + font-size: 16px; + } + } + + &-button { + background: var( --mini-button-background ); + + &:hover, + &:focus { + background: var( --mini-button-background-hover ); + } + } + + &-button-preselect { + background: var( --mini-button-alt-background ); + + &:hover, + &:focus { + background: var( --mini-button-alt-background-hover ); + } + } + + .smallprint-mini { + text-align: center; + font-size: 11px; + margin-top: 12px; + margin-bottom: -5px; + + a { + color: var( --mini-smallprint-color ); + + &:hover, + &:focus { + text-decoration: underline; + } + } + } + } +} diff --git a/banners/wpde_mobile/C24_WPDE_Mobile_01/styles/styles.scss b/banners/wpde_mobile/C24_WPDE_Mobile_01/styles/styles.scss new file mode 100644 index 000000000..79960925c --- /dev/null +++ b/banners/wpde_mobile/C24_WPDE_Mobile_01/styles/styles.scss @@ -0,0 +1,24 @@ +@use 'src/themes/Mikings/swatches/skin_default' with ( + $upgrade-to-yearly-button-form: true, + $progress-bar: true, + $soft-close: true +); +@use 'src/components/BannerConductor/banner-transition'; +@use 'src/themes/UseOfFunds/swatches/skin_default' as uof-default; +@use 'src/themes/UseOfFunds/UseOfFunds'; +@use 'src/themes/Mikings/defaults'; +@use './Banner'; +@use './MiniBanner' with ( + $height: 267px +); +@use './FullPageBanner'; +@use 'src/themes/Mikings/Footer/Footer'; +@use 'src/themes/Mikings/Footer/SelectionInput'; +@use 'src/themes/Mikings/DonationForm/MultiStepDonation'; +@use 'src/themes/Mikings/DonationForm/Forms/UpgradeToYearlyButtonForm'; +@use 'src/themes/Mikings/DonationForm/SubComponents/SelectGroup'; +@use 'src/themes/Mikings/DonationForm/SubComponents/SelectCustomAmount'; +@use 'src/themes/Mikings/DonationForm/SubComponents/SmsBox'; +@use 'src/themes/Mikings/Slider/Slider'; +@use 'src/themes/Mikings/ProgressBar/ProgressBar'; +@use 'src/themes/Mikings/SoftClose/SoftClose'; diff --git a/campaign_info.toml b/campaign_info.toml index 92b14daa2..919e3799c 100644 --- a/campaign_info.toml +++ b/campaign_info.toml @@ -115,9 +115,9 @@ tracking = "wpde-01-241028-var" [wikipediade_mobile] name = "WPDE Mobile" icon = "mobile" -campaign = "C24_WPDE_Mobile_00" -description = "Based on C23_WPDE_Mobile_01" -campaign_tracking = "wpde-mob00-240619" +campaign = "C24_WPDE_Mobile_01" +description = "Based on the control banner of last year's mobile-wpde-01" +campaign_tracking = "wpde-mob01-241028" preview_link = "/wikipedia.de?devbanner={{banner}}&banner=dev-mode-wpde" preview_link_darkmode = "/wikipedia.de?devbanner={{banner}}&banner=dev-mode-wpde" wrapper_template = "wikipedia_de" @@ -125,14 +125,14 @@ wrap_in_wikitext = false preview_url = 'https://www.wikipedia.de/?banner={{banner}}' [wikipediade_mobile.banners.ctrl] -filename = "./banners/wpde_mobile/C24_WPDE_Mobile_00/banner_ctrl.ts" -pagename = "B24_WPDE_Mobile_00_ctrl" -tracking = "wpde-mob00-240619-ctrl" +filename = "./banners/wpde_mobile/C24_WPDE_Mobile_01/banner_ctrl.ts" +pagename = "B24_WPDE_Mobile_01_ctrl" +tracking = "wpde-mob01-241028-ctrl" [wikipediade_mobile.banners.var] -filename = "./banners/wpde_mobile/C24_WPDE_Mobile_00/banner_var.ts" -pagename = "B24_WPDE_Mobile_00_var" -tracking = "wpde-mob00-240619-var" +filename = "./banners/wpde_mobile/C24_WPDE_Mobile_01/banner_var.ts" +pagename = "B24_WPDE_Mobile_01_var" +tracking = "wpde-mob01-241028-var" diff --git a/src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue b/src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue index ecd6c2e5e..e60be38a1 100644 --- a/src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue +++ b/src/components/SetWPDECookieImage/SetAlreadyDonatedCookieImage.vue @@ -1,8 +1,8 @@ diff --git a/test/banners/wpde_mobile/components/BannerCtrl.spec.ts b/test/banners/wpde_mobile/components/BannerCtrl.spec.ts index 6ee030f00..4078fee64 100644 --- a/test/banners/wpde_mobile/components/BannerCtrl.spec.ts +++ b/test/banners/wpde_mobile/components/BannerCtrl.spec.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, describe, vi, test } from 'vitest'; import { mount, VueWrapper } from '@vue/test-utils'; -import Banner from '@banners/wpde_mobile/C24_WPDE_Mobile_00/components/BannerCtrl.vue'; +import Banner from '@banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerCtrl.vue'; import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates'; import { PageScroller } from '@src/utils/PageScroller/PageScroller'; import { useOfFundsContent } from '@test/banners/useOfFundsContent'; @@ -76,8 +76,7 @@ describe( 'BannerCtrl.vue', () => { [ 'expectMainDonationFormSubmitsWhenYearlyIsSelected' ], [ 'expectMainDonationFormGoesToUpgrade' ], [ 'expectUpgradeToYearlyFormSubmitsUpgrade' ], - [ 'expectUpgradeToYearlyFormSubmitsDontUpgrade' ], - [ 'expectUpgradeToYearlyFormGoesToMainDonation' ] + [ 'expectUpgradeToYearlyFormSubmitsDontUpgrade' ] ] )( '%s', async ( testName: string ) => { await donationFormFeatures[ testName ]( getWrapper() ); } ); @@ -88,7 +87,6 @@ describe( 'BannerCtrl.vue', () => { [ 'expectShowsSoftCloseOnMiniBannerClose' ], [ 'expectDoesNotShowSoftCloseOnFullBannerClose' ], [ 'expectEmitsSoftCloseCloseEvent' ], - [ 'expectEmitsSoftCloseMaybeLaterEvent' ], [ 'expectEmitsSoftCloseTimeOutEvent' ], [ 'expectEmitsBannerContentChangedOnSoftClose' ], [ 'expectDoesNotShowSoftCloseOnFinalBannerImpression' ] @@ -100,8 +98,7 @@ describe( 'BannerCtrl.vue', () => { describe( 'Set Cookie Image', () => { test.each( [ [ 'expectSetsCookieImageOnSoftCloseClose' ], - [ 'expectSetsCookieImageOnSoftCloseTimeOut' ], - [ 'expectDoesNotSetCookieImageOnSoftCloseMaybeLater' ] + [ 'expectSetsCookieImageOnSoftCloseTimeOut' ] ] )( '%s', async ( testName: string ) => { await setCookieImageFeatures[ testName ]( getWrapper() ); } ); diff --git a/test/banners/wpde_mobile/components/BannerVar.spec.ts b/test/banners/wpde_mobile/components/BannerVar.spec.ts index a54674779..076db6212 100644 --- a/test/banners/wpde_mobile/components/BannerVar.spec.ts +++ b/test/banners/wpde_mobile/components/BannerVar.spec.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, describe, vi, test } from 'vitest'; import { mount, VueWrapper } from '@vue/test-utils'; -import Banner from '@banners/wpde_mobile/C24_WPDE_Mobile_00/components/BannerVar.vue'; +import Banner from '@banners/wpde_mobile/C24_WPDE_Mobile_01/components/BannerVar.vue'; import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates'; import { PageScroller } from '@src/utils/PageScroller/PageScroller'; import { useOfFundsContent } from '@test/banners/useOfFundsContent'; @@ -76,8 +76,7 @@ describe( 'BannerVar.vue', () => { [ 'expectMainDonationFormSubmitsWhenYearlyIsSelected' ], [ 'expectMainDonationFormGoesToUpgrade' ], [ 'expectUpgradeToYearlyFormSubmitsUpgrade' ], - [ 'expectUpgradeToYearlyFormSubmitsDontUpgrade' ], - [ 'expectUpgradeToYearlyFormGoesToMainDonation' ] + [ 'expectUpgradeToYearlyFormSubmitsDontUpgrade' ] ] )( '%s', async ( testName: string ) => { await donationFormFeatures[ testName ]( getWrapper() ); } ); @@ -88,7 +87,6 @@ describe( 'BannerVar.vue', () => { [ 'expectShowsSoftCloseOnMiniBannerClose' ], [ 'expectDoesNotShowSoftCloseOnFullBannerClose' ], [ 'expectEmitsSoftCloseCloseEvent' ], - [ 'expectEmitsSoftCloseMaybeLaterEvent' ], [ 'expectEmitsSoftCloseTimeOutEvent' ], [ 'expectEmitsBannerContentChangedOnSoftClose' ], [ 'expectDoesNotShowSoftCloseOnFinalBannerImpression' ] @@ -100,8 +98,7 @@ describe( 'BannerVar.vue', () => { describe( 'Set Cookie Image', () => { test.each( [ [ 'expectSetsCookieImageOnSoftCloseClose' ], - [ 'expectSetsCookieImageOnSoftCloseTimeOut' ], - [ 'expectDoesNotSetCookieImageOnSoftCloseMaybeLater' ] + [ 'expectSetsCookieImageOnSoftCloseTimeOut' ] ] )( '%s', async ( testName: string ) => { await setCookieImageFeatures[ testName ]( getWrapper() ); } ); diff --git a/test/features/SetCookieImageMobile.ts b/test/features/SetCookieImageMobile.ts index cac1a1104..9c5e82c06 100644 --- a/test/features/SetCookieImageMobile.ts +++ b/test/features/SetCookieImageMobile.ts @@ -2,8 +2,8 @@ import { VueWrapper } from '@vue/test-utils'; import { expect, vi } from 'vitest'; const expectSetsCookieImageOnSoftCloseClose = async ( wrapper: VueWrapper ): Promise => { - await wrapper.find( '.wmde-banner-mini-button' ).trigger( 'click' ); - await wrapper.find( '.wmde-banner-full-close' ).trigger( 'click' ); + await wrapper.find( '.wmde-banner-mini-close-button' ).trigger( 'click' ); + await wrapper.find( '.wmde-banner-soft-close-button-close' ).trigger( 'click' ); expect( wrapper.find( '.wmde-banner-set-cookie-image' ).exists() ).toBeTruthy(); }; @@ -12,7 +12,8 @@ const expectSetsCookieImageOnSoftCloseTimeOut = async ( wrapper: VueWrapper vi.useFakeTimers(); await wrapper.find( '.wmde-banner-mini-close-button' ).trigger( 'click' ); - await vi.runAllTimers(); + + await vi.runAllTimersAsync(); expect( wrapper.find( '.wmde-banner-set-cookie-image' ).exists() ).toBeTruthy();