From 9e2b5657021d69a03add9b546fc81d23627af13e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 06:32:21 +0000 Subject: [PATCH 1/8] Bump @astrojs/mdx from 3.0.1 to 3.1.0 Bumps [@astrojs/mdx](https://github.com/withastro/astro/tree/HEAD/packages/integrations/mdx) from 3.0.1 to 3.1.0. - [Release notes](https://github.com/withastro/astro/releases) - [Changelog](https://github.com/withastro/astro/blob/main/packages/integrations/mdx/CHANGELOG.md) - [Commits](https://github.com/withastro/astro/commits/@astrojs/mdx@3.1.0/packages/integrations/mdx) --- updated-dependencies: - dependency-name: "@astrojs/mdx" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index d8d3245..60c8cd5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "accessible-astro-starter", "version": "3.1.2", "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", @@ -223,15 +223,15 @@ } }, "node_modules/@astrojs/mdx": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-3.0.1.tgz", - "integrity": "sha512-UcPja14Qt6OEm7Wjak41Qa5f7G1M0oB2ARCsyIkXy6+Z65fJ6c1648UqEOqnEgR6Xtqq+V47wtK2qSP6KQKrAg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-3.1.0.tgz", + "integrity": "sha512-yuGDaOcCAfYgLQvUAlJDezYGK4twHlzW1Kvpyg3inxtDJuAsHdyVyYLWl0Wo5nwkyrbZktdrjnoW5scqzoAqAg==", "dev": true, "dependencies": { "@astrojs/markdown-remark": "5.1.0", "@mdx-js/mdx": "^3.0.1", "acorn": "^8.11.3", - "es-module-lexer": "^1.5.2", + "es-module-lexer": "^1.5.3", "estree-util-visit": "^2.0.0", "github-slugger": "^2.0.0", "gray-matter": "^4.0.3", diff --git a/package.json b/package.json index fb055dc..de651c4 100644 --- a/package.json +++ b/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", From e00aa8a53504bb127ba8b7e71c5b9b548f369166 Mon Sep 17 00:00:00 2001 From: Alexander Henderson Date: Fri, 7 Jun 2024 02:39:04 -0400 Subject: [PATCH 2/8] update dependabot.yml !noci --- .github/dependabot.yml | 15 +++++++++++++++ BRANDING.md | 25 +++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..37e4a17 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,15 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "npm" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "monthly" + assignees: + - "alexandzors" + open-pull-requests-limit: 5 + target-branch: "dev" \ No newline at end of file diff --git a/BRANDING.md b/BRANDING.md index 9f696ad..f3ee3e8 100644 --- a/BRANDING.md +++ b/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%), + ) +) +``` \ No newline at end of file From b22494b6169af07b44f2ed4d09b5305bab9414ce Mon Sep 17 00:00:00 2001 From: Alexander Henderson Date: Fri, 7 Jun 2024 02:59:02 -0400 Subject: [PATCH 3/8] fix typo in about.astro !noci --- src/pages/about.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/about.astro b/src/pages/about.astro index e959745..b153f72 100644 --- a/src/pages/about.astro +++ b/src/pages/about.astro @@ -9,7 +9,7 @@ import ContentMedia from '../components/ContentMedia.astro'

About

- 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.

From 09a49caa2c66a417dd0301ac3a9b00de90a097e3 Mon Sep 17 00:00:00 2001 From: Alexander Henderson Date: Fri, 7 Jun 2024 22:34:59 -0400 Subject: [PATCH 4/8] fix issues from pagespeed testing add pagespeed testing to dev update dependabot.yml add privacy policy page --- .github/dependabot.yml | 9 +++++ .github/workflows/ci.yml | 27 +++++++++----- src/components/Header.astro | 2 -- src/components/Hero.astro | 4 +-- src/pages/privacy.astro | 72 +++++++++++++++++++++++++++++++++++++ 5 files changed, 101 insertions(+), 13 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c0ec210..e70767d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,3 +13,12 @@ updates: - "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" + assignees: + - "alexandzors" + open-pull-requests-limit: 5 + target-branch: "dev" \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b472096..2f09694 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/src/components/Header.astro b/src/components/Header.astro index 84a730e..5f83deb 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -35,11 +35,9 @@ import { Icon } from 'astro-icon/components' Support --> -
  • diff --git a/src/components/Hero.astro b/src/components/Hero.astro index 26a38c7..6917b12 100644 --- a/src/components/Hero.astro +++ b/src/components/Hero.astro @@ -15,7 +15,7 @@ const { src = '/hero.webp' } = Astro.props Transparent IT, No Surprises.
    - + Contact Us @@ -28,7 +28,7 @@ const { src = '/hero.webp' } = Astro.props -->
    • - + diff --git a/src/pages/privacy.astro b/src/pages/privacy.astro index 2d79839..ab21cec 100644 --- a/src/pages/privacy.astro +++ b/src/pages/privacy.astro @@ -4,4 +4,76 @@ import DefaultLayout from '../layouts/DefaultLayout.astro' +
    +
    +

    Privacy Policy

    +

    Introduction

    +

    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.

    +
    +

    Information We Collect

    +

    We collect the following information to provide and improve our services:

    +
      +
    • Personal Information: Names, Email addresses, Phone numbers, and Voicemails.
      • +
    • Usage Data: Information on how you interact with our website and blog, collected through Google Analytics for site performance and improvement.
      • +
    +

    Additionally, "Alex's Blog" uses the following third-party service:

    +
      +
    • Giscus: 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 GitHub Privacy Policy.
      • +
    +
    +

    How We Use Your Information

    +

    The information we collect is used in the following ways:

    +
      +
    • To Provide and Improve Services: Your personal information is used to deliver our services, including invoicing and communication.
      • +
    • Analytics: 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.
      • +
    • Comments: Comments made through Giscus are publicly displayed and associated with your GitHub account.
      • +
    +
    +

    Data Storage and Security

    +

    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.

    +

    Information collected by third-party services is managed according to their respective privacy policies.

    +
    +

    Sharing Your Information

    +

    We do not share your personal information with third parties except:

    +
      +
    • With your consent: We may share your information with third parties if you have given us explicit consent to do so.
      • +
    • For legal reasons: We may disclose your information if required by law or to protect our rights and safety.
      • +
    +
    +

    Your Choices

    +

    You have the following rights regarding your personal information:

    +
      +
    • Access: You can request access to the personal information we hold about you.
      • +
    • Correction: You can request correction of any inaccurate personal information we hold about you.
      • +
    • Deletion: You can request the deletion of your personal information, subject to legal and contractual obligations.
      • +
    +
    +

    Cookies

    +

    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.

    +
    +

    Google Analytics

    +

    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.

    +
    +

    Changes to This Privacy Policy

    +

    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.

    +
    +

    Contact Us

    +

    If you have any questions or concerns about this Privacy Policy, please contact us at:

    +
      +
    • Email: info@alexsguardian.net
      • +
    • Phone: +1 717-573-0627
      • +
    +

    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.

    +
    +
    +     \ No newline at end of file From c79f9c47f397c07cfe0abf0d8a86156f489f3b91 Mon Sep 17 00:00:00 2001 From: Alexander Henderson Date: Fri, 7 Jun 2024 23:02:19 -0400 Subject: [PATCH 5/8] update desc in defaultlayout.astro --- src/layouts/DefaultLayout.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/DefaultLayout.astro b/src/layouts/DefaultLayout.astro index 4416b0a..131e92d 100644 --- a/src/layouts/DefaultLayout.astro +++ b/src/layouts/DefaultLayout.astro @@ -7,7 +7,7 @@ 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. It is based out of Manheim, PA", url, image = '/social-preview-image.png', author = 'Alexander Henderson', From 7e5ef33df89e64ddc35fb682fa7d5dcbba3c95be Mon Sep 17 00:00:00 2001 From: Alexander Henderson Date: Fri, 7 Jun 2024 23:03:06 -0400 Subject: [PATCH 6/8] reword desc again !noci --- src/layouts/DefaultLayout.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/DefaultLayout.astro b/src/layouts/DefaultLayout.astro index 131e92d..997dce6 100644 --- a/src/layouts/DefaultLayout.astro +++ b/src/layouts/DefaultLayout.astro @@ -7,7 +7,7 @@ import Footer from '../components/Footer.astro' const { title = "Alex's Guardian", - description = "Alex's Guardian is an IT consulting & servicing company that specializes in mostly local end users and small businesses. It is based out of Manheim, 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', From fa172f8e6e99a17a6d2f32da913bd0e65db51684 Mon Sep 17 00:00:00 2001 From: Alexander Henderson Date: Fri, 7 Jun 2024 23:09:07 -0400 Subject: [PATCH 7/8] move GA script into in defaultlayout.astro --- src/layouts/DefaultLayout.astro | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/layouts/DefaultLayout.astro b/src/layouts/DefaultLayout.astro index 997dce6..70d97d7 100644 --- a/src/layouts/DefaultLayout.astro +++ b/src/layouts/DefaultLayout.astro @@ -14,21 +14,6 @@ const { } = Astro.props --- - - - - - @@ -47,6 +32,21 @@ const { image={image} author={author} /> + + + + +
    From c01bce06c021f599a144c425c2dc8d3ff8eeb29f Mon Sep 17 00:00:00 2001 From: Alexander Henderson Date: Fri, 7 Jun 2024 23:57:24 -0400 Subject: [PATCH 8/8] update dependabot.yml !noci --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e70767d..0c026fa 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -18,7 +18,7 @@ updates: directory: "/" # Location of package manifests schedule: interval: "monthly" - assignees: + reviewers: - "alexandzors" open-pull-requests-limit: 5 target-branch: "dev" \ No newline at end of file