Merge branch 'main' into nathan/escape-room-subsite-ordering

Author: brian-montgomery

Makefile

@@ -9,7 +9,7 @@ ifdef OS
 	FixPath = $(subst /,\,$1)
 # The set command will return an error, even though it succeeds.
 else
-	WriteCmd = printf 
+	WriteCmd = printf
 	RemoveCmd = rm -rf
 	RemoveDirCmd = rm -rf
 	FixPath = $1
@@ -24,7 +24,7 @@ up:
 down:
 	@docker compose down
 
-shell:
+shell: up
 	@docker compose exec $(CONTAINER) bash
 
 dist: clean-js-dist $(SOURCE_DIR)/dist

astro/astro.config.mjs

@@ -1,10 +1,3 @@
-import path from "path";
-import { fileURLToPath } from "url";
-
-// https://flaviocopes.com/fix-dirname-not-defined-es-module-scope/
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
 import { defineConfig } from "astro/config";
 import styleGuide from "./style-guide/register.js";
 
@@ -42,28 +35,23 @@ export default defineConfig({
 
   redirects: {
     "/daf/overview/": "/daf/",
+    // Move old services URLs to new ones.
+    "/services/escape-room": "/escape-room/",
+    "/services/evaluations": "/evaluations/",
+    "/services/globa11y/": "/globa11y/",
+    "/services/mutua11y/": "/mutua11y/",
+    "/services/tip-of-the-week": "/tips/",
   },
 
   vite: {
-    resolve: {
-      alias: {
-        "~bootstrap": path.resolve(__dirname, "node_modules/bootstrap"),
-        "~bootstrap-es": path.resolve(
-          __dirname,
-          "node_modules/bootstrap/dist/js/bootstrap.esm.min.js",
-        ),
-        '@': './src',
-      },
-      extensions: ['.js', '.ts', '.mjs'],
-    },
     ssr: {
       noExternal: ["bootstrap"],
     },
   },
 
   integrations: [
     mdx(),
-    styleGuide(), 
+    styleGuide(),
     icon({
       include: {
         // Bootstrap Icons
@@ -73,7 +61,7 @@ export default defineConfig({
           // Contact Info
           'envelope-at-fill', 'telephone-fill', 'geo-alt-fill',
           // Social Media
-          'facebook', 'instagram', 'linkedin', 'rss-fill', 'tiktok', 'youtube','globe', 'mastodon', 'twitter',
+          'facebook', 'instagram', 'linkedin', 'rss-fill', 'tiktok', 'globe', 'mastodon', 'twitter',
           // Descriptive
           'gift-fill', 'pencil-fill', 'people-fill', 'person-fill',
           // Additional icons
@@ -84,16 +72,23 @@ export default defineConfig({
         cib: [
           // Social Media
           'facebook', 'instagram', 'linkedin', 'mastodon', 'twitter',
+          // Streaming
+          'apple-podcasts', 'youtube',
           // Payment
           "cc-paypal", "cc-stripe", "paypal", "stripe",
         ],
+        'simple-icons': [
+          // Streaming
+          'podcastindex'
+        ],
       }
     }),
     sitemap({
       filter: (page) =>
         !page.endsWith('/commitment-form/') &&
         !page.includes('/fixable/') &&
-        !page.includes('/services/escape-room/content/'),
+        !page.includes('/services/escape-room/content/') &&
+        !page.endsWith('tips/archive/')
     }),
     robotsTxt({
       sitemap: true,
@@ -115,6 +110,7 @@ export default defineConfig({
             '/api/digital-content',
             '/api/verify-purchase',
             '/services/escape-room/content/',
+            '/tips/archive/',
           ],
         },
       ]