@networkpro/web 1.12.9 → 1.13.1

package/src/lib/components/LegalNav.svelte

@@ -7,13 +7,13 @@ This file is part of Network Pro.
 ========================================================================== -->
 
 <script>
-  import { base } from "$app/paths";
-  import { CONSTANTS } from "$lib";
+  import { base } from '$app/paths';
+  import { CONSTANTS } from '$lib';
 
   // Log the base path to verify its value
   //console.log("Base path:", base);
 
-  console.log(CONSTANTS.COMPANY_INFO.APP_NAME);
+  //console.log(CONSTANTS.COMPANY_INFO.APP_NAME);
 
   const { PAGE } = CONSTANTS;
 
@@ -38,21 +38,21 @@ This file is part of Network Pro.
     [
       {
         href: privacyLink,
-        text: "Privacy Policy",
+        text: 'Privacy Policy',
       },
       {
         href: pdashLink,
-        text: "Privacy Dashboard",
+        text: 'Privacy Dashboard',
       },
     ],
     [
       {
         href: termsLink,
-        text: "Terms of Use",
+        text: 'Terms of Use',
       },
       {
         href: licenseLink,
-        text: "Legal",
+        text: 'Legal',
       },
     ],
   ];

package/src/lib/components/Logo.svelte

@@ -8,43 +8,43 @@ This file is part of Network Pro.
 
 <script>
   // Import logo images
-  import { logoPng, logoWbp } from "$lib";
+  import { logoPng, logoWbp } from '$lib';
 
   /**
    * Decoding mode for the image.
    * @type {"sync" | "async" | "auto"}
    */
-  export let decoding = "sync";
+  export let decoding = 'sync';
 
   /**
    * Loading mode for the image.
    * @type {"eager" | "lazy"}
    */
-  export let loading = "eager";
+  export let loading = 'eager';
 
   /**
    * CSS class for the logo image.
    * @type {string}
    */
-  export let className = "logo";
+  export let className = 'logo';
 
   /**
    * Alt text for the logo image.
    * @type {string}
    */
-  export let alt = "Network Pro Strategies";
+  export let alt = 'Network Pro Strategies';
 
   /**
    * First part of the company slogan.
    * @type {string}
    */
-  export let sloganA = "Locking Down Networks";
+  export let sloganA = 'Locking Down Networks';
 
   /**
    * Second part of the company slogan.
    * @type {string}
    */
-  export let sloganB = "Unlocking Confidence™";
+  export let sloganB = 'Unlocking Confidence™';
 
   /**
    * Enable/disable display of the slogan.
@@ -74,13 +74,13 @@ This file is part of Network Pro.
    * Fetch priority for the logo image.
    * @type {"high" | "low" | "auto"}
    */
-  export let fetchpriority = "high";
+  export let fetchpriority = 'high';
 
   /**
    * Tagline text to display.
    * @type {string}
    */
-  export let tagline = "Security | Networking | Privacy";
+  export let tagline = 'Security | Networking | Privacy';
 </script>
 
 <!-- BEGIN LOGO AND SITE TITLE -->

package/src/lib/components/MetaTags.svelte

@@ -10,17 +10,17 @@ This file is part of Network Pro.
   export let title;
   export let description;
 
-  import { CONSTANTS } from "$lib";
+  import { CONSTANTS } from '$lib';
 
-  console.log(CONSTANTS.COMPANY_INFO.APP_NAME);
+  //console.log(CONSTANTS.COMPANY_INFO.APP_NAME);
 
   const { COMPANY_INFO, LINKS } = CONSTANTS;
 
   // Static shared values
   const ogUrl = LINKS.HOME;
-  const ogImg = "/img/banner-og-1200x630.png";
+  const ogImg = '/img/banner-og-1200x630.png';
   const companyName = COMPANY_INFO.NAME;
-  const twitterAct = "@NetEng_Pro";
+  const twitterAct = '@NetEng_Pro';
 </script>
 
 <svelte:head>

package/src/lib/components/PWAInstallButton.svelte

@@ -7,8 +7,8 @@ This file is part of Network Pro.
 ========================================================================== -->
 
 <script>
-  import { onMount } from "svelte";
-  import { fade } from "svelte/transition";
+  import { onMount } from 'svelte';
+  import { fade } from 'svelte/transition';
 
   let show = false;
 
@@ -26,10 +26,10 @@ This file is part of Network Pro.
       show = true;
     }
 
-    window.addEventListener("pwa-install-available", handleInstallPrompt);
+    window.addEventListener('pwa-install-available', handleInstallPrompt);
 
     return () => {
-      window.removeEventListener("pwa-install-available", handleInstallPrompt);
+      window.removeEventListener('pwa-install-available', handleInstallPrompt);
     };
   });
 

package/src/lib/components/RedirectPage.svelte

@@ -7,19 +7,19 @@ This file is part of Network Pro.
 ========================================================================== -->
 
 <script>
-  import { onMount } from "svelte";
-  import FullWidthSection from "$lib/components/FullWidthSection.svelte";
+  import { onMount } from 'svelte';
+  import FullWidthSection from '$lib/components/FullWidthSection.svelte';
 
   export let to;
   export let delay = 3;
 
   onMount(() => {
     if (!to) {
-      console.warn("⛔ No redirect target provided");
+      console.warn('⛔ No redirect target provided');
       return;
     }
 
-    console.log("✅ Starting redirect to:", to);
+    console.log('✅ Starting redirect to:', to);
 
     setTimeout(() => {
       window.location.href = to;

package/src/lib/components/SocialMedia.svelte

@@ -22,30 +22,30 @@ This file is part of Network Pro.
    */
   const socialLinks = [
     {
-      href: "https://instagram.com/netwk_pro",
-      label: "Instagram",
-      iconClass: "fab fa-square-instagram fa-2x",
+      href: 'https://instagram.com/netwk_pro',
+      label: 'Instagram',
+      iconClass: 'fab fa-square-instagram fa-2x',
     },
     {
-      href: "https://facebook.com/neteng.pro",
-      label: "Facebook",
-      iconClass: "fab fa-square-facebook fa-2x",
+      href: 'https://facebook.com/neteng.pro',
+      label: 'Facebook',
+      iconClass: 'fab fa-square-facebook fa-2x',
     },
     {
-      href: "https://linkedin.com/company/netwk-pro",
-      label: "LinkedIn",
-      iconClass: "fab fa-linkedin fa-2x",
+      href: 'https://linkedin.com/company/netwk-pro',
+      label: 'LinkedIn',
+      iconClass: 'fab fa-linkedin fa-2x',
     },
     {
-      href: "https://noc.social/@NetEng_Pro",
-      label: "Mastodon",
-      rel: "me noopener noreferrer", // Special rel attribute for Mastodon
-      iconClass: "fab fa-mastodon fa-2x",
+      href: 'https://noc.social/@NetEng_Pro',
+      label: 'Mastodon',
+      rel: 'me noopener noreferrer', // Special rel attribute for Mastodon
+      iconClass: 'fab fa-mastodon fa-2x',
     },
     {
-      href: "https://github.com/netwk-pro/",
-      label: "GitHub",
-      iconClass: "fab fa-square-github fa-2x",
+      href: 'https://github.com/netwk-pro/',
+      label: 'GitHub',
+      iconClass: 'fab fa-square-github fa-2x',
     },
   ];
 </script>

package/src/lib/components/foss/FossItemContent.svelte

@@ -10,26 +10,24 @@ This file is part of Network Pro.
   /* at-html is sanitized by DOMPurify */
   /* eslint-disable svelte/no-at-html-tags */
 
-  import { onMount } from "svelte";
-  import { sanitizeHtml } from "$lib/utils/purify.js";
-  import FossFeatures from "$lib/components/foss/FossFeatures.svelte";
-  // Import directly from $lib by way of image utility
-  import { obtainiumPng, obtainiumWbp } from "$lib";
-  import { CONSTANTS } from "$lib";
+  import ObtainiumBlock from '$lib/components/foss/ObtainiumBlock.svelte';
+  import FossFeatures from '$lib/components/foss/FossFeatures.svelte';
 
-  console.log(CONSTANTS.COMPANY_INFO.APP_NAME);
+  import { onMount } from 'svelte';
+  import { sanitizeHtml } from '$lib/utils/purify.js';
+  import { obtainiumPng, obtainiumWbp } from '$lib';
 
-  const { PAGE, NAV } = CONSTANTS;
+  import { CONSTANTS } from '$lib';
+
+  //console.log(CONSTANTS.COMPANY_INFO.APP_NAME);
 
-  /** @type {string} */
-  const obtainiumLink =
-    "https://apps.obtainium.imranr.dev/redirect.html?r=obtainium://app/%7B%22id%22%3A%22fe.linksheet.nightly%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2FLinkSheet%2Fnightly%22%2C%22author%22%3A%221fexd%22%2C%22name%22%3A%22LinkSheet%20Nightly%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Atrue%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22filterReleaseNotesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22verifyLatestTag%5C%22%3Afalse%2C%5C%22dontSortReleasesList%5C%22%3Afalse%2C%5C%22useLatestAssetDateAsReleaseDate%5C%22%3Afalse%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Afalse%2C%5C%22releaseDateAsVersion%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22LinkSheet.Nightly%5C%22%2C%5C%22invertAPKFilter%5C%22%3Atrue%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22Restore%20link%20control%20on%20Android%2012%2B%5C%22%7D%22%7D";
+  const { PAGE, NAV } = CONSTANTS;
 
   /** @type {"async"} */
-  const decoding = "async";
+  const decoding = 'async';
 
   /** @type {"lazy"} */
-  const loading = "lazy";
+  const loading = 'lazy';
 
   /// <reference path="$lib/types/fossTypes.js" />
 
@@ -43,8 +41,8 @@ This file is part of Network Pro.
    */
   export let isFirst = false;
 
-  let safeHeadlineDescription = "";
-  let safeDetailsDescription = "";
+  let safeHeadlineDescription = '';
+  let safeDetailsDescription = '';
   /** @type {string[]} */
   let safeNotes = [];
 
@@ -66,12 +64,12 @@ This file is part of Network Pro.
             <picture>
               <source srcset={fossItem.images.webp} type="image/webp" />
               <img
-                decoding={isFirst ? "sync" : decoding}
-                loading={isFirst ? "eager" : loading}
-                fetchpriority={isFirst ? "high" : "auto"}
+                decoding={isFirst ? 'sync' : decoding}
+                loading={isFirst ? 'eager' : loading}
+                fetchpriority={isFirst ? 'high' : 'auto'}
                 src={fossItem.images.png}
                 alt={fossItem.imgAlt}
-                style="width: 50px; height: 50px" />
+                class="obtainium-icon" />
             </picture>
           </td>
           <td class="foss-cell">
@@ -105,49 +103,20 @@ This file is part of Network Pro.
 
   &nbsp;
 
-  <div class="linksheet">
+  <div class="obtainium">
     <!-- Special handling for LinkSheet's Obtainium link -->
-    {#if fossItem.id === "linksheet"}
-      <div class="linksheet-entry">
-        <a rel={PAGE.REL} href={obtainiumLink} target={PAGE.BLANK}>
-          <picture>
-            <source srcset={obtainiumWbp} type="image/webp" />
-            <img
-              decoding={isFirst ? "sync" : decoding}
-              loading={isFirst ? "eager" : loading}
-              fetchpriority={isFirst ? "high" : "auto"}
-              src={obtainiumPng}
-              alt="Obtainium"
-              style="width: 207px; height: 80px" />
-          </picture>
-        </a>
-        <p>
-          <span style="color: #ffc627"
-            ><i class="fas fa-file-arrow-down" style="margin-left: 8px;"></i
-            ></span>
-          <a
-            href="/bin/linksheet.json"
-            type="application/json"
-            download
-            style="margin-left: 8px;"
-            target={PAGE.BLANK}>
-            Obtainium App Config
-          </a>
-        </p>
-      </div>
+    {#if fossItem.obtainium}
+      <ObtainiumBlock obtainium={fossItem.obtainium} {isFirst} />
     {/if}
 
     <!-- Other links -->
-    {#each fossItem.links as { label, href, imgAlt, downloadText, downloadHref, hideLabels }, i}
-      <!-- Skip the first link for LinkSheet since we already handled it separately -->
-      {#if !(fossItem.id === "linksheet" && i === 0)}
-        <div class="linksheet-entry">
-          {#if !hideLabels && label && href}
-            <strong>{label}:</strong>
-            <a rel={PAGE.REL} {href} target={PAGE.BLANK}>{href}</a>
-          {/if}
-        </div>
-      {/if}
+    {#each fossItem.links as { label, href, imgAlt, downloadText, downloadHref }, i}
+      <div class="linksheet-entry">
+        {#if label && href}
+          <strong>{label}:</strong>
+          <a rel={PAGE.REL} {href} target={PAGE.BLANK}>{href}</a>
+        {/if}
+      </div>
     {/each}
   </div>
 

package/src/lib/components/foss/ObtainiumBlock.svelte

@@ -0,0 +1,64 @@
+<!-- ==========================================================================
+src/lib/components/foss/ObtainiumBlock.svelte
+
+Copyright © 2025 Network Pro Strategies (Network Pro™)
+SPDX-License-Identifier: CC-BY-4.0 OR GPL-3.0-or-later
+This file is part of Network Pro.
+========================================================================== -->
+
+<!-- Encapsulated UI block for Obtainium deep-link + manual config download. -->
+
+<script>
+  /// <reference path="$lib/types/fossTypes.js" />
+  /** @type {{ href: string; download: string; label: string; isFirst?: boolean }} */
+  export let obtainium;
+  export let isFirst = false;
+
+  import { obtainiumPng, obtainiumWbp } from '$lib';
+  import { CONSTANTS } from '$lib';
+
+  const { PAGE } = CONSTANTS;
+
+  /** @type {"async"} */
+  const decoding = 'async';
+
+  /** @type {"lazy"} */
+  const loading = 'lazy';
+</script>
+
+<div class="linksheet-entry">
+  <p class="obtainium-direct-label">Open directly in Obtainium:</p>
+
+  <a
+    rel={PAGE.REL}
+    href={obtainium.href}
+    target={PAGE.BLANK}
+    aria-label="Open this app in Obtainium">
+    <picture>
+      <source srcset={obtainiumWbp} type="image/webp" />
+      <img
+        decoding={isFirst ? 'sync' : decoding}
+        loading={isFirst ? 'eager' : loading}
+        fetchpriority={isFirst ? 'high' : 'auto'}
+        src={obtainiumPng}
+        alt="Obtainium"
+        class="obtainium-img" />
+    </picture>
+  </a>
+
+  <p class="obtainium-manual-label">Download and import manually:</p>
+
+  <p>
+    <span class="obtainium-fa-down">
+      <i class="fas fa-file-arrow-down"></i>
+    </span>
+    <a
+      href={obtainium.download}
+      type="application/json"
+      download
+      class="obtainium-margin"
+      target={PAGE.BLANK}>
+      {obtainium.label}
+    </a>
+  </p>
+</div>

package/src/lib/components/layout/Footer.svelte

@@ -9,15 +9,15 @@ This file is part of Network Pro.
 <!-- cspell:ignore ccby gnugpl -->
 
 <script>
-  import { base } from "$app/paths";
+  import { base } from '$app/paths';
   // Import icons for licenses
-  import { bySvg, ccSvg } from "$lib";
-  import { CONSTANTS } from "$lib";
+  import { bySvg, ccSvg } from '$lib';
+  import { CONSTANTS } from '$lib';
 
   // Log the base path to verify its value
   //console.log("Base path:", base);
 
-  console.log(CONSTANTS.COMPANY_INFO.APP_NAME);
+  //console.log(CONSTANTS.COMPANY_INFO.APP_NAME);
 
   const { COMPANY_INFO, CONTACT, PAGE, NAV } = CONSTANTS;
 
@@ -27,10 +27,10 @@ This file is part of Network Pro.
   const trademarkLink = `${base}/license#trademark`;
 
   /** @type {string} */
-  const creatorUrl = "https://netwk.pro";
+  const creatorUrl = 'https://netwk.pro';
 
   /** @type {string} */
-  const creatorSlogan = "Locking Down Networks...";
+  const creatorSlogan = 'Locking Down Networks...';
 
   /**
    * Icon used in a license object.
@@ -51,25 +51,25 @@ This file is part of Network Pro.
 
   const licenses = [
     {
-      type: "CC BY 4.0",
+      type: 'CC BY 4.0',
       url: ccbyLink,
-      externalUrl: "https://creativecommons.org/licenses/by/4.0/",
+      externalUrl: 'https://creativecommons.org/licenses/by/4.0/',
       icons: [
         {
           src: ccSvg,
-          alt: "Creative Commons BY",
+          alt: 'Creative Commons BY',
         },
         {
           src: bySvg,
-          alt: "Creative Commons BY",
+          alt: 'Creative Commons BY',
         },
       ],
     },
     {
-      type: "GNU GPL",
+      type: 'GNU GPL',
       url: gnugplLink,
-      externalUrl: "https://fsf.org",
-      description: "Free Software Foundation",
+      externalUrl: 'https://fsf.org',
+      description: 'Free Software Foundation',
     },
   ];
 
@@ -78,15 +78,15 @@ This file is part of Network Pro.
    * @type {Object}
    */
   const namespaceAttributes = {
-    "xmlns:cc": "http://creativecommons.org/ns#",
-    "xmlns:dct": "http://purl.org/dc/terms/",
+    'xmlns:cc': 'http://creativecommons.org/ns#',
+    'xmlns:dct': 'http://purl.org/dc/terms/',
   };
 
   /**
    * Relation attributes for license links.
    * @type {string}
    */
-  const relLicense = "license noopener noreferrer";
+  const relLicense = 'license noopener noreferrer';
 </script>
 
 <!-- BEGIN FOOTER -->
@@ -116,7 +116,7 @@ This file is part of Network Pro.
   <p>
     Licensed under
     {#each licenses as license, index}
-      {#if license.type === "CC BY 4.0"}
+      {#if license.type === 'CC BY 4.0'}
         <a
           href={license.url}
           target={PAGE.SELF}
@@ -155,7 +155,7 @@ This file is part of Network Pro.
         >, either version 3 of the License or (at your option) any later
         version.
       {/if}
-      {index < licenses.length - 1 ? " and the " : ""}
+      {index < licenses.length - 1 ? ' and the ' : ''}
     {/each}
   </p>
 </div>

package/src/lib/components/layout/HeaderDefault.svelte

@@ -7,15 +7,15 @@ This file is part of Network Pro.
 ========================================================================== -->
 
 <script>
-  import { base } from "$app/paths";
+  import { base } from '$app/paths';
 
   // Log the base path to verify its value
   //console.log("Base path:", base);
 
-  const homeLink = base || "/";
+  const homeLink = base || '/';
   const aboutLink = `${base}/about`;
   const fossLink = `${base}/foss-spotlight`;
-  const blogLink = "https://blog.netwk.pro";
+  const blogLink = 'https://blog.netwk.pro';
 
   /**
    * Navigation link object.
@@ -31,25 +31,25 @@ This file is part of Network Pro.
    * @type {NavItem[]}
    */
   const nav = [
-    { label: "home", href: homeLink, target: "_self", external: false },
-    { label: "about", href: aboutLink, target: "_self", external: false },
-    { label: "foss", href: fossLink, target: "_self", external: false },
+    { label: 'home', href: homeLink, target: '_self', external: false },
+    { label: 'about', href: aboutLink, target: '_self', external: false },
+    { label: 'foss', href: fossLink, target: '_self', external: false },
     {
-      label: "blog",
+      label: 'blog',
       href: blogLink,
-      target: "_self",
+      target: '_self',
       external: false,
     },
     {
-      label: "discussions",
-      href: "https://github.com/netwk-pro/netwk-pro.github.io/discussions",
-      target: "_blank",
+      label: 'discussions',
+      href: 'https://github.com/netwk-pro/netwk-pro.github.io/discussions',
+      target: '_blank',
       external: true,
     },
     {
-      label: "link hub",
-      href: "https://linktr.ee/neteng_pro",
-      target: "_blank",
+      label: 'link hub',
+      href: 'https://linktr.ee/neteng_pro',
+      target: '_blank',
       external: true,
     },
   ];
@@ -58,7 +58,7 @@ This file is part of Network Pro.
    * Relation attribute for external links.
    * @type {string}
    */
-  const rel = "noopener noreferrer";
+  const rel = 'noopener noreferrer';
 </script>
 
 <!-- BEGIN DEFAULT HEADER -->
@@ -76,7 +76,7 @@ This file is part of Network Pro.
     {/if}
     <!-- Separator logic -->
     {#if index < nav.length - 1}
-      {#if label === "blog"}
+      {#if label === 'blog'}
         <br />
       {:else}
         <span class="goldseparator">|</span>