Verify is clientVersion is not for prerelease (#41)

DefGuard · Sep 3, 2024 · f46137f · f46137f
1 parent 558cbfb
commit f46137f
Show file tree

Hide file tree

Showing 9 changed files with 5,298 additions and 2,566 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/components/download/DownloadInfo/DownloadInfo.tsx b/src/components/download/DownloadInfo/DownloadInfo.tsx
@@ -18,15 +18,20 @@ const DownloadInfo = function ({ owner, repo }: GithubProps) {
       .then((res) =>
         res.json().then((val) => {
           if (val.length) {
-            const data = val[0];
-            clientVersion.set(data.name ? data.name.slice(1) : "");
+            for (let data of val) {
+              if (!data.prerelease) {
+                const data = val[0];
+                clientVersion.set(data.name ? data.name.slice(1) : "");
 
-            // 2024-07-08T12:58:59Z -> 08.07.2024
-            setPublished(
-              data.published_at
-                ? data.published_at.split("T")[0].split("-").reverse().join(".")
-                : "",
-            );
+                // 2024-07-08T12:58:59Z -> 08.07.2024
+                setPublished(
+                  data.published_at
+                    ? data.published_at.split("T")[0].split("-").reverse().join(".")
+                    : "",
+                );
+                break;
+              }
+            }
           }
           setIsLoading(false);
         }),

diff --git a/src/pages/client.astro b/src/pages/client.astro
@@ -9,14 +9,15 @@ import ProductImage from "../components/product/ProductImage.astro";
 import ProductLayout from "../layouts/ProductLayout.astro";
 import ProductSection from "../layouts/ProductSection.astro";
 import MatrixSection from "../components/MatrixSection.astro";
-import { Image } from 'astro:assets';
+import { Image } from "astro:assets";
 import ClientImage from "/public/images/product/client/main-screen.png";
 import OverviewImage from "/public/images/product/client/overview.png";
 
 const clientFeatures = (await getCollection("client-features")).sort(
   (f1, f2) => f1.data.order - f2.data.order,
 );
-const title = "defguard enterprise open-source SSO&VPN with 2FA/MFA: Best Desktop WireGuard Client";
+const title =
+  "defguard enterprise open-source SSO&VPN with 2FA/MFA: Best Desktop WireGuard Client";
 const featuredImage =
   "github.com/DefGuard/defguard.github.io/raw/main/public/images/product/client/main-screen.png";
 const imageWidth = "1920";
@@ -62,7 +63,13 @@ const tags = [
       </header>
     </ProductSection>
     <ProductImage>
-      <Image src={ClientImage} alt="product image" densities={[0.5, 0.75, 1]} width={imageWidth} height={imageHeight} />
+      <Image
+        src={ClientImage}
+        alt="product image"
+        densities={[0.5, 0.75, 1]}
+        width={imageWidth}
+        height={imageHeight}
+      />
     </ProductImage>
     <ProductSection padding="large">
       <div class="product-features">

diff --git a/src/pages/compare.astro b/src/pages/compare.astro
@@ -7,7 +7,8 @@ import { featuresTableData } from "../data/compare-table";
 import { Button } from "../components/buttons/Button/Button";
 import OrganizationJSONLD from "../scripts/OrganizationJSONLD.astro";
 
-const title = "defguard enterprise open-source SSO&VPN with 2FA/MFA: Comparison of WireGuard VPN solutions";
+const title =
+  "defguard enterprise open-source SSO&VPN with 2FA/MFA: Comparison of WireGuard VPN solutions";
 const featuredImage =
   "github.com/DefGuard/defguard.github.io/raw/main/public/images/png/defguard.png";
 const imageWidth = "1080";

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -9,8 +9,8 @@ import ProductImage from "../components/product/ProductImage.astro";
 import ProductLayout from "../layouts/ProductLayout.astro";
 import ProductSection from "../layouts/ProductSection.astro";
 import MatrixSection from "../components/MatrixSection.astro";
-import { Image } from 'astro:assets';
-import CoreImage from '/public/images/product/core/hero-image.png';
+import { Image } from "astro:assets";
+import CoreImage from "/public/images/product/core/hero-image.png";
 
 const coreFeatures = (await getCollection("core-features")).sort(
   (f1, f2) => f1.data.order - f2.data.order,
@@ -83,7 +83,11 @@ const tags = [
       </header>
     </ProductSection>
     <ProductImage>
-      <Image src={CoreImage} alt="defguard vpn overview image" densities={[0.5, 0.75, 1]} />
+      <Image
+        src={CoreImage}
+        alt="defguard vpn overview image"
+        densities={[0.5, 0.75, 1]}
+      />
     </ProductImage>
     <ProductSection padding="large">
       <div class="product-features">

diff --git a/src/pages/openvpn.astro b/src/pages/openvpn.astro
@@ -13,7 +13,8 @@ import MigrateIllustration from "/public/svg/migrate-illustration.svg?raw";
 const openvpnFeatures = (await getCollection("openvpn-features")).sort(
   (f1, f2) => f1.data.order - f2.data.order,
 );
-const title = "defguard enterprise open-source SSO&VPN with 2FA/MFA: Migrate from OpenVPN to WireGuard";
+const title =
+  "defguard enterprise open-source SSO&VPN with 2FA/MFA: Migrate from OpenVPN to WireGuard";
 const featuredImage =
   "github.com/DefGuard/defguard.github.io/raw/main/public/images/png/defguard.png";
 const imageWidth = "1080";
@@ -94,4 +95,4 @@ const form_title = "Book a demo";
     <ProductBuiltBy />
     <MatrixSection />
   </main>
-</ProductLayout>
+</ProductLayout>
diff --git a/src/pages/pricing.astro b/src/pages/pricing.astro
@@ -39,7 +39,8 @@ const tags = [
 ];
 
 const form_title = "Book a demo";
-const form_description = "We provide consulting or custome deployment and security services. You can order custome features for the server and/or the client. Just fill out the form below:";
+const form_description =
+  "We provide consulting or custome deployment and security services. You can order custome features for the server and/or the client. Just fill out the form below:";
 ---
 
 <BaseLayout
@@ -97,7 +98,11 @@ const form_description = "We provide consulting or custome deployment and securi
         </a>
       </div>
       <div class="product-features">
-        <BookDemoForm client:only="preact" title={form_title} description={form_description} />
+        <BookDemoForm
+          client:only="preact"
+          title={form_title}
+          description={form_description}
+        />
       </div>
     </ProductSection>
   </main>

diff --git a/src/scripts/OrganizationJSONLD.astro b/src/scripts/OrganizationJSONLD.astro
@@ -1,35 +1,35 @@
 ---
 interface Props {
-    title: string;
-    description: string;
-    url: string;
-    tags: string[];
+  title: string;
+  description: string;
+  url: string;
+  tags: string[];
 }
-const { title, description, url, tags} = Astro.props;
+const { title, description, url, tags } = Astro.props;
 
 const schema = {
-    "@context": "https://schema.org",
-    "@type": "Organization",
-    "headline": title,
-    "description": description,
-    "url": url,
-    "keywords": tags,
-    "author": {
-        "@type": "Person",
-        "name": "Robert Olejnik",
-    },
-    "address": {
-        "@type": "PostalAddress",
-        "streetAddress": "Cyfrowa 6",
-        "city": "Szczecin",
-        "postalCode": "71-441",
-        "country": "Poland"
-    },
-    "contantPoint": {
-        "@type": "ContactPoint",
-        "email": "[email protected]",
-    },
-    "operatingSystem": "Windows, macOS, Linux",
+  "@context": "https://schema.org",
+  "@type": "Organization",
+  headline: title,
+  description: description,
+  url: url,
+  keywords: tags,
+  author: {
+    "@type": "Person",
+    name: "Robert Olejnik",
+  },
+  address: {
+    "@type": "PostalAddress",
+    streetAddress: "Cyfrowa 6",
+    city: "Szczecin",
+    postalCode: "71-441",
+    country: "Poland",
+  },
+  contantPoint: {
+    "@type": "ContactPoint",
+    email: "[email protected]",
+  },
+  operatingSystem: "Windows, macOS, Linux",
 };
 ---
 

diff --git a/src/styles/fonts/_font.scss b/src/styles/fonts/_font.scss
@@ -1,8 +1,9 @@
 @font-face {
-    font-family: "Poppins";
-    font-style: normal;
-    font-weight: 400;
-    src: local('Poppins'),
-        url("/fonts/poppins/Poppins-Regular.woff2") format("woff2");
-    font-display: swap;
-}
+  font-family: "Poppins";
+  font-style: normal;
+  font-weight: 400;
+  src:
+    local("Poppins"),
+    url("/fonts/poppins/Poppins-Regular.woff2") format("woff2");
+  font-display: swap;
+}