Skip to content

Commit e14a488

Browse files
committed
Revert "Failed attempt to use react icons in emails"
This reverts commit e82a8d9.
1 parent e82a8d9 commit e14a488

File tree

9 files changed

+13755
-2537
lines changed

9 files changed

+13755
-2537
lines changed

backend/api/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,5 @@
6666
"devDependencies": {
6767
"@types/cors": "2.8.17",
6868
"@types/ws": "8.5.10"
69-
},
70-
"resolutions": {
71-
"glob": "10.4.5"
7269
}
7370
}

backend/api/tsconfig.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"esModuleInterop": true,
1212
"target": "esnext",
1313
"skipLibCheck": true,
14-
"forceConsistentCasingInFileNames": true,
1514
"jsx": "react-jsx",
1615
"paths": {
1716
"common/*": ["../../common/src/*", "../../../common/lib/*"],
@@ -29,6 +28,5 @@
2928
{ "path": "../email" }
3029
],
3130
"compileOnSave": true,
32-
"include": ["src/**/*.ts"],
33-
"exclude": ["../../node_modules/@types/glob"]
31+
"include": ["src/**/*.ts"]
3432
}

backend/email/emails/utils.tsx

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
11
import {Link, Row, Section, Text} from "@react-email/components";
2-
import {
3-
TbBrandBluesky,
4-
TbBrandDiscord,
5-
TbBrandFacebook,
6-
TbBrandGithub,
7-
TbBrandInstagram,
8-
TbBrandLinkedin,
9-
TbBrandMastodon,
10-
TbBrandPatreon,
11-
TbBrandPaypal,
12-
TbBrandSpotify,
13-
TbBrandX
14-
} from "react-icons/tb";
15-
16-
import {LinkIcon} from '@heroicons/react/solid'
17-
import {Site} from 'common/src/socials'
18-
import {LuBookmark} from 'react-icons/lu'
2+
import {SocialIcon} from "web/components/user/social";
193

204
interface Props {
215
email?: string
@@ -35,7 +19,7 @@ export const Footer = ({
3519
<Row>
3620
<div></div>
3721
<Link href="https://github.com/CompassMeet/Compass">
38-
<SocialIcon site={'github'} size={36} color={'black'}/>
22+
<SocialIcon site={'github'} size={36} color={'black'} />
3923
</Link>
4024
<Link href="https://discord.gg/8Vd7jzqjun">
4125
<SocialIcon site={'discord'} size={36} color={'black'}/>
@@ -58,37 +42,6 @@ export const Footer = ({
5842
</Section>
5943
}
6044

61-
62-
export const PLATFORM_ICONS: {
63-
[key in Site]: (props: { className?: string }) => any
64-
} = {
65-
site: LinkIcon,
66-
x: TbBrandX,
67-
discord: TbBrandDiscord,
68-
bluesky: TbBrandBluesky,
69-
mastodon: TbBrandMastodon,
70-
substack: LuBookmark,
71-
instagram: TbBrandInstagram,
72-
github: TbBrandGithub,
73-
linkedin: TbBrandLinkedin,
74-
facebook: TbBrandFacebook,
75-
spotify: TbBrandSpotify,
76-
patreon: TbBrandPatreon,
77-
paypal: TbBrandPaypal,
78-
}
79-
80-
export const SocialIcon = (props: {
81-
site: string;
82-
className?: string;
83-
size?: number;
84-
color?: string;
85-
}): React.ReactElement | null => {
86-
const {site, ...rest} = props
87-
const Icon = PLATFORM_ICONS[site as Site] || PLATFORM_ICONS.site
88-
89-
return <Icon {...rest} />
90-
}
91-
9245
export const footer = {
9346
margin: '20px 0',
9447
textAlign: 'center' as const,

backend/email/yarn.lock

Lines changed: 1633 additions & 0 deletions
Large diffs are not rendered by default.

common/yarn.lock

Lines changed: 2704 additions & 0 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
},
2323
"dependencies": {
2424
"@playwright/test": "^1.54.2",
25-
"@react-email/components": "^0.5.3",
26-
"@react-email/render": "^1.2.3",
2725
"@tiptap/core": "2.3.2",
2826
"@tiptap/extension-blockquote": "2.3.2",
2927
"@tiptap/extension-bold": "2.3.2",
@@ -33,18 +31,14 @@
3331
"@tiptap/extension-link": "2.3.2",
3432
"@tiptap/extension-mention": "2.3.2",
3533
"@tiptap/html": "2.3.2",
36-
"@tiptap/pm": "2.3.2",
3734
"@tiptap/starter-kit": "2.3.2",
3835
"@tiptap/suggestion": "2.3.2",
39-
"@types/react": "18.2.0",
40-
"@types/react-dom": "18.2.0",
4136
"colorette": "^2.0.20",
4237
"prismjs": "^1.30.0",
43-
"react": "18.2.0",
44-
"react-dom": "18.2.0",
38+
"react-markdown": "*",
4539
"react-email": "3.0.7",
46-
"react-icons": "5.5.0",
47-
"react-markdown": "*"
40+
"@react-email/components": "^0.5.3",
41+
"@react-email/render": "^1.2.3"
4842
},
4943
"devDependencies": {
5044
"@testing-library/jest-dom": "^6.6.4",
@@ -77,40 +71,5 @@
7771
"@tiptap/html": "2.3.2",
7872
"@tiptap/starter-kit": "2.3.2",
7973
"@tiptap/suggestion": "2.3.2"
80-
},
81-
"resolutions": {
82-
"@tiptap/core": "2.3.2",
83-
"@tiptap/extension-blockquote": "2.3.2",
84-
"@tiptap/extension-bold": "2.3.2",
85-
"@tiptap/extension-bubble-menu": "2.3.2",
86-
"@tiptap/extension-floating-menu": "2.3.2",
87-
"@tiptap/extension-image": "2.3.2",
88-
"@tiptap/extension-link": "2.3.2",
89-
"@tiptap/extension-mention": "2.3.2",
90-
"@tiptap/html": "2.3.2",
91-
"@tiptap/starter-kit": "2.3.2",
92-
"@tiptap/suggestion": "2.3.2",
93-
"@tiptap/extension-bullet-list": "2.3.2",
94-
"@tiptap/extension-character-count": "2.3.2",
95-
"@tiptap/extension-code": "2.3.2",
96-
"@tiptap/extension-code-block": "2.3.2",
97-
"@tiptap/extension-document": "2.3.2",
98-
"@tiptap/extension-dropcursor": "2.3.2",
99-
"@tiptap/extension-gapcursor": "2.3.2",
100-
"@tiptap/extension-hard-break": "2.3.2",
101-
"@tiptap/extension-heading": "2.3.2",
102-
"@tiptap/extension-history": "2.3.2",
103-
"@tiptap/extension-horizontal-rule": "2.3.2",
104-
"@tiptap/extension-italic": "2.3.2",
105-
"@tiptap/extension-list-item": "2.3.2",
106-
"@tiptap/extension-ordered-list": "2.3.2",
107-
"@tiptap/extension-paragraph": "2.3.2",
108-
"@tiptap/extension-placeholder": "2.3.2",
109-
"@tiptap/extension-strike": "2.3.2",
110-
"@tiptap/extension-text": "2.3.2",
111-
"react": "18.2.0",
112-
"react-dom": "18.2.0",
113-
"@types/react": "18.2.0",
114-
"@types/react-dom": "18.2.0"
11574
}
11675
}

web/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
"@tailwindcss/typography": "^0.5.1",
6868
"@types/d3": "7.4.0",
6969
"@types/lodash": "4.14.178",
70-
"@types/react": "18.2.0",
71-
"@types/react-dom": "18.2.0",
70+
"@types/react": "18.3.5",
71+
"@types/react-dom": "18.3.0",
7272
"autoprefixer": "10.2.6",
7373
"concurrently": "8.2.2",
7474
"cross-env": "7.0.3",

0 commit comments

Comments
 (0)