aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinteck <contact@minteck.org>2022-08-13 12:50:56 +0200
committerMinteck <contact@minteck.org>2022-08-13 12:50:56 +0200
commitaf329e3b49d19e6d1cc189cd94c0e98f51d14faa (patch)
tree14c73e477e6e0752b5a38343e5cb9c1add5a0d4d
parent4f2620cb03a0fe28a716233b29b382a25dd32fd7 (diff)
downloadvaportrail-af329e3b49d19e6d1cc189cd94c0e98f51d14faa.tar.gz
vaportrail-af329e3b49d19e6d1cc189cd94c0e98f51d14faa.tar.bz2
vaportrail-af329e3b49d19e6d1cc189cd94c0e98f51d14faa.zip
Random fixes and things like thatHEADmane
-rw-r--r--.idea/deployment.xml15
-rw-r--r--data/projects.yml20
-rw-r--r--package.json4
-rw-r--r--public/assets/plurality.css1
-rw-r--r--views/error.ejs1
-rw-r--r--views/plurality.ejs6
6 files changed, 30 insertions, 17 deletions
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
new file mode 100644
index 0000000..6b51bac
--- /dev/null
+++ b/.idea/deployment.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="PublishConfigData" autoUpload="Always" serverName="Minteck.org" remoteFilesAllowedToDisappearOnAutoupload="false">
+ <serverData>
+ <paths name="Minteck.org">
+ <serverdata>
+ <mappings>
+ <mapping deploy="/mnt/vaportrail" local="$PROJECT_DIR$" web="/" />
+ </mappings>
+ </serverdata>
+ </paths>
+ </serverData>
+ <option name="myAutoUpload" value="ALWAYS" />
+ </component>
+</project> \ No newline at end of file
diff --git a/data/projects.yml b/data/projects.yml
index 3273a1c..4855c5f 100644
--- a/data/projects.yml
+++ b/data/projects.yml
@@ -53,18 +53,18 @@
url: https://git.equestria.dev/equestria.dev/dj-pon-3
- id: eaab41d186
- name: Strawberry OS
- language: javascript
+ name: ponies.equestria.horse
+ language: php
description: |
- An open-source text-mode operating system that pushes the limits of command line.
- url: https://git.equestria.dev/equestria.dev/strawberry-os
+ A fast, powerful and modular CMS for the ponies.equestria.horse website
+ url: https://git.equestria.dev/equestria.dev/ponies.equestria.horse
-- id: 11984e34ea
- name: strawberry-boot
- language: javascript
- description: |
- An open-source reference bootloader for Strawberry devices.
- url: https://git.equestria.dev/equestria.dev/strawberry-boot
+#- id: 11984e34ea
+# name: strawberry-boot
+# language: javascript
+# description: |
+# An open-source reference bootloader for Strawberry devices.
+# url: https://git.equestria.dev/equestria.dev/strawberry-boot
- id: 2a71c49048
name: Bits (client)
diff --git a/package.json b/package.json
index 6ed9c6d..bc1968f 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,6 @@
"ejs": "^3.1.8",
"express": "^4.18.1",
"multer": "^1.4.4",
- "superagent": "^7.1.3",
- "ua-parser-js": "^1.0.2",
- "yaml": "^2.1.1"
+ "superagent": "^7.1.3"
}
}
diff --git a/public/assets/plurality.css b/public/assets/plurality.css
index a7210a4..faeb7b2 100644
--- a/public/assets/plurality.css
+++ b/public/assets/plurality.css
@@ -45,6 +45,7 @@
color: white !important;
text-decoration: none;
cursor: pointer;
+ margin-top: 10px;
}
.plural-member-picture {
diff --git a/views/error.ejs b/views/error.ejs
index cee0fd2..a53e5d2 100644
--- a/views/error.ejs
+++ b/views/error.ejs
@@ -45,7 +45,6 @@
%>
<li>Browser: <%= ua.getBrowser().name + " " + ua.getBrowser().version %></li>
<li>Engine: <%= ua.getEngine().name + " " + ua.getEngine().version %></li>
- <li>Vapor Trail Version: <%= version %> (build <%= build %>)</li>
<li>Core Version: <%= process.version %></li>
<li>Memory (RSS): <%= (process.memoryUsage().rss / 1024).toFixed(2) %>K</li>
<li>Memory (Heap Total): <%= (process.memoryUsage().heapTotal / 1024).toFixed(2) %>K</li>
diff --git a/views/plurality.ejs b/views/plurality.ejs
index 2263e84..22356b4 100644
--- a/views/plurality.ejs
+++ b/views/plurality.ejs
@@ -45,7 +45,7 @@ let frontersRaindrops = raindrops['fronters']['members'].map((i) => { return i['
<div id="cnp-intro-outer">
<div id="cnp-intro" style="display:grid;grid-template-columns: 131px 1fr;grid-gap:10px;background:#353535;border-radius:10px;padding:10px;">
<div id="cnp-image-outer" style="display:flex;align-items:center;">
- <img id="cnp-image" alt="" src="https://ponies.equestria.horse/Special:Redirect/file/Logo.jpg" style="height:131px;border-radius:10px;">
+ <img id="cnp-image" alt="" src="https://ponies.equestria.horse/uploads/logo.jpg" style="height:131px;border-radius:10px;">
</div>
<div id="cnp-content-outer" style="display:flex;align-items:center;">
<div id="cnp-content">
@@ -65,7 +65,7 @@ let frontersRaindrops = raindrops['fronters']['members'].map((i) => { return i['
<p id="system-cloudburst-description" class="system-description">Plural system of <%= cloudburst["members"].length - 1 %> ponies!</p>
<% for (let member of cloudburst["members"]) { if (member.name !== "unknown") { %>
- <a href="https://ponies.equestria.horse/Cloudburst:<%= member['display_name'] ?? member['name'] %>" target="_blank" class="plural-member" id="plural-member-<%= member['id'] %>">
+ <a href="https://ponies.equestria.horse/cloudburst/<%= member['name'] %>" target="_blank" class="plural-member" id="plural-member-<%= member['id'] %>">
<img src="<%= member['avatar_url'] ?? cloudburst['general']['avatar_url'] %>" alt="" class="plural-member-picture" id="plural-member-<%= member['id'] %>-picture">
<span class="plural-member-name" id="plural-member-<%= member['id'] %>-name"><%= member['display_name'] ?? member['name'] %><% if (member['name'] === "twilight") { %>&nbsp;<span class="badge rounded-pill bg-success">Host</span><% } %><% if (frontersCloudburst.includes(member['id'])) { %>&nbsp;<span class="badge rounded-pill bg-primary">Front</span><% } %></span>
<span class="plural-member-prefix" id="plural-member-<%= member['id'] %>-prefix"><%= member['proxy_tags'][0]['prefix'] ?? "{...}" %></span>
@@ -78,7 +78,7 @@ let frontersRaindrops = raindrops['fronters']['members'].map((i) => { return i['
<p id="system-raindrops-description" class="system-description">Plural system of <%= raindrops["members"].length - 1 %> ponies!</p>
<% for (let member of raindrops["members"]) { if (member.name !== "unknown") { %>
- <a href="https://ponies.equestria.horse/Raindrops:<%= member['display_name'] ?? member['name'] %>" target="_blank" class="plural-member" id="plural-member-<%= member['id'] %>">
+ <a href="https://ponies.equestria.horse/raindrops/<%= member['name'] %>" target="_blank" class="plural-member" id="plural-member-<%= member['id'] %>">
<img src="<%= member['avatar_url'] ?? raindrops['general']['avatar_url'] %>" alt="" class="plural-member-picture" id="plural-member-<%= member['id'] %>-picture">
<span class="plural-member-name" id="plural-member-<%= member['id'] %>-name"><%= member['display_name'] ?? member['name'] %><% if (member['name'] === "scootaloo") { %>&nbsp;<span class="badge rounded-pill bg-success">Host</span><% } %><% if (frontersRaindrops.includes(member['id'])) { %>&nbsp;<span class="badge rounded-pill bg-primary">Front</span><% } %></span>
<span class="plural-member-prefix" id="plural-member-<%= member['id'] %>-prefix"><%= member['proxy_tags'][0]['prefix'] ?? "{...}" %></span>