refactor: Replace Font Awesome

Alexintosh · Dec 20, 2020 · 91de2c6 · 91de2c6
1 parent 7598a23
commit 91de2c6
Show file tree

Hide file tree

Showing 9 changed files with 146 additions and 137 deletions.
diff --git a/components/icons/icons.tsx b/components/icons/icons.tsx
@@ -0,0 +1,105 @@
+interface Props {
+  size?: number
+}
+
+export function JsIcon({ size }: Props) {
+  return (
+    <svg
+      width={size}
+      height={size}
+      role="img"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 448 512"
+    >
+      <path
+        fill="currentColor"
+        d="M0 32v448h448V32H0zm243.8 349.4c0 43.6-25.6 63.5-62.9 63.5-33.7 0-53.2-17.4-63.2-38.5l34.3-20.7c6.6 11.7 12.6 21.6 27.1 21.6 13.8 0 22.6-5.4 22.6-26.5V237.7h42.1v143.7zm99.6 63.5c-39.1 0-64.4-18.6-76.7-43l34.3-19.8c9 14.7 20.8 25.6 41.5 25.6 17.4 0 28.6-8.7 28.6-20.8 0-14.4-11.4-19.5-30.7-28l-10.5-4.5c-30.4-12.9-50.5-29.2-50.5-63.5 0-31.6 24.1-55.6 61.6-55.6 26.8 0 46 9.3 59.8 33.7L368 290c-7.2-12.9-15-18-27.1-18-12.3 0-20.1 7.8-20.1 18 0 12.6 7.8 17.7 25.9 25.6l10.5 4.5c35.8 15.3 55.9 31 55.9 66.2 0 37.8-29.8 58.6-69.7 58.6z"
+      ></path>
+    </svg>
+  )
+}
+
+export function SpiderIcon({ size }: Props) {
+  return (
+    <svg
+      width={size}
+      height={size}
+      role="img"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 576 512"
+    >
+      <path
+        fill="currentColor"
+        d="M151.17 167.35L177.1 176h4.67l5.22-26.12c.72-3.58 1.8-7.58 3.21-11.79l-20.29-40.58 23.8-71.39c2.79-8.38-1.73-17.44-10.12-20.24L168.42.82c-8.38-2.8-17.45 1.73-20.24 10.12l-25.89 77.68a32.04 32.04 0 0 0 1.73 24.43l27.15 54.3zm422.14 182.03l-52.75-79.12a32.002 32.002 0 0 0-26.62-14.25H416l68.99-24.36a32.03 32.03 0 0 0 16.51-12.61l53.6-80.41c4.9-7.35 2.91-17.29-4.44-22.19l-13.31-8.88c-7.35-4.9-17.29-2.91-22.19 4.44l-50.56 75.83L404.1 208H368l-10.37-51.85C355.44 145.18 340.26 96 288 96c-52.26 0-67.44 49.18-69.63 60.15L208 208h-36.1l-60.49-20.17L60.84 112c-4.9-7.35-14.83-9.34-22.19-4.44l-13.31 8.88c-7.35 4.9-9.34 14.83-4.44 22.19l53.6 80.41a32.03 32.03 0 0 0 16.51 12.61L160 256H82.06a32.02 32.02 0 0 0-26.63 14.25L2.69 349.38c-4.9 7.35-2.92 17.29 4.44 22.19l13.31 8.88c7.35 4.9 17.29 2.91 22.19-4.44l48-72h47.06l-60.83 97.33A31.988 31.988 0 0 0 72 418.3V496c0 8.84 7.16 16 16 16h16c8.84 0 16-7.16 16-16v-73.11l74.08-118.53c-1.01 14.05-2.08 28.11-2.08 42.21C192 399.64 232.76 448 288 448s96-48.36 96-101.43c0-14.1-1.08-28.16-2.08-42.21L456 422.89V496c0 8.84 7.16 16 16 16h16c8.84 0 16-7.16 16-16v-77.71c0-6-1.69-11.88-4.86-16.96L438.31 304h47.06l48 72c4.9 7.35 14.84 9.34 22.19 4.44l13.31-8.88c7.36-4.9 9.34-14.83 4.44-22.18zM406.09 97.51l-20.29 40.58c1.41 4.21 2.49 8.21 3.21 11.79l5.22 26.12h4.67l25.93-8.65 27.15-54.3a31.995 31.995 0 0 0 1.73-24.43l-25.89-77.68C425.03 2.56 415.96-1.98 407.58.82l-15.17 5.06c-8.38 2.8-12.91 11.86-10.12 20.24l23.8 71.39z"
+      ></path>
+    </svg>
+  )
+}
+
+export function ReactIcon({ size }: Props) {
+  return (
+    <svg
+      width={size}
+      height={size}
+      role="img"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 512 512"
+    >
+      <path
+        fill="currentColor"
+        d="M418.2 177.2c-5.4-1.8-10.8-3.5-16.2-5.1.9-3.7 1.7-7.4 2.5-11.1 12.3-59.6 4.2-107.5-23.1-123.3-26.3-15.1-69.2.6-112.6 38.4-4.3 3.7-8.5 7.6-12.5 11.5-2.7-2.6-5.5-5.2-8.3-7.7-45.5-40.4-91.1-57.4-118.4-41.5-26.2 15.2-34 60.3-23 116.7 1.1 5.6 2.3 11.1 3.7 16.7-6.4 1.8-12.7 3.8-18.6 5.9C38.3 196.2 0 225.4 0 255.6c0 31.2 40.8 62.5 96.3 81.5 4.5 1.5 9 3 13.6 4.3-1.5 6-2.8 11.9-4 18-10.5 55.5-2.3 99.5 23.9 114.6 27 15.6 72.4-.4 116.6-39.1 3.5-3.1 7-6.3 10.5-9.7 4.4 4.3 9 8.4 13.6 12.4 42.8 36.8 85.1 51.7 111.2 36.6 27-15.6 35.8-62.9 24.4-120.5-.9-4.4-1.9-8.9-3-13.5 3.2-.9 6.3-1.9 9.4-2.9 57.7-19.1 99.5-50 99.5-81.7 0-30.3-39.4-59.7-93.8-78.4zM282.9 92.3c37.2-32.4 71.9-45.1 87.7-36 16.9 9.7 23.4 48.9 12.8 100.4-.7 3.4-1.4 6.7-2.3 10-22.2-5-44.7-8.6-67.3-10.6-13-18.6-27.2-36.4-42.6-53.1 3.9-3.7 7.7-7.2 11.7-10.7zM167.2 307.5c5.1 8.7 10.3 17.4 15.8 25.9-15.6-1.7-31.1-4.2-46.4-7.5 4.4-14.4 9.9-29.3 16.3-44.5 4.6 8.8 9.3 17.5 14.3 26.1zm-30.3-120.3c14.4-3.2 29.7-5.8 45.6-7.8-5.3 8.3-10.5 16.8-15.4 25.4-4.9 8.5-9.7 17.2-14.2 26-6.3-14.9-11.6-29.5-16-43.6zm27.4 68.9c6.6-13.8 13.8-27.3 21.4-40.6s15.8-26.2 24.4-38.9c15-1.1 30.3-1.7 45.9-1.7s31 .6 45.9 1.7c8.5 12.6 16.6 25.5 24.3 38.7s14.9 26.7 21.7 40.4c-6.7 13.8-13.9 27.4-21.6 40.8-7.6 13.3-15.7 26.2-24.2 39-14.9 1.1-30.4 1.6-46.1 1.6s-30.9-.5-45.6-1.4c-8.7-12.7-16.9-25.7-24.6-39s-14.8-26.8-21.5-40.6zm180.6 51.2c5.1-8.8 9.9-17.7 14.6-26.7 6.4 14.5 12 29.2 16.9 44.3-15.5 3.5-31.2 6.2-47 8 5.4-8.4 10.5-17 15.5-25.6zm14.4-76.5c-4.7-8.8-9.5-17.6-14.5-26.2-4.9-8.5-10-16.9-15.3-25.2 16.1 2 31.5 4.7 45.9 8-4.6 14.8-10 29.2-16.1 43.4zM256.2 118.3c10.5 11.4 20.4 23.4 29.6 35.8-19.8-.9-39.7-.9-59.5 0 9.8-12.9 19.9-24.9 29.9-35.8zM140.2 57c16.8-9.8 54.1 4.2 93.4 39 2.5 2.2 5 4.6 7.6 7-15.5 16.7-29.8 34.5-42.9 53.1-22.6 2-45 5.5-67.2 10.4-1.3-5.1-2.4-10.3-3.5-15.5-9.4-48.4-3.2-84.9 12.6-94zm-24.5 263.6c-4.2-1.2-8.3-2.5-12.4-3.9-21.3-6.7-45.5-17.3-63-31.2-10.1-7-16.9-17.8-18.8-29.9 0-18.3 31.6-41.7 77.2-57.6 5.7-2 11.5-3.8 17.3-5.5 6.8 21.7 15 43 24.5 63.6-9.6 20.9-17.9 42.5-24.8 64.5zm116.6 98c-16.5 15.1-35.6 27.1-56.4 35.3-11.1 5.3-23.9 5.8-35.3 1.3-15.9-9.2-22.5-44.5-13.5-92 1.1-5.6 2.3-11.2 3.7-16.7 22.4 4.8 45 8.1 67.9 9.8 13.2 18.7 27.7 36.6 43.2 53.4-3.2 3.1-6.4 6.1-9.6 8.9zm24.5-24.3c-10.2-11-20.4-23.2-30.3-36.3 9.6.4 19.5.6 29.5.6 10.3 0 20.4-.2 30.4-.7-9.2 12.7-19.1 24.8-29.6 36.4zm130.7 30c-.9 12.2-6.9 23.6-16.5 31.3-15.9 9.2-49.8-2.8-86.4-34.2-4.2-3.6-8.4-7.5-12.7-11.5 15.3-16.9 29.4-34.8 42.2-53.6 22.9-1.9 45.7-5.4 68.2-10.5 1 4.1 1.9 8.2 2.7 12.2 4.9 21.6 5.7 44.1 2.5 66.3zm18.2-107.5c-2.8.9-5.6 1.8-8.5 2.6-7-21.8-15.6-43.1-25.5-63.8 9.6-20.4 17.7-41.4 24.5-62.9 5.2 1.5 10.2 3.1 15 4.7 46.6 16 79.3 39.8 79.3 58 0 19.6-34.9 44.9-84.8 61.4zm-149.7-15c25.3 0 45.8-20.5 45.8-45.8s-20.5-45.8-45.8-45.8c-25.3 0-45.8 20.5-45.8 45.8s20.5 45.8 45.8 45.8z"
+      ></path>
+    </svg>
+  )
+}
+
+export function PaintBrushIcon({ size }: Props) {
+  return (
+    <svg
+      width={size}
+      height={size}
+      role="img"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 512 512"
+    >
+      <path
+        fill="currentColor"
+        d="M167.02 309.34c-40.12 2.58-76.53 17.86-97.19 72.3-2.35 6.21-8 9.98-14.59 9.98-11.11 0-45.46-27.67-55.25-34.35C0 439.62 37.93 512 128 512c75.86 0 128-43.77 128-120.19 0-3.11-.65-6.08-.97-9.13l-88.01-73.34zM457.89 0c-15.16 0-29.37 6.71-40.21 16.45C213.27 199.05 192 203.34 192 257.09c0 13.7 3.25 26.76 8.73 38.7l63.82 53.18c7.21 1.8 14.64 3.03 22.39 3.03 62.11 0 98.11-45.47 211.16-256.46 7.38-14.35 13.9-29.85 13.9-45.99C512 20.64 486 0 457.89 0z"
+      ></path>
+    </svg>
+  )
+}
+
+export function SunIcon({ size }: Props) {
+  return (
+    <svg
+      width={size}
+      height={size}
+      role="img"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 512 512"
+    >
+      <path
+        fill="currentColor"
+        d="M256 160c-52.9 0-96 43.1-96 96s43.1 96 96 96 96-43.1 96-96-43.1-96-96-96zm246.4 80.5l-94.7-47.3 33.5-100.4c4.5-13.6-8.4-26.5-21.9-21.9l-100.4 33.5-47.4-94.8c-6.4-12.8-24.6-12.8-31 0l-47.3 94.7L92.7 70.8c-13.6-4.5-26.5 8.4-21.9 21.9l33.5 100.4-94.7 47.4c-12.8 6.4-12.8 24.6 0 31l94.7 47.3-33.5 100.5c-4.5 13.6 8.4 26.5 21.9 21.9l100.4-33.5 47.3 94.7c6.4 12.8 24.6 12.8 31 0l47.3-94.7 100.4 33.5c13.6 4.5 26.5-8.4 21.9-21.9l-33.5-100.4 94.7-47.3c13-6.5 13-24.7.2-31.1zm-155.9 106c-49.9 49.9-131.1 49.9-181 0-49.9-49.9-49.9-131.1 0-181 49.9-49.9 131.1-49.9 181 0 49.9 49.9 49.9 131.1 0 181z"
+      ></path>
+    </svg>
+  )
+}
+
+export function MoonIcon({ size }: Props) {
+  return (
+    <svg
+      width={size}
+      height={size}
+      role="img"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 512 512"
+    >
+      <path
+        fill="currentColor"
+        d="M283.211 512c78.962 0 151.079-35.925 198.857-94.792 7.068-8.708-.639-21.43-11.562-19.35-124.203 23.654-238.262-71.576-238.262-196.954 0-72.222 38.662-138.635 101.498-174.394 9.686-5.512 7.25-20.197-3.756-22.23A258.156 258.156 0 0 0 283.211 0c-141.309 0-256 114.511-256 256 0 141.309 114.511 256 256 256z"
+      ></path>
+    </svg>
+  )
+}
diff --git a/components/icons/index.tsx b/components/icons/index.tsx
@@ -0,0 +1,25 @@
+import { cloneElement } from 'react'
+
+import * as SVG from './icons'
+
+interface Props {
+  icon: 'js' | 'spider' | 'react' | 'paintBrush' | 'sun' | 'moon'
+  size?: number
+}
+
+const icons = {
+  js: <SVG.JsIcon />,
+  spider: <SVG.SpiderIcon />,
+  react: <SVG.ReactIcon />,
+  paintBrush: <SVG.PaintBrushIcon />,
+  sun: <SVG.SunIcon />,
+  moon: <SVG.MoonIcon />,
+}
+
+export function Icon({ icon, size = 32 }: Props): JSX.Element | null {
+  if (icon && icons[icon]) {
+    return cloneElement(icons[icon], { size })
+  }
+
+  return null
+}
diff --git a/components/ui/Card.tsx b/components/ui/Card.tsx
@@ -1,8 +1,8 @@
 import { FC } from 'react'
 import { Box, Heading } from '@chakra-ui/react'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { motion } from 'framer-motion'
 
+import { Icon } from '@/components/icons'
 import { Tilt } from '@/components/motion'
 import { CustomLink } from '@/components/ui'
 
@@ -61,7 +61,7 @@ const Card: FC<Props> = ({ theme, title, slug }) => (
           color={cardTheme[theme].color}
           zIndex="2"
         >
-          <FontAwesomeIcon icon={cardTheme[theme].icon} size="2x" />
+          <Icon icon={cardTheme[theme].icon} />
         </Box>
         <Heading
           as="h3"

diff --git a/components/ui/Navigation.tsx b/components/ui/Navigation.tsx
@@ -1,14 +1,11 @@
-import { FC } from 'react'
 import { Box, List, ListItem, useColorMode } from '@chakra-ui/react'
-import { faHtml5, faJs, faReact } from '@fortawesome/free-brands-svg-icons'
-import { faPaintBrush } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 
+import { Icon } from '@/components/icons'
 import { CustomLink, ThemeToggle } from '@/components/ui'
 
 import { bgColor, borderColor, mutedColor, primaryColor } from '@/styles/colors'
 
-const Navigation: FC = () => {
+export function Navigation() {
   const { colorMode } = useColorMode()
 
   const hoverStyle = {
@@ -35,7 +32,7 @@ const Navigation: FC = () => {
       <List h="100%" d="flex" flexDir="column" alignItems="center">
         <ListItem my={8}>
           <CustomLink href="/" color={primaryColor[colorMode]} isInternal>
-            <FontAwesomeIcon icon={faPaintBrush} size="2x" fixedWidth />
+            <Icon icon="paintBrush" />
           </CustomLink>
         </ListItem>
 
@@ -46,7 +43,7 @@ const Navigation: FC = () => {
             hover={hoverStyle}
             isInternal
           >
-            <FontAwesomeIcon icon={faJs} size="2x" fixedWidth />
+            <Icon icon="js" />
           </CustomLink>
         </ListItem>
 
@@ -57,7 +54,7 @@ const Navigation: FC = () => {
             hover={hoverStyle}
             isInternal
           >
-            <FontAwesomeIcon icon={faReact} size="2x" fixedWidth />
+            <Icon icon="react" />
           </CustomLink>
         </ListItem>
 
@@ -68,7 +65,7 @@ const Navigation: FC = () => {
             hover={hoverStyle}
             isInternal
           >
-            <FontAwesomeIcon icon={faHtml5} size="2x" fixedWidth />
+            <Icon icon="spider" />
           </CustomLink>
         </ListItem>
 
@@ -79,5 +76,3 @@ const Navigation: FC = () => {
     </Box>
   )
 }
-
-export default Navigation
diff --git a/components/ui/ThemeToggle.tsx b/components/ui/ThemeToggle.tsx
@@ -1,7 +1,7 @@
 import { FC } from 'react'
 import { IconButton, useColorMode } from '@chakra-ui/react'
-import { faSun, faMoon } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+
+import { Icon } from '@/components/icons'
 
 import { bgColor, mutedColor, primaryColor } from '@/styles/colors'
 
@@ -13,12 +13,7 @@ const ThemeToggle: FC = () => {
     color: primaryColor[colorMode],
   }
 
-  const icon =
-    colorMode === 'dark' ? (
-      <FontAwesomeIcon icon={faSun} size="2x" />
-    ) : (
-      <FontAwesomeIcon icon={faMoon} size="2x" />
-    )
+  const icon = colorMode === 'dark' ? <Icon icon="sun" /> : <Icon icon="moon" />
 
   return (
     <IconButton

diff --git a/components/ui/index.ts b/components/ui/index.ts
@@ -7,7 +7,7 @@ import { Emoji } from '@/components/ui/Emoji'
 import Image from '@/components/ui/Image'
 import { CustomLink } from '@/components/ui/Link'
 import { Olist, Ulist, Li } from '@/components/ui/List'
-import Navigation from '@/components/ui/Navigation'
+import { Navigation } from '@/components/ui/Navigation'
 import ThemeToggle from '@/components/ui/ThemeToggle'
 import { H1, H2, Hr, Paragraph } from '@/components/ui/Typography'
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,10 +11,6 @@
     "@chakra-ui/react": "^1.0.0",
     "@emotion/react": "^11.0.0",
     "@emotion/styled": "^11.0.0",
-    "@fortawesome/fontawesome-svg-core": "^1.2.32",
-    "@fortawesome/free-brands-svg-icons": "^5.15.1",
-    "@fortawesome/free-solid-svg-icons": "^5.15.1",
-    "@fortawesome/react-fontawesome": "^0.1.12",
     "@mapbox/rehype-prism": "^0.5.0",
     "@mdx-js/loader": "^1.6.21",
     "@mdx-js/react": "^1.6.21",