Merge pull request #110 from jbolns/dev

Improvs > Misc Formatting & Add Gateway
jbolns · Dec 14, 2024 · 1abdb23 · 1abdb23
2 parents 9c55a5b + 0c3f087
commit 1abdb23
Show file tree

Hide file tree

Showing 8 changed files with 113 additions and 18 deletions.
diff --git a/src/components/CategoriesPreview.astro b/src/components/CategoriesPreview.astro
@@ -1,12 +1,9 @@
 ---
 // IMPORTS
-// Config & content
-import { languages } from "@i18n/ui";
-
-// TYPES
 type MultiArray = { [key: string]: string[] };
+import { languages } from "@i18n/ui";
 
-// FUNCTIONS & ACTIONS
+// ACTIONS
 const { tags, locale, current } = Astro.props;
 
 let dict: MultiArray = {};

diff --git a/src/components/MainNavLangs.astro b/src/components/MainNavLangs.astro
@@ -7,6 +7,7 @@ import { getRoutes, sanitizeRoutes } from "@i18n/utils";
 // ACTIONS
 // Get locale
 const { locale } = Astro.props;
+
 // Determine current slug from pathname
 const currentPath = Astro.url.pathname;
 const parts = currentPath.split("/");

diff --git a/src/i18n/ui.ts b/src/i18n/ui.ts
@@ -6,15 +6,17 @@ import type { Multi, Links, Misc } from "@types"
 
 // ALL LANGUAGES
 export const languages: Multi = {
-  en: 'English',
-  es: 'Español',
-  fi: 'Suomi',
+  en: "English",
+  es: "Español",
+  fi: "Suomi",
 };
 
 
 // DEFAULT LANGUAGE
-export const defaultLang = 'en';
+export const defaultLang = "en";
 
+// COLLECTION NAMES
+export const listOfCollections = ["blog"]
 
 // TOP-LEVEL NAVIGATION
 //
@@ -68,7 +70,8 @@ export type Sections = {
   [key: string]: Multi
 }
 
-// VARIOUS STRINGS USED ACROSS WEBSITE
+// MISC STRINGS
+// Strings for animation wrapper
 export const wrapperStrings: Misc = {
   w1: {
     en: "Click here to load animation",
@@ -97,6 +100,7 @@ export const wrapperStrings: Misc = {
   }
 }
 
+// Strings used in CV
 export const cvStrings: Misc = {
   mode: {
     en: "View mode",
@@ -135,6 +139,7 @@ export const cvStrings: Misc = {
   }
 }
 
+// Strings for tag and icon labels requiring small adjustments
 export const labelStrings: Misc = {
   coding: {
     en: "coding",
@@ -153,9 +158,9 @@ export const labelStrings: Misc = {
   },
 }
 
+// OG strings used in header
 export const ogStrings: Multi = {
   en: "en_GB",
   es: "es_ES",
   fi: "fi_FI"
-
 }
diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts
@@ -28,7 +28,7 @@ export function getRoutes(slug = ""): Multi | string {
   let match = -1
 
   const allRoutes = Object.values(routes)
-  allRoutes.forEach((group,i) => Object.values(group).map((val) => val === slug ? match = i : ""))
+  allRoutes.forEach((group,i) => Object.values(group).map((val) => val === decodeURI(slug) ? match = i : ""))
 
   let group
   match >= 0 ? group = allRoutes[match] : ""  

diff --git a/src/layouts/BlogRoll.astro b/src/layouts/BlogRoll.astro
@@ -2,11 +2,10 @@
 // IMPORTS
 import BaseLayout from "@layouts/BaseLayout.astro";
 import { site, sections } from "@i18n/sections";
-import CategoriesPreview from "@components/CategoriesPreview.astro";
 
 // ACTIONS
 // Get props from child component
-const { tags, locale, section } = Astro.props;
+const { locale, section } = Astro.props;
 ---
 
 <BaseLayout

diff --git a/src/pages/blog/[lang]/[...page].astro b/src/pages/blog/[lang]/[...page].astro
@@ -50,7 +50,7 @@ export async function getStaticPaths({ paginate }: GetStaticPathsOptions) {
 
 const { splitTags, page } = Astro.props;
 const locale = Astro.params.lang;
-const current = "none";
+
 ---
 
 <BlogRollLayout page={page} tags={splitTags} locale={locale} section="blog">

diff --git a/src/pages/en/gateway.astro b/src/pages/en/gateway.astro
@@ -0,0 +1,94 @@
+---
+// IMPORTS
+import BaseLayout from "@layouts/BaseLayout.astro";
+import { site } from "@i18n/sections";
+import { defaultLang } from "@i18n/ui";
+
+// ACTIONS
+// Get locale from folder structure
+const locale = defaultLang;
+---
+
+<BaseLayout
+  siteTitle={site.title[locale]}
+  description="Online payments gateway"
+  pageTitle="Online payments gateway"
+  locale={locale}
+>
+  <section>
+    <p class="text-sm">
+      (For clarity, this page is only available in English.)
+    </p>
+
+    <h3>Services</h3>
+    <p>Click the button below to pay for services rendered.<sup>1, 2</sup></p>
+    <p>Do NOT use this gateway to book services.<sup>3</sup></p>
+
+    <div class="text-right">
+      <a
+        href="https://buy.stripe.com/eVa16F6XJ6XB8PS4gk"
+        target="_blank"
+        rel="noreferrer noopener"
+      >
+        <button
+          class="w-3/4 p-1 border border-black bg-yellow-200 rounded-lg shadow-lg hover:bg-yellow-300 dark:text-black dark:border-white "
+        >
+          Pay (services)<sup>4</sup>
+        </button>
+      </a>
+      <p class="m-0 text-sm text-blue-700 underline">
+        <a href="/en/terms">Terms & Conditions</a><sup>4</sup>
+      </p>
+    </div>
+
+    <h3>Products</h3>
+    <p>
+      All products I offer can be used in "ugly mode" without
+      activation. To make a voluntary payment to get make the user interface prettier, click the button below.<sup>1, 2, 5</sup>
+    </p>
+
+    <div class="text-right">
+      <a
+        href="https://buy.stripe.com/28o16Fci381F7LOeUX"
+        target="_blank"
+        rel="noreferrer noopener"
+      >
+        <button
+          class="w-3/4 p-1 border border-black bg-yellow-200 rounded-lg shadow-lg hover:bg-yellow-300 dark:text-black dark:border-white "
+        >
+          Pay (open source products)<sup>4</sup>
+        </button>
+      </a>
+      <p class="m-0 text-sm text-blue-700 underline">
+        <a href="/en/terms">Terms & Conditions</a><sup>4</sup>
+      </p>
+    </div>
+
+    <span class="text-sm">
+      <strong>Notes</strong>
+      <ol>
+        <li>
+          Payments are final and confirm satisfaction with products/services.
+        </li>
+        <li>Payments are handled via Stripe.</li>
+        <li>
+          Payments for services that have not been pre-arranged, agreed, and
+          contracted with me will be treated as voluntary payments relating to
+          an open-source or open-access resource of my choice.
+        </li>
+        <li>
+          By clicking the button you accept the applicable sections of the <a
+            href="/en/terms" class="text-blue-700 underline">Terms & Conditions</a
+          >.
+        </li>
+
+        <li>
+          After payment, Stripe will send an invoice to the email you entered in
+          the payment information. The invoice number is the activation code
+          needed to disable "ugly mode".
+        </li>
+
+      </ol>
+    </span>
+  </section>
+</BaseLayout>
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -3,12 +3,11 @@
 import type { Multi } from "@types";
 import { ViewTransitions } from "astro:transitions";
 import BaseHead from "@components/BaseHead.astro";
-import { languages } from "@i18n/ui";
+import { languages, defaultLang } from "@i18n/ui";
 import { sanitizeRoutes } from "@i18n/utils";
 import { site } from "@i18n/sections";
-import { defaultLang } from "@i18n/ui";
 
-// FUNCTIONS & ACTIONS
+// ACTIONS
 const locale: keyof Multi = defaultLang;
 ---