Use same table base for emails and subscriptions

This commit is contained in:
Jackson Harper 2023-01-17 15:28:35 +08:00
parent f674bb34aa
commit 23b1f13522
3 changed files with 479 additions and 337 deletions

View file

@ -0,0 +1,309 @@
import { Plus, Trash } from 'phosphor-react'
import { Toaster } from 'react-hot-toast'
import { Button } from '../../elements/Button'
import { Dropdown, DropdownOption } from '../../elements/DropdownElements'
import { MoreOptionsIcon } from '../../elements/images/MoreOptionsIcon'
import { InfoLink } from '../../elements/InfoLink'
import { Box, HStack, SpanBox, VStack } from '../../elements/LayoutPrimitives'
import { StyledText } from '../../elements/StyledText'
import { styled, theme } from '../../tokens/stitches.config'
import { PrimaryLayout } from '../PrimaryLayout'
type SettingsTableProps = {
pageId: string
pageHeadline: string
pageInfoLink: string
headerTitle: string
createTitle?: string
createAction?: () => void
children: React.ReactNode
}
type CreateButtonProps = {
title: string
action: () => void
}
type SettingsTableRowProps = {
key: string
title: string
isFirst: boolean
isLast: boolean
sublineElement: JSX.Element
titleElement?: JSX.Element
extraElement?: JSX.Element
deleteTitle: string
onDelete: () => void
}
type MoreOptionsProps = {
title: string
onDelete: () => void
}
const MoreOptions = (props: MoreOptionsProps) => (
<Dropdown
align={'end'}
triggerElement={
<Box
css={{
'&:hover': {
cursor: 'pointer',
},
}}
>
<MoreOptionsIcon
size={24}
strokeColor={theme.colors.grayTextContrast.toString()}
orientation="horizontal"
/>
</Box>
}
>
<DropdownOption
onSelect={() => {
return true
}}
>
<HStack alignment={'center'} distribution={'start'}>
<Trash size={24} color={theme.colors.omnivoreRed.toString()} />
<Button
css={{
color: theme.colors.omnivoreRed.toString(),
marginLeft: '8px',
border: 'none',
backgroundColor: 'transparent',
'&:hover': {
border: 'none',
backgroundColor: 'transparent',
},
}}
onClick={props.onDelete}
>
{props.title}
</Button>
</HStack>
</DropdownOption>
</Dropdown>
)
export const SettingsTableRow = (props: SettingsTableRowProps): JSX.Element => {
return (
<Box
key={props.key}
css={{
backgroundColor: '$grayBg',
display: 'flex',
alignItems: 'center',
padding: '10px 12px',
border: '0.5px solid $grayBgActive',
width: '100%',
'&:hover': {
background: 'rgba(255, 234, 159, 0.12)',
},
'@mdDown': {
borderTopLeftRadius: props.isFirst ? '5px' : '',
borderTopRightRadius: props.isFirst ? '5px' : '',
},
borderBottomLeftRadius: props.isLast ? '5px' : '',
borderBottomRightRadius: props.isLast ? '5px' : '',
'@md': {
paddingLeft: '0',
},
}}
>
<Box
css={{
display: 'flex',
width: '100%',
flexDirection: 'column',
'@md': {
paddingLeft: '20px',
flexDirection: 'row',
},
}}
>
<HStack
distribution="start"
css={{
display: 'flex',
padding: '4px 4px 4px 0px',
}}
>
<VStack css={{}}>
<StyledText
css={{
m: '0px',
fontSize: '18px',
'@mdDown': {
fontSize: '12px',
fontWeight: 'bold',
},
}}
>
{props.title}
</StyledText>
{props.sublineElement}
</VStack>
{props.titleElement}
{/* <CopyTextBtnWrapper
css={{
'@mdDown': {
marginRight: '10px',
},
}}
>
<CopyTextButton text={email.address} type={TextType.EmailAddress} />
</CopyTextBtnWrapper> */}
<Box
css={{
marginLeft: 'auto',
textAlign: 'right',
display: 'flex',
'@md': {
display: 'none',
},
}}
>
<MoreOptions title={props.deleteTitle} onDelete={props.onDelete} />
</Box>
</HStack>
{props.extraElement}
</Box>
<HStack distribution="start" css={{ marginLeft: 'auto' }}>
<Box
css={{
textAlign: 'right',
display: 'none',
'@md': {
display: 'flex',
},
}}
>
<MoreOptions title={props.deleteTitle} onDelete={props.onDelete} />
</Box>
</HStack>
</Box>
)
}
const CreateButton = (props: CreateButtonProps): JSX.Element => {
return (
<Button
onClick={props.action}
style="ctaDarkYellow"
css={{
display: 'flex',
alignItems: 'center',
marginLeft: 'auto',
}}
>
<SpanBox
css={{
display: 'none',
'@md': {
display: 'flex',
},
}}
>
<SpanBox>{props.title}</SpanBox>
</SpanBox>
<SpanBox
css={{
p: '0',
display: 'flex',
'@md': {
display: 'none',
},
}}
>
<Plus size={24} />
</SpanBox>
</Button>
)
}
export const SettingsTable = (props: SettingsTableProps): JSX.Element => {
return (
<PrimaryLayout pageTestId={props.pageId}>
<Toaster
containerStyle={{
top: '5rem',
}}
/>
<HStack css={{ width: '100%' }} alignment="center">
<VStack
distribution="center"
css={{
mx: '10px',
width: '100%',
maxWidth: '865px',
color: '$grayText',
paddingBottom: '5rem',
paddingTop: '2rem',
alignSelf: 'center',
'@md': {
m: '16px',
alignSelf: 'center',
mx: '42px',
paddingTop: '0',
},
}}
>
<Box
css={{
width: '100%',
'@md': {
display: 'block',
},
}}
>
<Box style={{ display: 'flex', alignItems: 'center' }}>
<Box>
<StyledText style="fixedHeadline">
{props.pageHeadline}{' '}
</StyledText>
</Box>
<InfoLink href={props.pageInfoLink} />
{props.createAction && props.createTitle && (
<CreateButton
action={props.createAction}
title={props.createTitle}
/>
)}
</Box>
<Box
css={{
backgroundColor: '$grayBgActive',
border: '1px solid rgba(0, 0, 0, 0.06)',
display: 'none',
alignItems: 'center',
padding: '10px 0 10px 20px',
borderRadius: '5px 5px 0px 0px',
width: '100%',
'@md': {
display: 'flex',
},
}}
>
<StyledText
style="menuTitle"
css={{
color: '$grayTextContrast',
}}
>
{props.headerTitle}
</StyledText>
</Box>
</Box>
{props.children}
</VStack>
</HStack>
<Box css={{ height: '120px' }} />
</PrimaryLayout>
)
}

View file

@ -1,29 +1,26 @@
import { PrimaryLayout } from '../../components/templates/PrimaryLayout'
import { Button } from '../../components/elements/Button'
import { useGetNewsletterEmailsQuery } from '../../lib/networking/queries/useGetNewsletterEmailsQuery'
import { createNewsletterEmailMutation } from '../../lib/networking/mutations/createNewsletterEmailMutation'
import { deleteNewsletterEmailMutation } from '../../lib/networking/mutations/deleteNewsletterEmailMutation'
import { MoreOptionsIcon } from '../../components/elements/images/MoreOptionsIcon'
import { Plus, Trash, Copy } from 'phosphor-react'
import { Trash, Copy } from 'phosphor-react'
import {
Dropdown,
DropdownOption,
} from '../../components/elements/DropdownElements'
import { theme, styled } from '../../components/tokens/stitches.config'
import {
Box,
SpanBox,
HStack,
VStack,
} from '../../components/elements/LayoutPrimitives'
import { Box, HStack } from '../../components/elements/LayoutPrimitives'
import { useCopyLink } from '../../lib/hooks/useCopyLink'
import { Toaster } from 'react-hot-toast'
import { useCallback, useMemo } from 'react'
import { StyledText } from '../../components/elements/StyledText'
import { applyStoredTheme } from '../../lib/themeUpdater'
import { showErrorToast, showSuccessToast } from '../../lib/toastHelpers'
import { InfoLink } from '../../components/elements/InfoLink'
import { formattedShortDate } from '../../lib/dateFormatting'
import Link from 'next/link'
import {
SettingsTable,
SettingsTableRow,
} from '../../components/templates/settings/SettingsTable'
enum TextType {
EmailAddress,
@ -35,42 +32,6 @@ type CopyTextButtonProps = {
type: TextType
}
const HeaderWrapper = styled(Box, {
width: '100%',
'@md': {
display: 'block',
},
})
const TableCard = styled(Box, {
backgroundColor: '$grayBg',
display: 'flex',
alignItems: 'center',
padding: '10px 12px',
border: '0.5px solid $grayBgActive',
width: '100%',
'&:hover': {
border: '0.5px solid #FFD234',
},
'@md': {
paddingLeft: '0',
},
})
const TableHeading = styled(Box, {
backgroundColor: '$grayBgActive',
border: '1px solid rgba(0, 0, 0, 0.06)',
display: 'none',
alignItems: 'center',
padding: '10px 0 10px 20px',
borderRadius: '5px 5px 0px 0px',
width: '100%',
'@md': {
display: 'flex',
},
})
const CopyTextBtnWrapper = styled(Box, {
background: '$grayBgActive',
borderRadius: '6px',
@ -87,52 +48,6 @@ const CopyTextBtnWrapper = styled(Box, {
marginLeft: '10px',
})
const MoreOptions = ({ onDelete }: { onDelete: () => void }) => (
<Dropdown
align={'end'}
triggerElement={
<Box
css={{
'&:hover': {
cursor: 'pointer',
},
}}
>
<MoreOptionsIcon
size={24}
strokeColor={theme.colors.grayTextContrast.toString()}
orientation="horizontal"
/>
</Box>
}
>
<DropdownOption
onSelect={() => {
return true
}}
>
<HStack alignment={'center'} distribution={'start'}>
<Trash size={24} color={theme.colors.omnivoreRed.toString()} />
<Button
css={{
color: theme.colors.omnivoreRed.toString(),
marginLeft: '8px',
border: 'none',
backgroundColor: 'transparent',
'&:hover': {
border: 'none',
backgroundColor: 'transparent',
},
}}
onClick={onDelete}
>
Delete
</Button>
</HStack>
</DropdownOption>
</Dropdown>
)
function CopyTextButton(props: CopyTextButtonProps): JSX.Element {
const { copyLink, isLinkCopied } = useCopyLink(
props.text,
@ -198,224 +113,89 @@ export default function EmailsPage(): JSX.Element {
}, [emailAddresses])
return (
<PrimaryLayout pageTestId="settings-emails-tag">
<Toaster
containerStyle={{
top: '5rem',
}}
/>
<HStack css={{ width: '100%' }} alignment="center">
<VStack
distribution="center"
css={{
mx: '10px',
width: '100%',
maxWidth: '865px',
color: '$grayText',
paddingBottom: '5rem',
paddingTop: '2rem',
alignSelf: 'center',
'@md': {
m: '16px',
alignSelf: 'center',
mx: '42px',
paddingTop: '0',
},
}}
>
<HeaderWrapper>
<Box style={{ display: 'flex', alignItems: 'center' }}>
<Box>
<StyledText style="fixedHeadline">Email Addresses </StyledText>
</Box>
<InfoLink href="/help/newsletters" />
<Button
onClick={createEmail}
style="ctaDarkYellow"
css={{
display: 'flex',
alignItems: 'center',
marginLeft: 'auto',
}}
>
<SpanBox
<SettingsTable
pageId="settings-emails-tag"
pageHeadline="Email Addresses"
pageInfoLink="/help/newsletters"
headerTitle="Address"
createTitle="Create a new email address"
createAction={createEmail}
>
{sortedEmailAddresses &&
sortedEmailAddresses.map((email, i) => {
return (
<SettingsTableRow
key={email.address}
title={email.address}
isFirst={i === 0}
isLast={i === sortedEmailAddresses.length - 1}
onDelete={() => deleteEmail(email.id)}
deleteTitle="Delete"
sublineElement={
<StyledText
css={{
display: 'none',
'@md': {
display: 'flex',
},
my: '5px',
fontSize: '11px',
}}
>
<SpanBox>Create a new email address</SpanBox>
</SpanBox>
<SpanBox
{`created ${formattedShortDate(email.createdAt)}, `}
<Link href="/settings/subscriptions">{`${email.subscriptionCount} subscriptions`}</Link>
</StyledText>
}
titleElement={
<CopyTextBtnWrapper
css={{
p: '0',
display: 'flex',
'@md': {
display: 'none',
},
}}
>
<Plus size={24} />
</SpanBox>
</Button>
</Box>
<TableHeading>
<StyledText
style="menuTitle"
css={{
color: '$grayTextContrast',
}}
>
Address
</StyledText>
</TableHeading>
</HeaderWrapper>
{sortedEmailAddresses &&
sortedEmailAddresses.map((email, i) => {
const isLastChild = i === sortedEmailAddresses.length - 1
return (
<TableCard
key={email.id}
css={{
'&:hover': {
background: 'rgba(255, 234, 159, 0.12)',
},
'@mdDown': {
borderTopLeftRadius: i === 0 ? '5px' : '',
borderTopRightRadius: i === 0 ? '5px' : '',
marginRight: '10px',
},
borderBottomLeftRadius: isLastChild ? '5px' : '',
borderBottomRightRadius: isLastChild ? '5px' : '',
}}
>
<Box
css={{
display: 'flex',
width: '100%',
flexDirection: 'column',
'@md': {
paddingLeft: '20px',
flexDirection: 'row',
},
}}
>
<HStack
distribution="start"
<CopyTextButton
text={email.address}
type={TextType.EmailAddress}
/>
</CopyTextBtnWrapper>
}
extraElement={
<HStack
alignment="start"
distribution="center"
css={{
width: '100%',
backgroundColor: '$grayBgActive',
borderRadius: '6px',
padding: '4px 4px 4px 0px',
'@md': {
width: '30%',
backgroundColor: 'transparent',
},
}}
>
<>
<StyledText
css={{
display: 'flex',
padding: '4px 4px 4px 0px',
}}
>
<VStack css={{}}>
<StyledText
css={{
m: '0px',
fontSize: '18px',
'@mdDown': {
fontSize: '12px',
fontWeight: 'bold',
},
}}
>
{email.address}
</StyledText>
<StyledText
css={{
my: '5px',
fontSize: '11px',
}}
>
{`created ${formattedShortDate(email.createdAt)}, ${
email.subscriptionCount
} subscriptions`}
</StyledText>
</VStack>
<CopyTextBtnWrapper
css={{
'@mdDown': {
marginRight: '10px',
},
}}
>
<CopyTextButton
text={email.address}
type={TextType.EmailAddress}
/>
</CopyTextBtnWrapper>
<Box
css={{
marginLeft: 'auto',
textAlign: 'right',
display: 'flex',
'@md': {
display: 'none',
},
}}
>
<MoreOptions onDelete={() => deleteEmail(email.id)} />
</Box>
</HStack>
{email.confirmationCode && (
<HStack
alignment="start"
distribution="end"
css={{
width: '100%',
backgroundColor: '$grayBgActive',
borderRadius: '6px',
padding: '4px 4px 4px 0px',
'@md': {
width: 'unset',
marginLeft: '32px',
backgroundColor: 'transparent',
},
}}
>
<>
<StyledText
css={{
fontSize: '11px',
'@md': {
marginTop: '5px',
},
}}
>
{`Gmail: ${email.confirmationCode}`}
</StyledText>
<Box>
<CopyTextBtnWrapper>
<CopyTextButton
text={email.confirmationCode}
type={TextType.ConfirmationCode}
/>
</CopyTextBtnWrapper>
</Box>
</>
</HStack>
)}
</Box>
<HStack distribution="start" css={{ marginLeft: 'auto' }}>
<Box
css={{
textAlign: 'right',
display: 'none',
fontSize: '11px',
'@md': {
display: 'flex',
marginTop: '5px',
},
}}
>
<MoreOptions onDelete={() => deleteEmail(email.id)} />
{`Gmail: ${email.confirmationCode}`}
</StyledText>
<Box>
<CopyTextBtnWrapper>
<CopyTextButton
text={email.confirmationCode || ''}
type={TextType.ConfirmationCode}
/>
</CopyTextBtnWrapper>
</Box>
</HStack>
</TableCard>
)
})}
</VStack>
</HStack>
<Box css={{ height: '120px' }} />
</PrimaryLayout>
</>
</HStack>
}
/>
)
})}
</SettingsTable>
)
}

View file

@ -1,18 +1,20 @@
import { useState } from 'react'
import { PrimaryLayout } from '../../components/templates/PrimaryLayout'
import { Toaster } from 'react-hot-toast'
import { applyStoredTheme } from '../../lib/themeUpdater'
import { ConfirmationModal } from '../../components/patterns/ConfirmationModal'
import { useGetSubscriptionsQuery } from '../../lib/networking/queries/useGetSubscriptionsQuery'
import { unsubscribeMutation } from '../../lib/networking/mutations/unsubscribeMutation'
import { showErrorToast, showSuccessToast } from '../../lib/toastHelpers'
import { Table } from '../../components/elements/Table'
import {
SettingsTable,
SettingsTableRow,
} from '../../components/templates/settings/SettingsTable'
import { StyledText } from '../../components/elements/StyledText'
import Link from 'next/link'
export default function SubscriptionsPage(): JSX.Element {
const { subscriptions, revalidate } = useGetSubscriptionsQuery()
const [confirmUnsubscribeName, setConfirmUnsubscribeName] = useState<
string | null
>(null)
const [confirmUnsubscribeName, setConfirmUnsubscribeName] =
useState<string | null>(null)
applyStoredTheme(false)
@ -26,42 +28,93 @@ export default function SubscriptionsPage(): JSX.Element {
revalidate()
}
const headers = ['Name', 'Email', 'Updated Time']
const rows = new Map<string, string[]>()
subscriptions.forEach((subscription) =>
rows.set(subscription.name, [
subscription.name,
subscription.newsletterEmail,
subscription.updatedAt.toString(),
])
)
function formattedShortDate(date: Date): string {
return new Intl.DateTimeFormat('en-US', {
dateStyle: 'short',
}).format(date)
}
return (
<PrimaryLayout pageTestId="settings-subscriptions-tag">
<Toaster
containerStyle={{
top: '5rem',
}}
/>
<SettingsTable
pageId="settings-subscriptions-tag"
pageHeadline="Subscriptions"
pageInfoLink="/help/newsletters"
headerTitle="Subscriptions"
>
<>
{subscriptions &&
subscriptions.map((subscription, i) => {
return (
<SettingsTableRow
key={subscription.id}
title={subscription.name}
isFirst={i === 0}
isLast={i === subscriptions.length - 1}
onDelete={() => onUnsubscribe(subscription.name)}
deleteTitle="Unsubscribe"
sublineElement={
<StyledText
css={{
my: '5px',
fontSize: '11px',
}}
>
{`Last received ${formattedShortDate(
subscription.updatedAt
)}, `}
<Link
href={`/settings/emails?address=${subscription.newsletterEmail}`}
>
{subscription.newsletterEmail}
</Link>
</StyledText>
}
/>
)
})}
{confirmUnsubscribeName ? (
<ConfirmationModal
message={
'Are you sure? You will stop receiving newsletters from this subscription.'
}
onAccept={async () => {
await onUnsubscribe(confirmUnsubscribeName)
setConfirmUnsubscribeName(null)
}}
onOpenChange={() => setConfirmUnsubscribeName(null)}
/>
) : null}
<Table
heading={'Subscriptions'}
headers={headers}
rows={rows}
onDelete={setConfirmUnsubscribeName}
/>
</PrimaryLayout>
{confirmUnsubscribeName ? (
<ConfirmationModal
message={
'Are you sure? You will stop receiving newsletters from this subscription.'
}
onAccept={async () => {
await onUnsubscribe(confirmUnsubscribeName)
setConfirmUnsubscribeName(null)
}}
onOpenChange={() => setConfirmUnsubscribeName(null)}
/>
) : null}
</>
</SettingsTable>
)
// return (
// <PrimaryLayout pageTestId="settings-subscriptions-tag">
// <Toaster
// containerStyle={{
// top: '5rem',
// }}
// />
// {confirmUnsubscribeName ? (
// <ConfirmationModal
// message={
// 'Are you sure? You will stop receiving newsletters from this subscription.'
// }
// onAccept={async () => {
// await onUnsubscribe(confirmUnsubscribeName)
// setConfirmUnsubscribeName(null)
// }}
// onOpenChange={() => setConfirmUnsubscribeName(null)}
// />
// ) : null}
// <Table
// heading={'Subscriptions'}
// headers={headers}
// rows={rows}
// onDelete={setConfirmUnsubscribeName}
// />
// </PrimaryLayout>
// )
}