I guess it's done?

5 files changed, 54 insertions, 15 deletions

diff --git a/views/about.ejs b/views/about.ejs
index 9dc7a60..8ecb333 100644
--- a/views/about.ejs
+++ b/views/about.ejs
@@ -26,20 +26,50 @@
 
 <div id="navbar-skipper">
     <br>
+    <h2 style="text-align: center;">About Us</h2>
+    <p style="text-align: center;margin-bottom:20px;">We're two fluffy birb horses!</p>
     <div class="container">
-        <div class="section" id="this-section">
+        <div class="section" id="why-shared-website">
             <!-- The pony who wrote this code is cute. - Scoots -->
             <!-- The pony who wrote the above comment is cute. - Twi -->
-            <a class="section-title" href="#this-section">This section</a>
-            <p class="section-content">
-                We take our work very seriously, as you can see from the comments on this page.
-            </p>
+            <a class="section-title" href="#why-shared-website">Why do we have a shared website?</a>
+            <div class="section-content">
+                We have a shared website for several reasons, but one of them is simply because we think it's cool honestly.<br>
+                We also already share basically everything, so why not share a website as well?
+            </div>
         </div>
-        <div class="section" id="another-section">
-            <a class="section-title" href="#this-section">Another section</a>
-            <p class="section-content">
-                Please don't see our code. Pleaaaaaase!
-            </p>
+        <div class="section" id="languages-we-know">
+            <a class="section-title" href="#languages-we-know">What languages do we know?</a>
+            <div class="section-content">
+                We both know...<br>
+                <div class="language-icon-wrapper">
+                    <img title="HTML" class="language-icon" src="/assets/languages/html.svg">
+                    <img title="JavaScript" class="language-icon" src="/assets/languages/javascript.svg">
+                    <img title="TypeScript" class="language-icon" src="/assets/languages/typescript.svg">
+                    <img title="PHP" class="language-icon" src="/assets/languages/php.svg">
+                    <img title="Python" class="language-icon" src="/assets/languages/python.svg">
+                </div><br>
+                The ponies in the Cloudburst System also know...<br>
+                <div class="language-icon-wrapper">
+                    <img title="C#" class="language-icon" src="/assets/languages/csharp.svg">
+                </div><br>
+                The ponies in the Raindrops System also know...<br>
+                <div class="language-icon-wrapper">
+                    <img title="Kotlin" class="language-icon" src="/assets/languages/kotlin.svg">
+                </div>
+            </div>
+        </div>
+        <div class="section" id="legal-notices">
+            <a class="section-title" href="#legal-notices">Your usual annoying legal stuff</a>
+            <div class="section-content">
+                Yes yes we know this stuff is annoying, but alas we do need to mention it.
+                <div class="list-group" id="legal-notices-block">
+                    <a class="list-group-item list-group-item-action" href="https://legal.equestria.horse/privacy">Data Privacy</a>
+                    <a class="list-group-item list-group-item-action" href="https://legal.equestria.horse/terms">Terms and Conditions</a>
+                    <a class="list-group-item list-group-item-action" href="https://legal.equestria.horse/sla">Quality of Service Policy</a>
+                    <a class="list-group-item list-group-item-action" href="https://legal.equestria.horse/notices">General Legal Notices</a>
+                </div>
+            </div>
         </div>
     </div>
 </div>
diff --git a/views/index.ejs b/views/index.ejs
index 5a62ac5..cecffe8 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -31,6 +31,7 @@
         </div>
     </div>
 </div>
+<!--
 <div id="hero-skipper">
     <div id="intro-bar"></div>
     <br>
@@ -40,11 +41,11 @@
     <br>
     <div class="container">
         <p><b>Welcome to our shared website!</b></p>
-        <p>This is where we talk about our common projects and (more generally) the kind of stuff we do together every day. We are both plural pegasus ponies who dream of living in Equestria (and/or together) and being happy. Hope you like our website!</p>
+        <p>This is where we talk about our common projects and (more generally) the kind of stuff we do together every day. We are both plural ponies from Equestria. Hope you like our website!</p>
 
         <p><b>The kind of stuff we do...</b></p>
         <p><i>Nothing for now -_-, but feel free to check later!</i></p>
     </div>
-</div>
+</div>-->
 <script src="/assets/scroll.js"></script>
 <%- include("./partials/footer.ejs") %>
\ No newline at end of file
diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs
index 33fb1a4..d6fe6b8 100644
--- a/views/partials/footer.ejs
+++ b/views/partials/footer.ejs
@@ -22,6 +22,7 @@
   ~ SOFTWARE.
   ~
   -->
+<br>
 <span style="position:fixed;right:0;top:0;z-index:999999999999;background:black;font-family:monospace;">version <%= version %> (build <%= build %>)</span>
 <span style="position:fixed;left:0;top:0;z-index:999999999999;background:black;font-family:monospace;">Project Vapor Trail</span>
 <span style="position:fixed;right:0;bottom:0;z-index:999999999999;background:black;font-family:monospace;">Not for production use.</span>
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index fee03d8..f04a266 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -25,6 +25,8 @@
 <!doctype html>
 <html lang="en">
 <head>
+    <meta name="X-VaporTrail-Version" content="<%= version %>">
+    <meta name="X-VaporTrail-Build" content="<%= build %>">
     <meta charset="UTF-8">
     <meta name="viewport"
           content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
@@ -36,7 +38,7 @@
     <link rel="stylesheet" href="/assets/about.css">
     <link rel="icon" href="/assets/favicon.png" type="image/png">
     <script src="/bootstrap/script.js"></script>
-    <title><%= title %> - The Cuties</title>
+    <title><%= title %> · The Cuties</title>
 </head>
 <body>
 <nav class="navbar navbar-expand-sm bg-dark navbar-dark fixed-top<% if (title !== "Home") { %> navbar-nohero<% } %>">
@@ -59,6 +61,9 @@
                 <li class="nav-item">
                     <a class="nav-link" href="/servers">Servers</a>
                 </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="https://portal.equestria.horse">Portal</a>
+                </li>
             </ul>
         </div>
     </div>
diff --git a/views/projects.ejs b/views/projects.ejs
index 705a1fe..d0d7f96 100644
--- a/views/projects.ejs
+++ b/views/projects.ejs
@@ -33,12 +33,14 @@
         <% let data = projectCache[project]; %>
         <a class="project" id="project-<%= data.id %>" target="_blank"
             <% if (![undefined, null, ""].includes(data.url)) { %>
-                href="<%= data.url %>"
+            href="<%= data.url %>"
             <% } %>
         >
+            <% if(![undefined, null, ""].includes(data.language)) { %>
             <img class="project-language" src="/assets/languages/<%= data.language %>.svg" />
+            <% } %>
             <h3 class="project-name"><%= data.name %></h3>
-            <p class="project-description"><%= data.description %></p>
+            <p class="project-description"><%- data.description.replaceAll("\n", "<br>") %></p>
         </a>
         <% } %>
     </div>