prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2377 from omnivore-app/fix/recent-emails-frame

Browse source 
Put recent emails in an iframe
This commit is contained in:
Jackson Harper 2023-06-16 20:53:56 +08:00 committed by GitHub
commit fc42800a9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/web/next.config.js
View file

@ -6,7 +6,7 @@ const ContentSecurityPolicy = `
font-src 'self' data: cdn.jsdelivr.net; font-src 'self' data: cdn.jsdelivr.net;
form-action 'self' ${process.env.NEXT_PUBLIC_SERVER_BASE_URL}; form-action 'self' ${process.env.NEXT_PUBLIC_SERVER_BASE_URL};
frame-ancestors 'none'; frame-ancestors 'none';
frame-src accounts.google.com platform.twitter.com www.youtube-nocookie.com; frame-src self accounts.google.com platform.twitter.com www.youtube.com www.youtube-nocookie.com;
manifest-src 'self'; manifest-src 'self';
script-src 'self' 'unsafe-inline' 'unsafe-eval' accounts.google.com widget.intercom.io js.intercomcdn.com platform.twitter.com cdnjs.cloudflare.com cdn.jsdelivr.net cdn.segment.com; script-src 'self' 'unsafe-inline' 'unsafe-eval' accounts.google.com widget.intercom.io js.intercomcdn.com platform.twitter.com cdnjs.cloudflare.com cdn.jsdelivr.net cdn.segment.com;
style-src 'self' 'unsafe-inline' accounts.google.com cdnjs.cloudflare.com; style-src 'self' 'unsafe-inline' accounts.google.com cdnjs.cloudflare.com;

13
packages/web/pages/settings/emails/recent.tsx
View file

@ -113,7 +113,7 @@ const ViewRecentEmailModal = (
;(document.activeElement as HTMLElement).blur() ;(document.activeElement as HTMLElement).blur()
}} }}
> >
<VStack distribution="start"> <VStack distribution="start" css={{ height: '100%' }}>
<ModalTitleBar title="View Email" onOpenChange={props.onOpenChange} /> <ModalTitleBar title="View Email" onOpenChange={props.onOpenChange} />
{props.display == 'text' ? ( {props.display == 'text' ? (
<Box <Box
@ -133,9 +133,16 @@ const ViewRecentEmailModal = (
height: '100%', height: '100%',
fontSize: '12px', fontSize: '12px',
overflowY: 'scroll', overflowY: 'scroll',
iframe: {
width: '100%',
height: '100%',
display: 'block',
border: 'none',
},
}} }}
dangerouslySetInnerHTML={{ __html: props.recentEmail.html }} >
></Box> <iframe srcDoc={props.recentEmail.html}></iframe>
</Box>
)} )}
</VStack> </VStack>
</ModalContent> </ModalContent>