From ab3cc3b1dfe40c5c525264abe69637d3c3c95204 Mon Sep 17 00:00:00 2001
From: Shay Punter <shay@shaypunter.co.uk>
Date: Tue, 26 May 2020 17:51:16 +0100
Subject: [PATCH 1/2] Made the website more consistent, changed the design on
 the community page, fixed the pinging issue on the users page

---
 .idea/discord.xml            |   9 +
 .idea/workspace.xml          | 457 +++++------------------------------
 src/components/BaseLayout.js |  11 +-
 src/components/Jumbotron.js  |  15 ++
 src/components/PageIntro.js  |  11 -
 src/pages/Community.css      |  28 ++-
 src/pages/Community.js       |  68 +++---
 src/pages/Download.css       |   4 +
 src/pages/Download.js        |  10 +-
 src/pages/Index.css          |   4 +
 src/pages/Index.js           |  16 +-
 src/pages/Users.css          |   6 +-
 src/pages/Users.js           |  36 ++-
 yarn.lock                    |  31 ++-
 14 files changed, 211 insertions(+), 495 deletions(-)
 create mode 100644 .idea/discord.xml
 create mode 100644 src/components/Jumbotron.js
 delete mode 100644 src/components/PageIntro.js

diff --git a/.idea/discord.xml b/.idea/discord.xml
new file mode 100644
index 0000000..59b11d1
--- /dev/null
+++ b/.idea/discord.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DiscordProjectSettings">
+    <option name="show" value="true" />
+  </component>
+  <component name="ProjectNotificationSettings">
+    <option name="askShowProject" value="false" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4637ff4..c0ea0aa 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,36 +2,21 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c63c7774-018d-4fe3-a5ce-5d88da211959" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/checkstyle-idea.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/velocity-website.iml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/public/favicon.ico" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/public/index.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/public/manifest.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/images/discord-background.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/images/forum-background.svg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/assets/wordmark.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/components/BaseLayout.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/components/Button.jsx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/pages/Community.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/pages/Community.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/pages/Download.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/pages/Download.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/pages/Index.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/pages/Index.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/registerServiceWorker.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/routes.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/velocity.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/yarn.lock" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/discord.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/components/Jumbotron.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/BaseLayout.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/BaseLayout.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/PageIntro.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/Community.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Community.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/Community.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Community.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/Download.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Download.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/Download.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Download.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/Index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Index.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/Users.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Users.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pages/Users.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Users.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/yarn.lock" afterDir="false" />
     </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -47,129 +32,22 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/components/BaseLayout.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="363">
-              <caret line="68" column="48" selection-start-line="68" selection-start-column="48" selection-end-line="68" selection-end-column="48" />
-              <folding>
-                <element signature="e#0#26#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="414">
-                <caret line="23" column="75" lean-forward="true" selection-start-line="23" selection-start-column="75" selection-end-line="23" selection-end-column="75" />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/pages/Download.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-99">
-              <caret line="54" column="16" selection-start-line="54" selection-start-column="16" selection-end-line="54" selection-end-column="16" />
-              <folding>
-                <element signature="e#0#26#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/pages/Community.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="945">
-              <caret line="54" column="10" lean-forward="true" selection-start-line="54" selection-start-column="10" selection-end-line="54" selection-end-column="10" />
-              <folding>
-                <element signature="e#0#26#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/pages/Index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="199">
-              <caret line="38" column="140" selection-start-line="38" selection-start-column="140" selection-end-line="38" selection-end-column="140" />
-              <folding>
-                <element signature="e#0#41#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/pages/Index.css">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="49" lean-forward="true" selection-start-line="49" selection-end-line="49" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="GOROOT" path="/usr/local/Cellar/go/1.11.4/libexec" />
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
       <list>
-        <option value="$PROJECT_DIR$/public/index.html" />
-        <option value="$PROJECT_DIR$/src/assets/praise.json" />
-        <option value="$PROJECT_DIR$/package.json" />
-        <option value="$PROJECT_DIR$/src/index.js" />
-        <option value="$PROJECT_DIR$/src/pages/Download.css" />
-        <option value="$PROJECT_DIR$/src/routes.js" />
-        <option value="$PROJECT_DIR$/src/velocity.css" />
-        <option value="$PROJECT_DIR$/src/pages/Community.css" />
-        <option value="$PROJECT_DIR$/src/pages/Community.js" />
-        <option value="$PROJECT_DIR$/src/components/Button.jsx" />
-        <option value="$PROJECT_DIR$/src/pages/Download.js" />
-        <option value="$PROJECT_DIR$/src/pages/Index.css" />
-        <option value="$PROJECT_DIR$/src/pages/Index.js" />
-        <option value="$PROJECT_DIR$/src/components/BaseLayout.js" />
-        <option value="$PROJECT_DIR$/README.md" />
+        <option value="JavaScript File" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="y" value="23" />
-    <option name="width" value="2048" />
-    <option name="height" value="1053" />
+  <component name="GOROOT" path="/usr/local/Cellar/go/1.11.4/libexec" />
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="ProjectId" id="1cRwyn62eMZj6dINPv4M5T5Hk9g" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="velocity-website" type="b2602c69:ProjectViewProjectNode" />
-              <item name="velocity-website" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
@@ -177,27 +55,18 @@
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
     <property name="go.import.settings.migrated" value="true" />
     <property name="go.sdk.automatically.set" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../website" />
     <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.path.for.package.tslint" value="project" />
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
+    <property name="node.js.selected.package.tslint" value="(autodetect)" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="/usr/local/bin/node" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="nodejs_package_manager_path" value="yarn" />
     <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
   <component name="RunManager">
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -245,252 +114,38 @@
       <workItem from="1548654899690" duration="33000" />
       <workItem from="1556939033613" duration="13801000" />
       <workItem from="1557001061367" duration="13769000" />
+      <workItem from="1590504974069" duration="5490000" />
     </task>
     <servers />
   </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="27621000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="23" width="2048" height="1053" extended-state="0" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25972083" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Designer" order="2" />
-      <window_info id="UI Designer" order="3" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" visible="true" weight="0.3298647" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.3298647" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="CheckStyle" order="7" />
-      <window_info anchor="bottom" id="Docker" order="8" />
-      <window_info anchor="bottom" id="Version Control" order="9" />
-      <window_info anchor="bottom" id="Database Changes" order="10" />
-      <window_info anchor="bottom" id="Terminal" order="11" weight="0.3298647" />
-      <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Maven" order="4" />
-      <window_info anchor="right" id="Palette&#9;" order="5" />
-      <window_info anchor="right" id="SciView" order="6" />
-      <window_info anchor="right" id="Database" order="7" />
-      <window_info anchor="right" id="Cargo" order="8" />
-    </layout>
-  </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/logo.svg" />
-    <entry file="file://$PROJECT_DIR$/public/favicon.ico">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="21" column="71" selection-start-line="21" selection-start-column="71" selection-end-line="21" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/node_modules/react-materialize/lib/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="199">
-          <caret line="155" column="31" selection-start-line="155" selection-start-column="31" selection-end-line="155" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/yarn.lock">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/node_modules/react-materialize/lib/NavItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-53" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/node_modules/react-router-dom/es/NavLink.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-221">
-          <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/static/js/main.0d6b9409.js" />
-    <entry file="file://$PROJECT_DIR$/build/static/js/runtime~main.a8a9905a.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/static/js/main.2b7f5308.chunk.js" />
-    <entry file="file://$PROJECT_DIR$/build/static/js/2.2e5ff8fd.chunk.js" />
-    <entry file="file://$PROJECT_DIR$/package.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="432">
-          <caret line="24" column="23" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/static/js/2.d07954e7.chunk.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30024">
-          <caret line="1" column="44" lean-forward="true" selection-start-line="1" selection-start-column="44" selection-end-line="1" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/static/js/main.ee97ae78.chunk.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="18">
-          <caret line="1" column="43" lean-forward="true" selection-start-line="1" selection-start-column="43" selection-end-line="1" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/static/css/main.8562c2f4.chunk.css">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/static/css/2.09d751c7.chunk.css">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/static/media/wordmark.37e52719.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/service-worker.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-213" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/node_modules/react/cjs/react.development.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-243">
-          <caret line="295" column="9" selection-start-line="295" selection-start-column="9" selection-end-line="295" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="11" selection-start-line="11" selection-end-line="11" />
-          <folding>
-            <element signature="e#0#26#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/pages/Download.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
-          <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/registerServiceWorker.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-28" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/routes.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="8" column="22" lean-forward="true" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#26#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/assets/images/discord-background.svg">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/velocity.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="20" column="20" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/pages/Community.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/components/Button.jsx">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#26#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/assets/praise.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="36">
-          <caret line="2" column="13" lean-forward="true" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/pages/Download.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-99">
-          <caret line="54" column="16" selection-start-line="54" selection-start-column="16" selection-end-line="54" selection-end-column="16" />
-          <folding>
-            <element signature="e#0#26#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/pages/Community.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="945">
-          <caret line="54" column="10" lean-forward="true" selection-start-line="54" selection-start-column="10" selection-end-line="54" selection-end-column="10" />
-          <folding>
-            <element signature="e#0#26#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/pages/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="199">
-          <caret line="38" column="140" selection-start-line="38" selection-start-column="140" selection-end-line="38" selection-end-column="140" />
-          <folding>
-            <element signature="e#0#41#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/pages/Index.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="49" lean-forward="true" selection-start-line="49" selection-end-line="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/components/BaseLayout.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="363">
-          <caret line="68" column="48" selection-start-line="68" selection-start-column="48" selection-end-line="68" selection-end-column="48" />
-          <folding>
-            <element signature="e#0#26#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="414">
-            <caret line="23" column="75" lean-forward="true" selection-start-line="23" selection-start-column="75" selection-end-line="23" selection-end-column="75" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
+    <option name="version" value="2" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="690" y="287" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1590510602084">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="690" y="287" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1080/1920.0.2560.1080@0.0.1920.1080" timestamp="1590510602084" />
+    <state x="740" y="295" key="FileChooserDialogImpl" timestamp="1590507905896">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="740" y="295" key="FileChooserDialogImpl/0.0.1920.1080/1920.0.2560.1080@0.0.1920.1080" timestamp="1590507905896" />
+    <state width="1899" height="294" key="GridCell.Tab.0.bottom" timestamp="1590505083522">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state width="1899" height="294" key="GridCell.Tab.0.bottom/0.0.1920.1080/1920.0.2560.1080@0.0.1920.1080" timestamp="1590505083522" />
+    <state width="1899" height="294" key="GridCell.Tab.0.center" timestamp="1590505083522">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state width="1899" height="294" key="GridCell.Tab.0.center/0.0.1920.1080/1920.0.2560.1080@0.0.1920.1080" timestamp="1590505083522" />
+    <state width="1899" height="294" key="GridCell.Tab.0.left" timestamp="1590505083522">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state width="1899" height="294" key="GridCell.Tab.0.left/0.0.1920.1080/1920.0.2560.1080@0.0.1920.1080" timestamp="1590505083522" />
+    <state width="1899" height="294" key="GridCell.Tab.0.right" timestamp="1590505083522">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state width="1899" height="294" key="GridCell.Tab.0.right/0.0.1920.1080/1920.0.2560.1080@0.0.1920.1080" timestamp="1590505083522" />
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/components/BaseLayout.js b/src/components/BaseLayout.js
index 60e9b2d..9439ec2 100644
--- a/src/components/BaseLayout.js
+++ b/src/components/BaseLayout.js
@@ -25,13 +25,15 @@ const FooterLink = ({ href, children }) => {
 export default ({ children }) => (
     <div className="BaseLayout">
         <Navbar fixed brand={<Wordmark />} alignLinks="right" className="grey darken-4">
-            <NavLink to="/downloads">Download</NavLink>
-            <a href="https://docs.velocitypowered.com">Documentation</a>
             <NavLink to="/community">Community</NavLink>
             <a href="https://forums.velocitypowered.com">Forums</a>
+            <a href="https://docs.velocitypowered.com">Documentation</a>
+            <NavLink to="/downloads">Download</NavLink>
         </Navbar>
-    
-        {children}
+
+        <div className="page-content">
+            {children}
+        </div>
 
         <footer className="page-footer grey darken-4 white-text">
             <div className="container">
@@ -44,6 +46,7 @@ export default ({ children }) => (
                             <li>About</li>
                             <li><FooterLink href="https://docs.velocitypowered.com">Documentation</FooterLink></li>
                             <li><FooterLink href="/downloads">Download</FooterLink></li>
+                            <li><FooterLink href="/users">Servers using Velocity</FooterLink></li>
                         </ul>
                     </Col>
                     <Col l={4} s={12}>
diff --git a/src/components/Jumbotron.js b/src/components/Jumbotron.js
new file mode 100644
index 0000000..f0ff414
--- /dev/null
+++ b/src/components/Jumbotron.js
@@ -0,0 +1,15 @@
+import React, { Component } from 'react';
+
+class Jumbotron extends Component {
+    render() {
+        return <div className="grey darken-3 jumbotron white-text">
+            <div className="container">
+                <h1>{this.props.title}</h1>
+                <p>{this.props.subtitle}</p>
+                {this.props.children}
+            </div>
+        </div>
+    }
+}
+
+export default Jumbotron;
\ No newline at end of file
diff --git a/src/components/PageIntro.js b/src/components/PageIntro.js
deleted file mode 100644
index ad682ac..0000000
--- a/src/components/PageIntro.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-
-export default ({ children }) => (
-    <div className="container">
-        <div className="row intro">
-            <div className="col s12">
-                {children}
-            </div>
-        </div>
-    </div>
-)
\ No newline at end of file
diff --git a/src/pages/Community.css b/src/pages/Community.css
index 1bca5a4..93c332e 100644
--- a/src/pages/Community.css
+++ b/src/pages/Community.css
@@ -1,11 +1,23 @@
+.page-content {
+    margin-bottom: 0;
+}
+
+.row {
+    margin-bottom: 0 !important;
+}
+
+.row .col {
+    padding: 0 !important;
+}
+
 #community-discord-blurb {
     background: #7289DA url('../assets/images/discord-background.svg');
-    background-size: 120px;
+    height: 600px;
 }
 
 #community-forums-blurb {
     background: #212121 url('../assets/images/forum-background.svg');
-    background-size: 120px;
+    height: 600px;
 }
 
 .community-platform {
@@ -14,4 +26,16 @@
 
 .community-platform h4 {
     font-weight: 700;
+}
+
+@media (max-width: 1375px) {
+    #discord-widget {
+        height: 350px;
+    }
+}
+
+@media (max-width: 600px) {
+    #community-forums-blurb {
+        height: auto;
+    }
 }
\ No newline at end of file
diff --git a/src/pages/Community.js b/src/pages/Community.js
index c05f4ad..c244553 100644
--- a/src/pages/Community.js
+++ b/src/pages/Community.js
@@ -1,53 +1,49 @@
 import React from 'react';
 import {LargeButtonLink} from "../components/Button";
-import PageIntro from "../components/PageIntro";
 import './Community.css';
+import Jumbotron from "../components/Jumbotron";
 
 export const Community = () => (
     <div>
-        <PageIntro>
-            <h1>Join Our Community</h1>
-            <p>
-                The Velocity community welcomes all with open arms. Whether you like to play with the internals
-                of the Minecraft server, run a server, or write plugins, we've got a place for you in our community.
-            </p>
-        </PageIntro>
-        
-        <div id="community-forums-blurb" className="community-platform">
-            <div className="container white-text">
-                <div className="row">
-                    <div className="col s12">
-                        <h4>Forums</h4>
-                        <p>
-                            Our forums are your source for important news about Velocity, along with providing a place
-                            to discuss Velocity, discovering Velocity plugins, and talking to other server administrators
-                            and plugin developers.
-                        </p>
 
-                        <LargeButtonLink href="https://forums.velocitypowered.com">
-                            <i className="material-icons left">forum</i> Join the Velocity forums
-                        </LargeButtonLink>
+        <Jumbotron title="Join Our Community"
+                   subtitle=" The Velocity community welcomes all with open arms. Whether you like to play with the internals
+                of the Minecraft server, run a server, or write plugins, we've got a place for you in our community." />
+
+        <div className="row">
+            <div className="col m6 s12 no-pad">
+                <div id="community-forums-blurb" className="community-platform">
+                    <div className="container white-text">
+                            <h4>Forums</h4>
+                            <p>
+                                Our forums are your source for important news about Velocity, along with providing a place
+                                to discuss Velocity, discovering Velocity plugins, and talking to other server administrators
+                                and plugin developers.
+                            </p>
+
+                            <LargeButtonLink href="https://forums.velocitypowered.com">
+                                <i className="material-icons left">forum</i> Join the Velocity forums
+                            </LargeButtonLink>
                     </div>
                 </div>
             </div>
-        </div>
 
-        <div id="community-discord-blurb" className="community-platform">
-            <div className="container white-text">
-                <div className="row">
-                    <div className="col s12">
-                        <h4>Discord</h4>
-                        <p>
-                            Discord is a popular option for many gamers to communicate with each other. We have a Discord
-                            community server that anyone can join. This is the best choice if you're new to Velocity and want
-                            support in real-time.
-                        </p>
+            <div className="col m6 s12 no-pad">
+                <div id="community-discord-blurb" className="community-platform">
+                    <div className="container white-text">
+                            <h4>Discord</h4>
+                            <p>
+                                Discord is a popular option for many gamers to communicate with each other. We have a Discord
+                                community server that anyone can join. This is the best choice if you're new to Velocity and want
+                                support in real-time.
+                            </p>
 
-                        <iframe src="https://discordapp.com/widget?id=472484458856185878&theme=dark" width="350"
-                                height="500" allowTransparency="true" frameBorder="0"></iframe>
-                    </div>
+                            <iframe src="https://discordapp.com/widget?id=472484458856185878&theme=dark" width="100%"
+        height="400" allowTransparency="true" frameBorder="0" id="discord-widget"/>
+                        </div>
                 </div>
             </div>
         </div>
+
     </div>
 );
\ No newline at end of file
diff --git a/src/pages/Download.css b/src/pages/Download.css
index e523973..32f1683 100644
--- a/src/pages/Download.css
+++ b/src/pages/Download.css
@@ -1,3 +1,7 @@
+.downloadContainers {
+    margin: 20px auto !important;
+}
+
 .build {
     text-align: right;
     padding-bottom: 1rem;
diff --git a/src/pages/Download.js b/src/pages/Download.js
index 10f5027..ea21056 100644
--- a/src/pages/Download.js
+++ b/src/pages/Download.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import {ButtonLink} from "../components/Button";
-import PageIntro from "../components/PageIntro";
 import "./Download.css";
+import Jumbotron from "../components/Jumbotron";
 
 const VELOCITY_VERSIONS = {
     '1.1.0': {
@@ -71,14 +71,14 @@ export default class Download extends React.Component {
     render() {
         return (
             <>
-                <PageIntro>
-                    <h1>Download Velocity</h1>
+                <Jumbotron title="Download Velocity">
                     <p>
                         Choose a version of Velocity to download below. Once you've got it, <a href="https://docs.velocitypowered.com/en/latest/users/getting-started.html">
                         install and configure Velocity</a>.
                     </p>
-                </PageIntro>
-                <div className="container">
+                </Jumbotron>
+
+                <div className="container downloadContainers">
                     <div className="row">
                         <div className="col s12">
                             {this._renderDownloads()}
diff --git a/src/pages/Index.css b/src/pages/Index.css
index 4052cd0..1572b08 100644
--- a/src/pages/Index.css
+++ b/src/pages/Index.css
@@ -1,3 +1,7 @@
+.page-content {
+    margin-bottom: 40px;
+}
+
 /* Jumbotron */
 .jumbotron {
     padding: 4rem 0;
diff --git a/src/pages/Index.js b/src/pages/Index.js
index 64d0fe0..65914bd 100644
--- a/src/pages/Index.js
+++ b/src/pages/Index.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import './Index.css';
 import { ButtonLink, JumbotronButtonLink } from "../components/Button";
+import Jumbotron from "../components/Jumbotron"
 
 const Sponsor = ({ name, icon, url }) => (
     <div className="Sponsor">
@@ -10,19 +11,6 @@ const Sponsor = ({ name, icon, url }) => (
     </div>
 );
 
-const Jumbotron = () => (
-    <div className="grey darken-3 jumbotron white-text">
-        <div className="container">
-            <div className="row">
-                <div className="col l12">
-                    <h1>Don't stop now.</h1>
-                    <p>Unleash the full power of your Minecraft server with Velocity, the next-generation high-performance Minecraft server proxy.</p>
-                </div>
-            </div>
-        </div>
-    </div>
-);
-
 const Sponsors = () => (
     <div className="container" id="sponsors-section">
         <div className="row">
@@ -51,7 +39,7 @@ const Benefit = ({ iconName, title, children }) => (
 
 const Index = () => (
     <div id="Index">
-        <Jumbotron />
+        <Jumbotron title="Don't stop now." subtitle="Unleash the full power of your Minecraft server with Velocity, the next-generation high-performance Minecraft server proxy." />
 
         <div className="section front-section" id="benefits">
             <div className="container">
diff --git a/src/pages/Users.css b/src/pages/Users.css
index 7857aa0..ea3d09d 100644
--- a/src/pages/Users.css
+++ b/src/pages/Users.css
@@ -1,5 +1,9 @@
+.userContainer {
+    margin: 50px auto !important;
+}
+
 .user {
-    padding: 1rem 0 !important;
+    margin: 1.5rem 0 !important;
 }
 
 .favicon-col {
diff --git a/src/pages/Users.js b/src/pages/Users.js
index 7210a5b..ee09799 100644
--- a/src/pages/Users.js
+++ b/src/pages/Users.js
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import "./Users.css";
+import Jumbotron from "../components/Jumbotron";
 
 const users = [
     {
@@ -40,18 +41,18 @@ const UserPlayers = ({ players }) => {
     }
 
     if (players.status) {
-        return <div>{players.players.online} players online</div>
+        return <div>{players.players.now} players online</div>
     } else {
         return <div>Offline</div>
     }
 }
 
 const User = ({ name, url, ip }) => {
-    const [players, setPlayers] = useState(null)
+    const [result, setPlayers] = useState(null)
     useEffect(() => {
         async function fetchPlayersData() {
             try {
-                const resp = await window.fetch('https://mcapi.ca/ping/all/' + ip)
+                const resp = await window.fetch('https://mcapi.us/server/status?ip='+ ip +'&port=25565')
                 setPlayers(await resp.json())
             } catch (e) {
                 setPlayers({ status: false })
@@ -64,13 +65,13 @@ const User = ({ name, url, ip }) => {
     return (
         <div className="col m3">
             <div className="col favicon-col user">
-                {players && players.favicon ? <img src={players.favicon} alt={name} width="64" height="64" /> : null}
+                {result && result.favicon ? <img src={result.favicon} alt={name} width="64" height="64" /> : null}
             </div>
             <div className="col user">
                 <a href={url} className="user-title">
                     {name}
                 </a>
-                <UserPlayers players={players} />
+                <UserPlayers players={result} />
             </div>
         </div>
     )
@@ -86,21 +87,18 @@ function partition(arr, by) {
 
 const Users = () => {
     const usersPartition = partition(users, 4)
-    return <div className="container">
-        <div className="row intro">
-            <div className="col s12">
-                <h1>Who's Using Velocity?</h1>
-                <p>
-                    These networks are powered by Velocity. Want yours added? <a href="https://docs.google.com/forms/d/e/1FAIpQLSdFeOdwtSPZjK3lJVzwEI_hyYMGDxUsCmcQm7IRDTFZTkgSGw/viewform">Let us know!</a>
-                </p>
-            </div>
+    return <>
+            <Jumbotron title="Who's Using Velocity?">
+            <p> These networks are powered by Velocity. Want yours added? <a href="https://docs.google.com/forms/d/e/1FAIpQLSdFeOdwtSPZjK3lJVzwEI_hyYMGDxUsCmcQm7IRDTFZTkgSGw/viewform">Let us know!</a></p>
+        </Jumbotron>
+        <div className="container userContainer">
+            {usersPartition.map((users, i) => {
+                return <div className="row" key={i}>
+                    {users.map((user) => <User {...user} key={user.name} />)}
+                </div>
+            })}
         </div>
-        {usersPartition.map((users, i) => {
-            return <div className="row" key={i}>
-                {users.map((user) => <User {...user} key={user.name} />)}
-            </div>
-        })}
-    </div>
+    </>
 }
 
 export default Users
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 2a4b61a..9d48ccb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8192,7 +8192,17 @@ react-dev-utils@^9.0.0:
     strip-ansi "5.2.0"
     text-table "0.2.0"
 
-react-dom@^16.8.5, react-dom@^16.8.6:
+react-dom@^16.13.1:
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f"
+  integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    scheduler "^0.19.1"
+
+react-dom@^16.8.5:
   version "16.8.6"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
   integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==
@@ -8302,7 +8312,16 @@ react-scripts@3.0.0:
   optionalDependencies:
     fsevents "2.0.6"
 
-react@^16.8.5, react@^16.8.6:
+react@^16.13.1:
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e"
+  integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+
+react@^16.8.5:
   version "16.8.6"
   resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
   integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
@@ -8794,6 +8813,14 @@ scheduler@^0.13.6:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
+scheduler@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
+  integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"

From 0076b7745d104aaf87479842e8fb2b1edc0b099d Mon Sep 17 00:00:00 2001
From: Shay Punter <shay@shaypunter.co.uk>
Date: Tue, 26 May 2020 18:28:01 +0100
Subject: [PATCH 2/2] Removed Jumbotrons from every page

---
 .idea/workspace.xml         | 40 +++++++++++++++++++++++++++----------
 src/components/Jumbotron.js |  2 +-
 src/components/PageIntro.js | 15 ++++++++++++++
 src/pages/Community.js      |  2 +-
 src/pages/Download.css      |  5 +----
 src/pages/Download.js       |  6 +++---
 src/pages/Users.js          | 22 ++++++++++----------
 7 files changed, 61 insertions(+), 31 deletions(-)
 create mode 100644 src/components/PageIntro.js

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c0ea0aa..8026133 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,20 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c63c7774-018d-4fe3-a5ce-5d88da211959" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/discord.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/components/Jumbotron.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/components/PageIntro.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/BaseLayout.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/BaseLayout.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/PageIntro.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/Community.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Community.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/Jumbotron.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Jumbotron.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/pages/Community.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Community.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/pages/Download.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Download.css" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/pages/Download.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Download.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/Index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Index.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/Users.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Users.css" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/pages/Users.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Users.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/yarn.lock" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -55,7 +48,7 @@
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
     <property name="go.import.settings.migrated" value="true" />
     <property name="go.sdk.automatically.set" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../website" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/components" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -67,6 +60,11 @@
     <property name="nodejs_package_manager_path" value="yarn" />
     <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
   </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\Website Stuff\velocity\Matter\src\components" />
+    </key>
+  </component>
   <component name="RunManager">
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -114,18 +112,34 @@
       <workItem from="1548654899690" duration="33000" />
       <workItem from="1556939033613" duration="13801000" />
       <workItem from="1557001061367" duration="13769000" />
-      <workItem from="1590504974069" duration="5490000" />
+      <workItem from="1590504974069" duration="7552000" />
+    </task>
+    <task id="LOCAL-00001" summary="Made the website more consistent, changed the design on the community page, fixed the pinging issue on the users page">
+      <created>1590511876674</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1590511876674</updated>
     </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="2" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="Made the website more consistent, changed the design on the community page, fixed the pinging issue on the users page" />
+    <option name="LAST_COMMIT_MESSAGE" value="Made the website more consistent, changed the design on the community page, fixed the pinging issue on the users page" />
+  </component>
   <component name="WindowStateProjectService">
     <state x="690" y="287" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1590510602084">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
     <state x="690" y="287" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1080/1920.0.2560.1080@0.0.1920.1080" timestamp="1590510602084" />
+    <state x="585" y="108" key="CommitChangelistDialog2" timestamp="1590511874663">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="585" y="108" key="CommitChangelistDialog2/0.0.1920.1080/1920.0.2560.1080@0.0.1920.1080" timestamp="1590511874663" />
     <state x="740" y="295" key="FileChooserDialogImpl" timestamp="1590507905896">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
@@ -146,6 +160,10 @@
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
     <state width="1899" height="294" key="GridCell.Tab.0.right/0.0.1920.1080/1920.0.2560.1080@0.0.1920.1080" timestamp="1590505083522" />
+    <state x="552" y="273" key="Vcs.Push.Dialog.v2" timestamp="1590511879612">
+      <screen x="0" y="0" width="1920" height="1080" />
+    </state>
+    <state x="552" y="273" key="Vcs.Push.Dialog.v2/0.0.1920.1080/1920.0.2560.1080@0.0.1920.1080" timestamp="1590511879612" />
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/components/Jumbotron.js b/src/components/Jumbotron.js
index f0ff414..df5d3ff 100644
--- a/src/components/Jumbotron.js
+++ b/src/components/Jumbotron.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 
 class Jumbotron extends Component {
     render() {
-        return <div className="grey darken-3 jumbotron white-text">
+        return <div className={"grey " + this.props.darken + " jumbotron white-text"}>
             <div className="container">
                 <h1>{this.props.title}</h1>
                 <p>{this.props.subtitle}</p>
diff --git a/src/components/PageIntro.js b/src/components/PageIntro.js
new file mode 100644
index 0000000..bf3a7df
--- /dev/null
+++ b/src/components/PageIntro.js
@@ -0,0 +1,15 @@
+import React, { Component } from 'react';
+
+class PageIntro extends Component {
+    render() {
+        return <div className="center">
+            <div className="container">
+                <h1>{this.props.title}</h1>
+                <p>{this.props.subtitle}</p>
+                {this.props.children}
+            </div>
+        </div>
+    }
+}
+
+export default PageIntro;
\ No newline at end of file
diff --git a/src/pages/Community.js b/src/pages/Community.js
index c244553..11f0dfd 100644
--- a/src/pages/Community.js
+++ b/src/pages/Community.js
@@ -6,7 +6,7 @@ import Jumbotron from "../components/Jumbotron";
 export const Community = () => (
     <div>
 
-        <Jumbotron title="Join Our Community"
+        <Jumbotron darken="darken-4" title="Join Our Community"
                    subtitle=" The Velocity community welcomes all with open arms. Whether you like to play with the internals
                 of the Minecraft server, run a server, or write plugins, we've got a place for you in our community." />
 
diff --git a/src/pages/Download.css b/src/pages/Download.css
index 32f1683..72e391f 100644
--- a/src/pages/Download.css
+++ b/src/pages/Download.css
@@ -1,10 +1,7 @@
-.downloadContainers {
-    margin: 20px auto !important;
-}
-
 .build {
     text-align: right;
     padding-bottom: 1rem;
+    height: 100%;
 }
 
 .build.side-by-side {
diff --git a/src/pages/Download.js b/src/pages/Download.js
index ea21056..47f1ffa 100644
--- a/src/pages/Download.js
+++ b/src/pages/Download.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import {ButtonLink} from "../components/Button";
 import "./Download.css";
-import Jumbotron from "../components/Jumbotron";
+import PageIntro from "../components/PageIntro";
 
 const VELOCITY_VERSIONS = {
     '1.1.0': {
@@ -71,12 +71,12 @@ export default class Download extends React.Component {
     render() {
         return (
             <>
-                <Jumbotron title="Download Velocity">
+                <PageIntro title="Download Velocity">
                     <p>
                         Choose a version of Velocity to download below. Once you've got it, <a href="https://docs.velocitypowered.com/en/latest/users/getting-started.html">
                         install and configure Velocity</a>.
                     </p>
-                </Jumbotron>
+                </PageIntro>
 
                 <div className="container downloadContainers">
                     <div className="row">
diff --git a/src/pages/Users.js b/src/pages/Users.js
index ee09799..d191d9f 100644
--- a/src/pages/Users.js
+++ b/src/pages/Users.js
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import "./Users.css";
-import Jumbotron from "../components/Jumbotron";
+import PageIntro from "../components/PageIntro";
 
 const users = [
     {
@@ -88,17 +88,17 @@ function partition(arr, by) {
 const Users = () => {
     const usersPartition = partition(users, 4)
     return <>
-            <Jumbotron title="Who's Using Velocity?">
+            <PageIntro title="Who's Using Velocity?">
             <p> These networks are powered by Velocity. Want yours added? <a href="https://docs.google.com/forms/d/e/1FAIpQLSdFeOdwtSPZjK3lJVzwEI_hyYMGDxUsCmcQm7IRDTFZTkgSGw/viewform">Let us know!</a></p>
-        </Jumbotron>
-        <div className="container userContainer">
-            {usersPartition.map((users, i) => {
-                return <div className="row" key={i}>
-                    {users.map((user) => <User {...user} key={user.name} />)}
-                </div>
-            })}
-        </div>
-    </>
+            </PageIntro>
+            <div className="container userContainer">
+                {usersPartition.map((users, i) => {
+                    return <div className="row" key={i}>
+                        {users.map((user) => <User {...user} key={user.name} />)}
+                    </div>
+                })}
+            </div>
+        </>
 }
 
 export default Users
\ No newline at end of file