From a57bbce5e34e6ecd9c4203aba619e40a79b3c4b8 Mon Sep 17 00:00:00 2001
From: Conrad <grosserconrad@gmail.com>
Date: Fri, 5 Jun 2020 09:15:40 +0200
Subject: [PATCH] Site Rework

- Split up into categories
---
 src/components/footer.js     |  4 ++++
 src/components/header.js     |  8 +++++++-
 src/components/main_entry.js |  4 ++--
 src/components/menu.js       |  8 ++++++++
 src/pages/about.js           | 14 +++-----------
 src/pages/comms.js           | 24 ++++++++++++++++++++++++
 src/pages/index.js           | 21 ---------------------
 src/pages/projects.js        | 16 ++++++++++++++++
 8 files changed, 64 insertions(+), 35 deletions(-)
 create mode 100644 src/components/menu.js
 create mode 100644 src/pages/comms.js
 create mode 100644 src/pages/projects.js

diff --git a/src/components/footer.js b/src/components/footer.js
index 1309a11..5f276af 100644
--- a/src/components/footer.js
+++ b/src/components/footer.js
@@ -14,6 +14,10 @@ export default () => (
         <a target="_blanc" href="https://github.com/creyD/urban_website">
             github
         </a>
+        .
+        <a target="_blanc" href="https://paypal.me/pools/c/89fz0b2YFk">
+            donate
+        </a>
         .<Link to="/about/">about</Link>
     </div>
 )
diff --git a/src/components/header.js b/src/components/header.js
index 48c0749..2d0bfe1 100644
--- a/src/components/header.js
+++ b/src/components/header.js
@@ -1,3 +1,9 @@
 import React from "react"
+import Menu from "../components/menu"
 
-export default (props) => <h1 align="center">{props.headline}</h1>
+export default props => (
+    <div>
+        <h1 align="center">{props.headline}</h1>
+        <Menu />
+    </div>
+)
diff --git a/src/components/main_entry.js b/src/components/main_entry.js
index ffbc7b0..95f0f65 100644
--- a/src/components/main_entry.js
+++ b/src/components/main_entry.js
@@ -1,8 +1,8 @@
 import React from "react"
 
-export default (props) => (
+export default props => (
     <div id={props.title}>
-        <h1>{props.title}</h1>
+        <h2>{props.title}</h2>
         <p>{props.text}</p>
     </div>
 )
diff --git a/src/components/menu.js b/src/components/menu.js
new file mode 100644
index 0000000..0baec5b
--- /dev/null
+++ b/src/components/menu.js
@@ -0,0 +1,8 @@
+import React from "react"
+import { Link } from "gatsby"
+
+export default () => (
+    <div style={{ textAlign: `center` }}>
+        <Link to="//">Home</Link> | <Link to="/comms/">Communication</Link> | <Link to="/projects/">Projects</Link>
+    </div>
+)
diff --git a/src/pages/about.js b/src/pages/about.js
index 5b0f57d..aabd161 100644
--- a/src/pages/about.js
+++ b/src/pages/about.js
@@ -6,25 +6,17 @@ export default () => (
     <div>
         <Header headline="About" />
         <div class="container">
-            <p>
-                As this is a private website, so no legal notice is required.
-                However let's clarify a few things:
-            </p>
+            <p>As this is a private website, so no legal notice is required. However let's clarify a few things:</p>
 
             <h2>Cookies</h2>
             <p>This site uses none.</p>
 
             <h2>GDPR</h2>
-            <p>
-                As this site doesn't use any user data, it complies with GDPR
-                regulations.
-            </p>
+            <p>As this site doesn't use/ store any user data, it complies with GDPR regulations.</p>
 
             <h2>Legal</h2>
             <p>
-                If you have any questions or queries regarding this website,
-                please write{" "}
-                <a herf="mailto://webmaster@urbanbrothers.de">an email.</a>
+                If you have any questions or queries regarding this website, please write <a herf="mailto://webmaster@urbanbrothers.de">an email.</a>
             </p>
             <a href="/">
                 <button>Back to homepage</button>
diff --git a/src/pages/comms.js b/src/pages/comms.js
new file mode 100644
index 0000000..e540be8
--- /dev/null
+++ b/src/pages/comms.js
@@ -0,0 +1,24 @@
+import React from "react"
+import Header from "../components/header"
+import Footer from "../components/footer"
+
+export default () => (
+    <div class="container">
+        <Header headline="Communication" />
+        <h2>Discord</h2>
+        <p>
+            Feel free to join our Urban Discord <a href="https://discord.gg/k6TnPq">here</a>.
+        </p>
+        <h2>TeamSpeak 3</h2>
+        <p>
+            You may also join our TeamSpeak server, accessible under this same <a href="ts3server://urbanbrothers.de">urbanbrothers.de</a> domain.
+        </p>
+        <h2>Steam</h2>
+        The{" "}
+        <a href="https://steamcommunity.com/groups/urban_group" target="_blanc">
+            steam community group
+        </a>{" "}
+        is rarely used for communications, but you may use it to show off the clan tag and join in with other members.
+        <Footer />
+    </div>
+)
diff --git a/src/pages/index.js b/src/pages/index.js
index 6375e08..fd098b7 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -8,27 +8,6 @@ export default () => (
         <Header headline="The Urban Brothers" />
         <p id="tagline">Welcome to the Urban Brothers Website</p>
         <div class="container">
-            <MainEntry title="Ressources" />
-            <ul>
-                <a href="ts3server://urbanbrothers.de">
-                    <li>TeamSpeak 3 Server</li>
-                </a>
-                <a href="https://discord.gg/k6TnPq">
-                    <li>Discord Server</li>
-                </a>
-                <a href="https://steamcommunity.com/groups/urban_group" target="_blanc">
-                    <li>Steam Community Group</li>
-                </a>
-            </ul>
-            <MainEntry title="Contribute" />
-            <p>
-                As it was requested by some people over the last years, we finally created a{" "}
-                <a href="https://paypal.me/pools/c/89fz0b2YFk" target="_blanc">
-                    donation link (PayPal).
-                </a>{" "}
-                All the donated money will go 100% towards keeping up the servers and running other community related projects in the future. However our
-                services will continue to be freely available for anyone. - <b>Thank you to everyone who donated.</b>
-            </p>
             <MainEntry title="Help" />
             <p>For help with any community related matters, please contact one of our moderators or admins on either TeamSpeak or Discord.</p>
         </div>
diff --git a/src/pages/projects.js b/src/pages/projects.js
new file mode 100644
index 0000000..04f04b5
--- /dev/null
+++ b/src/pages/projects.js
@@ -0,0 +1,16 @@
+import React from "react"
+import Header from "../components/header"
+import Footer from "../components/footer"
+
+export default () => (
+    <div class="container">
+        <Header headline="Projects" />
+        <h2>Minecraft</h2>
+        <p>Our small Minecraft server is hosted on this server. This project currently works with a whitelist of people.</p>
+        <h2>League/ TFT</h2>
+        <p>Most of the times, there are people who play League or TFT in the respecting channels.</p>
+        <h2>More</h2>
+        <p>More projects are coming regularly (kind of) so stay tuned!</p>
+        <Footer />
+    </div>
+)