Merge pull request 'mars rover and embryo pick and plate content' (#19) from website-content-updates into main

Reviewed-on: #19

.dockerignore

@@ -1,7 +1,17 @@
 .DS_Store
 
-.idea
-.astro
+.gitea/
+.astro/
+.idea/
 
+*/dist/
 */build/
 */node_modules/
+*/playwright-report/
+*/test-results/
+
+.gitignore
+Dockerfile
+Makefile
+new-words.txt
+README.md

.editorconfig

@@ -0,0 +1,7 @@
+[*]
+charset = utf-8
+insert_final_newline = true
+end_of_line = lf
+indent_style = space
+indent_size = 2
+max_line_length = 80

.gitea/disabled_workflows/playwright.yml

@@ -1,27 +0,0 @@
-name: Playwright Tests
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-jobs:
-  test:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: lts/*
-    - name: Install dependencies
-      run: npm ci
-    - name: Install Playwright Browsers
-      run: npx playwright install --with-deps
-    - name: Run Playwright tests
-      run: npx playwright test
-    - uses: actions/upload-artifact@v4
-      if: ${{ !cancelled() }}
-      with:
-        name: playwright-report
-        path: playwright-report/
-        retention-days: 30

.gitea/workflows/build-production.yaml

@@ -12,16 +12,24 @@ jobs:
       project_version: ${{ steps.project_metadata.outputs.PROJECT_VERSION }}
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node Environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
+        with:
+          node-version: ">=22.20"
 
       - name: Setup Project Dependencies
         run: |
           npm ci
           npx playwright install --with-deps
 
+      - name: Code Formatting Check
+        run: npx prettier . --check
+
+      - name: Spelling Check
+        run: npx cspell .
+
       - name: Build Project
         run: npm run build
 
@@ -42,28 +50,32 @@ jobs:
     needs: test
     steps:
       - name: Checkout caperren-com Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: caperren-com
 
       - name: Login to Docker Registry
         uses: docker/login-action@v3
         with:
-          registry: gitea.perren.cloud
+          registry: 192.168.1.36:30008
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.ACTIONS_TOKEN }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-config-inline: |
+            [registry."192.168.1.36:30008"]
+              http = true
 
       - name: Build and Push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: caperren-com
           push: true
           tags: |
-            gitea.perren.cloud/caperren/${{ needs.test.outputs.repo_name }}:${{ needs.test.outputs.repo_version_hash }}
-            gitea.perren.cloud/caperren/caperren-com:latest
+            192.168.1.36:30008/caperren/${{ needs.test.outputs.repo_name }}:${{ needs.test.outputs.repo_version_hash }}
+            192.168.1.36:30008/caperren/caperren-com:latest
           build-args: |
             REPO_VERSION_HASH=${{ needs.test.outputs.repo_version_hash }}
             BUILD_ENVIRONMENT=production

.gitea/workflows/build-staging.yaml

@@ -1,7 +1,7 @@
 name: Build and Test - Staging
 on:
   pull_request:
-    types: [ opened, synchronize, reopened ]
+    types: [opened, synchronize, reopened]
 
 jobs:
   test:
@@ -12,16 +12,24 @@ jobs:
       project_version: ${{ steps.project_metadata.outputs.PROJECT_VERSION }}
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Node Environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
+        with:
+          node-version: ">=22.20"
 
       - name: Setup Project Dependencies
         run: |
           npm ci
           npx playwright install --with-deps
 
+      - name: Code Formatting Check
+        run: npx prettier . --check
+
+      - name: Spelling Check
+        run: npx cspell .
+
       - name: Build Project
         run: npm run build
 
@@ -42,29 +50,33 @@ jobs:
     needs: test
     steps:
       - name: Checkout caperren-com Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: caperren-com
 
       - name: Login to Docker Registry
         uses: docker/login-action@v3
         with:
-          registry: gitea.perren.cloud
+          registry: 192.168.1.36:30008
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.ACTIONS_TOKEN }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-config-inline: |
+            [registry."192.168.1.36:30008"]
+              http = true
 
       - name: Build and Push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: caperren-com
           push: true
           tags: |
-            gitea.perren.cloud/caperren/caperren-com:latest-staging
+            192.168.1.36:30008/caperren/caperren-com:latest-staging
           build-args: |
-            REPO_VERSION_HASH=${{ needs.determine_version.outputs.repo_version_hash }}
+            REPO_VERSION_HASH=${{ needs.test.outputs.repo_version_hash }}
             BUILD_ENVIRONMENT=staging
 
   deploy_staging:

.gitignore

@@ -1,9 +1,3 @@
-# Ignore everything under src/content, as they are dynamically added from obsidian
-src/content/*
-
-# Do not ignore config.ts in src/content since that necessary to import the dynamic content
-!src/content/config.ts
-
 # build output
 dist/
 
@@ -35,3 +29,6 @@ pnpm-debug.log*
 /blob-report/
 /playwright/.cache/
 /playwright/.auth/
+
+# Local temporary storage files
+new-words.txt

.prettierignore

@@ -0,0 +1,34 @@
+# build output
+dist/
+
+# generated types
+.astro/
+
+# dependencies
+node_modules/
+
+# logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# environment variables
+.env
+.env.production
+
+# macOS-specific files
+.DS_Store
+
+# jetbrains setting folder
+.idea/
+
+# Playwright
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+/playwright/.auth/
+
+# Local temporary storage files
+new-words.txt

.prettierrc

@@ -0,0 +1,29 @@
+{
+  "astroOrganizeImportsMode": "All",
+  "importOrder": [
+    "^@core/(.*)$",
+    "^@server/(.*)$",
+    "^@ui/(.*)$",
+    "^@layouts/(.*)$",
+    "^@components/(.*)$",
+    "^@interfaces/(.*)$",
+    "^@assets/(.*)$",
+    "^[./]"
+  ],
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true,
+  "plugins": [
+    "prettier-plugin-astro",
+    "prettier-plugin-tailwindcss",
+    "@trivago/prettier-plugin-sort-imports",
+    "prettier-plugin-astro-organize-imports"
+  ],
+  "overrides": [
+    {
+      "files": "*.astro",
+      "options": {
+        "parser": "astro"
+      }
+    }
+  ]
+}

Dockerfile

@@ -5,12 +5,27 @@ WORKDIR /app
 # Therefore, the `-deps` steps will be skipped if only the source code changes.
 COPY package.json package-lock.json tsconfig.json astro.config.mjs ./
 
+CMD [ "/bin/bash" ]
+
 FROM base AS prod-deps
 RUN npm install --omit=dev
 
+FROM prod-deps AS test-base
+
+RUN npm ci
+RUN npx playwright install --with-deps
+
 FROM prod-deps AS build
 
-COPY . .
+COPY --exclude=test \
+    --exclude=test-e2e \
+    --exclude=playwright.config.ts \
+    --exclude=vitest.config.ts \
+    --exclude=.prettierrc \
+    --exclude=.prettierignore \
+    --exclude=cspell.json \
+    --exclude=project-words.txt \
+    . .
 
 ARG REPO_VERSION_HASH
 ARG BUILD_ENVIRONMENT
@@ -19,6 +34,16 @@ RUN echo "PUBLIC_REPO_VERSION_HASH=\"${REPO_VERSION_HASH}\" \n\
     PUBLIC_BUILD_ENVIRONMENT=\"${BUILD_ENVIRONMENT}\"" >> .env
 RUN npm run build
 
+FROM test-base AS test
+
+COPY . .
+COPY --from=build /app/dist /app/dist
+
+RUN npx prettier . --check
+RUN npx cspell .
+RUN npm run test
+RUN npm run e2e-test
+
 FROM nginx:alpine AS runtime
 
 COPY ./nginx/nginx.conf /etc/nginx/nginx.conf

Makefile

@@ -6,7 +6,17 @@
 	astro_upgrade \
 	build \
 	dev \
-	dev-hosted
+	dev-hosted \
+	test \
+	_spelling-generate-new-words \
+	spelling-find-new-words \
+	spelling-add-new-words \
+	spelling-check \
+	cleanup-check \
+	cleanup-code \
+	convert_video \
+	convert_video_times \
+	generate_asset_imports
 
 default: dev
 
@@ -28,3 +38,63 @@ dev:
 dev-hosted:
 	npm run dev-hosted
 
+test: spelling-check
+	@npx playwright install --with-deps
+	npm run test --ui
+	npx playwright test --ui
+
+_spelling-generate-new-words:
+	@cspell --words-only --unique . 2>/dev/null | sort --ignore-case -o new-words.txt
+
+spelling-find-new-words: _spelling-generate-new-words
+	@echo "Found the following new words:"
+	@cat new-words.txt
+	@rm -f new-words.txt
+
+spelling-add-new-words: _spelling-generate-new-words
+	@echo "Adding to project-words.txt"
+	@cat new-words.txt >> project-words.txt
+	@rm -f new-words.txt
+	@cat project-words.txt | sort --ignore-case -o project-words.txt
+
+spelling-check:
+	npx cspell .
+
+cleanup-check:
+	npx prettier . --check
+
+cleanup-code:
+	npx prettier . --write
+
+convert_video:
+	ffmpeg \
+		-init_hw_device vaapi=va:/dev/dri/renderD128 \
+		-filter_hw_device va \
+		-i $(input) \
+		-vf 'format=nv12,hwupload,scale_vaapi=-2:720' \
+		-c:v h264_vaapi \
+		-rc_mode CQP \
+		-qp 28 \
+		-an \
+		$(extra_args) \
+		$(output)
+
+convert_video_times:
+	ffmpeg \
+		-init_hw_device vaapi=va:/dev/dri/renderD128 \
+		-filter_hw_device va \
+		-i $(input) \
+		-ss $(start) \
+		-to $(end) \
+		-vf 'format=nv12,hwupload,scale_vaapi=-2:720' \
+		-c:v h264_vaapi \
+		-rc_mode CQP \
+		-qp 28 \
+		-an \
+		$(output)
+
+generate_asset_imports:
+	@for assets_path in `find "src/assets/${assets_relative_path}" -maxdepth 1 -type f -printf "%f\n"`; do	\
+			without_extension=$${assets_path/%.*};																															\
+		  echo "import $${without_extension//-/_} from \"@assets/${assets_relative_path}/$$assets_path\";";		\
+	done;

README.md

@@ -1,48 +1,3 @@
-# Astro Starter Kit: Basics
+# Corwin Perren's Personal Portfolio Website
 
-```sh
-npm create astro@latest -- --template basics
-```
-
-[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/basics)
-[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/p/sandbox/github/withastro/astro/tree/latest/examples/basics)
-[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/withastro/astro?devcontainer_path=.devcontainer/basics/devcontainer.json)
-
-> 🧑‍🚀 **Seasoned astronaut?** Delete this file. Have fun!
-
-![just-the-basics](https://github.com/withastro/astro/assets/2244813/a0a5533c-a856-4198-8470-2d67b1d7c554)
-
-## 🚀 Project Structure
-
-Inside of your Astro project, you'll see the following folders and files:
-
-```text
-/
-├── public/
-│   └── favicon.svg
-├── src/
-│   ├── layouts/
-│   │   └── Layout.astro
-│   └── pages/
-│       └── index.astro
-└── package.json
-```
-
-To learn more about the folder structure of an Astro project, refer to [our guide on project structure](https://docs.astro.build/en/basics/project-structure/).
-
-## 🧞 Commands
-
-All commands are run from the root of the project, from a terminal:
-
-| Command                   | Action                                           |
-| :------------------------ | :----------------------------------------------- |
-| `npm install`             | Installs dependencies                            |
-| `npm run dev`             | Starts local dev server at `localhost:4321`      |
-| `npm run build`           | Build your production site to `./dist/`          |
-| `npm run preview`         | Preview your build locally, before deploying     |
-| `npm run astro ...`       | Run CLI commands like `astro add`, `astro check` |
-| `npm run astro -- --help` | Get help using the Astro CLI                     |
-
-## 👀 Want to learn more?
-
-Feel free to check [our documentation](https://docs.astro.build) or jump into our [Discord server](https://astro.build/chat).
+Check the Makefile and/or package.json for the commands needed to build and run this project.

astro.config.mjs

@@ -1,31 +1,32 @@
 // @ts-check
-import {defineConfig} from 'astro/config';
 import sitemap from "@astrojs/sitemap";
 import tailwindcss from "@tailwindcss/vite";
+import { defineConfig } from "astro/config";
 
 // We don't have access to short imports this early in the build chain
 // noinspection ES6PreferShortImport
-import {siteLayout, getPaths} from "./src/data/site-layout.ts";
+import { getPaths, siteLayout } from "./src/data/site-layout.ts";
 
-const disabledPaths = getPaths(siteLayout, [], true)
+const disabledPaths = getPaths(siteLayout, [], true);
 
 // https://astro.build/config
 
 export default defineConfig({
   site: "https://caperren.com",
+  trailingSlash: "never",
   prefetch: {
-        prefetchAll: true
+    prefetchAll: true,
   },
   integrations: [
     sitemap({
       filter: (pagePath) =>
-                !disabledPaths.some(disabledPath => pagePath.includes(disabledPath))
-        })
+        !disabledPaths.some((disabledPath) => pagePath.includes(disabledPath)),
+    }),
   ],
   vite: {
     plugins: [
       // @ts-ignore
-            tailwindcss()
+      tailwindcss(),
     ],
   },
 });

cspell.json

@@ -0,0 +1,23 @@
+{
+  "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
+  "version": "0.2",
+  "dictionaryDefinitions": [
+    {
+      "name": "project-words",
+      "path": "./project-words.txt",
+      "addWords": true
+    }
+  ],
+  "dictionaries": ["project-words"],
+  "ignorePaths": [
+    ".astro",
+    ".idea",
+    "dist",
+    "node_modules",
+    "playwright-report",
+    "test-results",
+    "new-words.txt",
+    "playwright.config.ts",
+    "/project-words.txt"
+  ]
+}

package.json

@@ -1,7 +1,6 @@
 {
   "name": "caperren-com",
   "type": "module",
-  "version": "0.0.1",
   "scripts": {
     "dev": "astro dev",
     "dev-hosted": "astro dev --host",
@@ -14,7 +13,7 @@
   "dependencies": {
     "@astrojs/sitemap": "^3.6.0",
     "@tailwindcss/vite": "^4.1.11",
-    "astro": "^5.15.4",
+    "astro": "^5.16.3",
     "flowbite": "^3.1.2",
     "leader-line-new": "^1.1.9",
     "luxon": "^3.7.2",
@@ -23,8 +22,14 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.56.1",
+    "@trivago/prettier-plugin-sort-imports": "^6.0.0",
     "@types/luxon": "^3.7.1",
     "@types/node": "^24.10.0",
+    "cspell": "^9.3.2",
+    "prettier": "3.7.3",
+    "prettier-plugin-astro": "0.14.1",
+    "prettier-plugin-astro-organize-imports": "^0.4.11",
+    "prettier-plugin-tailwindcss": "0.7.1",
     "vitest": "^4.0.7"
   }
 }

playwright.config.ts

@@ -1,4 +1,4 @@
-import {defineConfig, devices} from '@playwright/test';
+import { defineConfig, devices } from "@playwright/test";
 
 /**
  * Read environment variables from file.
@@ -12,7 +12,7 @@ import {defineConfig, devices} from '@playwright/test';
  * See https://playwright.dev/docs/test-configuration.
  */
 export default defineConfig({
-    testDir: './test-e2e',
+  testDir: "./test-e2e",
   /* Run tests in files in parallel */
   fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
@@ -22,42 +22,42 @@ export default defineConfig({
   /* Opt out of parallel tests on CI. */
   workers: process.env.CI ? 1 : undefined,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-    reporter: 'html',
+  reporter: "html",
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
   use: {
     /* Base URL to use in actions like `await page.goto('')`. */
-        baseURL: 'http://localhost:4321',
+    baseURL: "http://localhost:4321",
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-        trace: 'on-first-retry',
+    trace: "on-first-retry",
   },
 
   /* Configure projects for major browsers */
   projects: [
     {
-            name: 'chromium',
-            use: {...devices['Desktop Chrome']},
+      name: "chromium",
+      use: { ...devices["Desktop Chrome"] },
     },
 
-        // {
-        //   name: 'firefox',
-        //   use: { ...devices['Desktop Firefox'] },
-        // },
-        //
-        // {
-        //   name: 'webkit',
-        //   use: { ...devices['Desktop Safari'] },
-        // },
+    {
+      name: "firefox",
+      use: { ...devices["Desktop Firefox"] },
+    },
+
+    {
+      name: "webkit",
+      use: { ...devices["Desktop Safari"] },
+    },
 
     /* Test against mobile viewports. */
     {
-            name: 'Mobile Chrome',
-            use: {...devices['Pixel 5']},
+      name: "Mobile Chrome",
+      use: { ...devices["Pixel 5"] },
+    },
+    {
+      name: "Mobile Safari",
+      use: { ...devices["iPhone 12"] },
     },
-        // {
-        //   name: 'Mobile Safari',
-        //   use: { ...devices['iPhone 12'] },
-        // },
 
     /* Test against branded browsers. */
     // {
@@ -72,8 +72,8 @@ export default defineConfig({
 
   /* Run your local dev server before starting the tests */
   webServer: {
-        command: 'npm run preview',
-        url: 'http://localhost:4321',
+    command: "npm run preview",
+    url: "http://localhost:4321",
     timeout: 120 * 1000,
     reuseExistingServer: !process.env.CI,
   },

project-words.txt

@@ -0,0 +1,96 @@
+ADCP
+Altium
+ASSEM
+astrojs
+Atmel
+automations
+barebones
+beaglebone
+Bitwarden
+Candian
+caperren
+CEOAS
+COMSC
+Concours
+CONSERV
+Corwin
+dangerousthings
+dechorionation
+Dechorionator
+dechorionators
+dockerization
+dockerizing
+drumheller
+ebox
+ELMI
+fhhs
+flowbite
+flowrate
+gcode
+gerbers
+Gitea
+HDFS
+headshot
+Homelab
+hwupload
+iceops
+ITAR
+Jetson
+KFSK
+Labjack
+leconte
+Loctite
+luxon
+MGMT
+microcontroller
+microcontroller's
+Micropumps
+Millis
+modbus
+Mokai
+Multimeters
+nixos
+nvme
+offroad
+Onshape
+OSSM
+OSURC
+panelized
+Passthroughs
+pcbs
+Perren
+Perren's
+Pixhawk
+Protocase
+pubpath
+RFID
+Rito
+RSSI
+SARL
+SCARA
+showerheads
+Shuttlebox
+simplemotion
+sinnhuber
+sitemapindex
+Smartsheet
+solderable
+ssds
+Starlink
+steller
+Steller
+Tanguay
+Teamcenter
+timelapse
+touchoff
+triaging
+trivago
+Truong
+Ubiquiti
+Unstow
+uuidv
+vaapi
+vitest
+Waterjet
+Zebrafish
+zscan