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

Reviewed-on: #19

.gitea/workflows/build-production.yaml

@@ -57,12 +57,16 @@ jobs:
       - 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@v6
@@ -70,8 +74,8 @@ jobs:
           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

@@ -57,12 +57,16 @@ jobs:
       - 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@v6
@@ -70,7 +74,7 @@ jobs:
           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.test.outputs.repo_version_hash }}
             BUILD_ENVIRONMENT=staging

Makefile

@@ -15,7 +15,8 @@
 	cleanup-check \
 	cleanup-code \
 	convert_video \
-	convert_video_times
+	convert_video_times \
+	generate_asset_imports
 
 default: dev
 
@@ -83,9 +84,17 @@ convert_video_times:
 		-init_hw_device vaapi=va:/dev/dri/renderD128 \
 		-filter_hw_device va \
 		-i $(input) \
-		-vf 'format=nv12,hwupload,scale_vaapi=-2:720,trim=start=$(start):end=$(end)' \
+		-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;

astro.config.mjs

@@ -13,6 +13,7 @@ const disabledPaths = getPaths(siteLayout, [], true);
 
 export default defineConfig({
   site: "https://caperren.com",
+  trailingSlash: "never",
   prefetch: {
     prefetchAll: true,
   },

project-words.txt

@@ -1,6 +1,12 @@
 ADCP
+Altium
 ASSEM
 astrojs
+Atmel
+automations
+barebones
+beaglebone
+Bitwarden
 Candian
 caperren
 CEOAS
@@ -9,9 +15,20 @@ Concours
 CONSERV
 Corwin
 dangerousthings
+dechorionation
 Dechorionator
+dechorionators
+dockerization
+dockerizing
+drumheller
+ebox
+ELMI
 fhhs
 flowbite
+flowrate
+gcode
+gerbers
+Gitea
 HDFS
 headshot
 Homelab
@@ -19,33 +36,61 @@ 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

src/components/Footer.astro

@@ -1,10 +1,23 @@
 ---
+import InlineLink from "@components/InlineLink.astro";
 
+const { pathname } = Astro.url;
 ---
 
 <footer
   class="border-t-caperren-green-dark text-caperren-green-dark z-50 flex w-full max-w-full items-center justify-between border-t bg-black px-6 py-2 text-sm"
 >
   <span>{import.meta.env.PUBLIC_BUILD_ENVIRONMENT || "development"}</span>
+  <div>
+    <InlineLink
+      class:list={[
+        "text-caperren-green-dark hover:text-caperren-green",
+        pathname === "/hobby/this-website"
+          ? "border-caperren-green-dark hover:border-caperren-green border-b-2"
+          : false,
+      ]}
+      href="/hobby/this-website">About This Website</InlineLink
+    >
+  </div>
   <span>{import.meta.env.PUBLIC_REPO_VERSION_HASH || "invalid"}</span>
 </footer>

src/components/H1.astro

@@ -2,4 +2,4 @@
 
 ---
 
-<h1 class="text-xl font-extrabold md:text-3xl"><slot /></h1>
+<h1 class="text-xl font-extrabold sm:text-2xl md:text-3xl"><slot /></h1>

src/components/H2.astro

@@ -2,4 +2,4 @@
 
 ---
 
-<h2 class="my-4 font-bold md:text-2xl"><slot /></h2>
+<h2 class="text-lg font-bold sm:text-xl md:text-2xl"><slot /></h2>

src/components/H3.astro

@@ -2,4 +2,4 @@
 
 ---
 
-<h3 class="mt-4 mb-2 font-bold md:text-lg"><slot /></h3>
+<h3 class="text-md font-semibold sm:text-lg md:text-xl"><slot /></h3>

src/components/H4.astro

@@ -0,0 +1,5 @@
+---
+
+---
+
+<h4 class="md:text-md text-xs sm:text-sm"><slot /></h4>

src/components/InlineLink.astro

@@ -7,16 +7,10 @@ interface Props extends ComponentPropsBase {
 }
 
 const { class: className, href, target } = Astro.props;
+const { pathname } = Astro.url;
 
-let finalTarget: string | undefined = target;
-
-if (target === undefined) {
-  if (href.startsWith("/")) {
-    finalTarget = "";
-  } else {
-    finalTarget = "_blank";
-  }
-}
+const finalTarget =
+  target === undefined ? (href.startsWith("/") ? undefined : "_blank") : target;
 ---
 
 <>
@@ -24,6 +18,7 @@ if (target === undefined) {
     class:list={["text-blue-500", "hover:text-blue-300", className]}
     href={href}
     target={finalTarget}
+    aria-current={pathname === href ? "page" : undefined}
   >
     <slot />
   </a>

src/components/Li.astro

@@ -0,0 +1,9 @@
+---
+
+---
+
+<>
+  <li>
+    <slot />
+  </li>
+</>

src/components/LinkButton.astro

@@ -9,6 +9,7 @@ interface Props {
 const { title, href, target = "_blank" } = Astro.props;
 ---
 
+<div class="mx-auto">
   <a
     class="text-caperren-green border-caperren-green hover:border-caperren-green-light hover:text-caperren-green-light rounded-2xl border-2 bg-black p-2"
     href={href}
@@ -16,3 +17,4 @@ const { title, href, target = "_blank" } = Astro.props;
   >
     {title}
   </a>
+</div>