Added won 1st to mars rover

.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 }}
+            192.168.1.36:30008/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/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

@@ -3,7 +3,10 @@ Altium
 ASSEM
 astrojs
 Atmel
+automations
 barebones
+beaglebone
+Bitwarden
 Candian
 caperren
 CEOAS
@@ -12,10 +15,20 @@ Concours
 CONSERV
 Corwin
 dangerousthings
+dechorionation
 Dechorionator
+dechorionators
+dockerization
+dockerizing
+drumheller
 ebox
+ELMI
 fhhs
 flowbite
+flowrate
+gcode
+gerbers
+Gitea
 HDFS
 headshot
 Homelab
@@ -24,36 +37,60 @@ 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/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;
+const finalTarget =
-
+  target === undefined ? (href.startsWith("/") ? undefined : "_blank") : target;
-if (target === undefined) {
-  if (href.startsWith("/")) {
-    finalTarget = "";
-  } else {
-    finalTarget = "_blank";
-  }
-}
 ---
 
 <>
@@ -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/Media/CustomCarousel/CustomCarousel.astro

@@ -1,15 +1,21 @@
 ---
 import { Image } from "astro:assets";
 
+import type { ComponentPropsBase } from "@interfaces/components.ts";
 import type { carouselGroup } from "@interfaces/image-carousel.ts";
 
-const groupToShow: carouselGroup = Astro.props.carouselGroup;
+interface Props extends ComponentPropsBase {
+  carouselGroup: carouselGroup;
+  showBorder?: boolean;
+}
+
+const { class: className, carouselGroup, showBorder = true } = Astro.props;
 ---
 
 <custom-carousel
   class="relative flex w-full flex-col"
-  data-custom-carousel={groupToShow.animation}
+  data-custom-carousel={carouselGroup.animation ?? "slide"}
-  data-custom-carousel-interval={groupToShow.interval}
+  data-custom-carousel-interval={carouselGroup.interval}
 >
   <!-- Modal for fullscreen viewing -->
   <div
@@ -57,54 +63,63 @@ const groupToShow: carouselGroup = Astro.props.carouselGroup;
   </div>
 
   <!-- Carousel wrapper -->
-  <div class="relative h-56 w-full overflow-hidden md:h-120">
+  <div
+    class:list={[
+      "relative h-56 w-full overflow-hidden rounded-lg md:h-120",
+      showBorder ? "border" : false,
+      className ? className : "border-caperren-green-dark",
+    ]}
+  >
     {
-      groupToShow.images.map((image, index) => (
+      carouselGroup.images &&
-        <div
+        carouselGroup.images.map((image, index) => (
-          class="hidden duration-1500 ease-in-out"
+          <div
-          data-custom-carousel-item={index}
+            class="hidden bg-black duration-1500 ease-in-out"
-        >
+            data-custom-carousel-item={index}
-          <Image
+          >
-            src={image}
+            <Image
-            class="absolute inset-0 m-auto h-full max-h-full w-auto max-w-full object-contain"
+              src={image}
-            alt="..."
+              class="absolute inset-0 m-auto h-full max-h-full w-auto max-w-full object-contain"
-            layout="constrained"
+              alt="..."
-            loading="eager"
+              layout="constrained"
-          />
+              loading="eager"
-        </div>
+            />
-      ))
+          </div>
+        ))
     }
   </div>
 
   <!-- Slider indicators -->
   {
-    groupToShow.images.length > 1 && (
+    carouselGroup.images && carouselGroup.images.length > 1 && (
       <div>
         <div class="absolute bottom-2 left-1/2 z-30 flex -translate-x-1/2 space-x-3 rounded-full">
-          {groupToShow.images.map((_, index) => (
+          {carouselGroup.images &&
-            <button
+            carouselGroup.images.map((_, index) => (
-              type="button"
+              <button
-              class="hover:bg-caperren-green-light h-3 w-3 rounded-full bg-black"
+                type="button"
-              aria-current={index ? "false" : "true"}
+                class="hover:bg-caperren-green-light h-3 w-3 rounded-full"
-              aria-label={index.toString()}
+                aria-current={index ? "false" : "true"}
-              data-custom-carousel-slide-to={index}
+                aria-label={index.toString()}
-            />
+                data-custom-carousel-slide-to={index}
-          ))}
+              />
+            ))}
         </div>
         <button
           type="button"
           class="group absolute start-0 top-0 z-30 flex h-full cursor-pointer items-center justify-center px-4 focus:outline-none"
           data-custom-carousel-prev
         >
-          <span class="ring-caperren-green/25 inline-flex h-10 w-10 items-center justify-center rounded-full bg-black/25 ring-2 group-hover:bg-black/75">
+          <span class="ring-caperren-green/35 group-hover:ring-caperren-green inline-flex h-10 w-10 items-center justify-center rounded-full bg-black/35 ring-2 group-hover:bg-black/75">
             <svg
-              class="text-caperren-green group-hover:text-caperren-green-light h-4 w-4"
+              class="text-caperren-green stroke-caperren-green group-hover:text-caperren-green-light h-4 w-4"
               aria-hidden="true"
               xmlns="http://www.w3.org/2000/svg"
-              viewBox="0 0 6 10"
+              viewBox="0 0 8 10"
             >
               <path
                 stroke="currentColor"
+                fill-opacity="0%"
                 stroke-linecap="round"
                 stroke-linejoin="round"
                 stroke-width="2"
@@ -119,15 +134,16 @@ const groupToShow: carouselGroup = Astro.props.carouselGroup;
           class="group absolute end-0 top-0 z-30 flex h-full cursor-pointer items-center justify-center px-4 focus:outline-none"
           data-custom-carousel-next
         >
-          <span class="ring-caperren-green/25 inline-flex h-10 w-10 items-center justify-center rounded-full bg-black/25 ring-2 group-hover:bg-black/75">
+          <span class="ring-caperren-green/25 group-hover:ring-caperren-green inline-flex h-10 w-10 items-center justify-center rounded-full bg-black/25 ring-2 group-hover:bg-black/75">
             <svg
-              class="text-caperren-green group-hover:text-caperren-green-light h-4 w-4"
+              class="text-caperren-green stroke-caperren-green group-hover:text-caperren-green-light h-4 w-4"
               aria-hidden="true"
               xmlns="http://www.w3.org/2000/svg"
-              viewBox="0 0 6 10"
+              viewBox="0 0 4 10"
             >
               <path
                 stroke="currentColor"
+                fill-opacity="0%"
                 stroke-linecap="round"
                 stroke-linejoin="round"
                 stroke-width="2"

src/components/Media/Video.astro

@@ -22,7 +22,7 @@ const {
 
 <div class="mx-auto my-auto">
   <video
-    class="h-auto w-full"
+    class="border-caperren-green-dark h-auto w-full rounded-lg border"
     controls={controls}
     autoplay={autoPlay}
     loop={loop}

src/components/Media/YtVideo.astro

@@ -1,13 +1,26 @@
 ---
 import type { videoConfig } from "@interfaces/video.ts";
 
-const config: videoConfig = Astro.props.videoConfig;
+interface Props extends videoConfig {}
+
+const {
+  videoPath,
+  videoTitle,
+  width = "1920",
+  height = "1080",
+  autoPlay = false,
+} = Astro.props;
+
+const aspect = `${width} / ${height}`;
 ---
 
-<iframe
+<div class="mx-auto my-auto w-full" style={`aspect-ratio: ${aspect};`}>
-  class="h-128 w-full max-w-1/2"
+  <iframe
-  src={config.videoPath}
+    src={videoPath}
-  title={config.videoTitle ?? ""}
+    title={videoTitle}
-  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+    class="border-caperren-green-dark h-full w-full rounded-lg border"
-  referrerpolicy="strict-origin-when-cross-origin"
+    allow={"accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share; " +
-  allowfullscreen></iframe>
+      (autoPlay ? "autoplay;" : "")}
+    referrerpolicy="strict-origin-when-cross-origin"
+    allowfullscreen></iframe>
+</div>

src/components/NestedNavbarEntries.astro

@@ -1,26 +1,18 @@
 ---
 import type { navLink } from "@interfaces/site-layout.ts";
 
+import { getHrefPath, getNavLinkSuffix } from "@data/site-layout.ts";
+
 const items: navLink[] = Astro.props.items;
 const depth: number = Astro.props.depth ?? 0;
 const paths: string[] = Astro.props.paths ?? [];
 
-const getNavLinkSuffix = (entry: navLink): string => {
-  return "-" + [...paths, entry.path].join("-");
-};
-const getHrefPath = (entry: navLink): string => {
-  return entry.pubpath
-    ? entry.pubpath
-    : "/" +
-        (paths && paths.length ? [...paths, entry.path].join("/") : entry.path);
-};
-
 const { pathname } = Astro.url;
 ---
 
 <ul
   class:list={[
-    "border-caperren-green flex flex-col space-y-4 space-x-8 bg-black",
+    "border-caperren-green flex flex-col space-y-4 bg-black",
     depth
       ? "space-y-4 py-4"
       : "items-start lg:mt-0 lg:flex-row lg:space-y-0 lg:space-x-8",
@@ -29,21 +21,23 @@ const { pathname } = Astro.url;
   {
     items.map(
       (entry) =>
-        (entry.enabled ?? true) && (
+        (entry.enabled ?? true) &&
+        !(entry.hidden ?? false) && (
           <li class="">
             {Array.isArray(entry.children) && entry.children.length ? (
               <div>
                 <button
-                  id={"dropdownNavbarLink" + getNavLinkSuffix(entry)}
+                  id={"dropdownNavbarLink" + getNavLinkSuffix(paths, entry)}
                   data-dropdown-toggle={
-                    "dropdownNavbar" + getNavLinkSuffix(entry)
+                    "dropdownNavbar" + getNavLinkSuffix(paths, entry)
                   }
                   data-dropdown-placement="bottom-start"
                   data-dropdown-offset-distance="5"
                   data-dropdown-offset-skidding="12"
                   class:list={[
                     "hover:text-caperren-green-light lg:hover:text-caperren-green-light flex w-full items-center justify-between lg:p-0 lg:hover:bg-transparent",
-                    pathname.startsWith(getHrefPath(entry))
+                    pathname.startsWith(getHrefPath(paths, entry)) &&
+                    !(entry.placeholderEntry ?? false)
                       ? "border-caperren-green border-b-2"
                       : false,
                   ]}
@@ -65,7 +59,7 @@ const { pathname } = Astro.url;
                   </svg>
                 </button>
                 <div
-                  id={"dropdownNavbar" + getNavLinkSuffix(entry)}
+                  id={"dropdownNavbar" + getNavLinkSuffix(paths, entry)}
                   class="border-caperren-green z-10 hidden w-max max-w-screen border bg-black px-6 shadow-sm"
                 >
                   <Astro.self
@@ -78,18 +72,32 @@ const { pathname } = Astro.url;
             ) : (
               <div>
                 <a
-                  href={getHrefPath(entry)}
+                  href={
-                  target={getHrefPath(entry).startsWith("/") ? "" : "_blank"}
+                    !(entry.placeholderEntry ?? false)
+                      ? getHrefPath(paths, entry)
+                      : undefined
+                  }
+                  target={
+                    getHrefPath(paths, entry).startsWith("/") ? "" : "_blank"
+                  }
                   class:list={[
-                    "hover:text-caperren-green-light ring-caperren-green-dark block bg-transparent lg:p-0",
+                    "ring-caperren-green-dark block bg-transparent lg:p-0",
-                    pathname === getHrefPath(entry)
+                    pathname === getHrefPath(paths, entry)
                       ? "border-caperren-green border-b-2"
                       : false,
+                    entry.isSubItem ? "ms-3" : false,
+                    entry.placeholderEntry
+                      ? false
+                      : "hover:text-caperren-green-light",
                   ]}
                   aria-current={
-                    pathname === getHrefPath(entry) ? "page" : undefined
+                    pathname === getHrefPath(paths, entry) &&
+                    !(entry.placeholderEntry ?? false)
+                      ? "page"
+                      : undefined
                   }
                 >
+                  {entry.isSubItem && "∟ "}
                   {entry.navText}
                 </a>
               </div>

src/components/PageGroup.astro

@@ -3,7 +3,7 @@ const hasHeader = Astro.slots.has("header");
 const hasDefault = Astro.slots.has("default");
 ---
 
-<div class="grid grid-cols-1 gap-3">
+<div class="grid grid-cols-1 gap-0.5">
   {
     Astro.slots.has("header") && (
       <div>

src/components/PopoverWordDefinition.astro

@@ -7,10 +7,15 @@ const keys: { [key: string]: string } = {
   ADCP: "Acoustic doppler current profiler",
   COTS: "Consumer off-the-shelf",
   CTD: "Conductivity, temperature, and depth sensor",
+  DUTs: "Devices under test",
   GUI: "Graphical user interface",
   NUC: "A small and low-power computer made by Intel",
   PCBs: "Printed circuit boards",
+  SCARA: "Selective Compliance Assembly Robot Arm",
+  TDD: "Test driven development",
   UPS: "Uninterruptible power supply",
+  VISA: "Virtual instrument software architecture",
+  VPS: "Virtual private server",
 };
 
 const key: string | undefined = Astro.props.key;
@@ -21,6 +26,12 @@ if (key && keys.hasOwnProperty(key)) {
   word = key;
   definition = keys[key];
 }
+
+if (!word || !definition) {
+  throw new Error(
+    `Popover definition is missing! Inputs were\nkey: ${key}\nword: ${word}\ndefinition: ${definition}`,
+  );
+}
 ---
 
 <>