Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Merge pull request #1001 from t3n/plus-badge" #1002

Merged
merged 1 commit into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/components/src/LegacyFooter/LegacyDesktopFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,12 @@ const legacyDesktopLinkGroups: DesktopLinkGroupsType = [
label: 't3n',
links: [
{
label: 'Plus',
url: '/plus-artikel',
label: 'Pur',
url: '/pur',
},
{
label: 'Digitale Abos',
url: '/abos',
label: 'Pro',
url: '/pro-artikel',
},
{
label: 'News',
Expand Down
8 changes: 4 additions & 4 deletions packages/components/src/LegacyFooter/LegacyMobileFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ const SmallerText = styled(Text)`

const legacyMobileLinks: MobileLinkType = [
{
label: 'Plus',
url: '/plus-artikel',
label: 'Pur',
url: '/pur',
},
{
label: 'Digitale Abos',
url: '/abos',
label: 'Pro',
url: '/pro-artikel',
},
{
label: 'Team',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ export interface LegacyDesktopHeaderProps {
showAds?: boolean;
adsPreview?: boolean;
userEmail?: string;
isPlusUser?: boolean;
isProMember?: boolean;
userMenuItems?: ReactNode[];
}
Expand Down
4 changes: 0 additions & 4 deletions packages/components/src/LegacyHeader/LegacyDesktopHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export interface LegacyDesktopHeaderProps {
showAds?: boolean;
adsPreview?: boolean;
userEmail?: string;
isPlusUser?: boolean;
isProMember?: boolean;
userMenuItems?: ReactNode[];
}
Expand Down Expand Up @@ -179,7 +178,6 @@ const LegacyDesktopHeader: React.FC<LegacyDesktopHeaderProps> = ({
showAds,
adsPreview,
userEmail,
isPlusUser,
isProMember,
userMenuItems,
}) => {
Expand Down Expand Up @@ -238,7 +236,6 @@ const LegacyDesktopHeader: React.FC<LegacyDesktopHeaderProps> = ({
</HeaderCampaign>
<Box display="flex" flexDirection="column" flexGrow={1} mt={2}>
<LegacyT3nNav
isPlusUser={isPlusUser}
isProMember={isProMember}
userEmail={userEmail}
userMenuItems={userMenuItems}
Expand Down Expand Up @@ -284,7 +281,6 @@ const LegacyDesktopHeader: React.FC<LegacyDesktopHeaderProps> = ({
</SearchForm>
</StickyNavBox>
<UserMenu
isPlusUser={isPlusUser}
isProMember={isProMember}
userEmail={userEmail}
light
Expand Down
1 change: 0 additions & 1 deletion packages/components/src/LegacyHeader/LegacyHeader.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export interface LegacyHeaderProps {
showAds?: boolean;
adsPreview?: boolean;
userEmail?: string;
isPlusUser?: boolean;
isProMember?: boolean;
userMenuItems?: ReactNode[];
}
Expand Down
4 changes: 0 additions & 4 deletions packages/components/src/LegacyHeader/LegacyHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ export interface LegacyHeaderProps {
showAds?: boolean;
adsPreview?: boolean;
userEmail?: string;
isPlusUser?: boolean;
isProMember?: boolean;
userMenuItems?: ReactNode[];
}
Expand All @@ -29,7 +28,6 @@ const LegacyHeader: React.FC<LegacyHeaderProps> = ({
showAds,
adsPreview,
userEmail,
isPlusUser,
isProMember,
userMenuItems,
}) => {
Expand All @@ -40,7 +38,6 @@ const LegacyHeader: React.FC<LegacyHeaderProps> = ({
headerCampaignUrl={headerCampaignUrl}
headerCampaignImageMobile={headerCampaignImageMobile}
userEmail={userEmail}
isPlusUser={isPlusUser}
isProMember={isProMember}
/>
</Box>
Expand All @@ -53,7 +50,6 @@ const LegacyHeader: React.FC<LegacyHeaderProps> = ({
showAds={showAds}
adsPreview={adsPreview}
userEmail={userEmail}
isPlusUser={isPlusUser}
isProMember={isProMember}
userMenuItems={userMenuItems}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ export interface LegacyMobileHeaderProps {
headerCampaignUrl: string;
headerCampaignImageMobile?: string;
userEmail?: string;
isPlusUser?: boolean;
isProMember?: boolean;
}
declare const LegacyMobileHeader: React.FC<LegacyMobileHeaderProps>;
Expand Down
3 changes: 0 additions & 3 deletions packages/components/src/LegacyHeader/LegacyMobileHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export interface LegacyMobileHeaderProps {
headerCampaignUrl: string;
headerCampaignImageMobile?: string;
userEmail?: string;
isPlusUser?: boolean;
isProMember?: boolean;
}

Expand Down Expand Up @@ -56,7 +55,6 @@ const LegacyMobileHeader: React.FC<LegacyMobileHeaderProps> = ({
headerCampaignUrl,
headerCampaignImageMobile,
userEmail,
isPlusUser,
isProMember,
}) => {
return (
Expand Down Expand Up @@ -92,7 +90,6 @@ const LegacyMobileHeader: React.FC<LegacyMobileHeaderProps> = ({
</HeaderCampaign>
<LegacyMobileNav
userEmail={userEmail}
isPlusUser={isPlusUser}
isProMember={isProMember}
headerCampaignUrl={headerCampaignUrl}
headerCampaignImageMobile={headerCampaignImageMobile}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ export const Indicator = styled.span`

const mainNavLinkGroups: MainNavLinkGroupsType[] = [
{
label: 'Plus',
url: '/plus-artikel',
label: 'Pro',
url: '/pro-artikel',
indicator: true,
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ export interface LegacyMobileNavProps {
headerCampaignUrl: string;
headerCampaignImageMobile?: string;
userEmail?: string;
isPlusUser?: boolean;
isProMember?: boolean;
}
export type MobileNavLinksType = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
MaterialClose,
MaterialMenu,
MaterialPersonOutline,
T3nPlus,
T3nPro,
} from '@t3n/icons';
import { ThemeProps } from '@t3n/theme';
Expand All @@ -27,7 +26,6 @@ export interface LegacyMobileNavProps {
headerCampaignUrl: string;
headerCampaignImageMobile?: string;
userEmail?: string;
isPlusUser?: boolean;
isProMember?: boolean;
}

Expand Down Expand Up @@ -160,8 +158,8 @@ const SearchForm = styled.form`

const mobileNavLinks: MobileNavLinksType[] = [
{
label: 'Plus',
url: '/plus-artikel',
label: 'Pro',
url: '/pro-artikel',
indicator: false,
},
{
Expand Down Expand Up @@ -219,7 +217,6 @@ const LegacyMobileNav: React.FC<LegacyMobileNavProps> = ({
headerCampaignUrl,
headerCampaignImageMobile,
userEmail,
isPlusUser,
isProMember,
}) => {
const [menuOpen, setMenuOpen] = useState(false);
Expand Down Expand Up @@ -299,20 +296,6 @@ 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { ReactNode } from 'react';
export interface LegacyT3nNavProps {
isPlusUser?: boolean;
isProMember?: boolean;
userEmail?: string;
userMenuItems?: ReactNode[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import HeaderLink from './LegacyHeaderLink';
import { MainNavDropdown } from './LegacyMainNav';

export interface LegacyT3nNavProps {
isPlusUser?: boolean;
isProMember?: boolean;
userEmail?: string;
userMenuItems?: ReactNode[];
Expand Down Expand Up @@ -120,7 +119,6 @@ const t3nNavLinks: T3nNavLinksType[] = [
];

const LegacyT3nNav: React.FC<LegacyT3nNavProps> = ({
isPlusUser,
isProMember,
userEmail,
userMenuItems,
Expand Down Expand Up @@ -158,7 +156,6 @@ const LegacyT3nNav: React.FC<LegacyT3nNavProps> = ({
</MainNavItem>
))}
<UserMenu
isPlusUser={isPlusUser}
isProMember={isProMember}
userEmail={userEmail}
light
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/LegacyNewsCard/LegacyNewsCard.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export interface LegacyNewsCardProps {
popular?: boolean;
sponsored?: boolean;
hero?: boolean;
plus?: boolean;
pro?: boolean;
tr?: boolean;
withImage?: boolean;
withTeaser?: boolean;
Expand All @@ -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, plus, tr, withTeaser, withImage, withAuthor, isBookmarked, onBookmarkClick, }: LegacyNewsCardProps) => React.JSX.Element | null;
declare const LegacyNewsCard: ({ news, loading, hero, sponsored, popular, pro, tr, withTeaser, withImage, withAuthor, isBookmarked, onBookmarkClick, }: LegacyNewsCardProps) => React.JSX.Element | null;
export default LegacyNewsCard;
8 changes: 4 additions & 4 deletions packages/components/src/LegacyNewsCard/LegacyNewsCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export interface LegacyNewsCardProps {
popular?: boolean;
sponsored?: boolean;
hero?: boolean;
plus?: boolean;
pro?: boolean;
tr?: boolean;
withImage?: boolean;
withTeaser?: boolean;
Expand Down Expand Up @@ -122,7 +122,7 @@ const LegacyNewsCard = ({
hero,
sponsored,
popular,
plus,
pro,
tr,
withTeaser,
withImage = true,
Expand Down Expand Up @@ -164,7 +164,7 @@ const LegacyNewsCard = ({
<LegacyNewsCardHeadline
title={news.title}
type={news.type}
plus={plus}
pro={pro}
tr={tr}
sponsored={sponsored}
/>
Expand Down Expand Up @@ -202,7 +202,7 @@ const LegacyNewsCard = ({
<LegacyNewsCardHeadline
title={news.title}
type={news.type}
plus={plus}
pro={pro}
tr={tr}
sponsored={sponsored}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export interface LegacyNewsCardHeadlineProps {
type: string;
title: string;
sponsored?: boolean;
plus?: boolean;
pro?: boolean;
tr?: boolean;
}
declare const LegacyNewsCardHeadline: React.FC<LegacyNewsCardHeadlineProps>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import styled from 'styled-components';
import { border, color, space, typography } from 'styled-system';

import { T3nPlus } from '@t3n/icons';
import { T3nPro } from '@t3n/icons';

import Box from '../Box';
import Heading from '../Heading';
Expand All @@ -12,7 +12,7 @@ export interface LegacyNewsCardHeadlineProps {
type: string;
title: string;
sponsored?: boolean;
plus?: boolean;
pro?: boolean;
tr?: boolean;
}

Expand Down Expand Up @@ -71,7 +71,7 @@ const LegacyNewsCardHeadline: React.FC<LegacyNewsCardHeadlineProps> = ({
type,
title,
sponsored,
plus,
pro,
tr,
}) => {
return (
Expand All @@ -82,9 +82,9 @@ const LegacyNewsCardHeadline: React.FC<LegacyNewsCardHeadlineProps> = ({
Anzeige
</SponsoredInfo>
)}
{plus && (
{pro && (
<Box display="flex" mb={1} mr={1}>
<T3nPlus height="18" width="22" />
<T3nPro height="18" width="36" />
</Box>
)}
{tr && <TRBadge>MIT Technology Review</TRBadge>}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export interface LegacyPageLayoutProps extends LegacyHeaderProps {
adUnits?: LegacyAdName[];
previewAdUnits?: boolean;
userEmail?: string;
isPlusUser?: boolean;
isProMember?: boolean;
userMenuItems?: ReactNode[];
children?: ReactNode;
Expand Down
3 changes: 0 additions & 3 deletions packages/components/src/LegacyPageLayout/LegacyPageLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export interface LegacyPageLayoutProps extends LegacyHeaderProps {
adUnits?: LegacyAdName[];
previewAdUnits?: boolean;
userEmail?: string;
isPlusUser?: boolean;
isProMember?: boolean;
userMenuItems?: ReactNode[];
children?: ReactNode;
Expand All @@ -36,7 +35,6 @@ const LegacyPageLayout: React.FC<LegacyPageLayoutProps> = ({
previewAdUnits,
overflow,
userEmail,
isPlusUser,
isProMember,
userMenuItems,
children,
Expand All @@ -61,7 +59,6 @@ const LegacyPageLayout: React.FC<LegacyPageLayoutProps> = ({
showAds={shouldDisplayAdUnit('T3N_D_Right')}
adsPreview={previewAdUnits}
userEmail={userEmail}
isPlusUser={isPlusUser}
isProMember={isProMember}
userMenuItems={userMenuItems}
/>
Expand Down
2 changes: 0 additions & 2 deletions packages/components/src/UserMenu/UserMenu.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ export interface UserMenuProps {
proMembershipLink?: string;
readingListLink?: string;
accountLink?: string;
isPlusUser?: boolean;
plusLink?: string;
isProMember?: boolean;
light?: boolean;
items?: ReactNode[];
Expand Down
Loading