Bump @astrojs/mdx from 3.0.1 to 3.1.0

.github/dependabot.yml

@@ -9,3 +9,16 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "monthly"
+    assignees:
+      - "alexandzors"
+    open-pull-requests-limit: 5
+    target-branch: "dev"
+
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "monthly"
+    reviewers:
+      - "alexandzors"
+    open-pull-requests-limit: 5
+    target-branch: "dev"

.github/workflows/ci.yml

@@ -35,13 +35,6 @@ jobs:
           sed -i -e 's#{GA-ID}#'${{ secrets.GOOGLE_ANALYTICS_ID }}'#g' ./src/layouts/DefaultLayout.astro
           npm install
           npm run build
-
-      - name: test production site
-        uses: chabad360/htmlproofer@master
-        id: testing
-        with:
-          directory: "./dist/"
-          arguments: --disable-external --checks --allow-hash-href --ignore_urls "/^http:\/\/127.0.0.1/,/^http:\/\/0.0.0.0/,/^http:\/\/localhost/"
 
       - name: Setup SSH
         id: ssh-setup
@@ -108,12 +101,28 @@ jobs:
           npm install
           npm run build
 
-      - name: test production site
+      - name: htmlproofer test
         uses: chabad360/htmlproofer@master
-        id: testing
+        id: html-testing
         with:
           directory: "./dist/"
           arguments: --disable-external --checks --allow-hash-href --ignore_urls "/^http:\/\/127.0.0.1/,/^http:\/\/0.0.0.0/,/^http:\/\/localhost/"
+
+      - name: psi mobile test
+        uses: stefafafan/psi-action@v1
+        id: psi-m-testing
+        with:
+          url: "https://dev.alexsguardian.net"
+          strategy: mobile
+          key: ${{ secrets.PS_KEY }}
+
+      - name: psi desktop test
+        uses: stefafafan/psi-action@v1
+        id: psi-d-testing
+        with:
+          url: "https://dev.alexsguardian.net"
+          strategy: desktop
+          key: ${{ secrets.PS_KEY }}
 
       - name: Setup SSH
         id: ssh-setup

BRANDING.md

@@ -2,3 +2,28 @@
 
 ## Color Palette
 
+**Website Hex**
+- Primary: #6389C6
+- Secondary: #D6E5E3
+
+[Coolors Link](https://coolors.co/6389c6-d6e5e3)
+
+**Website HSL**
+```scss
+(
+  primary: (
+    100: hsl(216, 46%, 58%),
+    200: hsl(216, 46%, 43%),
+    300: hsl(216, 46%, 29%),
+    400: hsl(216, 46%, 14%),
+    500: hsl(0, 0%, 0%),
+  ),
+  secondary: (
+    100: hsl(216, 46%, 86%),
+    200: hsl(216, 46%, 79%),
+    300: hsl(216, 46%, 72%),
+    400: hsl(216, 46%, 65%),
+    500: hsl(216, 46%, 58%),
+  )
+)
+```

package.json

@@ -11,7 +11,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "@astrojs/mdx": "^3.0.1",
+    "@astrojs/mdx": "^3.1.0",
     "@astrojs/partytown": "^2.1.0",
     "@astrojs/tailwind": "^5.0.4",
     "@iconify-json/ion": "^1.1.15",

src/components/Header.astro

@@ -35,11 +35,9 @@ import { Icon } from 'astro-icon/components'
           <a href="/support/">Support</a>
         </li>
          -->
-        <!-- Add back once the privacy policy page is complete.   
         <li class="menu-item">
           <a href="/privacy/">Privacy Policy</a>
         </li>
-         -->
       </ul>
     </li>
     <li class="menu-item type-icon">

src/components/Hero.astro

@@ -15,7 +15,7 @@ const { src = '/hero.webp' } = Astro.props
           <slot>Transparent IT, No Surprises.</slot>
         </h3>
         <div class="flex flex-col gap-3 min-[500px]:flex-row">
-          <a class="button has-icon" href="mailto:info@alexsguardian.net">
+          <a class="button has-icon color-secondary" href="mailto:info@alexsguardian.net">
             <Icon name="ion:email" />
             Contact Us
           </a>
@@ -28,7 +28,7 @@ const { src = '/hero.webp' } = Astro.props
           </a> -->
         </div>
       </div>
-      <img class="hidden lg:block" src={src} alt="" decoding="async" />
+      <img class="hidden lg:block" src={src} alt="Laptop on a desk with a toolbag next to it" decoding="async" loading="lazy" height="743" width="710"/>
     </div>
   </div>
 </section>

src/layouts/DefaultLayout.astro

@@ -7,28 +7,13 @@ import Footer from '../components/Footer.astro'
 
 const {
   title = "Alex's Guardian",
-  description = "Alex's Guardian is an IT consulting & servicing company based out of Lancaster County, PA.",
+  description = "Alex's Guardian is an IT consulting & servicing company that specializes in mostly local end users and small businesses.Alex's Guardian is based out of Manheim, PA",
   url,
   image = '/social-preview-image.png',
   author = 'Alexander Henderson',
 } = Astro.props
 ---
 
-<!-- head -->
-<script
-  type="text/partytown"
-  src="https://www.googletagmanager.com/gtag/js?id={GA-ID}">
-</script>
-<script type="text/partytown">
-  window.dataLayer = window.dataLayer || [];
-  function gtag() {
-    dataLayer.push(arguments);
-  }
-  gtag("js", new Date());
-  gtag("config", "{GA-ID}");
-</script>
-<!-- more head -->
-
 <html lang="en" dir="ltr">
   <head>
     <meta charset="utf-8" />
@@ -47,6 +32,21 @@ const {
       image={image}
       author={author}
     />
+
+    <!-- Start Google Analytics Script -->
+    <script
+      type="text/partytown"
+      src="https://www.googletagmanager.com/gtag/js?id={GA-ID}">
+    </script>
+    <script type="text/partytown">
+      window.dataLayer = window.dataLayer || [];
+      function gtag() {
+        dataLayer.push(arguments);
+      }
+      gtag("js", new Date());
+      gtag("config", "{GA-ID}");
+    </script>
+    <!-- End Google Analytics Script -->
   </head>
   <body>
     <Header />

src/pages/about.astro

@@ -9,7 +9,7 @@ import ContentMedia from '../components/ContentMedia.astro'
         <div id="center">
             <h1>About</h1>
             <p>
-                Alex's Guardian was started in 2015 by Alexander Henderson with the goal to make Infromation Technology (IT) work easier and transparent. IT work should never be complicated, or hidden behind bogus fees, for end users & businesses. You want someone to put YOU before profit.
+                Alex's Guardian was started in 2015 by Alexander Henderson with the goal to make Information Technology (IT) work easier and transparent. IT work should never be complicated, or hidden behind bogus fees, for end users & businesses. You want someone to put YOU before profit.
             </p>
         </div>
         <div>

src/pages/privacy.astro

@@ -4,4 +4,76 @@ import DefaultLayout from '../layouts/DefaultLayout.astro'
 
 <!-- TODO: Add privacy policy to this page -->
 <DefaultLayout>
+    <section class="container">
+        <div id="spacing">
+            <h1 style="display: flex; justify-content: center; margin-bottom: 2rem;">Privacy Policy</h1>
+            <h2>Introduction</h2>
+            <p>Welcome to Alex's Guardian. We value your privacy and are committed to protecting your personal information. This Privacy Policy outlines how we collect, use, and safeguard your information when you visit our website, including our blog subdomain, or use our services.</p>
+            <br>
+            <h2>Information We Collect</h2>
+            <p>We collect the following information to provide and improve our services:</p>
+            <ul>
+                <li><strong>Personal Information</strong>: Names, Email addresses, Phone numbers, and Voicemails.</li>
+                <li><strong>Usage Data</strong>: Information on how you interact with our website and blog, collected through Google Analytics for site performance and improvement.</li>
+            </ul>
+            <p>Additionally, "Alex's Blog" uses the following third-party service:</p>
+            <ul>
+                <li><strong>Giscus</strong>: Alex's Blog comments are managed through Giscus, which uses GitHub Discussions as the backend. Comments are associated with your public GitHub account. For more information on how GitHub handles your personal information, please refer to the <a href="https://docs.github.com/en/site-policy/privacy-policies/github-privacy-statement" target="_blank">GitHub Privacy Policy</a>.</li>
+            </ul>
+            <br>
+            <h2>How We Use Your Information</h2>
+            <p>The information we collect is used in the following ways:</p>
+            <ul>
+                <li><strong>To Provide and Improve Services</strong>: Your personal information is used to deliver our services, including invoicing and communication.</li>
+                <li><strong>Analytics</strong>: Usage data collected via Google Analytics helps us understand how our website and blog are used, allowing us to enhance user experience and content quality.</li>
+                <li><strong>Comments</strong>: Comments made through Giscus are publicly displayed and associated with your GitHub account.</li>
+            </ul>
+            <br>
+            <h2>Data Storage and Security</h2>
+            <p>Your personal information is stored in our internal encrypted database, used exclusively by our invoicing software. We take appropriate security measures to protect against unauthorized access, alteration, disclosure, or destruction of your personal information.</p>
+            <p>Information collected by third-party services is managed according to their respective privacy policies.</p>
+            <br>
+            <h2>Sharing Your Information</h2>
+            <p>We do not share your personal information with third parties except:</p>
+            <ul>
+                <li><strong>With your consent</strong>: We may share your information with third parties if you have given us explicit consent to do so.</li>
+                <li><strong>For legal reasons</strong>: We may disclose your information if required by law or to protect our rights and safety.</li>
+            </ul>
+            <br>
+            <h2>Your Choices</h2>
+            <p>You have the following rights regarding your personal information:</p>
+            <ul>
+                <li><strong>Access</strong>: You can request access to the personal information we hold about you.</li>
+                <li><strong>Correction</strong>: You can request correction of any inaccurate personal information we hold about you.</li>
+                <li><strong>Deletion</strong>: You can request the deletion of your personal information, subject to legal and contractual obligations.</li>
+            </ul>
+            <br>
+            <h2>Cookies</h2>
+            <p>Our website and blog use cookies to enhance your browsing experience. Cookies are small data files placed on your device to help us understand how you use our site and improve our services.</p>
+            <br>
+            <h2>Google Analytics</h2>
+            <p>We use Google Analytics to collect information about your use of our website and blog. Google Analytics collects information such as your IP address, browser type, referring/exit pages, and the dates/times of visits. This information helps us analyze website traffic and improve our services. Google Analytics operates independently and has its own privacy policy, which we encourage you to review.</p>
+            <br>
+            <h2>Changes to This Privacy Policy</h2>
+            <p>We may update this Privacy Policy from time to time. We will notify you of any changes by posting the new Privacy Policy on our website. You are advised to review this Privacy Policy periodically for any changes.</p>
+            <br>
+            <h2>Contact Us</h2>
+            <p>If you have any questions or concerns about this Privacy Policy, please contact us at:</p>
+            <ul>
+                <li><strong>Email</strong>: info@alexsguardian.net</li>
+                <li><strong>Phone</strong>: +1 717-573-0627</li>
+            </ul>
+            <p>Thank you for trusting Alex's Guardian with your personal information. We are committed to protecting your privacy and ensuring a safe and secure experience.</p>
+        </div>
+    </section>
+    <style>
+        #spacing {
+            p {
+                margin-bottom: 0.5rem;
+            }
+            h2 {
+                margin-bottom: 0.2rem;
+            }
+        }
+    </style>
 </DefaultLayout>