Merge pull request #1003 from t3n/paywall

Revert "Merge pull request #1002 from t3n/revert-feature-paywall"
t3n · Oct 7, 2024 · d97163e · d97163e
2 parents 429f682 + c40f46a
commit d97163e
Show file tree

Hide file tree

Showing 28 changed files with 97 additions and 25 deletions.
diff --git a/packages/components/src/LegacyFooter/LegacyDesktopFooter.tsx b/packages/components/src/LegacyFooter/LegacyDesktopFooter.tsx
@@ -178,12 +178,12 @@ const legacyDesktopLinkGroups: DesktopLinkGroupsType = [
     label: 't3n',
     links: [
       {
-        label: 'Pur',
-        url: '/pur',
+        label: 'Plus',
+        url: '/plus-artikel',
       },
       {
-        label: 'Pro',
-        url: '/pro-artikel',
+        label: 'Digitale Abos',
+        url: '/abos',
       },
       {
         label: 'News',

diff --git a/packages/components/src/LegacyFooter/LegacyMobileFooter.tsx b/packages/components/src/LegacyFooter/LegacyMobileFooter.tsx
@@ -60,12 +60,12 @@ const SmallerText = styled(Text)`
 
 const legacyMobileLinks: MobileLinkType = [
   {
-    label: 'Pur',
-    url: '/pur',
+    label: 'Plus',
+    url: '/plus-artikel',
   },
   {
-    label: 'Pro',
-    url: '/pro-artikel',
+    label: 'Digitale Abos',
+    url: '/abos',
   },
   {
     label: 'Team',

diff --git a/packages/components/src/LegacyHeader/LegacyDesktopHeader.d.ts b/packages/components/src/LegacyHeader/LegacyDesktopHeader.d.ts
@@ -8,6 +8,7 @@ export interface LegacyDesktopHeaderProps {
     showAds?: boolean;
     adsPreview?: boolean;
     userEmail?: string;
+    isPlusUser?: boolean;
     isProMember?: boolean;
     userMenuItems?: ReactNode[];
 }

diff --git a/packages/components/src/LegacyHeader/LegacyDesktopHeader.tsx b/packages/components/src/LegacyHeader/LegacyDesktopHeader.tsx
@@ -29,6 +29,7 @@ export interface LegacyDesktopHeaderProps {
   showAds?: boolean;
   adsPreview?: boolean;
   userEmail?: string;
+  isPlusUser?: boolean;
   isProMember?: boolean;
   userMenuItems?: ReactNode[];
 }
@@ -178,6 +179,7 @@ const LegacyDesktopHeader: React.FC<LegacyDesktopHeaderProps> = ({
   showAds,
   adsPreview,
   userEmail,
+  isPlusUser,
   isProMember,
   userMenuItems,
 }) => {
@@ -236,6 +238,7 @@ const LegacyDesktopHeader: React.FC<LegacyDesktopHeaderProps> = ({
           </HeaderCampaign>
           <Box display="flex" flexDirection="column" flexGrow={1} mt={2}>
             <LegacyT3nNav
+              isPlusUser={isPlusUser}
               isProMember={isProMember}
               userEmail={userEmail}
               userMenuItems={userMenuItems}
@@ -281,6 +284,7 @@ const LegacyDesktopHeader: React.FC<LegacyDesktopHeaderProps> = ({
               </SearchForm>
             </StickyNavBox>
             <UserMenu
+              isPlusUser={isPlusUser}
               isProMember={isProMember}
               userEmail={userEmail}
               light

diff --git a/packages/components/src/LegacyHeader/LegacyHeader.d.ts b/packages/components/src/LegacyHeader/LegacyHeader.d.ts
@@ -9,6 +9,7 @@ export interface LegacyHeaderProps {
     showAds?: boolean;
     adsPreview?: boolean;
     userEmail?: string;
+    isPlusUser?: boolean;
     isProMember?: boolean;
     userMenuItems?: ReactNode[];
 }

diff --git a/packages/components/src/LegacyHeader/LegacyHeader.tsx b/packages/components/src/LegacyHeader/LegacyHeader.tsx
@@ -15,6 +15,7 @@ export interface LegacyHeaderProps {
   showAds?: boolean;
   adsPreview?: boolean;
   userEmail?: string;
+  isPlusUser?: boolean;
   isProMember?: boolean;
   userMenuItems?: ReactNode[];
 }
@@ -28,6 +29,7 @@ const LegacyHeader: React.FC<LegacyHeaderProps> = ({
   showAds,
   adsPreview,
   userEmail,
+  isPlusUser,
   isProMember,
   userMenuItems,
 }) => {
@@ -38,6 +40,7 @@ const LegacyHeader: React.FC<LegacyHeaderProps> = ({
           headerCampaignUrl={headerCampaignUrl}
           headerCampaignImageMobile={headerCampaignImageMobile}
           userEmail={userEmail}
+          isPlusUser={isPlusUser}
           isProMember={isProMember}
         />
       </Box>
@@ -50,6 +53,7 @@ const LegacyHeader: React.FC<LegacyHeaderProps> = ({
           showAds={showAds}
           adsPreview={adsPreview}
           userEmail={userEmail}
+          isPlusUser={isPlusUser}
           isProMember={isProMember}
           userMenuItems={userMenuItems}
         />

diff --git a/packages/components/src/LegacyHeader/LegacyMobileHeader.d.ts b/packages/components/src/LegacyHeader/LegacyMobileHeader.d.ts
@@ -3,6 +3,7 @@ export interface LegacyMobileHeaderProps {
     headerCampaignUrl: string;
     headerCampaignImageMobile?: string;
     userEmail?: string;
+    isPlusUser?: boolean;
     isProMember?: boolean;
 }
 declare const LegacyMobileHeader: React.FC<LegacyMobileHeaderProps>;

diff --git a/packages/components/src/LegacyHeader/LegacyMobileHeader.tsx b/packages/components/src/LegacyHeader/LegacyMobileHeader.tsx
@@ -14,6 +14,7 @@ export interface LegacyMobileHeaderProps {
   headerCampaignUrl: string;
   headerCampaignImageMobile?: string;
   userEmail?: string;
+  isPlusUser?: boolean;
   isProMember?: boolean;
 }
 
@@ -55,6 +56,7 @@ const LegacyMobileHeader: React.FC<LegacyMobileHeaderProps> = ({
   headerCampaignUrl,
   headerCampaignImageMobile,
   userEmail,
+  isPlusUser,
   isProMember,
 }) => {
   return (
@@ -90,6 +92,7 @@ const LegacyMobileHeader: React.FC<LegacyMobileHeaderProps> = ({
       </HeaderCampaign>
       <LegacyMobileNav
         userEmail={userEmail}
+        isPlusUser={isPlusUser}
         isProMember={isProMember}
         headerCampaignUrl={headerCampaignUrl}
         headerCampaignImageMobile={headerCampaignImageMobile}

diff --git a/packages/components/src/LegacyHeader/components/LegacyMainNav.tsx b/packages/components/src/LegacyHeader/components/LegacyMainNav.tsx
@@ -159,8 +159,8 @@ export const Indicator = styled.span`
 
 const mainNavLinkGroups: MainNavLinkGroupsType[] = [
   {
-    label: 'Pro',
-    url: '/pro-artikel',
+    label: 'Plus',
+    url: '/plus-artikel',
     indicator: true,
   },
   {

diff --git a/packages/components/src/LegacyHeader/components/LegacyMobileNav.d.ts b/packages/components/src/LegacyHeader/components/LegacyMobileNav.d.ts
@@ -3,6 +3,7 @@ export interface LegacyMobileNavProps {
     headerCampaignUrl: string;
     headerCampaignImageMobile?: string;
     userEmail?: string;
+    isPlusUser?: boolean;
     isProMember?: boolean;
 }
 export type MobileNavLinksType = {

diff --git a/packages/components/src/LegacyHeader/components/LegacyMobileNav.tsx b/packages/components/src/LegacyHeader/components/LegacyMobileNav.tsx
@@ -9,6 +9,7 @@ import {
   MaterialClose,
   MaterialMenu,
   MaterialPersonOutline,
+  T3nPlus,
   T3nPro,
 } from '@t3n/icons';
 import { ThemeProps } from '@t3n/theme';
@@ -26,6 +27,7 @@ export interface LegacyMobileNavProps {
   headerCampaignUrl: string;
   headerCampaignImageMobile?: string;
   userEmail?: string;
+  isPlusUser?: boolean;
   isProMember?: boolean;
 }
 
@@ -158,8 +160,8 @@ const SearchForm = styled.form`
 
 const mobileNavLinks: MobileNavLinksType[] = [
   {
-    label: 'Pro',
-    url: '/pro-artikel',
+    label: 'Plus',
+    url: '/plus-artikel',
     indicator: false,
   },
   {
@@ -217,6 +219,7 @@ const LegacyMobileNav: React.FC<LegacyMobileNavProps> = ({
   headerCampaignUrl,
   headerCampaignImageMobile,
   userEmail,
+  isPlusUser,
   isProMember,
 }) => {
   const [menuOpen, setMenuOpen] = useState(false);
@@ -296,6 +299,20 @@ const LegacyMobileNav: React.FC<LegacyMobileNavProps> = ({
         ))}
         {userEmail ? (
           <>
+            {isPlusUser && (
+              <MobileMenuItem
+                borderTopThick
+                href="/account/plus"
+                title="t3n Plus"
+              >
+                <T3nPlus
+                  width="22px"
+                  height="18px"
+                  style={{ marginRight: 8 }}
+                />
+                Plus
+              </MobileMenuItem>
+            )}
             {isProMember && (
               <MobileMenuItem
                 borderTopThick

diff --git a/packages/components/src/LegacyHeader/components/LegacyT3nNav.d.ts b/packages/components/src/LegacyHeader/components/LegacyT3nNav.d.ts
@@ -1,5 +1,6 @@
 import React, { ReactNode } from 'react';
 export interface LegacyT3nNavProps {
+    isPlusUser?: boolean;
     isProMember?: boolean;
     userEmail?: string;
     userMenuItems?: ReactNode[];

diff --git a/packages/components/src/LegacyHeader/components/LegacyT3nNav.tsx b/packages/components/src/LegacyHeader/components/LegacyT3nNav.tsx
@@ -12,6 +12,7 @@ import HeaderLink from './LegacyHeaderLink';
 import { MainNavDropdown } from './LegacyMainNav';
 
 export interface LegacyT3nNavProps {
+  isPlusUser?: boolean;
   isProMember?: boolean;
   userEmail?: string;
   userMenuItems?: ReactNode[];
@@ -119,6 +120,7 @@ const t3nNavLinks: T3nNavLinksType[] = [
 ];
 
 const LegacyT3nNav: React.FC<LegacyT3nNavProps> = ({
+  isPlusUser,
   isProMember,
   userEmail,
   userMenuItems,
@@ -156,6 +158,7 @@ const LegacyT3nNav: React.FC<LegacyT3nNavProps> = ({
         </MainNavItem>
       ))}
       <UserMenu
+        isPlusUser={isPlusUser}
         isProMember={isProMember}
         userEmail={userEmail}
         light

diff --git a/packages/components/src/LegacyNewsCard/LegacyNewsCard.d.ts b/packages/components/src/LegacyNewsCard/LegacyNewsCard.d.ts
@@ -4,7 +4,7 @@ export interface LegacyNewsCardProps {
     popular?: boolean;
     sponsored?: boolean;
     hero?: boolean;
-    pro?: boolean;
+    plus?: boolean;
     tr?: boolean;
     withImage?: boolean;
     withTeaser?: boolean;
@@ -28,5 +28,5 @@ export declare const LegacyLoadingHeroCard: () => React.JSX.Element;
 export declare const LegacyLoadingFeedCard: React.FC<{
     withImage?: boolean;
 }>;
-declare const LegacyNewsCard: ({ news, loading, hero, sponsored, popular, pro, tr, withTeaser, withImage, withAuthor, isBookmarked, onBookmarkClick, }: LegacyNewsCardProps) => React.JSX.Element | null;
+declare const LegacyNewsCard: ({ news, loading, hero, sponsored, popular, plus, tr, withTeaser, withImage, withAuthor, isBookmarked, onBookmarkClick, }: LegacyNewsCardProps) => React.JSX.Element | null;
 export default LegacyNewsCard;
diff --git a/packages/components/src/LegacyNewsCard/LegacyNewsCard.tsx b/packages/components/src/LegacyNewsCard/LegacyNewsCard.tsx
@@ -19,7 +19,7 @@ export interface LegacyNewsCardProps {
   popular?: boolean;
   sponsored?: boolean;
   hero?: boolean;
-  pro?: boolean;
+  plus?: boolean;
   tr?: boolean;
   withImage?: boolean;
   withTeaser?: boolean;
@@ -122,7 +122,7 @@ const LegacyNewsCard = ({
   hero,
   sponsored,
   popular,
-  pro,
+  plus,
   tr,
   withTeaser,
   withImage = true,
@@ -164,7 +164,7 @@ const LegacyNewsCard = ({
             <LegacyNewsCardHeadline
               title={news.title}
               type={news.type}
-              pro={pro}
+              plus={plus}
               tr={tr}
               sponsored={sponsored}
             />
@@ -202,7 +202,7 @@ const LegacyNewsCard = ({
           <LegacyNewsCardHeadline
             title={news.title}
             type={news.type}
-            pro={pro}
+            plus={plus}
             tr={tr}
             sponsored={sponsored}
           />

diff --git a/packages/components/src/LegacyNewsCard/LegacyNewsCardHeadline.d.ts b/packages/components/src/LegacyNewsCard/LegacyNewsCardHeadline.d.ts
@@ -3,7 +3,7 @@ export interface LegacyNewsCardHeadlineProps {
     type: string;
     title: string;
     sponsored?: boolean;
-    pro?: boolean;
+    plus?: boolean;
     tr?: boolean;
 }
 declare const LegacyNewsCardHeadline: React.FC<LegacyNewsCardHeadlineProps>;

diff --git a/packages/components/src/LegacyNewsCard/LegacyNewsCardHeadline.tsx b/packages/components/src/LegacyNewsCard/LegacyNewsCardHeadline.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { border, color, space, typography } from 'styled-system';
 
-import { T3nPro } from '@t3n/icons';
+import { T3nPlus } from '@t3n/icons';
 
 import Box from '../Box';
 import Heading from '../Heading';
@@ -12,7 +12,7 @@ export interface LegacyNewsCardHeadlineProps {
   type: string;
   title: string;
   sponsored?: boolean;
-  pro?: boolean;
+  plus?: boolean;
   tr?: boolean;
 }
 
@@ -71,7 +71,7 @@ const LegacyNewsCardHeadline: React.FC<LegacyNewsCardHeadlineProps> = ({
   type,
   title,
   sponsored,
-  pro,
+  plus,
   tr,
 }) => {
   return (
@@ -82,9 +82,9 @@ const LegacyNewsCardHeadline: React.FC<LegacyNewsCardHeadlineProps> = ({
             Anzeige
           </SponsoredInfo>
         )}
-        {pro && (
+        {plus && (
           <Box display="flex" mb={1} mr={1}>
-            <T3nPro height="18" width="36" />
+            <T3nPlus height="18" width="22" />
           </Box>
         )}
         {tr && <TRBadge>MIT Technology Review</TRBadge>}

diff --git a/packages/components/src/LegacyPageLayout/LegacyPageLayout.d.ts b/packages/components/src/LegacyPageLayout/LegacyPageLayout.d.ts
@@ -7,6 +7,7 @@ export interface LegacyPageLayoutProps extends LegacyHeaderProps {
     adUnits?: LegacyAdName[];
     previewAdUnits?: boolean;
     userEmail?: string;
+    isPlusUser?: boolean;
     isProMember?: boolean;
     userMenuItems?: ReactNode[];
     children?: ReactNode;

diff --git a/packages/components/src/LegacyPageLayout/LegacyPageLayout.tsx b/packages/components/src/LegacyPageLayout/LegacyPageLayout.tsx
@@ -13,6 +13,7 @@ export interface LegacyPageLayoutProps extends LegacyHeaderProps {
   adUnits?: LegacyAdName[];
   previewAdUnits?: boolean;
   userEmail?: string;
+  isPlusUser?: boolean;
   isProMember?: boolean;
   userMenuItems?: ReactNode[];
   children?: ReactNode;
@@ -35,6 +36,7 @@ const LegacyPageLayout: React.FC<LegacyPageLayoutProps> = ({
   previewAdUnits,
   overflow,
   userEmail,
+  isPlusUser,
   isProMember,
   userMenuItems,
   children,
@@ -59,6 +61,7 @@ const LegacyPageLayout: React.FC<LegacyPageLayoutProps> = ({
           showAds={shouldDisplayAdUnit('T3N_D_Right')}
           adsPreview={previewAdUnits}
           userEmail={userEmail}
+          isPlusUser={isPlusUser}
           isProMember={isProMember}
           userMenuItems={userMenuItems}
         />

diff --git a/packages/components/src/UserMenu/UserMenu.d.ts b/packages/components/src/UserMenu/UserMenu.d.ts
@@ -7,6 +7,8 @@ export interface UserMenuProps {
     proMembershipLink?: string;
     readingListLink?: string;
     accountLink?: string;
+    isPlusUser?: boolean;
+    plusLink?: string;
     isProMember?: boolean;
     light?: boolean;
     items?: ReactNode[];