Merge branch 'main' into patch-1

.github/workflows/publish-website.yml

@@ -0,0 +1,70 @@
+name: Publish Website
+
+# When to trigger the workflow
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - .github/workflows/publish-website.yml
+      - .docker/website/**
+      - website/**
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Docker Login
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ secrets.CONTAINER_REG_URL }}
+        username: ${{ secrets.CONTAINER_REG_USERNAME }}
+        password: ${{ secrets.CONTAINER_REG_PASSWORD }}
+
+    - run: echo ${{ secrets.CONTAINER_REG_URL }}
+
+    - name: Install Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: '18.x'
+        cache: 'yarn'
+        cache-dependency-path: 'website/yarn.lock'
+
+    - name: Cache Yarn Packages
+      uses: actions/cache@v3
+      with:
+        path: |
+          website/.yarn/cache
+          website/.cache/yarn
+        key: ${{ runner.os }}-yarn-${{ hashFiles('website/yarn.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-yarn-
+
+    - name: Install Packages
+      run: yarn --immutable --network-timeout 100000
+      working-directory: website
+
+    - name: Build Website
+      run: yarn build --prefix-paths
+      working-directory: website
+
+    - name: Build WebSite Container
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: .docker/website/dockerfile
+        push: true
+        tags: ${{ secrets.CONTAINER_REG_DOMAIN }}/ccc-website-${{ github.ref_name }}:${{ github.run_id }}
+
+    - name: Deploy to Azure WebApp
+      uses: azure/webapps-deploy@v2
+      with:
+        app-name: ccc-p-us1-website
+        slot-name: 'production'
+        publish-profile: ${{ secrets.AZURE_PUBLISH_PROFILE }}
+        images: ${{ secrets.CONTAINER_REG_DOMAIN }}/ccc-website-${{ github.ref_name }}:${{ github.run_id }}
+

website/gatsby-config.js

@@ -156,24 +156,6 @@ module.exports = {
         icon: `src/images/chillicream-favicon.png`,
       },
     },
-    {
-      resolve: "gatsby-plugin-google-tagmanager",
-      options: {
-        id: "G-RSKJWN1W8V",
-        includeInDevelopment: false,
-        defaultDataLayer: {
-          platform: "gatsby",
-        },
-        enableWebVitalsTracking: true,
-      },
-    },
-    {
-      resolve: `gatsby-plugin-google-analytics`,
-      options: {
-        trackingId: "UA-72800164-1",
-        anonymize: true,
-      },
-    },
     {
       resolve: `gatsby-plugin-sitemap`,
       options: {

website/package.json

@@ -31,8 +31,6 @@
     "gatsby": "^3.6.2",
     "gatsby-plugin-disqus": "^1.2.2",
     "gatsby-plugin-feed": "^3.6.0",
-    "gatsby-plugin-google-analytics": "^5.3.0",
-    "gatsby-plugin-google-tagmanager": "^5.3.1",
     "gatsby-plugin-graphql-codegen": "^3.0.0",
     "gatsby-plugin-image": "^1.6.0",
     "gatsby-plugin-manifest": "^3.6.0",

website/src/components/layout/footer.tsx

@@ -133,6 +133,26 @@ export const Footer: FC = () => {
             <NavLink to="/services/support">Support</NavLink>
           </Navigation>
         </Links>
+        <Links>
+          <Title>About</Title>
+          <Navigation>
+            <NavLink prefetch={false} to="mailto:[email protected]">
+              Contact
+            </NavLink>
+            <NavLink prefetch={false} to="/legal/acceptable-use-policy.html">
+              Acceptable Use
+            </NavLink>
+            <NavLink prefetch={false} to="/legal/cookie-policy.html">
+              Cookie Policy
+            </NavLink>
+            <NavLink prefetch={false} to="/legal/privacy-policy.html">
+              Privacy Policy
+            </NavLink>
+            <NavLink prefetch={false} to="/legal/terms-of-service.html">
+              Terms of Service
+            </NavLink>
+          </Navigation>
+        </Links>
       </Section>
       <Section>
         <Copyright>

website/src/components/misc/cookie-consent.tsx

@@ -45,8 +45,8 @@ export const CookieConsent: FC = () => {
         <Container>
           <Message id="cookieconsent:desc">
             This website uses cookies to ensure you get the best experience on
-            our website.{" "}
-            <LearnMoreLink to="https://cookiesandyou.com">
+            our website.
+            <LearnMoreLink prefetch={false} to="/legal/cookie-policy.html">
               Learn more
             </LearnMoreLink>
           </Message>

website/src/components/misc/link.tsx

@@ -1,5 +1,4 @@
 import { GatsbyLinkProps, Link as GatsbyLink } from "gatsby";
-import { OutboundLink } from "gatsby-plugin-google-analytics";
 import React, { FC } from "react";
 
 export const Link: FC<
@@ -16,11 +15,6 @@ export const Link: FC<
       <a href={to} {...rest} />
     )
   ) : (
-    <OutboundLink
-      href={to}
-      target="_blank"
-      rel="noopener noreferrer"
-      {...rest}
-    />
+    <a href={to} target="_blank" rel="noopener noreferrer" {...rest} />
   );
 };

website/src/pages/products/bananacakepop.tsx

@@ -1,5 +1,4 @@
 import { SrOnly } from "@/components/misc/sr-only";
-import { OutboundLink } from "gatsby-plugin-google-analytics";
 import React, {
   FC,
   MouseEventHandler,
@@ -555,7 +554,7 @@ const DownloadButtonContainer = styled.div`
   overflow: visible;
 `;
 
-const DownloadLink = styled(OutboundLink).attrs({
+const DownloadLink = styled.a.attrs({
   rel: "noopener noreferrer",
 })`
   display: flex;