Merge pull request #4580 from serlo/deactivate-donation-temporarily

chore(web): deactivate donation feature for now

Author: elbotho

apps/web/src/components/entity/entity-base.tsx

@@ -11,7 +11,6 @@ import { Breadcrumbs } from '../navigation/breadcrumbs'
 import { MaxWidthDiv } from '../navigation/max-width-div'
 import { SecondaryMenu } from '../navigation/secondary-menu'
 import { NewsletterPopup } from '../scripts/newsletter-popup'
-import type { DonationsBannerProps } from '@/components/content/donations-banner-experiment/donations-banner'
 import {
   type EntityPageBase,
   type SingleEntityPage,
@@ -31,12 +30,6 @@ const CommentAreaEntity = dynamic<CommentAreaEntityProps>(() =>
   )
 )
 
-const DonationsBanner = dynamic<DonationsBannerProps>(() =>
-  import(
-    '@/components/content/donations-banner-experiment/donations-banner'
-  ).then((mod) => mod.DonationsBanner)
-)
-
 export function EntityBase({ children, page, entityId }: EntityBaseProps) {
   const noComments =
     page.kind === 'single-entity' &&
@@ -70,11 +63,6 @@ export function EntityBase({ children, page, entityId }: EntityBaseProps) {
           />
           <main id="content">{children}</main>
 
-          {/* Temporary donations banner trial */}
-          {page.kind === 'single-entity' ? (
-            <DonationsBanner id={entityId} entityData={page.entityData} />
-          ) : null}
-
           <div id="comment-area-begin-scrollpoint" />
           {!noComments && (
             <>

apps/web/src/components/landing/rework/footer-nav-new.tsx

@@ -26,12 +26,12 @@ export function FooterNavNew() {
           >
             Mitmachen
           </Link>
-          <Link
+          {/* <Link
             className="serlo-new-landing-button !text-white md:mx-0"
             href="/spenden"
           >
             Spenden
-          </Link>
+          </Link> */}
         </div>
       </div>
       <Separator className="md:hidden" />

apps/web/src/components/navigation/footer.tsx

@@ -4,7 +4,6 @@ import {
 } from '@fortawesome/free-solid-svg-icons'
 
 import { FaIcon } from '../fa-icon'
-import DonateIcon from '@/assets-webkit/img/footer-donate.svg'
 import ParticipateIcon from '@/assets-webkit/img/footer-participate.svg'
 import { Link } from '@/components/content/link'
 import { FooterNav } from '@/components/navigation/footer-nav'
@@ -64,15 +63,15 @@ function About() {
               {strings.footer.participate}
             </div>
           </Link>
-          <Link
+          {/* <Link
             href={footerData.donationHref}
             className="group flex flex-col items-center hover:no-underline"
           >
             <DonateIcon className="w-14" />
             <div className="serlo-button-learner mt-2 py-0.5 text-white hover:bg-brand group-hover:bg-brand">
               {strings.footer.donate}
             </div>
-          </Link>
+          </Link> */}
         </div>
       </div>
     </div>

apps/web/src/components/navigation/header/menu/item.tsx

@@ -12,7 +12,6 @@ import { useNavMenuTriggerFix } from './use-nav-menu-trigger-fix'
 import { FaIcon } from '@/components/fa-icon'
 import type { HeaderLinkData } from '@/data-types'
 import { cn } from '@/helper/cn'
-import { submitEvent } from '@/helper/submit-event'
 
 const styledLinkCls = cn(`
   navtrigger block flex w-full
@@ -60,10 +59,10 @@ export function Item({ link, elementAsIcon, className }: ItemProps) {
         <Link
           className={cn('group', styledLinkCls)}
           // temporarily track spenden button use
-          onClick={() => {
-            if (link.url === '/spenden')
-              submitEvent('spenden-header-menu-click')
-          }}
+          // onClick={() => {
+          //   if (link.url === '/spenden')
+          //     submitEvent('spenden-header-menu-click')
+          // }}
         >
           {textAndIcon}
         </Link>

apps/web/src/components/pages/donations.tsx

@@ -1,7 +1,6 @@
 import { faPaypal } from '@fortawesome/free-brands-svg-icons'
 import Image from 'next/image'
 
-import { TestimonialDonationsPage } from '../content/donations-banner-experiment/testimonial-donations-page'
 import { FaIcon } from '../fa-icon'
 import { HeadTags } from '../head-tags'
 import { PrivacyWrapper } from '@/components/content/privacy-wrapper'
@@ -172,7 +171,6 @@ export function Donations() {
             </p>
           </section>
         </div>
-        <TestimonialDonationsPage />
       </div>
 
       <footer>

apps/web/src/components/taxonomy/topic.tsx

@@ -1,6 +1,5 @@
 import { EditorPluginType, SerloRenderer } from '@editor/package'
 import { faFile, faTrash } from '@fortawesome/free-solid-svg-icons'
-import dynamic from 'next/dynamic'
 import { Fragment } from 'react'
 
 import { SubTopic } from './sub-topic'
@@ -9,7 +8,6 @@ import { ExerciseNumbering } from '../content/exercises/exercise-numbering'
 import { ExamsInfoBox } from '../exams-info-box'
 import { FaIcon } from '../fa-icon'
 import { InfoPanel } from '../info-panel'
-import type { DonationsBannerProps } from '@/components/content/donations-banner-experiment/donations-banner'
 import { LicenseNotice } from '@/components/content/license/license-notice'
 import { UserTools } from '@/components/user-tools/user-tools'
 import { EntityMetaProvider } from '@/contexts/entity-meta-context'
@@ -30,12 +28,6 @@ export interface TopicProps {
   breadcrumbs?: BreadcrumbsData
 }
 
-const DonationsBanner = dynamic<DonationsBannerProps>(() =>
-  import(
-    '@/components/content/donations-banner-experiment/donations-banner'
-  ).then((mod) => mod.DonationsBanner)
-)
-
 export function Topic({ data, breadcrumbs }: TopicProps) {
   const { strings } = useInstanceData()
 
@@ -82,18 +74,6 @@ export function Topic({ data, breadcrumbs }: TopicProps) {
       {/* Default license notice */}
       <LicenseNotice />
 
-      {/* Temporary donations banner trial */}
-      {isExerciseFolder ? (
-        <DonationsBanner
-          id={data.id}
-          entityData={{
-            ...data,
-            typename: UuidType.TaxonomyTerm,
-            isUnrevised: false,
-          }}
-        />
-      ) : null}
-
       {renderUserTools()}
     </>
   )

apps/web/src/data/de/menu-data.ts

@@ -61,7 +61,7 @@ export const headerData: InstanceData['headerData'] = [
       { title: 'Kontakt & Standorte', url: '/21657/kontakt-und-standorte' },
     ],
   },
-  { url: '/spenden', title: 'Spenden', icon: 'donate' },
+  // { url: '/spenden', title: 'Spenden', icon: 'donate' },
   {
     url: '',
     title: 'Mitmachen',

apps/web/src/pages/sitemap.xml.ts

@@ -58,7 +58,7 @@ const nextStaticPages: SitemapEntry[] = [
   { url: '/metadata' },
   { url: '/nachhaltigkeit' },
   { url: '/privacy' },
-  { url: '/spenden' },
+  // { url: '/spenden' },
   { url: '/mathe-pruefungen' },
   { url: '/mathe-pruefungen/bayern' },
   { url: '/mathe-pruefungen/berlin' },

apps/web/src/pages/spenden.tsx

@@ -1,9 +1,9 @@
 import { FrontendClientBase } from '@/components/frontend-client-base/frontend-client-base'
-import { Donations } from '@/components/pages/donations'
 import { renderedPageNoHooks } from '@/helper/rendered-page'
 
 export default renderedPageNoHooks(() => (
-  <FrontendClientBase noHeaderFooter noContainers>
-    <Donations />
+  <FrontendClientBase showNav>
+    <h1 className="serlo-h1">Spenden</h1>
+    <p className="serlo-p">Zur Zeit sind Spenden leider nicht möglich.</p>
   </FrontendClientBase>
 ))

e2e-tests/tests/000-general.mobile.ts

@@ -142,7 +142,7 @@ Scenario('Legal Pages @mobile', async ({ I }) => {
   I.see('Privacy Policy')
   I.see('[email protected]')
 })
-Scenario('Consent @mobile', async ({ I }) => {
+Scenario.skip('Consent @mobile', async ({ I }) => {
   I.amOnPage('/spenden')
 
   // Make sure that twingle is activated

e2e-tests/tests/000-general.ts

@@ -167,7 +167,7 @@ Scenario('Languages', ({ I }) => {
 })
 */
 
-Scenario('Donation', ({ I }) => {
+Scenario.skip('Donation', ({ I }) => {
   I.amOnPage('/spenden')
   I.see('Deine Spende macht einen Unterschied')
   I.see('Mit PayPal spenden')
@@ -210,7 +210,7 @@ Scenario('Legal Pages', async ({ I }) => {
   I.see('[email protected]')
 })
 
-Scenario('Consent', async ({ I }) => {
+Scenario.skip('Consent', async ({ I }) => {
   I.amOnPage('/spenden')
 
   // Make sure that twingle is activated