fix: Drop trailing slash from proxy URL and use api instead of proxy consistently

Signed-off-by: Felicitas Pojtinger <felicitas@pojtinger.com>

Author: pojntfx

assets/js/luma-next-event.js

@@ -60,10 +60,10 @@ customElements.define(
   class extends HTMLElement {
     async connectedCallback() {
       const cal = this.getAttribute("calendar");
-      const proxy = this.getAttribute("proxy");
+      const api = this.getAttribute("api");
       try {
         const { entries } = await fetch(
-          `${proxy}/next-event?calendar=${encodeURIComponent(cal)}`,
+          `${api}/next-event?calendar=${encodeURIComponent(cal)}`,
         ).then((r) => r.json());
         const evt = entries?.[0];
         if (!evt) {

assets/js/luma-upcoming-events.js

@@ -51,10 +51,10 @@ customElements.define(
   class extends HTMLElement {
     async connectedCallback() {
       const cal = this.getAttribute("calendar");
-      const proxy = this.getAttribute("proxy");
+      const api = this.getAttribute("api");
       try {
         const { entries } = await fetch(
-          `${proxy}/events?calendar=${encodeURIComponent(cal)}`,
+          `${api}/events?calendar=${encodeURIComponent(cal)}`,
         ).then((r) => r.json());
         if (!entries?.length) {
           this.textContent = "No upcoming events right now. Check back soon!";

assets/js/mastodon-feed.js

@@ -83,11 +83,11 @@ customElements.define(
   class extends HTMLElement {
     async connectedCallback() {
       const username = this.getAttribute("username");
-      const proxy = this.getAttribute("proxy");
+      const api = this.getAttribute("api");
       const profile = this.getAttribute("profile");
       try {
         const data = await fetch(
-          `${proxy}/mastodon?username=${encodeURIComponent(username)}`,
+          `${api}/mastodon?username=${encodeURIComponent(username)}`,
         ).then((r) => r.json());
         if (!data.toots?.length) {
           this.textContent = "No posts yet.";

data/links.yaml

@@ -77,9 +77,9 @@ donate:
   icon: fa-brands fa-paypal
 feed:
   mastodon: https://thecanadian.social/@vanlug.rss
+api: https://vanlug-website-backend.up.railway.app
 luma:
   calendar: cal-x23GENOxTsZqSMO
   url: https://luma.com/vanlug
-  proxy: https://vanlug-website-backend.up.railway.app/
 meetup:
   url: https://www.meetup.com/vanlug-bc/events/

layouts/_partials/mastodon-feed.html

@@ -15,7 +15,7 @@ <h3>Latest posts</h3>
   </div>
   <mastodon-feed
     username="{{ .Site.Data.links.socials.mastodon.username }}"
-    proxy="{{ .Site.Data.links.luma.proxy }}"
+    api="{{ .Site.Data.links.api }}"
     profile="{{ .Site.Data.links.socials.mastodon.url }}"
   >
     <div class="pf-v6-l-flex pf-m-column pf-m-gap-sm">

layouts/_partials/section-events.html

@@ -29,7 +29,7 @@ <h3>Upcoming</h3>
             >Luma calendar<icon-external></icon-external></a
           >. RSVP there to get reminders, or subscribe via
           <a
-            href="{{ .Site.Data.links.luma.proxy }}/events/feed?calendar={{ .Site.Data.links.luma.calendar }}"
+            href="{{ .Site.Data.links.api }}/events/feed?calendar={{ .Site.Data.links.luma.calendar }}"
             target="_blank"
             rel="noopener"
             >RSS<icon-custom data-icon="fa-solid fa-rss"></icon-custom></a
@@ -38,7 +38,7 @@ <h3>Upcoming</h3>
       </div>
       <luma-upcoming-events
         calendar="{{ .Site.Data.links.luma.calendar }}"
-        proxy="{{ .Site.Data.links.luma.proxy }}"
+        api="{{ .Site.Data.links.api }}"
       >
         <table
           class="pf-v6-c-table pf-m-grid-md pf-m-compact"

layouts/_partials/section-home.html

@@ -62,7 +62,7 @@ <h3>{{ $c.next_meeting.title }}</h3>
       </div>
       <luma-next-event
         calendar="{{ .Site.Data.links.luma.calendar }}"
-        proxy="{{ .Site.Data.links.luma.proxy }}"
+        api="{{ .Site.Data.links.api }}"
       >
         <div class="pf-v6-c-card pf-m-compact pf-m-flat">
           <div class="pf-v6-c-card__header">
@@ -100,7 +100,7 @@ <h3>{{ $c.next_meeting.title }}</h3>
           See
           <a href="{{ "/events/" | relURL }}">full schedule</a>, or subscribe via
           <a
-            href="{{ .Site.Data.links.luma.proxy }}/events/feed?calendar={{ .Site.Data.links.luma.calendar }}"
+            href="{{ .Site.Data.links.api }}/events/feed?calendar={{ .Site.Data.links.luma.calendar }}"
             target="_blank"
             rel="noopener"
             >RSS<icon-custom data-icon="fa-solid fa-rss"></icon-custom></a

layouts/_partials/sidebar.html

@@ -10,7 +10,7 @@
             <li class="pf-v6-c-nav__item">
               <a
                 class="pf-v6-c-nav__link"
-                href="{{ $.Site.Data.links.luma.proxy }}/events/feed?calendar={{ $.Site.Data.links.luma.calendar }}"
+                href="{{ $.Site.Data.links.api }}/events/feed?calendar={{ $.Site.Data.links.luma.calendar }}"
                 target="_blank"
                 rel="noopener"
                 ><span

layouts/baseof.html

@@ -35,7 +35,7 @@
       <link rel="me" href="{{ . }}" />
     {{ end }}
     <link rel="alternate" type="application/rss+xml" title="Mastodon posts from {{ .Site.Title }}" href="{{ .Site.Data.links.feed.mastodon }}" />
-    <link rel="alternate" type="application/atom+xml" title="Upcoming events from {{ .Site.Title }}" href="{{ .Site.Data.links.luma.proxy }}/events/feed?calendar={{ .Site.Data.links.luma.calendar }}" />
+    <link rel="alternate" type="application/atom+xml" title="Upcoming events from {{ .Site.Title }}" href="{{ .Site.Data.links.api }}/events/feed?calendar={{ .Site.Data.links.luma.calendar }}" />
 
     <meta name="author" content="{{ .Site.Data.site.author }}" />
     <meta name="fediverse:creator" content="@vanlug@thecanadian.social" />