Minor website overhaul (#89)

* Minor website overhaul * Re-add missing changes and organize blogs again * Add machine-readable dates to blog posts --------- Co-authored-by: Indicado <indi88@riseup.net>
OvercastCommunity · Aug 25, 2023 · 07f5ddb · 07f5ddb
1 parent 20fa1fe
commit 07f5ddb
Show file tree

Hide file tree

Showing 50 changed files with 319 additions and 239 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gem "jekyll", "~> 4.0"
 gem 'jekyll-redirect-from'
+gem 'jekyll-sitemap'
 
 gem "webrick", "~> 1.7"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -33,6 +33,8 @@ GEM
       jekyll (>= 3.3, < 5.0)
     jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     kramdown (2.3.1)
@@ -66,6 +68,7 @@ PLATFORMS
 DEPENDENCIES
   jekyll (~> 4.0)
   jekyll-redirect-from
+  jekyll-sitemap
   webrick (~> 1.7)
 
 BUNDLED WITH

diff --git a/_config.yml b/_config.yml
@@ -19,7 +19,10 @@ defaults:
   - scope:
       type: posts
     values:
+      permalink: /blog/:year/:month/:day/:title/ # Removes .html/.md extension from all blog posts
+      image: https://oc.tc/assets/img/image-slider/12.jpg # Front matter doesn't support Liquid, use absolute link instead
       layout: post
+      is_post: true
   - scope:
       path: assets/img/image-slider
     values:
@@ -36,3 +39,4 @@ exclude: [
 
 plugins:
   - jekyll-redirect-from
+  - jekyll-sitemap
diff --git a/_data/staff.yml b/_data/staff.yml
@@ -10,12 +10,18 @@ administrators:
     - username: ElectroidFilms
       id: dad8b95c-cf6a-44df-982e-8c8dd70201e0
       role: SysAdmin & Development
+      links:
+        github: Electroid
     - username: applenick
       id: f54a1b17-3167-4162-948a-9c95d65a18a5
       role: SysAdmin & Development
+      links:
+        github: applenick
     - username: Strangey
       id: 621b2aa8-4e5f-4ed8-bd36-0ae2f8952a06
       role: Map Development & Community
+      links:
+        github: Strangeys
     - username: Campeh
       id: 61f8e9dd-62ab-453a-b7ef-83ce8a383fe8
       role: Events
@@ -38,31 +44,55 @@ developers:
   members:
     - username: Pugzy
       id: 75fd93dd-8e48-4698-81a2-97dae2ec5b5f
+      links:
+        github: Pugzy
     - username: cs_
       id: cc2292de-fcb3-412d-9319-f3177f73b605
+      links:
+        github: cswhite2000
 map developers:
   color: "#55f"
   members:
     - username: Pugzy
       id: 75fd93dd-8e48-4698-81a2-97dae2ec5b5f
+      links:
+        github: Pugzy
     - username: jexel
       id: 9225421c-3c09-4d97-bb80-f6a77c1f360b
+      links:
+        github: Jexel
     - username: _DISTRACTION_
       id: f876b863-1ccd-4ae2-acad-8a09e2209e81
+      links:
+        github: master00ofdsiware
     - username: CoWinkKeyDinkInc
       id: 5c79d2c9-a4f0-4343-a84b-e1720f13009b
+      links:
+        github: CoWinkKeyDinkInc
     - username: mameBT
       id: 430ec559-364a-4363-ac7a-2529050440ac
+      links:
+        github: calcastor
     - username: Ruediger_LP
       id: e2d2c2c6-cea9-4510-9ab2-a091b5605b30
+      links:
+        github: RuedigerLP
     - username: Tywnis
       id: 2ca8072f-74be-4798-85b8-bbce03aa91af
+      links:
+        github: Tywnis
     - username: Cazadorian
       id: 6863869b-4b8c-4445-b778-a8e016775ae4
+      links:
+        github: Cazadorian
     - username: zzuf
       id: 9d4779a8-d35f-45d2-b51c-95de7a77e128
+      links:
+        github: zzufx
     - username: _Pear
       id: 6ff4ade9-e968-4acd-80eb-1a6fa89629fb
+      links:
+        github: TheRealPear
 head of events:
   color: "#fc0"
   members:
@@ -219,6 +249,8 @@ advisors:
   members:
     - username: Pablete1234
       id: e82603df-417d-4a95-bd1f-1720648be0b4
+      links:
+        github: Pablete1234
     - username: Cobol72
       id: f2b92aaf-40cc-4272-ad73-179f1b624658
     - username: Pibo
@@ -229,9 +261,15 @@ advisors:
         github: Indicardo
     - username: Siceth
       id: 1e4cbacc-0fb5-445a-a99d-7c76f9d0b564
+      links:
+        github: Siceth
     - username: unixfox
       id: 02407912-8bbf-4b7b-a34c-a45339841436
       role: Development Advisor
+      links:
+        github: unixfox
     - username: dentmaged
       id: 30401f63-f5bb-4f24-9a5a-0ecd5f706115
-      role: Development Advisor
+      role: Development Advisor
+      links:
+        github: dentmaged
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -6,27 +6,27 @@
         <span class="copyright text-muted">
           &copy; {{ site.title }}
         </span>
-        <span class="copyright text-muted" style="font-size: 0.70rem">
-          NOT AN OFFICIAL MINECRAFT SERVICE. NOT APPROVED BY OR ASSOCIATED WITH MOJANG OR MICROSOFT
+        <span class="copyright text-muted text-uppercase" style="font-size: 0.72rem;">
+          Not an official Minecraft service. Not approved by or associated with Mojang or Microsoft
         </span>
       </div>
       <div class="col-12 col-md-5">
         <ul class="nav justify-content-md-end">
-          <div class="nav-item">
+          <li class="nav-item">
             <a class="nav-link" href="{{ site.data.links.twitter }}" target="_blank">Twitter</a>
-          </div>
-          <div class="nav-item">
+          </li>
+          <li class="nav-item">
             <a class="nav-link" href="{{ site.data.links.discord }}" target="_blank">Discord</a>
-          </div>
-          <div class="nav-item">
+          </li>
+          <li class="nav-item">
             <a class="nav-link" href="{{ site.data.links.twitch }}" target="_blank">Twitch</a>
-          </div>
-          <div class="nav-item">
+          </li>
+          <li class="nav-item">
             <a class="nav-link" href="{{ site.data.links.youtube }}" target="_blank">YouTube</a>
-          </div>
-          <div class="nav-item">
+          </li>
+          <li class="nav-item">
             <a class="nav-link" href="{{ site.data.links.github }}" target="_blank">GitHub</a>
-          </div>
+          </li>
         </ul>
       </div>
     </div>

diff --git a/_includes/head.html b/_includes/head.html
@@ -1,31 +1,44 @@
 <head>
   <meta charset="utf-8">
-  <meta http-equiv="x-ua-compatible" content="ie=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta http-equiv="x-ua-compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, viewport-fit=cover">
 
-  <link rel="shortcut icon" href="{{ site.url }}/assets/img/favicon.png">
   <title>{% unless page.url == '/' %}{{ page.title }} - {% endunless %}{{ site.title }}</title>
-  <meta name="description" content="{{ site.description }}">
-  <meta name="keywords" content="{{ site.title }}">
+  <meta name="description" content="{% if page.url == '/' %}{{ site.description }}{% elsif page.is_post %}{{ page.excerpt }}{% else %}{{ page.description }}{% endif %}">
+  <link rel="canonical" href="{{ site.url }}{{ page.url | replace:'index.html',''}}">
+  <link rel="shortcut icon" href="{{ site.url }}{{ site.baseurl }}/assets/img/favicon.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="{{ site.url }}{{ site.baseurl }}/assets/img/apple-touch-icon.png">
+  <meta name="theme-color" content="#4C0704">
 
+  <meta property="og:site_name" content="{{ site.title }}">
+  <meta property="og:title" content="{% if page.url == '/' %}{{ site.title }}{% else %}{{ page.title }}{% endif %}">
+  <meta property="og:description" content="{% if page.url == '/' %}{{ site.description }}{% elsif page.is_post %}{{ page.excerpt }}{% else %}{{ page.description }}{% endif %}">
+  <meta property="og:url" content="{{ site.url }}{{ page.url | replace:'index.html',''}}">
+  {% if page.is_post %}
+  <meta property="og:type" content="article">
+  <meta name="author" content="{{ page.author }}">
+  <meta property="article:author" content="{{ page.author }}">
+  <meta name="twitter:card" content="summary_large_image">
+  <meta property="og:image" content="{{ page.image }}">
+  {% else %}
   <meta property="og:type" content="website">
-  <meta property="og:title" content="{% unless page.url == '/' %}{{ page.title }} - {% endunless %}{{ site.title }}">
-  <meta property="og:description" content="{{ site.description }}">
-  <meta property="og:image" content="{{ site.url }}/assets/img/image-slider/12.jpg">
-  <meta property="og:url" content="{{ site.url }}{{ page.url }}">
+  <meta name="twitter:card" content="summary">
+  <meta property="og:image" content="{{ site.url }}{{ site.baseurl }}/assets/img/large-logo.png">
+  {% endif %}
+  <meta name="twitter:site" content="{{ '@' | append: site.data.links.twitter | replace: 'https://twitter.com/', '' }}">
 
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous" />
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/4.6.2/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
   <link rel="preconnect" href="https://fonts.googleapis.com"> 
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> 
   <link href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="{{ site.url }}/assets/css/main.css">
+  <link rel="stylesheet" href="{{ site.url }}{{ site.baseurl }}/assets/css/main.css">
   <!-- Making CSS changes? Comment the above line and use the line below -->
   <!-- <link rel="stylesheet" href="/assets/css/main.css"> -->
 
-  <script src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-  <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
-  <script src="https://use.fontawesome.com/releases/v5.12.0/js/all.js"></script>
+  <script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.1/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/4.6.2/js/bootstrap.min.js" integrity="sha384-+sLIOodYLS7CIrQpBjl+C7nPvqq+FbNUBDunl/OZv93DB7Ln/533i8e/mZXLi/P+" crossorigin="anonymous"></script>
+  <script src="https://use.fontawesome.com/releases/v5.15.4/js/all.js" integrity="sha384-rOA1PnstxnOBLzCLMcre8ybwbTmemjzdNlILg8O7z1lUkLXozs4DHonlDtnE7fpc" crossorigin="anonymous"></script>
 
   <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
   <script>
@@ -34,7 +47,6 @@
           dataLayer.push(arguments);
       }
       gtag("js", new Date());
-
       gtag("config", "{{ site.google_analytics }}");
   </script>
 </head>
diff --git a/_includes/image-header.html b/_includes/image-header.html
@@ -1,12 +1,12 @@
 <div class="image-header"
-     {% if include.image %}
-      style="background-image:
-              linear-gradient(
-                rgba(0, 0, 0, 0.4),
-                rgba(0, 0, 0, 0.4)
-              ),
-              url('{{ include.image }}')"
-     {% endif %}>
+  {% if include.image %}
+   style="background-image:
+           linear-gradient(
+             rgba(0, 0, 0, 0.4),
+             rgba(0, 0, 0, 0.4)
+           ),
+           url('{{ site.baseurl }}{{ include.image }}')"
+  {% endif %}>
   <div class="container">
     <h1>
       {{ page.title }}

diff --git a/_includes/image-slider.html b/_includes/image-slider.html
@@ -4,20 +4,20 @@
       {% assign images = site.static_files | where: 'image_slider', true %}
       {% for image in images %}
         <div class="carousel-item {% if forloop.first %} active {% endif %}"
-             style="background: url('{{ site.url}}{{ image.path }}') no-repeat center">
+             style="background: url('{{ site.baseurl }}{{ image.path }}') no-repeat center">
         </div>
       {% endfor %}
     </div>
     <div class="jumbotron-fluid text-center">
       <div class="container">
         <div class="jumbotron-text">
           {% assign split = site.title | split: ' ' %}
-          <h1>
+          <h1 style="font-size: calc(3rem + 2vw);">
             <span class="accent">{{ split[0] }}</span> {{ split[1] }}
           </h1>
           <p>{{ site.description }}</p>
         </div>
-        <a class="btn btn-primary btn-lg" href="{{ site.url}}/play">Play Now »</a>
+        <a class="btn btn-primary btn-lg" href="{{ site.baseurl }}{% link _pages/play.html %}">Play Now »</a>
       </div>
     </div>
   </div>

diff --git a/_includes/nav.html b/_includes/nav.html
@@ -1,22 +1,20 @@
 <nav class="navbar navbar-expand-lg navbar-light bg-light">
   <div class="container">
-    <a class="navbar-brand" href="{{ site.url }}">
-      <img src="{{ site.url }}/assets/img/logo.png" class="d-inline-block align-top" alt="Logo">
+    <a class="navbar-brand" href="{{ site.url }}{{ site.baseurl }}">
+      <img src="{{ site.baseurl }}{% link /assets/img/logo.png %}" class="d-inline-block align-top" alt="Logo" width="30" height="34">
       <span class="title">{{ site.title }}</span>
     </a>
-
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#menu">
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#menu" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
-
     <div class="collapse navbar-collapse" id="menu">
       <ul class="navbar-nav ml-auto">
         {% assign pages = site.pages | sort:'url' %}
         {% for p in pages %}
           {% if p.in-nav == true %}
             <li class="nav-item {% if p.url == page.url %} active {% endif %}">
-              <a class="nav-link" href="{{ p.url }}">
-                <i class="{{ p.icon }}""></i>
+              <a class="nav-link" href="{{ site.baseurl }}{{ p.url }}">
+                <i class="{{ p.icon }}"></i>
                 {{ p.title }}
               </a>
             </li>

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,9 +1,6 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    {% include head.html %}
-  </head>
-
+  {% include head.html %}
   <body id="{% if page.layout == 'page' %}{{ page.title | downcase }}{% elsif page.layout == 'post' %}post{% endif %}">
     {% include nav.html %}
 

diff --git a/_layouts/post.html b/_layouts/post.html
@@ -4,14 +4,16 @@
 
 <article>
   <div class="container my-4">
-    <h2 class="post-title">
-      {{ page.title }}
-      <div class="post-info">
-        {{ page.author }}
-        -
-        {{ page.date | date: '%B %e, %Y' }}
-      </div>
-    </h2>
+    <header>
+      <h2 class="post-title">
+        {{ page.title }}
+        <hgroup class="post-info">
+          {{ page.author }}
+          -
+          <time datetime="{{ page.date | date: '%F' }}">{{ page.date | date: '%B %e, %Y' }}</time>
+        </hgroup>
+      </h2>
+    </header>
     <hr>
     <div class="post-content">
       {{ content }}

diff --git a/_pages/404.html b/_pages/404.html
@@ -2,10 +2,11 @@
 title: "404 Not found"
 description: "The requested page was not found"
 permalink: "404"
+sitemap: false
 ---
 
 <div class="container">
-    <div class="jumbotron" style="background: url(/assets/img/404.png); background-size: 940px 263px;">
+    <div class="jumbotron" style="background: url({{ site.baseurl }}{% link /assets/img/404.png %}); background-size: 940px 263px;">
         <div style="text-align: center; font-weight: bold; color: red; text-shadow: 2px 2px 5px black;">
             <div style="font-size: 90px; line-height: 90px;">404</div>
             <div style="font-size: 30px">Not found</div>

diff --git a/_pages/appeal.html b/_pages/appeal.html
@@ -16,7 +16,7 @@
   <div class="row mt-4 text-left">
     <div class="col-md-4">
       <h2>What can be appealed?</h2>
-      <p>Mistakes happen! If you feel your punishment should not have been issued we encourage you to appeal.</p>
+      <p>Mistakes happen! If you feel your punishment should not have been issued, we encourage you to appeal.</p>
       <p>Bans can be appealed and reduced, even if the ban was justified, but only unjustified mutes can be appealed.</p>
       <p>If there was a mistake, or the ban was issued a long time ago, we may consider giving you a second chance.</p>
     </div>
@@ -40,8 +40,8 @@ <h2>Privilege, not a right.</h2>
   <br/>
   <div class="row mt-4 text-center justify-content-center">
     <div class="col-md-6">
-      <p><a class="btn btn-primary btn-lg" href="https://discord.gg/s3MPCszFXG">Appeal</a></p>
-      <p>The appeal process is handled on our <a href="https://discord.com/">Discord</a> server. Please <a href="https://discord.com/register">create an account</a> if you do not already have one.</p>
+      <p><a class="btn btn-primary btn-lg" href="{{ site.data.links.discord }}">Appeal</a></p>
+      <p>The appeal process is handled through through <code>&#35;appeal</code> in our <a href="https://discord.com/">Discord</a> server. Please <a href="https://discord.com/register">create an account</a> if you do not already have one.</p>
     </div>
   </div>
 </div>