Skip to content

Commit

Permalink
Implement VAR for C23_WMDE_Mobile_DE_05
Browse files Browse the repository at this point in the history
Var banner has 2 buttons, the new one preselects
the amount 5 in the form.

Ticket: https://phabricator.wikimedia.org/T346884
  • Loading branch information
Abban authored and gbirke committed Oct 9, 2023
1 parent 0193b8d commit c3990fa
Show file tree
Hide file tree
Showing 12 changed files with 571 additions and 12 deletions.
4 changes: 2 additions & 2 deletions banners/mobile/banner_var.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { createVueApp } from '@src/createVueApp';

import './styles/styles.scss';
import './styles/styles_var.scss';

import BannerConductor from '@src/components/BannerConductor/BannerConductor.vue';
import Banner from './components/BannerCtrl.vue';
import Banner from './components/BannerVar.vue';
import getBannerDelay from '@src/utils/getBannerDelay';
import { WindowResizeHandler } from '@src/utils/ResizeHandler';
import PageWPORG from '@src/page/PageWPORG';
Expand Down
161 changes: 161 additions & 0 deletions banners/mobile/components/BannerVar.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
<template>
<div class="wmde-banner-wrapper" :class="contentState">
<MiniBanner
@close="onCloseMiniBanner"
@show-full-page-banner="onshowFullPageBanner"
@show-full-page-banner-preselected="onshowFullPageBannerPreselected"
>
<template #banner-slides>
<KeenSlider :with-navigation="false" :play="slideshowShouldPlay" :interval="5000">

<template #slides="{ currentSlide }: any">
<BannerSlides :currentSlide="currentSlide"/>
</template>

</KeenSlider>
</template>
</MiniBanner>

<FullPageBanner
@showFundsModal="isFundsModalVisible = true"
@close="() => onClose( 'FullPageBanner', CloseChoices.Hide )"
>
<template #banner-text>
<BannerText/>
</template>

<template #donation-form="{ formInteraction }: any">
<MultiStepDonation :step-controllers="stepControllers" @form-interaction="formInteraction" :page-scroller="pageScroller">

<template #[FormStepNames.MainDonationFormStep]="{ pageIndex, submit, isCurrent, previous }: any">
<MainDonationForm :page-index="pageIndex" @submit="submit" :is-current="isCurrent" @previous="previous"/>
</template>

<template #[FormStepNames.UpgradeToYearlyFormStep]="{ pageIndex, submit, isCurrent, previous }: any">
<UpgradeToYearlyButtonForm :page-index="pageIndex" @submit="submit" :is-current="isCurrent" @previous="previous">
<template #back>
<ChevronLeftIcon/> {{ $translate( 'back-button' ) }}
</template>
</UpgradeToYearlyButtonForm>
</template>

</MultiStepDonation>
</template>

<template #footer>
<BannerFooter :show-funds-link="false"/>
</template>
</FullPageBanner>

<SoftClose
v-if="contentState === ContentStates.SoftClosing"
@close="() => onClose( 'SoftClose', CloseChoices.Close )"
@maybe-later="() => onClose( 'SoftClose', CloseChoices.MaybeLater )"
@time-out-close="() => onClose( 'SoftClose', CloseChoices.TimeOut )"
/>

<FundsModal
:content="useOfFundsContent"
:is-funds-modal-visible="isFundsModalVisible"
@hideFundsModal="onHideFundsModal"
/>
</div>
</template>

<script setup lang="ts">
import { BannerStates } from '@src/components/BannerConductor/StateMachine/BannerStates';
import SoftClose from '@src/components/SoftClose/SoftClose.vue';
import { computed, inject, ref, watch } from 'vue';
import FullPageBanner from './FullPageBanner.vue';
import MiniBanner from './MiniBannerVar.vue';
import FundsModal from '@src/components/UseOfFunds/FundsModal.vue';
import { UseOfFundsContent as useOfFundsContentInterface } from '@src/domain/UseOfFunds/UseOfFundsContent';
import { UseOfFundsCloseSources } from '@src/components/UseOfFunds/UseOfFundsCloseSources';
import { PageScroller } from '@src/utils/PageScroller/PageScroller';
import MainDonationForm from '@src/components/DonationForm/Forms/MainDonationForm.vue';
import MultiStepDonation from '@src/components/DonationForm/MultiStepDonation.vue';
import BannerText from '../content/BannerText.vue';
import UpgradeToYearlyButtonForm from '@src/components/DonationForm/Forms/UpgradeToYearlyButtonForm.vue';
import BannerSlides from '../content/BannerSlides.vue';
import BannerFooter from '@src/components/Footer/BannerFooter.vue';
import ChevronLeftIcon from '@src/components/Icons/ChevronLeftIcon.vue';
import KeenSlider from '@src/components/Slider/KeenSlider.vue';
import { Tracker } from '@src/tracking/Tracker';
import { MobileMiniBannerExpandedEvent } from '@src/tracking/events/MobileMiniBannerExpandedEvent';
import { useFormModel } from '@src/components/composables/useFormModel';
import {
createSubmittableMainDonationForm
} from '@src/components/DonationForm/StepControllers/SubmittableMainDonationForm';
import {
createSubmittableUpgradeToYearly
} from '@src/components/DonationForm/StepControllers/SubmittableUpgradeToYearly';
import { CloseChoices } from '@src/domain/CloseChoices';
import { CloseEvent } from '@src/tracking/events/CloseEvent';
import { TrackingFeatureName } from '@src/tracking/TrackingEvent';
enum ContentStates {
Mini = 'wmde-banner-wrapper--mini',
FullPage = 'wmde-banner-wrapper--full-page',
SoftClosing = 'wmde-banner-wrapper--soft-closing'
}
enum FormStepNames {
MainDonationFormStep = 'MainDonationForm',
UpgradeToYearlyFormStep = 'UpgradeToYearlyForm'
}
interface Props {
bannerState: BannerStates;
useOfFundsContent: useOfFundsContentInterface;
pageScroller: PageScroller;
}
const props = defineProps<Props>();
const emit = defineEmits( [ 'bannerClosed', 'bannerContentChanged' ] );
const tracker = inject<Tracker>( 'tracker' );
const isFundsModalVisible = ref<boolean>( false );
const slideShowStopped = ref<boolean>( false );
const slideshowShouldPlay = computed( () => props.bannerState === BannerStates.Visible && !slideShowStopped.value );
const contentState = ref<ContentStates>( ContentStates.Mini );
const formModel = useFormModel();
const stepControllers = [
createSubmittableMainDonationForm( formModel, FormStepNames.UpgradeToYearlyFormStep ),
createSubmittableUpgradeToYearly( formModel, FormStepNames.MainDonationFormStep, FormStepNames.MainDonationFormStep )
];
watch( contentState, async () => {
emit( 'bannerContentChanged' );
} );
function onCloseMiniBanner(): void {
contentState.value = ContentStates.SoftClosing;
}
function onClose( feature: TrackingFeatureName, userChoice: CloseChoices ): void {
emit( 'bannerClosed', new CloseEvent( feature, userChoice ) );
}
function onshowFullPageBanner(): void {
slideShowStopped.value = true;
contentState.value = ContentStates.FullPage;
tracker.trackEvent( new MobileMiniBannerExpandedEvent() );
}
function onshowFullPageBannerPreselected(): void {
slideShowStopped.value = true;
formModel.selectedAmount.value = '5';
contentState.value = ContentStates.FullPage;
tracker.trackEvent( new MobileMiniBannerExpandedEvent( 'preselected' ) );
}
const onHideFundsModal = ( payload: { source: UseOfFundsCloseSources } ): void => {
props.pageScroller.scrollIntoView( payload.source === UseOfFundsCloseSources.callToAction ?
'.wmde-banner-form' :
'.wmde-banner-full-small-print .wmde-banner-footer-usage-link'
);
isFundsModalVisible.value = false;
};
</script>
37 changes: 37 additions & 0 deletions banners/mobile/components/MiniBannerVar.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<template>
<div class="wmde-banner-mini">
<div class="wmde-banner-mini-close">
<button class="wmde-banner-mini-close-button t-close-main-banner" @click.prevent="$emit( 'close' )">
<CloseIconMobile/>
</button>
</div>

<header class="wmde-banner-mini-headline">
<div class="wmde-banner-mini-headline-background">
<span class="wmde-banner-mini-headline-content">Ist Ihnen Wikipedia 5&nbsp;€ wert?</span>
</div>
</header>

<div class="wmde-banner-mini-slideshow">
<slot name="banner-slides"/>
</div>

<div class="wmde-banner-mini-button-group">
<button class="wmde-banner-mini-button-preselect" @click="$emit( 'showFullPageBannerPreselected' )">
Jetzt 5&euro; spenden
</button>
<button class="wmde-banner-mini-button" @click="$emit( 'showFullPageBanner' )">
Anderen Betrag
</button>
</div>

</div>
</template>

<script setup lang="ts">
import CloseIconMobile from '@src/components/Icons/CloseIconMobile.vue';
defineEmits( [ 'showFullPageBanner', 'showFullPageBannerPreselected', 'close' ] );
</script>
6 changes: 2 additions & 4 deletions banners/mobile/content/BannerSlides.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@

<KeenSliderSlide :is-current="currentSlide === 2">
<p>
<span class="wmde-banner-text-animated-highlight">
Millionen Menschen nutzen Wikipedia, aber 99 % spenden nicht – sie übergehen diesen Aufruf.
</span>
Die meisten Menschen spenden, weil sie Wikipedia nützlich finden.</p>
<span class="wmde-banner-text-animated-highlight">Millionen Menschen nutzen Wikipedia, aber 99 % spenden nicht
– sie übergehen diesen Aufruf.</span> Die meisten Menschen spenden, weil sie Wikipedia nützlich finden.</p>
</KeenSliderSlide>

<KeenSliderSlide :is-current="currentSlide === 3">
Expand Down
6 changes: 2 additions & 4 deletions banners/mobile/content/BannerText.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
<p>
vielleicht kommen wir gerade ungelegen, aber dennoch: Klicken Sie jetzt bitte nicht weg! Am
heutigen {{ currentDayName }} bitten wir Sie bescheiden, die Unabhängigkeit von Wikipedia zu
unterstützen.
<span class="wmde-banner-text-animated-highlight">
Millionen Menschen nutzen Wikipedia, aber 99 % spenden nicht – sie übergehen diesen Aufruf.
</span>
unterstützen. <span class="wmde-banner-text-animated-highlight">Millionen Menschen nutzen Wikipedia,
aber 99 % spenden nicht – sie übergehen diesen Aufruf.</span>
Die meisten Menschen spenden, weil sie Wikipedia nützlich finden. Die durchschnittliche Spende
beträgt 22,25&nbsp;€, doch bereits 5 € helfen uns weiter. Hat Wikipedia Ihnen in
diesem Jahr Wissen im Wert einer Tasse Kaffee geschenkt? <strong>Dann entscheiden Sie sich, eine der
Expand Down
2 changes: 1 addition & 1 deletion banners/mobile/event_map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { WMDESizeIssueEvent } from '@src/tracking/WPORG/WMDEBannerSizeIssue';
export default new Map<string, TrackingEventConverterFactory>( [
[ CloseEvent.EVENT_NAME, mapCloseEvent ],
[ MobileMiniBannerExpandedEvent.EVENT_NAME,
( e: MobileMiniBannerExpandedEvent ): WMDELegacyBannerEvent => new WMDELegacyBannerEvent( e.eventName, 1 ) ],
( e: MobileMiniBannerExpandedEvent ): WMDELegacyBannerEvent => new WMDELegacyBannerEvent( e.eventName + ( e.userChoice !== '' ? `-${e.userChoice}` : '' ), 1 ) ],
[ FormStepShownEvent.EVENT_NAME, mapFormStepShownEvent ],
[ NotShownEvent.EVENT_NAME, mapNotShownEvent ],

Expand Down
3 changes: 2 additions & 1 deletion banners/mobile/messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ const messages: TranslationMessages = {
'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-prompt': 'Wikipedia später unterstützen?',
'use-of-funds-link': 'Was Ihre Spende bewirkt'
};

export default messages;
Loading

0 comments on commit c3990fa

Please sign in to comment.