From b03519ec5f142748ca697edd3898bf27cf6bb1f4 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 11 Feb 2022 15:22:26 +0200
Subject: [PATCH] Remove font-awesome

---
 components/Footer.tsx                    | 60 +++++++++++++-----------
 package.json                             |  1 -
 public/static/images/social/facebook.svg |  1 +
 public/static/images/social/github.svg   |  1 +
 public/static/images/social/linkedin.svg |  1 +
 public/static/images/social/slack.svg    |  1 +
 public/static/images/social/twitter.svg  |  1 +
 styles/_icons.scss                       | 32 -------------
 styles/style.scss                        |  6 ++-
 yarn.lock                                |  5 --
 10 files changed, 43 insertions(+), 66 deletions(-)
 create mode 100644 public/static/images/social/facebook.svg
 create mode 100644 public/static/images/social/github.svg
 create mode 100644 public/static/images/social/linkedin.svg
 create mode 100644 public/static/images/social/slack.svg
 create mode 100644 public/static/images/social/twitter.svg
 delete mode 100644 styles/_icons.scss

diff --git a/components/Footer.tsx b/components/Footer.tsx
index bb4b194..d278a8d 100644
--- a/components/Footer.tsx
+++ b/components/Footer.tsx
@@ -5,7 +5,7 @@ import sponsors from "../data/sponsors";
 type Props = {
   href: string;
   name: string;
-  key: string;
+  title?: string;
 };
 
 const SponsorLink = ({ href, name }: Props) => (
@@ -19,6 +19,17 @@ const SponsorLink = ({ href, name }: Props) => (
   </a>
 );
 
+const SocialLink = ({ href, name, title }: Props) => (
+  <a href={href} target="_blank" rel="noopener noreferrer" aria-label={title}>
+    <img
+      src={`/static/images/social/${name.toLowerCase()}.svg`}
+      alt={title}
+      className={`social social__${name.toLowerCase()}`}
+      loading="lazy"
+    />
+  </a>
+);
+
 export function Footer() {
   return (
     <footer>
@@ -30,36 +41,31 @@ export function Footer() {
       </div>
       <div className="contacts">
         <div>
-          <a
+          <SocialLink
             href="https://koodiklinikka.slack.com"
-            aria-label="Koodiklinikka Slackissä"
-          >
-            <i className="fa fa-slack" aria-hidden="true" />
-          </a>
-          <a
-            href="https://github.com/koodiklinikka/koodiklinikka.fi"
-            aria-label="Koodiklinikka Githubissa"
-          >
-            <i className="fa fa-github" aria-hidden="true" />
-          </a>
-          <a
+            title="Koodiklinikka Slackissä"
+            name="slack"
+          />
+          <SocialLink
+            href="https://github.com/koodiklinikka"
+            title="Koodiklinikka Githubissa"
+            name="github"
+          />
+          <SocialLink
             href="https://twitter.com/koodiklinikka"
-            aria-label="Koodiklinikka Twitterissä"
-          >
-            <i className="fa fa-twitter" aria-hidden="true" />
-          </a>
-          <a
+            title="Koodiklinikka Twitterissä"
+            name="twitter"
+          />
+          <SocialLink
             href="https://www.linkedin.com/groups/12025476"
-            aria-label="Koodiklinikka Linkedinissä"
-          >
-            <i className="fa fa-linkedin" aria-hidden="true" />
-          </a>
-          <a
+            title="Koodiklinikka Linkedinissä"
+            name="linkedin"
+          />
+          <SocialLink
             href="https://www.facebook.com/koodiklinikka"
-            aria-label="Koodiklinikka Facebookissa"
-          >
-            <i className="fa fa-facebook" aria-hidden="true" />
-          </a>
+            title="Koodiklinikka Facebookissa"
+            name="facebook"
+          />
           <div id="email">
             <EmailComponent />
           </div>
diff --git a/package.json b/package.json
index db3fe24..c75a8fc 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,6 @@
   "dependencies": {
     "axios": "^0.25.0",
     "classnames": "^2.3.1",
-    "font-awesome": "^4.7.0",
     "javascript-time-ago": "^2.3.13",
     "less": "^4.1.2",
     "lodash": "^4.17.21",
diff --git a/public/static/images/social/facebook.svg b/public/static/images/social/facebook.svg
new file mode 100644
index 0000000..7f375de
--- /dev/null
+++ b/public/static/images/social/facebook.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M504 256C504 119 393 8 256 8S8 119 8 256c0 123.78 90.69 226.38 209.25 245V327.69h-63V256h63v-54.64c0-62.15 37-96.48 93.67-96.48 27.14 0 55.52 4.84 55.52 4.84v61h-31.28c-30.8 0-40.41 19.12-40.41 38.73V256h68.78l-11 71.69h-57.78V501C413.31 482.38 504 379.78 504 256z"/></svg>
\ No newline at end of file
diff --git a/public/static/images/social/github.svg b/public/static/images/social/github.svg
new file mode 100644
index 0000000..ec2bab2
--- /dev/null
+++ b/public/static/images/social/github.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"/></svg>
\ No newline at end of file
diff --git a/public/static/images/social/linkedin.svg b/public/static/images/social/linkedin.svg
new file mode 100644
index 0000000..ad64244
--- /dev/null
+++ b/public/static/images/social/linkedin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M416 32H31.9C14.3 32 0 46.5 0 64.3v383.4C0 465.5 14.3 480 31.9 480H416c17.6 0 32-14.5 32-32.3V64.3c0-17.8-14.4-32.3-32-32.3zM135.4 416H69V202.2h66.5V416zm-33.2-243c-21.3 0-38.5-17.3-38.5-38.5S80.9 96 102.2 96c21.2 0 38.5 17.3 38.5 38.5 0 21.3-17.2 38.5-38.5 38.5zm282.1 243h-66.4V312c0-24.8-.5-56.7-34.5-56.7-34.6 0-39.9 27-39.9 54.9V416h-66.4V202.2h63.7v29.2h.9c8.9-16.8 30.6-34.5 62.9-34.5 67.2 0 79.7 44.3 79.7 101.9V416z"/></svg>
\ No newline at end of file
diff --git a/public/static/images/social/slack.svg b/public/static/images/social/slack.svg
new file mode 100644
index 0000000..0eefd75
--- /dev/null
+++ b/public/static/images/social/slack.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M94.12 315.1c0 25.9-21.16 47.06-47.06 47.06S0 341 0 315.1c0-25.9 21.16-47.06 47.06-47.06h47.06v47.06zm23.72 0c0-25.9 21.16-47.06 47.06-47.06s47.06 21.16 47.06 47.06v117.84c0 25.9-21.16 47.06-47.06 47.06s-47.06-21.16-47.06-47.06V315.1zm47.06-188.98c-25.9 0-47.06-21.16-47.06-47.06S139 32 164.9 32s47.06 21.16 47.06 47.06v47.06H164.9zm0 23.72c25.9 0 47.06 21.16 47.06 47.06s-21.16 47.06-47.06 47.06H47.06C21.16 243.96 0 222.8 0 196.9s21.16-47.06 47.06-47.06H164.9zm188.98 47.06c0-25.9 21.16-47.06 47.06-47.06 25.9 0 47.06 21.16 47.06 47.06s-21.16 47.06-47.06 47.06h-47.06V196.9zm-23.72 0c0 25.9-21.16 47.06-47.06 47.06-25.9 0-47.06-21.16-47.06-47.06V79.06c0-25.9 21.16-47.06 47.06-47.06 25.9 0 47.06 21.16 47.06 47.06V196.9zM283.1 385.88c25.9 0 47.06 21.16 47.06 47.06 0 25.9-21.16 47.06-47.06 47.06-25.9 0-47.06-21.16-47.06-47.06v-47.06h47.06zm0-23.72c-25.9 0-47.06-21.16-47.06-47.06 0-25.9 21.16-47.06 47.06-47.06h117.84c25.9 0 47.06 21.16 47.06 47.06 0 25.9-21.16 47.06-47.06 47.06H283.1z"/></svg>
\ No newline at end of file
diff --git a/public/static/images/social/twitter.svg b/public/static/images/social/twitter.svg
new file mode 100644
index 0000000..f44967a
--- /dev/null
+++ b/public/static/images/social/twitter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!-- Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><path d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"/></svg>
\ No newline at end of file
diff --git a/styles/_icons.scss b/styles/_icons.scss
deleted file mode 100644
index 1d8e455..0000000
--- a/styles/_icons.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-@import "../node_modules/font-awesome/scss/_variables.scss";
-@import "../node_modules/font-awesome/scss/_core.scss";
-
-@font-face {
-  font-family: "FontAwesome";
-  src: url("../node_modules/font-awesome/fonts/fontawesome-webfont.woff2?v=@{fa-version}")
-      format("woff2"),
-    url("../node_modules/font-awesome/fonts/fontawesome-webfont.woff?v=@{fa-version}")
-      format("woff");
-  font-weight: normal;
-  font-style: normal;
-}
-
-.#{$fa-css-prefix}-linkedin:before {
-  content: $fa-var-linkedin;
-}
-
-.#{$fa-css-prefix}-github:before {
-  content: $fa-var-github;
-}
-
-.#{$fa-css-prefix}-slack:before {
-  content: $fa-var-slack;
-}
-
-.#{$fa-css-prefix}-twitter:before {
-  content: $fa-var-twitter;
-}
-
-.#{$fa-css-prefix}-facebook:before {
-  content: $fa-var-facebook;
-}
diff --git a/styles/style.scss b/styles/style.scss
index e077fb4..871a03d 100644
--- a/styles/style.scss
+++ b/styles/style.scss
@@ -5,7 +5,6 @@ $textColor: #444;
 $feedWidth: 500px;
 $footerHeight: 50px;
 
-@import "_icons";
 @import "_input";
 @import "_button";
 @import "_header";
@@ -388,6 +387,11 @@ footer {
     margin-top: 1em;
   }
 }
+.social {
+  height: 30px;
+  margin-left: .5em;
+  margin-right: .5em;
+}
 .feed {
   width: $feedWidth;
   height: 100%;
diff --git a/yarn.lock b/yarn.lock
index 5cef275..6ca3234 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -864,11 +864,6 @@ follow-redirects@^1.14.7:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
   integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
-font-awesome@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"