@networkpro/web 1.22.2 → 1.24.0

package/src/routes/privacy/+page.svelte

@@ -7,26 +7,15 @@ This file is part of Network Pro.
 ========================================================================== -->
 
 <script>
-  import Badges from '$lib/components/Badges.svelte';
-  import FullWidthSection from '$lib/components/FullWidthSection.svelte';
-  import PrivacyContent from '$lib/pages/PrivacyContent.svelte';
-  import LegalNav from '$lib/components/LegalNav.svelte';
-  import SocialMedia from '$lib/components/SocialMedia.svelte';
-  import MetaTags from '$lib/components/MetaTags.svelte';
-
-  /**
-   * @type {string}
-   * Style class for the div element.
-   */
-  const spaceStyle = 'spacer';
-
-  export let data;
+  import {
+    Badges,
+    FullWidthSection,
+    LegalNav,
+    SocialMedia,
+  } from '$lib/components';
+  import { PrivacyContent } from '$lib/pages';
 </script>
 
-<MetaTags title={data.meta.title} description={data.meta.description} />
-
-<link rel="canonical" href="https://netwk.pro/privacy" />
-
 <section id="privacy">
   <FullWidthSection containerClass="readable">
     <!-- BEGIN PRIVACY POLICY -->
@@ -35,7 +24,7 @@ This file is part of Network Pro.
     </section>
     <!-- END PRIVACY POLICY -->
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN SOCIAL MEDIA -->
     <section id="social-media">
@@ -45,7 +34,7 @@ This file is part of Network Pro.
 
     <hr />
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN LEGAL -->
     <section id="legal-nav">
@@ -53,7 +42,7 @@ This file is part of Network Pro.
     </section>
     <!-- END LEGAL -->
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN BADGES -->
     <section id="badges">

package/src/routes/privacy-dashboard/+page.svelte

@@ -7,32 +7,15 @@ This file is part of Network Pro.
 ========================================================================== -->
 
 <script>
-  import Badges from '$lib/components/Badges.svelte';
-  import FullWidthSection from '$lib/components/FullWidthSection.svelte';
-  import PrivacyDashboard from '$lib/pages/PrivacyDashboard.svelte';
-  import LegalNav from '$lib/components/LegalNav.svelte';
-  import SocialMedia from '$lib/components/SocialMedia.svelte';
-  import MetaTags from '$lib/components/MetaTags.svelte';
-
-  /**
-   * @type {string}
-   * Style class for the horizontal rule element.
-   */
-  const hrStyle = 'hr-styled';
-
-  /**
-   * @type {string}
-   * Style class for the div element.
-   */
-  const spaceStyle = 'spacer';
-
-  export let data;
+  import {
+    Badges,
+    FullWidthSection,
+    LegalNav,
+    SocialMedia,
+  } from '$lib/components';
+  import { PrivacyDashboard } from '$lib/pages';
 </script>
 
-<MetaTags title={data.meta.title} description={data.meta.description} />
-
-<link rel="canonical" href="https://netwk.pro/privacy-dashboard" />
-
 <section id="privacy">
   <FullWidthSection containerClass="readable">
     <!-- BEGIN PRIVACY DASHBOARD -->
@@ -41,7 +24,7 @@ This file is part of Network Pro.
     </section>
     <!-- END PRIVACY DASHBOARD -->
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN SOCIAL MEDIA -->
     <section id="social-media">
@@ -51,7 +34,7 @@ This file is part of Network Pro.
 
     <hr />
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN LEGAL -->
     <section id="legal-nav">
@@ -59,7 +42,7 @@ This file is part of Network Pro.
     </section>
     <!-- END LEGAL -->
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN BADGES -->
     <section id="badges">

package/src/routes/services/+page.svelte

@@ -12,23 +12,10 @@ This file is part of Network Pro.
     FullWidthSection,
     LegalNav,
     SocialMedia,
-    MetaTags,
   } from '$lib/components';
   import { ServicesContent } from '$lib/pages';
-
-  /**
-   * @type {string}
-   * Style class for the div element.
-   */
-  const spaceStyle = 'spacer';
-
-  export let data;
 </script>
 
-<MetaTags title={data.meta.title} description={data.meta.description} />
-
-<link rel="canonical" href="https://netwk.pro/services" />
-
 <section id="services">
   <FullWidthSection>
     <!-- BEGIN PRIVACY POLICY -->
@@ -37,7 +24,7 @@ This file is part of Network Pro.
     </section>
     <!-- END PRIVACY POLICY -->
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN SOCIAL MEDIA -->
     <section id="social-media">
@@ -47,7 +34,7 @@ This file is part of Network Pro.
 
     <hr />
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN LEGAL -->
     <section id="legal-nav">
@@ -55,7 +42,7 @@ This file is part of Network Pro.
     </section>
     <!-- END LEGAL -->
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN BADGES -->
     <section id="badges">

package/src/routes/terms-conditions/+page.svelte

@@ -7,26 +7,15 @@ This file is part of Network Pro.
 ========================================================================== -->
 
 <script>
-  import Badges from '$lib/components/Badges.svelte';
-  import FullWidthSection from '$lib/components/FullWidthSection.svelte';
-  import TermsConditionsContent from '$lib/pages/TermsConditionsContent.svelte';
-  import LegalNav from '$lib/components/LegalNav.svelte';
-  import SocialMedia from '$lib/components/SocialMedia.svelte';
-  import MetaTags from '$lib/components/MetaTags.svelte';
-
-  /**
-   * @type {string}
-   * Style class for the div element.
-   */
-  const spaceStyle = 'spacer';
-
-  export let data;
+  import {
+    Badges,
+    FullWidthSection,
+    LegalNav,
+    SocialMedia,
+  } from '$lib/components';
+  import { TermsConditionsContent } from '$lib/pages';
 </script>
 
-<MetaTags title={data.meta.title} description={data.meta.description} />
-
-<link rel="canonical" href="https://netwk.pro/terms-conditions" />
-
 <section id="terms-conditions">
   <FullWidthSection containerClass="readable">
     <!-- BEGIN TERMS AND CONDITIONS -->
@@ -35,7 +24,7 @@ This file is part of Network Pro.
     </section>
     <!-- END TERMS AND CONDITIONS -->
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN SOCIAL MEDIA -->
     <section id="social-media">
@@ -45,7 +34,7 @@ This file is part of Network Pro.
 
     <hr />
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN LEGAL -->
     <section id="legal-nav">
@@ -53,7 +42,7 @@ This file is part of Network Pro.
     </section>
     <!-- END LEGAL -->
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN BADGES -->
     <section id="badges">

package/src/routes/terms-of-use/+page.svelte

@@ -7,26 +7,15 @@ This file is part of Network Pro.
 ========================================================================== -->
 
 <script>
-  import Badges from '$lib/components/Badges.svelte';
-  import FullWidthSection from '$lib/components/FullWidthSection.svelte';
-  import TermsUseContent from '$lib/pages/TermsUseContent.svelte';
-  import LegalNav from '$lib/components/LegalNav.svelte';
-  import SocialMedia from '$lib/components/SocialMedia.svelte';
-  import MetaTags from '$lib/components/MetaTags.svelte';
-
-  /**
-   * @type {string}
-   * Style class for the div element.
-   */
-  const spaceStyle = 'spacer';
-
-  export let data;
+  import {
+    Badges,
+    FullWidthSection,
+    LegalNav,
+    SocialMedia,
+  } from '$lib/components';
+  import { TermsUseContent } from '$lib/pages';
 </script>
 
-<MetaTags title={data.meta.title} description={data.meta.description} />
-
-<link rel="canonical" href="https://netwk.pro/terms-of-use" />
-
 <section id="terms-of-use">
   <FullWidthSection containerClass="readable">
     <!-- BEGIN TERMS OF USE -->
@@ -35,7 +24,7 @@ This file is part of Network Pro.
     </section>
     <!-- END TERMS OF USE -->
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN SOCIAL MEDIA -->
     <section id="social-media">
@@ -45,7 +34,7 @@ This file is part of Network Pro.
 
     <hr />
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN LEGAL -->
     <section id="legal-nav">
@@ -53,7 +42,7 @@ This file is part of Network Pro.
     </section>
     <!-- END LEGAL -->
 
-    <div class={spaceStyle}></div>
+    <div class="spacer"></div>
 
     <!-- BEGIN BADGES -->
     <section id="badges">

package/static/sitemap.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Sitemap last updated 2025-10-20 -->
+<!-- Sitemap last updated 2025-10-30 -->
 
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 
@@ -7,7 +7,7 @@
 
     <loc>https://netwk.pro</loc>
 
-    <lastmod>2025-10-20</lastmod>
+    <lastmod>2025-10-30</lastmod>
 
     <changefreq>weekly</changefreq>
 
@@ -19,7 +19,7 @@
 
     <loc>https://netwk.pro/services</loc>
 
-    <lastmod>2025-10-20</lastmod>
+    <lastmod>2025-10-30</lastmod>
 
     <changefreq>monthly</changefreq>
 
@@ -29,9 +29,9 @@
 
   <url>
 
-    <loc>https://netwk.pro/foss-spotlight</loc>
+    <loc>https://netwk.pro/foss</loc>
 
-    <lastmod>2025-07-20</lastmod>
+    <lastmod>2025-10-30</lastmod>
 
     <changefreq>monthly</changefreq>
 
@@ -43,7 +43,7 @@
 
     <loc>https://netwk.pro/about</loc>
 
-    <lastmod>2025-10-20</lastmod>
+    <lastmod>2025-10-30</lastmod>
 
     <changefreq>monthly</changefreq>
 
@@ -55,7 +55,7 @@
 
     <loc>https://netwk.pro/privacy-dashboard</loc>
 
-    <lastmod>2025-06-30</lastmod>
+    <lastmod>2025-10-30</lastmod>
 
     <changefreq>monthly</changefreq>
 
@@ -67,7 +67,7 @@
 
     <loc>https://netwk.pro/privacy</loc>
 
-    <lastmod>2025-10-17</lastmod>
+    <lastmod>2025-10-30</lastmod>
 
     <changefreq>monthly</changefreq>
 
@@ -77,9 +77,9 @@
 
   <url>
 
-    <loc>https://netwk.pro/license</loc>
+    <loc>https://netwk.pro/legal</loc>
 
-    <lastmod>2025-10-09</lastmod>
+    <lastmod>2025-10-30</lastmod>
 
     <changefreq>monthly</changefreq>
 
@@ -91,7 +91,7 @@
 
     <loc>https://netwk.pro/terms-of-use</loc>
 
-    <lastmod>2025-05-27</lastmod>
+    <lastmod>2025-10-30</lastmod>
 
     <changefreq>monthly</changefreq>
 
@@ -103,7 +103,7 @@
 
     <loc>https://netwk.pro/terms-conditions</loc>
 
-    <lastmod>2025-06-10</lastmod>
+    <lastmod>2025-10-30</lastmod>
 
     <changefreq>monthly</changefreq>
 
@@ -115,7 +115,7 @@
 
     <loc>https://netwk.pro/pgp</loc>
 
-    <lastmod>2025-10-20</lastmod>
+    <lastmod>2025-10-30</lastmod>
 
     <changefreq>monthly</changefreq>
 

package/tests/e2e/mobile.spec.js

@@ -15,12 +15,24 @@ This file is part of Network Pro.
  */
 
 import { expect, test } from '@playwright/test';
-import { getFooter, getVisibleNav, setMobileView } from './shared/helpers.js';
+import {
+  clickAndWaitForNavigation,
+  getFooter,
+  getVisibleNav,
+  setMobileView,
+} from './shared/helpers.js';
+
+// ---------------------------------------------------------------------------
+// 📱 Mobile viewport smoke tests
+// ---------------------------------------------------------------------------
 
-// Mobile viewport smoke tests for the root route
 test.describe('Mobile Tests', () => {
-  test.setTimeout(90_000); // increase timeout for all desktop tests
+  // Increase timeout for all mobile tests
+  test.setTimeout(90_000);
 
+  // -------------------------------------------------------------------------
+  // 🧱 Test 1: Main description text
+  // -------------------------------------------------------------------------
   test('should display the main description text on mobile', async ({
     page,
     browserName,
@@ -29,7 +41,7 @@ test.describe('Mobile Tests', () => {
 
     await setMobileView(page);
     await page.goto('/');
-    await page.waitForLoadState('domcontentloaded', { timeout: 60000 });
+    await page.waitForLoadState('domcontentloaded', { timeout: 60_000 });
 
     const description = page.locator(
       'div.index-title1:has-text("Locking Down Networks")',
@@ -37,6 +49,9 @@ test.describe('Mobile Tests', () => {
     await expect(description).toBeVisible();
   });
 
+  // -------------------------------------------------------------------------
+  // 🧱 Test 2: Main content
+  // -------------------------------------------------------------------------
   test('should display main content correctly on mobile', async ({
     page,
     browserName,
@@ -45,12 +60,15 @@ test.describe('Mobile Tests', () => {
 
     await setMobileView(page);
     await page.goto('/');
-    await page.waitForLoadState('domcontentloaded', { timeout: 60000 });
+    await page.waitForLoadState('domcontentloaded', { timeout: 60_000 });
 
     const mainHeading = page.locator('h1, h2');
     await expect(mainHeading).toBeVisible();
   });
 
+  // -------------------------------------------------------------------------
+  // 🧱 Test 3: "About" link navigation
+  // -------------------------------------------------------------------------
   test("should ensure the 'about' link is clickable on mobile", async ({
     page,
     browserName,
@@ -58,23 +76,24 @@ test.describe('Mobile Tests', () => {
     if (browserName === 'webkit') test.skip();
 
     await setMobileView(page);
-    await page.goto('/');
-    await page.waitForLoadState('domcontentloaded', { timeout: 60000 });
+    await page.goto('/', { waitUntil: 'networkidle' });
 
     const nav = await getVisibleNav(page);
-    const aboutLink = nav.getByRole('link', { name: 'about' });
-    await expect(aboutLink).toBeVisible();
 
-    // combine click + wait in a Promise.all to ensure navigation completes
-    await Promise.all([
-      page.waitForLoadState('load'),
-      page.waitForURL('**/about', { timeout: 60000 }),
-      aboutLink.click(),
-    ]);
+    // Ensure the link exists before interacting
+    await page.waitForSelector('a[href="/about"]', { timeout: 10_000 });
+    const aboutLink = nav.getByRole('link', { name: 'about' });
 
-    await expect(page).toHaveURL(/\/about/);
+    // Use the safe navigation helper
+    await clickAndWaitForNavigation(page, aboutLink, {
+      urlPattern: /\/about/,
+      timeout: 60_000,
+    });
   });
 
+  // -------------------------------------------------------------------------
+  // 🧱 Test 4: Footer presence on /about
+  // -------------------------------------------------------------------------
   test('should display the footer on /about (mobile)', async ({
     page,
     browserName,
@@ -89,4 +108,4 @@ test.describe('Mobile Tests', () => {
   });
 });
 
-// cspell:ignore domcontentloaded
+// cspell:ignore domcontentloaded networkidle

package/tests/e2e/shared/helpers.js

@@ -11,9 +11,11 @@ This file is part of Network Pro.
  * @description Stores commonly used functions for importing into E2E tests.
  * @module tests/e2e/shared
  * @author Scott Lopez
- * @updated 2025-05-29
+ * @updated 2025-10-29
  */
 
+import { expect } from '@playwright/test';
+
 /**
  * @param {import('@playwright/test').Page} page - The Playwright page object.
  * @returns {Promise<void>}
@@ -55,3 +57,39 @@ export async function getVisibleNav(page) {
 export function getFooter(page) {
   return page.locator('footer');
 }
+
+/**
+ * @function clickAndWaitForNavigation
+ * @description Clicks a link or button and waits for navigation or URL change.
+ * Works for both SPA (client-side) and full-page navigations.
+ *
+ * @param {import('@playwright/test').Page} page
+ * @param {import('@playwright/test').Locator} locator
+ * @param {object} [options]
+ * @param {string|RegExp} [options.urlPattern] - URL or regex to match
+ * @param {number} [options.timeout=60000] - Max wait time
+ */
+export async function clickAndWaitForNavigation(page, locator, options = {}) {
+  const { urlPattern = /\/.*/, timeout = 60000 } = options;
+
+  // Ensure the element is ready for interaction
+  await locator.scrollIntoViewIfNeeded();
+  await locator.waitFor({ state: 'visible', timeout: 10000 });
+  await locator.click({ trial: true });
+
+  // Capture current URL to detect SPA navigation
+  const currentUrl = page.url();
+
+  // Handle both SPA transitions and full page reloads
+  await Promise.all([
+    page.waitForURL(urlPattern, { timeout }).catch(() => {}),
+    page.waitForLoadState('load', { timeout }).catch(() => {}),
+    locator.click(),
+  ]);
+
+  // Confirm the URL changed successfully
+  await expect(page).toHaveURL(urlPattern, { timeout });
+
+  // Optional: log navigation success (helps in CI)
+  console.log(`✅ Navigation from ${currentUrl} → ${page.url()}`);
+}

package/tests/meta/meta.test.js

@@ -21,7 +21,7 @@ const routes = [
   {
     path: '/',
     title: /Security, Networking, Privacy/,
-    description: /Network Pro/,
+    description: /Locking Down Networks/,
   },
   // add more paths as needed:
   // { path: '/about', title: /About/, description: /Network Pro/ }

package/tests/unit/server/meta.test.js

@@ -25,6 +25,6 @@ describe('Meta info', () => {
     const { meta } = load({ url: mockUrl });
 
     expect(meta.title).toMatch(/Security, Networking, Privacy/);
-    expect(meta.description).toMatch(/Network Pro/);
+    expect(meta.description).toMatch(/Locking Down Networks/);
   });
 });

package/vercel.json

@@ -13,23 +13,23 @@
       "permanent": true
     },
     {
-      "source": "/legal",
-      "destination": "/license",
+      "source": "/license",
+      "destination": "/legal",
       "permanent": true
     },
     {
-      "source": "/legal/:path*",
-      "destination": "/license/:path*",
+      "source": "/license/:path*",
+      "destination": "/legal/:path*",
       "permanent": true
     },
     {
-      "source": "/foss",
-      "destination": "/foss-spotlight",
+      "source": "/foss-spotlight",
+      "destination": "/foss",
       "permanent": true
     },
     {
-      "source": "/foss/:path*",
-      "destination": "/foss-spotlight/:path*",
+      "source": "/foss-spotlight/:path*",
+      "destination": "/foss/:path*",
       "permanent": true
     }
   ],