From 06a2bd793f25abd431fed9d40f0a1dc9699893cb Mon Sep 17 00:00:00 2001
From: Kevin Kandlbinder <kevin@kevink.dev>
Date: Sun, 7 Nov 2021 00:51:00 +0000
Subject: [PATCH] Cleanup code

---
 gatsby-config.js               |  12 ---
 src/components/navigation.js   |  24 +-----
 src/components/offscreenNav.js |  28 ++----
 src/pages/about.js             |   2 +-
 src/pages/donate/thank-you.js  |   6 +-
 src/pages/friends.js           | 152 ++++++++++++++-------------------
 src/pages/index.js             |   1 -
 src/pages/index.module.scss    |   4 -
 src/pages/legal/about.js       |   4 +-
 src/pages/legal/datasec.js     |   4 +-
 src/pages/legal/disclaimer.js  |   4 +-
 src/templates/blogPost.js      |   5 --
 12 files changed, 86 insertions(+), 160 deletions(-)

diff --git a/gatsby-config.js b/gatsby-config.js
index 68f85b0..1ab89cb 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -102,18 +102,6 @@ module.exports = {
             },
         },
         `gatsby-plugin-robots-txt`,
-        /*{
-            resolve: `gatsby-plugin-offline`,
-            options: {
-                precachePages: [
-                    "/",
-                    "/en",
-                    "/en/projects",
-                    "/de",
-                    "/de/projects",
-                ],
-            },
-        },*/
         `gatsby-plugin-sitemap`,
         `gatsby-plugin-react-helmet`,
         {
diff --git a/src/components/navigation.js b/src/components/navigation.js
index 4c437a1..7a24412 100644
--- a/src/components/navigation.js
+++ b/src/components/navigation.js
@@ -83,32 +83,16 @@ const Navigation = ({ isHome }) => {
                     )}
                 />
                 <div className="flexSpacer"></div>
-                <Link
-                    id="navBtnProjects"
-                    to="/about"
-                    activeClassName={styles.active}
-                >
+                <Link to="/about" activeClassName={styles.active}>
                     <Trans>about.title</Trans>
                 </Link>
-                <Link
-                    id="navBtnProjects"
-                    to="/projects"
-                    activeClassName={styles.active}
-                >
+                <Link to="/projects" activeClassName={styles.active}>
                     <Trans>project.plural</Trans>
                 </Link>
-                <Link
-                    id="navBtnSocial"
-                    to="/social"
-                    activeClassName={styles.active}
-                >
+                <Link to="/social" activeClassName={styles.active}>
                     <Trans>social.title</Trans>
                 </Link>
-                <Link
-                    id="navBtnBlog"
-                    to="/blog"
-                    activeClassName={styles.active}
-                >
+                <Link to="/blog" activeClassName={styles.active}>
                     <Trans>blog.title</Trans>
                 </Link>
                 <div className={styles.hamburger}>
diff --git a/src/components/offscreenNav.js b/src/components/offscreenNav.js
index 3cccf9c..ffa7969 100644
--- a/src/components/offscreenNav.js
+++ b/src/components/offscreenNav.js
@@ -26,32 +26,16 @@ const OffScreenNav = ({ active, close }) => {
                 <Link to="/" activeClassName={styles.active}>
                     <Trans>home.title</Trans>
                 </Link>
-                <Link
-                    id="osnavBtnProjects"
-                    to="/about"
-                    activeClassName={styles.active}
-                >
+                <Link to="/about" activeClassName={styles.active}>
                     <Trans>about.title</Trans>
                 </Link>
-                <Link
-                    id="osnavBtnProjects"
-                    to="/projects"
-                    activeClassName={styles.active}
-                >
-                    <Trans>projects</Trans>
+                <Link to="/projects" activeClassName={styles.active}>
+                    <Trans>project.plural</Trans>
                 </Link>
-                <Link
-                    id="osnavBtnSocial"
-                    to="/social"
-                    activeClassName={styles.active}
-                >
-                    <Trans>social</Trans>
+                <Link to="/social" activeClassName={styles.active}>
+                    <Trans>social.title</Trans>
                 </Link>
-                <Link
-                    id="osnavBtnBlog"
-                    to="/blog"
-                    activeClassName={styles.active}
-                >
+                <Link to="/blog" activeClassName={styles.active}>
                     <Trans>blog.title</Trans>
                 </Link>
             </div>
diff --git a/src/pages/about.js b/src/pages/about.js
index 3e421ef..5160b25 100644
--- a/src/pages/about.js
+++ b/src/pages/about.js
@@ -111,7 +111,7 @@ const AboutPage = (props) => {
                 xPath: ["article"],
             }}
         >
-            <section className={styles.aboutSection} id="about">
+            <section className={styles.aboutSection}>
                 <article>
                     <div className={styles.aboutText}>
                         <MDXRenderer>{file.childMdx.body}</MDXRenderer>
diff --git a/src/pages/donate/thank-you.js b/src/pages/donate/thank-you.js
index 9066a60..5cb1606 100644
--- a/src/pages/donate/thank-you.js
+++ b/src/pages/donate/thank-you.js
@@ -29,17 +29,17 @@ const ThankYouPage = (props) => {
     let contactEmail = site.siteMetadata.contactEmail;
     const { t } = useI18next();
     return (
-        <Layout title={t("donate")}>
+        <Layout title={t("donate.thanks")}>
             <section>
                 <article>
                     <h1>
-                        <Trans>donateThanks</Trans>
+                        <Trans>donate.thanks</Trans>
                     </h1>
 
                     <p>
                         <Trans
                             contactEmail={contactEmail}
-                            i18nKey="donateThanksText"
+                            i18nKey="donate.thanksText"
                         >
                             donateThanksText
                             <a href={"mailto:" + contactEmail}>
diff --git a/src/pages/friends.js b/src/pages/friends.js
index b811475..fc1099a 100644
--- a/src/pages/friends.js
+++ b/src/pages/friends.js
@@ -41,14 +41,6 @@ export const query = graphql`
 const FriendsPage = ({ data }) => {
     const { t } = useI18next();
 
-    /*function shuffle(a) {
-    for (let i = a.length - 1; i > 0; i--) {
-      const j = Math.floor(Math.random() * (i + 1));
-      [a[i], a[j]] = [a[j], a[i]];
-    }
-    return a;
-  }*/
-
     return (
         <Layout
             title={t("friends.title")}
@@ -65,85 +57,73 @@ const FriendsPage = ({ data }) => {
                     </p>
 
                     <div className={styles.friendsList}>
-                        {
-                            /*shuffle(*/ data.allFriendsJson.nodes /*)*/
-                                .map((friend) => {
-                                    return (
-                                        <div
-                                            className={styles.friendProfile}
-                                            key={friend.url + "#" + friend.name}
-                                        >
-                                            <div
-                                                className={styles.friendImage}
-                                                key={
-                                                    friend.url +
-                                                    "#" +
-                                                    friend.name +
-                                                    "#image"
-                                                }
-                                            >
-                                                <div
-                                                    className={styles.friendBg}
-                                                >
-                                                    <GatsbyImage
-                                                        image={getImage(
-                                                            friend.localImage
-                                                        )}
-                                                    ></GatsbyImage>
-                                                </div>
-                                                <span
-                                                    className={
-                                                        styles.friendName
-                                                    }
-                                                    key={
-                                                        friend.url +
-                                                        "#" +
-                                                        friend.name +
-                                                        "#name"
-                                                    }
-                                                >
-                                                    {friend.name}
-                                                </span>
-                                                <span
-                                                    className={
-                                                        styles.friendTitle
-                                                    }
-                                                    key={
-                                                        friend.url +
-                                                        "#" +
-                                                        friend.name +
-                                                        "#profession"
-                                                    }
-                                                >
-                                                    {friend.profession}
-                                                </span>
-                                            </div>
-
-                                            <div
-                                                className={styles.contactLinks}
-                                                key={
-                                                    friend.url +
-                                                    "#" +
-                                                    friend.name +
-                                                    "#links"
-                                                }
-                                            >
-                                                <a
-                                                    className={
-                                                        styles.contactLink
-                                                    }
-                                                    href={friend.url}
-                                                    target="_blank"
-                                                    rel="noreferrer"
-                                                >
-                                                    <Globe2 height={20} />{" "}
-                                                    {friend.url}
-                                                </a>
-                                            </div>
+                        {data.allFriendsJson.nodes.map((friend) => {
+                            return (
+                                <div
+                                    className={styles.friendProfile}
+                                    key={friend.url + "#" + friend.name}
+                                >
+                                    <div
+                                        className={styles.friendImage}
+                                        key={
+                                            friend.url +
+                                            "#" +
+                                            friend.name +
+                                            "#image"
+                                        }
+                                    >
+                                        <div className={styles.friendBg}>
+                                            <GatsbyImage
+                                                image={getImage(
+                                                    friend.localImage
+                                                )}
+                                            ></GatsbyImage>
                                         </div>
-                                    );
-                                })
-                        }
+                                        <span
+                                            className={styles.friendName}
+                                            key={
+                                                friend.url +
+                                                "#" +
+                                                friend.name +
+                                                "#name"
+                                            }
+                                        >
+                                            {friend.name}
+                                        </span>
+                                        <span
+                                            className={styles.friendTitle}
+                                            key={
+                                                friend.url +
+                                                "#" +
+                                                friend.name +
+                                                "#profession"
+                                            }
+                                        >
+                                            {friend.profession}
+                                        </span>
+                                    </div>
+
+                                    <div
+                                        className={styles.contactLinks}
+                                        key={
+                                            friend.url +
+                                            "#" +
+                                            friend.name +
+                                            "#links"
+                                        }
+                                    >
+                                        <a
+                                            className={styles.contactLink}
+                                            href={friend.url}
+                                            target="_blank"
+                                            rel="noreferrer"
+                                        >
+                                            <Globe2 height={20} /> {friend.url}
+                                        </a>
+                                    </div>
+                                </div>
+                            );
+                        })}
                     </div>
                 </article>
             </section>
diff --git a/src/pages/index.js b/src/pages/index.js
index 1c66807..beea1ee 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -97,7 +97,6 @@ const IndexPage = (props) => {
                     className={styles.heroSectionBg}
                     id="particle-container"
                 ></div>
-                {/*<div className={styles.heroSectionBgOver}></div>*/}
                 <div className={styles.profile + " profile"}>
                     <div className={styles.profileImage}>
                         <StaticImage
diff --git a/src/pages/index.module.scss b/src/pages/index.module.scss
index 681d3ce..7cc8c16 100644
--- a/src/pages/index.module.scss
+++ b/src/pages/index.module.scss
@@ -30,8 +30,6 @@
     }
 
     .heroSectionBg {
-        /*background: radial-gradient(ellipse at top left, #1f0ba659, transparent),
-            radial-gradient(ellipse at bottom right, #4a086829, transparent);*/
 
         background: linear-gradient(45deg, #000850 0%, #000320 100%),
             radial-gradient(100% 225% at 100% 0%, #ff6928 0%, #000000 100%),
@@ -53,8 +51,6 @@
     .heroSectionBgOver {
         bottom: 0;
         height: 150px;
-        /*background-color: $background;
-        transition: background-color 0.25s, box-shadow 0.25s;*/
 
         @media (max-width: 950px) {
             display: none;
diff --git a/src/pages/legal/about.js b/src/pages/legal/about.js
index c8163dd..267872b 100644
--- a/src/pages/legal/about.js
+++ b/src/pages/legal/about.js
@@ -20,11 +20,11 @@ export const query = graphql`
 export default function ImprintPage() {
     const { t } = useI18next();
     return (
-        <Layout title={t("imprint")}>
+        <Layout title={t("layout.imprint")}>
             <section>
                 <article>
                     <h1>
-                        <Trans>imprint</Trans>
+                        <Trans>layout.imprint</Trans>
                     </h1>
 
                     <p>Angaben gemäß § 5 TMG</p>
diff --git a/src/pages/legal/datasec.js b/src/pages/legal/datasec.js
index afdbafd..207dfd5 100644
--- a/src/pages/legal/datasec.js
+++ b/src/pages/legal/datasec.js
@@ -20,11 +20,11 @@ export const query = graphql`
 export default function DataSecPage() {
     const { t } = useI18next();
     return (
-        <Layout title={t("datasec")}>
+        <Layout title={t("layout.datasec")}>
             <section>
                 <article>
                     <h1>
-                        <Trans>datasec</Trans>
+                        <Trans>layout.datasec</Trans>
                     </h1>
 
                     <h3 id="dsg-general-intro"></h3>
diff --git a/src/pages/legal/disclaimer.js b/src/pages/legal/disclaimer.js
index 99ec147..35af15c 100644
--- a/src/pages/legal/disclaimer.js
+++ b/src/pages/legal/disclaimer.js
@@ -20,11 +20,11 @@ export const query = graphql`
 export default function DisclaimerPage() {
     const { t } = useI18next();
     return (
-        <Layout title={t("disclaimer")}>
+        <Layout title={t("layout.disclaimer")}>
             <section>
                 <article>
                     <h1>
-                        <Trans>disclaimer</Trans>
+                        <Trans>layout.disclaimer</Trans>
                     </h1>
 
                     <h2>Haftung für Inhalte</h2>
diff --git a/src/templates/blogPost.js b/src/templates/blogPost.js
index 2a1245a..19e6902 100644
--- a/src/templates/blogPost.js
+++ b/src/templates/blogPost.js
@@ -24,11 +24,6 @@ const BlogPost = ({ data }) => {
                         "@context": "https://schema.org",
                         "@type": "NewsArticle",
                         headline: data.mdx.frontmatter.title,
-                        /*"image": [
-                        "https://example.com/photos/1x1/photo.jpg",
-                        "https://example.com/photos/4x3/photo.jpg",
-                        "https://example.com/photos/16x9/photo.jpg"
-                    ],*/
                         datePublished: data.mdx.frontmatter.publishedIso,
                         dateModified: data.mdx.frontmatter.publishedIso,
                         author: [